- Update Gimp-Print driver to version 4.2.0

- Update HPinkjet driver to version 1.0
- Better support for jpeg WRKDIR location
- bump PORTREVISION

PR:		33060
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

6 files changed, 38 insertions, 89 deletions

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
index 35eb9e6b06b1..6e94367c778c 100644
--- a/print/ghostscript8/files/hpijs.contrib.mak
+++ b/print/ghostscript8/files/hpijs.contrib.mak
@@ -1,31 +1,19 @@
-### ------------- Hewlett-Packard Co. Inkjet Driver -------------- ###
+### ------------- IJS Interface -------------- ###
 
-hpijs_=$(GLOBJ)gdevhpij.$(OBJ)
+ijs_=$(GLOBJ)gdevijs.$(OBJ) $(GLOBJ)ijs_client.$(OBJ) $(GLOBJ)ijs_exec_unix.$(OBJ) $(GLOBJ)ijs.$(OBJ)
 
-$(DD)gdevhpij.$(OBJ): $(GLSRC)gdevhpij.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevhpij.$(OBJ) $(C_) $(GLSRC)gdevhpij.c
+$(GLOBJ)ijs_client.$(OBJ) : $(GLSRC)ijs_client.c $(PDEVH)
+	$(GLCC) $(GLO_)ijs_client.$(OBJ) $(C_) $(GLSRC)ijs_client.c
 
-$(DD)hpijs.dev : $(hpijs_) $(DD)page.dev
-	$(SETPDEV) $(DD)hpijs $(hpijs_)
+$(GLOBJ)ijs_exec_unix.$(OBJ) : $(GLSRC)ijs_exec_unix.c $(PDEVH)
+	$(GLCC) $(GLO_)ijs_exec_unix.$(OBJ) $(C_) $(GLSRC)ijs_exec_unix.c
 
-$(DD)DJ630.dev : $(hpijs_) $(DD)page.dev
-	$(SETPDEV) DJ630 $(hpijs_)
+$(GLOBJ)ijs.$(OBJ) : $(GLSRC)ijs.c $(PDEVH)
+	$(GLCC) $(GLO_)ijs.$(OBJ) $(C_) $(GLSRC)ijs.c
 
-$(DD)DJ6xx.dev : $(hpijs_) $(DD)page.dev
-	$(SETPDEV) DJ6xx $(hpijs_)
+$(GLOBJ)gdevijs.$(OBJ) : $(GLSRC)gdevijs.c $(PDEVH)
+	$(GLCC) $(GLO_)gdevijs.$(OBJ) $(C_) $(GLSRC)gdevijs.c
 
-$(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_)
+$(DD)ijs.dev : $(ijs_) $(DD)page.dev
+	$(SETPDEV) $(DD)ijs $(ijs_)
 
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-hpijs:platform.h b/print/ghostscript8/files/patch-hpijs:platform.h
deleted file mode 100644
index 8243385b25b3..000000000000
--- a/print/ghostscript8/files/patch-hpijs:platform.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- hpijs/platform.h.orig	Wed Oct  3 03:56:37 2001
-+++ hpijs/platform.h	Wed Oct  3 04:20:33 2001
-@@ -13,3 +13,10 @@
- #include <string.h>
- #include <stdio.h>
- #include <math.h>
-+
-+#ifdef __FreeBSD__
-+#include <machine/endian.h>
-+#if BYTE_ORDER == LITTLE_ENDIAN
-+#define _LITTLE_ENDIAN
-+#endif
-+#endif
diff --git a/print/ghostscript8/files/patch-src:unix-gcc.mak b/print/ghostscript8/files/patch-src:unix-gcc.mak
index 22ec0928c428..4c6b7163bb5d 100644
--- a/print/ghostscript8/files/patch-src:unix-gcc.mak
+++ b/print/ghostscript8/files/patch-src:unix-gcc.mak
@@ -1,5 +1,5 @@
---- src/unix-gcc.mak.orig	Fri Nov  2 03:45:56 2001
-+++ src/unix-gcc.mak	Fri Nov  2 03:54:59 2001
+--- src/unix-gcc.mak.orig	Sat Sep 15 17:55:32 2001
++++ src/unix-gcc.mak	Sat Dec 15 04:19:08 2001
 @@ -26,14 +26,15 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
@@ -83,21 +83,19 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -229,9 +229,11 @@
+@@ -229,9 +229,9 @@
  # 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
++#XCFLAGS=
  
 -CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
 +CFLAGS+=$(XCFLAGS)
  
  # Define platform flags for ld.
  # SunOS 4.n may need -Bstatic.
-@@ -240,7 +242,7 @@
+@@ -240,7 +240,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.
@@ -106,7 +104,7 @@
  
  LDFLAGS=$(XLDFLAGS) -fno-common
  
-@@ -273,7 +275,7 @@
+@@ -273,7 +273,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
@@ -115,15 +113,12 @@
  
  # 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
-@@ -286,11 +288,16 @@
+@@ -285,12 +285,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
-+ifdef NO_X
-+XLIBS=
-+else
+-#XLIBS=Xt SM ICE Xext X11
 +XLIBS=Xt SM ICE Xext X11
-+endif
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11R6/lib
diff --git a/print/ghostscript8/files/stp.contrib.mak b/print/ghostscript8/files/stp.contrib.mak
new file mode 100644
index 000000000000..613116007dd3
--- /dev/null
+++ b/print/ghostscript8/files/stp.contrib.mak
@@ -0,0 +1,17 @@
+### --------------- 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