15 files changed, 204 insertions, 166 deletions

diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile
index 7813ba66771e..85b0d1400b8f 100644
--- a/print/ghostscript7/Makefile
+++ b/print/ghostscript7/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	6.53
-PORTREVISION=	2
+PORTVERSION=	7.05
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
-		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,fonts,gprint,hpijs/} \
+		${MASTER_SITE_SOURCEFORGE:S/$/:DEFAULT,gprint,hpijs/} \
 		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
 		http://home.t-online.de/home/Martin.Lottermoser/pcl3dist/:hpdj_pcl3 \
 		http://www.harsch.net/Download/:dj970 \
@@ -20,8 +19,8 @@ MASTER_SITES=	${MASTER_SITE_GNU:S/$/:DEFAULT,fonts/} \
 		http://www.epkowa.on.arena.ne.jp/pips/data/gs65_301/:eplaser \
 		http://www.ceres.dti.ne.jp/~owatanab/gdevnpdl/:npdl \
 		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/ \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs653/
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/fonts/:fonts \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/gnu/gs705/
 MASTER_SITE_SUBDIR=	${PORTNAME} \
 			gimp-print/:gprint \
 			hpinkjet/:hpijs \
@@ -51,18 +50,16 @@ EXTRACT_ONLY=	${GS_SRCS}
 
 MAINTAINER=	ports@FreeBSD.org
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
 		XCFLAGS="${XCFLAGS}"
-MAKEFILE=	src/unix-gcc.mak
-ALL_TARGET=	all pcl3opts
 PLIST_SUB=	GS_VERSION=${PORTVERSION}
 
-MAN1=		dvipdf.1 eps2eps.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
+MAN1=		ansi2knr.1 dvipdf.1 font2c.1 gs-hpdj.1 gs-pcl3.1 \
 		gs.1 gslp.1 gsnd.1 pcl3opts.1 pdf2dsc.1 pdf2ps.1 pdfopt.1 \
 		pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 ps2epsi.1 ps2pdf.1 \
 		ps2pdfwr.1 ps2ps.1 wftopfa.1
@@ -71,7 +68,8 @@ MLINKS=		gslp.1 gsbj.1 \
 		gslp.1 gsdj500.1 \
 		gslp.1 gslj.1 \
 		ps2pdf.1 ps2pdf12.1 \
-		ps2pdf.1 ps2pdf13.1
+		ps2pdf.1 ps2pdf13.1 \
+		ps2ps.1 eps2eps.1
 
 XCFLAGS=	-DUPD_SIGNAL=0
 
@@ -86,6 +84,20 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
 MAKE_ENV+=	WITHOUT_X11="${WITHOUT_X11}"
 .endif
 
+.if defined(WITH_SHLIB)
+.undef WITHOUT_X11
+USE_GTK=	yes
+MAKE_ENV+=	GS_SHLIB_VER="${SHLIB_VER}"
+ALL_TARGET=	so pcl3opts
+INSTALL_TARGET=	soinstall
+INSTALLS_SHLIB=	yes
+SHLIB_VER=	1
+PLIST_SUB+=	SHLIB="" SHLIB_VER="${SHLIB_VER}"
+.else
+ALL_TARGET=	all pcl3opts
+PLIST_SUB+=	SHLIB="@comment "
+.endif
+
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
 #  Note: the following two are real files that have symlinks with
 #  later version numbers pointing to them.  To avoid unnecessarily
@@ -127,7 +139,7 @@ DJ970_SRCS=	${DJ970}.c.gz
 # Gimp-Print - very high quality driver for Epson, HPs,...
 # http://gimp-print.sourceforge.net/
 GPRINT=		gimp-print
-GPRINT_VERS=	4.2.0
+GPRINT_VERS=	4.2.1
 GPRINT_NAME=	${GPRINT}-${GPRINT_VERS}
 GPRINT_SRCS=	${GPRINT_NAME}.tar.gz
 
@@ -214,8 +226,6 @@ pre-everything::
 
 post-extract:
 	${ECHO_MSG} ">>> in post-extract ..."
-	${LN} -sf `cd ${PORTSDIR}/graphics/jpeg && ${MAKE} -V WRKSRC` \
-		${WRKSRC}/jpeg
 # ** 3rd party driver **
 # Note: don't forget to add those devices in scripts/configure and
 # configure.batch, which update unix-gcc.mak to build gs with these
@@ -283,6 +293,8 @@ post-extract:
 post-patch:
 	${PERL} -pi -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
 		${WRKSRC}/src/unix-gcc.mak
+	${PERL} -pi -e 's|\. de|\.|g' \
+		${WRKSRC}/src/unixinst.mak
 	${PERL} -pi -e 's|%%DATADIR%%|${DATADIR}|g' \
 		${WRKSRC}/lib/gs_res.ps
 # for HPinkjet driver
@@ -306,7 +318,7 @@ pre-configure:
 		>> ${WRKSRC}/src/contrib.mak
 # for PCL3 driver
 	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-6.51.add \
+	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
 		>> ${WRKSRC}/src/contrib.mak
 # for MD2K driver
 	${ECHO_MSG} ">>>   adding ${MD2K} driver to contrib.mak ..."
@@ -365,8 +377,7 @@ post-configure:
 	${ECHO_MSG} ">>>   running configure script for ${GPRINT} library ..."
 	cd ${WRKSRC}/${GPRINT_NAME} ; \
 		${SETENV} ${MAKE_ENV} ${SH} ./configure \
-			--without-cups --without-translated-ppds \
-			--with-ghost --without-foomatic \
+			--without-translated-ppds \
 			--without-gimp --without-samples \
 			--without-user-guide --disable-escputil \
 			--disable-nls --disable-shared \
@@ -382,6 +393,7 @@ pre-build:
 	${ECHO_MSG} ">>>   creating directories for compilation ..."
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
+	${LN} -sf ${WRKSRC}/src/unix-gcc.mak ${WRKSRC}/Makefile
 # for Gimp-Print driver
 	${ECHO_MSG} ">>>   building ${GPRINT} library ..."
 	cd ${WRKSRC}/${GPRINT_NAME} ; \
@@ -452,7 +464,12 @@ pre-install:
 post-install:
 	${ECHO_MSG} ">>> in post-install ..."
 	${ECHO_MSG} ">>>   stripping gs ..."
+.if defined(WITH_SHLIB)
+	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
+	${LN} -sf gsc ${PREFIX}/bin/gs
+.else
 	${STRIP_CMD} ${PREFIX}/bin/gs
+.endif
 # for HPDJ driver
 	${ECHO_MSG} ">>>   installing ${HPDJ} manpages ..."
 .for i in ${HPDJ_MAN1}
diff --git a/print/ghostscript7/distinfo b/print/ghostscript7/distinfo
index bd9c8db9ee86..6c9c6c2fd255 100644
--- a/print/ghostscript7/distinfo
+++ b/print/ghostscript7/distinfo
@@ -1,11 +1,11 @@
-MD5 (ghostscript/ghostscript-6.53.tar.bz2) = fc61954bddd6252f992b8bc1f4cc8761
+MD5 (ghostscript/ghostscript-7.05.tar.bz2) = 821caada7e265ea5b698a78e6b029734
 MD5 (ghostscript/gnu-gs-fonts-std-6.0.tar.gz) = 1521fab85ca3e8ce3ce781d4970e6c79
 MD5 (ghostscript/gnu-gs-fonts-other-6.0.tar.gz) = 33457d3f37de7ef03d2eea05a9e6aa4f
 MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
 MD5 (ghostscript/hpdj-2.6.tar.gz) = dcc402281f36afd2041144e0e97917be
 MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
-MD5 (ghostscript/gdevdj9.c.gz) = f09ef883b8ba837fb42c608c01af7375
-MD5 (ghostscript/gimp-print-4.2.0.tar.gz) = 4350e2ac1f27eccad0d7ce2aab90cdf6
+MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
+MD5 (ghostscript/gimp-print-4.2.1.tar.gz) = 62f59f0bf0b4d2843cc9953f3b4f894f
 MD5 (ghostscript/hpijs-1.0.4.tar.gz) = e2b8d2a671fdbcd27f20092691d40bba
 MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
 MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
diff --git a/print/ghostscript7/files/patch-eplaser:gdevescv.c b/print/ghostscript7/files/patch-eplaser:gdevescv.c
index b1b6fc57f0c0..dbc3f4a109a9 100644
--- a/print/ghostscript7/files/patch-eplaser:gdevescv.c
+++ b/print/ghostscript7/files/patch-eplaser:gdevescv.c
@@ -1,6 +1,16 @@
 --- eplaser/gdevescv.c.orig	Fri Dec 21 15:50:22 2001
-+++ eplaser/gdevescv.c	Fri Mar 15 04:27:39 2002
-@@ -1760,13 +1760,13 @@
++++ eplaser/gdevescv.c	Sat Apr 27 13:45:53 2002
+@@ -37,8 +37,7 @@
+ 
+  */
+ 
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+ 
+ #include "math_.h"
+ #include "gx.h"
+@@ -1760,13 +1759,13 @@
  
  /* Process the next piece of an image. */
  private int
@@ -16,7 +26,7 @@
      gx_device *dev = info->dev;
  #endif
      gx_device_vector *const	vdev = (gx_device_vector *) dev;
-@@ -1784,7 +1784,7 @@
+@@ -1784,7 +1783,7 @@
  
      {
  
@@ -25,7 +35,7 @@
  	if (height == 260)
  	    height = 1;
  #endif
-@@ -1922,13 +1922,13 @@
+@@ -1922,13 +1921,13 @@
  
  
  private int
diff --git a/print/ghostscript7/files/patch-eplaser:gdevesmv.c b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
index 8764eb63292f..bce92ff8358c 100644
--- a/print/ghostscript7/files/patch-eplaser:gdevesmv.c
+++ b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
@@ -1,6 +1,16 @@
 --- eplaser/gdevesmv.c.orig	Fri Dec 14 10:50:14 2001
-+++ eplaser/gdevesmv.c	Fri Mar 15 04:28:41 2002
-@@ -1799,13 +1799,13 @@
++++ eplaser/gdevesmv.c	Sat Apr 27 13:46:31 2002
+@@ -34,8 +34,7 @@
+ 
+  */
+ 
+-#include <stdlib.h>
+-#include <unistd.h>
++#include <string.h>
+ 
+ #include "math_.h"
+ #include "gx.h"
+@@ -1799,13 +1798,13 @@
  
  /* Process the next piece of an image. */
  private int
@@ -16,7 +26,7 @@
      gx_device *dev = info->dev;
  #endif
      gx_device_vector *const	vdev = (gx_device_vector *) dev;
-@@ -1823,7 +1823,7 @@
+@@ -1823,7 +1822,7 @@
  
      {
  
@@ -25,7 +35,7 @@
  	if (height == 260)
  	    height = 1;
  #endif
-@@ -1980,13 +1980,13 @@
+@@ -1980,13 +1979,13 @@
  
  
  private int
diff --git a/print/ghostscript7/files/patch-lib:gs_init.ps b/print/ghostscript7/files/patch-lib:gs_init.ps
index dd14a517967b..70de88245ddc 100644
--- a/print/ghostscript7/files/patch-lib:gs_init.ps
+++ b/print/ghostscript7/files/patch-lib:gs_init.ps
@@ -1,6 +1,6 @@
---- lib/gs_init.ps.orig	Tue Jun  5 16:42:40 2001
-+++ lib/gs_init.ps	Wed Jun 20 04:16:46 2001
-@@ -1247,7 +1247,7 @@
+--- lib/gs_init.ps.orig	Fri Feb  1 12:25:45 2002
++++ lib/gs_init.ps	Sat Feb  9 01:42:10 2002
+@@ -1274,7 +1274,7 @@
  % Set the default screen and BG/UCR.
  /.setdefaultbgucr {
    systemdict /setblackgeneration known {
@@ -9,8 +9,8 @@
    } if
  } bind def
  /.useloresscreen {	% - .useloresscreen <bool>
-@@ -1799,3 +1799,7 @@
- (END GC) VMDEBUG
+@@ -1874,3 +1874,7 @@
+ userdict /AGM_preserve_spots false put
  
  % The interpreter will run the initial procedure (start).
 +
diff --git a/print/ghostscript7/files/patch-lib:ps2epsi b/print/ghostscript7/files/patch-lib:ps2epsi
deleted file mode 100644
index e2abdfc2574b..000000000000
--- a/print/ghostscript7/files/patch-lib:ps2epsi
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ps2epsi.orig	Wed Jan 30 01:05:36 2002
-+++ lib/ps2epsi	Wed Jan 30 01:05:58 2002
-@@ -63,7 +63,7 @@
- 
- cat ${infile} |
- sed -e '/^%%BeginPreview:/,/^%%EndPreview[^!-~]*$/d' -e '/^%!PS-Adobe/d'\
---e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
-+ -e '/^%%[A-Za-z][A-Za-z]*[^!-~]*$/d' -e '/^%%[A-Za-z][A-Za-z]*: /d'
- 
- cat << ENDEPS
- %%Trailer
diff --git a/print/ghostscript7/files/patch-lib:ps2epsi.ps b/print/ghostscript7/files/patch-lib:ps2epsi.ps
deleted file mode 100644
index 8e150354428c..000000000000
--- a/print/ghostscript7/files/patch-lib:ps2epsi.ps
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ps2epsi.ps.orig	Tue Jun  5 15:31:41 2001
-+++ lib/ps2epsi.ps	Sat Apr 20 15:57:44 2002
-@@ -52,7 +52,7 @@
-   /ps2epsi
-    {				% Open the file
-      outfile (w) file /epsifile exch def
--     //systemdict /.setsafe known { .setsafe } if
-+%     //systemdict /.setsafe known { .setsafe } if
- 					% Get the device parameters
-      currentdevice getdeviceprops .dicttomark
-      /HWSize get aload pop
diff --git a/print/ghostscript7/files/patch-src:dviprlib.c b/print/ghostscript7/files/patch-src:dviprlib.c
index 1fc25e484764..67662665f273 100644
--- a/print/ghostscript7/files/patch-src:dviprlib.c
+++ b/print/ghostscript7/files/patch-src:dviprlib.c
@@ -1,23 +1,13 @@
---- src/dviprlib.c.orig	Tue May 13 00:14:09 1997
-+++ src/dviprlib.c	Thu Apr  4 03:18:57 2002
-@@ -1433,7 +1433,8 @@
+--- src/dviprlib.c.orig	Tue May 13 16:14:09 1997
++++ src/dviprlib.c	Mon Apr 22 23:02:58 2002
+@@ -1433,7 +1433,9 @@
  char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
  char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
  
 -private FILE *dviprt_messagestream = stderr;
 +private FILE *dviprt_messagestream;
-+private int dviprt_messagestream_init;
++private void dviprt_messagestream_construct (void) __attribute__((constructor));
++private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
  
  /*--- library functions ---*/
  int
-@@ -1505,6 +1506,10 @@
- liblocal int
- dviprt_printmessage(char *str,int len)
- {
-+  if (!dviprt_messagestream_init) {
-+    dviprt_messagestream = stderr;
-+    dviprt_messagestream_init = 1;
-+  }
-   if (dviprt_messagestream && str) {
-     if (len >= 0) fwrite(str,len,1,dviprt_messagestream);
-     else fputs(str,dviprt_messagestream);
diff --git a/print/ghostscript7/files/patch-src:gdevlbp8.c b/print/ghostscript7/files/patch-src:gdevlbp8.c
index 6e5b29da5734..052492c58f6a 100644
--- a/print/ghostscript7/files/patch-src:gdevlbp8.c
+++ b/print/ghostscript7/files/patch-src:gdevlbp8.c
@@ -1,5 +1,5 @@
---- src/gdevlbp8.c.orig	Thu Mar  9 03:40:41 2000
-+++ src/gdevlbp8.c
+--- src/gdevlbp8.c.orig	Wed Aug  1 09:48:23 2001
++++ src/gdevlbp8.c	Thu Mar 14 20:56:05 2002
 @@ -22,6 +22,8 @@
  
  /* 
@@ -15,13 +15,13 @@
  private dev_proc_print_page(lbp8_print_page);
 -private dev_proc_print_page(lips3_print_page);
  
- gx_device_printer far_data gs_lbp8_device =
+ const gx_device_printer far_data gs_lbp8_device =
    prn_device(prn_std_procs, "lbp8",
 @@ -58,14 +59,6 @@
  	0.16, 0.2, 0.32, 0.21,		/* margins: left, bottom, right, top */
  	1, lbp8_print_page);
  
--gx_device_printer far_data gs_lips3_device =
+-const gx_device_printer far_data gs_lips3_device =
 -  prn_device(prn_std_procs, "lips3",
 -	82,				/* width_10ths, 8.3" */
 -	117,				/* height_10ths, 11.7" */
diff --git a/print/ghostscript7/files/patch-src:unix-dll.mak b/print/ghostscript7/files/patch-src:unix-dll.mak
new file mode 100644
index 000000000000..2ee0a5c3a0d1
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:unix-dll.mak
@@ -0,0 +1,59 @@
+--- src/unix-dll.mak.orig	Wed Oct 17 19:11:23 2001
++++ src/unix-dll.mak	Sat Feb  9 04:53:18 2002
+@@ -48,11 +48,9 @@
+ 
+ # shared library
+ GS_SONAME=lib$(GS).so
+-GS_SONAME_MAJOR=$(GS_SONAME).$(GS_VERSION_MAJOR)
+-GS_SONAME_MAJOR_MINOR= $(GS_SONAME).$(GS_VERSION_MAJOR).$(GS_VERSION_MINOR)
++GS_SONAME_MAJOR=$(GS_SONAME).$(GS_SHLIB_VER)
+ GS_SO=$(BINDIR)/$(GS_SONAME)
+-GS_SO_MAJOR=$(GS_SO).$(GS_VERSION_MAJOR)
+-GS_SO_MAJOR_MINOR=$(GS_SO_MAJOR).$(GS_VERSION_MINOR)
++GS_SO_MAJOR=$(GS_SO).$(GS_SHLIB_VER)
+ 
+ # Shared object is built by redefining GS_XE in a recursive make.
+ 
+@@ -60,24 +58,20 @@
+ 
+ $(GS_SO): $(GS_SO_MAJOR)
+ 	$(RM_) $(GS_SO)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO)
+-
+-$(GS_SO_MAJOR): $(GS_SO_MAJOR_MINOR)
+-	$(RM_) $(GS_SO_MAJOR)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(GS_SO_MAJOR)
++	ln -s $(GS_SONAME_MAJOR) $(GS_SO)
+ 
+ # Build the small Ghostscript loaders, with Gtk+ and without
+ 
+ $(GSSOX_XE): $(GS_SO) $(GLSRC)dxmain.c
+-	$(GLCC) -g `gtk-config --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `gtk-config --libs`
++	$(GLCC) `$(GTK_CONFIG) --cflags` -o $(GSSOX_XE) $(GLSRC)dxmain.c -L$(BINDIR) -l$(GS) `$(GTK_CONFIG) --libs`
+ 
+ $(GSSOC_XE): $(GS_SO) $(GLSRC)dxmainc.c
+-	$(GLCC) -g -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
++	$(GLCC) -o $(GSSOC_XE) $(GLSRC)dxmainc.c -L$(BINDIR) -l$(GS)
+ 
+ # ------------------------- Recursive make targets ------------------------- #
+ 
+ SODEFS=LDFLAGS='$(LDFLAGS) $(CFLAGS_SO) -shared -Wl,-soname,$(GS_SONAME_MAJOR)'\
+- GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR)\
++ GS_XE=$(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR)\
+  STDIO_IMPLEMENTATION=c\
+  DISPLAY_DEV=$(DD)$(SOOBJRELDIR)/display.dev\
+  BINDIR=$(BINDIR)/$(SOBINRELDIR)\
+@@ -106,11 +100,9 @@
+ 	-mkdir $(libdir)
+ 	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
+ 	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
+-	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
++	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME_MAJOR)
+ 	$(RM_) $(libdir)/$(GS_SONAME)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
+-	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
++	ln -s $(GS_SONAME_MAJOR) $(libdir)/$(GS_SONAME)
+ 
+ soinstall: install-so install-scripts install-data
+ 
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
index 626241a4d32e..2887ad8ef2e5 100644
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -1,6 +1,6 @@
---- src/unix-gcc.mak.orig	Tue Feb  5 09:20:42 2002
-+++ src/unix-gcc.mak	Fri Feb  8 05:16:49 2002
-@@ -27,14 +27,15 @@
+--- src/unix-gcc.mak.orig	Sat Apr 20 07:23:09 2002
++++ src/unix-gcc.mak	Sat Apr 27 02:05:12 2002
+@@ -24,14 +24,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
  
@@ -24,69 +24,31 @@
  
  # Do not edit the next group of lines.
  
-@@ -53,17 +54,17 @@
+@@ -50,11 +51,10 @@
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
 -INSTALL = $(GLSRCDIR)/instcopy -c
 -INSTALL_PROGRAM = $(INSTALL) -m 755
 -INSTALL_DATA = $(INSTALL) -m 644
-+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
-+INSTALL_DATA = $(BSD_INSTALL_DATA)
++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
  
 -prefix = /usr/local
-+prefix = $(PREFIX)
++prefix = ${PREFIX}
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
- libdir = $(exec_prefix)/lib
- mandir = $(prefix)/man
- man1ext = 1
-+man1dir = $(mandir)/man$(man1ext)
- datadir = $(prefix)/share
- gsdir = $(datadir)/ghostscript
- gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
-@@ -103,14 +104,6 @@
- #	  No execution time or space penalty.
- 
- GENOPT=
--# Choose capability options.
--
--# -DHAVE_MKSTEMP
--#	uses mkstemp instead of mktemp
--#		This gets rid of several security warnings that look
--#		ominous.  Enable this if you wish to get rid of them.
--
--CAPOPT= -DHAVE_MKSTEMP
- 
- # Choose capability options.
- 
-@@ -121,7 +114,6 @@
- 
- CAPOPT= -DHAVE_MKSTEMP
- 
--
- # Define the name of the executable file.
- 
- GS=gs
-@@ -147,7 +139,7 @@
- # You may need to change this if the IJG library version changes.
- # See jpeg.mak for more information.
- 
--JSRCDIR=jpeg
-+JSRCDIR=${.CURDIR}/jpeg
- JVERSION=6
- 
- # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
-@@ -167,14 +159,14 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${LOCALBASE}/include
- PVERSION=10012
- 
- # Choose whether to use a shared version of the PNG library, and if so,
+@@ -142,7 +142,7 @@
+ # D_MAX_BLOCKS_IN_MCU patch, and thus may not be able to read
+ # some older JPEG streams that violate the standard. If the JPEG
+ # library built from local sources, the patch will be applied.
+-SHARE_JPEG=0
++SHARE_JPEG=1
+ JPEG_NAME=jpeg
+ 
+ # Define the directory where the PNG library sources are stored,
+@@ -157,7 +157,7 @@
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -95,7 +57,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -186,7 +178,7 @@
+@@ -169,7 +169,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -104,7 +66,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -197,6 +189,8 @@
+@@ -185,6 +185,8 @@
  IJSSRCDIR=ijs
  IJSEXECTYPE=unix
  
@@ -113,7 +75,7 @@
  # Define how to build the library archives.  (These are not used in any
  # standard configuration.)
  
-@@ -208,7 +202,7 @@
+@@ -196,7 +198,7 @@
  
  # Define the name of the C compiler.
  
@@ -122,7 +84,7 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -225,9 +219,9 @@
+@@ -213,9 +215,9 @@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
@@ -135,34 +97,34 @@
  CFLAGS_SO=-fPIC
  
  # Define the other compilation flags.  Add at most one of the following:
-@@ -241,7 +235,7 @@
+@@ -229,7 +231,7 @@
  # We don't include -ansi, because this gets in the way of the platform-
  #   specific stuff that <math.h> typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
 -XCFLAGS=
-+XCFLAGS+=-I${.CURDIR}/gimp-print
++XCFLAGS+=-I${.CURDIR}/gimp-print -I${LOCALBASE}/include
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -252,7 +246,7 @@
+@@ -240,7 +242,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${.CURDIR}/gimp-print -L${LOCALBASE}/lib
  
- LDFLAGS=$(XLDFLAGS) -fno-common
+ LDFLAGS=$(XLDFLAGS)
  
-@@ -285,7 +279,7 @@
+@@ -273,7 +275,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
--XINCLUDE=-I/X11R6/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
-@@ -297,12 +291,12 @@
+@@ -285,12 +287,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
diff --git a/print/ghostscript7/files/patch-src:zmedia2.c b/print/ghostscript7/files/patch-src:zmedia2.c
index 6e19c2ddfd8e..9033a4388085 100644
--- a/print/ghostscript7/files/patch-src:zmedia2.c
+++ b/print/ghostscript7/files/patch-src:zmedia2.c
@@ -1,6 +1,6 @@
---- src/zmedia2.c.orig	Tue Jun  5 15:39:08 2001
-+++ src/zmedia2.c	Wed Jun 20 04:18:27 2001
-@@ -430,11 +430,17 @@
+--- src/zmedia2.c.orig	Fri Apr 27 02:57:41 2001
++++ src/zmedia2.c	Fri Nov  2 04:08:16 2001
+@@ -429,11 +429,17 @@
  
  	rx = ry, ry = temp;
      }
@@ -10,16 +10,16 @@
 -    if (medium->p.y < MIN_MEDIA_SIZE && my > ry)
 -	my = ry;
 +    /* If 'medium' is flexible, adjust 'mx' and 'my' towards 'rx' and 'ry',
-+	respectively. Note that 'mx' and 'my' have just acquired the largest
-+	permissible value, medium->q. */
-+    if (medium->p.x < mx)     /* non-empty width range */
-+	if (rx < medium->p.x) mx = medium->p.x; /* minimum */
-+	else if (mx > rx) mx = rx;      /* fits */
-+	/* else use medium->q.x, i.e., the maximum */
-+    if (medium->p.y < my)     /* non-empty height range */
-+	if (ry < medium->p.y) my = medium->p.y; /* minimum */
-+	else if (my > ry) my = ry;      /* fits */
-+	/* else use medium->q.y, i.e., the maximum */
++       respectively. Note that 'mx' and 'my' have just acquired the largest
++       permissible value, medium->q. */
++    if (medium->p.x < mx)	/* non-empty width range */
++      if (rx < medium->p.x) mx = medium->p.x;	/* minimum */
++      else if (mx > rx) mx = rx;	/* fits */
++      /* else use medium->q.x, i.e., the maximum */
++    if (medium->p.y < my)	/* non-empty height range */
++      if (ry < medium->p.y) my = medium->p.y;	/* minimum */
++      else if (my > ry) my = ry;	/* fits */
++      /* else use medium->q.y, i.e., the maximum */
  
      /* Translate to align the centers. */ 
      gs_make_translation(mx / 2, my / 2, pmat);
diff --git a/print/ghostscript7/pkg-plist b/print/ghostscript7/pkg-plist
index 8d03be52540f..1be29cd8bb60 100644
--- a/print/ghostscript7/pkg-plist
+++ b/print/ghostscript7/pkg-plist
@@ -6,11 +6,13 @@ bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
+%%SHLIB%%bin/gsc
 bin/gsdj
 bin/gsdj500
 bin/gslj
 bin/gslp
 bin/gsnd
+%%SHLIB%%bin/gsx
 bin/hpijs
 bin/lprsetup.sh
 bin/pcl3opts
@@ -33,6 +35,8 @@ bin/pv.sh
 bin/sysvlp.sh
 bin/unix-lpr.sh
 bin/wftopfa
+%%SHLIB%%lib/libgs.so
+%%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/alps/README.gdevalps
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/bj10v/gdev10v.jis
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/dmprt/gdevdmpr.sj
@@ -59,15 +63,18 @@ bin/wftopfa
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/gs-pcl3.html
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/how-to-report.txt
 %%PORTDOCS%%share/doc/ghostscript/%%GS_VERSION%%/pcl3/pcl3opts.html
+share/ghostscript/%%GS_VERSION%%/doc/API.htm
+share/ghostscript/%%GS_VERSION%%/doc/Bug-form.htm
 share/ghostscript/%%GS_VERSION%%/doc/Bug-info.htm
 share/ghostscript/%%GS_VERSION%%/doc/C-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/CJK.htm
 share/ghostscript/%%GS_VERSION%%/doc/CJKTTCID.htm
-share/ghostscript/%%GS_VERSION%%/doc/COPYING
 share/ghostscript/%%GS_VERSION%%/doc/Changes.htm
 share/ghostscript/%%GS_VERSION%%/doc/Commprod.htm
 share/ghostscript/%%GS_VERSION%%/doc/Copying.htm
+share/ghostscript/%%GS_VERSION%%/doc/Current.htm
 share/ghostscript/%%GS_VERSION%%/doc/DLL.htm
+share/ghostscript/%%GS_VERSION%%/doc/Develop.htm
 share/ghostscript/%%GS_VERSION%%/doc/Devices.htm
 share/ghostscript/%%GS_VERSION%%/doc/Drivers.htm
 share/ghostscript/%%GS_VERSION%%/doc/Fonts.htm
@@ -79,16 +86,19 @@ share/ghostscript/%%GS_VERSION%%/doc/History3.htm
 share/ghostscript/%%GS_VERSION%%/doc/History4.htm
 share/ghostscript/%%GS_VERSION%%/doc/History5.htm
 share/ghostscript/%%GS_VERSION%%/doc/History6.htm
+share/ghostscript/%%GS_VERSION%%/doc/History7.htm
 share/ghostscript/%%GS_VERSION%%/doc/Htmstyle.htm
 share/ghostscript/%%GS_VERSION%%/doc/Humor.htm
 share/ghostscript/%%GS_VERSION%%/doc/Install.htm
+share/ghostscript/%%GS_VERSION%%/doc/Issues.htm
 share/ghostscript/%%GS_VERSION%%/doc/Language.htm
 share/ghostscript/%%GS_VERSION%%/doc/Lib.htm
+share/ghostscript/%%GS_VERSION%%/doc/Maintain.htm
 share/ghostscript/%%GS_VERSION%%/doc/Make.htm
 share/ghostscript/%%GS_VERSION%%/doc/New-user.htm
 share/ghostscript/%%GS_VERSION%%/doc/News.htm
-share/ghostscript/%%GS_VERSION%%/doc/PUBLIC
 share/ghostscript/%%GS_VERSION%%/doc/Projects.htm
+share/ghostscript/%%GS_VERSION%%/doc/Ps-style.htm
 share/ghostscript/%%GS_VERSION%%/doc/Ps2epsi.htm
 share/ghostscript/%%GS_VERSION%%/doc/Ps2pdf.htm
 share/ghostscript/%%GS_VERSION%%/doc/Psfiles.htm
@@ -101,8 +111,9 @@ share/ghostscript/%%GS_VERSION%%/doc/Tester.htm
 share/ghostscript/%%GS_VERSION%%/doc/Unix-lpr.htm
 share/ghostscript/%%GS_VERSION%%/doc/Use.htm
 share/ghostscript/%%GS_VERSION%%/doc/Xfonts.htm
+share/ghostscript/%%GS_VERSION%%/doc/gs.css
+share/ghostscript/%%GS_VERSION%%/doc/index.html
 share/ghostscript/%%GS_VERSION%%/examples/alphabet.ps
-share/ghostscript/%%GS_VERSION%%/examples/chess.ps
 share/ghostscript/%%GS_VERSION%%/examples/cjk/all_ac1.ps
 share/ghostscript/%%GS_VERSION%%/examples/cjk/all_ag1.ps
 share/ghostscript/%%GS_VERSION%%/examples/cjk/all_aj1.ps
@@ -136,6 +147,11 @@ share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.CJK
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Koc
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Ore
 share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Sol
+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.Win
+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.b5
+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.gb
+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.ksx
+share/ghostscript/%%GS_VERSION%%/lib/CIDFnmap.sj
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap
 share/ghostscript/%%GS_VERSION%%/lib/Fontmap.GS
 share/ghostscript/%%GS_VERSION%%/lib/acctest.ps
@@ -203,6 +219,7 @@ share/ghostscript/%%GS_VERSION%%/lib/gs_epsf.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fform.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_fonts.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_frsd.ps
+share/ghostscript/%%GS_VERSION%%/lib/gs_icc.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_il1_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_il2_e.ps
 share/ghostscript/%%GS_VERSION%%/lib/gs_init.ps
@@ -303,6 +320,9 @@ share/ghostscript/%%GS_VERSION%%/lib/stc2.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc200_h.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc2_h.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc2s_h.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bl.upp
+share/ghostscript/%%GS_VERSION%%/lib/stc300bm.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500p.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc500ph.upp
 share/ghostscript/%%GS_VERSION%%/lib/stc600ih.upp
diff --git a/print/ghostscript7/scripts/configure b/print/ghostscript7/scripts/configure
index 4316b5b1a34a..a25bb4c618fe 100644
--- a/print/ghostscript7/scripts/configure
+++ b/print/ghostscript7/scripts/configure
@@ -48,14 +48,8 @@ Have fun with this new configuration style !     -andreas \n\n\
   "stp"      "Configurable Canon/Epson/Lexmark/HP driver [Gimp-Print]" ON \
   "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" ON \
   "dmprt"    "Configurable dot matrix printer driver [DMPRT]" ON \
-  "dl2100"   "DEClaser 2100" OFF \
-  "la50"     "DEC LA50" OFF \
-  "la70"     "DEC LA70" OFF \
-  "la75"     "DEC LA75" OFF \
-  "la75plus" "DEC LA75plus" OFF \
   "lj250"    "DEC LJ250 Companion color printer" OFF \
   "declj250" "DEC LJ250 driver (alternate)" OFF \
-  "ln03"     "DEC LN03" OFF \
   "ap3250"   "Epson ActionPrinter 3250" OFF \
   "epson"    "Epson-compatible dot matrix, 9/24-pin" OFF \
   "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" OFF \
@@ -130,7 +124,7 @@ Have fun with this new configuration style !     -andreas \n\n\
   "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" ON \
   "pcl3"     "HP PCL 3+ (generic) [PCL3]" ON \
   "hpdj"     "HP PCL 3+ (old drv.) [HPDJ]" ON \
-  "ijs"      "HP PhotoSmart/DeskJet series [HPinkjet]" ON \
+  "ijs"      "HP Inkjet and other raster devices" ON \
   "ibmpro"   "IBM 9-pin Proprinter" OFF \
   "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" OFF \
   "imagen"   "Imagen ImPress printers" OFF \
@@ -153,7 +147,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
-  "xes"      "Xerox XES 2700/3700/4045" OFF \
   "bmpmono"  "BMP Monochrome" ON \
   "bmpgray"  "BMP 8-bit gray" ON \
   "bmp16"    "BMP 4-bit EGA/VGA" ON \
@@ -167,7 +160,6 @@ Have fun with this new configuration style !     -andreas \n\n\
   "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 \
diff --git a/print/ghostscript7/scripts/configure.batch b/print/ghostscript7/scripts/configure.batch
index 021c96d07632..c3a757666866 100644
--- a/print/ghostscript7/scripts/configure.batch
+++ b/print/ghostscript7/scripts/configure.batch
@@ -5,7 +5,7 @@ ifndef WITHOUT_X11
 DEVICE_DEVS= \$(DD)x11.dev \$(DD)x11alpha.dev \$(DD)x11cmyk.dev \$(DD)x11cmyk2.dev \$(DD)x11cmyk4.dev \$(DD)x11cmyk8.dev \$(DD)x11gray2.dev \$(DD)x11gray4.dev \$(DD)x11mono.dev \$(DD)x11rg16x.dev \$(DD)x11rg32x.dev
 endif
 
-DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)dl2100.dev \$(DD)la50.dev \$(DD)la70.dev \$(DD)la75.dev \$(DD)la75plus.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ln03.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8000.dev \$(DD)lp8800c.dev \$(DD)lp8000c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9600.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)xes.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)sxlcrt.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
+DEVICE_DEVS+= \$(DD)md2k.dev \$(DD)md5k.dev \$(DD)md50Mono.dev \$(DD)md50Eco.dev \$(DD)md1xMono.dev \$(DD)appledmp.dev \$(DD)iwhi.dev \$(DD)iwlo.dev \$(DD)iwlq.dev \$(DD)hl7x0.dev \$(DD)bj10e.dev \$(DD)bj10v.dev \$(DD)bj10vh.dev \$(DD)bj200.dev \$(DD)bjc600.dev \$(DD)bjc800.dev \$(DD)lbp8.dev \$(DD)lips2p.dev \$(DD)lips3.dev \$(DD)lips4.dev \$(DD)bjc880j.dev \$(DD)lips4v.dev \$(DD)m8510.dev \$(DD)coslw2p.dev \$(DD)coslwxl.dev \$(DD)stp.dev \$(DD)uniprint.dev \$(DD)dmprt.dev \$(DD)lj250.dev \$(DD)declj250.dev \$(DD)ap3250.dev \$(DD)epson.dev \$(DD)eps9mid.dev \$(DD)eps9high.dev \$(DD)lp8000.dev \$(DD)epag.dev \$(DD)escpage.dev \$(DD)lp2000.dev \$(DD)lp8800c.dev \$(DD)lp8300c.dev \$(DD)lp8500c.dev \$(DD)lp3000c.dev \$(DD)lp8200c.dev \$(DD)lp8000c.dev \$(DD)lp2200.dev \$(DD)lp9400.dev \$(DD)lp8700.dev \$(DD)lp8100.dev \$(DD)lp8600f.dev \$(DD)lp8400f.dev \$(DD)lp8300f.dev \$(DD)lp1900.dev \$(DD)lp9600s.dev \$(DD)lp9600.dev \$(DD)lp9300.dev \$(DD)lp8600.dev \$(DD)lp1800.dev \$(DD)lq850.dev \$(DD)epsonc.dev \$(DD)mjc180.dev \$(DD)mjc360.dev \$(DD)mjc720.dev \$(DD)mj500c.dev \$(DD)st800.dev \$(DD)stcolor.dev \$(DD)photoex.dev \$(DD)lp2563.dev \$(DD)dnj650c.dev \$(DD)deskjet.dev \$(DD)djet500.dev \$(DD)cdeskjet.dev \$(DD)djet500c.dev \$(DD)cdjcolor.dev \$(DD)cdjmono.dev \$(DD)cdj500.dev \$(DD)cdj550.dev \$(DD)cdj670.dev \$(DD)cdj850.dev \$(DD)cdj880.dev \$(DD)cdj890.dev \$(DD)cdj1600.dev \$(DD)cdj970.dev \$(DD)laserjet.dev \$(DD)ljetplus.dev \$(DD)ljet2p.dev \$(DD)ljet3.dev \$(DD)ljet3d.dev \$(DD)ljet4.dev \$(DD)ljet4d.dev \$(DD)lj4dith.dev \$(DD)cljet5.dev \$(DD)cljet5c.dev \$(DD)cljet5pr.dev \$(DD)lj5mono.dev \$(DD)lj5gray.dev \$(DD)pj.dev \$(DD)pjetxl.dev \$(DD)pjxl.dev \$(DD)paintjet.dev \$(DD)pjxl300.dev \$(DD)pxlmono.dev \$(DD)pxlcolor.dev \$(DD)pcl3.dev \$(DD)hpdj.dev \$(DD)ijs.dev \$(DD)ibmpro.dev \$(DD)jetp3852.dev \$(DD)imagen.dev \$(DD)fs600.dev \$(DD)lxm5700m.dev \$(DD)cp50.dev \$(DD)necp6.dev \$(DD)npdl.dev \$(DD)oce9050.dev \$(DD)oki182.dev \$(DD)okiibm.dev \$(DD)atx23.dev \$(DD)atx24.dev \$(DD)atx38.dev \$(DD)r4081.dev \$(DD)rpdl.dev \$(DD)gdi.dev \$(DD)sj48.dev \$(DD)t4693d2.dev \$(DD)t4693d4.dev \$(DD)t4693d8.dev \$(DD)tek4696.dev \$(DD)bmpmono.dev \$(DD)bmpgray.dev \$(DD)bmp16.dev \$(DD)bmp256.dev \$(DD)bmp16m.dev \$(DD)bmp32b.dev \$(DD)bmpsep1.dev \$(DD)bmpsep8.dev \$(DD)ccr.dev \$(DD)cgmmono.dev \$(DD)cgm8.dev \$(DD)cgm24.dev \$(DD)cif.dev \$(DD)dfaxhigh.dev \$(DD)dfaxlow.dev \$(DD)faxg3.dev \$(DD)faxg32d.dev \$(DD)faxg4.dev \$(DD)miff24.dev \$(DD)inferno.dev \$(DD)jpeg.dev \$(DD)jpeggray.dev \$(DD)mgrmono.dev \$(DD)mgrgray2.dev \$(DD)mgrgray4.dev \$(DD)mgrgray8.dev \$(DD)mgr4.dev \$(DD)mgr8.dev \$(DD)pcxmono.dev \$(DD)pcxgray.dev \$(DD)pcx16.dev \$(DD)pcx256.dev \$(DD)pcx24b.dev \$(DD)pcxcmyk.dev \$(DD)pdfwrite.dev \$(DD)bit.dev \$(DD)bitrgb.dev \$(DD)bitcmyk.dev \$(DD)plan9bm.dev \$(DD)pbm.dev \$(DD)pbmraw.dev \$(DD)pgm.dev \$(DD)pgmraw.dev \$(DD)pgnm.dev \$(DD)pgnmraw.dev \$(DD)pnm.dev \$(DD)pnmraw.dev \$(DD)ppm.dev \$(DD)ppmraw.dev \$(DD)pkm.dev \$(DD)pkmraw.dev \$(DD)pksm.dev \$(DD)pksmraw.dev \$(DD)pngmono.dev \$(DD)pnggray.dev \$(DD)png16.dev \$(DD)png256.dev \$(DD)png16m.dev \$(DD)psmono.dev \$(DD)psgray.dev \$(DD)psrgb.dev \$(DD)pswrite.dev \$(DD)epswrite.dev \$(DD)sgirgb.dev \$(DD)sunhmono.dev \$(DD)tiffcrle.dev \$(DD)tiffg3.dev \$(DD)tiffg32d.dev \$(DD)tiffg4.dev \$(DD)tiff12nc.dev \$(DD)tiff24nc.dev \$(DD)tifflzw.dev \$(DD)tiffpack.dev
 !EOT
 
 # create one new Makefile, where DEVICE_DEVS contains all wanted devices