don't install into /etc, use CONF_FILES instead, and put the file

where fontconfig finds it
bump PKGREV

4 files changed, 34 insertions, 6 deletions

diff --git a/fonts/font-bh-ttf/Makefile b/fonts/font-bh-ttf/Makefile
index 84223224e68..485b5ef6a27 100644
--- a/fonts/font-bh-ttf/Makefile
+++ b/fonts/font-bh-ttf/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2012/06/12 02:10:23 mef Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/31 18:15:14 drochner Exp $
 #
 
 DISTNAME=		font-bh-ttf-1.0.3
+PKGREVISION=		1
 CATEGORIES=		fonts
 MASTER_SITES=		${MASTER_SITE_XORG:=font/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,13 +14,16 @@ COMMENT=		Standard Bigelow & Holmes TrueType fonts
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		FCCACHE=${TOOLS_CMD.true:Q}
 
 FONTS_DIRS.ttf=		share/fonts/X11/TTF
 FONTS_DIRS.x11=		share/fonts/X11/TTF
 
 INSTALLATION_DIRS=	share/doc/font-bh-ttf
 
+PKG_SYSCONFSUBDIR=	fontconfig
+CONF_FILES=	${PREFIX}/share/fontconfig/conf.avail/42-luxi-mono.conf \
+		${PKG_SYSCONFDIR}/conf.d/42-luxi-mono.conf
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/font-bh-ttf
 
diff --git a/fonts/font-bh-ttf/PLIST b/fonts/font-bh-ttf/PLIST
index 1ca1355d286..c1edf23f436 100644
--- a/fonts/font-bh-ttf/PLIST
+++ b/fonts/font-bh-ttf/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2012/06/12 02:10:23 mef Exp $
-etc/fonts/conf.avail/42-luxi-mono.conf
-etc/fonts/conf.d/42-luxi-mono.conf
+@comment $NetBSD: PLIST,v 1.5 2012/07/31 18:15:14 drochner Exp $
 share/doc/font-bh-ttf/COPYING
+share/fontconfig/conf.avail/42-luxi-mono.conf
 share/fonts/X11/TTF/luximb.ttf
 share/fonts/X11/TTF/luximbi.ttf
 share/fonts/X11/TTF/luximr.ttf
diff --git a/fonts/font-bh-ttf/distinfo b/fonts/font-bh-ttf/distinfo
index 1ca0ffb4cfd..1ed98bf84b3 100644
--- a/fonts/font-bh-ttf/distinfo
+++ b/fonts/font-bh-ttf/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2012/06/12 02:10:23 mef Exp $
+$NetBSD: distinfo,v 1.4 2012/07/31 18:15:14 drochner Exp $
 
 SHA1 (font-bh-ttf-1.0.3.tar.bz2) = f42ebd527096011040a312e0f9cdf78d64177419
 RMD160 (font-bh-ttf-1.0.3.tar.bz2) = c38f33f78a6b82a6b6b5567c67c5ed3c9e668663
 Size (font-bh-ttf-1.0.3.tar.bz2) = 465351 bytes
+SHA1 (patch-aa) = 80c9cd9b188d716ae26e382a166866bd42c2a729
diff --git a/fonts/font-bh-ttf/patches/patch-aa b/fonts/font-bh-ttf/patches/patch-aa
new file mode 100644
index 00000000000..98992ad0d62
--- /dev/null
+++ b/fonts/font-bh-ttf/patches/patch-aa
@@ -0,0 +1,24 @@
+$NetBSD: patch-aa,v 1.1 2012/07/31 18:15:14 drochner Exp $
+
+--- Makefile.in.orig	2010-11-11 05:25:32.000000000 +0000
++++ Makefile.in
+@@ -250,7 +250,7 @@ FONT_FILES = \
+ fontdir = @FONTDIR@
+ font_DATA = $(FONT_FILES)
+ actualconfigdir = $(FC_CONFDIR)/conf.d
+-availconfigdir = $(FC_CONFDIR)/conf.avail
++availconfigdir = $(prefix)/share/fontconfig/conf.avail
+ dist_availconfig_DATA = 42-luxi-mono.conf
+ EXTRA_DIST = $(FONT_FILES) COPYRIGHT.BH
+ MAINTAINERCLEANFILES = ChangeLog INSTALL
+@@ -605,10 +605,6 @@ install-data-hook:
+ 	$(MKFONTSCALE) $(DESTDIR)$(fontdir)
+ 	@rm -f $(DESTDIR)$(fontdir)/font.dir
+ 	$(MKFONTDIR) $(DESTDIR)$(fontdir)
+-	mkdir -p $(DESTDIR)$(actualconfigdir)
+-	@rm -f $(DESTDIR)$(actualconfigdir)/$(dist_availconfig_DATA)
+-	ln -s ../conf.avail/$(dist_availconfig_DATA) $(DESTDIR)$(actualconfigdir)
+-	@RUN_FCCACHE@
+ 
+ distuninstallcheck:
+ 	@: