Don't install the "ghostscript-fonts-std" part -- these are buggy and

do harm external applications. ghostscript itself doesn't need them
because it comes with its own standard font files, for the others
I've just added a "urw-fonts" pkg which contains better versions.

3 files changed, 6 insertions, 111 deletions

diff --git a/fonts/ghostscript-fonts/Makefile b/fonts/ghostscript-fonts/Makefile
index bdc14bec362..77d6355e5d9 100644
--- a/fonts/ghostscript-fonts/Makefile
+++ b/fonts/ghostscript-fonts/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.18 2008/03/10 12:34:10 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/02 19:09:25 drochner Exp $
 
 DISTNAME=		ghostscript-fonts-8.11
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		fonts
 MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=ghostscript/} \
 			ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/
-DISTFILES=		${GS_FONTS_STD} ${GS_FONTS_OTHER}
+DISTFILES=		${GS_FONTS_OTHER}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gs-fonts.sourceforge.net/
@@ -13,14 +13,6 @@ COMMENT=		Postscript fonts for Aladdin Ghostscript
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-#  Note: the following two are special files.  In the 5.50 directory
-#  on the FTP site, there are symlinks:
-#	ghostscript-fonts-other-5.50.tar.gz ->
-#		../fonts/ghostscript-fonts-other-4.40.tar.gz
-#  To avoid unnecessarily downloading distfiles, do not change these
-#  when upgrading the port unless the symlinks/files really change.
-#
-GS_FONTS_STD=		ghostscript-fonts-std-8.11.tar.gz
 GS_FONTS_OTHER=		ghostscript-fonts-other-6.0.tar.gz
 
 CONFLICTS=		ghostscript-[0-5]* ghostscript-x11-[0-5]*
@@ -37,15 +29,12 @@ INSTALLATION_DIRS=	share/ghostscript/fonts
 REQD_DIRS+=		share/ghostscript
 
 do-install:
-	for ext in afm gsf pfa pfb pfm;				\
+	for ext in afm gsf pfa pfm;				\
 	do							\
 		for f in ${WRKSRC}/*.$${ext};			\
 		do						\
 			${INSTALL_DATA} $${f} ${DESTDIR}${FONTS_DIR};	\
 		done;						\
 	done
-	${INSTALL_DATA} ${WRKSRC}/fonts.dir ${DESTDIR}${FONTS_DIR}
-	${INSTALL_DATA} ${WRKSRC}/fonts.scale ${DESTDIR}${FONTS_DIR}
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias ${DESTDIR}${FONTS_DIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/fonts/ghostscript-fonts/PLIST b/fonts/ghostscript-fonts/PLIST
index 06214a5ce9d..aba7d187849 100644
--- a/fonts/ghostscript-fonts/PLIST
+++ b/fonts/ghostscript-fonts/PLIST
@@ -1,28 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 19:01:14 joerg Exp $
-share/ghostscript/fonts/a010013l.afm
-share/ghostscript/fonts/a010013l.pfb
-share/ghostscript/fonts/a010013l.pfm
-share/ghostscript/fonts/a010015l.afm
-share/ghostscript/fonts/a010015l.pfb
-share/ghostscript/fonts/a010015l.pfm
-share/ghostscript/fonts/a010033l.afm
-share/ghostscript/fonts/a010033l.pfb
-share/ghostscript/fonts/a010033l.pfm
-share/ghostscript/fonts/a010035l.afm
-share/ghostscript/fonts/a010035l.pfb
-share/ghostscript/fonts/a010035l.pfm
-share/ghostscript/fonts/b018012l.afm
-share/ghostscript/fonts/b018012l.pfb
-share/ghostscript/fonts/b018012l.pfm
-share/ghostscript/fonts/b018015l.afm
-share/ghostscript/fonts/b018015l.pfb
-share/ghostscript/fonts/b018015l.pfm
-share/ghostscript/fonts/b018032l.afm
-share/ghostscript/fonts/b018032l.pfb
-share/ghostscript/fonts/b018032l.pfm
-share/ghostscript/fonts/b018035l.afm
-share/ghostscript/fonts/b018035l.pfb
-share/ghostscript/fonts/b018035l.pfm
+@comment $NetBSD: PLIST,v 1.7 2010/06/02 19:09:25 drochner Exp $
 share/ghostscript/fonts/bchb.afm
 share/ghostscript/fonts/bchb.pfa
 share/ghostscript/fonts/bchbi.afm
@@ -31,16 +7,6 @@ share/ghostscript/fonts/bchr.afm
 share/ghostscript/fonts/bchr.pfa
 share/ghostscript/fonts/bchri.afm
 share/ghostscript/fonts/bchri.pfa
-share/ghostscript/fonts/c059013l.afm
-share/ghostscript/fonts/c059013l.pfb
-share/ghostscript/fonts/c059016l.afm
-share/ghostscript/fonts/c059016l.pfb
-share/ghostscript/fonts/c059033l.afm
-share/ghostscript/fonts/c059033l.pfb
-share/ghostscript/fonts/c059036l.afm
-share/ghostscript/fonts/c059036l.pfb
-share/ghostscript/fonts/d050000l.afm
-share/ghostscript/fonts/d050000l.pfb
 share/ghostscript/fonts/fcyr.afm
 share/ghostscript/fonts/fcyr.gsf
 share/ghostscript/fonts/fcyri.afm
@@ -49,9 +15,6 @@ share/ghostscript/fonts/fhirw.gsf
 share/ghostscript/fonts/fhirw.pfm
 share/ghostscript/fonts/fkarw.gsf
 share/ghostscript/fonts/fkarw.pfm
-share/ghostscript/fonts/fonts.alias
-share/ghostscript/fonts/fonts.dir
-share/ghostscript/fonts/fonts.scale
 share/ghostscript/fonts/hrger.pfa
 share/ghostscript/fonts/hrgerb.gsf
 share/ghostscript/fonts/hrgerd.gsf
@@ -87,67 +50,13 @@ share/ghostscript/fonts/hrscs.pfa
 share/ghostscript/fonts/hrscsb.gsf
 share/ghostscript/fonts/hrscso.gsf
 share/ghostscript/fonts/hrsyr.gsf
-share/ghostscript/fonts/n019003l.afm
-share/ghostscript/fonts/n019003l.pfb
-share/ghostscript/fonts/n019003l.pfm
-share/ghostscript/fonts/n019004l.afm
-share/ghostscript/fonts/n019004l.pfb
-share/ghostscript/fonts/n019004l.pfm
-share/ghostscript/fonts/n019023l.afm
-share/ghostscript/fonts/n019023l.pfb
-share/ghostscript/fonts/n019023l.pfm
-share/ghostscript/fonts/n019024l.afm
-share/ghostscript/fonts/n019024l.pfb
-share/ghostscript/fonts/n019024l.pfm
-share/ghostscript/fonts/n019043l.afm
-share/ghostscript/fonts/n019043l.pfb
-share/ghostscript/fonts/n019044l.afm
-share/ghostscript/fonts/n019044l.pfb
-share/ghostscript/fonts/n019063l.afm
-share/ghostscript/fonts/n019063l.pfb
-share/ghostscript/fonts/n019064l.afm
-share/ghostscript/fonts/n019064l.pfb
-share/ghostscript/fonts/n019064l.pfm
-share/ghostscript/fonts/n021003l.afm
-share/ghostscript/fonts/n021003l.pfb
-share/ghostscript/fonts/n021003l.pfm
-share/ghostscript/fonts/n021004l.afm
-share/ghostscript/fonts/n021004l.pfb
-share/ghostscript/fonts/n021004l.pfm
-share/ghostscript/fonts/n021023l.afm
-share/ghostscript/fonts/n021023l.pfb
-share/ghostscript/fonts/n021023l.pfm
-share/ghostscript/fonts/n021024l.afm
-share/ghostscript/fonts/n021024l.pfb
-share/ghostscript/fonts/n021024l.pfm
-share/ghostscript/fonts/n022003l.afm
-share/ghostscript/fonts/n022003l.pfb
-share/ghostscript/fonts/n022004l.afm
-share/ghostscript/fonts/n022004l.pfb
-share/ghostscript/fonts/n022023l.afm
-share/ghostscript/fonts/n022023l.pfb
-share/ghostscript/fonts/n022024l.afm
-share/ghostscript/fonts/n022024l.pfb
-share/ghostscript/fonts/p052003l.afm
-share/ghostscript/fonts/p052003l.pfb
-share/ghostscript/fonts/p052004l.afm
-share/ghostscript/fonts/p052004l.pfb
-share/ghostscript/fonts/p052023l.afm
-share/ghostscript/fonts/p052023l.pfb
-share/ghostscript/fonts/p052024l.afm
-share/ghostscript/fonts/p052024l.pfb
 share/ghostscript/fonts/putb.pfa
 share/ghostscript/fonts/putbi.pfa
 share/ghostscript/fonts/putr.pfa
 share/ghostscript/fonts/putri.pfa
-share/ghostscript/fonts/s050000l.afm
-share/ghostscript/fonts/s050000l.pfb
 share/ghostscript/fonts/u003043t.afm
 share/ghostscript/fonts/u003043t.gsf
 share/ghostscript/fonts/u003043t.pfm
 share/ghostscript/fonts/u004006t.afm
 share/ghostscript/fonts/u004006t.gsf
 share/ghostscript/fonts/u004006t.pfm
-share/ghostscript/fonts/z003034l.afm
-share/ghostscript/fonts/z003034l.pfb
-share/ghostscript/fonts/z003034l.pfm
diff --git a/fonts/ghostscript-fonts/distinfo b/fonts/ghostscript-fonts/distinfo
index 334a9d25905..0c243aa8a15 100644
--- a/fonts/ghostscript-fonts/distinfo
+++ b/fonts/ghostscript-fonts/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.4 2005/05/30 14:54:00 dillo Exp $
+$NetBSD: distinfo,v 1.5 2010/06/02 19:09:25 drochner Exp $
 
-SHA1 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 2a7198e8178b2e7dba87cb5794da515200b568f5
-RMD160 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 10a19a10d0388bc084a7c1d3da845068d7169054
-Size (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 3752871 bytes
 SHA1 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = da62dfcb9c10d96743c7e30c1eebe7166489798c
 RMD160 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = ab60dbf71e7d91283a106c3df381cadfe173082f
 Size (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 796086 bytes