aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts/charis
diff options
context:
space:
mode:
authorBrendan Fabeny <bf@FreeBSD.org>2011-10-14 20:37:20 +0000
committerBrendan Fabeny <bf@FreeBSD.org>2011-10-14 20:37:20 +0000
commit23da1ab869151d3efc0eb7b13da79292eb590282 (patch)
treeebc2857337deaa185d6e3adf4dcc1bc506f2f317 /x11-fonts/charis
parent15cfa870ac2b67e7408240acfb83b1e75ddb65f9 (diff)
downloadports-23da1ab869151d3efc0eb7b13da79292eb590282.tar.gz
ports-23da1ab869151d3efc0eb7b13da79292eb590282.zip
Notes
Diffstat (limited to 'x11-fonts/charis')
-rw-r--r--x11-fonts/charis/Makefile29
-rw-r--r--x11-fonts/charis/distinfo4
-rw-r--r--x11-fonts/charis/files/pkg-message.in2
3 files changed, 17 insertions, 18 deletions
diff --git a/x11-fonts/charis/Makefile b/x11-fonts/charis/Makefile
index 5fdb431acdbf..44b400091362 100644
--- a/x11-fonts/charis/Makefile
+++ b/x11-fonts/charis/Makefile
@@ -6,47 +6,46 @@
#
PORTNAME= CharisSIL
-PORTVERSION= 4.106
+PORTVERSION= 4.110
CATEGORIES= x11-fonts
-MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/
+MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?&format=file&media_id=${MEDIA_ID}&filename=/ \
+ LOCAL/bf
MASTER_SITE_SUBDIR= #prevent bsd.xorg.mk from setting a default subdirectory
-DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= bf@FreeBSD.org
COMMENT= Charis SIL TrueType font collection
+LICENSE= OFL
+LICENSE_NAME= SIL Open Font License (OFL)
+LICENSE_FILE= ${WRKSRC}/OFL.txt
+LICENSE_PERMS= auto-accept
+
USE_ZIP= yes
XORG_CAT= font
-FONTROOTDIR= ${PREFIX}/lib/X11/fonts/${FONTDIR}
+FONTROOTDIR= ${PREFIX}/lib/X11/fonts
INSTALLS_TTF= yes
-MEDIA_ID= ${DISTNAME}b${EXTRACT_SUFX}
+MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX}
NO_BUILD= yes
USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP
-WRKSRC= ${WRKDIR}/${PORTNAME}
-
-LICENSE= OFL
-LICENSE_FILE= ${WRKSRC}/OFL.txt
-LICENSE_NAME= SIL Open Font License (OFL)
-LICENSE_PERMS= auto-accept
.for type in B BI I R
-PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${PORTNAME}${type}.ttf
+PLIST_FILES+= ${FONTROOTDIR:S/${PREFIX}\///}/${FONTDIR}/${PORTNAME}-${type}.ttf
.endfor
.if !defined(NOPORTDOCS)
PORTDOCS= FONTLOG.txt OFL-FAQ.txt OFL.txt README.txt
.endif
-SUB_LIST= FONTROOTDIR="${FONTROOTDIR}"
+SUB_LIST= DIR="${FONTROOTDIR}/${FONTDIR}"
SUB_FILES= pkg-message
do-configure:
@${DO_NADA}
do-install:
- @${MKDIR} ${FONTROOTDIR}
- @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR})
+ @${MKDIR} ${FONTROOTDIR}/${FONTDIR}
+ @(cd ${WRKSRC} ; ${INSTALL_DATA} *.ttf ${FONTROOTDIR}/${FONTDIR})
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
@(cd ${WRKSRC} ; ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR})
diff --git a/x11-fonts/charis/distinfo b/x11-fonts/charis/distinfo
index 402c494a6733..2bb9b9991016 100644
--- a/x11-fonts/charis/distinfo
+++ b/x11-fonts/charis/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/font/CharisSIL4.106.zip) = 8902f6091fac3d96a50a1d7250f73ddeba4a1f93055632c87338e500e87055d8
-SIZE (xorg/font/CharisSIL4.106.zip) = 2134757
+SHA256 (xorg/font/CharisSIL-4.110.zip) = 97bf74d1bb8301e7688abf1481515920a84d47e3d325ce3eb0d8ee9a16cb3264
+SIZE (xorg/font/CharisSIL-4.110.zip) = 3435758
diff --git a/x11-fonts/charis/files/pkg-message.in b/x11-fonts/charis/files/pkg-message.in
index ddfde34f6a7b..b648d77200d4 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 "%%FONTROOTDIR%%/"
+ FontPath "%%DIR%%/"
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