Looks like we do need fc-cache since the cache files seem to vary slightly

from machine to machine.

3 files changed, 7 insertions, 13 deletions

diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index d079680e749..e441f3dd061 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bitstream-vera
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.0
@@ -16,6 +16,8 @@ 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
@@ -50,7 +52,6 @@ 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:
@@ -68,6 +69,8 @@ install-docs:
 .endif
 
 post-install:
+	${ECHO_MSG} "===> Running fc-cache"
+	-${X11BASE}/bin/fc-cache -f -v
 	${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
deleted file mode 100644
index 4edcc0f223d..00000000000
--- a/x11-fonts/bitstream-vera/files/fonts.cache-1
+++ /dev/null
@@ -1,10 +0,0 @@
-"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 ec0b5991d6e..8d7e5e77e39 100644
--- a/x11-fonts/bitstream-vera/pkg-plist
+++ b/x11-fonts/bitstream-vera/pkg-plist
@@ -2,7 +2,6 @@
 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
@@ -16,4 +15,6 @@ etc/fonts/local.conf-vera
 %%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 || /usr/bin/true