** ghostscript55 has been repocopied to ghostscript-gnu **

Update to GNU Ghostscript 6.51.

PR:		ports/29579
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

19 files changed, 524 insertions, 190 deletions

diff --git a/print/ghostscript7/files/escputil.contrib.mak b/print/ghostscript7/files/escputil.contrib.mak
new file mode 100644
index 0000000..b0cea60
--- /dev/null
+++ b/print/ghostscript7/files/escputil.contrib.mak
@@ -0,0 +1,6 @@
+
+# build escputil command from gimp-print sources
+
+escputil: $(GLSRC)escputil.c
+	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
+
diff --git a/print/ghostscript7/files/hpijs.contrib.mak b/print/ghostscript7/files/hpijs.contrib.mak
new file mode 100644
index 0000000..35eb9e6
--- /dev/null
+++ b/print/ghostscript7/files/hpijs.contrib.mak
@@ -0,0 +1,31 @@
+### ------------- Hewlett-Packard Co. Inkjet Driver -------------- ###
+
+hpijs_=$(GLOBJ)gdevhpij.$(OBJ)
+
+$(DD)gdevhpij.$(OBJ): $(GLSRC)gdevhpij.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevhpij.$(OBJ) $(C_) $(GLSRC)gdevhpij.c
+
+$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) $(DD)hpijs $(hpijs_)
+
+$(DD)DJ630.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ630 $(hpijs_)
+
+$(DD)DJ6xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ6xx $(hpijs_)
+
+$(DD)DJ6xxP.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ6xxP $(hpijs_)
+
+$(DD)DJ8xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ8xx $(hpijs_)
+
+$(DD)DJ9xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ9xx $(hpijs_)
+
+$(DD)DJ9xxVIP.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) DJ9xxVIP $(hpijs_)
+
+$(DD)AP21xx.dev : $(hpijs_) $(DD)page.dev
+	$(SETPDEV) AP21xx $(hpijs_)
+
diff --git a/print/ghostscript7/files/lqx70ch.upp b/print/ghostscript7/files/lqx70ch.upp
new file mode 100644
index 0000000..b5d3cd4
--- /dev/null
+++ b/print/ghostscript7/files/lqx70ch.upp
@@ -0,0 +1,26 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70ch.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x360DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r360x360
+-dupMargins="{ 9.0 0.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 0A
+   1b5501
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/lqx70cl.upp b/print/ghostscript7/files/lqx70cl.upp
new file mode 100644
index 0000000..91fb1aa
--- /dev/null
+++ b/print/ghostscript7/files/lqx70cl.upp
@@ -0,0 +1,26 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70cl.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 180x180DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r180x180
+-dupMargins="{ 9.0 0.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 14
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/lqx70cm.upp b/print/ghostscript7/files/lqx70cm.upp
new file mode 100644
index 0000000..895af73
--- /dev/null
+++ b/print/ghostscript7/files/lqx70cm.upp
@@ -0,0 +1,25 @@
+# $ApsCVS: src/apsfilter/uniprint/lqx70cm.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson LQ-1170 ESC/P2 Dot Matrix, 360x180DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/ErrorDiffusion
+-dupOutputFormat=/EscP2
+-r360x180
+-dupMargins="{ 9.0 24.0 9.0 24.0}"
+-dupOutputPins=24
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2869 0100 01
+   1b2855 0100 14
+   1b5501
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupEndPageCommand="(\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/patch-aa b/print/ghostscript7/files/patch-aa
deleted file mode 100644
index 7aeee26..0000000
--- a/print/ghostscript7/files/patch-aa
+++ /dev/null
@@ -1,150 +0,0 @@
---- unix-gcc.mak.orig	Mon Feb 14 11:28:41 2000
-+++ unix-gcc.mak	Sat Jul 29 00:40:45 2000
-@@ -54,12 +54,10 @@
- # the directories also define the default search path for the
- # initialization files (gs_*.ps) and the fonts.
- 
--# If your system has installbsd, change install to installbsd in the next line.
--INSTALL = install -c
--INSTALL_PROGRAM = $(INSTALL) -m 755
--INSTALL_DATA = $(INSTALL) -m 644
-+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
-+INSTALL_DATA = $(BSD_INSTALL_DATA)
- 
--prefix = /usr/local
-+prefix = $(PREFIX)
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- scriptdir = $(bindir)
-@@ -140,14 +138,14 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${LOCALBASE}/include
- PVERSION=96
- 
- # Choose whether to use a shared version of the PNG library, and if so,
- # what its name is.
- # See gs.mak and Make.htm for more information.
- 
--SHARE_LIBPNG=0
-+SHARE_LIBPNG=1
- LIBPNG_NAME=png
- 
- # Define the directory where the zlib sources are stored.
-@@ -159,7 +157,7 @@
- # what its name is (usually libz, but sometimes libgz).
- # See gs.mak and Make.htm for more information.
- 
--SHARE_ZLIB=0
-+SHARE_ZLIB=1
- #ZLIB_NAME=gz
- ZLIB_NAME=z
- 
-@@ -178,7 +176,7 @@
- 
- # Define the name of the C compiler.
- 
--CC=gcc
-+#CC=cc
- 
- # Define the name of the linker for the final link step.
- # Normally this is the same as the C compiler.
-@@ -211,7 +209,7 @@
- #   gcc to accept ANSI-style function prototypes and function definitions.
- XCFLAGS=
- 
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
- 
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -220,7 +218,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${LOCALBASE}/lib
- 
- LDFLAGS=$(XLDFLAGS) -fno-common
- 
-@@ -240,7 +238,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$(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
-@@ -252,12 +250,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$(X11BASE)/lib
- XLIBDIR=
--XLIBS=Xt Xext X11
-+#XLIBS=Xt X11
- 
- # Define whether this platform has floating point hardware:
- #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -298,27 +296,6 @@
- 
- FILE_IMPLEMENTATION=stdio
- 
--# Choose the device(s) to include.  See devs.mak for details,
--# devs.mak and contrib.mak for the list of available devices.
--
--DEVICE_DEVS=x11.dev x11alpha.dev x11cmyk.dev x11gray2.dev x11gray4.dev x11mono.dev
--#DEVICE_DEVS1=bmpmono.dev bmpamono.dev posync.dev
--DEVICE_DEVS1=
--DEVICE_DEVS2=
--DEVICE_DEVS3=deskjet.dev djet500.dev laserjet.dev ljetplus.dev ljet2p.dev ljet3.dev ljet4.dev
--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 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 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 --------------------------- #
- 
- # Define the name of the partial makefile that specifies options --
-@@ -326,16 +303,10 @@
- 
- MAKEFILE=$(GLSRC)unix-gcc.mak
- 
--# Define the ANSI-to-K&R dependency.  There isn't one, but we do have to
--# detect whether we're running a version of gcc with the const optimization
--# bug.
--
--AK=$(GLGENDIR)/cc.tr
--
- # Define the compilation rules and flags.
- 
- CCFLAGS=$(GENOPT) $(CFLAGS)
--CC_=$(CC) `cat $(AK)` $(CCFLAGS)
-+CC_=$(CC) $(CCFLAGS)
- CCAUX=$(CC)
- #We can't use -fomit-frame-pointer with -pg....
- #CC_LEAF=$(CC_)
-@@ -356,7 +327,3 @@
- include $(GLSRC)unixtail.mak
- include $(GLSRC)unix-end.mak
- include $(GLSRC)unixinst.mak
--
--# This has to come last so it won't be taken as the default target.
--$(AK):
--	if ( gcc --version | grep "2.7.[01]" >/dev/null || test `gcc --version` = 2.7.2 ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
diff --git a/print/ghostscript7/files/patch-ab b/print/ghostscript7/files/patch-ab
deleted file mode 100644
index aee04b3..0000000
--- a/print/ghostscript7/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- gs_init.ps.orig	Thu Jan  2 19:23:13 1997
-+++ gs_init.ps	Thu Jan  2 19:24:46 1997
-@@ -1363,3 +1363,7 @@
- (END GC) VMDEBUG
- 
- % The interpreter will run the initial procedure (start).
-+
-+% unofficial patch:
-+% make it possible to print from within acroread pdf viewer
-+/Default currenthalftone /Halftone defineresource pop
diff --git a/print/ghostscript7/files/patch-ac b/print/ghostscript7/files/patch-ac
deleted file mode 100644
index ebd487b..0000000
--- a/print/ghostscript7/files/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
---- contrib.mak.orig	Tue Sep 15 04:03:52 1998
-+++ contrib.mak	Tue Dec  1 15:37:58 1998
-@@ -435,6 +435,18 @@
- cdj850.dev: $(cdeskjet8_) page.dev
- 	$(SETPDEV) cdj850 $(cdeskjet8_)
- 
-+cdj670.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj670 $(cdeskjet8_)
-+
-+cdj890.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj890 $(cdeskjet8_)
-+
-+cdj1600.dev: $(cdeskjet8_) page.dev
-+	$(SETPDEV) cdj1600 $(cdeskjet8_)
-+
-+$(GLOBJ)gdevcd8.$(OBJ): $(GLSRC)gdevcd8.c $(GLSRC)gdevcd8.h $(PDEVH)
-+	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
-+
- ### ------------ The H-P PaintJet color printer device ----------------- ###
- ### Note: this driver also supports the DEC LJ250 color printer, which   ###
- ###       has a PaintJet-compatible mode, and the PaintJet XL.           ###
diff --git a/print/ghostscript7/files/patch-hpijs:makefile b/print/ghostscript7/files/patch-hpijs:makefile
new file mode 100644
index 0000000..8f53a82
--- /dev/null
+++ b/print/ghostscript7/files/patch-hpijs:makefile
@@ -0,0 +1,32 @@
+--- hpijs/makefile.orig	Fri Jun  8 06:10:57 2001
++++ hpijs/makefile	Tue Jul 10 03:09:21 2001
+@@ -1,17 +1,17 @@
+-FLAGS = -D_LITTLE_ENDIAN -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
++FLAGS = -D_DJ660 -D_DJ6xx -D_DJ6xxPhoto -D_DJ8xx -D_DJ9xx \
+ 	-D_DJ9xxVIP -D_DJ630 -D_APOLLO2100 -D_DJ600 -D_DJ350
+ 
+ VERSION=0.97
+ INSTALLDIR=/usr/bin
+ 
+ 
+-CC = g++ -c -Wall -DVERSION=\"$(VERSION)\" $(FLAGS)
++CXXFLAGS += -DVERSION=\"$(VERSION)\" $(FLAGS)
+ #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" -DCAPTURE $(FLAGS)
+ #CC = g++ -c -g -Wall -DVERSION=\"$(VERSION)\" $(FLAGS)
+ 
+ .cpp.o:
+ 	echo "compiling $(<F)"
+-	$(CC) $(<F) -o $(*F).o
++	$(CXX) $(CXXFLAGS) -c $(<F) -o $(*F).o
+ 
+ OBJS = hpijs.o models.o breaks_open.o \
+ 	aladdin.o broadway.o capture.o \
+@@ -28,7 +28,7 @@
+ 
+ 
+ linkit: $(OBJS)
+-	g++ $(OBJS) -o hpijs
++	$(CXX) $(OBJS) -o hpijs
+ 
+ install:
+ 	install -m 0755 -s hpijs $(INSTALLDIR)
diff --git a/print/ghostscript7/files/patch-lib:gs_init.ps b/print/ghostscript7/files/patch-lib:gs_init.ps
new file mode 100644
index 0000000..dd14a51
--- /dev/null
+++ b/print/ghostscript7/files/patch-lib:gs_init.ps
@@ -0,0 +1,19 @@
+--- 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 @@
+ % Set the default screen and BG/UCR.
+ /.setdefaultbgucr {
+   systemdict /setblackgeneration known {
+-    { pop 0 } dup setblackgeneration setundercolorremoval
++    {} dup setblackgeneration setundercolorremoval
+   } if
+ } bind def
+ /.useloresscreen {	% - .useloresscreen <bool>
+@@ -1799,3 +1799,7 @@
+ (END GC) VMDEBUG
+ 
+ % The interpreter will run the initial procedure (start).
++
++% unofficial patch:
++% make it possible to print from within acroread pdf viewer
++/Default currenthalftone /Halftone defineresource pop
diff --git a/print/ghostscript7/files/patch-src:contrib.mak-5.94.add b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
new file mode 100644
index 0000000..1d2c46b
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
@@ -0,0 +1,14 @@
+--- src/contrib.mak-5.94.add.orig	Sun Oct 17 05:20:06 1999
++++ src/contrib.mak-5.94.add	Tue Jun 19 03:20:13 2001
+@@ -102,11 +102,6 @@
+ $(GLOBJ)hpdjprn.$(OBJ): $(GLSRC)hpdjprn.c
+ 	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)hpdjprn.c
+ 
+-$(GLOBJ)pclcomp.$(OBJ): $(GLSRC)pclcomp.c
+-	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pclcomp.c
+-
+-$(GLOBJ)pagecount.$(OBJ): $(GLSRC)pagecount.c
+-	$(GLCC) $(C_) $(O_)$@ $(hpdj_opts) $(GLSRC)pagecount.c
+ 
+ 
+ $(DD)hpdj.dev: $(hpdj_) $(DD)page.dev
diff --git a/print/ghostscript7/files/patch-src:gdevxini.c b/print/ghostscript7/files/patch-src:gdevxini.c
new file mode 100644
index 0000000..44bb6b3
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:gdevxini.c
@@ -0,0 +1,14 @@
+--- src/gdevxini.c.orig	Tue Jun  5 15:38:57 2001
++++ src/gdevxini.c	Wed Jun 20 04:17:15 2001
+@@ -655,8 +655,10 @@
+     }
+     x_set_buffer(xdev);
+     /* Clear the destination pixmap to avoid initializing with garbage. */
+-    xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
++    if (xdev->dest == (Pixmap) 0) {
++    	xdev->dest = (xdev->bpixmap != (Pixmap) 0 ?
+ 		  xdev->bpixmap : (Pixmap) xdev->win);
++    }
+     if (xdev->dest != (Pixmap) 0) {
+ 	XSetForeground(xdev->dpy, xdev->gc, xdev->background);
+ 	XFillRectangle(xdev->dpy, xdev->dest, xdev->gc,
diff --git a/print/ghostscript7/files/patch-src:genarch.c b/print/ghostscript7/files/patch-src:genarch.c
new file mode 100644
index 0000000..a015e69
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:genarch.c
@@ -0,0 +1,34 @@
+--- src/genarch.c.orig	Tue Jun  5 15:38:57 2001
++++ src/genarch.c	Wed Jun 20 04:17:42 2001
+@@ -41,6 +41,7 @@
+     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
+ }
+ 
++#ifndef __FreeBSD__
+ private clock_t
+ time_clear(char *buf, int bsize, int nreps)
+ {
+@@ -51,6 +52,7 @@
+ 	memset(buf, 0, bsize);
+     return clock() - t;
+ }
++#endif /* __FreeBSD__ */
+ 
+ private void
+ define(FILE *f, const char *str)
+@@ -181,6 +183,7 @@
+     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
+ #undef PRINT_MAX
+ 
++#ifndef __FreeBSD__
+     section(f, "Cache sizes");
+ 
+     /*
+@@ -241,6 +244,7 @@
+ 	}
+ 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
+     }
++#endif /* __FreeBSD__ */
+ 
+     section(f, "Miscellaneous");
+ 
diff --git a/print/ghostscript7/files/patch-ad b/print/ghostscript7/files/patch-src:gp_unifs.c
index 9688a7b..e7db705 100644
--- a/print/ghostscript7/files/patch-ad
+++ b/print/ghostscript7/files/patch-src:gp_unifs.c
@@ -1,6 +1,6 @@
---- gp_unifs.c.orig	Mon Feb 14 11:28:25 2000
-+++ gp_unifs.c	Fri Jul 28 23:53:04 2000
-@@ -33,6 +33,7 @@
+--- src/gp_unifs.c.orig	Tue Jun  5 15:38:58 2001
++++ src/gp_unifs.c	Wed Jun 20 04:18:03 2001
+@@ -29,6 +29,7 @@
  #include "stat_.h"
  #include "dirent_.h"
  #include <sys/param.h>		/* for MAXPATHLEN */
@@ -8,26 +8,26 @@
  
  /* Some systems (Interactive for example) don't define MAXPATHLEN,
   * so we define it here.  (This probably should be done via a Config-Script.)
-@@ -63,6 +64,8 @@
+@@ -59,6 +60,8 @@
  		     const char *mode)
  {				/* The -8 is for XXXXXX plus a possible final / and -. */
      int len = gp_file_name_sizeof - strlen(prefix) - 8;
 +    int fd;
 +    FILE *f;
  
-     if (gp_getenv("TEMP", fname, &len) != 0)
+     if (gp_gettmpdir(fname, &len) != 0)
  	strcpy(fname, "/tmp/");
-@@ -75,8 +78,12 @@
+@@ -71,8 +74,12 @@
      if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
  	strcat(fname, "-");
      strcat(fname, "XXXXXX");
 -    mktemp(fname);
--    return fopen(fname, mode);
+-    return gp_fopentemp(fname, mode);
 +    fd = mkstemp(fname);
 +    if (fd == -1)
-+    	return NULL;
++	return NULL;
 +    if ((f = fdopen(fd, mode)) == NULL)
-+    	close(fd);
++	close(fd);
 +    return f;
  }
  
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
new file mode 100644
index 0000000..c0082fd
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -0,0 +1,135 @@
+--- src/unix-gcc.mak.orig	Tue Jun  5 16:54:10 2001
++++ src/unix-gcc.mak	Fri Jun 15 04:11:50 2001
+@@ -27,14 +27,15 @@
+ # source, generated intermediate file, and object directories
+ # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
+ 
+-BINDIR=./bin
+-GLSRCDIR=./src
+-GLGENDIR=./obj
+-GLOBJDIR=./obj
+-PSSRCDIR=./src
+-PSLIBDIR=./lib
+-PSGENDIR=./obj
+-PSOBJDIR=./obj
++.CURDIR?=.
++BINDIR=${.CURDIR}/bin
++GLSRCDIR=${.CURDIR}/src
++GLGENDIR=${.CURDIR}/obj
++GLOBJDIR=${.CURDIR}/obj
++PSSRCDIR=${.CURDIR}/src
++PSLIBDIR=${.CURDIR}/lib
++PSGENDIR=${.CURDIR}/obj
++PSOBJDIR=${.CURDIR}/obj
+ 
+ # Do not edit the next group of lines.
+ 
+@@ -53,17 +54,17 @@
+ # 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)
+ 
+-prefix = /usr/local
++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)
+@@ -129,7 +130,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).
+@@ -149,14 +150,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-PSRCDIR=libpng
++PSRCDIR=${LOCALBASE}/include
+ PVERSION=10008
+ 
+ # Choose whether to use a shared version of the PNG library, and if so,
+ # what its name is.
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_LIBPNG=0
++SHARE_LIBPNG=1
+ LIBPNG_NAME=png
+ 
+ # Define the directory where the zlib sources are stored.
+@@ -168,7 +169,7 @@
+ # what its name is (usually libz, but sometimes libgz).
+ # See gs.mak and Make.htm for more information.
+ 
+-SHARE_ZLIB=0
++SHARE_ZLIB=1
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+ 
+@@ -183,7 +184,7 @@
+ 
+ # Define the name of the C compiler.
+ 
+-CC=gcc
++CC?=cc
+ 
+ # Define the name of the linker for the final link step.
+ # Normally this is the same as the C compiler.
+@@ -218,7 +219,7 @@
+ #   gcc to accept ANSI-style function prototypes and function definitions.
+ XCFLAGS=
+ 
+-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
++#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
+ 
+ # Define platform flags for ld.
+ # SunOS 4.n may need -Bstatic.
+@@ -227,7 +228,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${LOCALBASE}/lib
+ 
+ LDFLAGS=$(XLDFLAGS) -fno-common
+ 
+@@ -260,7 +261,7 @@
+ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
+ # not in $(XINCLUDE).
+ 
+-XINCLUDE=-I/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
+@@ -272,12 +273,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/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.
diff --git a/print/ghostscript7/files/patch-src:zmedia2.c b/print/ghostscript7/files/patch-src:zmedia2.c
new file mode 100644
index 0000000..6e19c2d
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:zmedia2.c
@@ -0,0 +1,25 @@
+--- 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 @@
+ 
+ 	rx = ry, ry = temp;
+     }
+-    /* Adjust the medium size if flexible. */ 
+-    if (medium->p.x < MIN_MEDIA_SIZE && mx > rx)
+-	mx = rx;
+-    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 */
+ 
+     /* Translate to align the centers. */ 
+     gs_make_translation(mx / 2, my / 2, pmat);
diff --git a/print/ghostscript7/files/stc740ih.upp b/print/ghostscript7/files/stc740ih.upp
new file mode 100644
index 0000000..bb9805f
--- /dev/null
+++ b/print/ghostscript7/files/stc740ih.upp
@@ -0,0 +1,60 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740ih.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 1440x720DpI, Inkjet Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2XY
+-r1440x720
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupBlackTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupCyanTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupMagentaTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupYellowTransfer="{
+ 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
+ 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
+ 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
+}"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveXPasses=2
+-dupOutputXStep=2
+-dupWeaveYPasses=6
+-dupOutputPins=46
+-dupWeaveYFeeds="{23 23 23 23 23 23 23 23 23 23 23 23}"
+-dupWeaveXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
+-dupWeaveYOffset=50
+-dupWeaveInitialYFeeds="{ 5  5  5  5  5  5  5  5  5  5  5 23}"
+-dupWeaveInitialXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
+-dupWeaveInitialPins="{ 13 16 19 22 25 28 31 34 37 40 43 46}"
+-dupFormatYabsolute
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 05
+   1b2873 0100 02
+   1b5501
+   1b2865 0200 0001
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupXStepCommand="<1b285c 0400 a005 0100 0000>"
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/stc740p.upp b/print/ghostscript7/files/stc740p.upp
new file mode 100644
index 0000000..a4e7f54
--- /dev/null
+++ b/print/ghostscript7/files/stc740p.upp
@@ -0,0 +1,36 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740p.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 720x720DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2
+-r720x720
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupBlackTransfer="{   0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupCyanTransfer="{    0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupMagentaTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupYellowTransfer="{  0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveYPasses=6
+-dupOutputPins=48
+-dupWeaveYFeeds="{47 47 47 53 47 47}"
+-dupWeaveInitialYFeeds="{1  1  1  1  1  43}"
+-dupWeaveInitialPins="{ 8 48 40 31 23 15}"
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 05
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+
diff --git a/print/ghostscript7/files/stc740pl.upp b/print/ghostscript7/files/stc740pl.upp
new file mode 100644
index 0000000..b2fdb0d
--- /dev/null
+++ b/print/ghostscript7/files/stc740pl.upp
@@ -0,0 +1,32 @@
+# $ApsCVS: src/apsfilter/uniprint/stc740pl.upp,v 1.2 2000/04/21 18:48:01 andreas Exp $
+#
+-supModel="Epson Stylus Color 740, 360x360DpI, Plain Paper"
+-sDEVICE=uniprint
+-dNOPAUSE
+-dSAFER
+-dupColorModel=/DeviceCMYKgenerate
+-dupRendering=/FSCMYK32
+-dupOutputFormat=/EscP2
+-r360x360
+-dupMargins="{ 9.0 39.96 9.0 9.0}"
+-dupOutputComponentOrder="{ 1 2 3 0 }"
+-dupWeaveYPasses=3
+-dupOutputPins=48
+-dupWeaveYFeeds="{47 50 47}"
+-dupWeaveInitialYFeeds="{1 1 46}"
+-dupWeaveInitialPins="{ 16 48 32}"
+-dupBeginPageCommand="<
+   1b40   1b40
+   1b2847 0100 01
+   1b2855 0100 0A
+   1b5500
+   1b2865 0200 0002
+   1b2843 0200 0000
+   1b2863 0400 0000 0000
+>"
+-dupAdjustPageLengthCommand
+-dupAdjustTopMarginCommand
+-dupAdjustBottomMarginCommand
+-dupEndPageCommand="(\033@\014)"
+-dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
+