Move ghostscript-fonts from print to fonts.

9 files changed, 7 insertions, 228 deletions

diff --git a/fonts/Makefile b/fonts/Makefile
index 110433787db..db76ba61d70 100644
--- a/fonts/Makefile
+++ b/fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/03/13 14:15:55 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2001/04/03 14:47:15 wiz Exp $
 #
 
 COMMENT=	Fonts
@@ -10,6 +10,7 @@ SUBDIR+=	acroread-font-share
 SUBDIR+=	acroread-jpnfont
 SUBDIR+=	acroread-korfont
 SUBDIR+=	freefonts
+SUBDIR+=	ghostscript-fonts
 SUBDIR+=	intlfonts
 SUBDIR+=	jisx0208fonts
 SUBDIR+=	jisx0212fonts
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index 39484898556..34cf6d1ce41 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2001/03/28 11:26:09 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2001/04/03 14:47:16 wiz Exp $
 # FreeBSD Id: Makefile,v 1.12 1998/03/11 03:08:12 vanilla Exp
 # 
 
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.foolabs.com/xpdf/
 COMMENT=	Display tool for PDF files
 
 DEPENDS+=	freetype-lib-1.3.1:../../graphics/freetype
-DEPENDS+=	ghostscript-fonts-*:../../print/ghostscript-fonts
+DEPENDS+=	ghostscript-fonts-*:../../fonts/ghostscript-fonts
 DEPENDS+=	t1lib>=1.0.1:../../textproc/t1lib
 
 CONFLICTS=	xpdf-crypto-*
diff --git a/print/Makefile b/print/Makefile
index a9c8bc45679..e9be62e7591 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2001/02/16 15:51:52 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2001/04/03 14:47:15 wiz Exp $
 #
 
 COMMENT=	Desktop publishing
@@ -17,7 +17,6 @@ SUBDIR+=	dvidvi
 SUBDIR+=	enscript
 SUBDIR+=	ggv
 SUBDIR+=	ghostscript
-SUBDIR+=	ghostscript-fonts
 SUBDIR+=	ghostscript-nox11
 SUBDIR+=	gnome-print
 SUBDIR+=	gv
diff --git a/print/ghostscript-fonts/Makefile b/print/ghostscript-fonts/Makefile
deleted file mode 100644
index 813c79698f8..00000000000
--- a/print/ghostscript-fonts/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# $NetBSD: Makefile,v 1.4 2001/02/17 17:51:42 wiz Exp $
-
-DISTNAME=		ghostscript-fonts-6.0
-CATEGORIES=		print
-MASTER_SITES+=		${MASTER_SITE_SOURCEFORGE:=gsfonts/} \
-			ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/
-DISTFILES=		${GS_FONTS_STD} ${GS_FONTS_OTHER}
-
-MAINTAINER=		jlam@netbsd.org
-HOMEPAGE=		http://gs-fonts.sourceforge.net/
-COMMENT=		Postscript fonts for Aladdin Ghostscript
-
-#  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-6.0.tar.gz
-GS_FONTS_OTHER=		ghostscript-fonts-other-6.0.tar.gz
-
-CONFLICTS=		ghostscript-[0-5]* ghostscript-x11-[0-5]*
-
-DIST_SUBDIR=		ghostscript
-EXTRACT_ONLY=		# empty
-NO_PATCH=		# defined
-NO_CONFIGURE=		# defined
-NO_BUILD=		# defined
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/ghostscript
-	cd ${PREFIX}/share/ghostscript; \
-		${PAX} -zrf ${_DISTDIR}/${GS_FONTS_STD}; \
-		${PAX} -zrf ${_DISTDIR}/${GS_FONTS_OTHER}
-	${INSTALL_DATA} ${FILESDIR}/fonts.alias \
-		${PREFIX}/share/ghostscript/fonts/
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/ghostscript
-	${CHMOD} -R a-w ${PREFIX}/share/ghostscript
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript-fonts/files/fonts.alias b/print/ghostscript-fonts/files/fonts.alias
deleted file mode 100644
index b60770469ed..00000000000
--- a/print/ghostscript-fonts/files/fonts.alias
+++ /dev/null
@@ -1 +0,0 @@
--URW-zapfdingbats-medium-r-normal--0-0-0-0-p-0-urw-fontspecific -URW-Dingbats-medium-r-normal--0-0-0-0-p-0-urw-fontspecific
diff --git a/print/ghostscript-fonts/files/md5 b/print/ghostscript-fonts/files/md5
deleted file mode 100644
index 0d122138384..00000000000
--- a/print/ghostscript-fonts/files/md5
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: md5,v 1.1.1.1 2000/05/07 02:03:38 jlam Exp $
-
-MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-MD5 (ghostscript/ghostscript-fonts-std-6.0.tar.gz) = 8250132d6fcc6eb1419f505f06c7690b
diff --git a/print/ghostscript-fonts/pkg/DESCR b/print/ghostscript-fonts/pkg/DESCR
deleted file mode 100644
index 14c7efdeed2..00000000000
--- a/print/ghostscript-fonts/pkg/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Fonts and font metrics customarily distributed with Ghostscript.
-Currently includes the 35 standard PostScript fonts and a grab-bag
-of others.
diff --git a/print/ghostscript-fonts/pkg/PLIST b/print/ghostscript-fonts/pkg/PLIST
deleted file mode 100644
index 2c7f2f54d4b..00000000000
--- a/print/ghostscript-fonts/pkg/PLIST
+++ /dev/null
@@ -1,172 +0,0 @@
-@comment $NetBSD: PLIST,v 1.2 2000/08/21 15:08:55 fredb 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
-share/ghostscript/fonts/bchb.afm
-share/ghostscript/fonts/bchb.pfa
-share/ghostscript/fonts/bchbi.afm
-share/ghostscript/fonts/bchbi.pfa
-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/c059013l.pfm
-share/ghostscript/fonts/c059016l.afm
-share/ghostscript/fonts/c059016l.pfb
-share/ghostscript/fonts/c059016l.pfm
-share/ghostscript/fonts/c059033l.afm
-share/ghostscript/fonts/c059033l.pfb
-share/ghostscript/fonts/c059033l.pfm
-share/ghostscript/fonts/c059036l.afm
-share/ghostscript/fonts/c059036l.pfb
-share/ghostscript/fonts/c059036l.pfm
-share/ghostscript/fonts/d050000l.afm
-share/ghostscript/fonts/d050000l.pfb
-share/ghostscript/fonts/d050000l.pfm
-share/ghostscript/fonts/fcyr.afm
-share/ghostscript/fonts/fcyr.gsf
-share/ghostscript/fonts/fcyri.afm
-share/ghostscript/fonts/fcyri.gsf
-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
-share/ghostscript/fonts/hrgero.gsf
-share/ghostscript/fonts/hrgkc.gsf
-share/ghostscript/fonts/hrgks.gsf
-share/ghostscript/fonts/hrgrr.pfa
-share/ghostscript/fonts/hrgrrb.gsf
-share/ghostscript/fonts/hrgrro.gsf
-share/ghostscript/fonts/hritr.pfa
-share/ghostscript/fonts/hritrb.gsf
-share/ghostscript/fonts/hritro.gsf
-share/ghostscript/fonts/hrpld.pfa
-share/ghostscript/fonts/hrpldb.gsf
-share/ghostscript/fonts/hrpldbi.gsf
-share/ghostscript/fonts/hrpldi.pfa
-share/ghostscript/fonts/hrplr.gsf
-share/ghostscript/fonts/hrplrb.gsf
-share/ghostscript/fonts/hrplrbo.gsf
-share/ghostscript/fonts/hrplro.gsf
-share/ghostscript/fonts/hrpls.gsf
-share/ghostscript/fonts/hrplsb.gsf
-share/ghostscript/fonts/hrplsbo.gsf
-share/ghostscript/fonts/hrplso.gsf
-share/ghostscript/fonts/hrplt.pfa
-share/ghostscript/fonts/hrpltb.gsf
-share/ghostscript/fonts/hrpltbi.gsf
-share/ghostscript/fonts/hrplti.pfa
-share/ghostscript/fonts/hrscc.pfa
-share/ghostscript/fonts/hrsccb.gsf
-share/ghostscript/fonts/hrscco.gsf
-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/n019043l.pfm
-share/ghostscript/fonts/n019044l.afm
-share/ghostscript/fonts/n019044l.pfb
-share/ghostscript/fonts/n019044l.pfm
-share/ghostscript/fonts/n019063l.afm
-share/ghostscript/fonts/n019063l.pfb
-share/ghostscript/fonts/n019063l.pfm
-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/n022003l.pfm
-share/ghostscript/fonts/n022004l.afm
-share/ghostscript/fonts/n022004l.pfb
-share/ghostscript/fonts/n022004l.pfm
-share/ghostscript/fonts/n022023l.afm
-share/ghostscript/fonts/n022023l.pfb
-share/ghostscript/fonts/n022023l.pfm
-share/ghostscript/fonts/n022024l.afm
-share/ghostscript/fonts/n022024l.pfb
-share/ghostscript/fonts/n022024l.pfm
-share/ghostscript/fonts/p052003l.afm
-share/ghostscript/fonts/p052003l.pfb
-share/ghostscript/fonts/p052003l.pfm
-share/ghostscript/fonts/p052004l.afm
-share/ghostscript/fonts/p052004l.pfb
-share/ghostscript/fonts/p052004l.pfm
-share/ghostscript/fonts/p052023l.afm
-share/ghostscript/fonts/p052023l.pfb
-share/ghostscript/fonts/p052023l.pfm
-share/ghostscript/fonts/p052024l.afm
-share/ghostscript/fonts/p052024l.pfb
-share/ghostscript/fonts/p052024l.pfm
-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/s050000l.pfm
-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
-@dirrm share/ghostscript/fonts
-@dirrm share/ghostscript
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 4b2041c7a9a..62a74ae6c8c 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2001/03/27 03:20:13 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.7 2001/04/03 14:47:18 wiz Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -10,7 +10,7 @@ EXTRACT_SUFX=		.tar.bz2
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://www.cs.wisc.edu/~ghost/index.html
 
-DEPENDS+=		ghostscript-fonts-6.0:../../print/ghostscript-fonts
+DEPENDS+=		ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 DEPENDS+=		ja-vflib-lib-2.*:../../japanese/vflib-lib
 DEPENDS+=		watanabe-vfont-19930318:../../fonts/watanabe_vfont
 DEPENDS+=		png>=1.0.6:../../graphics/png