- Update to 20061010

- Fix wrapper files
- Add a note to pkg-message about a problem with foo2hp using 2bpp

PR:		ports/104344 ports/103616
Submitted by:	Frank J. Laszlo, Armin Pirkovitsch
Approved by:	portmgr (erwin)

5 files changed, 164 insertions, 8 deletions

diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index f6437e2d7cf5..fa588b266c06 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	foo2zjs
-PORTVERSION=	20061004
+PORTVERSION=	20061010
 CATEGORIES=	print
 MASTER_SITES=	http://foo2zjs.rkkda.com/
 DISTNAME=	${PORTNAME}
@@ -16,7 +16,8 @@ COMMENT=	Driver for printers that use the ZjStream wire protocol
 
 LIB_DEPENDS=	cups.2:${PORTSDIR}/print/cups-base
 RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:${PORTSDIR}/print/foomatic-db \
-		foomatic-rip:${PORTSDIR}/print/foomatic-filters
+		foomatic-rip:${PORTSDIR}/print/foomatic-filters \
+		espgs:${PORTSDIR}/print/cups-pstoraster
 
 USE_GHOSTSCRIPT=	yes
 USE_GMAKE=	yes
diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo
index 07a75e881ca9..d4ce1dd56c86 100644
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,3 +1,3 @@
-MD5 (foo2zjs.tar.gz) = 889ac408080c5be11be1085f8567f68d
-SHA256 (foo2zjs.tar.gz) = d84573a6ca5aedb8c8e3a56f1cb2eb13fc71d6c1b11de9d8c8f7be92122fb681
-SIZE (foo2zjs.tar.gz) = 876978
+MD5 (foo2zjs.tar.gz) = 53dcb19be048871e2075c61170a1b7d1
+SHA256 (foo2zjs.tar.gz) = af2ea9a66f8c9b6fd7b836888965bb95f2b124de65a06f827f42ecb7b3c9620d
+SIZE (foo2zjs.tar.gz) = 877006
diff --git a/print/foo2zjs/files/patch-foo2hp2600-wrapper.in b/print/foo2zjs/files/patch-foo2hp2600-wrapper.in
new file mode 100644
index 000000000000..e35f08c72caf
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2hp2600-wrapper.in
@@ -0,0 +1,87 @@
+--- foo2hp2600-wrapper.in	Wed Oct  4 08:30:16 2006
++++ foo2hp2600-wrapper.in	Fri Oct 13 12:33:20 2006
+@@ -31,13 +31,6 @@
+ PREFIX=/usr
+ SHARE=$PREFIX/share/foo2hp
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "foo2hp2600-wrapper $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -174,11 +167,7 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs8 -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs8}
+-else
+-        GSBIN=${GSBIN:-gs}
+-fi
++GSBIN=${GSBIN:-gs}
+ 
+ CMDLINE="$*"
+ DEBUG=0
+@@ -211,24 +200,8 @@
+ GSDEV=-sDEVICE=pbmraw
+ DefaultRGB=sRGB
+ # What mode to use if the user wants us to pick the "best" mode
+-case `$GSBIN --version` in
+-7*)
+-	DEFAULTCOLORMODE=10
+-	;;
+-8.1*)
+-	# Buggy 8.14/8.15 in Ubuntu
+-	DEFAULTCOLORMODE=10
+-	if is32 $GSBIN; then
+-	    GAMMAFILE=km2430_2.icm
+-	else
+-	    GAMMAFILE=hpclj2600n-0.icm
+-	fi
+-	QUALITY=1
+-	;;
+-*)
+-	DEFAULTCOLORMODE=10
+-	;;
+-esac
++
++DEFAULTCOLORMODE=10
+ 
+ while getopts "24o:b:cC:d:g:l:u:L:m:n:p:q:r:s:tABS:D:G:I:PX:Vh?" opt
+ do
+@@ -302,9 +275,11 @@
+ 	    # error "2-bpp monochrome is not yet supported"
+ 	    GSDEV="-sDEVICE=cups -dcupsColorSpace=3 -dcupsBitsPerColor=2"
+ 	    GSDEV="$GSDEV -dcupsColorOrder=2"
++	    GSBIN="$PREFIX/bin/espgs"
+ 	else
+ 	    GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
+ 	    GSDEV="$GSDEV -dcupsColorOrder=2"
++	    GSBIN="$PREFIX/bin/espgs"
+ 	fi
+ 
+ 	case "$GAMMAFILE" in
+@@ -651,18 +626,6 @@
+ 	    $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
+ 	    -J "$LPJOB" -U "$USER" \
+ 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
+-
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPT $GAMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \
+--n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \
+-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
+-fi
+ 
+ #
+ #	Remove cruft
diff --git a/print/foo2zjs/files/patch-foo2zjs-wrapper.in b/print/foo2zjs/files/patch-foo2zjs-wrapper.in
new file mode 100644
index 000000000000..555cf3d036e3
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2zjs-wrapper.in
@@ -0,0 +1,65 @@
+--- foo2zjs-wrapper.in	Mon May  1 23:33:58 2006
++++ foo2zjs-wrapper.in	Fri Oct 13 12:34:22 2006
+@@ -40,13 +40,6 @@
+ PREFIX=/usr
+ SHARE=$PREFIX/share/foo2zjs
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "foo2zjs-wrapper $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -141,11 +134,7 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs8 -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs8}
+-else
+-        GSBIN=${GSBIN:-gs}
+-fi
++GSBIN=${GSBIN:-gs}
+ 
+ CMDLINE="$*"
+ DEBUG=0
+@@ -154,13 +143,9 @@
+ COLORMODE=0
+ MODEL=0
+ # What mode to use if the user wants us to pick the "best" mode
+-case `$GSBIN --version` in
+-7*)	DEFAULTCOLORMODE=10
+-	DEFAULTCOLORMODE=2
+-	;;
+-*)	DEFAULTCOLORMODE=2
+-	;;
+-esac
++
++DEFAULTCOLORMODE=10
++DEFAULTCOLORMODE=2
+ QUALITY=1
+ MEDIA=1
+ COPIES=1
+@@ -600,18 +585,6 @@
+ 	    -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
+ 	    -J "$LPJOB" -U "$USER" \
+ 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
+-
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPT $GAMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \
+--n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
+-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
+-fi
+ 
+ #
+ #	Remove cruft
diff --git a/print/foo2zjs/files/pkg-message.in b/print/foo2zjs/files/pkg-message.in
index d019d3f488f3..5db4565c0ad0 100644
--- a/print/foo2zjs/files/pkg-message.in
+++ b/print/foo2zjs/files/pkg-message.in
@@ -1,4 +1,4 @@
-###############################################################################################
+###############################################################################
 
 1) Please read the detailed installation instructions in the file:
 
@@ -15,6 +15,9 @@
      cp hpclj26*.icm km2430*.icm %%PREFIX%%/share/foo2hp/icm && \
      rm *.icm *.img
 
-4) Enjoy it ;)
+4) If you are testing foo2hp driver, do not use 2bpp because it causes a crash
+   in the foo2hp program.
 
-###############################################################################################
+5) Enjoy it ;)
+
+###############################################################################