3 files changed, 6 insertions, 173 deletions

diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 64578d40a4a2..65bad60844ec 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	${GS_VERSION}
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,bjc250/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
@@ -22,7 +22,6 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,gprint,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/gnu/gs${GS_VERSION:S/.//}/:gs_srcs
 MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			gimp-print/:gprint \
@@ -30,8 +29,6 @@ MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
 			./:ports_jp
 PKGNAMESUFFIX=	-gnu
 DISTFILES=	${GS_SRCS}:gs_srcs \
-		${GS_FONTS_STD}:gs_fonts \
-		${GS_FONTS_OTHER}:gs_fonts \
 		${HP8XX_SRCS}:hp8xx \
 		${HPDJ_SRCS}:hpdj_pcl3 \
 		${PCL3_SRCS}:hpdj_pcl3 \
@@ -59,6 +56,7 @@ COMMENT=	GNU 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
 
 CONFLICTS=	ghostscript-afpl*
 USE_BZIP2=	yes
@@ -114,8 +112,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:
 
@@ -159,7 +155,7 @@ DJ970_SRCS=	${DJ970}.c.gz
 #
 # For that reason, integlation of stp driver is disabled by default.
 GPRINT=		gimp-print
-GPRINT_VERS=	4.2.1
+GPRINT_VERS=	4.2.6
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
@@ -444,6 +440,7 @@ post-configure:
 		${SETENV} ${MAKE_ENV} ${SH} ./configure \
 			--without-translated-ppds --with-ghost \
 			--without-gimp --without-samples \
+			--without-cups --without-ijs \
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
 			--prefix=${PREFIX}
@@ -525,9 +522,6 @@ pre-su-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/ghostscript7/distinfo b/print/ghostscript7/distinfo
index 39e0f143089c..583251d02414 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -1,9 +1,5 @@
 MD5 (ghostscript/ghostscript-7.07.tar.bz2) = 85fd16cdc8232e5e3679a3a7e30a3359
 SIZE (ghostscript/ghostscript-7.07.tar.bz2) = 4138372
-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/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
@@ -12,8 +8,8 @@ MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
 SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
 MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
 SIZE (ghostscript/gdevdj9.c.gz) = 20139
-MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
-SIZE (ghostscript/gimp-print-4.2.1.tar.gz) = 4691313
+MD5 (ghostscript/gimp-print-4.2.6.tar.gz) = c7aae843d6a705cb8983b2f06c1f7819
+SIZE (ghostscript/gimp-print-4.2.6.tar.gz) = 5056790
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 SIZE (ghostscript/gdevmd2k-0.2a.tar.gz) = 9955
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index aa2ec3b3f5c8..a91803947a50 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -368,163 +368,6 @@ share/ghostscript/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
 share/ghostscript/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
 share/ghostscript/%%GS_VERSION%%/pcl3/margins-Letter.ps
 share/ghostscript/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
-share/ghostscript/fonts/COPYING
-share/ghostscript/fonts/ChangeLog
-share/ghostscript/fonts/README
-share/ghostscript/fonts/README.tweaks
-share/ghostscript/fonts/TODO
-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/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
-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.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/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
-@dirrm share/ghostscript/fonts
 @dirrm share/ghostscript/%%GS_VERSION%%/pcl3
 @dirrm share/ghostscript/%%GS_VERSION%%/lib
 @dirrm share/ghostscript/%%GS_VERSION%%/hpdj