This commit was manufactured by cvs2svn to create tag 'RELEASE_4_4_0'.release/4.4.0

18 files changed, 0 insertions, 578 deletions

diff --git a/print/ghostscript8/files/cdj850.contrib.mak b/print/ghostscript8/files/cdj850.contrib.mak
deleted file mode 100644
index 8faefec5fe4e..000000000000
--- a/print/ghostscript8/files/cdj850.contrib.mak
+++ /dev/null
@@ -1,21 +0,0 @@
-###- cdj850 - HP 850 Driver under development -------- ###
-cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
-
-$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
-
-$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
-
-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
-
-$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
-
-$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
-
-$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
- $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
diff --git a/print/ghostscript8/files/dj970.contrib.mak b/print/ghostscript8/files/dj970.contrib.mak
deleted file mode 100644
index 8227012da41a..000000000000
--- a/print/ghostscript8/files/dj970.contrib.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-###- cdj970 - HP 970Cxi Driver under development -------- ###
-cdeskjet9_=$(GLOBJ)gdevdj9.$(OBJ) $(HPPCL)
-
-$(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
-
-$(GLOBJ)gdevdj9.$(OBJ) : $(GLSRC)gdevdj9.c $(PDEVH) $(math__h) \
-		$(gsparam_h) $(gxlum_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevdj9.$(OBJ) $(C_) $(GLSRC)gdevdj9.c
diff --git a/print/ghostscript8/files/escputil.contrib.mak b/print/ghostscript8/files/escputil.contrib.mak
deleted file mode 100644
index b0cea6064968..000000000000
--- a/print/ghostscript8/files/escputil.contrib.mak
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# build escputil command from gimp-print sources
-
-escputil: $(GLSRC)escputil.c
-	$(CC_) -o $(GLSRC)escputil $(GLSRC)escputil.c
-
diff --git a/print/ghostscript8/files/hpijs.contrib.mak b/print/ghostscript8/files/hpijs.contrib.mak
deleted file mode 100644
index 35eb9e6b06b1..000000000000
--- a/print/ghostscript8/files/hpijs.contrib.mak
+++ /dev/null
@@ -1,31 +0,0 @@
-### ------------- 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/ghostscript8/files/lqx70ch.upp b/print/ghostscript8/files/lqx70ch.upp
deleted file mode 100644
index b5d3cd49e912..000000000000
--- a/print/ghostscript8/files/lqx70ch.upp
+++ /dev/null
@@ -1,26 +0,0 @@
-# $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/ghostscript8/files/lqx70cl.upp b/print/ghostscript8/files/lqx70cl.upp
deleted file mode 100644
index 91fb1aa89906..000000000000
--- a/print/ghostscript8/files/lqx70cl.upp
+++ /dev/null
@@ -1,26 +0,0 @@
-# $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/ghostscript8/files/lqx70cm.upp b/print/ghostscript8/files/lqx70cm.upp
deleted file mode 100644
index 895af73aa8d8..000000000000
--- a/print/ghostscript8/files/lqx70cm.upp
+++ /dev/null
@@ -1,25 +0,0 @@
-# $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/ghostscript8/files/patch-hpijs:makefile b/print/ghostscript8/files/patch-hpijs:makefile
deleted file mode 100644
index 8f53a8202f59..000000000000
--- a/print/ghostscript8/files/patch-hpijs:makefile
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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/ghostscript8/files/patch-lib:gs_init.ps b/print/ghostscript8/files/patch-lib:gs_init.ps
deleted file mode 100644
index d3e7e8130021..000000000000
--- a/print/ghostscript8/files/patch-lib:gs_init.ps
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/gs_init.ps.orig	Mon Apr  9 15:20:03 2001
-+++ lib/gs_init.ps	Wed Jun 20 04:05:12 2001
-@@ -1263,7 +1263,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>
-@@ -1815,3 +1815,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/ghostscript8/files/patch-pcl3:eprn:gdeveprn.c b/print/ghostscript8/files/patch-pcl3:eprn:gdeveprn.c
deleted file mode 100644
index 605148be439c..000000000000
--- a/print/ghostscript8/files/patch-pcl3:eprn:gdeveprn.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- pcl3/eprn/gdeveprn.c.orig	Sun Mar 25 13:59:11 2001
-+++ pcl3/eprn/gdeveprn.c	Tue Apr 10 17:53:03 2001
-@@ -81,6 +81,9 @@
- #include "gstypes.h"	/* needed by gsstate.h */
- #include "gsstate.h"	/* needed by icstate.h */
- #include "icstate.h"	/* for struct gs_context_state_s */
-+#if !defined(GS_REVISION) || GS_REVISION >= 700
-+#include "iapi.h"	/* needed by iminst.h */
-+#endif
- #include "iminst.h"	/* for struct gs_main_instance_s */
- #include "imain.h"	/* for gs_main_instance_default() */
- #include "gscoord.h"	/* for gs_setdefaultmatrix() */
diff --git a/print/ghostscript8/files/patch-src:contrib.mak-5.94.add b/print/ghostscript8/files/patch-src:contrib.mak-5.94.add
deleted file mode 100644
index 1d2c46b8ea2e..000000000000
--- a/print/ghostscript8/files/patch-src:contrib.mak-5.94.add
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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/ghostscript8/files/patch-src:genarch.c b/print/ghostscript8/files/patch-src:genarch.c
deleted file mode 100644
index 3b74ac7e6145..000000000000
--- a/print/ghostscript8/files/patch-src:genarch.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/genarch.c.orig	Wed Sep 20 04:00:23 2000
-+++ src/genarch.c	Wed Jun 20 04:05:36 2001
-@@ -40,6 +40,7 @@
-     fprintf(f, "\n\t /* ---------------- %s ---------------- */\n\n", str);
- }
- 
-+#ifndef __FreeBSD__
- private clock_t
- time_clear(char *buf, int bsize, int nreps)
- {
-@@ -50,6 +51,7 @@
- 	memset(buf, 0, bsize);
-     return clock() - t;
- }
-+#endif /* __FreeBSD__ */
- 
- private void
- define(FILE *f, const char *str)
-@@ -180,6 +182,7 @@
-     fprintf(f, "((unsigned long)~0L + (unsigned long)0)\n");
- #undef PRINT_MAX
- 
-+#ifndef __FreeBSD__
-     section(f, "Cache sizes");
- 
-     /*
-@@ -240,6 +243,7 @@
- 	}
- 	define_int(f, "ARCH_CACHE2_SIZE", bsize >> 1);
-     }
-+#endif /* __FreeBSD__ */
- 
-     section(f, "Miscellaneous");
- 
diff --git a/print/ghostscript8/files/patch-src:gp_unifs.c b/print/ghostscript8/files/patch-src:gp_unifs.c
deleted file mode 100644
index 68c9bcaf175b..000000000000
--- a/print/ghostscript8/files/patch-src:gp_unifs.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/gp_unifs.c.orig	Tue Mar 13 15:51:39 2001
-+++ src/gp_unifs.c	Wed Jun 20 04:06:02 2001
-@@ -28,6 +28,7 @@
- #include "stat_.h"
- #include "dirent_.h"
- #include <sys/param.h>		/* for MAXPATHLEN */
-+#include <unistd.h>
- 
- /* Some systems (Interactive for example) don't define MAXPATHLEN,
-  * so we define it here.  (This probably should be done via a Config-Script.)
-@@ -58,6 +59,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_gettmpdir(fname, &len) != 0)
- 	strcpy(fname, "/tmp/");
-@@ -70,8 +73,12 @@
-     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
- 	strcat(fname, "-");
-     strcat(fname, "XXXXXX");
--    mktemp(fname);
--    return gp_fopentemp(fname, mode);
-+    fd = mkstemp(fname);
-+    if (fd == -1)
-+	return NULL;
-+    if ((f = fdopen(fd, mode)) == NULL)
-+	close(fd);
-+    return f;
- }
- 
- /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
deleted file mode 100644
index dbadbe4eb3c1..000000000000
--- a/print/ghostscript8/files/patch-src:unix-gcc.mak
+++ /dev/null
@@ -1,136 +0,0 @@
---- src/unix-gcc.mak.orig	Mon Apr  9 14:52:57 2001
-+++ src/unix-gcc.mak	Wed Sep 12 22:54:27 2001
-@@ -26,14 +26,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.
- 
-@@ -52,11 +53,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)
- 
--prefix = /usr/local
-+prefix = $(PREFIX)
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- scriptdir = $(bindir)
-@@ -128,7 +128,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).
-@@ -148,14 +148,14 @@
- # You may need to change this if the libpng version changes.
- # See libpng.mak for more information.
- 
--PSRCDIR=libpng
-+PSRCDIR=${LOCALBASE}/include
- PVERSION=10010
- 
- # 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.
-@@ -167,7 +167,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
- 
-@@ -187,7 +187,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.
-@@ -220,9 +220,11 @@
- # 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=
-+ifdef A4
-+XCFLAGS=-DA4
-+endif
- 
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+CFLAGS+=$(XCFLAGS)
- 
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -231,7 +233,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
- 
-@@ -264,7 +266,7 @@
- # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
- # not in $(XINCLUDE).
- 
--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
-@@ -277,11 +279,16 @@
- #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
- # X11R6 (on any platform) may need
- #XLIBS=Xt SM ICE Xext X11
-+ifdef NO_X
-+XLIBS=
-+else
-+XLIBS=Xt SM ICE Xext X11
-+endif
- 
- #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/ghostscript8/files/patch-src:zmedia2.c b/print/ghostscript8/files/patch-src:zmedia2.c
deleted file mode 100644
index 7db33eaecc44..000000000000
--- a/print/ghostscript8/files/patch-src:zmedia2.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/zmedia2.c.orig	Wed Sep 20 04:00:54 2000
-+++ src/zmedia2.c	Wed Jun 20 04:06:24 2001
-@@ -427,11 +427,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/ghostscript8/files/stc740ih.upp b/print/ghostscript8/files/stc740ih.upp
deleted file mode 100644
index bb9805f55fb8..000000000000
--- a/print/ghostscript8/files/stc740ih.upp
+++ /dev/null
@@ -1,60 +0,0 @@
-# $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/ghostscript8/files/stc740p.upp b/print/ghostscript8/files/stc740p.upp
deleted file mode 100644
index a4e7f5441793..000000000000
--- a/print/ghostscript8/files/stc740p.upp
+++ /dev/null
@@ -1,36 +0,0 @@
-# $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/ghostscript8/files/stc740pl.upp b/print/ghostscript8/files/stc740pl.upp
deleted file mode 100644
index b2fdb0dbbc06..000000000000
--- a/print/ghostscript8/files/stc740pl.upp
+++ /dev/null
@@ -1,32 +0,0 @@
-# $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)"
-