svn commit: r421564 - in head/x11-fonts/intlfonts: . files

Tijl Coosemans tijl at FreeBSD.org
Thu Sep 8 16:03:29 UTC 2016 

Author: tijl
Date: Thu Sep  8 16:03:28 2016
New Revision: 421564
URL: https://svnweb.freebsd.org/changeset/ports/421564

Log:
  - Convert to USES=fonts to fix a package installation problem.
  - Install upstream fonts.alias.

Deleted:
  head/x11-fonts/intlfonts/files/DEINSTALL.tmpl
  head/x11-fonts/intlfonts/files/INSTALL.tmpl
Modified:
  head/x11-fonts/intlfonts/Makefile
  head/x11-fonts/intlfonts/pkg-plist

Modified: head/x11-fonts/intlfonts/Makefile
==============================================================================
--- head/x11-fonts/intlfonts/Makefile	Thu Sep  8 16:03:26 2016	(r421563)
+++ head/x11-fonts/intlfonts/Makefile	Thu Sep  8 16:03:28 2016	(r421564)
@@ -3,69 +3,52 @@
 
 PORTNAME=	intlfonts
 PORTVERSION=	1.2.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	GNU
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Free X11 fonts for all characters that Emacs can handle
 
-BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf \
-		mkfontdir:x11-fonts/mkfontdir \
-		mkfontscale:x11-fonts/mkfontscale
-RUN_DEPENDS=	type1inst:x11-fonts/p5-type1inst
+BUILD_DEPENDS=	bdftopcf:x11-fonts/bdftopcf
 
-OPTIONS_DEFINE=	DOCS
+USES=		fonts
+# Don't move to pkg-plist, must appear before @fcfontsdir from USES=fonts.
+PLIST_FILES=	"@fontsdir ${FONTSDIR}/TrueType" \
+		"@fontsdir ${FONTSDIR}/Type1"
 
-USE_XORG=	x11
-PLIST_SUB+=	FONTSDIR=${FONTSDIR} T1_FONTSDIR=${T1_FONTSDIR} \
-		TT_FONTSDIR=${TT_FONTSDIR}
+OPTIONS_DEFINE=	DOCS
 
-NORMAL_FONTS=	Asian		\
+FONTS=		Asian		\
 		Chinese		\
+		Chinese.BIG	\
 		Ethiopic	\
 		European	\
+		European.BIG	\
 		Japanese	\
+		Japanese.BIG	\
 		Misc
-BIG_FONTS=	Chinese.BIG	\
-		European.BIG	\
-		Japanese.BIG
-SCALABLE_FONTS=	TrueType \
-		Type1
-FONTSDIR=	lib/X11/fonts/local
-T1_FONTSDIR=	lib/X11/fonts/Type1
-TT_FONTSDIR=	lib/X11/fonts/TrueType
-PKGINSTALL=	${WRKDIR}/INSTALL
-PKGDEINSTALL=	${WRKDIR}/DEINSTALL
 
 do-build:
-	cd ${WRKSRC}; \
-	for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
-		for bdf in $$dir/*.bdf ; do \
-			${ECHO_CMD} $$bdf; \
-			pcf_gz=`${ECHO_CMD} $$bdf | ${SED} 's/.bdf$$/.pcf.gz/'`; \
-			${CAT} $$bdf | bdftopcf | ${GZIP_CMD} \
-				> $$pcf_gz; \
-		done \
+.for f in ${FONTS}
+	for bdf in ${WRKSRC}/${f}/*.bdf ; do \
+		${ECHO_CMD} $${bdf}; \
+		${LOCALBASE}/bin/bdftopcf $${bdf} | ${GZIP_CMD} \
+			> $${bdf%.bdf}.pcf.gz; \
 	done
-	for f in INSTALL DEINSTALL; do \
-		${SED} -e 's,%%FONTSDIR%%,${FONTSDIR},g' \
-			-e 's,%%T1_FONTSDIR%%,${T1_FONTSDIR},g' \
-			-e 's,%%TT_FONTSDIR%%,${TT_FONTSDIR},g' \
-			-e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-			< ${FILESDIR}/$${f}.tmpl > ${WRKDIR}/$${f}; \
-	done
-
+.endfor
 
 do-install:
-.for d in ${FONTSDIR} ${T1_FONTSDIR} ${TT_FONTSDIR}
-	@${MKDIR} ${STAGEDIR}${PREFIX}/$d
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}
+.for f in ${FONTS}
+	${INSTALL_DATA} ${WRKSRC}/${f}/*.pcf.gz ${STAGEDIR}${FONTSDIR}
+	[ ! -f ${WRKSRC}/${f}/fonts.alias ] || \
+		${CAT} ${WRKSRC}/${f}/fonts.alias >> ${STAGEDIR}${FONTSDIR}/fonts.alias
 .endfor
-	for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$$dir/*.pcf.gz ${STAGEDIR}${PREFIX}/${FONTSDIR}; \
-	done
-	${INSTALL_DATA} ${WRKSRC}/Type1/*.* ${STAGEDIR}${PREFIX}/${T1_FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/TrueType/*.ttf ${STAGEDIR}${PREFIX}/${TT_FONTSDIR}
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}/TrueType
+	${INSTALL_DATA} ${WRKSRC}/TrueType/*.* ${STAGEDIR}${FONTSDIR}/TrueType
+	@${MKDIR} ${STAGEDIR}${FONTSDIR}/Type1
+	${INSTALL_DATA} ${WRKSRC}/Type1/*.* ${STAGEDIR}${FONTSDIR}/Type1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/Emacs.ap ${WRKSRC}/NEWS \
 		${STAGEDIR}${DOCSDIR}

Modified: head/x11-fonts/intlfonts/pkg-plist
==============================================================================
--- head/x11-fonts/intlfonts/pkg-plist	Thu Sep  8 16:03:26 2016	(r421563)
+++ head/x11-fonts/intlfonts/pkg-plist	Thu Sep  8 16:03:28 2016	(r421564)
@@ -1,6 +1,96 @@
- at exec [ -f %D/%%FONTSDIR%%/fonts.dir ] || mv %D/%%FONTSDIR%%/fonts.dir %D/%%FONTSDIR%%/fonts.dir.org
- at exec [ -f %D/%%T1_FONTSDIR%%/fonts.dir ] || mv %D/%%T1_FONTSDIR%%/fonts.dir %D/%%FONTSDIR%%/fonts.dir.org
- at exec [ -f %D/%%T1_FONTSDIR%%/fonts.scale ] || mv %D/%%T1_FONTSDIR%%/fonts.scale %D/%%FONTSDIR%%/fonts.scale.org
+%%FONTSDIR%%/TrueType/lt1-b-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt1-bi-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt1-i-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt1-r-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt2-b-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt2-bi-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt2-i-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt2-r-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt3-b-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt3-bi-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt3-i-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt3-r-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt4-b-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt4-bi-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt4-i-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt4-r-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt5-b-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt5-bi-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt5-i-omega-serif.ttf
+%%FONTSDIR%%/TrueType/lt5-r-omega-serif.ttf
+%%FONTSDIR%%/TrueType/viscii-omega-serif.ttf
+%%FONTSDIR%%/Type1/lt1-b-omega-serif.afm
+%%FONTSDIR%%/Type1/lt1-b-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt1-b-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt1-bi-omega-serif.afm
+%%FONTSDIR%%/Type1/lt1-bi-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt1-bi-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt1-i-omega-serif.afm
+%%FONTSDIR%%/Type1/lt1-i-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt1-i-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt1-r-omega-serif.afm
+%%FONTSDIR%%/Type1/lt1-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt1-r-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt2-b-omega-serif.afm
+%%FONTSDIR%%/Type1/lt2-b-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt2-b-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt2-bi-omega-serif.afm
+%%FONTSDIR%%/Type1/lt2-bi-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt2-bi-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt2-i-omega-serif.afm
+%%FONTSDIR%%/Type1/lt2-i-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt2-i-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt2-r-omega-serif.afm
+%%FONTSDIR%%/Type1/lt2-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt2-r-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt3-b-omega-serif.afm
+%%FONTSDIR%%/Type1/lt3-b-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt3-b-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt3-bi-omega-serif.afm
+%%FONTSDIR%%/Type1/lt3-bi-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt3-bi-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt3-i-omega-serif.afm
+%%FONTSDIR%%/Type1/lt3-i-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt3-i-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt3-r-omega-serif.afm
+%%FONTSDIR%%/Type1/lt3-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt3-r-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt4-b-omega-serif.afm
+%%FONTSDIR%%/Type1/lt4-b-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt4-b-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt4-bi-omega-serif.afm
+%%FONTSDIR%%/Type1/lt4-bi-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt4-bi-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt4-i-omega-serif.afm
+%%FONTSDIR%%/Type1/lt4-i-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt4-i-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt4-r-omega-serif.afm
+%%FONTSDIR%%/Type1/lt4-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt4-r-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt5-b-omega-serif.afm
+%%FONTSDIR%%/Type1/lt5-b-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt5-b-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt5-bi-omega-serif.afm
+%%FONTSDIR%%/Type1/lt5-bi-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt5-bi-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt5-i-omega-serif.afm
+%%FONTSDIR%%/Type1/lt5-i-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt5-i-omega-serif.pfb
+%%FONTSDIR%%/Type1/lt5-r-omega-serif.afm
+%%FONTSDIR%%/Type1/lt5-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/lt5-r-omega-serif.pfb
+%%FONTSDIR%%/Type1/nf3.afm
+%%FONTSDIR%%/Type1/nf3.pfa
+%%FONTSDIR%%/Type1/nf3.pfb
+%%FONTSDIR%%/Type1/nf3i.afm
+%%FONTSDIR%%/Type1/nf3i.pfa
+%%FONTSDIR%%/Type1/nf3i.pfb
+%%FONTSDIR%%/Type1/tis620-r-omega-serif.afm
+%%FONTSDIR%%/Type1/tis620-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/tis620-r-omega-serif.pfb
+%%FONTSDIR%%/Type1/viscii-r-omega-serif.afm
+%%FONTSDIR%%/Type1/viscii-r-omega-serif.pfa
+%%FONTSDIR%%/Type1/viscii-r-omega-serif.pfb
 %%FONTSDIR%%/a18rk.pcf.gz
 %%FONTSDIR%%/a18rkb.pcf.gz
 %%FONTSDIR%%/a18rki.pcf.gz
@@ -39,6 +129,7 @@
 %%FONTSDIR%%/cyr24-etl.pcf.gz
 %%FONTSDIR%%/ethio16f-uni.pcf.gz
 %%FONTSDIR%%/ethio24f-uni.pcf.gz
+%%FONTSDIR%%/fonts.alias
 %%FONTSDIR%%/grk14-etl.pcf.gz
 %%FONTSDIR%%/grk16-etl.pcf.gz
 %%FONTSDIR%%/grk24-etl.pcf.gz
@@ -62,8 +153,8 @@
 %%FONTSDIR%%/j83-18b.pcf.gz
 %%FONTSDIR%%/j83-18i.pcf.gz
 %%FONTSDIR%%/j90-16.pcf.gz
-%%FONTSDIR%%/jiskan48.pcf.gz
 %%FONTSDIR%%/jiskan32.pcf.gz
+%%FONTSDIR%%/jiskan48.pcf.gz
 %%FONTSDIR%%/jksp16.pcf.gz
 %%FONTSDIR%%/jksp24.pcf.gz
 %%FONTSDIR%%/jksp40.pcf.gz
@@ -127,99 +218,6 @@
 %%FONTSDIR%%/visc24-etl.pcf.gz
 %%FONTSDIR%%/xtis18.pcf.gz
 %%FONTSDIR%%/xtis24.pcf.gz
-%%T1_FONTSDIR%%/lt1-b-omega-serif.afm
-%%T1_FONTSDIR%%/lt1-b-omega-serif.pfa
-%%T1_FONTSDIR%%/lt1-b-omega-serif.pfb
-%%T1_FONTSDIR%%/lt1-bi-omega-serif.afm
-%%T1_FONTSDIR%%/lt1-bi-omega-serif.pfa
-%%T1_FONTSDIR%%/lt1-bi-omega-serif.pfb
-%%T1_FONTSDIR%%/lt1-i-omega-serif.afm
-%%T1_FONTSDIR%%/lt1-i-omega-serif.pfa
-%%T1_FONTSDIR%%/lt1-i-omega-serif.pfb
-%%T1_FONTSDIR%%/lt1-r-omega-serif.afm
-%%T1_FONTSDIR%%/lt1-r-omega-serif.pfa
-%%T1_FONTSDIR%%/lt1-r-omega-serif.pfb
-%%T1_FONTSDIR%%/lt2-b-omega-serif.afm
-%%T1_FONTSDIR%%/lt2-b-omega-serif.pfa
-%%T1_FONTSDIR%%/lt2-b-omega-serif.pfb
-%%T1_FONTSDIR%%/lt2-bi-omega-serif.afm
-%%T1_FONTSDIR%%/lt2-bi-omega-serif.pfa
-%%T1_FONTSDIR%%/lt2-bi-omega-serif.pfb
-%%T1_FONTSDIR%%/lt2-i-omega-serif.afm
-%%T1_FONTSDIR%%/lt2-i-omega-serif.pfa
-%%T1_FONTSDIR%%/lt2-i-omega-serif.pfb
-%%T1_FONTSDIR%%/lt2-r-omega-serif.afm
-%%T1_FONTSDIR%%/lt2-r-omega-serif.pfa
-%%T1_FONTSDIR%%/lt2-r-omega-serif.pfb
-%%T1_FONTSDIR%%/lt3-b-omega-serif.afm
-%%T1_FONTSDIR%%/lt3-b-omega-serif.pfa
-%%T1_FONTSDIR%%/lt3-b-omega-serif.pfb
-%%T1_FONTSDIR%%/lt3-bi-omega-serif.afm
-%%T1_FONTSDIR%%/lt3-bi-omega-serif.pfa
-%%T1_FONTSDIR%%/lt3-bi-omega-serif.pfb
-%%T1_FONTSDIR%%/lt3-i-omega-serif.afm
-%%T1_FONTSDIR%%/lt3-i-omega-serif.pfa
-%%T1_FONTSDIR%%/lt3-i-omega-serif.pfb
-%%T1_FONTSDIR%%/lt3-r-omega-serif.afm
-%%T1_FONTSDIR%%/lt3-r-omega-serif.pfa
-%%T1_FONTSDIR%%/lt3-r-omega-serif.pfb
-%%T1_FONTSDIR%%/lt4-b-omega-serif.afm
-%%T1_FONTSDIR%%/lt4-b-omega-serif.pfa
-%%T1_FONTSDIR%%/lt4-b-omega-serif.pfb
-%%T1_FONTSDIR%%/lt4-bi-omega-serif.afm
-%%T1_FONTSDIR%%/lt4-bi-omega-serif.pfa
-%%T1_FONTSDIR%%/lt4-bi-omega-serif.pfb
-%%T1_FONTSDIR%%/lt4-i-omega-serif.afm
-%%T1_FONTSDIR%%/lt4-i-omega-serif.pfa
-%%T1_FONTSDIR%%/lt4-i-omega-serif.pfb
-%%T1_FONTSDIR%%/lt4-r-omega-serif.afm
-%%T1_FONTSDIR%%/lt4-r-omega-serif.pfa
-%%T1_FONTSDIR%%/lt4-r-omega-serif.pfb
-%%T1_FONTSDIR%%/lt5-b-omega-serif.afm
-%%T1_FONTSDIR%%/lt5-b-omega-serif.pfa
-%%T1_FONTSDIR%%/lt5-b-omega-serif.pfb
-%%T1_FONTSDIR%%/lt5-bi-omega-serif.afm
-%%T1_FONTSDIR%%/lt5-bi-omega-serif.pfa
-%%T1_FONTSDIR%%/lt5-bi-omega-serif.pfb
-%%T1_FONTSDIR%%/lt5-i-omega-serif.afm
-%%T1_FONTSDIR%%/lt5-i-omega-serif.pfa
-%%T1_FONTSDIR%%/lt5-i-omega-serif.pfb
-%%T1_FONTSDIR%%/lt5-r-omega-serif.afm
-%%T1_FONTSDIR%%/lt5-r-omega-serif.pfa
-%%T1_FONTSDIR%%/lt5-r-omega-serif.pfb
-%%T1_FONTSDIR%%/nf3.afm
-%%T1_FONTSDIR%%/nf3.pfa
-%%T1_FONTSDIR%%/nf3.pfb
-%%T1_FONTSDIR%%/nf3i.afm
-%%T1_FONTSDIR%%/nf3i.pfa
-%%T1_FONTSDIR%%/nf3i.pfb
-%%T1_FONTSDIR%%/tis620-r-omega-serif.afm
-%%T1_FONTSDIR%%/tis620-r-omega-serif.pfa
-%%T1_FONTSDIR%%/tis620-r-omega-serif.pfb
-%%T1_FONTSDIR%%/viscii-r-omega-serif.afm
-%%T1_FONTSDIR%%/viscii-r-omega-serif.pfa
-%%T1_FONTSDIR%%/viscii-r-omega-serif.pfb
-%%TT_FONTSDIR%%/lt1-b-omega-serif.ttf
-%%TT_FONTSDIR%%/lt1-bi-omega-serif.ttf
-%%TT_FONTSDIR%%/lt1-i-omega-serif.ttf
-%%TT_FONTSDIR%%/lt1-r-omega-serif.ttf
-%%TT_FONTSDIR%%/lt2-b-omega-serif.ttf
-%%TT_FONTSDIR%%/lt2-bi-omega-serif.ttf
-%%TT_FONTSDIR%%/lt2-i-omega-serif.ttf
-%%TT_FONTSDIR%%/lt2-r-omega-serif.ttf
-%%TT_FONTSDIR%%/lt3-b-omega-serif.ttf
-%%TT_FONTSDIR%%/lt3-bi-omega-serif.ttf
-%%TT_FONTSDIR%%/lt3-i-omega-serif.ttf
-%%TT_FONTSDIR%%/lt3-r-omega-serif.ttf
-%%TT_FONTSDIR%%/lt4-b-omega-serif.ttf
-%%TT_FONTSDIR%%/lt4-bi-omega-serif.ttf
-%%TT_FONTSDIR%%/lt4-i-omega-serif.ttf
-%%TT_FONTSDIR%%/lt4-r-omega-serif.ttf
-%%TT_FONTSDIR%%/lt5-b-omega-serif.ttf
-%%TT_FONTSDIR%%/lt5-bi-omega-serif.ttf
-%%TT_FONTSDIR%%/lt5-i-omega-serif.ttf
-%%TT_FONTSDIR%%/lt5-r-omega-serif.ttf
-%%TT_FONTSDIR%%/viscii-omega-serif.ttf
-%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/Emacs.ap
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README

More information about the svn-ports-head mailing list