summaryrefslogtreecommitdiff
path: root/print/ghostscript7/files
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2002-08-10 04:35:28 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2002-08-10 04:35:28 +0000
commitf124555536ce4b815ff160312c094545c36ec440 (patch)
tree702199d3b5e34c9ba151483313d8c26565451c75 /print/ghostscript7/files
parent280725774faa4e3d91ff599cca3a1466c77d300e (diff)
Diffstat (limited to 'print/ghostscript7/files')
-rw-r--r--print/ghostscript7/files/gdi.contrib.mak12
-rw-r--r--print/ghostscript7/files/lqx70ch.upp26
-rw-r--r--print/ghostscript7/files/lqx70cl.upp26
-rw-r--r--print/ghostscript7/files/lqx70cm.upp25
-rw-r--r--print/ghostscript7/files/patch-alps:gdevalps.mak25
-rw-r--r--print/ghostscript7/files/patch-eplaser:gdevescv.c53
-rw-r--r--print/ghostscript7/files/patch-eplaser:gdevesmv.c53
-rw-r--r--print/ghostscript7/files/patch-gdev10v:gdev10v.mak22
-rw-r--r--print/ghostscript7/files/patch-lib:gs_init.ps19
-rw-r--r--print/ghostscript7/files/patch-lib:gs_res.ps13
-rw-r--r--print/ghostscript7/files/patch-lips:gdevlips.mak18
-rw-r--r--print/ghostscript7/files/patch-md2k:gdevmd2k.mak19
-rw-r--r--print/ghostscript7/files/patch-mjc:gdevmjc.c335
-rw-r--r--print/ghostscript7/files/patch-mjc:gdevmjc.mak43
-rw-r--r--print/ghostscript7/files/patch-src:contrib.mak-5.94.add14
-rw-r--r--print/ghostscript7/files/patch-src:dmp_site.ps10
-rw-r--r--print/ghostscript7/files/patch-src:dviprlib.c13
-rw-r--r--print/ghostscript7/files/patch-src:gdevdmpr.c11
-rw-r--r--print/ghostscript7/files/patch-src:gdevdmpr.mak21
-rw-r--r--print/ghostscript7/files/patch-src:gdevgdi.c19
-rw-r--r--print/ghostscript7/files/patch-src:gdevlbp8.c70
-rw-r--r--print/ghostscript7/files/patch-src:genarch.c34
-rw-r--r--print/ghostscript7/files/patch-src:unix-dll.mak59
-rw-r--r--print/ghostscript7/files/patch-src:unix-gcc.mak142
-rw-r--r--print/ghostscript7/files/patch-src:zmedia2.c25
-rw-r--r--print/ghostscript7/files/stc740ih.upp60
-rw-r--r--print/ghostscript7/files/stc740p.upp36
-rw-r--r--print/ghostscript7/files/stc740pl.upp32
28 files changed, 0 insertions, 1235 deletions
diff --git a/print/ghostscript7/files/gdi.contrib.mak b/print/ghostscript7/files/gdi.contrib.mak
deleted file mode 100644
index 808b7fb71935..000000000000
--- a/print/ghostscript7/files/gdi.contrib.mak
+++ /dev/null
@@ -1,12 +0,0 @@
-### ---------------- The Samsung SmartGDI laser printer devices --------- ###
-### Note : this driver is used by Samsung SmartGDI compatible printers. ###
-###
-
-GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
-
-$(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gsparam_h)
- $(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
-
-$(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
- $(SETPDEV) $(DD)gdi $(GDIMONO)
-
diff --git a/print/ghostscript7/files/lqx70ch.upp b/print/ghostscript7/files/lqx70ch.upp
deleted file mode 100644
index b5d3cd49e912..000000000000
--- a/print/ghostscript7/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/ghostscript7/files/lqx70cl.upp b/print/ghostscript7/files/lqx70cl.upp
deleted file mode 100644
index 91fb1aa89906..000000000000
--- a/print/ghostscript7/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/ghostscript7/files/lqx70cm.upp b/print/ghostscript7/files/lqx70cm.upp
deleted file mode 100644
index 895af73aa8d8..000000000000
--- a/print/ghostscript7/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/ghostscript7/files/patch-alps:gdevalps.mak b/print/ghostscript7/files/patch-alps:gdevalps.mak
deleted file mode 100644
index 45144eaadcfd..000000000000
--- a/print/ghostscript7/files/patch-alps:gdevalps.mak
+++ /dev/null
@@ -1,25 +0,0 @@
---- alps/gdevalps.mak-5.50.orig Sat Jan 12 13:21:12 2002
-+++ alps/gdevalps.mak-5.50 Sat Jan 12 13:23:45 2002
-@@ -2,15 +2,15 @@
-
- alps_=$(GLOBJ)gdevalps.$(OBJ)
-
--md50Mono.dev: $(alps_) page.dev
-- $(SETPDEV) md50Mono $(alps_)
-+$(DD)md50Mono.dev: $(alps_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md50Mono $(alps_)
-
--md50Eco.dev: $(alps_) page.dev
-- $(SETPDEV) md50Eco $(alps_)
-+$(DD)md50Eco.dev: $(alps_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md50Eco $(alps_)
-
--md1xMono.dev: $(alps_) page.dev
-- $(SETPDEV) md1xMono $(alps_)
-+$(DD)md1xMono.dev: $(alps_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md1xMono $(alps_)
-
--$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(PDEVH)
-+$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(gdevprn_h) $(PDEVH)
- $(GLCC) $(GLO_)gdevalps.$(OBJ) $(C_) $(GLSRC)gdevalps.c
-
diff --git a/print/ghostscript7/files/patch-eplaser:gdevescv.c b/print/ghostscript7/files/patch-eplaser:gdevescv.c
deleted file mode 100644
index dbc3f4a109a9..000000000000
--- a/print/ghostscript7/files/patch-eplaser:gdevescv.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- eplaser/gdevescv.c.orig Fri Dec 21 15:50:22 2001
-+++ 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
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- escv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used)
- #else
- escv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height)
- #endif
- {
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- gx_device *dev = info->dev;
- #endif
- gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1784,7 +1783,7 @@
-
- {
-
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- if (height == 260)
- height = 1;
- #endif
-@@ -1922,13 +1921,13 @@
-
-
- private int
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- escv_image_end_image(gx_image_enum_common_t * info, bool draw_last)
- #else
- escv_image_end_image(gx_device *dev, gx_image_enum_common_t * info, bool draw_last)
- #endif
- {
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- gx_device *dev = info->dev;
- #endif
- gx_device_vector *const vdev = (gx_device_vector *) dev;
diff --git a/print/ghostscript7/files/patch-eplaser:gdevesmv.c b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
deleted file mode 100644
index bce92ff8358c..000000000000
--- a/print/ghostscript7/files/patch-eplaser:gdevesmv.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- eplaser/gdevesmv.c.orig Fri Dec 14 10:50:14 2001
-+++ 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
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- esmv_image_plane_data(gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height, int *rows_used)
- #else
- esmv_image_plane_data(gx_device *dev, gx_image_enum_common_t *info, const gx_image_plane_t *planes, int height)
- #endif
- {
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- gx_device *dev = info->dev;
- #endif
- gx_device_vector *const vdev = (gx_device_vector *) dev;
-@@ -1823,7 +1822,7 @@
-
- {
-
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- if (height == 260)
- height = 1;
- #endif
-@@ -1980,13 +1979,13 @@
-
-
- private int
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- esmv_image_end_image(gx_image_enum_common_t * info, bool draw_last)
- #else
- esmv_image_end_image(gx_device * dev, gx_image_enum_common_t * info, bool draw_last)
- #endif
- {
--#if GS_VERSION_MAJOR == 6
-+#if GS_VERSION_MAJOR >= 6
- gx_device *dev = info->dev;
- #endif
- gx_device_vector *const vdev = (gx_device_vector *) dev;
diff --git a/print/ghostscript7/files/patch-gdev10v:gdev10v.mak b/print/ghostscript7/files/patch-gdev10v:gdev10v.mak
deleted file mode 100644
index 25a8317379b8..000000000000
--- a/print/ghostscript7/files/patch-gdev10v:gdev10v.mak
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdev10v/gdev10v.mak.orig Thu Oct 12 11:17:50 2000
-+++ gdev10v/gdev10v.mak Thu Oct 12 11:21:12 2000
-@@ -1,12 +1,13 @@
- ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
-
--bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ)
--bj10v.dev: $(bj10v_)
-- $(SHP)gssetdev bj10v $(bj10v_)
--bj10vh.dev: $(bj10v_)
-- $(SHP)gssetdev bj10vh $(bj10v_)
-+bj10v_=$(GLOBJ)gdev10v.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
-+$(DD)bj10v.dev: $(bj10v_) $(DD)page.dev
-+ $(SETPDEV) $(DD)bj10v $(bj10v_)
-+$(DD)bj10vh.dev: $(bj10v_) $(DD)page.dev
-+ $(SETPDEV) $(DD)bj10vh $(bj10v_)
-
- # Uncomment the following line if you are using MS-DOS on PC9801 series.
-
--gdev10v.$(OBJ): gdevbj10.c $(PDEVH)
-+$(GLOBJ)gdev10v.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH)
-+ $(GLCC) $(GLO_)gdev10v.$(OBJ) $(C_) $(GLSRC)gdev10v.c
- # $(CCC) -DPC9801 gdev10v.c
diff --git a/print/ghostscript7/files/patch-lib:gs_init.ps b/print/ghostscript7/files/patch-lib:gs_init.ps
deleted file mode 100644
index 70de88245ddc..000000000000
--- a/print/ghostscript7/files/patch-lib:gs_init.ps
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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 {
-- { pop 0 } dup setblackgeneration setundercolorremoval
-+ {} dup setblackgeneration setundercolorremoval
- } if
- } bind def
- /.useloresscreen { % - .useloresscreen <bool>
-@@ -1874,3 +1874,7 @@
- userdict /AGM_preserve_spots false put
-
- % 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-lib:gs_res.ps b/print/ghostscript7/files/patch-lib:gs_res.ps
deleted file mode 100644
index 2e5169720649..000000000000
--- a/print/ghostscript7/files/patch-lib:gs_res.ps
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/gs_res.ps.orig Mon Jul 16 01:09:41 2001
-+++ lib/gs_res.ps Fri Feb 8 07:12:09 2002
-@@ -248,8 +248,8 @@
- /pssystemparams 10 dict readonly def
- } if
- pssystemparams begin
-- /FontResourceDir (/Resource/Font/) readonly .forcedef % pssys'params is r-o
-- /GenericResourceDir (/Resource/) readonly .forcedef % pssys'params is r-o
-+ /FontResourceDir (%%DATADIR%%/Resource/Font/) readonly .forcedef % pssys'params is r-o
-+ /GenericResourceDir (%%DATADIR%%/Resource/) readonly .forcedef % pssys'params is r-o
- /GenericResourcePathSep (/) readonly .forcedef % pssys'params is r-o
- end
- end
diff --git a/print/ghostscript7/files/patch-lips:gdevlips.mak b/print/ghostscript7/files/patch-lips:gdevlips.mak
deleted file mode 100644
index 06630057330c..000000000000
--- a/print/ghostscript7/files/patch-lips:gdevlips.mak
+++ /dev/null
@@ -1,18 +0,0 @@
---- lips/gdevlips.mak.orig Thu Nov 2 12:12:13 2000
-+++ lips/gdevlips.mak Wed Feb 13 07:29:36 2002
-@@ -43,15 +43,6 @@
- $(GLOBJ)lp2000.dev: $(escpage_) $(DD)page.dev
- $(SETPDEV) $(DD)lp2000 $(escpage_)
-
--### --- The NEC NPDL language printer device ------ ###
--
--npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
--$(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
-- $(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
--
--$(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
-- $(SETPDEV) $(DD)npdl $(npdl_)
--
- ### --- The RICOH RPDL language printer device ------ ###
-
- rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
diff --git a/print/ghostscript7/files/patch-md2k:gdevmd2k.mak b/print/ghostscript7/files/patch-md2k:gdevmd2k.mak
deleted file mode 100644
index b003efb81f7f..000000000000
--- a/print/ghostscript7/files/patch-md2k:gdevmd2k.mak
+++ /dev/null
@@ -1,19 +0,0 @@
---- md2k/gdevmd2k.mak-5.50.orig Sun Nov 19 18:42:20 2000
-+++ md2k/gdevmd2k.mak-5.50 Sun Nov 19 18:52:14 2000
-@@ -3,11 +3,11 @@
-
- md2k_=$(GLOBJ)gdevmd2k.$(OBJ)
-
--md2k.dev: $(md2k_) page.dev
-- $(SETPDEV) md2k $(md2k_)
-+$(DD)md2k.dev: $(md2k_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md2k $(md2k_)
-
--md5k.dev: $(md2k_) page.dev
-- $(SETPDEV) md5k $(md2k_)
-+$(DD)md5k.dev: $(md2k_) $(DD)page.dev
-+ $(SETPDEV) $(DD)md5k $(md2k_)
-
--$(GLOBJ)gdevmd2k.$(OBJ): gdevmd2k.c $(PDEVH) $(gsparam_h)
-+$(GLOBJ)gdevmd2k.$(OBJ): $(GLSRC)gdevmd2k.c $(PDEVH) $(gsparam_h)
- $(GLCC) $(GLO_)gdevmd2k.$(OBJ) $(C_) $(GLSRC)gdevmd2k.c
diff --git a/print/ghostscript7/files/patch-mjc:gdevmjc.c b/print/ghostscript7/files/patch-mjc:gdevmjc.c
deleted file mode 100644
index 99ff0bcb245f..000000000000
--- a/print/ghostscript7/files/patch-mjc:gdevmjc.c
+++ /dev/null
@@ -1,335 +0,0 @@
---- mjc/gdevmjc.c.orig Tue May 23 19:16:52 2000
-+++ mjc/gdevmjc.c Tue May 23 19:17:44 2000
-@@ -43,7 +43,8 @@
- #include <limits.h>
- #include "gdevprn.h"
- #include "gdevpcl.h"
--#include "gsprops.h"
-+#include "gsparam.h"
-+#include "gsstate.h"
-
- #include "mjmtx2.c"
- #include "mjbksep.c"
-@@ -150,7 +151,9 @@
-
- /* Undefined macros expected to be defined in gdevpcl.h */
- #define PAPER_SIZE_A3_NOBI 28
-+#ifndef PAPER_SIZE_A2
- #define PAPER_SIZE_A2 29
-+#endif
- #define PAPER_SIZE_B4 30
- #define PAPER_SIZE_B5 31
-
-@@ -190,14 +193,12 @@
- private dev_proc_print_page(mjc720_print_page);
- private dev_proc_print_page(mj500c_print_page);
-
--private dev_proc_get_props(mj_get_props);
--private dev_proc_put_props(mj_put_props);
-+private dev_proc_get_params(mj_get_params);
-+private dev_proc_put_params(mj_put_params);
-
- private void expand_line(P4(word*, int, int, int));
--private int put_prop_float(P5(gs_prop_item *, float *, float, float, int));
--private int put_prop_int(P5(gs_prop_item *, int *, int, int, int));
--
--private void set_bpp(P2(gx_device *, int));
-+private int mj_put_param_int(P6(gs_param_list *, gs_param_name, int *, int, int, int));
-+private void mj_set_bpp(P2(gx_device *, int));
-
- private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int ));
-
-@@ -224,7 +225,7 @@
- #define mj ((gx_device_mj *) pdev)
-
- #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\
-- prn_device_body(gx_device_printer, procs, dev_name,\
-+ prn_device_body(gx_device_mj, procs, dev_name,\
- WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\
- bpp, 0, 0, 0, 0, print_page)
-
-@@ -235,9 +236,9 @@
- }
-
-
--#define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\
-+#define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\
- proc_colour_open,\
-- gdev_pcl_get_initial_matrix,\
-+ gx_default_get_initial_matrix,\
- gx_default_sync_output,\
- gdev_prn_output_page,\
- gdev_prn_close,\
-@@ -249,15 +250,15 @@
- NULL, /* copy_color */\
- NULL, /* draw_line */\
- gx_default_get_bits,\
-- proc_get_props,\
-- proc_put_props\
-+ proc_get_params,\
-+ proc_put_params\
- }
-
- private int mjc_open(P1(gx_device *));
- private int mj_colour_open(P1(gx_device *));
-
- private gx_device_procs mj_procs =
--mj_colour_procs(mjc_open, mj_get_props, mj_put_props);
-+mj_colour_procs(mjc_open, mj_get_params, mj_put_params);
-
- gx_device_mj far_data gs_mjc180_device =
- mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL,
-@@ -306,14 +307,14 @@
- static const float mj_b4[4] = { MJ700V2C_MARGINS_B4 };
- static const float mj_b5[4] = { MJ700V2C_MARGINS_B5 };
- static const float mj_letter[4] = { MJ700V2C_MARGINS_LETTER };
-- const float _ds *m;
-+ const float *m;
- int psize;
-
- int paper_size;
-
- /* Set up colour params if put_props has not already done so */
- if (pdev->color_info.num_components == 0)
-- set_bpp(pdev, pdev->color_info.depth);
-+ mj_set_bpp(pdev, pdev->color_info.depth);
-
- paper_size = gdev_mjc_paper_size(pdev);
- if (paper_size == PAPER_SIZE_A2 ) {
-@@ -332,10 +333,7 @@
- m = mj_letter;
- }
-
-- pdev->l_margin = m[0];
-- pdev->b_margin = m[1];
-- pdev->r_margin = m[2];
-- pdev->t_margin = m[3];
-+ gx_device_set_margins(pdev, m, true);
-
- switch (mj->colorcomp) {
- case 1:
-@@ -360,80 +358,74 @@
- * and control over the bits-per-pixel used in output rendering */
- /* Added properties for DeskJet 5xxC */
-
--private const gs_prop_item props_mj[] = {
-- /* Read-write properties. */
-- prop_def("Density", prt_int),
-- prop_def("Cyan", prt_int),
-- prop_def("Magenta", prt_int),
-- prop_def("Yellow", prt_int),
-- prop_def("Black", prt_int),
-- prop_def("Dither", prt_int),
-- prop_def("ColorComponent", prt_int),
-- prop_def("Direction", prt_int),
-- prop_def("MicroWeave", prt_int),
-- prop_def("DotSize", prt_int),
--};
--
- private int
--mj_get_props(gx_device *pdev, gs_prop_item *plist)
--{ int start = gdev_prn_get_props(pdev, plist);
-- if ( plist != 0 ) {
-- register gs_prop_item *pi = plist + start;
-- memcpy(pi, props_mj, sizeof(props_mj));
-- pi[0].value.i = mj->density;
-- pi[1].value.i = mj->cyan;
-- pi[2].value.i = mj->magenta;
-- pi[3].value.i = mj->yellow;
-- pi[4].value.i = mj->black;
-- pi[5].value.i = mj->dither;
-- pi[6].value.i = mj->colorcomp;
-- pi[7].value.i = mj->direction;
-- pi[8].value.i = mj->microweave;
-- pi[9].value.i = mj->dotsize;
-- }
-- return start + sizeof(props_mj) / sizeof(gs_prop_item);
-+mj_get_params(gx_device *pdev, gs_param_list *plist)
-+{ int code = gdev_prn_get_params(pdev, plist);
-+ if ( code < 0 ||
-+ (code = param_write_int(plist, "Density", &mj->density)) < 0 ||
-+ (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 ||
-+ (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 ||
-+ (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 ||
-+ (code = param_write_int(plist, "Black", &mj->black)) < 0 ||
-+ (code = param_write_int(plist, "Dither", &mj->dither)) < 0 ||
-+ (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 ||
-+ (code = param_write_int(plist, "Direction", &mj->direction)) < 0 ||
-+ (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 ||
-+ (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0
-+ )
-+ return code;
-+ return code;
- }
-
- /* Put properties. */
- private int
--mj_put_props(gx_device *pdev, gs_prop_item *plist, int count)
-+mj_put_params(gx_device *pdev, gs_param_list *plist)
- {
-- static const argn = 10;
--/* gs_prop_item *known[argn]; */
-- gs_prop_item *known[10];
- int old_bpp = mj->color_info.depth;
- int bpp = 0;
- int code = 0;
--
-- props_extract(plist, count, props_mj, argn, known, 0);
-- code = gdev_prn_put_props(pdev, plist, count);
-- if ( code < 0 ) return code;
--
-- code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code);
-- code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code);
-- code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code);
-- code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code);
-- code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code);
-- code = put_prop_int(known[5], &mj->dither, 0, 1, code);
-- code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code);
-- code = put_prop_int(known[7], &mj->direction, 1, 2, code);
-- code = put_prop_int(known[8], &mj->microweave, 0, 1, code);
-- code = put_prop_int(known[9], &mj->dotsize, 0, 1, code);
--
-+ int density = mj->density;
-+ int cyan = mj->cyan;
-+ int magenta = mj->magenta;
-+ int yellow = mj->yellow;
-+ int black = mj->black;
-+ int dither = mj->dither;
-+ int colorcomp = mj->colorcomp;
-+ int direction = mj->direction;
-+ int microweave = mj->microweave;
-+ int dotsize = mj->dotsize;
-+ code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Cyan", &cyan, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Magenta", &magenta, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Yellow", &yellow, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Black", &black, 0, INT_MAX, code);
-+ code = mj_put_param_int(plist, "Dither", &dither, 0, 1, code);
-+ code = mj_put_param_int(plist, "ColorComponent", &colorcomp, 1, 4, code);
-+ code = mj_put_param_int(plist, "Direction", &direction, 1, 2, code);
-+ code = mj_put_param_int(plist, "MicroWeave", &microweave, 0, 1, code);
-+ code = mj_put_param_int(plist, "DotSize", &dotsize, 0, 1, code);
-+ code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code);
- if ( code < 0 )
-- return_error(code);
--
-- if (bpp != 0) {
-- set_bpp(pdev, bpp);
--
-- /* Close the device; gs_putdeviceprops will reopen it. */
-+ return code;
-+ mj->density = density;
-+ mj->cyan = cyan;
-+ mj->magenta = magenta;
-+ mj->yellow = yellow;
-+ mj->black = black;
-+ mj->dither = dither;
-+ mj->colorcomp = colorcomp;
-+ mj->direction = direction;
-+ mj->microweave = microweave;
-+ mj->dotsize = dotsize;
-+ if ( bpp != 0 ) {
-+ mj_set_bpp(pdev, bpp);
-+ gdev_prn_put_params(pdev, plist);
- if ( bpp != old_bpp && pdev->is_open )
-- { int ccode = gs_closedevice(pdev);
-- if ( ccode < 0 ) return ccode;
-- }
-+ return gs_closedevice(pdev);
-+ return 0;
- }
--
-- return code;
-+ else
-+ return gdev_prn_put_params(pdev, plist);
- }
-
- /* ------ Internal routines ------ */
-@@ -1163,7 +1155,8 @@
-
- /* Send each scan line in turn */
- {
-- long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi;
-+ long int lend = pdev->height -
-+ (dev_t_margin_points(pdev) + dev_b_margin_points(pdev));
- int cErr, mErr, yErr, kErr;
- int this_pass, i;
- long int lnum;
-@@ -1685,39 +1678,25 @@
- }
-
- private int
--put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code)
--{
-- if ( pi == 0 )
-- return (code);
--
-- if ( pi->value.i < minval || pi->value.i > maxval )
-- { pi->status = pv_rangecheck;
-- return (gs_error_rangecheck);
-- }
-- else
-- { *property = pi->value.i;
-- return (code ? code : 1);
-- }
--}
--
--private int
--put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code)
--{
-- if ( pi == 0 )
-- return (code);
--
-- if ( pi->value.f < minval || pi->value.f > maxval )
-- { pi->status = pv_rangecheck;
-- return (gs_error_rangecheck);
-- }
-- else
-- { *property = pi->value.f;
-- return (code ? code : 1);
-- }
-+mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue,
-+ int minval, int maxval, int ecode)
-+{ int code, value;
-+ switch ( code = param_read_int(plist, pname, &value) )
-+ {
-+ default:
-+ return code;
-+ case 1:
-+ return ecode;
-+ case 0:
-+ if ( value < minval || value > maxval )
-+ param_signal_error(plist, pname, gs_error_rangecheck);
-+ *pvalue = value;
-+ return (ecode < 0 ? ecode : 1);
-+ }
- }
-
- private void
--set_bpp(gx_device *pdev, int bits_per_pixel)
-+mj_set_bpp(gx_device *pdev, int bits_per_pixel)
- { gx_device_color_info *ci = &pdev->color_info;
- /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */
- int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 :
-@@ -1725,9 +1704,9 @@
- ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3);
- ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp);
- ci->max_gray = (bpp >= 8 ? 255 : 1);
-- ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
-- ci->dither_gray = (bpp >= 8 ? 5 : 2);
-- ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
-+ ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
-+ ci->dither_grays = (bpp >= 8 ? 5 : 2);
-+ ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
- }
-
- /* This returns either the number of pixels in a scan line, or the number
-@@ -1736,7 +1715,7 @@
- gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount)
- {
- word raster_width =
-- pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin);
-+ pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]);
- return (pixelcount ?
- (uint)raster_width :
- (uint)((raster_width * pdev->color_info.depth + 7) >> 3));
diff --git a/print/ghostscript7/files/patch-mjc:gdevmjc.mak b/print/ghostscript7/files/patch-mjc:gdevmjc.mak
deleted file mode 100644
index a094ea08812f..000000000000
--- a/print/ghostscript7/files/patch-mjc:gdevmjc.mak
+++ /dev/null
@@ -1,43 +0,0 @@
---- mjc/gdevmjc.mak.orig Tue May 23 19:19:13 2000
-+++ mjc/gdevmjc.mak Tue May 23 19:19:40 2000
-@@ -4,25 +4,22 @@
- # Supports MJ-700V2C, MJ-5000C, MJ-900C, MJ-800C, MJ-500C
- #
- ##
--#
--# Append this file to Makefile
--#
--##
--MJCSRC = gdevmjc.c mjmtx2.c mjbksep.c mjhtocmy.c mjvtbl.c \
-- mjgrnsp.c mjgrnsp2.c mjespdtc.c mjespdtm.c mjespdty.c mjbarrie.c
-+MJCSRC = $(GLSRC)gdevmjc.c $(GLSRC)mjmtx2.c $(GLSRC)mjbksep.c \
-+ $(GLSRC)mjhtocmy.c $(GLSRC)mjvtbl.c $(GLSRC)mjgrnsp.c \
-+ $(GLSRC)mjgrnsp2.c $(GLSRC)mjespdtc.c $(GLSRC)mjespdtm.c \
-+ $(GLSRC)mjespdty.c $(GLSRC)mjbarrie.c
-
--mj700v2c_=gdevmjc.$(OBJ) $(HPPCL)
-+mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL)
-
- # To make A4 paper the default, change the second line below this to
--gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
-- $(CCC) -DA4 gdevmjc.c
--
--mjc180.dev: $(mj700v2c_)
-- $(SHP)gssetdev mjc180 $(mj700v2c_)
--mjc360.dev: $(mj700v2c_)
-- $(SHP)gssetdev mjc360 $(mj700v2c_)
--mjc720.dev: $(mj700v2c_)
-- $(SHP)gssetdev mjc720 $(mj700v2c_)
--mj500c.dev: $(mj700v2c_)
-- $(SHP)gssetdev mj500c $(mj700v2c_)
-+$(GLOBJ)gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
-+ $(GLCC) -DA4 $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c
-
-+$(GLOBJ)mjc180.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mjc180 $(mj700v2c_)
-+$(GLOBJ)mjc360.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mjc360 $(mj700v2c_)
-+$(GLOBJ)mjc720.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mjc720 $(mj700v2c_)
-+$(GLOBJ)mj500c.dev: $(mj700v2c_) $(DD)page.dev
-+ $(SETPDEV) $(DD)mj500c $(mj700v2c_)
diff --git a/print/ghostscript7/files/patch-src:contrib.mak-5.94.add b/print/ghostscript7/files/patch-src:contrib.mak-5.94.add
deleted file mode 100644
index 1d2c46b8ea2e..000000000000
--- a/print/ghostscript7/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/ghostscript7/files/patch-src:dmp_site.ps b/print/ghostscript7/files/patch-src:dmp_site.ps
deleted file mode 100644
index ee1a5717d641..000000000000
--- a/print/ghostscript7/files/patch-src:dmp_site.ps
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dmp_site.ps.orig Tue May 27 09:57:00 1997
-+++ src/dmp_site.ps Tue Apr 2 23:05:45 2002
-@@ -1,6 +1,6 @@
- BeginConfig
- %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
--/printer (epsimage.src)
-+/printer (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
- % horizontal / vertical
- % /resolution [ 160.0 180.0 ]
- % horizontal / vertical
diff --git a/print/ghostscript7/files/patch-src:dviprlib.c b/print/ghostscript7/files/patch-src:dviprlib.c
deleted file mode 100644
index 67662665f273..000000000000
--- a/print/ghostscript7/files/patch-src:dviprlib.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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 void dviprt_messagestream_construct (void) __attribute__((constructor));
-+private void dviprt_messagestream_construct (void) { dviprt_messagestream = stderr; }
-
- /*--- library functions ---*/
- int
diff --git a/print/ghostscript7/files/patch-src:gdevdmpr.c b/print/ghostscript7/files/patch-src:gdevdmpr.c
deleted file mode 100644
index 05e3bb12dc13..000000000000
--- a/print/ghostscript7/files/patch-src:gdevdmpr.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdevdmpr.c.orig Tue May 13 20:43:37 1997
-+++ src/gdevdmpr.c Tue Apr 2 01:16:25 2002
-@@ -846,7 +846,7 @@
- if (env) {
- strcpy(fname,env);
- strcat(fname,
-- gp_file_name_concat_string(env,strlen(env),fname,strlen(fnamebase)));
-+ gp_file_name_concat_string(env,strlen(env)));
- strcat(fname,fnamebase);
- fp = fopen(fname,gp_fmode_rb);
- }
diff --git a/print/ghostscript7/files/patch-src:gdevdmpr.mak b/print/ghostscript7/files/patch-src:gdevdmpr.mak
deleted file mode 100644
index 9136172873fa..000000000000
--- a/print/ghostscript7/files/patch-src:gdevdmpr.mak
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/gdevdmpr.mak.orig Mon May 1 20:24:43 2000
-+++ src/gdevdmpr.mak Mon May 1 20:26:23 2000
-@@ -1,8 +1,12 @@
- ### ---------------- Dot matrix printer device ---------------- ###
--dmprt_=gdevdmpr.$(OBJ) dviprlib.$(OBJ) gdevprn.$(OBJ)
-+dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
-
--dmprt.dev: $(dmprt_)
-- $(SETDEV) dmprt $(dmprt_)
-- $(ADDMOD) dmprt -ps dmp_init
--gdevdmpr.$(OBJ): gdevdmpr.c dviprlib.h $(PDEVH)
--dviprlib.$(OBJ): dviprlib.c dviprlib.h
-+$(DD)dmprt.dev: $(dmprt_)
-+ $(SETDEV) $(DD)dmprt $(dmprt_)
-+ $(ADDMOD) $(DD)dmprt -ps dmp_init
-+
-+$(GLOBJ)gdevdmpr.$(OBJ): $(GLSRC)gdevdmpr.c $(GLSRC)dviprlib.h $(PDEVH)
-+ $(GLCC) $(GLO_)gdevdmpr.$(OBJ) $(C_) $(GLSRC)gdevdmpr.c
-+
-+$(GLOBJ)dviprlib.$(OBJ): $(GLSRC)dviprlib.c $(GLSRC)dviprlib.h
-+ $(GLCC) $(GLO_)dviprlib.$(OBJ) $(C_) $(GLSRC)dviprlib.c
diff --git a/print/ghostscript7/files/patch-src:gdevgdi.c b/print/ghostscript7/files/patch-src:gdevgdi.c
deleted file mode 100644
index 15f7c66b85ee..000000000000
--- a/print/ghostscript7/files/patch-src:gdevgdi.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/gdevgdi.c.orig Fri Feb 9 04:51:11 2001
-+++ src/gdevgdi.c Tue Aug 21 11:17:56 2001
-@@ -24,6 +24,7 @@
- /* SAMSUNG GDI driver for Ghostscript */
- #include "gdevprn.h"
- #include "gdevpcl.h"
-+#include "gsparam.h"
-
-
- /*
-@@ -126,7 +127,7 @@
- private int
- gdi_open(gx_device *pdev)
- { /* Change the margins if necessary. */
-- const float _ds *m = 0;
-+ const float *m = 0;
- bool move_origin = true;
-
- static const float m_a4[4] = { GDI_MARGINS_A4 };
diff --git a/print/ghostscript7/files/patch-src:gdevlbp8.c b/print/ghostscript7/files/patch-src:gdevlbp8.c
deleted file mode 100644
index 052492c58f6a..000000000000
--- a/print/ghostscript7/files/patch-src:gdevlbp8.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- 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 @@
-
- /*
- Modifications:
-+ 3.10.00 Johnny Lam
-+ Removed LIPS III code, as it's obsoleted by gdevlips driver.
- 2.2.97 Lauri Paatero
- Changed CSI command into ESC [. DCS commands may still need to be changed
- (to ESC P).
-@@ -49,7 +51,6 @@
-
- /* The device descriptors */
- private dev_proc_print_page(lbp8_print_page);
--private dev_proc_print_page(lips3_print_page);
-
- 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);
-
--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" */
-- X_DPI, Y_DPI,
-- 0.16, 0.27, 0.23, 0.27, /* margins */
-- 1, lips3_print_page);
--
- /* ------ Internal routines ------ */
-
- #define ESC 0x1b
-@@ -84,23 +77,6 @@
-
- static const char *lbp8_end = NULL;
-
--static const char lips3_init[] = {
-- ESC, '<', /* soft reset */
-- DCS, '0', 'J', ST, /* JOB END */
-- DCS, '3', '1', ';', '3', '0', '0', ';', '2', 'J', ST, /* 300dpi, LIPS3 JOB START */
-- ESC, '<', /* soft reset */
-- DCS, '2', 'y', 'P', 'r', 'i', 'n', 't', 'i', 'n', 'g', '(', 'g', 's', ')', ST, /* Printing (gs) display */
-- ESC, '[', '?', '1', 'l', /* auto cr-lf disable */
-- ESC, '[', '?', '2', 'h', /* auto ff disable */
-- ESC, '[', '1', '1', 'h', /* set mode */
-- ESC, '[', '7', ' ', 'I', /* select unit size (300dpi)*/
-- ESC, '[', 'f' /* move to home position */
--};
--
--static const char lips3_end[] = {
-- DCS, '0', 'J', ST /* JOB END */
--};
--
- /* Send the page to the printer. */
- private int
- can_print_page(gx_device_printer *pdev, FILE *prn_stream,
-@@ -203,11 +179,4 @@
- lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream)
- { return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init),
- lbp8_end, sizeof(lbp8_end));
--}
--
--/* Print a LIPS III page. */
--private int
--lips3_print_page(gx_device_printer *pdev, FILE *prn_stream)
--{ return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init),
-- lips3_end, sizeof(lips3_end));
- }
diff --git a/print/ghostscript7/files/patch-src:genarch.c b/print/ghostscript7/files/patch-src:genarch.c
deleted file mode 100644
index a015e69e758a..000000000000
--- a/print/ghostscript7/files/patch-src:genarch.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- 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-src:unix-dll.mak b/print/ghostscript7/files/patch-src:unix-dll.mak
deleted file mode 100644
index 2ee0a5c3a0d1..000000000000
--- a/print/ghostscript7/files/patch-src:unix-dll.mak
+++ /dev/null
@@ -1,59 +0,0 @@
---- 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
deleted file mode 100644
index 2887ad8ef2e5..000000000000
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ /dev/null
@@ -1,142 +0,0 @@
---- 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).
-
--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.
-
-@@ -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}
-
--prefix = /usr/local
-+prefix = ${PREFIX}
- exec_prefix = $(prefix)
- bindir = $(exec_prefix)/bin
- scriptdir = $(bindir)
-@@ -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.
-
--SHARE_LIBPNG=0
-+SHARE_LIBPNG=1
- LIBPNG_NAME=png
-
- # Define the directory where the zlib sources are stored.
-@@ -169,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
-
-@@ -185,6 +185,8 @@
- IJSSRCDIR=ijs
- IJSEXECTYPE=unix
-
-+STPLIB=gimpprint
-+
- # Define how to build the library archives. (These are not used in any
- # standard configuration.)
-
-@@ -196,7 +198,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.
-@@ -213,9 +215,9 @@
- # Define the added flags for standard, debugging, profiling
- # and shared object builds.
-
--CFLAGS_STANDARD=-O2
--CFLAGS_DEBUG=-g -O
--CFLAGS_PROFILE=-pg -O2
-+CFLAGS_STANDARD?=-O2
-+CFLAGS_DEBUG=-g
-+CFLAGS_PROFILE=-pg
- CFLAGS_SO=-fPIC
-
- # Define the other compilation flags. Add at most one of the following:
-@@ -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 -I${LOCALBASE}/include
-
- CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-
-@@ -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)
-
-@@ -273,7 +275,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
-@@ -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
--#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
deleted file mode 100644
index 9033a4388085..000000000000
--- a/print/ghostscript7/files/patch-src:zmedia2.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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;
- }
-- /* 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
deleted file mode 100644
index bb9805f55fb8..000000000000
--- a/print/ghostscript7/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/ghostscript7/files/stc740p.upp b/print/ghostscript7/files/stc740p.upp
deleted file mode 100644
index a4e7f5441793..000000000000
--- a/print/ghostscript7/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/ghostscript7/files/stc740pl.upp b/print/ghostscript7/files/stc740pl.upp
deleted file mode 100644
index b2fdb0dbbc06..000000000000
--- a/print/ghostscript7/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)"
-