svn commit: r344305 - head/x11-fonts/dejavu
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Fri Feb 14 19:43:05 UTC 2014
Author: sunpoet
Date: Fri Feb 14 19:43:04 2014
New Revision: 344305
URL: http://svnweb.freebsd.org/changeset/ports/344305
QAT: https://qat.redports.org/buildarchive/r344305/
Log:
- Remove fontconfig from dependency list
- Turn LINKS option on by default
- Update PLIST and PLIST_SUB: do not use _REL suffix
- Simplify Makefile
- Cosmetic change
- Bump PORTREVISION for dependency and package change
Modified:
head/x11-fonts/dejavu/Makefile
head/x11-fonts/dejavu/pkg-plist
Modified: head/x11-fonts/dejavu/Makefile
==============================================================================
--- head/x11-fonts/dejavu/Makefile Fri Feb 14 19:41:26 2014 (r344304)
+++ head/x11-fonts/dejavu/Makefile Fri Feb 14 19:43:04 2014 (r344305)
@@ -3,7 +3,7 @@
PORTNAME= dejavu
PORTVERSION= 2.34
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-fonts
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVERSION}
@@ -11,51 +11,35 @@ DISTNAME= ${PORTNAME}-fonts-ttf-${PORTVE
MAINTAINER= sunpoet at FreeBSD.org
COMMENT= Bitstream Vera Fonts clone with a wider range of characters
-BUILD_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig \
- ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
+BUILD_DEPENDS= ${LOCALBASE}/bin/mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
${LOCALBASE}/bin/mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-RUN_DEPENDS= ${LOCALBASE}/bin/fc-cache:${PORTSDIR}/x11-fonts/fontconfig
OPTIONS_DEFINE= DOCS LINKS
+OPTIONS_DEFAULT=LINKS
+OPTIONS_SUB= yes
LINKS_DESC= Install links of configuration files in conf.d
USE_BZIP2= yes
-FCDIR= ${PREFIX}/${FCDIR_REL}
-FCDIR_REL?= etc/fonts/conf.avail
-FONTSDIR= ${PREFIX}/${FONTSDIR_REL}
-FONTSDIR_REL?= lib/X11/fonts/${PORTNAME}
-PLIST_SUB= FCDIR_REL=${FCDIR_REL} FONTSDIR_REL=${FONTSDIR_REL}
+PLIST_SUB= FCDIR=${FCDIR} FCDIR_LINKS=${FCDIR_LINKS} FONTSDIR=${FONTSDIR}
PORTDOCS= README langcover.txt status.txt unicover.txt
SUB_FILES= pkg-message
SUB_LIST= FONTSDIR=${FONTSDIR}
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MLINKS}
-FCDIR_LINKS= ${FCDIR_REL:S|conf.avail|conf.d|}
-PLIST_SUB+= FCDIR_LINKS="${FCDIR_LINKS}"
-.else
-PLIST_SUB+= FCDIR_LINKS="@comment "
-.endif
+FCDIR?= etc/fonts/conf.avail
+FCDIR_LINKS= ${FCDIR:S|conf.avail|conf.d|}
+FONTSDIR?= lib/X11/fonts/${PORTNAME}
do-build:
@cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontscale
@cd ${WRKSRC}/ && ${LOCALBASE}/bin/mkfontdir
do-install:
- ${MKDIR} ${STAGEDIR}${FCDIR}/ ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ ${STAGEDIR}${FONTSDIR}/
- ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${FCDIR}/
- ${INSTALL_DATA} ${WRKSRC}/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${FONTSDIR}/
-.if ${PORT_OPTIONS:MDOCS}
+ cd ${STAGEDIR}${PREFIX}/ && ${MKDIR} ${FCDIR}/ ${FCDIR_LINKS}/ ${FONTSDIR}/
+ ${INSTALL_DATA} ${WRKSRC}/fontconfig/*.conf ${STAGEDIR}${PREFIX}/${FCDIR}/
+ cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
+ ${INSTALL_DATA} ${WRKSRC}/fonts.* ${WRKSRC}/ttf/*.ttf ${STAGEDIR}${PREFIX}/${FONTSDIR}/
${MKDIR} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
-.endif
-.if ${PORT_OPTIONS:MLINKS}
- cd ${STAGEDIR}${PREFIX}/${FCDIR_LINKS}/ && ${LN} -fs ../conf.avail/*dejavu*.conf .
-.endif
- @${ECHO_MSG} "===> Running fc-cache"
- -${LOCALBASE}/bin/fc-cache -f -v ${FONTSDIR}/
- @${ECHO_MSG}
.include <bsd.port.mk>
Modified: head/x11-fonts/dejavu/pkg-plist
==============================================================================
--- head/x11-fonts/dejavu/pkg-plist Fri Feb 14 19:41:26 2014 (r344304)
+++ head/x11-fonts/dejavu/pkg-plist Fri Feb 14 19:43:04 2014 (r344305)
@@ -1,36 +1,39 @@
-%%FCDIR_REL%%/20-unhint-small-dejavu-sans-mono.conf
-%%FCDIR_REL%%/20-unhint-small-dejavu-sans.conf
-%%FCDIR_REL%%/20-unhint-small-dejavu-serif.conf
-%%FCDIR_REL%%/57-dejavu-sans-mono.conf
-%%FCDIR_REL%%/57-dejavu-sans.conf
-%%FCDIR_REL%%/57-dejavu-serif.conf
-%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans-mono.conf
-%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans.conf
-%%FCDIR_LINKS%%/20-unhint-small-dejavu-serif.conf
-%%FCDIR_LINKS%%/57-dejavu-sans-mono.conf
-%%FCDIR_LINKS%%/57-dejavu-sans.conf
-%%FCDIR_LINKS%%/57-dejavu-serif.conf
-%%FONTSDIR_REL%%/DejaVuSans-Bold.ttf
-%%FONTSDIR_REL%%/DejaVuSans-BoldOblique.ttf
-%%FONTSDIR_REL%%/DejaVuSans-ExtraLight.ttf
-%%FONTSDIR_REL%%/DejaVuSans-Oblique.ttf
-%%FONTSDIR_REL%%/DejaVuSans.ttf
-%%FONTSDIR_REL%%/DejaVuSansCondensed-Bold.ttf
-%%FONTSDIR_REL%%/DejaVuSansCondensed-BoldOblique.ttf
-%%FONTSDIR_REL%%/DejaVuSansCondensed-Oblique.ttf
-%%FONTSDIR_REL%%/DejaVuSansCondensed.ttf
-%%FONTSDIR_REL%%/DejaVuSansMono-Bold.ttf
-%%FONTSDIR_REL%%/DejaVuSansMono-BoldOblique.ttf
-%%FONTSDIR_REL%%/DejaVuSansMono-Oblique.ttf
-%%FONTSDIR_REL%%/DejaVuSansMono.ttf
-%%FONTSDIR_REL%%/DejaVuSerif-Bold.ttf
-%%FONTSDIR_REL%%/DejaVuSerif-BoldItalic.ttf
-%%FONTSDIR_REL%%/DejaVuSerif-Italic.ttf
-%%FONTSDIR_REL%%/DejaVuSerif.ttf
-%%FONTSDIR_REL%%/DejaVuSerifCondensed-Bold.ttf
-%%FONTSDIR_REL%%/DejaVuSerifCondensed-BoldItalic.ttf
-%%FONTSDIR_REL%%/DejaVuSerifCondensed-Italic.ttf
-%%FONTSDIR_REL%%/DejaVuSerifCondensed.ttf
-%%FONTSDIR_REL%%/fonts.dir
-%%FONTSDIR_REL%%/fonts.scale
- at dirrm %%FONTSDIR_REL%%
+%%FCDIR%%/20-unhint-small-dejavu-sans-mono.conf
+%%FCDIR%%/20-unhint-small-dejavu-sans.conf
+%%FCDIR%%/20-unhint-small-dejavu-serif.conf
+%%FCDIR%%/57-dejavu-sans-mono.conf
+%%FCDIR%%/57-dejavu-sans.conf
+%%FCDIR%%/57-dejavu-serif.conf
+%%LINKS%%%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans-mono.conf
+%%LINKS%%%%FCDIR_LINKS%%/20-unhint-small-dejavu-sans.conf
+%%LINKS%%%%FCDIR_LINKS%%/20-unhint-small-dejavu-serif.conf
+%%LINKS%%%%FCDIR_LINKS%%/57-dejavu-sans-mono.conf
+%%LINKS%%%%FCDIR_LINKS%%/57-dejavu-sans.conf
+%%LINKS%%%%FCDIR_LINKS%%/57-dejavu-serif.conf
+%%FONTSDIR%%/DejaVuSans-Bold.ttf
+%%FONTSDIR%%/DejaVuSans-BoldOblique.ttf
+%%FONTSDIR%%/DejaVuSans-ExtraLight.ttf
+%%FONTSDIR%%/DejaVuSans-Oblique.ttf
+%%FONTSDIR%%/DejaVuSans.ttf
+%%FONTSDIR%%/DejaVuSansCondensed-Bold.ttf
+%%FONTSDIR%%/DejaVuSansCondensed-BoldOblique.ttf
+%%FONTSDIR%%/DejaVuSansCondensed-Oblique.ttf
+%%FONTSDIR%%/DejaVuSansCondensed.ttf
+%%FONTSDIR%%/DejaVuSansMono-Bold.ttf
+%%FONTSDIR%%/DejaVuSansMono-BoldOblique.ttf
+%%FONTSDIR%%/DejaVuSansMono-Oblique.ttf
+%%FONTSDIR%%/DejaVuSansMono.ttf
+%%FONTSDIR%%/DejaVuSerif-Bold.ttf
+%%FONTSDIR%%/DejaVuSerif-BoldItalic.ttf
+%%FONTSDIR%%/DejaVuSerif-Italic.ttf
+%%FONTSDIR%%/DejaVuSerif.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed-Bold.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed-BoldItalic.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed-Italic.ttf
+%%FONTSDIR%%/DejaVuSerifCondensed.ttf
+%%FONTSDIR%%/fonts.dir
+%%FONTSDIR%%/fonts.scale
+ at dirrm %%FONTSDIR%%
+%%LINKS%%@dirrmtry %%FCDIR_LINKS%%
+ at dirrmtry %%FCDIR%%
+ at dirrmtry etc/fonts
More information about the svn-ports-all
mailing list