5 files changed, 296 insertions, 135 deletions

diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index 65016dedf5cf..a17b1de68b62 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript8
 PORTVERSION=	8.71
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print
 MASTER_SITES=	http://ghostscript.com/releases/:gs_srcs \
 		SF/ghostscript/files/GPL%20Ghostscript/${PORTVERSION}:gs_srcs \
@@ -45,7 +45,8 @@ CONFIGURE_ARGS=	--disable-compile-inits \
 		--enable-contrib \
 		--enable-dynamic \
 		--with-ijs \
-		--with-jasper
+		--with-jasper \
+		--with-drivers=""
 CPPFLAGS=	-DUPD_SIGNAL=0 -I. \
 		-I${WRKSRC}/jasper/src/libjasper/include \
 		-I${LOCALBASE}/include/libpng \
@@ -81,6 +82,7 @@ CIDFONTDIR=	${DATADIR}/${PORTVERSION}/Resource
 
 .include "Makefile.drivers"
 .include <bsd.port.pre.mk>
+.include "${FILESDIR}/Makefile.drivers_post"
 
 .for D in ${OPTIONS:MGS_*:S/^GS_//}
 .if !defined(WITHOUT_GS_${D})
@@ -90,96 +92,6 @@ PLIST_SUB+=	GS_${D}="@comment "
 .endif
 .endfor
 
-.if !defined(WITHOUT_CUPS)
-LIB_DEPENDS+=	cupsimage.2:${PORTSDIR}/print/cups-image
-CONFIGURE_ARGS+=	--enable-cups
-.else
-CONFIGURE_ARGS+=	--disable-cups
-.endif
-
-.if !defined(WITHOUT_GS_dmprt)
-.include "${FILESDIR}/Makefile.dmprt"
-.endif
-
-.if !defined(WITHOUT_GS_epag)
-.include "${FILESDIR}/Makefile.epag"
-.endif
-
-EPAG_BASE=	epag
-EPAG_SRCS=	${EPAG_BASE}-3.09.tar.gz
-EPAG_NAME=	${EPAG_SRCS:S,.tar.gz$,,}
-
-post-extract-epag:
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
-	${LN} -s -f ${EPAG_NAME} ${WRKSRC}/${EPAG_BASE}
-	${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak ${WRKSRC}/base/epag.contrib.mak
-
-post-extract: post-extract-epag
-
-.if !defined(WITHOUT_GS_pcl3)
-.include "${FILESDIR}/Makefile.pcl3"
-.endif
-
-.if defined(WITHOUT_SVGALIB)
-.undef WITH_GS_lvga256
-.undef WITH_GS_vgalib
-.endif
-
-.if defined(WITH_GS_lvga256) \
-	|| defined(WITH_GS_vgalib)
-LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
-.endif
-
-.if defined(WITHOUT_X11)
-. undef WITH_GS_x11
-. undef WITH_GS_x11alpha
-. undef WITH_GS_x11cmyk
-. undef WITH_GS_x11cmyk2
-. undef WITH_GS_x11cmyk4
-. undef WITH_GS_x11cmyk8
-. undef WITH_GS_x11gray2
-. undef WITH_GS_x11gray4
-. undef WITH_GS_x11mono
-. undef WITH_GS_x11rg16x
-. undef WITH_GS_x11rg32x
-.endif
-
-.if defined(WITH_GS_x11) \
-	|| defined(WITH_GS_x11alpha) \
-	|| defined(WITH_GS_x11cmyk) \
-	|| defined(WITH_GS_x11cmyk2) \
-	|| defined(WITH_GS_x11cmyk4) \
-	|| defined(WITH_GS_x11cmyk8) \
-	|| defined(WITH_GS_x11gray2) \
-	|| defined(WITH_GS_x11gray4) \
-	|| defined(WITH_GS_x11mono) \
-	|| defined(WITH_GS_x11rg16x) \
-	|| defined(WITH_GS_x11rg32x)
-USE_XORG=	xt xext
-CONFIGURE_ARGS+=--with-x \
-		--x-includes=${X11BASE}/include \
-		--x-libraries=${X11BASE}/lib
-CONFLICTS+=	ghostscript8-nox11-[0-9]*
-.else
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
-CONFIGURE_ARGS+=--without-x
-CONFLICTS+=	ghostscript8-[0-9]*
-.endif
-
-.if defined(WITHOUT_ICONV)
-. undef WITH_GS_oprp
-. undef WITH_GS_opvp
-.endif
-
-_ICONV_ARG=	no
-.if defined(WITH_GS_oprp) \
-	|| defined(WITH_GS_opvp)
-USE_ICONV=	yes
-_ICONV_ARG=	gnu
-EXTRALIBS+=	-liconv
-.endif
-CONFIGURE_ARGS+=--with-libiconv=${_ICONV_ARG}
-
 .if !defined(WITH_LETTERSIZE)
 .if defined(A4) || defined(WITH_A4SIZE)
 XCFLAGS+=	-DA4
@@ -194,6 +106,13 @@ CONFIGURE_ARGS+=	--enable-fontconfig
 CONFIGURE_ARGS+=	--disable-fontconfig
 .endif
 
+.if !defined(WITHOUT_CUPS)
+LIB_DEPENDS+=	cupsimage.2:${PORTSDIR}/print/cups-image
+CONFIGURE_ARGS+=	--enable-cups
+.else
+CONFIGURE_ARGS+=	--disable-cups
+.endif
+
 .if !defined(WITHOUT_FT_BRIDGE)
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
 MAKE_ENV+=	FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".so"
@@ -203,13 +122,6 @@ PLIST_SUB+=	FAPI=""
 PLIST_SUB+=	FAPI="@comment "
 .endif
 
-.if defined(WITH_GS_cairo)
-LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
-CONFIGURE_ARGS+=	--enable-cairo
-.else
-CONFIGURE_ARGS+=	--disable-cairo
-.endif
-
 ALL_TARGET=	so
 INSTALL_TARGET=	soinstall
 USE_LDCONFIG=	yes
@@ -239,12 +151,19 @@ post-patch:
 			${WRKSRC}/contrib/japanese/dmp_site.ps
 
 pre-build-drivers.mak:
-	@${ECHO_CMD} 'DEVICE_DEVS= \' > ${WRKSRC}/base/drivers.mak
+	@${ECHO_CMD} '# automatically generated' > ${WRKSRC}/base/drivers.mak
+.for N in ${DEVS_LIST}
+	@${ECHO_CMD} 'DEVICE_${N}=' >> ${WRKSRC}/base/drivers.mak
+.endfor
 .for D in ${OPTIONS:MGS_*:S/^GS_//}
+.for N in ${DEVS_LIST}
 .if defined(WITH_GS_${D})
-	@${ECHO_CMD} '$$(DD)${D}.dev \' >> ${WRKSRC}/base/drivers.mak
+.for X in ${DEVICE_${N}:M${D}.dev}
+	@${ECHO_CMD} 'DEVICE_${N}+= $$(DD)${D}.dev'  >> ${WRKSRC}/base/drivers.mak
+.endfor
 .endif
 .endfor
+.endfor
 
 pre-build: pre-build-drivers.mak
 	${MKDIR} ${WRKSRC}/obj
diff --git a/print/ghostscript8/Makefile.drivers b/print/ghostscript8/Makefile.drivers
index 0daac3985385..98f0158e399b 100644
--- a/print/ghostscript8/Makefile.drivers
+++ b/print/ghostscript8/Makefile.drivers
@@ -3,39 +3,6 @@
 OPTIONS_GS_DEFAULT_ON=	on
 OPTIONS_GS_DEFAULT_OFF=	off
 
-.if !defined(WITHOUT_X11)
-OPTIONS_X11_DEFAULT=	on
-.else
-OPTIONS_X11_DEFAULT=	off
-.endif
-
-.if !defined(WITH_SVGALIB)
-OPTIONS_SVGALIB_DEFAULT=	off
-.else
-OPTIONS_SVGALIB_DEFAULT=	on
-.endif
-
-.if !defined(WITHOUT_ICONV)
-OPTIONS_ICONV_DEFAULT=	on
-.else
-OPTIONS_ICONV_DEFAULT=	off
-.endif
-
-.if !defined(WITH_CAIRO)
-OPTIONS_CAIRO_DEFAULT=	off
-.else
-OPTIONS_CAIRO_DEFAULT=	on
-.endif
-
-.if make(makesum)
-OPTIONS_X11_DEFAULT=	on
-OPTIONS_SVGALIB_DEFAULT=on
-OPTIONS_ICONV_DEFAULT=	on
-OPTIONS_CAIRO_DEFAULT=	on
-OPTIONS_GS_DEFAULT_ON=	on
-OPTIONS_GS_DEFAULT_OFF=	on
-.endif
-
 OPTIONS_X11= \
 GS_x11		"D: X Window System version 11, release >=4"	${OPTIONS_X11_DEFAULT} \
 GS_x11alpha	"D: X Window System masquer. alpha capability"	${OPTIONS_X11_DEFAULT} \
@@ -60,13 +27,18 @@ GS_opvp		"D: OpenPrinting Vecter driver interface"	${OPTIONS_ICONV_DEFAULT}
 OPTIONS_CAIRO= \
 GS_cairo	"D: cairo driver for PDF, SVG, EPS or PNG files"	${OPTIONS_CAIRO_DEFAULT}
 
+OPTIONS_CUPS= \
+GS_cups		"D: CUPS driver"	${OPTIONS_CUPS_DEFAULT}
+
 OPTIONS+=	${OPTIONS_X11}
 OPTIONS+=	${OPTIONS_SVGALIB}
 OPTIONS+=	${OPTIONS_CAIRO}
 OPTIONS+=	${OPTIONS_ICONV}
+OPTIONS+=	${OPTIONS_CUPS}
 
 OPTIONS+=	\
 GS_display	"D: display device for GS shared library"	${OPTIONS_GS_DEFAULT_ON} \
+GS_omni		"D: Omni driver"	${OPTIONS_GS_DEFAULT_ON} \
 GS_md2k		"D: ALPS MD-2000/2010/4000/1300/1500/5000"	${OPTIONS_GS_DEFAULT_ON} \
 GS_md5k		"D: ALPS MD-5000 Eco Mode"	${OPTIONS_GS_DEFAULT_ON} \
 GS_md50Mono	"D: ALPS MD-5000 Monochrome"	${OPTIONS_GS_DEFAULT_ON} \
@@ -321,6 +293,7 @@ GS_png16	"D: PNG 4-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
 GS_png256	"D: PNG 8-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
 GS_png16m	"D: PNG 24-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
 GS_pngalpha	"D: PNG 32-bit RGBA Color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_png48	"D: PNG 48-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
 GS_psmono	"D: PostScript (Level 1) monochrome image"	${OPTIONS_GS_DEFAULT_ON} \
 GS_psgray	"D: PostScript (Level 1) 8-bit gray image"	${OPTIONS_GS_DEFAULT_ON} \
 GS_psrgb	"D: PostScript (Level 2) 24-bit color image"	${OPTIONS_GS_DEFAULT_ON} \
@@ -330,6 +303,7 @@ GS_epswrite	"D: Encapsulated PostScript"	${OPTIONS_GS_DEFAULT_ON} \
 GS_cfax		"D: SFF format for CAPI FAX interface"	${OPTIONS_GS_DEFAULT_ON} \
 GS_sgirgb	"D: SGI RGB pixmap format"	${OPTIONS_GS_DEFAULT_ON} \
 GS_sunhmono	"D: Harlequin variant of 1-bit Sun raster file"	${OPTIONS_GS_DEFAULT_ON} \
+GS_svgwrite	"D: SVG driver"	${OPTIONS_GS_DEFAULT_ON} \
 GS_tiffcrle	"D: TIFF CCITT RLE 1 dim (G3 FAX with no EOL)"	${OPTIONS_GS_DEFAULT_ON} \
 GS_tiffg3	"D: TIFF Group 3 FAX (with EOL)"	${OPTIONS_GS_DEFAULT_ON} \
 GS_tiffg32d	"D: TIFF Group 3 2-D FAX"	${OPTIONS_GS_DEFAULT_ON} \
diff --git a/print/ghostscript8/files/Makefile.drivers_post b/print/ghostscript8/files/Makefile.drivers_post
new file mode 100644
index 000000000000..b6f45172e122
--- /dev/null
+++ b/print/ghostscript8/files/Makefile.drivers_post
@@ -0,0 +1,208 @@
+# $FreeBSD$
+# pre/postprocessing driver variables
+
+# define defaults which depend on WITHOUT_*/WITH_*
+.for D in X11 SVGALIB ICONV
+.if !defined(WITHOUT_${D})
+OPTIONS_${D}_DEFAULT=	on
+.else
+OPTIONS_${D}_DEFAULT=	off
+.endif
+.endfor
+.for D in SVGALIB CAIRO CUPS
+.if !defined(WITH_${D})
+OPTIONS_${D}_DEFAULT=	off
+.else
+OPTIONS_${D}_DEFAULT=	on
+.endif
+.endfor
+
+# makesum needs lowest common multiple
+.if make(makesum)
+OPTIONS_X11_DEFAULT=	on
+OPTIONS_SVGALIB_DEFAULT=on
+OPTIONS_ICONV_DEFAULT=	on
+OPTIONS_CAIRO_DEFAULT=	on
+OPTIONS_CUPS_DEFAULT=	on
+OPTIONS_GS_DEFAULT_ON=	on
+OPTIONS_GS_DEFAULT_OFF=	on
+.endif
+
+# dmprt specific
+.if !defined(WITHOUT_GS_dmprt)
+.include "${FILESDIR}/Makefile.dmprt"
+.endif
+
+# epag specific
+.if !defined(WITHOUT_GS_epag)
+.include "${FILESDIR}/Makefile.epag"
+.endif
+
+EPAG_BASE=	epag
+EPAG_SRCS=	${EPAG_BASE}-3.09.tar.gz
+EPAG_NAME=	${EPAG_SRCS:S,.tar.gz$,,}
+
+post-extract-epag:
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
+	${LN} -s -f ${EPAG_NAME} ${WRKSRC}/${EPAG_BASE}
+	${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak ${WRKSRC}/base/epag.contrib.mak
+
+post-extract: post-extract-epag
+
+# pcl3 specific
+.if !defined(WITHOUT_GS_pcl3)
+.include "${FILESDIR}/Makefile.pcl3"
+.endif
+
+# vgalib specific
+VGA_DEVS= lvga256 vgalib
+.undef _VGA_DEVS
+
+.for D in ${VGA_DEVS}
+.if defined(WITHOUT_SVGALIB)
+.undef WITH_GS_${D}
+.elif defined(WITH_GS_${D})
+_VGA_DEVS+= ${D}
+.endif
+.endfor
+
+.if defined(_VGA_DEVS)
+LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
+.endif
+
+# x11 specific
+X11_DEVS= x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 x11gray2	\
+	x11gray4 x11mono x11rg16x x11rg32x
+.undef _X11_DEVS
+
+.for D in ${X11_DEVS}
+.if defined(WITHOUT_X11)
+. undef WITH_GS_${D}
+.elif defined(WITH_GS_${D})
+_X11_DEVS+= ${D}
+.endif
+.endfor
+
+.if defined(_X11_DEVS)
+USE_XORG=	xt xext
+CONFIGURE_ARGS+=--with-x \
+		--x-includes=${X11BASE}/include \
+		--x-libraries=${X11BASE}/lib
+CONFLICTS+=	ghostscript8-nox11-[0-9]*
+.else
+CONFIGURE_ARGS+=--without-x
+CONFLICTS+=	ghostscript8-[0-9]*
+.endif
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
+.endif
+
+# iconv specific
+ICONV_DEVS= oprp opvp
+.undef _ICONV_DEVS
+
+.for D in ${ICONV_DEVS}
+.if defined(WITHOUT_ICONV)
+.undef WITH_GS_${D}
+.elif defined(WITH_GS_${D})
+_ICONV_DEVS+= ${D}
+.endif
+.endfor
+
+.if defined(_ICONV_DEVS)
+USE_ICONV=	yes
+CONFIGURE_ARGS+=--with-libiconv=gnu
+EXTRALIBS+=	-liconv
+.else
+CONFIGURE_ARGS+=--with-libiconv=no
+.endif
+
+# cairo specific
+.if defined(WITH_GS_cairo)
+LIB_DEPENDS+=	cairo.2:${PORTSDIR}/graphics/cairo
+CONFIGURE_ARGS+=	--enable-cairo
+.else
+CONFIGURE_ARGS+=	--disable-cairo
+.endif
+
+# pre-defined order
+DEVS_LIST= DEVS1 DEVS2 DEVS3 DEVS4 DEVS5 DEVS6 DEVS7 DEVS8 DEVS9	\
+	DEVS10 DEVS11 DEVS12 DEVS13 DEVS14 DEVS15 DEVS16 DEVS17 DEVS18	\
+	DEVS19 DEVS20 DEVS21
+
+DEVICE_DEVS1= bmpmono.dev bmpgray.dev bmpsep1.dev bmpsep8.dev	\
+	bmp16.dev bmp256.dev bmp16m.dev bmp32b.dev stcolor.dev
+DEVICE_DEVS2= epson.dev eps9high.dev eps9mid.dev epsonc.dev ibmpro.dev
+DEVICE_DEVS3= deskjet.dev djet500.dev laserjet.dev ljetplus.dev	\
+	ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljet4d.dev	\
+	lj5mono.dev lj5gray.dev cups.dev
+DEVICE_DEVS4= cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev	\
+	pjxl.dev pjxl300.dev ijs.dev
+DEVICE_DEVS5= uniprint.dev omni.dev
+DEVICE_DEVS6= bj10e.dev bj200.dev bjc600.dev bjc800.dev png48.dev	\
+	png16m.dev pnggray.dev pngmono.dev png256.dev png16.dev		\
+	pngalpha.dev
+DEVICE_DEVS7= faxg3.dev faxg32d.dev faxg4.dev
+DEVICE_DEVS8= pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev	\
+	pcxcmyk.dev svgwrite.dev
+DEVICE_DEVS9= pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev		\
+	pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev	\
+	pkmraw.dev pksm.dev pksmraw.dev
+DEVICE_DEVS10= tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev	\
+	tifflzw.dev tiffpack.dev
+DEVICE_DEVS11= tiff12nc.dev tiff24nc.dev tiff48nc tiffgray.dev	\
+	tiff32nc.dev tiff64nc.dev tiffsep.dev tiffsep1.dev
+DEVICE_DEVS12= psmono.dev psgray.dev psrgb.dev bit.dev bitrgb.dev	\
+	bitcmyk.dev
+DEVICE_DEVS13=
+DEVICE_DEVS14= jpeg.dev jpeggray.dev jpegcmyk.dev
+DEVICE_DEVS15= pdfwrite.dev pswrite.dev ps2write.dev epswrite.dev	\
+	txtwrite.dev pxlmono.dev pxlcolor.dev
+DEVICE_DEVS16= bbox.dev
+DEVICE_DEVS17=
+DEVICE_DEVS18=
+DEVICE_DEVS20= cljet5.dev cljet5c.dev
+DEVICE_DEVS21= spotcmyk.dev devicen.dev xcf.dev psdcmyk.dev psdrgb.dev	\
+	pamcmyk32.dev
+
+# DEVS19 is for this port specific
+DEVICE_DEVS19= alc1900.dev alc2000.dev alc4000.dev alc4100.dev		\
+	alc8500.dev alc8600.dev ap3250.dev appledmp.dev atx23.dev	\
+	atx24.dev atx38.dev bj10v.dev bj10vh.dev bjc880j.dev		\
+	bjccmyk.dev bjccolor.dev bjcgray.dev bjcmono.dev cairo.dev	\
+	ccr.dev cdj1600.dev cdj500.dev cdj670.dev cdj850.dev		\
+	cdj880.dev cdj890.dev cdj970.dev cdnj500.dev cfax.dev		\
+	cgm24.dev cgm8.dev cgmmono.dev chp2200.dev cif.dev		\
+	cljet5pr.dev coslw2p.dev coslwxl.dev cp50.dev declj250.dev	\
+	dfaxhigh.dev dfaxlow.dev display.dev dj505j.dev djet500c.dev	\
+	dl2100.dev dmprt.dev dnj650c.dev epag.dev epl2050.dev		\
+	epl2050p.dev epl2120.dev epl2500.dev epl2750.dev epl5800.dev	\
+	epl5900.dev epl6100.dev eplcolor.dev eplmono.dev escpage.dev	\
+	fmlbp.dev fmpr.dev fs600.dev gdi.dev hl1240.dev hl1250.dev	\
+	hl7x0.dev imagen.dev imdi.dev inferno.dev iwhi.dev iwlo.dev	\
+	iwlq.dev jetp3852.dev jj100.dev jpegcmyk.dev la50.dev la70.dev	\
+	la75.dev la75plus.dev lbp310.dev lbp320.dev lbp8.dev		\
+	lex2050.dev lex3200.dev lex5700.dev lex7000.dev lips2p.dev	\
+	lips3.dev lips4.dev lips4v.dev lj250.dev lj4dith.dev		\
+	lj4dithp.dev ljet4pjl.dev ln03.dev lp1800.dev lp1900.dev	\
+	lp2000.dev lp2200.dev lp2400.dev lp2500.dev lp2563.dev		\
+	lp3000c.dev lp7500.dev lp7700.dev lp7900.dev lp8000.dev		\
+	lp8000c.dev lp8100.dev lp8200c.dev lp8300c.dev lp8300f.dev	\
+	lp8400f.dev lp8500c.dev lp8600.dev lp8600f.dev lp8700.dev	\
+	lp8800c.dev lp8900.dev lp9000b.dev lp9000c.dev lp9100.dev	\
+	lp9300.dev lp9400.dev lp9500c.dev lp9600.dev lp9600s.dev	\
+	lp9800c.dev lq850.dev lvga256.dev lx5000.dev lxm3200.dev	\
+	lxm5700m.dev m8510.dev mag16.dev mag256.dev md1xMono.dev	\
+	md2k.dev md50Eco.dev md50Mono.dev md5k.dev mgr4.dev mgr8.dev	\
+	mgrgray2.dev mgrgray4.dev mgrgray8.dev mgrmono.dev miff24.dev	\
+	mj500c.dev mj6000c.dev mj700v2c.dev mj8000c.dev ml600.dev	\
+	necp6.dev npdl.dev oce9050.dev oki182.dev oki4w.dev okiibm.dev	\
+	oprp.dev opvp.dev paintjet.dev pam.dev pamcmyk32.dev pcl3.dev	\
+	perm.dev photoex.dev picty180.dev pjetxl.dev plan9bm.dev	\
+	pr1000.dev pr1000_4.dev pr150.dev pr201.dev r4081.dev rpdl.dev	\
+	sgirgb.dev sj48.dev st800.dev sunhmono.dev t4693d2.dev		\
+	t4693d4.dev t4693d8.dev tek4696.dev tiff48nc tiff64nc.dev	\
+	tiffsep1.dev txtwrite.dev vgalib.dev wtscmyk.dev wtsimdi.dev	\
+	x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev	\
+	x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev		\
+	x11rg16x.dev x11rg32x.dev xcfcmyk.dev xes.dev
diff --git a/print/ghostscript8/files/patch-base-Makefile.in b/print/ghostscript8/files/patch-base-Makefile.in
index bc0e6f9f85c3..92dc3c96df60 100644
--- a/print/ghostscript8/files/patch-base-Makefile.in
+++ b/print/ghostscript8/files/patch-base-Makefile.in
@@ -1,5 +1,5 @@
 --- base/Makefile.in.orig	2009-12-18 16:04:10.000000000 +0900
-+++ base/Makefile.in	2010-04-11 00:55:04.000000000 +0900
++++ base/Makefile.in	2010-05-23 03:04:55.000000000 +0900
 @@ -47,9 +47,8 @@
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
@@ -72,6 +72,55 @@
  
  # programs we use
  RM=rm -f
+@@ -436,27 +435,27 @@
+ #DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev
+ #DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
+ DEVICE_DEVS=$(DISPLAY_DEV) @X_DEVS@
+-DEVICE_DEVS1=@FILES@
+-DEVICE_DEVS2=@PRINTERS@
+-DEVICE_DEVS3=@CUPSDEV@
+-DEVICE_DEVS4=@IJSDEVS@
+-DEVICE_DEVS5=@OMNIDEVS@
+-DEVICE_DEVS6=@PNGDEVS@
+-DEVICE_DEVS7=@JBIG2DEVS@
+-DEVICE_DEVS8=$(DD)svgwrite.dev
+-DEVICE_DEVS9=
+-DEVICE_DEVS10=
+-DEVICE_DEVS11=
+-DEVICE_DEVS12=
+-DEVICE_DEVS13=
+-DEVICE_DEVS14=
+-DEVICE_DEVS15=
+-DEVICE_DEVS16=
+-DEVICE_DEVS17=
+-DEVICE_DEVS18=
+-DEVICE_DEVS19=
+-DEVICE_DEVS20=
+-DEVICE_DEVS21=
++#DEVICE_DEVS1=@FILES@
++#DEVICE_DEVS2=@PRINTERS@
++#DEVICE_DEVS3=@CUPSDEV@
++#DEVICE_DEVS4=@IJSDEVS@
++#DEVICE_DEVS5=@OMNIDEVS@
++#DEVICE_DEVS6=@PNGDEVS@
++#DEVICE_DEVS7=@JBIG2DEVS@
++#DEVICE_DEVS8=$(DD)svgwrite.dev
++#DEVICE_DEVS9=
++#DEVICE_DEVS10=
++#DEVICE_DEVS11=
++#DEVICE_DEVS12=
++#DEVICE_DEVS13=
++#DEVICE_DEVS14=
++#DEVICE_DEVS15=
++#DEVICE_DEVS16=
++#DEVICE_DEVS17=
++#DEVICE_DEVS18=
++#DEVICE_DEVS19=
++#DEVICE_DEVS20=
++#DEVICE_DEVS21=
+ 
+ 
+ # Shared library target to build.
 @@ -490,6 +489,7 @@
  # ---------------- End of platform-specific section ---------------- #
  
diff --git a/print/ghostscript8/files/patch-base-gs.mak b/print/ghostscript8/files/patch-base-gs.mak
new file mode 100644
index 000000000000..ecb6f57e0dd7
--- /dev/null
+++ b/print/ghostscript8/files/patch-base-gs.mak
@@ -0,0 +1,11 @@
+--- base/gs.mak.orig	2010-05-23 15:46:23.000000000 +0900
++++ base/gs.mak	2010-05-23 15:57:37.000000000 +0900
+@@ -415,7 +415,7 @@
+ ld_tr=$(GLGENDIR)$(D)ld.tr
+ $(ld_tr) : \
+   $(GS_MAK) $(TOP_MAKEFILES) $(GLSRCDIR)$(D)version.mak $(GENCONF_XE) $(ECHOGS_XE) $(devs_tr) $(DEVS_ALL) $(GLGENDIR)$(D)libcore.dev
+-	$(EXP)$(GENCONF_XE) $(devs_tr) -h $(gconfig_h) $(CONFILES) $(CONFLDTR) $(ld_tr)
++	$(EXP)$(GENCONF_XE) $(devs_tr) -h /dev/stdout $(CONFILES) $(CONFLDTR) $(ld_tr) | awk 'BEGIN{j=0; p=1;} /jpeg_device/ {if(j++ > 0) p=0;} // {if(p==1) { print; } else { p=1 } }' > $(gconfig_h)
+ 	$(EXP)$(ECHOGS_XE) -a $(gconfig_h) $(GCONFIG_EXTRAS)
+ 
+ $(gconfig_h) : $(ld_tr)