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

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

3 files changed, 22 insertions, 21 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}
diff --git a/x11-fonts/bitstream-vera/files/fonts.cache-1 b/x11-fonts/bitstream-vera/files/fonts.cache-1
new file mode 100644
index 000000000000..4edcc0f223d0
--- /dev/null
+++ b/x11-fonts/bitstream-vera/files/fonts.cache-1
@@ -0,0 +1,10 @@
+"tt2001gn.ttf" 0 "Bitstream Vera Sans:style=Roman:slant=0:weight=100:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2002gn.ttf" 0 "Bitstream Vera Sans:style=Oblique:slant=100:weight=100:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2003gn.ttf" 0 "Bitstream Vera Sans:style=Bold:slant=0:weight=200:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2004gn.ttf" 0 "Bitstream Vera Sans:style=Bold Oblique:slant=100:weight=200:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2005gn.ttf" 0 "Bitstream Vera Serif:style=Roman:slant=0:weight=100:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2007gn.ttf" 0 "Bitstream Vera Serif:style=Bold:slant=0:weight=200:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2009gn.ttf" 0 "Bitstream Vera Sans Mono:style=Roman:slant=0:weight=100:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2010gn.ttf" 0 "Bitstream Vera Sans Mono:style=Oblique:slant=100:weight=100:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2011gn.ttf" 0 "Bitstream Vera Sans Mono:style=Bold:slant=0:weight=200:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
+"tt2012gn.ttf" 0 "Bitstream Vera Sans Mono:style=Bold Oblique:slant=100:weight=200:index=0:outline=True:scalable=True:charset=  |>^1!|>^1!P0oWQ!!!!#|>^1!|>^1!|>^1!!!!%#gfN8.!!B7%ggR6OF3y?4!!K?&   !!!)$      9;*f! !!!.%     !!!)$!!!!# !!#0GM>RAd#y#fx!!!!5  !!!W?  !!#3H !!!!&      !!#6I<UKaX!!!?+!!!%#!!!!X    !!#AL      !!!1& !!+Qp!!!!*       !!+lx       P0oWR!!+u{!!!!)       :lang=aa|ast|ay|bi|br|ch|co|da|de|en|es|et|eu|fi|fj|fo|fr|fur|fy|gd|gl|gv|ho|ia|id|ie|io|is|it|lb|mg|nb|nl|nn|no|oc|om|pt|rm|sma|smj|so|sq|sv|sw|tn|tr|ts|vo|vot|wa|xh|yap|zu:fontversion=65537"
diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist
index ba5895099f0d..ec0b5991d6e1 100644
--- a/x11-fonts/bitstream-vera/pkg-plist
+++ b/x11-fonts/bitstream-vera/pkg-plist
@@ -1,5 +1,8 @@
-etc/fonts/local.conf
+@unexec if cmp -s %D/etc/fonts/local.conf %D/etc/fonts/local.conf-vera; then rm -f %D/etc/fonts/local.conf; fi
+etc/fonts/local.conf-vera
+@exec [ ! -f %B/local.conf ] && cp %B/%f %B/local.conf
 %%FONTSDIR%%/COPYRIGHT.TXT
+%%FONTSDIR%%/fonts.cache-1
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/tt2001gn.ttf
 %%FONTSDIR%%/tt2002gn.ttf
@@ -13,6 +16,4 @@ etc/fonts/local.conf
 %%FONTSDIR%%/tt2012gn.ttf
 %%PORTDOCS%%share/doc/bitstream-vera/Bitstream_Vera_Fonts_README.html
 %%PORTDOCS%%@dirrm share/doc/bitstream-vera
-@unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
 @dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v