Honour the NO_X variable, and don't try and build the X11 output formats,

or depend on the X11 libraries, if it is set.

This should allow "make release" to work happily with the documentation
build again.

Approved by:	andreas (MAINTAINER)

12 files changed, 104 insertions, 36 deletions

diff --git a/print/ghostscript-afpl/Makefile b/print/ghostscript-afpl/Makefile
index c0c5b7e65834..1548a0e269a3 100644
--- a/print/ghostscript-afpl/Makefile
+++ b/print/ghostscript-afpl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -39,7 +39,16 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
+
+.if !defined(NO_X)
 USE_XLIB=	yes
+.else
+# XXX Hack.  If you've done something like "-DNO_X" on the command line
+# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
+# that NO_X is defined *and* has a value.
+MAKE_ENV+=	NO_X=true
+.endif
+
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
diff --git a/print/ghostscript-afpl/files/patch-aa b/print/ghostscript-afpl/files/patch-aa
index 18f6f663cabf..d4e6fa42b073 100644
--- a/print/ghostscript-afpl/files/patch-aa
+++ b/print/ghostscript-afpl/files/patch-aa
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 17:06:28 2000
-+++ src/unix-gcc.mak	Tue Jan  9 17:30:58 2001
+--- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
++++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -119,12 +119,16 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -266,12 +266,12 @@
+@@ -266,12 +266,16 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
 -#XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
 +XLIBS=Xt SM ICE Xext X11
++endif
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11/lib
@@ -135,7 +139,7 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -329,7 +329,7 @@
+@@ -329,7 +333,7 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
@@ -144,7 +148,7 @@
  
  #DEVICE_DEVS1=
  #DEVICE_DEVS2=
-@@ -352,27 +352,27 @@
+@@ -352,27 +356,27 @@
  #DEVICE_DEVS19=
  #DEVICE_DEVS20=
  
@@ -193,7 +197,7 @@
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -386,13 +386,13 @@
+@@ -386,13 +390,13 @@
  # detect whether we're running a version of gcc with the const optimization
  # bug.
  
@@ -210,7 +214,7 @@
  CC_LEAF=$(CC_) -fomit-frame-pointer
  # gcc can't use -fomit-frame-pointer with -pg.
  CC_LEAF_PG=$(CC_)
-@@ -419,5 +419,5 @@
+@@ -419,5 +423,5 @@
  include $(GLSRCDIR)/unixinst.mak
  
  # This has to come last so it won't be taken as the default target.
diff --git a/print/ghostscript-afpl/scripts/configure.batch b/print/ghostscript-afpl/scripts/configure.batch
index 0aed2a22e47b..0697421ce6fb 100644
--- a/print/ghostscript-afpl/scripts/configure.batch
+++ b/print/ghostscript-afpl/scripts/configure.batch
@@ -6,7 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+ifndef NO_X
+DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
+endif
+
+DEVICE_DEVS+= \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index c0c5b7e65834..1548a0e269a3 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -39,7 +39,16 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
+
+.if !defined(NO_X)
 USE_XLIB=	yes
+.else
+# XXX Hack.  If you've done something like "-DNO_X" on the command line
+# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
+# that NO_X is defined *and* has a value.
+MAKE_ENV+=	NO_X=true
+.endif
+
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
diff --git a/print/ghostscript-gpl/files/patch-aa b/print/ghostscript-gpl/files/patch-aa
index 18f6f663cabf..d4e6fa42b073 100644
--- a/print/ghostscript-gpl/files/patch-aa
+++ b/print/ghostscript-gpl/files/patch-aa
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 17:06:28 2000
-+++ src/unix-gcc.mak	Tue Jan  9 17:30:58 2001
+--- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
++++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -119,12 +119,16 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -266,12 +266,12 @@
+@@ -266,12 +266,16 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
 -#XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
 +XLIBS=Xt SM ICE Xext X11
++endif
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11/lib
@@ -135,7 +139,7 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -329,7 +329,7 @@
+@@ -329,7 +333,7 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
@@ -144,7 +148,7 @@
  
  #DEVICE_DEVS1=
  #DEVICE_DEVS2=
-@@ -352,27 +352,27 @@
+@@ -352,27 +356,27 @@
  #DEVICE_DEVS19=
  #DEVICE_DEVS20=
  
@@ -193,7 +197,7 @@
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -386,13 +386,13 @@
+@@ -386,13 +390,13 @@
  # detect whether we're running a version of gcc with the const optimization
  # bug.
  
@@ -210,7 +214,7 @@
  CC_LEAF=$(CC_) -fomit-frame-pointer
  # gcc can't use -fomit-frame-pointer with -pg.
  CC_LEAF_PG=$(CC_)
-@@ -419,5 +419,5 @@
+@@ -419,5 +423,5 @@
  include $(GLSRCDIR)/unixinst.mak
  
  # This has to come last so it won't be taken as the default target.
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index 0aed2a22e47b..0697421ce6fb 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -6,7 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+ifndef NO_X
+DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
+endif
+
+DEVICE_DEVS+= \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index c0c5b7e65834..1548a0e269a3 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -39,7 +39,16 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
+
+.if !defined(NO_X)
 USE_XLIB=	yes
+.else
+# XXX Hack.  If you've done something like "-DNO_X" on the command line
+# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
+# that NO_X is defined *and* has a value.
+MAKE_ENV+=	NO_X=true
+.endif
+
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
diff --git a/print/ghostscript6/files/patch-aa b/print/ghostscript6/files/patch-aa
index 18f6f663cabf..d4e6fa42b073 100644
--- a/print/ghostscript6/files/patch-aa
+++ b/print/ghostscript6/files/patch-aa
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 17:06:28 2000
-+++ src/unix-gcc.mak	Tue Jan  9 17:30:58 2001
+--- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
++++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -119,12 +119,16 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -266,12 +266,12 @@
+@@ -266,12 +266,16 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
 -#XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
 +XLIBS=Xt SM ICE Xext X11
++endif
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11/lib
@@ -135,7 +139,7 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -329,7 +329,7 @@
+@@ -329,7 +333,7 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
@@ -144,7 +148,7 @@
  
  #DEVICE_DEVS1=
  #DEVICE_DEVS2=
-@@ -352,27 +352,27 @@
+@@ -352,27 +356,27 @@
  #DEVICE_DEVS19=
  #DEVICE_DEVS20=
  
@@ -193,7 +197,7 @@
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -386,13 +386,13 @@
+@@ -386,13 +390,13 @@
  # detect whether we're running a version of gcc with the const optimization
  # bug.
  
@@ -210,7 +214,7 @@
  CC_LEAF=$(CC_) -fomit-frame-pointer
  # gcc can't use -fomit-frame-pointer with -pg.
  CC_LEAF_PG=$(CC_)
-@@ -419,5 +419,5 @@
+@@ -419,5 +423,5 @@
  include $(GLSRCDIR)/unixinst.mak
  
  # This has to come last so it won't be taken as the default target.
diff --git a/print/ghostscript6/scripts/configure.batch b/print/ghostscript6/scripts/configure.batch
index 0aed2a22e47b..0697421ce6fb 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -6,7 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+ifndef NO_X
+DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
+endif
+
+DEVICE_DEVS+= \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices
diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile
index c0c5b7e65834..1548a0e269a3 100644
--- a/print/ghostscript8/Makefile
+++ b/print/ghostscript8/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ghostscript
 PORTVERSION=	6.50
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/gs650/ \
 	ftp://ftp.fh-koblenz.de/pub/Ghostscript/aladdin/fonts/ \
@@ -39,7 +39,16 @@ LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/gs${PORTVERSION}
 ALL_TARGET=	all pcl3opts escputil
+
+.if !defined(NO_X)
 USE_XLIB=	yes
+.else
+# XXX Hack.  If you've done something like "-DNO_X" on the command line
+# (instead of NO_X=true, or similar) gmake won't pick it up.  So make sure
+# that NO_X is defined *and* has a value.
+MAKE_ENV+=	NO_X=true
+.endif
+
 USE_GMAKE=	yes
 MAKEFILE=	src/unix-gcc.mak
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
diff --git a/print/ghostscript8/files/patch-aa b/print/ghostscript8/files/patch-aa
index 18f6f663cabf..d4e6fa42b073 100644
--- a/print/ghostscript8/files/patch-aa
+++ b/print/ghostscript8/files/patch-aa
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Mon Sep 25 17:06:28 2000
-+++ src/unix-gcc.mak	Tue Jan  9 17:30:58 2001
+--- src/unix-gcc.mak.orig	Mon Sep 25 16:06:28 2000
++++ src/unix-gcc.mak	Sun Feb 25 17:58:59 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -119,12 +119,16 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -266,12 +266,12 @@
+@@ -266,12 +266,16 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
 -#XLIBS=Xt SM ICE Xext X11
++ifdef NO_X
++XLIBS=
++else
 +XLIBS=Xt SM ICE Xext X11
++endif
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11/lib
@@ -135,7 +139,7 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -329,7 +329,7 @@
+@@ -329,7 +333,7 @@
  # Choose the device(s) to include.  See devs.mak for details,
  # devs.mak and contrib.mak for the list of available devices.
  
@@ -144,7 +148,7 @@
  
  #DEVICE_DEVS1=
  #DEVICE_DEVS2=
-@@ -352,27 +352,27 @@
+@@ -352,27 +356,27 @@
  #DEVICE_DEVS19=
  #DEVICE_DEVS20=
  
@@ -193,7 +197,7 @@
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -386,13 +386,13 @@
+@@ -386,13 +390,13 @@
  # detect whether we're running a version of gcc with the const optimization
  # bug.
  
@@ -210,7 +214,7 @@
  CC_LEAF=$(CC_) -fomit-frame-pointer
  # gcc can't use -fomit-frame-pointer with -pg.
  CC_LEAF_PG=$(CC_)
-@@ -419,5 +419,5 @@
+@@ -419,5 +423,5 @@
  include $(GLSRCDIR)/unixinst.mak
  
  # This has to come last so it won't be taken as the default target.
diff --git a/print/ghostscript8/scripts/configure.batch b/print/ghostscript8/scripts/configure.batch
index 0aed2a22e47b..0697421ce6fb 100644
--- a/print/ghostscript8/scripts/configure.batch
+++ b/print/ghostscript8/scripts/configure.batch
@@ -6,7 +6,11 @@
 # by Andreas Klemm <andreas@FreeBSD.org>
 
 cat - > ${WRKSRC}/src/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
+ifndef NO_X
+DEVICE_DEVS=\$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
+endif
+
+DEVICE_DEVS+= \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)fs600.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lp2563.dev \$(DD)oce9050.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)psdf.dev \$(DD)epswrite.dev \$(DD)pswrite.dev \$(DD)pdfwrite.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)miff24.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pcx2up.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)plan9bm.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)fax.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)tfax.dev \$(DD)tiffs.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)bj10e.dev \$(DD)bj200.dev \$(DD)ccr.dev \$(DD)cdeskjet.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)declj250.dev \$(DD)dnj650c.dev \$(DD)lj4dith.dev \$(DD)pj.dev \$(DD)pjxl.dev \$(DD)pjxl300.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)escp.dev \$(DD)djet500c.dev \$(DD)cljet5.dev \$(DD)cljet5pr.dev \$(DD)cljet5c.dev \$(DD)lj3100sw.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)cp50.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)ibmpro.dev \$(DD)epsonc.dev \$(DD)ap3250.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)uniprint.dev \$(DD)lj250.dev \$(DD)paintjet.dev \$(DD)pjetxl.dev \$(DD)hl7x0.dev \$(DD)imagen.dev \$(DD)jetp3852.dev \$(DD)lbp8.dev \$(DD)lips3.dev \$(DD)lp8000.dev \$(DD)m8510.dev \$(DD)necp6.dev \$(DD)lq850.dev \$(DD)lxm5700m.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)photoex.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)cfax.dev \$(DD)dfaxlow.dev \$(DD)dfaxhigh.dev \$(DD)cif.dev \$(DD)inferno.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)hpdj.dev \$(DD)pcl3.dev \$(DD)hpdjplus.dev \$(DD)hpdjportable.dev \$(DD)hpdj310.dev \$(DD)hpdj320.dev \$(DD)hpdj340.dev \$(DD)hpdj400.dev \$(DD)hpdj500.dev \$(DD)hpdj500c.dev \$(DD)hpdj510.dev \$(DD)hpdj520.dev \$(DD)hpdj540.dev \$(DD)hpdj550c.dev \$(DD)hpdj560c.dev \$(DD)hpdj600.dev \$(DD)hpdj660c.dev \$(DD)hpdj670c.dev \$(DD)hpdj680c.dev \$(DD)hpdj690c.dev \$(DD)hpdj850c.dev \$(DD)hpdj855c.dev \$(DD)hpdj870c.dev \$(DD)hpdj890c.dev \$(DD)hpdj1120c.dev \$(DD)cdj970.dev \$(DD)stp.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices