*** empty log message ***

8 files changed, 450 insertions, 433 deletions

diff --git a/print/ghostscript-gpl/Makefile b/print/ghostscript-gpl/Makefile
index bfc4cd815897..74807a6b2b89 100644
--- a/print/ghostscript-gpl/Makefile
+++ b/print/ghostscript-gpl/Makefile
@@ -3,32 +3,33 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.24 1998/11/28 09:07:15 asami Exp $
+# $Id: Makefile,v 1.25 1998/12/01 09:59:46 asami Exp $
 #
 
-DISTNAME=	ghostscript-5.10
+DISTNAME=	ghostscript-5.50
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
-		ftp://bonk.ethz.ch/gs-driver-distrib/ \
+MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
+		http://www.erdw.ethz.ch/~bonk/ftp/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER} \
 		${HP850_DRV} ${DECRYPT_PDF}
+
 MAINTAINER=	andreas@FreeBSD.ORG
 
 BUILD_DEPENDS=	/nonexistent:${PORTSDIR}/graphics/jpeg:extract \
 		/nonexistent:${PORTSDIR}/graphics/png:extract \
 		unzip:${PORTSDIR}/archivers/unzip
+LIB_DEPENDS=	png.2:${PORTSDIR}/graphics/png
 
 USE_XLIB=	yes
-MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
-WRKSRC=		${WRKDIR}/gs5.10
+WRKSRC=		${WRKDIR}/gs5.50
+USE_GMAKE=	yes
 MAKEFILE=	unix-gcc.mak
-MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" -f
-MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1
+MAN1=		gs.1 pdf2dsc.1 pdf2ps.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2ps.1
 
-GS_SOURCES=	ghostscript-5.10.tar.gz
-GS_SOURCES+=	ghostscript-5.10gnu.tar.gz
+GS_SOURCES=	ghostscript-5.50.tar.gz
+GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
 #  downloading distfiles, do not change these when upgrading the port
@@ -36,7 +37,7 @@ GS_SOURCES+=	ghostscript-5.10gnu.tar.gz
 GS_FONTS_STD=	ghostscript-fonts-std-5.10.tar.gz
 GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
-# Additional driver HP 850, see http://bonk.ethz.ch/hp850/hp850.html
+# Additional driver HP 850, see http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
 HP850_DRV=	hp8xxs13.zip
 
 # replacement for pdf_sec.ps, that allows you to read encrypted PDF files
@@ -54,25 +55,22 @@ pre-fetch:
 .endif
 
 post-extract:
-	${TOUCH} ${WRKSRC}/adler32.c
-	${TOUCH} ${WRKSRC}/deflate.c
-	${TOUCH} ${WRKSRC}/trees.c
-	${TOUCH} ${WRKSRC}/adler32.o
-	${TOUCH} ${WRKSRC}/deflate.o
-	${TOUCH} ${WRKSRC}/trees.o
-	ln -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg-6b
-	ln -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.2 ${WRKSRC}/libpng
+	${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/jpeg/work/jpeg-6b ${WRKSRC}/jpeg
+	${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/graphics/png/work/libpng-1.0.2 ${WRKSRC}/libpng
+	${MV} ${WRKSRC}/devs.mak ${WRKSRC}/devs.mak.bak
 	cd ${WRKSRC} && unzip -Lao ${DISTDIR}/${HP850_DRV}
+	${MV} ${WRKSRC}/devs.mak.bak ${WRKSRC}/devs.mak
 
 do-configure:
 .if defined(BATCH)
-	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		${SH} ${SCRIPTDIR}/configure.batch
+	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure.batch
 .else
-	@${SETENV} PORTSDIR=${PORTSDIR} WRKSRC=${WRKSRC} \
-		${SH} ${SCRIPTDIR}/configure
+	@${SETENV} WRKSRC=${WRKSRC} ${SH} ${SCRIPTDIR}/configure
 .endif
 
+pre-build:
+	${MKDIR} ${WRKSRC}/obj
+
 pre-install:
 	@${MKDIR} ${PREFIX}/share/ghostscript ${PREFIX}/bin ${PREFIX}/man/man1
 	(cd ${PREFIX}/share/ghostscript ; \
@@ -84,10 +82,10 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/gs
 	${INSTALL_DATA} ${DISTDIR}/${DECRYPT_PDF} \
-		${PREFIX}/share/ghostscript/5.10
+		${PREFIX}/share/ghostscript/5.50
 	${INSTALL_DATA} ${WRKSRC}/license.hp8 \
-		${PREFIX}/share/ghostscript/5.10/doc
+		${PREFIX}/share/ghostscript/5.50/doc
 	${INSTALL_DATA} ${WRKSRC}/readme.hp8 \
-		${PREFIX}/share/ghostscript/5.10/doc
+		${PREFIX}/share/ghostscript/5.50/doc
 
 .include <bsd.port.mk>
diff --git a/print/ghostscript-gpl/distinfo b/print/ghostscript-gpl/distinfo
index 54ad231620b1..48ec6f2a0509 100644
--- a/print/ghostscript-gpl/distinfo
+++ b/print/ghostscript-gpl/distinfo
@@ -1,5 +1,5 @@
-MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
-MD5 (ghostscript-5.10gnu.tar.gz) = 6706117129a5f63dff3a5a2bf4258630
+MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
+MD5 (ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
 MD5 (ghostscript-fonts-std-5.10.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
 MD5 (hp8xxs13.zip) = 964b5e40bf0a44cc29b76616e71f6cfb
diff --git a/print/ghostscript-gpl/files/patch-aa b/print/ghostscript-gpl/files/patch-aa
index a83361b95e61..65a3e92356bb 100644
--- a/print/ghostscript-gpl/files/patch-aa
+++ b/print/ghostscript-gpl/files/patch-aa
@@ -1,24 +1,40 @@
---- unix-gcc.mak.orig	Tue Nov 25 03:29:01 1997
-+++ unix-gcc.mak	Thu Jun  4 21:44:45 1998
-@@ -130,7 +130,7 @@
- # You may need to change this if the IJG library version changes.
- # See jpeg.mak for more information.
- 
--JSRCDIR=jpeg-6a
-+JSRCDIR=jpeg-6b
- JVERSION=6
- 
- # Define the directory where the PNG library sources are stored,
-@@ -151,7 +151,7 @@
+--- unix-gcc.mak.orig	Thu Sep 17 08:06:06 1998
++++ unix-gcc.mak	Mon Nov 30 13:11:05 1998
+@@ -48,12 +48,10 @@
+ # the directories also define the default search path for the
+ # initialization files (gs_*.ps) and the fonts.
+ 
+-# If your system has installbsd, change install to installbsd in the next line.
+-INSTALL = install -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
++INSTALL_DATA = $(BSD_INSTALL_DATA)
+ 
+-prefix = /usr/local
++prefix = $(PREFIX)
+ exec_prefix = $(prefix)
+ bindir = $(exec_prefix)/bin
+ scriptdir = $(bindir)
+@@ -141,7 +139,7 @@
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
  # Define the directory where the zlib sources are stored.
- # See zlib.mak for more information.
+@@ -153,7 +151,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
  
--ZSRCDIR=zlib
-+ZSRCDIR=.
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
  
- # Choose whether to use a shared version of the zlib library, and if so,
- # what its name is (usually libz, but sometimes libgz).
-@@ -176,7 +176,7 @@
+@@ -172,7 +170,7 @@
  
  # Define the name of the C compiler.
  
@@ -27,39 +43,58 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -218,7 +218,7 @@
- # SVR4 may need -lnsl.
- # (Libraries required by individual drivers are handled automatically.)
+@@ -205,7 +203,7 @@
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+ XCFLAGS=
+ 
+-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+@@ -214,7 +212,7 @@
+ #	-R /usr/local/xxx/lib:/usr/local/lib
+ # giving the full path names of the shared library directories.
+ # XLDFLAGS can be set from the command line.
+-XLDFLAGS=
++XLDFLAGS=-L$(prefix)/lib
  
--EXTRALIBS=
-+EXTRALIBS=-lz
+ LDFLAGS=$(XLDFLAGS) -fno-common
  
- # Define the include switch(es) for the X11 header files.
- # This can be null if handled in some other way (e.g., the files are
-@@ -228,7 +228,7 @@
+@@ -234,7 +232,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/local/X/include
-+XINCLUDE=-I/usr/X11R6/include
++XINCLUDE=-I$(X11BASE)/include
  
  # 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
-@@ -243,7 +243,7 @@
- #XLIBS=Xt SM ICE Xext X11
+@@ -246,12 +244,12 @@
+ # 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
++XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11/lib
--XLIBDIR=
-+XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIR=/usr/X11R6/lib
- XLIBS=Xt Xext X11
- 
-@@ -287,22 +287,22 @@
- 
- # Choose the device(s) to include.  See devs.mak for details.
- 
--DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
++XLIBDIRS=-L$(X11BASE)/lib
+ XLIBDIR=
+-XLIBS=Xt Xext X11
++#XLIBS=Xt X11
+ 
+ # Define whether this platform has floating point hardware:
+ #	FPU_TYPE=2 means floating point is faster than fixed point.
+@@ -292,27 +290,6 @@
+ 
+ FILE_IMPLEMENTATION=stdio
+ 
+-# Choose the device(s) to include.  See devs.mak for details,
+-# devs.mak and contrib.mak for the list of available devices.
+-
+-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11gray4.dev x11mono.dev
+-#DEVICE_DEVS1=bmpmono.dev bmpamono.dev posync.dev
 -DEVICE_DEVS1=
 -DEVICE_DEVS2=
 -DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
@@ -68,89 +103,40 @@
 -DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
 -DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
 -DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
--DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.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
 -DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
 -DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
--DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
+-DEVICE_DEVS12=psmono.dev psgray.dev psrgb.dev bit.dev bitrgb.dev bitcmyk.dev
 -DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
 -DEVICE_DEVS14=jpeg.dev jpeggray.dev
 -DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
-+#DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev
-+#DEVICE_DEVS1=
-+#DEVICE_DEVS2=
-+#DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
-+#DEVICE_DEVS4=cdeskjet.dev cdjcolor.dev cdjmono.dev cdj550.dev pj.dev pjxl.dev pjxl300.dev
-+#DEVICE_DEVS5=uniprint.dev
-+#DEVICE_DEVS6=bj10e.dev bj200.dev bjc600.dev bjc800.dev
-+#DEVICE_DEVS7=faxg3.dev faxg32d.dev faxg4.dev
-+#DEVICE_DEVS8=pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev
-+#DEVICE_DEVS9=pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev
-+#DEVICE_DEVS10=tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tifflzw.dev tiffpack.dev
-+#DEVICE_DEVS11=tiff12nc.dev tiff24nc.dev
-+#DEVICE_DEVS12=psmono.dev psgray.dev bit.dev bitrgb.dev bitcmyk.dev
-+#DEVICE_DEVS13=pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev
-+#DEVICE_DEVS14=jpeg.dev jpeggray.dev
-+#DEVICE_DEVS15=pdfwrite.dev pswrite.dev epswrite.dev pxlmono.dev pxlcolor.dev
- 
+-
  # ---------------------------- End of options --------------------------- #
  
-@@ -3676,8 +3676,8 @@
- libpng95.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
- 	$(SETMOD) libpng95 pngwio.$(OBJ) -include crc32
- 
--libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ) crc32.dev
--	$(SETMOD) libpng96 pngwio.$(OBJ) -include crc32
-+libpng96.dev: $(LIBPNG_MAK) $(ECHOGS_XE) pngwio.$(OBJ)
-+	$(SETMOD) libpng96 pngwio.$(OBJ)
- #    Copyright (C) 1995, 1996, 1997 Aladdin Enterprises.  All rights reserved.
- # 
- # This file is part of Aladdin Ghostscript.
-@@ -3758,7 +3758,7 @@
- zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
- 	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
- 
--zlibe_=adler32.$(OBJ) deflate.$(OBJ) trees.$(OBJ)
-+zlibe_=
- zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
- 	$(SETMOD) zlibe_0 $(zlibe_)
- 	$(ADDMOD) zlibe_0 -include zlibc
-@@ -3805,11 +3805,11 @@
- 
- zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
- zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
--zlibd_ = $(zlibd1_) $(zlibd2_)
--zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibd_)
--	$(SETMOD) zlibd_0 $(zlibd1_)
--	$(ADDMOD) zlibd_0 -obj $(zlibd2_)
--	$(ADDMOD) zlibd_0 -include zlibc
-+zlibd_ =
-+zlibd_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev
-+	$(SETMOD) zlibd_0
-+	$(ADDMOD) zlibd_0
-+	$(ADDMOD) zlibd_0
- 
- infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
- 	$(CP_) $(ZSRC)infblock.c .
-@@ -4584,8 +4584,22 @@
- 
- cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
- 
-+cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
-+
- cdeskjet.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdeskjet $(cdeskjet_)
-+
-+cdj670.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj670 $(cdeskjet8_)
-+
-+cdj850.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj850 $(cdeskjet8_)
-+
-+cdj890.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj890 $(cdeskjet8_)
-+
-+cdj1600.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj1600 $(cdeskjet8_)
- 
- cdjcolor.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdjcolor $(cdeskjet_)
+ # Define the name of the partial makefile that specifies options --
+@@ -320,16 +297,10 @@
+ 
+ MAKEFILE=$(GLSRC)unix-gcc.mak
+ 
+-# Define the ANSI-to-K&R dependency.  There isn't one, but we do have to
+-# detect whether we're running a version of gcc with the const optimization
+-# bug.
+-
+-AK=$(GLGENDIR)/cc.tr
+-
+ # Define the compilation rules and flags.
+ 
+ CCFLAGS=$(GENOPT) $(CFLAGS)
+-CC_=$(CC) `cat $(AK)` $(CCFLAGS)
++CC_=$(CC) $(CCFLAGS)
+ CCAUX=$(CC)
+ #We can't use -fomit-frame-pointer with -pg....
+ #CC_LEAF=$(CC_)
+@@ -350,7 +321,3 @@
+ include $(GLSRC)unixtail.mak
+ include $(GLSRC)unix-end.mak
+ include $(GLSRC)unixinst.mak
+-
+-# This has to come last so it won't be taken as the default target.
+-$(AK):
+-	if ( gcc --version | grep "2.7.[01]" >/dev/null || test `gcc --version` = 2.7.2 ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript-gpl/files/patch-ac b/print/ghostscript-gpl/files/patch-ac
new file mode 100644
index 000000000000..ebd487b9fa66
--- /dev/null
+++ b/print/ghostscript-gpl/files/patch-ac
@@ -0,0 +1,21 @@
+--- contrib.mak.orig	Tue Sep 15 04:03:52 1998
++++ contrib.mak	Tue Dec  1 15:37:58 1998
+@@ -435,6 +435,18 @@
+ cdj850.dev: $(cdeskjet8_) page.dev
+ 	$(SETPDEV) cdj850 $(cdeskjet8_)
+ 
++cdj670.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj670 $(cdeskjet8_)
++
++cdj890.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj890 $(cdeskjet8_)
++
++cdj1600.dev: $(cdeskjet8_) page.dev
++	$(SETPDEV) cdj1600 $(cdeskjet8_)
++
++$(GLOBJ)gdevcd8.$(OBJ): $(GLSRC)gdevcd8.c $(GLSRC)gdevcd8.h $(PDEVH)
++	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
++
+ ### ------------ The H-P PaintJet color printer device ----------------- ###
+ ### Note: this driver also supports the DEC LJ250 color printer, which   ###
+ ###       has a PaintJet-compatible mode, and the PaintJet XL.           ###
diff --git a/print/ghostscript-gpl/pkg-descr b/print/ghostscript-gpl/pkg-descr
index ed75b6ea01b3..66f3c75cd941 100644
--- a/print/ghostscript-gpl/pkg-descr
+++ b/print/ghostscript-gpl/pkg-descr
@@ -12,7 +12,7 @@ Official ghostscript homepage, see:
 This FreeBSD port includes two useful add-on packages:
 	o Support for HP DeskJet 670, 690, 850, 855, 870, 890, 1100 and 1600,
 	  see announcement on
-		 http://bonk.ethz.ch/hp850/hp850.html
+		 http://www.erdw.ethz.ch/~bonk/hp850/hp850.html
 	o Support for pdfencrypt, see description on
 	  	http://www.ozemail.com.au/~geoffk/pdfencrypt/
 		
diff --git a/print/ghostscript-gpl/pkg-plist b/print/ghostscript-gpl/pkg-plist
index e00efd13b346..f33ceeedc537 100644
--- a/print/ghostscript-gpl/pkg-plist
+++ b/print/ghostscript-gpl/pkg-plist
@@ -1,4 +1,5 @@
 bin/bdftops
+bin/dvipdf
 bin/font2c
 bin/gs
 bin/gsbj
@@ -13,178 +14,187 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
+bin/ps2ps
 bin/wftopfa
-share/ghostscript/5.10/Fontmap
-share/ghostscript/5.10/acctest.ps
-share/ghostscript/5.10/align.ps
-share/ghostscript/5.10/bdftops.ps
-share/ghostscript/5.10/bjc610a0.upp
-share/ghostscript/5.10/bjc610a1.upp
-share/ghostscript/5.10/bjc610a2.upp
-share/ghostscript/5.10/bjc610a3.upp
-share/ghostscript/5.10/bjc610a4.upp
-share/ghostscript/5.10/bjc610a5.upp
-share/ghostscript/5.10/bjc610a6.upp
-share/ghostscript/5.10/bjc610a7.upp
-share/ghostscript/5.10/bjc610a8.upp
-share/ghostscript/5.10/bjc610b1.upp
-share/ghostscript/5.10/bjc610b2.upp
-share/ghostscript/5.10/bjc610b3.upp
-share/ghostscript/5.10/bjc610b4.upp
-share/ghostscript/5.10/bjc610b6.upp
-share/ghostscript/5.10/bjc610b7.upp
-share/ghostscript/5.10/bjc610b8.upp
-share/ghostscript/5.10/caption.ps
-share/ghostscript/5.10/cbjc600.ppd
-share/ghostscript/5.10/cbjc800.ppd
-share/ghostscript/5.10/cdj550.upp
-share/ghostscript/5.10/decrypt.ps
-share/ghostscript/5.10/doc/COPYING
-share/ghostscript/5.10/doc/NEWS
-share/ghostscript/5.10/doc/PUBLIC
-share/ghostscript/5.10/doc/README
-share/ghostscript/5.10/doc/bug-form.txt
-share/ghostscript/5.10/doc/c-style.txt
-share/ghostscript/5.10/doc/current.txt
-share/ghostscript/5.10/doc/devices.txt
-share/ghostscript/5.10/doc/drivers.txt
-share/ghostscript/5.10/doc/fonts.txt
-share/ghostscript/5.10/doc/helpers.txt
-share/ghostscript/5.10/doc/hershey.txt
-share/ghostscript/5.10/doc/history1.txt
-share/ghostscript/5.10/doc/history2.txt
-share/ghostscript/5.10/doc/history3.txt
-share/ghostscript/5.10/doc/humor.txt
-share/ghostscript/5.10/doc/install.txt
-share/ghostscript/5.10/doc/language.txt
-share/ghostscript/5.10/doc/license.hp8
-share/ghostscript/5.10/doc/lib.txt
-share/ghostscript/5.10/doc/make.txt
-share/ghostscript/5.10/doc/new-user.txt
-share/ghostscript/5.10/doc/ps2epsi.txt
-share/ghostscript/5.10/doc/ps2pdf.txt
-share/ghostscript/5.10/doc/psfiles.txt
-share/ghostscript/5.10/doc/public.txt
-share/ghostscript/5.10/doc/readme.hp8
-share/ghostscript/5.10/doc/unix-lpr.txt
-share/ghostscript/5.10/doc/use.txt
-share/ghostscript/5.10/doc/xfonts.txt
-share/ghostscript/5.10/docie.ps
-share/ghostscript/5.10/examples/alphabet.ps
-share/ghostscript/5.10/examples/cheq.ps
-share/ghostscript/5.10/examples/chess.ps
-share/ghostscript/5.10/examples/colorcir.ps
-share/ghostscript/5.10/examples/escher.ps
-share/ghostscript/5.10/examples/golfer.ps
-share/ghostscript/5.10/examples/grayalph.ps
-share/ghostscript/5.10/examples/ridt91.eps
-share/ghostscript/5.10/examples/snowflak.ps
-share/ghostscript/5.10/examples/tiger.ps
-share/ghostscript/5.10/examples/waterfal.ps
-share/ghostscript/5.10/font2c.ps
-share/ghostscript/5.10/gs_btokn.ps
-share/ghostscript/5.10/gs_ccfnt.ps
-share/ghostscript/5.10/gs_cff.ps
-share/ghostscript/5.10/gs_cidfn.ps
-share/ghostscript/5.10/gs_cmap.ps
-share/ghostscript/5.10/gs_dbt_e.ps
-share/ghostscript/5.10/gs_diskf.ps
-share/ghostscript/5.10/gs_dpnxt.ps
-share/ghostscript/5.10/gs_dps.ps
-share/ghostscript/5.10/gs_dps1.ps
-share/ghostscript/5.10/gs_dps2.ps
-share/ghostscript/5.10/gs_epsf.ps
-share/ghostscript/5.10/gs_fonts.ps
-share/ghostscript/5.10/gs_init.ps
-share/ghostscript/5.10/gs_iso_e.ps
-share/ghostscript/5.10/gs_kanji.ps
-share/ghostscript/5.10/gs_ksb_e.ps
-share/ghostscript/5.10/gs_l2img.ps
-share/ghostscript/5.10/gs_lev2.ps
-share/ghostscript/5.10/gs_mex_e.ps
-share/ghostscript/5.10/gs_mro_e.ps
-share/ghostscript/5.10/gs_pdf.ps
-share/ghostscript/5.10/gs_pdf_e.ps
-share/ghostscript/5.10/gs_pdfwr.ps
-share/ghostscript/5.10/gs_pfile.ps
-share/ghostscript/5.10/gs_res.ps
-share/ghostscript/5.10/gs_setpd.ps
-share/ghostscript/5.10/gs_statd.ps
-share/ghostscript/5.10/gs_std_e.ps
-share/ghostscript/5.10/gs_sym_e.ps
-share/ghostscript/5.10/gs_ttf.ps
-share/ghostscript/5.10/gs_typ42.ps
-share/ghostscript/5.10/gs_type1.ps
-share/ghostscript/5.10/gs_wan_e.ps
-share/ghostscript/5.10/gslp.ps
-share/ghostscript/5.10/impath.ps
-share/ghostscript/5.10/landscap.ps
-share/ghostscript/5.10/level1.ps
-share/ghostscript/5.10/lines.ps
-share/ghostscript/5.10/markhint.ps
-share/ghostscript/5.10/markpath.ps
-share/ghostscript/5.10/necp2x.upp
-share/ghostscript/5.10/necp2x6.upp
-share/ghostscript/5.10/packfile.ps
-share/ghostscript/5.10/pcharstr.ps
-share/ghostscript/5.10/pdf2dsc.ps
-share/ghostscript/5.10/pdf_2ps.ps
-share/ghostscript/5.10/pdf_base.ps
-share/ghostscript/5.10/pdf_draw.ps
-share/ghostscript/5.10/pdf_font.ps
-share/ghostscript/5.10/pdf_main.ps
-share/ghostscript/5.10/pdf_sec.ps
-share/ghostscript/5.10/pfbtogs.ps
-share/ghostscript/5.10/ppath.ps
-share/ghostscript/5.10/prfont.ps
-share/ghostscript/5.10/printafm.ps
-share/ghostscript/5.10/ps2ai.ps
-share/ghostscript/5.10/ps2ascii.ps
-share/ghostscript/5.10/ps2epsi.ps
-share/ghostscript/5.10/ps2image.ps
-share/ghostscript/5.10/quit.ps
-share/ghostscript/5.10/ras1.upp
-share/ghostscript/5.10/ras24.upp
-share/ghostscript/5.10/ras3.upp
-share/ghostscript/5.10/ras32.upp
-share/ghostscript/5.10/ras4.upp
-share/ghostscript/5.10/ras8m.upp
-share/ghostscript/5.10/showchar.ps
-share/ghostscript/5.10/showpage.ps
-share/ghostscript/5.10/stc.upp
-share/ghostscript/5.10/stc1520h.upp
-share/ghostscript/5.10/stc2.upp
-share/ghostscript/5.10/stc2_h.upp
-share/ghostscript/5.10/stc2s_h.upp
-share/ghostscript/5.10/stc500p.upp
-share/ghostscript/5.10/stc500ph.upp
-share/ghostscript/5.10/stc600ih.upp
-share/ghostscript/5.10/stc600p.upp
-share/ghostscript/5.10/stc600pl.upp
-share/ghostscript/5.10/stc800ih.upp
-share/ghostscript/5.10/stc800p.upp
-share/ghostscript/5.10/stc800pl.upp
-share/ghostscript/5.10/stc_h.upp
-share/ghostscript/5.10/stc_l.upp
-share/ghostscript/5.10/stcany.upp
-share/ghostscript/5.10/stcinfo.ps
-share/ghostscript/5.10/stcolor.ps
-share/ghostscript/5.10/traceimg.ps
-share/ghostscript/5.10/traceop.ps
-share/ghostscript/5.10/type1enc.ps
-share/ghostscript/5.10/type1ops.ps
-share/ghostscript/5.10/uninfo.ps
-share/ghostscript/5.10/unprot.ps
-share/ghostscript/5.10/viewcmyk.ps
-share/ghostscript/5.10/viewgif.ps
-share/ghostscript/5.10/viewjpeg.ps
-share/ghostscript/5.10/viewpbm.ps
-share/ghostscript/5.10/viewpcx.ps
-share/ghostscript/5.10/viewps2a.ps
-share/ghostscript/5.10/wftopfa.ps
-share/ghostscript/5.10/winmaps.ps
-share/ghostscript/5.10/wrfont.ps
-share/ghostscript/5.10/zeroline.ps
+share/ghostscript/5.50/Fontmap
+share/ghostscript/5.50/acctest.ps
+share/ghostscript/5.50/align.ps
+share/ghostscript/5.50/bdftops.ps
+share/ghostscript/5.50/bjc610a0.upp
+share/ghostscript/5.50/bjc610a1.upp
+share/ghostscript/5.50/bjc610a2.upp
+share/ghostscript/5.50/bjc610a3.upp
+share/ghostscript/5.50/bjc610a4.upp
+share/ghostscript/5.50/bjc610a5.upp
+share/ghostscript/5.50/bjc610a6.upp
+share/ghostscript/5.50/bjc610a7.upp
+share/ghostscript/5.50/bjc610a8.upp
+share/ghostscript/5.50/bjc610b1.upp
+share/ghostscript/5.50/bjc610b2.upp
+share/ghostscript/5.50/bjc610b3.upp
+share/ghostscript/5.50/bjc610b4.upp
+share/ghostscript/5.50/bjc610b6.upp
+share/ghostscript/5.50/bjc610b7.upp
+share/ghostscript/5.50/bjc610b8.upp
+share/ghostscript/5.50/caption.ps
+share/ghostscript/5.50/cbjc600.ppd
+share/ghostscript/5.50/cbjc800.ppd
+share/ghostscript/5.50/cdj550.upp
+share/ghostscript/5.50/cid2code.ps
+share/ghostscript/5.50/decrypt.ps
+share/ghostscript/5.50/doc/Bug-form.htm
+share/ghostscript/5.50/doc/C-style.htm
+share/ghostscript/5.50/doc/Commprod.htm
+share/ghostscript/5.50/doc/Copying.htm
+share/ghostscript/5.50/doc/Current.htm
+share/ghostscript/5.50/doc/DLL.htm
+share/ghostscript/5.50/doc/Devices.htm
+share/ghostscript/5.50/doc/Drivers.htm
+share/ghostscript/5.50/doc/Fonts.htm
+share/ghostscript/5.50/doc/Helpers.htm
+share/ghostscript/5.50/doc/Hershey.htm
+share/ghostscript/5.50/doc/History1.htm
+share/ghostscript/5.50/doc/History2.htm
+share/ghostscript/5.50/doc/History3.htm
+share/ghostscript/5.50/doc/History4.htm
+share/ghostscript/5.50/doc/Htmstyle.htm
+share/ghostscript/5.50/doc/Humor.htm
+share/ghostscript/5.50/doc/Install.htm
+share/ghostscript/5.50/doc/Language.htm
+share/ghostscript/5.50/doc/Lib.htm
+share/ghostscript/5.50/doc/Make.htm
+share/ghostscript/5.50/doc/New-user.htm
+share/ghostscript/5.50/doc/News.htm
+share/ghostscript/5.50/doc/PUBLIC
+share/ghostscript/5.50/doc/Ps2pdf.htm
+share/ghostscript/5.50/doc/Psfiles.htm
+share/ghostscript/5.50/doc/Public.htm
+share/ghostscript/5.50/doc/Readme.htm
+share/ghostscript/5.50/doc/Source.htm
+share/ghostscript/5.50/doc/Unix-lpr.htm
+share/ghostscript/5.50/doc/Use.htm
+share/ghostscript/5.50/doc/Xfonts.htm
+share/ghostscript/5.50/doc/license.hp8
+share/ghostscript/5.50/doc/ps2epsi.txt
+share/ghostscript/5.50/doc/readme.hp8
+share/ghostscript/5.50/docie.ps
+share/ghostscript/5.50/examples/alphabet.ps
+share/ghostscript/5.50/examples/cheq.ps
+share/ghostscript/5.50/examples/chess.ps
+share/ghostscript/5.50/examples/colorcir.ps
+share/ghostscript/5.50/examples/escher.ps
+share/ghostscript/5.50/examples/golfer.ps
+share/ghostscript/5.50/examples/grayalph.ps
+share/ghostscript/5.50/examples/ridt91.eps
+share/ghostscript/5.50/examples/snowflak.ps
+share/ghostscript/5.50/examples/tiger.ps
+share/ghostscript/5.50/examples/vasarely.ps
+share/ghostscript/5.50/examples/waterfal.ps
+share/ghostscript/5.50/font2c.ps
+share/ghostscript/5.50/font2pcl.ps
+share/ghostscript/5.50/gs_btokn.ps
+share/ghostscript/5.50/gs_ccfnt.ps
+share/ghostscript/5.50/gs_cff.ps
+share/ghostscript/5.50/gs_cidfn.ps
+share/ghostscript/5.50/gs_cmap.ps
+share/ghostscript/5.50/gs_dbt_e.ps
+share/ghostscript/5.50/gs_diskf.ps
+share/ghostscript/5.50/gs_dpnxt.ps
+share/ghostscript/5.50/gs_dps.ps
+share/ghostscript/5.50/gs_dps1.ps
+share/ghostscript/5.50/gs_dps2.ps
+share/ghostscript/5.50/gs_epsf.ps
+share/ghostscript/5.50/gs_fonts.ps
+share/ghostscript/5.50/gs_init.ps
+share/ghostscript/5.50/gs_iso_e.ps
+share/ghostscript/5.50/gs_kanji.ps
+share/ghostscript/5.50/gs_ksb_e.ps
+share/ghostscript/5.50/gs_l2img.ps
+share/ghostscript/5.50/gs_lev2.ps
+share/ghostscript/5.50/gs_ll3.ps
+share/ghostscript/5.50/gs_mex_e.ps
+share/ghostscript/5.50/gs_mro_e.ps
+share/ghostscript/5.50/gs_pdf_e.ps
+share/ghostscript/5.50/gs_pdfwr.ps
+share/ghostscript/5.50/gs_pfile.ps
+share/ghostscript/5.50/gs_res.ps
+share/ghostscript/5.50/gs_setpd.ps
+share/ghostscript/5.50/gs_statd.ps
+share/ghostscript/5.50/gs_std_e.ps
+share/ghostscript/5.50/gs_sym_e.ps
+share/ghostscript/5.50/gs_ttf.ps
+share/ghostscript/5.50/gs_typ32.ps
+share/ghostscript/5.50/gs_typ42.ps
+share/ghostscript/5.50/gs_type1.ps
+share/ghostscript/5.50/gs_wan_e.ps
+share/ghostscript/5.50/gslp.ps
+share/ghostscript/5.50/impath.ps
+share/ghostscript/5.50/landscap.ps
+share/ghostscript/5.50/level1.ps
+share/ghostscript/5.50/lines.ps
+share/ghostscript/5.50/markhint.ps
+share/ghostscript/5.50/markpath.ps
+share/ghostscript/5.50/necp2x.upp
+share/ghostscript/5.50/necp2x6.upp
+share/ghostscript/5.50/packfile.ps
+share/ghostscript/5.50/pcharstr.ps
+share/ghostscript/5.50/pdf2dsc.ps
+share/ghostscript/5.50/pdf_base.ps
+share/ghostscript/5.50/pdf_draw.ps
+share/ghostscript/5.50/pdf_font.ps
+share/ghostscript/5.50/pdf_main.ps
+share/ghostscript/5.50/pdf_ops.ps
+share/ghostscript/5.50/pdf_sec.ps
+share/ghostscript/5.50/pf2afm.ps
+share/ghostscript/5.50/ppath.ps
+share/ghostscript/5.50/prfont.ps
+share/ghostscript/5.50/printafm.ps
+share/ghostscript/5.50/ps2ai.ps
+share/ghostscript/5.50/ps2ascii.ps
+share/ghostscript/5.50/ps2epsi.ps
+share/ghostscript/5.50/quit.ps
+share/ghostscript/5.50/ras1.upp
+share/ghostscript/5.50/ras24.upp
+share/ghostscript/5.50/ras3.upp
+share/ghostscript/5.50/ras32.upp
+share/ghostscript/5.50/ras4.upp
+share/ghostscript/5.50/ras8m.upp
+share/ghostscript/5.50/showchar.ps
+share/ghostscript/5.50/showpage.ps
+share/ghostscript/5.50/stc.upp
+share/ghostscript/5.50/stc1520h.upp
+share/ghostscript/5.50/stc2.upp
+share/ghostscript/5.50/stc2_h.upp
+share/ghostscript/5.50/stc2s_h.upp
+share/ghostscript/5.50/stc500p.upp
+share/ghostscript/5.50/stc500ph.upp
+share/ghostscript/5.50/stc600ih.upp
+share/ghostscript/5.50/stc600p.upp
+share/ghostscript/5.50/stc600pl.upp
+share/ghostscript/5.50/stc800ih.upp
+share/ghostscript/5.50/stc800p.upp
+share/ghostscript/5.50/stc800pl.upp
+share/ghostscript/5.50/stc_h.upp
+share/ghostscript/5.50/stc_l.upp
+share/ghostscript/5.50/stcany.upp
+share/ghostscript/5.50/stcinfo.ps
+share/ghostscript/5.50/stcolor.ps
+share/ghostscript/5.50/traceimg.ps
+share/ghostscript/5.50/traceop.ps
+share/ghostscript/5.50/type1enc.ps
+share/ghostscript/5.50/type1ops.ps
+share/ghostscript/5.50/uninfo.ps
+share/ghostscript/5.50/unprot.ps
+share/ghostscript/5.50/viewcmyk.ps
+share/ghostscript/5.50/viewgif.ps
+share/ghostscript/5.50/viewjpeg.ps
+share/ghostscript/5.50/viewpbm.ps
+share/ghostscript/5.50/viewpcx.ps
+share/ghostscript/5.50/viewps2a.ps
+share/ghostscript/5.50/wftopfa.ps
+share/ghostscript/5.50/winmaps.ps
+share/ghostscript/5.50/wrfont.ps
+share/ghostscript/5.50/zeroline.ps
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -352,7 +362,7 @@ share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
 @dirrm share/ghostscript/fonts
-@dirrm share/ghostscript/5.10/doc
-@dirrm share/ghostscript/5.10/examples
-@dirrm share/ghostscript/5.10
+@dirrm share/ghostscript/5.50/doc
+@dirrm share/ghostscript/5.50/examples
+@dirrm share/ghostscript/5.50
 @dirrm share/ghostscript
diff --git a/print/ghostscript-gpl/scripts/configure b/print/ghostscript-gpl/scripts/configure
index 2bddd0ff9663..e107c3418b7f 100644
--- a/print/ghostscript-gpl/scripts/configure
+++ b/print/ghostscript-gpl/scripts/configure
@@ -1,137 +1,121 @@
 #! /bin/sh
 
-# without that no way :)
-touch ${WRKSRC}/makefile
-
 # driverselection
-/usr/bin/dialog --title "Ghostscript 4 driver configuration" --clear \
+/usr/bin/dialog --title "Ghostscript 5 driver configuration" --clear \
 	--checklist "\n\
 This new ghostscript driver configuration dialog allows you to choose \n\
 only those gs drivers, you really need. Don't think too economical, since \n\
 other programs in the ports collection might need some of the default gs \n\
-file format drivers. The gs4 default drivers are preselected. \n\
+file format drivers. The gs5 default drivers are preselected. \n\
 Have fun with this new configuration style !     -andreas \n\n\
-  Please choose options by pressing SPACE to TOGGLE an option ON/ON ?" -1 -1 9\
-  "x11"      "X Windows version 11, release >=4" ON \
-  "x11alpha" "X Windows masquer. as device with alpha capability" ON \
-  "x11cmyk"  "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
-  "x11gray2" "X Windows as a 2-bit gray-scale device" ON \
-  "x11mono"  "X Windows masquer. as black-and-white device" ON \
-  "sxlcrt"   "CRT sixels, e.g. for VT240-like terminals" ON \
-  "ap3250"   "Epson AP3250" ON \
-  "appledmp" "Apple Dot Matrix Printer / Imagewriter" ON \
+  Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9\
+  "appledmp" "Apple Dot Matrix Printer / Imagewriter" OFF \
+  "iwhi"     "Apple Imagewriter, high-resolution mode" OFF \
+  "iwlo"     "Apple Imagewriter, low-resolution mode" OFF \
+  "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" OFF \
+  "hl7x0"    "Brother HL 720 and HL 730" OFF \
   "bj10e"    "Canon BubbleJet BJ10e" ON \
   "bj200"    "Canon BubbleJet BJ200 and BJC-240(b&w)" ON \
   "bjc600"   "Canon Color BJC-240/600/4000/70 + Apple StyleWriter 2x00" ON \
   "bjc800"   "Canon Color BubbleJet BJC-240/800" ON \
-  "ccr"      "CalComp Raster format" ON \
+  "lbp8"     "Canon LBP-8II laser printer" OFF \
+  "lips3"    "Canon LIPS III laser printer in English/CaPSL mode" OFF \
+  "m8510"    "C.Itoh M8510 printer" OFF \
+  "uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
+  "la50"     "DEC LA50 printer" OFF \
+  "la70"     "DEC LA70 printer" OFF \
+  "la75"     "DEC LA75 printer" OFF \
+  "la75plus" "DEC LA75plus printer" OFF \
+  "lj250"    "DEC LJ250 Companion color printer" OFF \
+  "declj250" "DEC LJ250 driver (alternate)" OFF \
+  "ln03"     "DEC LN03 printer" OFF \
+  "ap3250"   "Epson AP3250" OFF \
+  "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
+  "eps9mid"  "Epson-compatible 9-pin, medium resol" OFF \
+  "eps9high" "Epson-compatible 9-pin, high resol" OFF \
+  "lp8000"   "Epson LP-8000 line printer" OFF \
+  "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" OFF \
+  "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" OFF \
+  "st800"    "Epson Stylus 800 printer" OFF \
+  "stcolor"  "Epson Stylus Color" OFF \
+  "lp2563"   "HP 2563B line printer" OFF \
+  "dnj650c"  "HP DesignJet 650C" OFF \
+  "deskjet"  "HP DeskJet and DeskJet Plus" ON \
+  "djet500"  "HP DeskJet 500" ON \
   "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" ON \
+  "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" OFF \
   "cdjcolor" "HP DeskJet 500C/540C, 24 bit/pixel color + FS dithering" ON \
   "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" ON \
-  "cdj500"   "HP DeskJet 500C (same as cdjcolor)" ON \
+  "cdj500"   "HP DeskJet 500C (same as cdjcolor)" OFF \
   "cdj550"   "HP DeskJet 550C/560C" ON \
-  "cdj670"   "HP DeskJet 670/690" ON \
-  "cdj850"   "HP DeskJet 850/855/870/1100" ON \
-  "cdj890"   "HP DeskJet 890" ON \
-  "cdj1600"  "HP DeskJet 1600" ON \
-  "cp50"     "Mitsubishi CP50 color" ON \
-  "declj250" "alternate DEC LJ250 driver" ON \
-  "deskjet"  "HP DeskJet and DeskJet Plus" ON \
-  "djet500"  "HP DeskJet 500" ON \
-  "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" ON \
-  "dnj650c"  "HP DesignJet 650C" ON \
-  "epson"    "Epson-compatible dot matrix, 9/24-pin" ON \
-  "eps9mid"  "Epson-compatible 9-pin, medium resol" ON \
-  "eps9high" "Epson-compatible 9-pin, high resol" ON \
-  "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" ON \
-  "ibmpro"   "IBM 9-pin Proprinter" ON \
-  "imagen"   "Imagen ImPress printers" ON \
-  "iwhi"     "Apple Imagewriter, high-resolution mode" ON \
-  "iwlo"     "Apple Imagewriter, low-resolution mode" ON \
-  "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" ON \
-  "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" ON \
+  "cdj670"   "HP DeskJet 670/690" OFF \
+  "cdj850"   "HP DeskJet 850/855/870/1100" OFF \
+  "cdj890"   "HP DeskJet 890" OFF \
+  "cdj1600"  "HP DeskJet 1600" OFF \
   "laserjet" "HP LaserJet" ON \
-  "la50"     "DEC LA50 printer" ON \
-  "la70"     "DEC LA70 printer" ON \
-  "la75"     "DEC LA75 printer" ON \
-  "la75plus" "DEC LA75plus printer" ON \
-  "lbp8"     "Canon LBP-8II laser printer" ON \
-  "lips3"    "Canon LIPS III laser printer in English/CaPSL mode" ON \
-  "ln03"     "DEC LN03 printer" ON \
-  "lj250"    "DEC LJ250 Companion color printer" ON \
+  "ljetplus" "HP LaserJet Plus" ON \
   "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" ON \
   "ljet3"    "HP LaserJet III* with Delta Row compression" ON \
-  "ljet3d"   "HP LaserJet IIID with duplex capability" ON \
+  "ljet3d"   "HP LaserJet IIID with duplex capability" OFF \
   "ljet4"    "HP LaserJet 4 (defaults to 600 dpi)" ON \
-  "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" ON \
-  "ljetplus" "HP LaserJet Plus" ON \
-  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" ON \
-  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" ON \
-  "lp2563"   "HP 2563B line printer" ON \
-  "lp8000"   "EPSON LP-8000 line printer" ON \
-  "lq850"    "EPSON LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" ON \
-  "m8510"    "C.Itoh M8510 printer" ON \
-  "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" ON \
-  "oce9050"  "OCE 9050 printer" ON \
-  "oki182"   "Okidata MicroLine 182" ON \
-  "okiibm"   "Okidata MicroLine IBM-compatible printers" ON \
-  "paintjet" "alternate HP PaintJet color printer" ON \
+  "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" OFF \
+  "cljet5"   "HP LaserJet 5/5M Color " OFF \
+  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" OFF \
+  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" OFF \
   "pj"       "HP PaintJet XL driver " ON \
-  "pjetxl"   "alternate HP PaintJet XL driver" ON \
+  "pjetxl"   "HP PaintJet XL driver (alternate)" OFF \
   "pjxl"     "HP PaintJet XL color printer" ON \
+  "paintjet" "HP PaintJet color printer (alternate)" OFF \
   "pjxl300"  "HP PaintJet XL300 color printer (also for 1200C)" ON \
-  "pxlmono"  "HP black-and-white PCL XL printers (LaserJet 5 and 6 family)" ON \
-  "pxlcolor" "HP color PCL XL printers (none available yet)" ON \
-  "r4081"    "Ricoh 4081 laser printer" ON \
-  "sj48"     "StarJet 48 inkjet printer" ON \
-  "st800"    "Epson Stylus 800 printer" ON \
-  "stcolor"  "Epson Stylus Color" ON \
-  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" ON \
-  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" ON \
-  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" ON \
-  "tek4696"  "Tektronix 4695/4696 inkjet plotter" ON \
-  "uniprint" "Configurable Color ESC/P,ESC/P2,HP-RTL/PCL mono/color driver" ON \
-  "xes"      "Xerox XES printers (2700, 3700, 4045, etc.)" ON \
-  "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" ON \
-  "dfaxlow"  "DigiFAX low (normal) resol" ON \
+  "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" ON \
+  "pxlcolor" "HP PCL XL color printers (none available yet)" ON \
+  "ibmpro"   "IBM 9-pin Proprinter" OFF \
+  "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
+  "imagen"   "Imagen ImPress printers" OFF \
+  "cp50"     "Mitsubishi CP50 color" OFF \
+  "necp6"    "NEC P6/P6+/P60, 360x360 DPI resol" OFF \
+  "oce9050"  "OCE 9050 printer" OFF \
+  "oki182"   "Okidata MicroLine 182" OFF \
+  "okiibm"   "Okidata MicroLine IBM-compatible printers" OFF \
+  "r4081"    "Ricoh 4081 laser printer" OFF \
+  "sj48"     "StarJet 48 inkjet printer" OFF \
+  "xes"      "Xerox XES printers (2700, 3700, 4045, etc.)" OFF \
+  "bmpmono"  "BMP Monochrome" OFF \
+  "bmp16"    "BMP 4-bit EGA/VGA" OFF \
+  "bmp256"   "BMP 8-bit 256-color" OFF \
+  "bmp16m"   "BMP 24-bit" OFF \
+  "ccr"      "CalComp Raster format" OFF \
+  "cgmmono"  "CGM Monochrome -- LOW LEVEL OUTPUT ONLY" OFF \
+  "cgm8"     "CGM 8-bit 256-color -- DITTO" OFF \
+  "cgm24"    "CGM 24-bit color -- DITTO" OFF \
+  "cif"      "CIF file format for VLSI" OFF \
+  "sxlcrt"   "CRT sixels, e.g. for VT240-like terminals" OFF \
+  "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" OFF \
+  "dfaxlow"  "DigiFAX low (normal) resol" OFF \
   "faxg3"    "Group 3 fax, with EOLs but no header or EOD" ON \
   "faxg32d"  "Group 3 2-D fax, with EOLs but no header or EOD" ON \
   "faxg4"    "Group 4 fax, with EOLs but no header or EOD" ON \
-  "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" ON \
-  "tiffg3"   "TIFF Group 3 fax with EOLs" ON \
-  "tiffg32d" "TIFF Group 3 2-D fax" ON \
-  "tiffg4"   "TIFF Group 4 fax" ON \
-  "epswrite" "EPS output (like PostScript Distillery)" ON \
-  "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
-  "pswrite"  "PostScript output (like PostScript Distillery)" ON \
-  "pxlmono"  "Black-and-white PCL XL" ON \
-  "pxlcolor" "Color PCL XL" ON \
-  "bit"      "Plain bits, monochrome" ON \
-  "bitrgb"   "Plain bits, RGB" ON \
-  "bitcmyk"  "Plain bits, CMYK" ON \
-  "bmpmono"  "Monochrome MS Windows .BMP file format" ON \
-  "bmp16"    "4-bit EGA/VGA .BMP file format" ON \
-  "bmp256"   "8-bit 256-color .BMP file format" ON \
-  "bmp16m"   "24-bit .BMP file format" ON \
-  "cgmmono"  "Monochrome CGM -- LOW LEVEL OUTPUT ONLY" ON \
-  "cgm8"     "8-bit 256-color CGM -- DITTO" ON \
-  "cgm24"    "24-bit color CGM -- DITTO" ON \
-  "cif"      "CIF file format for VLSI" ON \
+  "miff24"   "ImageMagick MIFF, 24-bit direct color, RLE compressed" OFF \
+  "inferno"  "Inferno bitmaps" OFF \
   "jpeg"     "JPEG format, RGB output" ON \
   "jpeggray" "JPEG format, gray output" ON \
-  "miff24"   "ImageMagick MIFF, 24-bit direct color, RLE compressed" ON \
-  "mgrmono"  "1-bit monochrome MGR devices" ON \
-  "mgrgray2" "2-bit gray scale MGR devices" ON \
-  "mgrgray4" "4-bit gray scale MGR devices" ON \
-  "mgrgray8" "8-bit gray scale MGR devices" ON \
-  "mgr4"     "4-bit (VGA) color MGR devices" ON \
-  "mgr8"     "8-bit color MGR devices" ON \
+  "mgrmono"  "MGR devices 1-bit monochrome" OFF \
+  "mgrgray2" "MGR devices 2-bit gray scale" OFF \
+  "mgrgray4" "MGR devices 4-bit gray scale" OFF \
+  "mgrgray8" "MGR devices 8-bit gray scale" OFF \
+  "mgr4"     "MGR devices 4-bit (VGA) color" OFF \
+  "mgr8"     "MGR devices 8-bit color" OFF \
   "pcxmono"  "PCX file format, monochrome 1-bit b/w" ON \
   "pcxgray"  "PCX file format, 8-bit gray scale" ON \
   "pcx16"    "PCX file format, 4-bit planar EGA/VGA color" ON \
   "pcx256"   "PCX file format, 8-bit chunky color" ON \
   "pcx24b"   "PCX file format, 24-bit color 3x8-bit planes" ON \
   "pcxcmyk"  "PCX file format, 4-bit chunky CMYK color" ON \
+  "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" ON \
+  "bit"      "Plain bits, monochrome" ON \
+  "bitrgb"   "Plain bits, RGB" ON \
+  "bitcmyk"  "Plain bits, CMYK" ON \
+  "plan9bm"  "Plan 9 bitmap format" OFF \
   "pbm"      "Portable Bitmap,  plain format" ON \
   "pbmraw"   "Portable Bitmap,  raw format" ON \
   "pgm"      "Portable Graymap, plain format" ON \
@@ -144,18 +128,39 @@ Have fun with this new configuration style !     -andreas \n\n\
   "ppmraw"   "Portable Pixmap,  raw format RGB" ON \
   "pkm"      "Portable inKmap (plain format) (4-bit CMYK => RGB)" ON \
   "pkmraw"   "Portable inKmap (raw format) (4-bit CMYK => RGB)" ON \
-  "pngmono"  "Monochrome Portable Network Graphics, PNG" ON \
-  "pnggray"  "8-bit gray Portable Network Graphics, PNG" ON \
-  "png16"    "4-bit color Portable Network Graphics, PNG" ON \
-  "png256"   "8-bit color Portable Network Graphics, PNG" ON \
-  "png16m"   "24-bit color Portable Network Graphics, PNG" ON \
+  "pngmono"  "PNG Monochrome Portable Network Graphics" ON \
+  "pnggray"  "PNG 8-bit gray Portable Network Graphics" ON \
+  "png16"    "PNG 4-bit color Portable Network Graphics" ON \
+  "png256"   "PNG 8-bit color Portable Network Graphics" ON \
+  "png16m"   "PNG 24-bit color Portable Network Graphics" ON \
   "psmono"   "PostScript, Level 1, monochrome image" ON \
   "psgray"   "PostScript (Level 1) 8-bit gray image" ON \
-  "sgirgb"   "SGI RGB pixmap format" ON \
+  "psrgb"    "PostScript (Level 2) 24-bit color image" ON \
+  "pswrite"  "PostScript output (like PostScript Distillery)" ON \
+  "epswrite" "EPS output (like PostScript Distillery)" ON \
+  "sgirgb"   "SGI RGB pixmap format" OFF \
+  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" OFF \
+  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" OFF \
+  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" OFF \
+  "tek4696"  "Tektronix 4695/4696 inkjet plotter" OFF \
+  "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" ON \
+  "tiffg3"   "TIFF Group 3 fax with EOLs" ON \
+  "tiffg32d" "TIFF Group 3 2-D fax" ON \
+  "tiffg4"   "TIFF Group 4 fax" ON \
   "tiff12nc" "TIFF 12-bit RGB, no compression" ON \
   "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format)" ON \
   "tifflzw"  "TIFF LZW,      tag = 5,     mono" ON \
-  "tiffpack" "TIFF PackBits, tag = 32773, mono" ON 2> /tmp/checklist.tmp.$$
+  "tiffpack" "TIFF PackBits, tag = 32773, mono" ON \
+  "x11"      "X Windows version 11, release >=4" ON \
+  "x11alpha" "X Windows masquer. as device with alpha capability" ON \
+  "x11cmyk"  "X Windows masquer. as 1-bit-per-plane CMYK device" ON \
+  "x11cmyk2" "X Windows as a 2-bit-per-plane CMYK device" OFF \
+  "x11cmyk4" "X Windows as a 4-bit-per-plane CMYK device" OFF \
+  "x11cmyk8" "X Windows as an 8-bit-per-plane CMYK device" OFF \
+  "x11gray2" "X Windows as a 2-bit gray-scale device" ON \
+  "x11gray4" "X Windows as a 4-bit gray-scale device" ON \
+  "x11mono"  "X Windows masquer. as black-and-white device" ON \
+2> /tmp/checklist.tmp.$$
 
 retval=$?
 
@@ -163,7 +168,7 @@ choice=`cat /tmp/checklist.tmp.$$`
 rm -f /tmp/checklist.tmp.$$
 
 case $retval in
-	0)	if [ -z choice ]; then
+	0)	if [ -z "$choice" ]; then
 			echo "Nothing selected"
 			exit 1;
 		fi
diff --git a/print/ghostscript-gpl/scripts/configure.batch b/print/ghostscript-gpl/scripts/configure.batch
index b7735752554c..75c2755395b9 100644
--- a/print/ghostscript-gpl/scripts/configure.batch
+++ b/print/ghostscript-gpl/scripts/configure.batch
@@ -1,10 +1,7 @@
 #! /bin/sh
 
-# without that no way :)
-touch ${WRKSRC}/makefile
-
 cat - > ${WRKSRC}/unix-gcc.mak.new << !EOT
-DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11mono.dev sxlcrt.dev ap3250.dev appledmp.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev ccr.dev cdeskjet.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj670.dev cdj850.dev cdj890.dev cdj1600.dev cp50.dev declj250.dev deskjet.dev djet500.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev laserjet.dev la50.dev la70.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev lp8000.dev lq850.dev m8510.dev necp6.dev oce9050.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev pxlmono.dev pxlcolor.dev r4081.dev sj48.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev epswrite.dev pdfwrite.dev pswrite.dev pxlmono.dev pxlcolor.dev bit.dev bitrgb.dev bitcmyk.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev cgmmono.dev cgm8.dev cgm24.dev cif.dev jpeg.dev jpeggray.dev miff24.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev sgirgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev
+DEVICE_DEVS=appledmp.dev iwhi.dev iwlo.dev iwlq.dev hl7x0.dev bj10e.dev bj200.dev bjc600.dev bjc800.dev lbp8.dev lips3.dev m8510.dev uniprint.dev la50.dev la70.dev la75.dev la75plus.dev lj250.dev declj250.dev ln03.dev ap3250.dev epson.dev eps9mid.dev eps9high.dev lp8000.dev lq850.dev epsonc.dev st800.dev stcolor.dev lp2563.dev dnj650c.dev deskjet.dev djet500.dev cdeskjet.dev djet500c.dev cdjcolor.dev cdjmono.dev cdj500.dev cdj550.dev cdj670.dev cdj850.dev cdj890.dev cdj1600.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev lj4dith.dev cljet5.dev lj5mono.dev lj5gray.dev pj.dev pjetxl.dev pjxl.dev paintjet.dev pjxl300.dev pxlmono.dev pxlcolor.dev ibmpro.dev jetp3852.dev imagen.dev cp50.dev necp6.dev oce9050.dev oki182.dev okiibm.dev r4081.dev sj48.dev xes.dev bmpmono.dev bmp16.dev bmp256.dev bmp16m.dev ccr.dev cgmmono.dev cgm8.dev cgm24.dev sxlcrt.dev dfaxhigh.dev dfaxlow.dev faxg3.dev faxg32d.dev faxg4.dev bit.dev bitrgb.dev bitcmyk.dev cif.dev miff24.dev inferno.dev jpeg.dev jpeggray.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev pcxmono.dev pcxgray.dev pcx16.dev pcx256.dev pcx24b.dev pcxcmyk.dev pdfwrite.dev plan9bm.dev pbm.dev pbmraw.dev pgm.dev pgmraw.dev pgnm.dev pgnmraw.dev pnm.dev pnmraw.dev ppm.dev ppmraw.dev pkm.dev pkmraw.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev pswrite.dev epswrite.dev sgirgb.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev tiffcrle.dev tiffg3.dev tiffg32d.dev tiffg4.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.dev x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices