diff options
| author | Matthew Seaman <matthew@FreeBSD.org> | 2013-12-08 22:38:52 +0000 |
|---|---|---|
| committer | Matthew Seaman <matthew@FreeBSD.org> | 2013-12-08 22:38:52 +0000 |
| commit | 08f342435d49d94edb5d5780db619af89e7f3038 (patch) | |
| tree | e40af42880ba18d7a3f8182977ac3694849fcd35 /x11-fonts | |
| parent | - s/subversion-java/java-subversion/ (diff) | |
Mark all my architecture independent ports using shell/perl/PHP as
NO_ARCH=yes
While here, fix a few other niggles:
net/phpldapadmin -- remove indefinite article from COMMENT
www/p5-RT* -- fix comments referencing the different versions of RT
x11-fonts/gentium-{basic,plus} -- mention ${STAGEDIR} explicitly in the
install targets; rework the handling of ${FONTPATH}
Notes
Notes:
svn path=/head/; revision=335945
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/gentium-basic/Makefile | 26 | ||||
| -rw-r--r-- | x11-fonts/gentium-plus/Makefile | 14 |
2 files changed, 22 insertions, 18 deletions
diff --git a/x11-fonts/gentium-basic/Makefile b/x11-fonts/gentium-basic/Makefile index 2a4fa7b85b65..d886f7525dda 100644 --- a/x11-fonts/gentium-basic/Makefile +++ b/x11-fonts/gentium-basic/Makefile @@ -12,26 +12,28 @@ COMMENT= Gentium Basic and Gentium Book Basic TrueType fonts LICENSE= OFL11 +NO_ARCH= yes + USE_TGZ= yes XORG_CAT= font FONTLIBPATH= lib/X11/fonts -FONTROOTDIR= ${STAGEDIR}${PREFIX}/${FONTLIBPATH} +FONTPATH= ${PREFIX}/${FONTLIBPATH}/${FONTDIR} INSTALLS_TTF= yes MEDIA_ID= ${PORTNAME}_${PORTVERSION}_tar NO_BUILD= yes WRKSRC= ${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,} -PLIST_FILES= ${FONTLIBPATH}/${FONTDIR}/GenBasB.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBasBI.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBasI.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBasR.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBkBasB.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBkBasBI.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBkBasI.ttf \ - ${FONTLIBPATH}/${FONTDIR}/GenBkBasR.ttf +PLIST_FILES= ${FONTPATH:S,^${PREFIX}/,,}/GenBasB.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBasBI.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBasI.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBasR.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBkBasB.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBkBasBI.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBkBasI.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/GenBkBasR.ttf -SUB_LIST= "FONTPATH=${PREFIX}/${FONTLIBPATH}/${FONTDIR}" +SUB_LIST= "FONTPATH=${FONTPATH}" SUB_FILES= pkg-message DOCSLIST= FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt @@ -47,8 +49,8 @@ do-configure: do-install: install-fonts install-docs install-fonts: - ${MKDIR} ${FONTROOTDIR}/${FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR} + ${MKDIR} ${STAGEDIR}${FONTPATH} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTPATH} install-docs: .if ${PORT_OPTIONS:MDOCS} diff --git a/x11-fonts/gentium-plus/Makefile b/x11-fonts/gentium-plus/Makefile index b7352ef07963..5e3a425f7c71 100644 --- a/x11-fonts/gentium-plus/Makefile +++ b/x11-fonts/gentium-plus/Makefile @@ -11,20 +11,22 @@ COMMENT= Gentium Plus TrueType font collection LICENSE= OFL11 +NO_ARCH= yes + USE_ZIP= yes XORG_CAT= font FONTLIBPATH= lib/X11/fonts -FONTROOTDIR= ${STAGEDIR}${PREFIX}/${FONTLIBPATH} +FONTPATH= ${PREFIX}/${FONTLIBPATH}/${FONTDIR} INSTALLS_TTF= yes MEDIA_ID= ${DISTNAME}${EXTRACT_SUFX} NO_BUILD= yes USE_TGZ= yes #prevent bsd.xorg.mk from setting USE_BZIP -PLIST_FILES= ${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-I.ttf \ - ${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-R.ttf +PLIST_FILES= ${FONTPATH:S,^${PREFIX}/,,}/${PORTNAME}-I.ttf \ + ${FONTPATH:S,^${PREFIX}/,,}/${PORTNAME}-R.ttf -SUB_LIST= "FONTPATH=${PREFIX}$FONTLIBPATH}/${FONTDIR}" +SUB_LIST= "FONTPATH=${FONTPATH}" SUB_FILES= pkg-message DOCSLIST= FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt README.txt \ @@ -41,8 +43,8 @@ do-configure: do-install: install-fonts install-docs install-fonts: - ${MKDIR} ${FONTROOTDIR}/${FONTDIR} - ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR} + ${MKDIR} ${STAGEDIR}${FONTPATH} + ${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTPATH} install-docs: .if ${PORT_OPTIONS:MDOCS} |