svn commit: r360616 - head/x11-fonts/indic-ttf

Vanilla I. Shu vanilla at FreeBSD.org
Fri Jul 4 14:05:20 UTC 2014 

Author: vanilla
Date: Fri Jul  4 14:05:20 2014
New Revision: 360616
URL: http://svnweb.freebsd.org/changeset/ports/360616
QAT: https://qat.redports.org/buildarchive/r360616/

Log:
  1: Stagify.
  2: use @fcfontsdir.

Modified:
  head/x11-fonts/indic-ttf/Makefile
  head/x11-fonts/indic-ttf/pkg-plist

Modified: head/x11-fonts/indic-ttf/Makefile
==============================================================================
--- head/x11-fonts/indic-ttf/Makefile	Fri Jul  4 14:04:08 2014	(r360615)
+++ head/x11-fonts/indic-ttf/Makefile	Fri Jul  4 14:05:20 2014	(r360616)
@@ -36,18 +36,11 @@ PUNJABI_DESC=		PUNJABI font set
 TAMIL_DESC=		TAMIL font set
 TELUGU_DESC=		TELUGU font set
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 FONTSNAME=	${PORTNAME}
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTSNAME}
 
 CONFAVAILDIR?=	${PREFIX}/etc/fonts/conf.avail
 
-MKFONTSCALE?=	${LOCALBASE}/bin/mkfontscale
-MKFONTSDIR?=	${LOCALBASE}/bin/mkfontdir
-FCCACHE?=	${LOCALBASE}/bin/fc-cache -f -v
-
 PLIST_SUB=	FONTSDIR=${FONTSDIR:S|${PREFIX}/||} \
 		CONFAVAILDIR=${CONFAVAILDIR:S|${PREFIX}/||} \
 		FCCACHE='${FCCACHE}'
@@ -56,6 +49,8 @@ SUB_FILES=	pkg-message
 SUB_LIST=	FONTSDIR=${FONTSDIR} \
 		CONFAVAILDIR=${CONFAVAILDIR}
 
+.include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MBENGALI}
 FONTS=		bengali
 PLIST_SUB+=	BENGALI=''
@@ -126,24 +121,15 @@ do-install: install-fonts install-conf
 install-fonts:
 
 .for f in ${FONTS}
-	${MKDIR} ${FONTSDIR}/${f}
-	${INSTALL_DATA} ${WRKSRC}/ttf-${f}/*.ttf ${FONTSDIR}/${f}
-	${INSTALL_DATA} ${WRKSRC}/debian/ttf-${f}${PKGNAMESUFFIX}.copyright ${FONTSDIR}/${f}
-	${MKFONTSCALE} ${FONTSDIR}/${f} 2>/dev/null || ${TRUE}
-	${MKFONTSDIR} ${FONTSDIR}/${f} 2>/dev/null || ${TRUE}
+	${MKDIR} ${STAGEDIR}${FONTSDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/ttf-${f}/*.ttf ${STAGEDIR}${FONTSDIR}/${f}
+	${INSTALL_DATA} ${WRKSRC}/debian/ttf-${f}${PKGNAMESUFFIX}.copyright ${STAGEDIR}${FONTSDIR}/${f}
 .endfor
 
 install-conf:
-	${MKDIR} ${CONFAVAILDIR}
+	${MKDIR} ${STAGEDIR}${CONFAVAILDIR}
 .for f in ${FONTS}
-	${INSTALL_DATA} ${WRKSRC}/ttf-${f}/90-ttf-${f}${PKGNAMESUFFIX}.conf ${CONFAVAILDIR}/
+	${INSTALL_DATA} ${WRKSRC}/ttf-${f}/90-ttf-${f}${PKGNAMESUFFIX}.conf ${STAGEDIR}${CONFAVAILDIR}/
 .endfor
 
-post-install:
-	@${ECHO_MSG} "===> Running fc-cache"
-	-${FCCACHE} ${FONTSDIR}
-	@${ECHO_MSG}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_MSG}
-
 .include <bsd.port.mk>

Modified: head/x11-fonts/indic-ttf/pkg-plist
==============================================================================
--- head/x11-fonts/indic-ttf/pkg-plist	Fri Jul  4 14:04:08 2014	(r360615)
+++ head/x11-fonts/indic-ttf/pkg-plist	Fri Jul  4 14:05:20 2014	(r360616)
@@ -12,8 +12,6 @@
 %%BENGALI%%%%FONTSDIR%%/bengali/MuktiNarrow.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/MuktiNarrowBold.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/ani.ttf
-%%BENGALI%%%%FONTSDIR%%/bengali/fonts.dir
-%%BENGALI%%%%FONTSDIR%%/bengali/fonts.scale
 %%BENGALI%%%%FONTSDIR%%/bengali/lohit_as.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/lohit_bn.ttf
 %%BENGALI%%%%FONTSDIR%%/bengali/mitra.ttf
@@ -21,8 +19,6 @@
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/Samyak-Devanagari.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/Sarai_07.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/chandas1-2.ttf
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/fonts.dir
-%%DEVANAGARI%%%%FONTSDIR%%/devanagari/fonts.scale
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/gargi.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/kalimati.ttf
 %%DEVANAGARI%%%%FONTSDIR%%/devanagari/lohit_hi.ttf
@@ -39,8 +35,6 @@
 %%GUJARATI%%%%FONTSDIR%%/gujarati/Rekha.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/Samyak-Gujarati.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/aakar-medium.ttf
-%%GUJARATI%%%%FONTSDIR%%/gujarati/fonts.dir
-%%GUJARATI%%%%FONTSDIR%%/gujarati/fonts.scale
 %%GUJARATI%%%%FONTSDIR%%/gujarati/lohit_gu.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa-Bold.1.1.ttf
 %%GUJARATI%%%%FONTSDIR%%/gujarati/padmaa-Medium-0.5.ttf
@@ -54,8 +48,6 @@
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-i.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-n.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/Malige-t.ttf
-%%KANNADA%%%%FONTSDIR%%/kannada/fonts.dir
-%%KANNADA%%%%FONTSDIR%%/kannada/fonts.scale
 %%KANNADA%%%%FONTSDIR%%/kannada/lohit_kn.ttf
 %%KANNADA%%%%FONTSDIR%%/kannada/ttf-kannada-fonts.copyright
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/AnjaliOldLipi.ttf
@@ -65,43 +57,30 @@
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Rachana_04.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/RaghuMalayalamSans2.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/Samyak-Malayalam.ttf
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/fonts.dir
-%%MALAYALAM%%%%FONTSDIR%%/malayalam/fonts.scale
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/lohit_ml.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/suruma2.ttf
 %%MALAYALAM%%%%FONTSDIR%%/malayalam/ttf-malayalam-fonts.copyright
 %%ORIYA%%%%FONTSDIR%%/oriya/Samyak-Oriya.ttf
-%%ORIYA%%%%FONTSDIR%%/oriya/fonts.dir
-%%ORIYA%%%%FONTSDIR%%/oriya/fonts.scale
 %%ORIYA%%%%FONTSDIR%%/oriya/lohit_or.ttf
 %%ORIYA%%%%FONTSDIR%%/oriya/ttf-oriya-fonts.copyright
 %%ORIYA%%%%FONTSDIR%%/oriya/utkal.ttf
 %%PUNJABI%%%%FONTSDIR%%/punjabi/Saab.ttf
-%%PUNJABI%%%%FONTSDIR%%/punjabi/fonts.dir
-%%PUNJABI%%%%FONTSDIR%%/punjabi/fonts.scale
 %%PUNJABI%%%%FONTSDIR%%/punjabi/lohit_pa.ttf
 %%PUNJABI%%%%FONTSDIR%%/punjabi/ttf-punjabi-fonts.copyright
 %%TAMIL%%%%FONTSDIR%%/tamil/Samyak-Tamil.ttf
-%%TAMIL%%%%FONTSDIR%%/tamil/fonts.dir
-%%TAMIL%%%%FONTSDIR%%/tamil/fonts.scale
 %%TAMIL%%%%FONTSDIR%%/tamil/lohit_ta.ttf
 %%TAMIL%%%%FONTSDIR%%/tamil/ttf-tamil-fonts.copyright
 %%TELUGU%%%%FONTSDIR%%/telugu/Pothana2000.ttf
 %%TELUGU%%%%FONTSDIR%%/telugu/Vemana.ttf
-%%TELUGU%%%%FONTSDIR%%/telugu/fonts.dir
-%%TELUGU%%%%FONTSDIR%%/telugu/fonts.scale
 %%TELUGU%%%%FONTSDIR%%/telugu/lohit_te.ttf
 %%TELUGU%%%%FONTSDIR%%/telugu/ttf-telugu-fonts.copyright
-%%TELUGU%%@dirrm %%FONTSDIR%%/telugu
-%%TAMIL%%@dirrm %%FONTSDIR%%/tamil
-%%PUNJABI%%@dirrm %%FONTSDIR%%/punjabi
-%%ORIYA%%@dirrm %%FONTSDIR%%/oriya
-%%MALAYALAM%%@dirrm %%FONTSDIR%%/malayalam
-%%KANNADA%%@dirrm %%FONTSDIR%%/kannada
-%%GUJARATI%%@dirrm %%FONTSDIR%%/gujarati
-%%DEVANAGARI%%@dirrm %%FONTSDIR%%/devanagari
-%%BENGALI%%@dirrm %%FONTSDIR%%/bengali
- at exec %%FCCACHE%% %D/%%FONTSDIR%% 2>/dev/null || true
- at unexec rm %D/%%FONTSDIR%%/fonts.cache-2 2>/dev/null || true
+%%TELUGU%%@fcfontsdir %%FONTSDIR%%/telugu
+%%TAMIL%%@fcfontsdir %%FONTSDIR%%/tamil
+%%PUNJABI%%@fcfontsdir %%FONTSDIR%%/punjabi
+%%ORIYA%%@fcfontsdir %%FONTSDIR%%/oriya
+%%MALAYALAM%%@fcfontsdir %%FONTSDIR%%/malayalam
+%%KANNADA%%@fcfontsdir %%FONTSDIR%%/kannada
+%%GUJARATI%%@fcfontsdir %%FONTSDIR%%/gujarati
+%%DEVANAGARI%%@fcfontsdir %%FONTSDIR%%/devanagari
+%%BENGALI%%@fcfontsdir %%FONTSDIR%%/bengali
 @dirrm %%FONTSDIR%%
- at unexec %%FCCACHE%% %D/%%FONTSDIR%% 2>/dev/null || true

More information about the svn-ports-head mailing list