Remove ghostscript-fonts and Add dependency on print/gsfonts.

PR:		ports/67596
Submitted by:	Jose M Rodriguez <freebsd@wanadoo.es>

12 files changed, 6 insertions, 510 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index 9ed0fa90da7e..db34984a3587 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -22,15 +22,12 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/:gs_fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
 			./:ports_jp
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
-		${GS_FONTS_STD}:gs_fonts \
-		${GS_FONTS_OTHER}:gs_fonts \
 		${HP8XX_SRCS}:hp8xx \
 		${DJ970_SRCS}:dj970 \
 		${MD2K_SRCS}:md2k \
@@ -54,6 +51,7 @@ COMMENT=	AFPL Postscript interpreter
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/gs/fonts.dir:${PORTSDIR}/print/gsfonts
 
 NO_CDROM=	"Can only be distributed for free"
 
@@ -115,8 +113,6 @@ PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
-GS_FONTS_STD=	ghostscript-fonts-std-8.11.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
@@ -439,9 +435,6 @@ pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
-	${ECHO_MSG} ">>>   extracting ghostscript fonts ..."
-	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
 post-install:
diff --git a/print/ghostscript-afpl/Makefile.inc b/print/ghostscript-afpl/Makefile.inc
index 92d8fe12cb12..55bbe5bc77bd 100644
--- a/print/ghostscript-afpl/Makefile.inc
+++ b/print/ghostscript-afpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.14
-GS_REVISION=	0
+GS_REVISION=	1
 GS_EPOCH=	1
diff --git a/print/ghostscript-afpl/distinfo b/print/ghostscript-afpl/distinfo
index 71090b4b4a81..f5784aa8d1d6 100644
--- a/print/ghostscript-afpl/distinfo
+++ b/print/ghostscript-afpl/distinfo
@@ -1,9 +1,5 @@
 MD5 (ghostscript/ghostscript-8.14.tar.bz2) = 5f22dbe24b7fc8c8c07e249f8b14f9ce
 SIZE (ghostscript/ghostscript-8.14.tar.bz2) = 5719617
-MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 6865682b095f8c4500c54b285ff05ef6
-SIZE (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 3752871
-MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-SIZE (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 796086
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript-afpl/pkg-plist b/print/ghostscript-afpl/pkg-plist
index 2f370c101361..d3f2b6adb574 100644
--- a/print/ghostscript-afpl/pkg-plist
+++ b/print/ghostscript-afpl/pkg-plist
@@ -408,163 +408,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
-%%DATADIR%%/fonts/COPYING
-%%DATADIR%%/fonts/ChangeLog
-%%DATADIR%%/fonts/README
-%%DATADIR%%/fonts/README.tweaks
-%%DATADIR%%/fonts/TODO
-%%DATADIR%%/fonts/a010013l.afm
-%%DATADIR%%/fonts/a010013l.pfb
-%%DATADIR%%/fonts/a010013l.pfm
-%%DATADIR%%/fonts/a010015l.afm
-%%DATADIR%%/fonts/a010015l.pfb
-%%DATADIR%%/fonts/a010015l.pfm
-%%DATADIR%%/fonts/a010033l.afm
-%%DATADIR%%/fonts/a010033l.pfb
-%%DATADIR%%/fonts/a010033l.pfm
-%%DATADIR%%/fonts/a010035l.afm
-%%DATADIR%%/fonts/a010035l.pfb
-%%DATADIR%%/fonts/a010035l.pfm
-%%DATADIR%%/fonts/b018012l.afm
-%%DATADIR%%/fonts/b018012l.pfb
-%%DATADIR%%/fonts/b018012l.pfm
-%%DATADIR%%/fonts/b018015l.afm
-%%DATADIR%%/fonts/b018015l.pfb
-%%DATADIR%%/fonts/b018015l.pfm
-%%DATADIR%%/fonts/b018032l.afm
-%%DATADIR%%/fonts/b018032l.pfb
-%%DATADIR%%/fonts/b018032l.pfm
-%%DATADIR%%/fonts/b018035l.afm
-%%DATADIR%%/fonts/b018035l.pfb
-%%DATADIR%%/fonts/b018035l.pfm
-%%DATADIR%%/fonts/bchb.afm
-%%DATADIR%%/fonts/bchb.pfa
-%%DATADIR%%/fonts/bchbi.afm
-%%DATADIR%%/fonts/bchbi.pfa
-%%DATADIR%%/fonts/bchr.afm
-%%DATADIR%%/fonts/bchr.pfa
-%%DATADIR%%/fonts/bchri.afm
-%%DATADIR%%/fonts/bchri.pfa
-%%DATADIR%%/fonts/c059013l.afm
-%%DATADIR%%/fonts/c059013l.pfb
-%%DATADIR%%/fonts/c059016l.afm
-%%DATADIR%%/fonts/c059016l.pfb
-%%DATADIR%%/fonts/c059033l.afm
-%%DATADIR%%/fonts/c059033l.pfb
-%%DATADIR%%/fonts/c059036l.afm
-%%DATADIR%%/fonts/c059036l.pfb
-%%DATADIR%%/fonts/d050000l.afm
-%%DATADIR%%/fonts/d050000l.pfb
-%%DATADIR%%/fonts/fcyr.afm
-%%DATADIR%%/fonts/fcyr.gsf
-%%DATADIR%%/fonts/fcyri.afm
-%%DATADIR%%/fonts/fcyri.gsf
-%%DATADIR%%/fonts/fhirw.gsf
-%%DATADIR%%/fonts/fhirw.pfm
-%%DATADIR%%/fonts/fkarw.gsf
-%%DATADIR%%/fonts/fkarw.pfm
-%%DATADIR%%/fonts/fonts.dir
-%%DATADIR%%/fonts/fonts.scale
-%%DATADIR%%/fonts/hrger.pfa
-%%DATADIR%%/fonts/hrgerb.gsf
-%%DATADIR%%/fonts/hrgerd.gsf
-%%DATADIR%%/fonts/hrgero.gsf
-%%DATADIR%%/fonts/hrgkc.gsf
-%%DATADIR%%/fonts/hrgks.gsf
-%%DATADIR%%/fonts/hrgrr.pfa
-%%DATADIR%%/fonts/hrgrrb.gsf
-%%DATADIR%%/fonts/hrgrro.gsf
-%%DATADIR%%/fonts/hritr.pfa
-%%DATADIR%%/fonts/hritrb.gsf
-%%DATADIR%%/fonts/hritro.gsf
-%%DATADIR%%/fonts/hrpld.pfa
-%%DATADIR%%/fonts/hrpldb.gsf
-%%DATADIR%%/fonts/hrpldbi.gsf
-%%DATADIR%%/fonts/hrpldi.pfa
-%%DATADIR%%/fonts/hrplr.gsf
-%%DATADIR%%/fonts/hrplrb.gsf
-%%DATADIR%%/fonts/hrplrbo.gsf
-%%DATADIR%%/fonts/hrplro.gsf
-%%DATADIR%%/fonts/hrpls.gsf
-%%DATADIR%%/fonts/hrplsb.gsf
-%%DATADIR%%/fonts/hrplsbo.gsf
-%%DATADIR%%/fonts/hrplso.gsf
-%%DATADIR%%/fonts/hrplt.pfa
-%%DATADIR%%/fonts/hrpltb.gsf
-%%DATADIR%%/fonts/hrpltbi.gsf
-%%DATADIR%%/fonts/hrplti.pfa
-%%DATADIR%%/fonts/hrscc.pfa
-%%DATADIR%%/fonts/hrsccb.gsf
-%%DATADIR%%/fonts/hrscco.gsf
-%%DATADIR%%/fonts/hrscs.pfa
-%%DATADIR%%/fonts/hrscsb.gsf
-%%DATADIR%%/fonts/hrscso.gsf
-%%DATADIR%%/fonts/hrsyr.gsf
-%%DATADIR%%/fonts/n019003l.afm
-%%DATADIR%%/fonts/n019003l.pfb
-%%DATADIR%%/fonts/n019003l.pfm
-%%DATADIR%%/fonts/n019004l.afm
-%%DATADIR%%/fonts/n019004l.pfb
-%%DATADIR%%/fonts/n019004l.pfm
-%%DATADIR%%/fonts/n019023l.afm
-%%DATADIR%%/fonts/n019023l.pfb
-%%DATADIR%%/fonts/n019023l.pfm
-%%DATADIR%%/fonts/n019024l.afm
-%%DATADIR%%/fonts/n019024l.pfb
-%%DATADIR%%/fonts/n019024l.pfm
-%%DATADIR%%/fonts/n019043l.afm
-%%DATADIR%%/fonts/n019043l.pfb
-%%DATADIR%%/fonts/n019044l.afm
-%%DATADIR%%/fonts/n019044l.pfb
-%%DATADIR%%/fonts/n019063l.afm
-%%DATADIR%%/fonts/n019063l.pfb
-%%DATADIR%%/fonts/n019064l.afm
-%%DATADIR%%/fonts/n019064l.pfb
-%%DATADIR%%/fonts/n019064l.pfm
-%%DATADIR%%/fonts/n021003l.afm
-%%DATADIR%%/fonts/n021003l.pfb
-%%DATADIR%%/fonts/n021003l.pfm
-%%DATADIR%%/fonts/n021004l.afm
-%%DATADIR%%/fonts/n021004l.pfb
-%%DATADIR%%/fonts/n021004l.pfm
-%%DATADIR%%/fonts/n021023l.afm
-%%DATADIR%%/fonts/n021023l.pfb
-%%DATADIR%%/fonts/n021023l.pfm
-%%DATADIR%%/fonts/n021024l.afm
-%%DATADIR%%/fonts/n021024l.pfb
-%%DATADIR%%/fonts/n021024l.pfm
-%%DATADIR%%/fonts/n022003l.afm
-%%DATADIR%%/fonts/n022003l.pfb
-%%DATADIR%%/fonts/n022004l.afm
-%%DATADIR%%/fonts/n022004l.pfb
-%%DATADIR%%/fonts/n022023l.afm
-%%DATADIR%%/fonts/n022023l.pfb
-%%DATADIR%%/fonts/n022024l.afm
-%%DATADIR%%/fonts/n022024l.pfb
-%%DATADIR%%/fonts/p052003l.afm
-%%DATADIR%%/fonts/p052003l.pfb
-%%DATADIR%%/fonts/p052004l.afm
-%%DATADIR%%/fonts/p052004l.pfb
-%%DATADIR%%/fonts/p052023l.afm
-%%DATADIR%%/fonts/p052023l.pfb
-%%DATADIR%%/fonts/p052024l.afm
-%%DATADIR%%/fonts/p052024l.pfb
-%%DATADIR%%/fonts/putb.pfa
-%%DATADIR%%/fonts/putbi.pfa
-%%DATADIR%%/fonts/putr.pfa
-%%DATADIR%%/fonts/putri.pfa
-%%DATADIR%%/fonts/s050000l.afm
-%%DATADIR%%/fonts/s050000l.pfb
-%%DATADIR%%/fonts/u003043t.afm
-%%DATADIR%%/fonts/u003043t.gsf
-%%DATADIR%%/fonts/u003043t.pfm
-%%DATADIR%%/fonts/u004006t.afm
-%%DATADIR%%/fonts/u004006t.gsf
-%%DATADIR%%/fonts/u004006t.pfm
-%%DATADIR%%/fonts/z003034l.afm
-%%DATADIR%%/fonts/z003034l.pfb
-%%DATADIR%%/fonts/z003034l.pfm
-@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index 9ed0fa90da7e..db34984a3587 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -22,15 +22,12 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/:gs_fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
 			./:ports_jp
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
-		${GS_FONTS_STD}:gs_fonts \
-		${GS_FONTS_OTHER}:gs_fonts \
 		${HP8XX_SRCS}:hp8xx \
 		${DJ970_SRCS}:dj970 \
 		${MD2K_SRCS}:md2k \
@@ -54,6 +51,7 @@ COMMENT=	AFPL Postscript interpreter
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/gs/fonts.dir:${PORTSDIR}/print/gsfonts
 
 NO_CDROM=	"Can only be distributed for free"
 
@@ -115,8 +113,6 @@ PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
-GS_FONTS_STD=	ghostscript-fonts-std-8.11.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
@@ -439,9 +435,6 @@ pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
-	${ECHO_MSG} ">>>   extracting ghostscript fonts ..."
-	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
 post-install:
diff --git a/print/ghostscript-gpl/Makefile.inc b/print/ghostscript-gpl/Makefile.inc
index 92d8fe12cb12..55bbe5bc77bd 100644
--- a/print/ghostscript-gpl/Makefile.inc
+++ b/print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.14
-GS_REVISION=	0
+GS_REVISION=	1
 GS_EPOCH=	1
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 71090b4b4a81..f5784aa8d1d6 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,9 +1,5 @@
 MD5 (ghostscript/ghostscript-8.14.tar.bz2) = 5f22dbe24b7fc8c8c07e249f8b14f9ce
 SIZE (ghostscript/ghostscript-8.14.tar.bz2) = 5719617
-MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 6865682b095f8c4500c54b285ff05ef6
-SIZE (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 3752871
-MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-SIZE (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 796086
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index 2f370c101361..d3f2b6adb574 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -408,163 +408,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
-%%DATADIR%%/fonts/COPYING
-%%DATADIR%%/fonts/ChangeLog
-%%DATADIR%%/fonts/README
-%%DATADIR%%/fonts/README.tweaks
-%%DATADIR%%/fonts/TODO
-%%DATADIR%%/fonts/a010013l.afm
-%%DATADIR%%/fonts/a010013l.pfb
-%%DATADIR%%/fonts/a010013l.pfm
-%%DATADIR%%/fonts/a010015l.afm
-%%DATADIR%%/fonts/a010015l.pfb
-%%DATADIR%%/fonts/a010015l.pfm
-%%DATADIR%%/fonts/a010033l.afm
-%%DATADIR%%/fonts/a010033l.pfb
-%%DATADIR%%/fonts/a010033l.pfm
-%%DATADIR%%/fonts/a010035l.afm
-%%DATADIR%%/fonts/a010035l.pfb
-%%DATADIR%%/fonts/a010035l.pfm
-%%DATADIR%%/fonts/b018012l.afm
-%%DATADIR%%/fonts/b018012l.pfb
-%%DATADIR%%/fonts/b018012l.pfm
-%%DATADIR%%/fonts/b018015l.afm
-%%DATADIR%%/fonts/b018015l.pfb
-%%DATADIR%%/fonts/b018015l.pfm
-%%DATADIR%%/fonts/b018032l.afm
-%%DATADIR%%/fonts/b018032l.pfb
-%%DATADIR%%/fonts/b018032l.pfm
-%%DATADIR%%/fonts/b018035l.afm
-%%DATADIR%%/fonts/b018035l.pfb
-%%DATADIR%%/fonts/b018035l.pfm
-%%DATADIR%%/fonts/bchb.afm
-%%DATADIR%%/fonts/bchb.pfa
-%%DATADIR%%/fonts/bchbi.afm
-%%DATADIR%%/fonts/bchbi.pfa
-%%DATADIR%%/fonts/bchr.afm
-%%DATADIR%%/fonts/bchr.pfa
-%%DATADIR%%/fonts/bchri.afm
-%%DATADIR%%/fonts/bchri.pfa
-%%DATADIR%%/fonts/c059013l.afm
-%%DATADIR%%/fonts/c059013l.pfb
-%%DATADIR%%/fonts/c059016l.afm
-%%DATADIR%%/fonts/c059016l.pfb
-%%DATADIR%%/fonts/c059033l.afm
-%%DATADIR%%/fonts/c059033l.pfb
-%%DATADIR%%/fonts/c059036l.afm
-%%DATADIR%%/fonts/c059036l.pfb
-%%DATADIR%%/fonts/d050000l.afm
-%%DATADIR%%/fonts/d050000l.pfb
-%%DATADIR%%/fonts/fcyr.afm
-%%DATADIR%%/fonts/fcyr.gsf
-%%DATADIR%%/fonts/fcyri.afm
-%%DATADIR%%/fonts/fcyri.gsf
-%%DATADIR%%/fonts/fhirw.gsf
-%%DATADIR%%/fonts/fhirw.pfm
-%%DATADIR%%/fonts/fkarw.gsf
-%%DATADIR%%/fonts/fkarw.pfm
-%%DATADIR%%/fonts/fonts.dir
-%%DATADIR%%/fonts/fonts.scale
-%%DATADIR%%/fonts/hrger.pfa
-%%DATADIR%%/fonts/hrgerb.gsf
-%%DATADIR%%/fonts/hrgerd.gsf
-%%DATADIR%%/fonts/hrgero.gsf
-%%DATADIR%%/fonts/hrgkc.gsf
-%%DATADIR%%/fonts/hrgks.gsf
-%%DATADIR%%/fonts/hrgrr.pfa
-%%DATADIR%%/fonts/hrgrrb.gsf
-%%DATADIR%%/fonts/hrgrro.gsf
-%%DATADIR%%/fonts/hritr.pfa
-%%DATADIR%%/fonts/hritrb.gsf
-%%DATADIR%%/fonts/hritro.gsf
-%%DATADIR%%/fonts/hrpld.pfa
-%%DATADIR%%/fonts/hrpldb.gsf
-%%DATADIR%%/fonts/hrpldbi.gsf
-%%DATADIR%%/fonts/hrpldi.pfa
-%%DATADIR%%/fonts/hrplr.gsf
-%%DATADIR%%/fonts/hrplrb.gsf
-%%DATADIR%%/fonts/hrplrbo.gsf
-%%DATADIR%%/fonts/hrplro.gsf
-%%DATADIR%%/fonts/hrpls.gsf
-%%DATADIR%%/fonts/hrplsb.gsf
-%%DATADIR%%/fonts/hrplsbo.gsf
-%%DATADIR%%/fonts/hrplso.gsf
-%%DATADIR%%/fonts/hrplt.pfa
-%%DATADIR%%/fonts/hrpltb.gsf
-%%DATADIR%%/fonts/hrpltbi.gsf
-%%DATADIR%%/fonts/hrplti.pfa
-%%DATADIR%%/fonts/hrscc.pfa
-%%DATADIR%%/fonts/hrsccb.gsf
-%%DATADIR%%/fonts/hrscco.gsf
-%%DATADIR%%/fonts/hrscs.pfa
-%%DATADIR%%/fonts/hrscsb.gsf
-%%DATADIR%%/fonts/hrscso.gsf
-%%DATADIR%%/fonts/hrsyr.gsf
-%%DATADIR%%/fonts/n019003l.afm
-%%DATADIR%%/fonts/n019003l.pfb
-%%DATADIR%%/fonts/n019003l.pfm
-%%DATADIR%%/fonts/n019004l.afm
-%%DATADIR%%/fonts/n019004l.pfb
-%%DATADIR%%/fonts/n019004l.pfm
-%%DATADIR%%/fonts/n019023l.afm
-%%DATADIR%%/fonts/n019023l.pfb
-%%DATADIR%%/fonts/n019023l.pfm
-%%DATADIR%%/fonts/n019024l.afm
-%%DATADIR%%/fonts/n019024l.pfb
-%%DATADIR%%/fonts/n019024l.pfm
-%%DATADIR%%/fonts/n019043l.afm
-%%DATADIR%%/fonts/n019043l.pfb
-%%DATADIR%%/fonts/n019044l.afm
-%%DATADIR%%/fonts/n019044l.pfb
-%%DATADIR%%/fonts/n019063l.afm
-%%DATADIR%%/fonts/n019063l.pfb
-%%DATADIR%%/fonts/n019064l.afm
-%%DATADIR%%/fonts/n019064l.pfb
-%%DATADIR%%/fonts/n019064l.pfm
-%%DATADIR%%/fonts/n021003l.afm
-%%DATADIR%%/fonts/n021003l.pfb
-%%DATADIR%%/fonts/n021003l.pfm
-%%DATADIR%%/fonts/n021004l.afm
-%%DATADIR%%/fonts/n021004l.pfb
-%%DATADIR%%/fonts/n021004l.pfm
-%%DATADIR%%/fonts/n021023l.afm
-%%DATADIR%%/fonts/n021023l.pfb
-%%DATADIR%%/fonts/n021023l.pfm
-%%DATADIR%%/fonts/n021024l.afm
-%%DATADIR%%/fonts/n021024l.pfb
-%%DATADIR%%/fonts/n021024l.pfm
-%%DATADIR%%/fonts/n022003l.afm
-%%DATADIR%%/fonts/n022003l.pfb
-%%DATADIR%%/fonts/n022004l.afm
-%%DATADIR%%/fonts/n022004l.pfb
-%%DATADIR%%/fonts/n022023l.afm
-%%DATADIR%%/fonts/n022023l.pfb
-%%DATADIR%%/fonts/n022024l.afm
-%%DATADIR%%/fonts/n022024l.pfb
-%%DATADIR%%/fonts/p052003l.afm
-%%DATADIR%%/fonts/p052003l.pfb
-%%DATADIR%%/fonts/p052004l.afm
-%%DATADIR%%/fonts/p052004l.pfb
-%%DATADIR%%/fonts/p052023l.afm
-%%DATADIR%%/fonts/p052023l.pfb
-%%DATADIR%%/fonts/p052024l.afm
-%%DATADIR%%/fonts/p052024l.pfb
-%%DATADIR%%/fonts/putb.pfa
-%%DATADIR%%/fonts/putbi.pfa
-%%DATADIR%%/fonts/putr.pfa
-%%DATADIR%%/fonts/putri.pfa
-%%DATADIR%%/fonts/s050000l.afm
-%%DATADIR%%/fonts/s050000l.pfb
-%%DATADIR%%/fonts/u003043t.afm
-%%DATADIR%%/fonts/u003043t.gsf
-%%DATADIR%%/fonts/u003043t.pfm
-%%DATADIR%%/fonts/u004006t.afm
-%%DATADIR%%/fonts/u004006t.gsf
-%%DATADIR%%/fonts/u004006t.pfm
-%%DATADIR%%/fonts/z003034l.afm
-%%DATADIR%%/fonts/z003034l.pfb
-%%DATADIR%%/fonts/z003034l.pfm
-@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 9ed0fa90da7e..db34984a3587 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -22,15 +22,12 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
 		http://www.linuxprinting.org/download/printing/:lxm3200 \
 		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/fonts/:gs_fonts \
 		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			bjc250gs/:bjc250 \
 			./:ports_jp
 PKGNAMESUFFIX=	-afpl
 DISTFILES=	${GS_SRCS}:gs_srcs \
-		${GS_FONTS_STD}:gs_fonts \
-		${GS_FONTS_OTHER}:gs_fonts \
 		${HP8XX_SRCS}:hp8xx \
 		${DJ970_SRCS}:dj970 \
 		${MD2K_SRCS}:md2k \
@@ -54,6 +51,7 @@ COMMENT=	AFPL Postscript interpreter
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
+RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/gs/fonts.dir:${PORTSDIR}/print/gsfonts
 
 NO_CDROM=	"Can only be distributed for free"
 
@@ -115,8 +113,6 @@ PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
-GS_FONTS_STD=	ghostscript-fonts-std-8.11.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-6.0.tar.gz
 
 # Additional Drivers:
 
@@ -439,9 +435,6 @@ pre-install:
 	${ECHO_MSG} ">>> in pre-install ..."
 	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
 	${MKDIR} ${DATADIR}
-	${ECHO_MSG} ">>>   extracting ghostscript fonts ..."
-	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_STD}
-	${TAR} -C ${DATADIR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${GS_FONTS_OTHER}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
 
 post-install:
diff --git a/print/ghostscript8/Makefile.inc b/print/ghostscript8/Makefile.inc
index 92d8fe12cb12..55bbe5bc77bd 100644
--- a/print/ghostscript8/Makefile.inc
+++ b/print/ghostscript8/Makefile.inc
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
 GS_VERSION=	8.14
-GS_REVISION=	0
+GS_REVISION=	1
 GS_EPOCH=	1
diff --git a/print/ghostscript8/distinfo b/print/ghostscript8/distinfo
index 71090b4b4a81..f5784aa8d1d6 100644
--- a/print/ghostscript8/distinfo
+++ b/print/ghostscript8/distinfo
@@ -1,9 +1,5 @@
 MD5 (ghostscript/ghostscript-8.14.tar.bz2) = 5f22dbe24b7fc8c8c07e249f8b14f9ce
 SIZE (ghostscript/ghostscript-8.14.tar.bz2) = 5719617
-MD5 (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 6865682b095f8c4500c54b285ff05ef6
-SIZE (ghostscript/ghostscript-fonts-std-8.11.tar.gz) = 3752871
-MD5 (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 1a643ae62ef166562e4d422b1a601272
-SIZE (ghostscript/ghostscript-fonts-other-6.0.tar.gz) = 796086
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 SIZE (ghostscript/gdevcd8.tar.gz) = 24803
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
diff --git a/print/ghostscript8/pkg-plist b/print/ghostscript8/pkg-plist
index 2f370c101361..d3f2b6adb574 100644
--- a/print/ghostscript8/pkg-plist
+++ b/print/ghostscript8/pkg-plist
@@ -408,163 +408,6 @@ bin/wftopfa
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
-%%DATADIR%%/fonts/COPYING
-%%DATADIR%%/fonts/ChangeLog
-%%DATADIR%%/fonts/README
-%%DATADIR%%/fonts/README.tweaks
-%%DATADIR%%/fonts/TODO
-%%DATADIR%%/fonts/a010013l.afm
-%%DATADIR%%/fonts/a010013l.pfb
-%%DATADIR%%/fonts/a010013l.pfm
-%%DATADIR%%/fonts/a010015l.afm
-%%DATADIR%%/fonts/a010015l.pfb
-%%DATADIR%%/fonts/a010015l.pfm
-%%DATADIR%%/fonts/a010033l.afm
-%%DATADIR%%/fonts/a010033l.pfb
-%%DATADIR%%/fonts/a010033l.pfm
-%%DATADIR%%/fonts/a010035l.afm
-%%DATADIR%%/fonts/a010035l.pfb
-%%DATADIR%%/fonts/a010035l.pfm
-%%DATADIR%%/fonts/b018012l.afm
-%%DATADIR%%/fonts/b018012l.pfb
-%%DATADIR%%/fonts/b018012l.pfm
-%%DATADIR%%/fonts/b018015l.afm
-%%DATADIR%%/fonts/b018015l.pfb
-%%DATADIR%%/fonts/b018015l.pfm
-%%DATADIR%%/fonts/b018032l.afm
-%%DATADIR%%/fonts/b018032l.pfb
-%%DATADIR%%/fonts/b018032l.pfm
-%%DATADIR%%/fonts/b018035l.afm
-%%DATADIR%%/fonts/b018035l.pfb
-%%DATADIR%%/fonts/b018035l.pfm
-%%DATADIR%%/fonts/bchb.afm
-%%DATADIR%%/fonts/bchb.pfa
-%%DATADIR%%/fonts/bchbi.afm
-%%DATADIR%%/fonts/bchbi.pfa
-%%DATADIR%%/fonts/bchr.afm
-%%DATADIR%%/fonts/bchr.pfa
-%%DATADIR%%/fonts/bchri.afm
-%%DATADIR%%/fonts/bchri.pfa
-%%DATADIR%%/fonts/c059013l.afm
-%%DATADIR%%/fonts/c059013l.pfb
-%%DATADIR%%/fonts/c059016l.afm
-%%DATADIR%%/fonts/c059016l.pfb
-%%DATADIR%%/fonts/c059033l.afm
-%%DATADIR%%/fonts/c059033l.pfb
-%%DATADIR%%/fonts/c059036l.afm
-%%DATADIR%%/fonts/c059036l.pfb
-%%DATADIR%%/fonts/d050000l.afm
-%%DATADIR%%/fonts/d050000l.pfb
-%%DATADIR%%/fonts/fcyr.afm
-%%DATADIR%%/fonts/fcyr.gsf
-%%DATADIR%%/fonts/fcyri.afm
-%%DATADIR%%/fonts/fcyri.gsf
-%%DATADIR%%/fonts/fhirw.gsf
-%%DATADIR%%/fonts/fhirw.pfm
-%%DATADIR%%/fonts/fkarw.gsf
-%%DATADIR%%/fonts/fkarw.pfm
-%%DATADIR%%/fonts/fonts.dir
-%%DATADIR%%/fonts/fonts.scale
-%%DATADIR%%/fonts/hrger.pfa
-%%DATADIR%%/fonts/hrgerb.gsf
-%%DATADIR%%/fonts/hrgerd.gsf
-%%DATADIR%%/fonts/hrgero.gsf
-%%DATADIR%%/fonts/hrgkc.gsf
-%%DATADIR%%/fonts/hrgks.gsf
-%%DATADIR%%/fonts/hrgrr.pfa
-%%DATADIR%%/fonts/hrgrrb.gsf
-%%DATADIR%%/fonts/hrgrro.gsf
-%%DATADIR%%/fonts/hritr.pfa
-%%DATADIR%%/fonts/hritrb.gsf
-%%DATADIR%%/fonts/hritro.gsf
-%%DATADIR%%/fonts/hrpld.pfa
-%%DATADIR%%/fonts/hrpldb.gsf
-%%DATADIR%%/fonts/hrpldbi.gsf
-%%DATADIR%%/fonts/hrpldi.pfa
-%%DATADIR%%/fonts/hrplr.gsf
-%%DATADIR%%/fonts/hrplrb.gsf
-%%DATADIR%%/fonts/hrplrbo.gsf
-%%DATADIR%%/fonts/hrplro.gsf
-%%DATADIR%%/fonts/hrpls.gsf
-%%DATADIR%%/fonts/hrplsb.gsf
-%%DATADIR%%/fonts/hrplsbo.gsf
-%%DATADIR%%/fonts/hrplso.gsf
-%%DATADIR%%/fonts/hrplt.pfa
-%%DATADIR%%/fonts/hrpltb.gsf
-%%DATADIR%%/fonts/hrpltbi.gsf
-%%DATADIR%%/fonts/hrplti.pfa
-%%DATADIR%%/fonts/hrscc.pfa
-%%DATADIR%%/fonts/hrsccb.gsf
-%%DATADIR%%/fonts/hrscco.gsf
-%%DATADIR%%/fonts/hrscs.pfa
-%%DATADIR%%/fonts/hrscsb.gsf
-%%DATADIR%%/fonts/hrscso.gsf
-%%DATADIR%%/fonts/hrsyr.gsf
-%%DATADIR%%/fonts/n019003l.afm
-%%DATADIR%%/fonts/n019003l.pfb
-%%DATADIR%%/fonts/n019003l.pfm
-%%DATADIR%%/fonts/n019004l.afm
-%%DATADIR%%/fonts/n019004l.pfb
-%%DATADIR%%/fonts/n019004l.pfm
-%%DATADIR%%/fonts/n019023l.afm
-%%DATADIR%%/fonts/n019023l.pfb
-%%DATADIR%%/fonts/n019023l.pfm
-%%DATADIR%%/fonts/n019024l.afm
-%%DATADIR%%/fonts/n019024l.pfb
-%%DATADIR%%/fonts/n019024l.pfm
-%%DATADIR%%/fonts/n019043l.afm
-%%DATADIR%%/fonts/n019043l.pfb
-%%DATADIR%%/fonts/n019044l.afm
-%%DATADIR%%/fonts/n019044l.pfb
-%%DATADIR%%/fonts/n019063l.afm
-%%DATADIR%%/fonts/n019063l.pfb
-%%DATADIR%%/fonts/n019064l.afm
-%%DATADIR%%/fonts/n019064l.pfb
-%%DATADIR%%/fonts/n019064l.pfm
-%%DATADIR%%/fonts/n021003l.afm
-%%DATADIR%%/fonts/n021003l.pfb
-%%DATADIR%%/fonts/n021003l.pfm
-%%DATADIR%%/fonts/n021004l.afm
-%%DATADIR%%/fonts/n021004l.pfb
-%%DATADIR%%/fonts/n021004l.pfm
-%%DATADIR%%/fonts/n021023l.afm
-%%DATADIR%%/fonts/n021023l.pfb
-%%DATADIR%%/fonts/n021023l.pfm
-%%DATADIR%%/fonts/n021024l.afm
-%%DATADIR%%/fonts/n021024l.pfb
-%%DATADIR%%/fonts/n021024l.pfm
-%%DATADIR%%/fonts/n022003l.afm
-%%DATADIR%%/fonts/n022003l.pfb
-%%DATADIR%%/fonts/n022004l.afm
-%%DATADIR%%/fonts/n022004l.pfb
-%%DATADIR%%/fonts/n022023l.afm
-%%DATADIR%%/fonts/n022023l.pfb
-%%DATADIR%%/fonts/n022024l.afm
-%%DATADIR%%/fonts/n022024l.pfb
-%%DATADIR%%/fonts/p052003l.afm
-%%DATADIR%%/fonts/p052003l.pfb
-%%DATADIR%%/fonts/p052004l.afm
-%%DATADIR%%/fonts/p052004l.pfb
-%%DATADIR%%/fonts/p052023l.afm
-%%DATADIR%%/fonts/p052023l.pfb
-%%DATADIR%%/fonts/p052024l.afm
-%%DATADIR%%/fonts/p052024l.pfb
-%%DATADIR%%/fonts/putb.pfa
-%%DATADIR%%/fonts/putbi.pfa
-%%DATADIR%%/fonts/putr.pfa
-%%DATADIR%%/fonts/putri.pfa
-%%DATADIR%%/fonts/s050000l.afm
-%%DATADIR%%/fonts/s050000l.pfb
-%%DATADIR%%/fonts/u003043t.afm
-%%DATADIR%%/fonts/u003043t.gsf
-%%DATADIR%%/fonts/u003043t.pfm
-%%DATADIR%%/fonts/u004006t.afm
-%%DATADIR%%/fonts/u004006t.gsf
-%%DATADIR%%/fonts/u004006t.pfm
-%%DATADIR%%/fonts/z003034l.afm
-%%DATADIR%%/fonts/z003034l.pfb
-%%DATADIR%%/fonts/z003034l.pfm
-@dirrm %%DATADIR%%/fonts
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc