5.50

7 files changed, 241 insertions, 325 deletions

diff --git a/print/ghostscript5/Makefile b/print/ghostscript5/Makefile
index fec700df32c..3829c7d2234 100644
--- a/print/ghostscript5/Makefile
+++ b/print/ghostscript5/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 1998/09/15 17:05:07 agc Exp $
-# FreeBSD Id: Makefile,v 1.14 1997/10/13 11:22:43 asami Exp
+# $NetBSD: Makefile,v 1.25 1998/11/04 21:42:11 mycroft Exp $
 #
 
-DISTNAME=	ghostscript-5.10
+DISTNAME=	ghostscript-5.50
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs510/ \
+MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/gs550/ \
 		ftp://ftp.cs.wisc.edu/ghost/aladdin/fonts/ \
 		ftp://bonk.ethz.ch/gs-driver-distrib/ \
 		http://www.ozemail.com.au/~geoffk/pdfencrypt/
@@ -15,24 +14,28 @@ MAINTAINER=	explorer@netbsd.org
 HOMEPAGE=	http://www.cs.wisc.edu/~ghost/index.html
 
 BUILD_DEPENDS=	${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b:../../graphics/jpeg:extract \
-		${BUILD_ROOT}/graphics/png/${WRKDIR:T}/libpng-1.0.2:../../graphics/png:extract \
+		libpng-1.0.2:../../graphics/png \
 		unzip:../../archivers/unzip
 
+CONFLICTS=	ghostscript-5.10
+
 EXTRACT_ONLY=	${GS_SOURCES}
-WRKSRC=		${WRKDIR}/gs5.10
+WRKSRC=		${WRKDIR}/gs5.50
 MAKEFILE=	unix-gcc.mak
-MAKE_FLAGS=	prefix=${PREFIX} zlibc_=-lz CFLAGS="${CFLAGS}" JSRCDIR=jpeg-6b
+ALL_TARGET=	std
+MAKE_ENV+=	MAKEOBJDIR=.
+MAKE_FLAGS=	prefix=${PREFIX} CFLAGS="${CFLAGS}"
 
-GS_SOURCES=	ghostscript-5.10.tar.gz
-GS_SOURCES+=	ghostscript-5.10gnu.tar.gz
-#  Note: the following two are special files.  In the 5.10 directory
+GS_SOURCES=	ghostscript-5.50.tar.gz
+GS_SOURCES+=	ghostscript-5.50gnu.tar.gz
+#  Note: the following two are special files.  In the 5.50 directory
 #  on the FTP site, there are symlinks:
-#        ghostscript-fonts-other-5.10.tar.gz ->
+#        ghostscript-fonts-other-5.50.tar.gz ->
 #               ../fonts/ghostscript-fonts-other-4.40.tar.gz
 #  To avoid unnecessarily downloading distfiles, do not change these
 #  when upgrading the port unless the symlinks/files really change.
-GS_FONTS_STD=	ghostscript-fonts-std-4.0.tar.gz
-GS_FONTS_OTHER=	ghostscript-fonts-other-4.40.tar.gz
+GS_FONTS_STD=	ghostscript-fonts-std-5.10a.tar.gz
+GS_FONTS_OTHER=	ghostscript-fonts-other-5.10.tar.gz
 
 # Additional driver HP 850, see http://bonk.ethz.ch/hp850/hp850.html
 HP850_DRV=	hp850.zip
@@ -57,14 +60,7 @@ SCRIPT_SUFFIX=	.batch
 .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 ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg-6b
-	${LN} -s ${BUILD_ROOT}/graphics/png/${WRKDIR:T}/libpng-1.0.2 ${WRKSRC}/libpng
+	${LN} -s ${BUILD_ROOT}/graphics/jpeg/${WRKDIR:T}/jpeg-6b ${WRKSRC}/jpeg
 	cd ${WRKSRC} && unzip -La ${DISTDIR}/${HP850_DRV}
 	${CP} ${DISTDIR}/${PDF_SEC} ${WRKSRC}
 
@@ -86,8 +82,4 @@ pre-install:
 post-install:
 	strip ${PREFIX}/bin/gs
 
-pre-clean:
-	@cd ../../graphics/jpeg && ${MAKE} clean
-	@cd ../../graphics/png && ${MAKE} clean
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/ghostscript5/files/md5 b/print/ghostscript5/files/md5
index ac88d1da5c8..c6095a5d303 100644
--- a/print/ghostscript5/files/md5
+++ b/print/ghostscript5/files/md5
@@ -1,8 +1,8 @@
-$NetBSD: md5,v 1.8 1998/08/07 13:27:35 agc Exp $
+$NetBSD: md5,v 1.9 1998/11/04 21:42:12 mycroft Exp $
 
-MD5 (ghostscript-5.10.tar.gz) = 47fbc4f6402c98374c61bf3e64e59e9a
-MD5 (ghostscript-5.10gnu.tar.gz) = 6706117129a5f63dff3a5a2bf4258630
-MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
-MD5 (ghostscript-fonts-other-4.40.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
+MD5 (ghostscript-5.50.tar.gz) = f51e92976c4cda9a05de5388fdbbbbbd
+MD5 (ghostscript-5.50gnu.tar.gz) = 4930c9d2feea3294904fc683bf8b8beb
+MD5 (ghostscript-fonts-other-5.10.tar.gz) = fcf3abf81a1b46da9a92942d288020f9
+MD5 (ghostscript-fonts-std-5.10a.tar.gz) = 8462a429e2672d332a510da076dca6d2
 MD5 (hp850.zip) = e37477210305e027c45f82d04d1613d1
 MD5 (pdf_sec.ps) = 92cd6af5b4d7219e91e61b8351f0f7c4
diff --git a/print/ghostscript5/patches/patch-aa b/print/ghostscript5/patches/patch-aa
index 66654020126..d971551f1ff 100644
--- a/print/ghostscript5/patches/patch-aa
+++ b/print/ghostscript5/patches/patch-aa
@@ -1,69 +1,56 @@
-$NetBSD: patch-aa,v 1.3 1998/08/07 11:11:22 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/11/04 21:42:12 mycroft Exp $
 
---- unix-gcc.mak.orig	Tue Nov 25 03:29:01 1997
-+++ unix-gcc.mak	Sun Feb 22 17:08:48 1998
-@@ -1,3 +1,4 @@
-+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 cdj850.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 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 pdfwrite.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
- #    Copyright (C) 1997 Aladdin Enterprises.  All rights reserved.
- # 
- # This file is part of Aladdin Ghostscript.
-@@ -151,7 +152,7 @@
- # Define the directory where the zlib sources are stored.
- # See zlib.mak for more information.
+--- unix-gcc.mak.orig	Wed Nov  4 13:11:19 1998
++++ unix-gcc.mak	Wed Nov  4 14:40:18 1998
+@@ -141,7 +141,7 @@
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
  
--ZSRCDIR=zlib
-+ZSRCDIR=.
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
  
- # Choose whether to use a shared version of the zlib library, and if so,
+ # Define the directory where the zlib sources are stored.
+@@ -153,7 +153,7 @@
  # what its name is (usually libz, but sometimes libgz).
-@@ -176,7 +177,7 @@
- 
- # Define the name of the C compiler.
- 
--CC=gcc
-+CC=cc
+ # See gs.mak and Make.htm for more information.
  
- # Define the name of the linker for the final link step.
- # Normally this is the same as the C compiler.
-@@ -218,7 +219,7 @@
- # SVR4 may need -lnsl.
- # (Libraries required by individual drivers are handled automatically.)
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
  
--EXTRALIBS=
-+EXTRALIBS=-lz
- 
- # 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 +229,7 @@
+@@ -234,7 +234,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
-@@ -240,12 +241,12 @@
- #XLIBDIRS=-L/usr/openwin/lib
- #XLIBDIR=/usr/openwin/lib
+@@ -246,12 +246,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
-+XLIBDIRS=-L/usr/X11R6/lib
++XLIBDIRS=-L${X11BASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
 +#XLIBS=Xt Xext X11
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -287,22 +288,22 @@
- 
- # Choose the device(s) to include.  See devs.mak for details.
+@@ -295,23 +295,23 @@
+ # 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 x11mono.dev
+-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
@@ -72,14 +59,15 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:11:22 agc Exp $
 -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_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
@@ -88,64 +76,13 @@ $NetBSD: patch-aa,v 1.3 1998/08/07 11:11:22 agc Exp $
 +#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
  
  # ---------------------------- End of options --------------------------- #
  
-@@ -3676,8 +3677,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 +3759,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 +3806,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 +4585,13 @@
- 
- cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
- 
-+cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
-+
- cdeskjet.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdeskjet $(cdeskjet_)
-+
-+cdj850.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj850 $(cdeskjet8_)
- 
- cdjcolor.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript5/patches/patch-ad b/print/ghostscript5/patches/patch-ad
deleted file mode 100644
index a25783f4f0a..00000000000
--- a/print/ghostscript5/patches/patch-ad
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: patch-ad,v 1.2 1998/08/07 11:11:23 agc Exp $
-
---- /dev/null	Sun May 18 19:02:12 1997
-+++ cdj850.dev	Sun May 18 19:14:48 1997
-@@ -0,0 +1 @@
-+-dev cdj850 -include page -obj gdevcd8.o gdevpcl.o
diff --git a/print/ghostscript5/patches/patch-ae b/print/ghostscript5/patches/patch-ae
deleted file mode 100644
index e7986e68859..00000000000
--- a/print/ghostscript5/patches/patch-ae
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ae,v 1.2 1998/08/07 11:11:23 agc Exp $
-
---- devs.mak.org	Sun May 18 19:17:33 1997
-+++ devs.mak	Sun May 18 19:19:06 1997
-@@ -676,8 +676,13 @@
- 
- cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
- 
-+cdeskjet8_=gdevcd8.$(OBJ) $(HPPCL)
-+
- cdeskjet.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdeskjet $(cdeskjet_)
-+
-+cdj850.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj850 $(cdeskjet8_)
- 
- cdjcolor.dev: $(cdeskjet_) page.dev
- 	$(SETPDEV) cdjcolor $(cdeskjet_)
diff --git a/print/ghostscript5/pkg/PLIST b/print/ghostscript5/pkg/PLIST
index 0b181d0ad99..51121db00c1 100644
--- a/print/ghostscript5/pkg/PLIST
+++ b/print/ghostscript5/pkg/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 1998/01/24 22:37:53 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.5 1998/11/04 21:42:13 mycroft Exp $
 bin/bdftops
+bin/dvipdf
 bin/font2c
 bin/gs
 bin/gsbj
@@ -14,6 +15,7 @@ bin/printafm
 bin/ps2ascii
 bin/ps2epsi
 bin/ps2pdf
+bin/ps2ps
 bin/wftopfa
 man/man1/gs.1
 man/man1/pdf2dsc.1
@@ -21,175 +23,184 @@ man/man1/pdf2ps.1
 man/man1/ps2ascii.1
 man/man1/ps2epsi.1
 man/man1/ps2pdf.1
-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/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/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
+man/man1/ps2ps.1
+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/ps2epsi.txt
+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
@@ -357,7 +368,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/ghostscript5/scripts/configure.batch b/print/ghostscript5/scripts/configure.batch
index ceb7cff8c98..3c93b5297ca 100644
--- a/print/ghostscript5/scripts/configure.batch
+++ b/print/ghostscript5/scripts/configure.batch
@@ -1,13 +1,13 @@
 #! /bin/sh
 #
-# $NetBSD: configure.batch,v 1.2 1998/08/07 11:11:24 agc Exp $
+# $NetBSD: configure.batch,v 1.3 1998/11/04 21:42:14 mycroft Exp $
 #
 
 # 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 cdj850.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 la70t.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=x11.dev x11alpha.dev x11cmyk.dev x11cmyk2.dev x11cmyk4.dev x11cmyk8.dev x11gray2.dev x11gray4.dev x11mono.dev cljet5.dev deskjet.dev djet500.dev laserjet.dev ljet2p.dev ljet3.dev ljet3d.dev ljet4.dev ljetplus.dev lj5mono.dev lj5gray.dev lp2563.dev oce9050.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 jpeg.dev jpeggray.dev miff24.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 plan9bm.dev pngmono.dev pnggray.dev png16.dev png256.dev png16m.dev psmono.dev psgray.dev psrgb.dev tiff12nc.dev tiff24nc.dev tifflzw.dev tiffpack.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 cdj850.dev cp50.dev declj250.dev djet500c.dev dnj650c.dev epson.dev eps9mid.dev eps9high.dev epsonc.dev hl7x0.dev ibmpro.dev imagen.dev iwhi.dev iwlo.dev iwlq.dev jetp3852.dev la50.dev la70.dev la70t.dev la75.dev la75plus.dev lbp8.dev lips3.dev ln03.dev lj250.dev lj4dith.dev lp8000.dev lq850.dev m8510.dev necp6.dev nwp533.dev oki182.dev okiibm.dev paintjet.dev pj.dev pjetxl.dev pjxl.dev pjxl300.dev r4081.dev sj48.dev sparc.dev st800.dev stcolor.dev t4693d2.dev t4693d4.dev t4693d8.dev tek4696.dev uniprint.dev xes.dev dfaxhigh.dev dfaxlow.dev cif.dev inferno.dev mgrmono.dev mgrgray2.dev mgrgray4.dev mgrgray8.dev mgr4.dev mgr8.dev sgirgb.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices