* Don't depend on fontconfig (instead, package fonts.cache-1 with the port)

* Only install local.conf if one doesn't already exist

1 files changed, 8 insertions, 18 deletions

diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index 69c58973fd26..d079680e7499 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	bitstream-vera
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
@@ -15,8 +16,6 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@freebsd.org
 COMMENT=	Bitstream Vera collection of 10 TrueType fonts
 
-BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
@@ -38,10 +37,6 @@ FONTSDIR?=	${PREFIX}/lib/X11/fonts/${FONTNAME}
 
 .SILENT:
 
-#
-# Post-patch
-#
-
 post-patch:
 	${SED} 's|%%FONTSDIR%%|${FONTSDIR}|g' ${MSG_FILE} > ${PKGMESSAGE}
 
@@ -55,11 +50,16 @@ install-fonts:
 	${MKDIR} ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
 	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
+	${INSTALL_DATA} ${FILESDIR}/fonts.cache-1 ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${FONTSDIR}
 
 install-conf:
 	${MKDIR} ${PREFIX}/etc/fonts
-	${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts
+	if [ ! -f ${PREFIX}/etc/fonts/local.conf ]; then \
+	    ${INSTALL_DATA} ${WRKSRC}/local.conf ${PREFIX}/etc/fonts ; \
+	fi
+	${INSTALL_DATA} ${WRKSRC}/local.conf \
+		${PREFIX}/etc/fonts/local.conf-vera
 
 install-docs:
 .if !defined(NOPORTDOCS)
@@ -67,17 +67,7 @@ install-docs:
 	${INSTALL_DATA} ${WRKSRC}/Bitstream_Vera_Fonts_README.html ${DOCSDIR}
 .endif
 
-#
-# Post-install
-#
-
-post-install: run-fc-cache display-message
-
-run-fc-cache:
-	${ECHO_MSG} "===> Running fc-cache"
-	-${X11BASE}/bin/fc-cache -f -v
-
-display-message:
+post-install:
 	${ECHO_MSG}
 	${CAT} ${PKGMESSAGE}
 	${ECHO_MSG}