- The package other fonts doesn't have the trailing fonts/ path,

  so other-fonts were extracted into /usr/local/share/ghostscript
  instead of /usr/local/share/ghostscript/fonts
- Corrected PLIST file

2 files changed, 66 insertions, 64 deletions

diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index d0ce7d07f521..4024799942c5 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/06/11 06:20:46 andreas Exp $
 #
 
 DISTNAME=	ghostscript-5.0
@@ -55,8 +55,10 @@ do-configure:
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
-	(cd ${PREFIX}/share/ghostscript ; tar -xzf ${DISTDIR}/${GS_FONTS_STD})
-	(cd ${PREFIX}/share/ghostscript ; tar -xzf ${DISTDIR}/${GS_FONTS_OTHER})
+	(cd ${PREFIX}/share/ghostscript ; \
+			tar -xzf ${DISTDIR}/${GS_FONTS_STD})
+	(cd ${PREFIX}/share/ghostscript/fonts ; \
+			tar -xzf ${DISTDIR}/${GS_FONTS_OTHER})
 
 post-install:
 	strip ${PREFIX}/bin/gs
diff --git a/print/ghostscript6/pkg-plist b/print/ghostscript6/pkg-plist
index fca7ba799980..5b23666a2443 100644
--- a/print/ghostscript6/pkg-plist
+++ b/print/ghostscript6/pkg-plist
@@ -169,22 +169,6 @@ share/ghostscript/5.0/wftopfa.ps
 share/ghostscript/5.0/winmaps.ps
 share/ghostscript/5.0/wrfont.ps
 share/ghostscript/5.0/zeroline.ps
-share/ghostscript/bchb.afm
-share/ghostscript/bchb.pfa
-share/ghostscript/bchbi.afm
-share/ghostscript/bchbi.pfa
-share/ghostscript/bchr.afm
-share/ghostscript/bchr.pfa
-share/ghostscript/bchri.afm
-share/ghostscript/bchri.pfa
-share/ghostscript/fcyr.afm
-share/ghostscript/fcyr.gsf
-share/ghostscript/fcyri.afm
-share/ghostscript/fcyri.gsf
-share/ghostscript/fhirw.gsf
-share/ghostscript/fhirw.pfm
-share/ghostscript/fkarw.gsf
-share/ghostscript/fkarw.pfm
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -209,6 +193,14 @@ 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
@@ -224,6 +216,49 @@ 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/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
@@ -284,54 +319,19 @@ 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
-share/ghostscript/hrger.pfa
-share/ghostscript/hrgerb.gsf
-share/ghostscript/hrgerd.gsf
-share/ghostscript/hrgero.gsf
-share/ghostscript/hrgkc.gsf
-share/ghostscript/hrgks.gsf
-share/ghostscript/hrgrr.pfa
-share/ghostscript/hrgrrb.gsf
-share/ghostscript/hrgrro.gsf
-share/ghostscript/hritr.pfa
-share/ghostscript/hritrb.gsf
-share/ghostscript/hritro.gsf
-share/ghostscript/hrpld.pfa
-share/ghostscript/hrpldb.gsf
-share/ghostscript/hrpldbi.gsf
-share/ghostscript/hrpldi.pfa
-share/ghostscript/hrplr.gsf
-share/ghostscript/hrplrb.gsf
-share/ghostscript/hrplrbo.gsf
-share/ghostscript/hrplro.gsf
-share/ghostscript/hrpls.gsf
-share/ghostscript/hrplsb.gsf
-share/ghostscript/hrplsbo.gsf
-share/ghostscript/hrplso.gsf
-share/ghostscript/hrplt.pfa
-share/ghostscript/hrpltb.gsf
-share/ghostscript/hrpltbi.gsf
-share/ghostscript/hrplti.pfa
-share/ghostscript/hrscc.pfa
-share/ghostscript/hrsccb.gsf
-share/ghostscript/hrscco.gsf
-share/ghostscript/hrscs.pfa
-share/ghostscript/hrscsb.gsf
-share/ghostscript/hrscso.gsf
-share/ghostscript/hrsyr.gsf
-share/ghostscript/putb.pfa
-share/ghostscript/putbi.pfa
-share/ghostscript/putr.pfa
-share/ghostscript/putri.pfa
-share/ghostscript/u003043t.afm
-share/ghostscript/u003043t.gsf
-share/ghostscript/u003043t.pfm
-share/ghostscript/u004006t.afm
-share/ghostscript/u004006t.gsf
-share/ghostscript/u004006t.pfm