diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-20 01:12:20 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-03-20 01:12:20 +0000 |
| commit | 6bc7b7ce5dca31aeba10feab51f6522baef39fa3 (patch) | |
| tree | 6c84536921c7c5a3def1d614c13a8a70d850700c /x11-fonts/charis | |
| parent | 82ae895c0bfc875ead9a37815f837215abb5eaf8 (diff) | |
| download | ports-6bc7b7ce5dca31aeba10feab51f6522baef39fa3.tar.gz ports-6bc7b7ce5dca31aeba10feab51f6522baef39fa3.zip | |
Rework XORG_CAT= font
Fonts are now generating the fonts.scale and fonts.dir at install time
font-alias is not needed anymore for the above reason
extract font-util and encodings out of XORG_CAT=fonts because they do not
install any fonts
make XORG_CAT=fonts use USES=fonts
Notes
Notes:
svn path=/head/; revision=381702
Diffstat (limited to 'x11-fonts/charis')
| -rw-r--r-- | x11-fonts/charis/Makefile | 19 | ||||
| -rw-r--r-- | x11-fonts/charis/distinfo | 4 | ||||
| -rw-r--r-- | x11-fonts/charis/files/pkg-message.in | 2 |
3 files changed, 8 insertions, 17 deletions
diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile index 02e5e1cb2102..489cd7ba0717 100644 --- a/x11-fonts/charis/Makefile +++ b/x11-fonts/charis/Makefile @@ -3,6 +3,7 @@ PORTNAME= CharisSIL PORTVERSION= 4.114 +PORTREVISION= 1 CATEGORIES= x11-fonts MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \ LOCAL/bf @@ -13,34 +14,24 @@ COMMENT= Charis SIL TrueType font collection LICENSE= OFL11 -USES= zip -XORG_CAT= font +USES= fonts zip -FONTROOTDIR= ${PREFIX}/lib/X11/fonts -INSTALLS_TTF= yes MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX} NO_BUILD= yes -USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP .for type in B BI I R -PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf +PLIST_FILES+= ${FONTSDIR}/${PORTNAME}-${type}.ttf .endfor OPTIONS_DEFINE= DOCS -.include <bsd.port.options.mk> - PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt -SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}" SUB_FILES= pkg-message -do-configure: - @${DO_NADA} - do-install: - ${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR} - (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}) + ${MKDIR} ${STAGEDIR}${FONTSDIR} + (cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${STAGEDIR}${FONTSDIR}) ${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}) diff --git a/x11-fonts/charis/distinfo b/x11-fonts/charis/distinfo index 9429a3599b8e..3b6a3396ac23 100644 --- a/x11-fonts/charis/distinfo +++ b/x11-fonts/charis/distinfo @@ -1,2 +1,2 @@ -SHA256 (xorg/font/CharisSIL-4.114.zip) = 92ea75512a0bee4d491ba23fb295fd410707f6e8dedacd1af81e222a3081dd56 -SIZE (xorg/font/CharisSIL-4.114.zip) = 2782898 +SHA256 (CharisSIL-4.114.zip) = 92ea75512a0bee4d491ba23fb295fd410707f6e8dedacd1af81e222a3081dd56 +SIZE (CharisSIL-4.114.zip) = 2782898 diff --git a/x11-fonts/charis/files/pkg-message.in b/x11-fonts/charis/files/pkg-message.in index b648d77200d4..9ce0ab9fbb48 100644 --- a/x11-fonts/charis/files/pkg-message.in +++ b/x11-fonts/charis/files/pkg-message.in @@ -1,7 +1,7 @@ To use these fonts, add the following line to the "Files" section of xorg.conf: - FontPath "%%DIR%%/" + FontPath "%%FONTSDIR%%/" Users of older versions of X may additionally have to make sure that the freetype module is loaded. Check /var/log/Xorg.0.log for error |