Upgrade to 6.53.

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

20 files changed, 756 insertions, 145 deletions

diff --git a/print/ghostscript7/files/gdi.contrib.mak b/print/ghostscript7/files/gdi.contrib.mak
new file mode 100644
index 0000000..808b7fb
--- /dev/null
+++ b/print/ghostscript7/files/gdi.contrib.mak
@@ -0,0 +1,12 @@
+### ---------------- 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/hpijs.contrib.mak b/print/ghostscript7/files/hpijs.contrib.mak
deleted file mode 100644
index 6e94367..0000000
--- a/print/ghostscript7/files/hpijs.contrib.mak
+++ /dev/null
@@ -1,19 +0,0 @@
-### ------------- IJS Interface -------------- ###
-
-ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ)
-
-$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c
-
-$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c
-
-$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH)
-	$(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c
-
-$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
-
-$(DD)ijs.dev : $(ijs_) $(DD)page.dev
-	$(SETPDEV) $(DD)ijs $(ijs_)
-
diff --git a/print/ghostscript7/files/patch-alps:gdevalps.mak b/print/ghostscript7/files/patch-alps:gdevalps.mak
new file mode 100644
index 0000000..45144ea
--- /dev/null
+++ b/print/ghostscript7/files/patch-alps:gdevalps.mak
@@ -0,0 +1,25 @@
+--- 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
new file mode 100644
index 0000000..b1b6fc5
--- /dev/null
+++ b/print/ghostscript7/files/patch-eplaser:gdevescv.c
@@ -0,0 +1,43 @@
+--- eplaser/gdevescv.c.orig	Fri Dec 21 15:50:22 2001
++++ eplaser/gdevescv.c	Fri Mar 15 04:27:39 2002
+@@ -1760,13 +1760,13 @@
+ 
+ /* 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 +1784,7 @@
+ 
+     {
+ 
+-#if GS_VERSION_MAJOR == 6
++#if GS_VERSION_MAJOR >= 6
+ 	if (height == 260)
+ 	    height = 1;
+ #endif
+@@ -1922,13 +1922,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
new file mode 100644
index 0000000..8764eb6
--- /dev/null
+++ b/print/ghostscript7/files/patch-eplaser:gdevesmv.c
@@ -0,0 +1,43 @@
+--- eplaser/gdevesmv.c.orig	Fri Dec 14 10:50:14 2001
++++ eplaser/gdevesmv.c	Fri Mar 15 04:28:41 2002
+@@ -1799,13 +1799,13 @@
+ 
+ /* 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 +1823,7 @@
+ 
+     {
+ 
+-#if GS_VERSION_MAJOR == 6
++#if GS_VERSION_MAJOR >= 6
+ 	if (height == 260)
+ 	    height = 1;
+ #endif
+@@ -1980,13 +1980,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
new file mode 100644
index 0000000..25a8317
--- /dev/null
+++ b/print/ghostscript7/files/patch-gdev10v:gdev10v.mak
@@ -0,0 +1,22 @@
+--- 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_res.ps b/print/ghostscript7/files/patch-lib:gs_res.ps
new file mode 100644
index 0000000..2e51697
--- /dev/null
+++ b/print/ghostscript7/files/patch-lib:gs_res.ps
@@ -0,0 +1,13 @@
+--- 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
new file mode 100644
index 0000000..0663005
--- /dev/null
+++ b/print/ghostscript7/files/patch-lips:gdevlips.mak
@@ -0,0 +1,18 @@
+--- 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
new file mode 100644
index 0000000..b003efb
--- /dev/null
+++ b/print/ghostscript7/files/patch-md2k:gdevmd2k.mak
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 0000000..99ff0bc
--- /dev/null
+++ b/print/ghostscript7/files/patch-mjc:gdevmjc.c
@@ -0,0 +1,335 @@
+--- 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
new file mode 100644
index 0000000..a094ea0
--- /dev/null
+++ b/print/ghostscript7/files/patch-mjc:gdevmjc.mak
@@ -0,0 +1,43 @@
+--- 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:dmp_site.ps b/print/ghostscript7/files/patch-src:dmp_site.ps
new file mode 100644
index 0000000..ee1a571
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:dmp_site.ps
@@ -0,0 +1,10 @@
+--- 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:gdevdmpr.c b/print/ghostscript7/files/patch-src:gdevdmpr.c
new file mode 100644
index 0000000..05e3bb1
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:gdevdmpr.c
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 0000000..9136172
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:gdevdmpr.mak
@@ -0,0 +1,21 @@
+--- 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
new file mode 100644
index 0000000..15f7c66
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:gdevgdi.c
@@ -0,0 +1,19 @@
+--- 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
new file mode 100644
index 0000000..6e5b29d
--- /dev/null
+++ b/print/ghostscript7/files/patch-src:gdevlbp8.c
@@ -0,0 +1,70 @@
+--- src/gdevlbp8.c.orig	Thu Mar  9 03:40:41 2000
++++ src/gdevlbp8.c
+@@ -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);
+ 
+ gx_device_printer far_data gs_lbp8_device =
+   prn_device(prn_std_procs, "lbp8",
+@@ -58,14 +59,6 @@
+ 	0.16, 0.2, 0.32, 0.21,		/* margins: left, bottom, right, top */
+ 	1, lbp8_print_page);
+ 
+-gx_device_printer far_data gs_lips3_device =
+-  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:gdevxini.c b/print/ghostscript7/files/patch-src:gdevxini.c
deleted file mode 100644
index 44bb6b3..0000000
--- a/print/ghostscript7/files/patch-src:gdevxini.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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:gp_unifs.c b/print/ghostscript7/files/patch-src:gp_unifs.c
deleted file mode 100644
index ba0f959..0000000
--- a/print/ghostscript7/files/patch-src:gp_unifs.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/gp_unifs.c.orig	Tue Jun  5 15:31:44 2001
-+++ src/gp_unifs.c	Sun Jul 15 22:57:50 2001
-@@ -28,6 +27,8 @@
- #include "gsutil.h"		/* for string_match */
- #include "stat_.h"
- #include "dirent_.h"
-+#include "unistd_.h"
-+#include <stdlib.h>             /* for mkstemp/mktemp */
- #include <sys/param.h>		/* for MAXPATHLEN */
- 
- /* Some systems (Interactive for example) don't define MAXPATHLEN,
-@@ -57,22 +58,44 @@
- FILE *
- gp_open_scratch_file(const char *prefix, char fname[gp_file_name_sizeof],
- 		     const char *mode)
--{				/* The -8 is for XXXXXX plus a possible final / and -. */
--    int len = gp_file_name_sizeof - strlen(prefix) - 8;
--
--    if (gp_gettmpdir(fname, &len) != 0)
-+{	/* The -8 is for XXXXXX plus a possible final / and -. */
-+    int prefix_length = strlen(prefix);
-+    int len = gp_file_name_sizeof - prefix_length - 8;
-+
-+    if (gp_file_name_is_absolute(prefix, prefix_length))
-+	*fname = 0;
-+    else if (gp_gettmpdir(fname, &len) != 0)
- 	strcpy(fname, "/tmp/");
-     else {
- 	if (strlen(fname) != 0 && fname[strlen(fname) - 1] != '/')
- 	    strcat(fname, "/");
-     }
-+    if (strlen(fname) + prefix_length + 8 >= gp_file_name_sizeof)
-+	return 0;		/* file name too long */
-     strcat(fname, prefix);
-     /* Prevent trailing X's in path from being converted by mktemp. */
-     if (*fname != 0 && fname[strlen(fname) - 1] == 'X')
- 	strcat(fname, "-");
-     strcat(fname, "XXXXXX");
-+
-+#ifdef HAVE_MKSTEMP
-+    {
-+	    int file;
-+	    FILE *fp;
-+
-+	    file = mkstemp(fname);
-+	    if (file < -1)
-+		    return NULL;
-+	    fp = fdopen(file, mode);
-+	    if (fp == NULL)
-+		    close(file);
-+		    
-+	    return fp;
-+    }
-+#else
-     mktemp(fname);
-     return gp_fopentemp(fname, mode);
-+#endif
- }
- 
- /* Open a file with the given name, as a stream of uninterpreted bytes. */
diff --git a/print/ghostscript7/files/patch-src:unix-gcc.mak b/print/ghostscript7/files/patch-src:unix-gcc.mak
index 2143001..626241a 100644
--- a/print/ghostscript7/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript7/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Tue Jul 10 12:01:06 2001
-+++ src/unix-gcc.mak	Sat Dec 15 04:22:49 2001
+--- src/unix-gcc.mak.orig	Tue Feb  5 09:20:42 2002
++++ src/unix-gcc.mak	Fri Feb  8 05:16:49 2002
 @@ -27,14 +27,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -46,23 +46,30 @@
  datadir = $(prefix)/share
  gsdir = $(datadir)/ghostscript
  gsdatadir = $(gsdir)/$(GS_DOT_VERSION)
-@@ -104,6 +105,15 @@
+@@ -103,14 +104,6 @@
+ #	  No execution time or space penalty.
  
  GENOPT=
+-# Choose capability options.
+-
+-# -DHAVE_MKSTEMP
+-#	uses mkstemp instead of mktemp
+-#		This gets rid of several security warnings that look
+-#		ominous.  Enable this if you wish to get rid of them.
+-
+-CAPOPT= -DHAVE_MKSTEMP
  
-+# Choose capability options.
-+
-+# -DHAVE_MKSTEMP
-+#	uses mkstemp instead of mktemp
-+#		This gets rid of several security warnings that look
-+#		ominous.  Enable this if you wish to get rid of them.
-+
-+CAPOPT= -DHAVE_MKSTEMP
-+
+ # Choose capability options.
+ 
+@@ -121,7 +114,6 @@
+ 
+ CAPOPT= -DHAVE_MKSTEMP
+ 
+-
  # Define the name of the executable file.
  
  GS=gs
-@@ -129,7 +139,7 @@
+@@ -147,7 +139,7 @@
  # You may need to change this if the IJG library version changes.
  # See jpeg.mak for more information.
  
@@ -71,7 +78,7 @@
  JVERSION=6
  
  # Choose whether to use a shared version of the IJG JPEG library (-ljpeg).
-@@ -149,14 +159,14 @@
+@@ -167,14 +159,14 @@
  # You may need to change this if the libpng version changes.
  # See libpng.mak for more information.
  
@@ -88,7 +95,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -168,7 +178,7 @@
+@@ -186,7 +178,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -97,7 +104,16 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -183,7 +193,7 @@
+@@ -197,6 +189,8 @@
+ IJSSRCDIR=ijs
+ IJSEXECTYPE=unix
+ 
++STPLIB=gimpprint
++
+ # Define how to build the library archives.  (These are not used in any
+ # standard configuration.)
+ 
+@@ -208,7 +202,7 @@
  
  # Define the name of the C compiler.
  
@@ -106,28 +122,38 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -216,9 +226,9 @@
+@@ -225,9 +219,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:
+@@ -241,7 +235,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=
++XCFLAGS+=-I${.CURDIR}/gimp-print
  
--CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
-+CFLAGS+=$(XCFLAGS)
+ CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
- # Define platform flags for ld.
- # SunOS 4.n may need -Bstatic.
-@@ -227,7 +237,7 @@
+@@ -252,7 +246,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
++XLDFLAGS=-L${.CURDIR}/gimp-print -L${LOCALBASE}/lib
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -260,7 +270,7 @@
+@@ -285,7 +279,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -136,7 +162,7 @@
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -272,12 +282,12 @@
+@@ -297,12 +291,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
@@ -152,12 +178,3 @@
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -406,7 +416,7 @@
- 
- # Define the compilation rules and flags.
- 
--CCFLAGS=$(GENOPT) $(CFLAGS)
-+CCFLAGS=$(GENOPT) $(CAPOPT) $(CFLAGS)
- CC_=$(CC) `cat $(AK)` $(CCFLAGS)
- CCAUX=$(CC) `cat $(AK)`
- CC_LEAF=$(CC_) -fomit-frame-pointer
diff --git a/print/ghostscript7/files/stp.contrib.mak b/print/ghostscript7/files/stp.contrib.mak
deleted file mode 100644
index 6131160..0000000
--- a/print/ghostscript7/files/stp.contrib.mak
+++ /dev/null
@@ -1,17 +0,0 @@
-### --------------- Gimp-Print/stp Driver ---------------------------- ###
-### Be careful to add the exact contents of this file; cut and paste   ###
-### may corrupt the file and cause mysterious make errors              ###
-
-stp_=$(GLOBJ)gdevstp.$(OBJ)
-
-STPINCDIR=-I$(GLSRC)
-STPLIBDIR=-L$(GLOBJ)
-STPLIB=gimpprint
-
-$(DD)stp.dev:	$(stp_) $(DD)page.dev
-	$(SETPDEV) $(DD)stp $(stp_)
-	$(ADDMOD) $(DD)stp -link $(STPLIBDIR)
-	$(ADDMOD) $(DD)stp -lib $(STPLIB)
-
-$(GLOBJ)gdevstp.$(OBJ) : $(GLSRC)gdevstp.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevstp.$(OBJ) $(C_) $(STPINCDIR) $(GLSRC)gdevstp.c