From ba229588b8d43845079f5052d27e55e988043649 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Sat, 24 Mar 2007 20:40:54 +0000
Subject: Do not install config file as these fonts will automatically be
 loaded with fontconfig-2.4.2.  By installing the config file, it is no longer
 possible to override Bitstream fonts in the users ~/.fonts.conf file.

PR:		110544
Submitted by:	NIIMI Satoshi <sa2c@sa2c.net>
---
 x11-fonts/bitstream-vera/Makefile  | 9 ++-------
 x11-fonts/bitstream-vera/pkg-plist | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

(limited to 'x11-fonts/bitstream-vera')

diff --git a/x11-fonts/bitstream-vera/Makefile b/x11-fonts/bitstream-vera/Makefile
index cf6758b27ebd..0124e6f85e53 100644
--- a/x11-fonts/bitstream-vera/Makefile
+++ b/x11-fonts/bitstream-vera/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	bitstream-vera
 PORTVERSION=	1.10
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11-fonts
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/ttf-${PORTNAME}/1.10
@@ -50,7 +50,7 @@ post-patch:
 # Install
 #
 
-do-install: install-fonts install-conf install-docs
+do-install: install-fonts install-docs
 
 install-fonts:
 	${MKDIR} ${FONTSDIR}
@@ -58,11 +58,6 @@ install-fonts:
 	${INSTALL_DATA} ${FILESDIR}/fonts.dir ${FONTSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYRIGHT.TXT ${FONTSDIR}
 
-install-conf:
-	${MKDIR} ${PREFIX}/etc/fonts/conf.d
-	${INSTALL_DATA} ${WRKSRC}/local.conf \
-		${PREFIX}/etc/fonts/conf.d/0.vera.conf
-
 install-docs:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
diff --git a/x11-fonts/bitstream-vera/pkg-plist b/x11-fonts/bitstream-vera/pkg-plist
index 30445c503b4f..2298a6be2f44 100644
--- a/x11-fonts/bitstream-vera/pkg-plist
+++ b/x11-fonts/bitstream-vera/pkg-plist
@@ -1,4 +1,3 @@
-etc/fonts/conf.d/0.vera.conf
 %%FONTSDIR%%/COPYRIGHT.TXT
 %%FONTSDIR%%/fonts.dir
 %%FONTSDIR%%/Vera.ttf
-- 
cgit