aboutsummaryrefslogtreecommitdiff
path: root/x11-fonts/andika
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2015-03-20 01:12:20 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2015-03-20 01:12:20 +0000
commit6bc7b7ce5dca31aeba10feab51f6522baef39fa3 (patch)
tree6c84536921c7c5a3def1d614c13a8a70d850700c /x11-fonts/andika
parent82ae895c0bfc875ead9a37815f837215abb5eaf8 (diff)
downloadports-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/andika')
-rw-r--r--x11-fonts/andika/Makefile20
-rw-r--r--x11-fonts/andika/distinfo4
-rw-r--r--x11-fonts/andika/files/pkg-message.in2
3 files changed, 9 insertions, 17 deletions
diff --git a/x11-fonts/andika/Makefile b/x11-fonts/andika/Makefile
index f0d769b7a841..be84557181b7 100644
--- a/x11-fonts/andika/Makefile
+++ b/x11-fonts/andika/Makefile
@@ -2,6 +2,7 @@
PORTNAME= Andika
PORTVERSION= 1.004
+PORTREVISION= 1
CATEGORIES= x11-fonts
MASTER_SITES= http://scripts.sil.org/cms/scripts/render_download.php?format=file&media_id=${MEDIA_ID}&filename=/
@@ -10,18 +11,14 @@ COMMENT= Andika TrueType fonts
LICENSE= OFL11
-XORG_CAT= font
+USES= fonts
-FONTLIBPATH= lib/X11/fonts
-FONTROOTDIR= ${PREFIX}/${FONTLIBPATH}
-INSTALLS_TTF= yes
MEDIA_ID= ${PORTNAME}-${PORTVERSION}.zip
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,}
-PLIST_FILES= ${FONTLIBPATH}/${FONTDIR}/Andika-R.ttf
+PLIST_FILES= ${FONTSDIR}/Andika-R.ttf
-SUB_LIST= "FONTPATH=${FONTROOTDIR}/${FONTDIR}"
SUB_FILES= pkg-message
DOCSLIST= FONTLOG.txt OFL-FAQ.txt README.txt
@@ -29,15 +26,10 @@ PORTDOCS= ${DOCSLIST:C,^.*/,,}
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
-do-configure:
- ${DO_NADA}
-
do-install:
- ${MKDIR} ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
- ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTROOTDIR}/${FONTDIR}
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ @${MKDIR} ${STAGEDIR}${FONTSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTSDIR}
+ @${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${DOCSLIST:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>
diff --git a/x11-fonts/andika/distinfo b/x11-fonts/andika/distinfo
index e30a3d0c7b2d..9d1aa2e57e1b 100644
--- a/x11-fonts/andika/distinfo
+++ b/x11-fonts/andika/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xorg/font/Andika-1.004.tar.bz2) = e7de847f4ccfd881249630992e8b3d2dba2bec093eda9991d554228c7f14e77c
-SIZE (xorg/font/Andika-1.004.tar.bz2) = 1000025
+SHA256 (Andika-1.004.tar.gz) = e7de847f4ccfd881249630992e8b3d2dba2bec093eda9991d554228c7f14e77c
+SIZE (Andika-1.004.tar.gz) = 1000025
diff --git a/x11-fonts/andika/files/pkg-message.in b/x11-fonts/andika/files/pkg-message.in
index 7117adce42d0..66a3d98c1032 100644
--- a/x11-fonts/andika/files/pkg-message.in
+++ b/x11-fonts/andika/files/pkg-message.in
@@ -1,7 +1,7 @@
To use these fonts, add the following line to the "Files" section of
xorg.conf:
- FontPath "%%FONTPATH%%/"
+ 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