Upgrade to ghostscript 5.03

Makefile:
- Changed WRKSRC
- New GS_SOURCES
- Make symbolic link from jpeg-6a and libpng port's workdir into
  WRKSRC, instead of patching unix-gcc.mak  further:
	ln -s ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
- updated md5 files

patches/patch-aa:
- new unified diff because some of the above mentioned changes
- Only commented out the default DEVICE_DEVS
- make our zlib compile again

pkg/DESCR:
- bumped version number

pkg/PLIST:
- updated PLIST
- added proper @dirrm's for a successfull pkg_delete action

scripts/configure:
- added new drivers
	"la70t" "DEC LA70 printer with low resol. text enhancement" ON \
	"lq850" "EPSON LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" ON \
- rmoved one unnecessary "pdfwrite"

- same for scripts/configure.batch
As requested by:	Lars Koeller ;-)

7 files changed, 237 insertions, 235 deletions

diff --git a/print/ghostscript6/Makefile b/print/ghostscript6/Makefile
index 016802415e01..c6463d08a23a 100644
--- a/print/ghostscript6/Makefile
+++ b/print/ghostscript6/Makefile
@@ -3,10 +3,10 @@
 # Date created:		Tue Jun 10 21:58:54 CEST 1997
 # Whom:			Andreas Klemm <andreas@klemm.gtn.com>
 #
-# $Id: Makefile,v 1.4 1997/06/14 09:36:28 andreas Exp $
+# $Id: Makefile,v 1.5 1997/07/13 18:49:28 max Exp $
 #
 
-DISTNAME=	ghostscript-5.0
+DISTNAME=	ghostscript-5.03
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.cs.wisc.edu/ghost/aladdin/
 DISTFILES=	${GS_SOURCES} ${GS_FONTS_STD} ${GS_FONTS_OTHER}
@@ -19,13 +19,13 @@ DEPENDS_TARGET=	extract
 
 MAKE_ENV=	PORTSDIR=${PORTSDIR}
 EXTRACT_ONLY=	${GS_SOURCES}
-WRKSRC=		${WRKDIR}/gs5.0
+WRKSRC=		${WRKDIR}/gs5.03
 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
 
-GS_SOURCES=	ghostscript-5.0.tar.gz
-GS_SOURCES+=	ghostscript-5.0gnu.tar.gz
+GS_SOURCES=	ghostscript-5.03.tar.gz
+GS_SOURCES+=	ghostscript-5.03gnu.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
@@ -46,12 +46,14 @@ pre-fetch:
 
 
 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
+	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 ${PORTSDIR}/graphics/jpeg/work/jpeg-6a ${WRKSRC}/jpeg-6a
+	ln -s ${PORTSDIR}/graphics/png/work/libpng-0.96 ${WRKSRC}/libpng
 
 do-configure:
 .if defined(BATCH)
diff --git a/print/ghostscript6/distinfo b/print/ghostscript6/distinfo
index cee99b2827d1..1e59f0799ce8 100644
--- a/print/ghostscript6/distinfo
+++ b/print/ghostscript6/distinfo
@@ -1,4 +1,4 @@
-MD5 (ghostscript-5.0.tar.gz) = ee33f94a413f5476d8021aee8c84563d
-MD5 (ghostscript-5.0gnu.tar.gz) = 1f394adbb2720502d74023d9862a1935
+MD5 (ghostscript-5.03.tar.gz) = 43aadf534775dc47f3ca2c235023f909
+MD5 (ghostscript-5.03gnu.tar.gz) = f33fa05bec91d96fef34fe902629f974
 MD5 (ghostscript-fonts-std-4.0.tar.gz) = 1e0fe2149affd80deaaae144227049b9
 MD5 (ghostscript-fonts-other-5.0.tar.gz) = 703bcc5592f4b4644cda454bcc45c7d6
diff --git a/print/ghostscript6/files/patch-aa b/print/ghostscript6/files/patch-aa
index 7fec6a2e9143..9a32f8c0ed18 100644
--- a/print/ghostscript6/files/patch-aa
+++ b/print/ghostscript6/files/patch-aa
@@ -1,34 +1,11 @@
---- unix-gcc.mak.orig	Sat Jun  7 03:40:37 1997
-+++ unix-gcc.mak	Sat Jun 14 10:50:37 1997
-@@ -1,3 +1,9 @@
-+# FreeBSD ports collection - Porters note:
-+#	the device(s) we include are now completely controlled
-+#	be the two scripts configure and configure.batch.
-+# A detailled list of supported devices see: devs.mak
-+#	Andreas ///
-+
+--- unix-gcc.mak.orig	Sat Aug  9 20:27:58 1997
++++ unix-gcc.mak	Sun Aug 24 15:44:56 1997
+@@ -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.
-@@ -126,7 +132,7 @@
- # You may need to change this if the IJG library version changes.
- # See jpeg.mak for more information.
- 
--JSRCDIR=jpeg-6a
-+JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
- JVERSION=6
- 
- # Define the directory where the PNG library sources are stored,
-@@ -134,7 +140,7 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.96
- PVERSION=89
- 
- # Choose whether to use a shared version of the PNG library, and if so,
-@@ -147,7 +153,7 @@
+@@ -150,7 +151,7 @@
  # Define the directory where the zlib sources are stored.
  # See zlib.mak for more information.
  
@@ -37,7 +14,7 @@
  
  # Choose whether to use a shared version of the zlib library, and if so,
  # what its name is (usually libz, but sometimes libgz).
-@@ -172,7 +178,7 @@
+@@ -175,7 +176,7 @@
  
  # Define the name of the C compiler.
  
@@ -46,7 +23,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -214,7 +220,7 @@
+@@ -217,7 +218,7 @@
  # SVR4 may need -lnsl.
  # (Libraries required by individual drivers are handled automatically.)
  
@@ -55,7 +32,7 @@
  
  # 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
-@@ -224,7 +230,7 @@
+@@ -227,7 +228,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -64,7 +41,7 @@
  
  # 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
-@@ -236,7 +242,7 @@
+@@ -242,7 +243,7 @@
  #XLIBS=Xt SM ICE Xext X11
  
  #XLIBDIRS=-L/usr/local/X/lib
@@ -73,18 +50,16 @@
  XLIBDIR=
  XLIBS=Xt Xext X11
  
-@@ -278,25 +284,6 @@
+@@ -286,22 +287,22 @@
  
- FILE_IMPLEMENTATION=stdio
+ # Choose the device(s) to include.  See devs.mak for details.
  
--# Choose the device(s) to include.  See devs.mak for details.
--
 -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=
+-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
@@ -95,38 +70,37 @@
 -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 --------------------------- #
  
- # Define the name of the partial makefile that specifies options --
-@@ -3204,7 +3191,7 @@
- 
- # JSRCDIR is defined in the platform-specific makefile, not here,
- # as the directory where the IJG library sources are stored.
--#JSRCDIR=jpeg-6a
-+#JSRCDIR=${PORTSDIR}/graphics/jpeg/work/jpeg-6a
- # JVERSION is defined in the platform-specific makefile, not here,
- # as the IJG library major version number (currently "5" or "6").
- #JVERSION=6
-@@ -3551,7 +3538,7 @@
- 
- # PSRCDIR is defined in the platform-specific makefile, not here,
- # as the directory where the PNG library sources are stored.
--#PSRCDIR=libpng
-+#PSRCDIR=${PORTSDIR}/graphics/png/work/libpng-0.89c
- # PVERSION is defined in the platform-specific makefile, not here,
- # as the libpng version number ("88", "89", "90", or "95").
- #PVERSION=95
-@@ -3655,7 +3642,7 @@
- 
- # ZSRCDIR is defined in the platform-specific makefile, not here,
- # as the directory where the zlib sources are stored.
--#ZSRCDIR=zlib
-+#ZSRCDIR=.
- ZSRC=$(ZSRCDIR)$(D)
- # We would like to define
- #CCCZ=$(CCC) -I$(ZSRCDIR) -Dverbose=-1
-@@ -3704,7 +3691,7 @@
+@@ -3629,8 +3630,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.
+@@ -3711,7 +3712,7 @@
  zlibe_1.dev: $(MAKEFILE) $(ZLIB_MAK) $(ECHOGS_XE)
  	$(SETMOD) zlibe_1 -lib $(ZLIB_NAME)
  
@@ -135,7 +109,7 @@
  zlibe_0.dev: $(ZLIB_MAK) $(ECHOGS_XE) zlibc.dev $(zlibe_)
  	$(SETMOD) zlibe_0 $(zlibe_)
  	$(ADDMOD) zlibe_0 -include zlibc
-@@ -3751,11 +3738,11 @@
+@@ -3758,11 +3759,11 @@
  
  zlibd1_=infblock.$(OBJ) infcodes.$(OBJ) inffast.$(OBJ)
  zlibd2_=inflate.$(OBJ) inftrees.$(OBJ) infutil.$(OBJ)
@@ -152,7 +126,7 @@
  
  infblock.$(OBJ): $(ZSRC)infblock.c $(ZDEP) zutil.h
  	$(CP_) $(ZSRC)infblock.c .
-@@ -4522,8 +4509,13 @@
+@@ -4537,8 +4538,13 @@
  
  cdeskjet_=gdevcdj.$(OBJ) $(HPPCL)
  
diff --git a/print/ghostscript6/pkg-descr b/print/ghostscript6/pkg-descr
index f11756968608..fbed1aed748e 100644
--- a/print/ghostscript6/pkg-descr
+++ b/print/ghostscript6/pkg-descr
@@ -1,6 +1,6 @@
-This is Aladdin Ghostscript 5.0, the non-GPL version that comes
+This is Aladdin Ghostscript 5.03, the non-GPL version that comes
 with a licence different from the GPL. Read the file PUBLIC in the
-work/gs5.0 directory or in /usr/local/share/ghostscript/5.0/doc/PUBLIC
+work/gs5.03 directory or in /usr/local/share/ghostscript/5.03/doc/PUBLIC
 after installation for details !
 
 Ghostscript is the well-known PostScript interpreter which is
diff --git a/print/ghostscript6/pkg-plist b/print/ghostscript6/pkg-plist
index 5b23666a2443..c81b9aa9af23 100644
--- a/print/ghostscript6/pkg-plist
+++ b/print/ghostscript6/pkg-plist
@@ -20,155 +20,175 @@ man/man1/pdf2ps.1.gz
 man/man1/ps2ascii.1.gz
 man/man1/ps2epsi.1.gz
 man/man1/ps2pdf.1.gz
-share/ghostscript/5.0/Fontmap
-share/ghostscript/5.0/acctest.ps
-share/ghostscript/5.0/align.ps
-share/ghostscript/5.0/bdftops.ps
-share/ghostscript/5.0/caption.ps
-share/ghostscript/5.0/cbjc600.ppd
-share/ghostscript/5.0/cbjc800.ppd
-share/ghostscript/5.0/cdj550.upp
-share/ghostscript/5.0/decrypt.ps
-share/ghostscript/5.0/doc/COPYING
-share/ghostscript/5.0/doc/NEWS
-share/ghostscript/5.0/doc/PUBLIC
-share/ghostscript/5.0/doc/README
-share/ghostscript/5.0/doc/bug-form.txt
-share/ghostscript/5.0/doc/c-style.txt
-share/ghostscript/5.0/doc/current.txt
-share/ghostscript/5.0/doc/devices.txt
-share/ghostscript/5.0/doc/drivers.txt
-share/ghostscript/5.0/doc/fonts.txt
-share/ghostscript/5.0/doc/helpers.txt
-share/ghostscript/5.0/doc/hershey.txt
-share/ghostscript/5.0/doc/history1.txt
-share/ghostscript/5.0/doc/history2.txt
-share/ghostscript/5.0/doc/history3.txt
-share/ghostscript/5.0/doc/humor.txt
-share/ghostscript/5.0/doc/install.txt
-share/ghostscript/5.0/doc/language.txt
-share/ghostscript/5.0/doc/lib.txt
-share/ghostscript/5.0/doc/make.txt
-share/ghostscript/5.0/doc/new-user.txt
-share/ghostscript/5.0/doc/ps2epsi.txt
-share/ghostscript/5.0/doc/ps2pdf.txt
-share/ghostscript/5.0/doc/psfiles.txt
-share/ghostscript/5.0/doc/public.txt
-share/ghostscript/5.0/doc/unix-lpr.txt
-share/ghostscript/5.0/doc/use.txt
-share/ghostscript/5.0/doc/xfonts.txt
-share/ghostscript/5.0/docie.ps
-share/ghostscript/5.0/examples/alphabet.ps
-share/ghostscript/5.0/examples/cheq.ps
-share/ghostscript/5.0/examples/chess.ps
-share/ghostscript/5.0/examples/colorcir.ps
-share/ghostscript/5.0/examples/escher.ps
-share/ghostscript/5.0/examples/golfer.ps
-share/ghostscript/5.0/examples/grayalph.ps
-share/ghostscript/5.0/examples/snowflak.ps
-share/ghostscript/5.0/examples/tiger.ps
-share/ghostscript/5.0/examples/waterfal.ps
-share/ghostscript/5.0/font2c.ps
-share/ghostscript/5.0/gs_btokn.ps
-share/ghostscript/5.0/gs_ccfnt.ps
-share/ghostscript/5.0/gs_cff.ps
-share/ghostscript/5.0/gs_cidfn.ps
-share/ghostscript/5.0/gs_cmap.ps
-share/ghostscript/5.0/gs_dbt_e.ps
-share/ghostscript/5.0/gs_diskf.ps
-share/ghostscript/5.0/gs_dpnxt.ps
-share/ghostscript/5.0/gs_dps1.ps
-share/ghostscript/5.0/gs_dps2.ps
-share/ghostscript/5.0/gs_epsf.ps
-share/ghostscript/5.0/gs_fonts.ps
-share/ghostscript/5.0/gs_init.ps
-share/ghostscript/5.0/gs_iso_e.ps
-share/ghostscript/5.0/gs_kanji.ps
-share/ghostscript/5.0/gs_ksb_e.ps
-share/ghostscript/5.0/gs_l2img.ps
-share/ghostscript/5.0/gs_lev2.ps
-share/ghostscript/5.0/gs_mex_e.ps
-share/ghostscript/5.0/gs_mro_e.ps
-share/ghostscript/5.0/gs_pdf.ps
-share/ghostscript/5.0/gs_pdf_e.ps
-share/ghostscript/5.0/gs_pdfwr.ps
-share/ghostscript/5.0/gs_pfile.ps
-share/ghostscript/5.0/gs_res.ps
-share/ghostscript/5.0/gs_setpd.ps
-share/ghostscript/5.0/gs_statd.ps
-share/ghostscript/5.0/gs_std_e.ps
-share/ghostscript/5.0/gs_sym_e.ps
-share/ghostscript/5.0/gs_ttf.ps
-share/ghostscript/5.0/gs_typ42.ps
-share/ghostscript/5.0/gs_type1.ps
-share/ghostscript/5.0/gs_wan_e.ps
-share/ghostscript/5.0/gslp.ps
-share/ghostscript/5.0/impath.ps
-share/ghostscript/5.0/landscap.ps
-share/ghostscript/5.0/level1.ps
-share/ghostscript/5.0/lines.ps
-share/ghostscript/5.0/markhint.ps
-share/ghostscript/5.0/markpath.ps
-share/ghostscript/5.0/necp2x.upp
-share/ghostscript/5.0/packfile.ps
-share/ghostscript/5.0/pcharstr.ps
-share/ghostscript/5.0/pdf2dsc.ps
-share/ghostscript/5.0/pdf_2ps.ps
-share/ghostscript/5.0/pdf_base.ps
-share/ghostscript/5.0/pdf_draw.ps
-share/ghostscript/5.0/pdf_font.ps
-share/ghostscript/5.0/pdf_main.ps
-share/ghostscript/5.0/pdf_sec.ps
-share/ghostscript/5.0/pfbtogs.ps
-share/ghostscript/5.0/ppath.ps
-share/ghostscript/5.0/prfont.ps
-share/ghostscript/5.0/printafm.ps
-share/ghostscript/5.0/ps2ai.ps
-share/ghostscript/5.0/ps2ascii.ps
-share/ghostscript/5.0/ps2epsi.ps
-share/ghostscript/5.0/ps2image.ps
-share/ghostscript/5.0/quit.ps
-share/ghostscript/5.0/ras1.upp
-share/ghostscript/5.0/ras24.upp
-share/ghostscript/5.0/ras3.upp
-share/ghostscript/5.0/ras32.upp
-share/ghostscript/5.0/ras4.upp
-share/ghostscript/5.0/ras8m.upp
-share/ghostscript/5.0/showchar.ps
-share/ghostscript/5.0/showpage.ps
-share/ghostscript/5.0/stc.upp
-share/ghostscript/5.0/stc2.upp
-share/ghostscript/5.0/stc2_h.upp
-share/ghostscript/5.0/stc2s_h.upp
-share/ghostscript/5.0/stc500p.upp
-share/ghostscript/5.0/stc500ph.upp
-share/ghostscript/5.0/stc600ih.upp
-share/ghostscript/5.0/stc600p.upp
-share/ghostscript/5.0/stc600pl.upp
-share/ghostscript/5.0/stc800ih.upp
-share/ghostscript/5.0/stc800p.upp
-share/ghostscript/5.0/stc800pl.upp
-share/ghostscript/5.0/stc_h.upp
-share/ghostscript/5.0/stc_l.upp
-share/ghostscript/5.0/stcany.upp
-share/ghostscript/5.0/stcinfo.ps
-share/ghostscript/5.0/stcolor.ps
-share/ghostscript/5.0/traceimg.ps
-share/ghostscript/5.0/traceop.ps
-share/ghostscript/5.0/type1enc.ps
-share/ghostscript/5.0/type1ops.ps
-share/ghostscript/5.0/uninfo.ps
-share/ghostscript/5.0/unprot.ps
-share/ghostscript/5.0/viewcmyk.ps
-share/ghostscript/5.0/viewgif.ps
-share/ghostscript/5.0/viewjpeg.ps
-share/ghostscript/5.0/viewpbm.ps
-share/ghostscript/5.0/viewpcx.ps
-share/ghostscript/5.0/viewps2a.ps
-share/ghostscript/5.0/wftopfa.ps
-share/ghostscript/5.0/winmaps.ps
-share/ghostscript/5.0/wrfont.ps
-share/ghostscript/5.0/zeroline.ps
+share/ghostscript/5.03/Fontmap
+share/ghostscript/5.03/acctest.ps
+share/ghostscript/5.03/align.ps
+share/ghostscript/5.03/bdftops.ps
+share/ghostscript/5.03/bjc610a0.upp
+share/ghostscript/5.03/bjc610a1.upp
+share/ghostscript/5.03/bjc610a2.upp
+share/ghostscript/5.03/bjc610a3.upp
+share/ghostscript/5.03/bjc610a4.upp
+share/ghostscript/5.03/bjc610a5.upp
+share/ghostscript/5.03/bjc610a6.upp
+share/ghostscript/5.03/bjc610a7.upp
+share/ghostscript/5.03/bjc610a8.upp
+share/ghostscript/5.03/bjc610b1.upp
+share/ghostscript/5.03/bjc610b2.upp
+share/ghostscript/5.03/bjc610b3.upp
+share/ghostscript/5.03/bjc610b4.upp
+share/ghostscript/5.03/bjc610b6.upp
+share/ghostscript/5.03/bjc610b7.upp
+share/ghostscript/5.03/bjc610b8.upp
+share/ghostscript/5.03/caption.ps
+share/ghostscript/5.03/cbjc600.ppd
+share/ghostscript/5.03/cbjc800.ppd
+share/ghostscript/5.03/cdj550.upp
+share/ghostscript/5.03/decrypt.ps
+share/ghostscript/5.03/doc/COPYING
+share/ghostscript/5.03/doc/NEWS
+share/ghostscript/5.03/doc/PUBLIC
+share/ghostscript/5.03/doc/README
+share/ghostscript/5.03/doc/bug-form.txt
+share/ghostscript/5.03/doc/c-style.txt
+share/ghostscript/5.03/doc/current.txt
+share/ghostscript/5.03/doc/devices.txt
+share/ghostscript/5.03/doc/drivers.txt
+share/ghostscript/5.03/doc/fonts.txt
+share/ghostscript/5.03/doc/helpers.txt
+share/ghostscript/5.03/doc/hershey.txt
+share/ghostscript/5.03/doc/history1.txt
+share/ghostscript/5.03/doc/history2.txt
+share/ghostscript/5.03/doc/history3.txt
+share/ghostscript/5.03/doc/humor.txt
+share/ghostscript/5.03/doc/install.txt
+share/ghostscript/5.03/doc/language.txt
+share/ghostscript/5.03/doc/lib.txt
+share/ghostscript/5.03/doc/make.txt
+share/ghostscript/5.03/doc/new-user.txt
+share/ghostscript/5.03/doc/ps2epsi.txt
+share/ghostscript/5.03/doc/ps2pdf.txt
+share/ghostscript/5.03/doc/psfiles.txt
+share/ghostscript/5.03/doc/public.txt
+share/ghostscript/5.03/doc/unix-lpr.txt
+share/ghostscript/5.03/doc/use.txt
+share/ghostscript/5.03/doc/xfonts.txt
+share/ghostscript/5.03/docie.ps
+share/ghostscript/5.03/examples/alphabet.ps
+share/ghostscript/5.03/examples/cheq.ps
+share/ghostscript/5.03/examples/chess.ps
+share/ghostscript/5.03/examples/colorcir.ps
+share/ghostscript/5.03/examples/escher.ps
+share/ghostscript/5.03/examples/golfer.ps
+share/ghostscript/5.03/examples/grayalph.ps
+share/ghostscript/5.03/examples/ridt91.eps
+share/ghostscript/5.03/examples/snowflak.ps
+share/ghostscript/5.03/examples/tiger.ps
+share/ghostscript/5.03/examples/waterfal.ps
+share/ghostscript/5.03/font2c.ps
+share/ghostscript/5.03/gs_btokn.ps
+share/ghostscript/5.03/gs_ccfnt.ps
+share/ghostscript/5.03/gs_cff.ps
+share/ghostscript/5.03/gs_cidfn.ps
+share/ghostscript/5.03/gs_cmap.ps
+share/ghostscript/5.03/gs_dbt_e.ps
+share/ghostscript/5.03/gs_diskf.ps
+share/ghostscript/5.03/gs_dpnxt.ps
+share/ghostscript/5.03/gs_dps.ps
+share/ghostscript/5.03/gs_dps1.ps
+share/ghostscript/5.03/gs_dps2.ps
+share/ghostscript/5.03/gs_epsf.ps
+share/ghostscript/5.03/gs_fonts.ps
+share/ghostscript/5.03/gs_init.ps
+share/ghostscript/5.03/gs_iso_e.ps
+share/ghostscript/5.03/gs_kanji.ps
+share/ghostscript/5.03/gs_ksb_e.ps
+share/ghostscript/5.03/gs_l2img.ps
+share/ghostscript/5.03/gs_lev2.ps
+share/ghostscript/5.03/gs_mex_e.ps
+share/ghostscript/5.03/gs_mro_e.ps
+share/ghostscript/5.03/gs_pdf.ps
+share/ghostscript/5.03/gs_pdf_e.ps
+share/ghostscript/5.03/gs_pdfwr.ps
+share/ghostscript/5.03/gs_pfile.ps
+share/ghostscript/5.03/gs_res.ps
+share/ghostscript/5.03/gs_setpd.ps
+share/ghostscript/5.03/gs_statd.ps
+share/ghostscript/5.03/gs_std_e.ps
+share/ghostscript/5.03/gs_sym_e.ps
+share/ghostscript/5.03/gs_ttf.ps
+share/ghostscript/5.03/gs_typ42.ps
+share/ghostscript/5.03/gs_type1.ps
+share/ghostscript/5.03/gs_wan_e.ps
+share/ghostscript/5.03/gslp.ps
+share/ghostscript/5.03/impath.ps
+share/ghostscript/5.03/landscap.ps
+share/ghostscript/5.03/level1.ps
+share/ghostscript/5.03/lines.ps
+share/ghostscript/5.03/markhint.ps
+share/ghostscript/5.03/markpath.ps
+share/ghostscript/5.03/necp2x.upp
+share/ghostscript/5.03/necp2x6.upp
+share/ghostscript/5.03/packfile.ps
+share/ghostscript/5.03/pcharstr.ps
+share/ghostscript/5.03/pdf2dsc.ps
+share/ghostscript/5.03/pdf_2ps.ps
+share/ghostscript/5.03/pdf_base.ps
+share/ghostscript/5.03/pdf_draw.ps
+share/ghostscript/5.03/pdf_font.ps
+share/ghostscript/5.03/pdf_main.ps
+share/ghostscript/5.03/pdf_sec.ps
+share/ghostscript/5.03/pfbtogs.ps
+share/ghostscript/5.03/ppath.ps
+share/ghostscript/5.03/prfont.ps
+share/ghostscript/5.03/printafm.ps
+share/ghostscript/5.03/ps2ai.ps
+share/ghostscript/5.03/ps2ascii.ps
+share/ghostscript/5.03/ps2epsi.ps
+share/ghostscript/5.03/ps2image.ps
+share/ghostscript/5.03/quit.ps
+share/ghostscript/5.03/ras1.upp
+share/ghostscript/5.03/ras24.upp
+share/ghostscript/5.03/ras3.upp
+share/ghostscript/5.03/ras32.upp
+share/ghostscript/5.03/ras4.upp
+share/ghostscript/5.03/ras8m.upp
+share/ghostscript/5.03/showchar.ps
+share/ghostscript/5.03/showpage.ps
+share/ghostscript/5.03/stc.upp
+share/ghostscript/5.03/stc1520h.upp
+share/ghostscript/5.03/stc2.upp
+share/ghostscript/5.03/stc2_h.upp
+share/ghostscript/5.03/stc2s_h.upp
+share/ghostscript/5.03/stc500p.upp
+share/ghostscript/5.03/stc500ph.upp
+share/ghostscript/5.03/stc600ih.upp
+share/ghostscript/5.03/stc600p.upp
+share/ghostscript/5.03/stc600pl.upp
+share/ghostscript/5.03/stc800ih.upp
+share/ghostscript/5.03/stc800p.upp
+share/ghostscript/5.03/stc800pl.upp
+share/ghostscript/5.03/stc_h.upp
+share/ghostscript/5.03/stc_l.upp
+share/ghostscript/5.03/stcany.upp
+share/ghostscript/5.03/stcinfo.ps
+share/ghostscript/5.03/stcolor.ps
+share/ghostscript/5.03/traceimg.ps
+share/ghostscript/5.03/traceop.ps
+share/ghostscript/5.03/type1enc.ps
+share/ghostscript/5.03/type1ops.ps
+share/ghostscript/5.03/uninfo.ps
+share/ghostscript/5.03/unprot.ps
+share/ghostscript/5.03/viewcmyk.ps
+share/ghostscript/5.03/viewgif.ps
+share/ghostscript/5.03/viewjpeg.ps
+share/ghostscript/5.03/viewpbm.ps
+share/ghostscript/5.03/viewpcx.ps
+share/ghostscript/5.03/viewps2a.ps
+share/ghostscript/5.03/wftopfa.ps
+share/ghostscript/5.03/winmaps.ps
+share/ghostscript/5.03/wrfont.ps
+share/ghostscript/5.03/zeroline.ps
 share/ghostscript/fonts/a010013l.afm
 share/ghostscript/fonts/a010013l.pfb
 share/ghostscript/fonts/a010013l.pfm
@@ -335,3 +355,8 @@ share/ghostscript/fonts/u004006t.pfm
 share/ghostscript/fonts/z003034l.afm
 share/ghostscript/fonts/z003034l.pfb
 share/ghostscript/fonts/z003034l.pfm
+@dirrm share/ghostscript/fonts
+@dirrm share/ghostscript/5.03/doc
+@dirrm share/ghostscript/5.03/examples
+@dirrm share/ghostscript/5.03
+@dirrm share/ghostscript
diff --git a/print/ghostscript6/scripts/configure b/print/ghostscript6/scripts/configure
index 6c9125d8b4b0..91107e76a763 100644
--- a/print/ghostscript6/scripts/configure
+++ b/print/ghostscript6/scripts/configure
@@ -50,6 +50,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "laserjet" "HP LaserJet" ON \
   "la50"     "DEC LA50 printer" ON \
   "la70"     "DEC LA70 printer" ON \
+  "la70t"    "DEC LA70 printer with low resol. text enhancement" ON \
   "la75"     "DEC LA75 printer" ON \
   "la75plus" "DEC LA75plus printer" ON \
   "lbp8"     "Canon LBP-8II laser printer" ON \
@@ -66,6 +67,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
@@ -122,7 +124,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "mgrgray8" "8-bit gray scale MGR devices" ON \
   "mgr4"     "4-bit (VGA) color MGR devices" ON \
   "mgr8"     "8-bit color MGR devices" ON \
-  "pdfwrite" "Allow writting of pdf files" ON \
   "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 \
diff --git a/print/ghostscript6/scripts/configure.batch b/print/ghostscript6/scripts/configure.batch
index ac7b80a28fe8..469cba521c97 100644
--- a/print/ghostscript6/scripts/configure.batch
+++ b/print/ghostscript6/scripts/configure.batch
@@ -4,7 +4,7 @@
 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 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
+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
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices