13 files changed, 801 insertions, 181 deletions

diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index 2c74476df76c..92a2527e48e0 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -6,27 +6,116 @@
 #
 
 PORTNAME=	foo2zjs
-PORTVERSION=	20070120
-PORTREVISION=	2
+PORTVERSION=	20090530
 CATEGORIES=	print
-MASTER_SITES=	http://foo2zjs.rkkda.com/ \
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,}
-DISTNAME=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 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 \
-		espgs:${PORTSDIR}/print/cups-pstoraster
+		foomatic-rip:${PORTSDIR}/print/foomatic-filters
 
-USE_GHOSTSCRIPT=	yes
+PROJECTHOST=	bsdistfiles
+USE_GHOSTSCRIPT=yes
 USE_GMAKE=	yes
 SUB_FILES=	pkg-message
 
-MAN1=	foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1
+MAN1=	arm2hpdl.1 \
+	foo2hiperc-wrapper.1 \
+	foo2hiperc.1 \
+	foo2hp.1 \
+	foo2hp2600-wrapper.1 \
+	foo2lava-wrapper.1 \
+	foo2lava.1 \
+	foo2oak-wrapper.1 \
+	foo2oak.1 \
+	foo2qpdl-wrapper.1 \
+	foo2qpdl.1 \
+	foo2slx-wrapper.1 \
+	foo2slx.1 \
+	foo2xqx-wrapper.1 \
+	foo2xqx.1 \
+	foo2zjs-pstops.1 \
+	foo2zjs-wrapper.1 \
+	foo2zjs.1 \
+	hipercdecode.1 \
+	lavadecode.1 \
+	oakdecode.1 \
+	opldecode.1 \
+	printer-profile.1 \
+	qpdldecode.1 \
+	slxdecode.1 \
+	usb_printerid.1 \
+	xqxdecode.1 \
+	zjsdecode.1 \
+
 EXTRAFILES=	msexpand getweb
+XML_FILES=	driver/foo2hiperc.xml \
+		driver/foo2hp.xml \
+		driver/foo2lava.xml \
+		driver/foo2oak.xml \
+		driver/foo2oak-z1.xml \
+		driver/foo2qpdl.xml \
+		driver/foo2slx.xml \
+		driver/foo2xqx.xml \
+		driver/foo2zjs.xml \
+		printer/Generic-OAKT_Printer.xml \
+		printer/Generic-ZjStream_Printer.xml \
+		printer/HP-Color_LaserJet_1500.xml \
+		printer/HP-Color_LaserJet_1600.xml \
+		printer/HP-Color_LaserJet_2600n.xml \
+		printer/HP-Color_LaserJet_CP1215.xml \
+		printer/HP-LaserJet_1000.xml \
+		printer/HP-LaserJet_1005.xml \
+		printer/HP-LaserJet_1018.xml \
+		printer/HP-LaserJet_1020.xml \
+		printer/HP-LaserJet_1022.xml \
+		printer/HP-LaserJet_M1005_MFP.xml \
+		printer/HP-LaserJet_M1120_MFP.xml \
+		printer/HP-LaserJet_P1005.xml \
+		printer/HP-LaserJet_P1006.xml \
+		printer/HP-LaserJet_P1007.xml \
+		printer/HP-LaserJet_P1008.xml \
+		printer/HP-LaserJet_P1505.xml \
+		printer/HP-LaserJet_P2014.xml \
+		printer/KONICA_MINOLTA-magicolor_2480_MF.xml \
+		printer/KONICA_MINOLTA-magicolor_2490_MF.xml \
+		printer/KONICA_MINOLTA-magicolor_2530_DL.xml \
+		printer/Kyocera-KM-1635.xml \
+		printer/Kyocera-KM-2035.xml \
+		printer/Lexmark-C500.xml \
+		printer/Minolta-Color_PageWorks_Pro_L.xml \
+		printer/Minolta-magicolor_2200_DL.xml \
+		printer/Minolta-magicolor_2300_DL.xml \
+		printer/Minolta-magicolor_2430_DL.xml \
+		printer/Oki-C3100.xml \
+		printer/Oki-C3200.xml \
+		printer/Oki-C3300.xml \
+		printer/Oki-C3400.xml \
+		printer/Oki-C3530_MFP.xml \
+		printer/Oki-C5100.xml \
+		printer/Oki-C5200.xml \
+		printer/Oki-C5500.xml \
+		printer/Oki-C5600.xml \
+		printer/Oki-C5800.xml \
+		printer/Samsung-CLP-300.xml \
+		printer/Samsung-CLP-315.xml \
+		printer/Samsung-CLP-600.xml \
+		printer/Samsung-CLP-610.xml \
+		printer/Samsung-CLX-2160.xml \
+		printer/Samsung-CLX-3160.xml \
+		printer/Samsung-CLX-3175.xml \
+		printer/Xerox-Phaser_6110.xml \
+		printer/Xerox-Phaser_6115MFP.xml
+
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
+.for FILES in ${XML_FILES}
+EXTRACT_AFTER_ARGS+=	--exclude '${FILES}'
+.endfor
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^CFLAGS|CFLAGS?|g' -e 's|^PREFIX|PREFIX?|g' ${WRKSRC}/icc2ps/Makefile
diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo
index 4bf4c97422cd..4538a9f05ec7 100644
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,3 +1,3 @@
-MD5 (foo2zjs.tar.gz) = b0d65c5a93708eb778fee68fd52a320c
-SHA256 (foo2zjs.tar.gz) = 6a45579dbada5c71b9ad2ad6e9c63784a469c3d3e675b25fb5b7006060fa5240
-SIZE (foo2zjs.tar.gz) = 935615
+MD5 (foo2zjs-20090530.tar.gz) = 44f5450902e20edf53a6e98271950e7d
+SHA256 (foo2zjs-20090530.tar.gz) = 887f0ae60a4e450d96775fc75c013220a6b0b92edb559e1acd11055fe56ff787
+SIZE (foo2zjs-20090530.tar.gz) = 1565746
diff --git a/print/foo2zjs/files/patch-Makefile b/print/foo2zjs/files/patch-Makefile
index e009f719b6eb..a8a0d641d7c0 100644
--- a/print/foo2zjs/files/patch-Makefile
+++ b/print/foo2zjs/files/patch-Makefile
@@ -1,66 +1,201 @@
---- Makefile	Fri Sep 29 23:28:51 2006
-+++ Makefile	Sun Oct  8 17:29:53 2006
-@@ -6,8 +6,7 @@
+--- Makefile	2009-04-21 19:53:37.000000000 -0500
++++ Makefile	2009-05-30 04:31:51.000000000 -0500
+@@ -16,9 +16,7 @@
  VERSION=0.0
  
  # Installation prefix...
 -PREFIX=/usr/local
 -PREFIX=/usr
-+PREFIX?=
+-PREFIX=$(DESTDIR)/usr
++PREFIX?=/usr/local
  
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
-@@ -18,7 +17,7 @@
+@@ -30,12 +28,13 @@
+ SHAREQPDL=$(PREFIX)/share/foo2qpdl
+ SHARESLX=$(PREFIX)/share/foo2slx
+ SHAREHC=$(PREFIX)/share/foo2hiperc
+-MANDIR=$(PREFIX)/share/man
++MANDIR=$(PREFIX)/man
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
+-INSTALL=install
++INSTALL?=install
++INSTALL_MAN?=install
  
  # Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
-+FOODB=$(PREFIX)/share/foomatic/db/source
+-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
++FOODB=$(DESTDIR)$(PREFIX)/foomatic/db/source
  
  # User ID's
- LPuid=-olp
-@@ -154,7 +153,7 @@
+ LPuid=-oroot
+@@ -255,7 +254,7 @@
  endif
  
  # Compiler flags
 -CFLAGS +=	-O2 -Wall
-+CFLAGS?=
++CFLAGS ?=	-O2 -Wall
+ #CFLAGS +=	-g
  
  #
- # Rules to create test documents
-@@ -291,7 +290,7 @@
+@@ -505,10 +504,8 @@
+ #
  # Installation rules
  #
- install: all install-test install-prog install-icc2ps install-extra \
--	    install-crd install-foo install-ppd install-man install-doc
-+	    install-crd install-ppd
+-install: all install-test install-prog install-icc2ps install-extra \
+-	    install-crd install-foo install-ppd \
+-	    install-gui install-desktop \
+-	    install-man install-doc
++install: all install-prog install-icc2ps \
++	    install-crd install-foo install-ppd
  	#
  	# If you use CUPS, then restart the spooler:
  	#	make cups
-@@ -349,8 +348,10 @@
+@@ -544,7 +541,7 @@
+ 	#
+     
+ 
+-UDEVBIN=$(DESTDIR)/bin/
++UDEVBIN=$(DESTDIR)$(PREFIX)/bin/
+ 
+ install-prog:
  	#
+@@ -574,21 +571,13 @@
+ 	#
+ 	# Remove obsolete foomatic database files from previous versions
+ 	#
+-	rm -f $(FOODB)/opt/foo2zjs-Media.xml
+-	rm -f $(FOODB)/opt/foo2zjs-PaperSize.xml
+-	rm -f $(FOODB)/opt/foo2zjs-Source.xml
+-	rm -f $(FOODB)/opt/foo2zjs-DitherPPI.xml
+-	rm -f $(FOODB)/opt/foo2zjs-Copies.xml
+-	rm -f $(FOODB)/opt/foo2zjs-Nup.xml
+-	rm -f $(FOODB)/opt/foo2zjs-NupOrient.xml
+-	rm -f $(FOODB)/opt/foo2*-Quality.xml
+-	rm -f $(FOODB)/printer/KonicaMinolta*.xml
+-	#
  	# Install current database files
  	#
 +	mkdir -p $(FOODB)
  	@if [ -d $(FOODB) ]; then \
- 	    for dir in driver printer opt; do \
-+		install -d $(FOODB)/$$dir/; \
+-	    for dir in driver printer opt; do \
++	    for dir in printer opt; do \
  		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
- 		install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
++		mkdir -p $(FOODB)/$$dir/; \
+ 		$(INSTALL) -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
  	    done \
-@@ -435,12 +436,13 @@
+ 	else \
+@@ -602,15 +591,6 @@
+ 	    echo "*** ... wherever foomatic is stashed on your machine."; \
+ 	    echo "***"; \
+ 	fi
+-	#
+-	# Clear foomatic cache and rebuild database if needed
+-	#
+-	rm -rf /var/cache/foomatic/*/*
+-	rm -f /var/cache/foomatic/printconf.pickle
+-	if [ -d /var/cache/foomatic/compiled ]; then \
+-	    cd /var/cache/foomatic/compiled; \
+-	    foomatic-combo-xml -O >overview.xml; \
+-	fi
+ 
+ install-icc2ps:
+ 	#
+@@ -722,9 +702,9 @@
  	    fi; \
  	done
  
--MODEL=/usr/share/cups/model
--LOCALMODEL=/usr/local/share/cups/model
-+MODEL=$(PREFIX)/share/cups/model
-+LOCALMODEL=$(PREFIX)/share/cups/model
+-MODEL=$(DESTDIR)/usr/share/cups/model
+-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
+-PPD=$(DESTDIR)/usr/share/ppd
++MODEL=$(DESTDIR)$(PREFIX)/share/cups/model
++LOCALMODEL=$(DESTDIR)$(PREFIX)/share/cups/model
++PPD=$(DESTDIR)$(PREFIX)/ppd
+ VARPPD=/var/lp/ppd
  install-ppd:
  	#
- 	# Install PPD files for CUPS
- 	#
+@@ -753,6 +733,7 @@
+ 		gzip < $$ppd > $(PPD)/foo2zjs/$$ppd.gz; \
+ 	    done; \
+ 	fi
 +	mkdir -p $(MODEL)
- 	if [ -d /usr/share/ppd/ ]; then \
- 	    find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \
- 	    find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \
+ 	if [ -d $(MODEL) ]; then \
+ 	    rm -f $(MODEL)/KonicaMinolta*; \
+ 	    cd PPD; \
+@@ -767,9 +748,9 @@
+ 	    done; \
+ 	fi
+ 
+-APPL=$(DESTDIR)/usr/share/applications
+-OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
+-PIXMAPS=$(DESTDIR)/usr/share/pixmaps
++APPL=$(DESTDIR)$(PREFIX)/share/applications
++OLDAPPL=$(DESTDIR)$(PREFIX)/share/gnome/apps/System
++PIXMAPS=$(DESTDIR)$(PREFIX)/share/pixmaps
+ 
+ install-desktop:
+ 	#
+@@ -1185,36 +1166,34 @@
+ 	#
+ 	# Install manual pages
+ 	#
+-	$(INSTALL) -d -m 755 $(MANDIR)
+-	$(INSTALL) -d -m 755 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2zjs.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 zjsdecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2oak.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2oak-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 oakdecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2hp.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2hp2600-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 xqxdecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2xqx.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2xqx-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 lavadecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2lava.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2lava-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 qpdldecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2qpdl.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2qpdl-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 opldecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 slxdecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2slx.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2slx-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
+-	$(INSTALL) -c -m 644 printer-profile.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2zjs.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2zjs-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 zjsdecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2oak.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2oak-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 oakdecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2hp.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2hp2600-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 xqxdecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2xqx.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2xqx-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 lavadecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2lava.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2lava-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 qpdldecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2qpdl.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2qpdl-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 opldecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 slxdecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2slx.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2slx-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2hiperc.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2hiperc-wrapper.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 hipercdecode.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 foo2zjs-pstops.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 arm2hpdl.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 usb_printerid.1 $(MANDIR)/man1/
++	$(INSTALL_MAN) -c -m 644 printer-profile.1 $(MANDIR)/man1/
+ 
+ doc: README INSTALL manual.pdf
+ 
diff --git a/print/foo2zjs/files/patch-foo2hiperc-wrapper.in b/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
new file mode 100644
index 000000000000..e39f04cee57c
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
@@ -0,0 +1,43 @@
+--- foo2hiperc-wrapper.in	2009-05-30 04:40:00.000000000 -0500
++++ foo2hiperc-wrapper.in	2009-05-30 04:57:27.000000000 -0500
+@@ -44,10 +44,6 @@
+ #
+ #	Log the command line, for debugging and problem reports
+ #
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -151,8 +147,8 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -645,18 +641,6 @@
+ 	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -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 $GSOPTS $GAMMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2hiperc -r$RES -g$DIM -p$PAPER -m$MEDIA \
+--n$COPIES -d$DUPLEX -s$SOURCE $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
+-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED"
+-fi
+-
+-#
+ #	Remove cruft
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2hp2600-wrapper.in b/print/foo2zjs/files/patch-foo2hp2600-wrapper.in
index e35f08c72caf..03344cc7924d 100644
--- a/print/foo2zjs/files/patch-foo2hp2600-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2hp2600-wrapper.in
@@ -1,87 +1,55 @@
---- 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
+--- foo2hp2600-wrapper.in	2009-05-30 04:57:56.000000000 -0500
++++ foo2hp2600-wrapper.in	2009-05-30 04:59:38.000000000 -0500
+@@ -34,13 +34,6 @@
  SHARE=$PREFIX/share/foo2hp
+ PATH=$PATH:/sw/bin:/opt/local/bin
  
 -#
 -#	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
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
 -fi
 -
  usage() {
  	cat <<EOF
  Usage:
-@@ -174,11 +167,7 @@
+@@ -185,8 +178,8 @@
  #
  # 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
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -343,7 +336,7 @@
  	    GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2"
  	    GSDEV="$GSDEV -dcupsColorOrder=2"
-+	    GSBIN="$PREFIX/bin/espgs"
+ 	fi
+-	if [ $GSBIN = "gs.foo" ]; then
++	if [ $GSBIN = "gs" ]; then
+ 	    GSBIN=gs
  	fi
  
- 	case "$GAMMAFILE" in
-@@ -651,18 +626,6 @@
- 	    $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \
- 	    -J "$LPJOB" -U "$USER" \
+@@ -749,18 +742,6 @@
  	    $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"
+-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
 -    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
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2lava-wrapper.in b/print/foo2zjs/files/patch-foo2lava-wrapper.in
new file mode 100644
index 000000000000..9755ae4fa46b
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2lava-wrapper.in
@@ -0,0 +1,46 @@
+--- foo2lava-wrapper.in	2009-05-30 05:00:03.000000000 -0500
++++ foo2lava-wrapper.in	2009-05-30 05:00:53.000000000 -0500
+@@ -41,13 +41,6 @@
+ SHARE=$PREFIX/share/foo2lava
+ PATH=$PATH:/sw/bin:/opt/local/bin
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "foo2lava-wrapper $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -154,8 +147,8 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -700,18 +693,6 @@
+ 	    $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 $GSOPTS $GAMMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2lava -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
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2oak-wrapper.in b/print/foo2zjs/files/patch-foo2oak-wrapper.in
new file mode 100644
index 000000000000..f10b8db60d8c
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2oak-wrapper.in
@@ -0,0 +1,47 @@
+--- foo2oak-wrapper.in	2009-05-30 05:01:17.000000000 -0500
++++ foo2oak-wrapper.in	2009-05-30 05:02:12.000000000 -0500
+@@ -34,13 +34,6 @@
+ SHARE=$PREFIX/share/foo2oak
+ PATH=$PATH:/sw/bin:/opt/local/bin
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -141,8 +134,8 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -668,19 +661,6 @@
+ 	    $BC $AIB $COLOR2MONO -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 $GSOPTS $GAMMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2oak -r$RES -g$DIM -p$PAPER -m$MEDIA \
+--n$COPIES -d$DUPLEX -s$SOURCE -M$MIRROR $COLOR -b$BPP \
+-$CLIP_UL $CLIP_LR $CLIP_LOG \
+-$BC $AIB $COLOR2MONO"
+-fi
+-
+-#
+ #	Remove cruft
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2qpdl-wrapper.in b/print/foo2zjs/files/patch-foo2qpdl-wrapper.in
new file mode 100644
index 000000000000..e6b33551b297
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2qpdl-wrapper.in
@@ -0,0 +1,46 @@
+--- foo2qpdl-wrapper.in	2009-05-30 05:02:42.000000000 -0500
++++ foo2qpdl-wrapper.in	2009-05-30 05:03:26.000000000 -0500
+@@ -40,13 +40,6 @@
+ SHARE=$PREFIX/share/foo2qpdl
+ PATH=$PATH:/sw/bin:/opt/local/bin
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -157,8 +150,8 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -671,18 +664,6 @@
+ 	    $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 $GSOPTS $GAMMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2qpdl -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
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2slx-wrapper.in b/print/foo2zjs/files/patch-foo2slx-wrapper.in
new file mode 100644
index 000000000000..bb23cc5aa6f2
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2slx-wrapper.in
@@ -0,0 +1,46 @@
+--- foo2slx-wrapper.in	2009-05-30 05:03:55.000000000 -0500
++++ foo2slx-wrapper.in	2009-05-30 05:04:31.000000000 -0500
+@@ -32,13 +32,6 @@
+ SHARE=$PREFIX/share/foo2slx
+ PATH=$PATH:/sw/bin:/opt/local/bin
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -133,8 +126,8 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -672,18 +665,6 @@
+ 	    $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 $GSOPTS $GAMMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2slx -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
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2xqx-wrapper.in b/print/foo2zjs/files/patch-foo2xqx-wrapper.in
new file mode 100644
index 000000000000..78168534bf06
--- /dev/null
+++ b/print/foo2zjs/files/patch-foo2xqx-wrapper.in
@@ -0,0 +1,46 @@
+--- foo2xqx-wrapper.in	2009-05-30 05:04:57.000000000 -0500
++++ foo2xqx-wrapper.in	2009-05-30 05:05:34.000000000 -0500
+@@ -32,13 +32,6 @@
+ SHARE=$PREFIX/share/foo2xqx
+ PATH=$PATH:/sw/bin:/opt/local/bin
+ 
+-#
+-#	Log the command line, for debugging and problem reports
+-#
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
+-fi
+-
+ usage() {
+ 	cat <<EOF
+ Usage:
+@@ -139,8 +132,8 @@
+ #
+ # N.B. := operator used here, when :- would be better, because "ash"
+ # doesn't have :-
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -614,18 +607,6 @@
+ 	    $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 $GSOPTS $GAMMAFILE"
+-    logger -t "$BASENAME" -p lpr.info -- \
+-	"foo2xqx -r$RES -g$DIM -p$PAPER -m$MEDIA \
+--n$COPIES -d$DUPLEX -s$SOURCE $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \
+-$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
+-fi
+-
+-#
+ #	Remove cruft
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-foo2zjs-wrapper.in b/print/foo2zjs/files/patch-foo2zjs-wrapper.in
index 555cf3d036e3..57edd88d256c 100644
--- a/print/foo2zjs/files/patch-foo2zjs-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2zjs-wrapper.in
@@ -1,65 +1,46 @@
---- 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
+--- foo2zjs-wrapper.in	2009-05-30 05:05:50.000000000 -0500
++++ foo2zjs-wrapper.in	2009-05-30 05:06:36.000000000 -0500
+@@ -42,13 +42,6 @@
  SHARE=$PREFIX/share/foo2zjs
+ PATH=$PATH:/sw/bin:/opt/local/bin
  
 -#
 -#	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
+-if [ -x /usr/bin/logger -o -x /bin/logger ]; then
+-    logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null
 -fi
 -
  usage() {
  	cat <<EOF
  Usage:
-@@ -141,11 +134,7 @@
+@@ -153,8 +146,8 @@
  #
  # 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" \
+-if gs.foo -v >/dev/null 2>&1; then
+-        GSBIN=${GSBIN:-gs.foo}
++if gs -v >/dev/null 2>&1; then
++        GSBIN=${GSBIN:-gs}
+ else
+         GSBIN=${GSBIN:-gs}
+ fi
+@@ -707,18 +700,6 @@
  	    $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"
+-	"$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE"
 -    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
+ #
+ if [ $DEBUG -eq 0 ]; then
diff --git a/print/foo2zjs/files/patch-getweb.in b/print/foo2zjs/files/patch-getweb.in
index f62297c0c7eb..9b1451ee77f6 100644
--- a/print/foo2zjs/files/patch-getweb.in
+++ b/print/foo2zjs/files/patch-getweb.in
@@ -1,29 +1,65 @@
---- getweb.in	Thu May 11 17:02:59 2006
-+++ getweb.in	Sun Jun  4 15:41:29 2006
-@@ -48,7 +48,7 @@
+--- getweb.in	2009-05-29 22:17:38.000000000 -0500
++++ getweb.in	2009-05-29 22:21:18.000000000 -0500
+@@ -11,7 +11,7 @@
+ 
+ VERSION='$Id: getweb.in,v 1.85 2009/05/04 14:10:55 rick Exp $'
+ 
+-WGETOPTS="--passive-ftp -q"
++FETCHOPTS="-m -o"
+ 
+ usage() {
+ cat <<EOF
+@@ -111,7 +111,7 @@
      exefile="$2"
-     what="$3"
+     shift; shift
      
 -    wget $WGETOPTS -O $exefile "$url/$exefile" ||
-+    fetch -m -o $exefile "$url/$exefile" ||
++    fetch $FETCHOPTS $exefile "$url/$exefile" ||
  	error "Couldn't download $url/$exefile"
-     unzip -o $exefile "$what"
+     unzip -oj $exefile "$@"
      rm $exefile
-@@ -62,7 +62,7 @@
+@@ -125,7 +125,7 @@
      file="$2"
      what="$3"
      
 -    wget $WGETOPTS -O $file "$url/$file" ||
-+    fetch -m -o $file "$url/$file" ||
++    fetch $FETCHOPTS $file "$url/$file" ||
  	error "Couldn't download $url/$file"
      gunzip <$file | tar xvf - $what
      rm $file
-@@ -130,7 +130,7 @@
- 	do
- 	    base=`basename $i .IC_`
- 	    mv $base.IC_ $base.ic_
--	    ./msexpand $base.ic_
-+	    msexpand $base.ic_
- 	    rm -f $base.ic_
+@@ -212,7 +212,7 @@
+ 	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
+ 	FILE="MC2300DL_v255.zip"
+ 	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
+-	wget $WGETOPTS "$URL" || error "Couldn't download $URL"
++	fetch $FETCHOPTS "$URL" || error "Couldn't download $URL"
+ 	echo "*** Now use a windows box to unzip and install $FILE ***"
+ 	;;
+     cpwl|pageworks)
+@@ -224,7 +224,7 @@
+ 	    do
+ 		base=`basename $i .IC_`
+ 		mv $base.IC_ $base.ic_
+-		./msexpand $base.ic_
++		msexpand $base.ic_
+ 		rm -f $base.ic_
+ 	    done
+ 	    copyright "(c) Copyright Minolta-QMS 1998"
+@@ -332,7 +332,7 @@
+ 	    URL="$URL?driver=$driver&printer=$printer"
+ 	    URL="$URL&.submit=Generate+PPD+file"
+ 	    URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
+-	    wget $WGETOPTS -O PPD/$printer.ppd "$URL" ||
++	    fetch $FETCHOPTS PPD/$printer.ppd "$URL" ||
+ 		error "Couldn't dowload $URL"
  	done
  	;;
+@@ -368,7 +368,7 @@
+     update)
+ 	url=${URLZJS}
+ 	file=foo2zjs.tar.gz
+-	wget $WGETOPTS -O $file $url/$file ||
++	fetch $FETCHOPTS $file $url/$file ||
+ 		error "Couldn't download $url/$exefile"
+ 	mv getweb getweb.old
+ 	HERE=`pwd`
diff --git a/print/foo2zjs/pkg-plist b/print/foo2zjs/pkg-plist
index 862a5c65fae0..70eabf4b6707 100644
--- a/print/foo2zjs/pkg-plist
+++ b/print/foo2zjs/pkg-plist
@@ -1,51 +1,185 @@
+bin/foo2zjs
+bin/zjsdecode
 bin/arm2hpdl
 bin/foo2hp
-bin/foo2hp2600-wrapper
+bin/foo2xqx
+bin/xqxdecode
 bin/foo2lava
-bin/foo2lava-wrapper
+bin/lavadecode
+bin/foo2qpdl
+bin/qpdldecode
+bin/opldecode
+bin/foo2oak
+bin/oakdecode
+bin/foo2slx
+bin/slxdecode
+bin/foo2hiperc
+bin/hipercdecode
+bin/gipddecode
+bin/printer-profile
+bin/foo2zjs-wrapper
 bin/foo2oak-wrapper
-bin/foo2xqx
+bin/foo2hp2600-wrapper
 bin/foo2xqx-wrapper
-bin/foo2zjs
+bin/msexpand
+bin/foo2lava-wrapper
+bin/foo2qpdl-wrapper
+bin/foo2slx-wrapper
+bin/foo2hiperc-wrapper
+bin/foo2zjs-pstops
 bin/foo2zjs-icc2ps
-bin/foo2zjs-wrapper
 bin/getweb
-bin/lavadecode
-bin/msexpand
-bin/xqxdecode
-bin/zjsdecode
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
+%%DATADIR%%/gamma.ps
+%%DATADIR%%/gamma-lookup.ps
+%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
+%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd
+%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd
+%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd
+%%DATADIR%%/crd/kh.crd
+%%DATADIR%%/crd/kx.crd
+%%DATADIR%%/crd/prolog.ps
+%%DATADIR%%/crd/screen1200.ps
+%%DATADIR%%/crd/screen2400.ps
+share/foo2qpdl/crd/CLP-300-1200x1200cms2
+share/foo2qpdl/crd/CLP-300-1200x600cms2
+share/foo2qpdl/crd/CLP-300-600x600cms2
+share/foo2qpdl/crd/CLP-300cms
+share/foo2qpdl/crd/CLP-600-1200x1200cms2
+share/foo2qpdl/crd/CLP-600-1200x600cms2
+share/foo2qpdl/crd/CLP-600-600x600cms2
+share/foo2qpdl/crd/CLP-600cms
+share/foo2qpdl/crd/black-text.ps
 share/cups/model/Generic-OAKT_Printer.ppd.gz
 share/cups/model/Generic-ZjStream_Printer.ppd.gz
-share/cups/model/KonicaMinolta-magicolor_2490_MF.ppd.gz
-share/cups/model/KonicaMinolta-magicolor_2530_DL.ppd.gz
 share/cups/model/HP-Color_LaserJet_1500.ppd.gz
 share/cups/model/HP-Color_LaserJet_1600.ppd.gz
 share/cups/model/HP-Color_LaserJet_2600n.ppd.gz
-share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz
+share/cups/model/HP-Color_LaserJet_CP1215.ppd.gz
 share/cups/model/HP-LaserJet_1000.ppd.gz
 share/cups/model/HP-LaserJet_1005.ppd.gz
 share/cups/model/HP-LaserJet_1018.ppd.gz
 share/cups/model/HP-LaserJet_1020.ppd.gz
 share/cups/model/HP-LaserJet_1022.ppd.gz
+share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz
+share/cups/model/HP-LaserJet_M1120_MFP.ppd.gz
+share/cups/model/HP-LaserJet_M1319_MFP.ppd.gz
+share/cups/model/HP-LaserJet_P1005.ppd.gz
+share/cups/model/HP-LaserJet_P1006.ppd.gz
+share/cups/model/HP-LaserJet_P1007.ppd.gz
+share/cups/model/HP-LaserJet_P1008.ppd.gz
+share/cups/model/HP-LaserJet_P1505.ppd.gz
+share/cups/model/HP-LaserJet_P2014.ppd.gz
+share/cups/model/HP-LaserJet_P2035.ppd.gz
+share/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz
+share/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
+share/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
+share/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
+share/cups/model/Lexmark-C500.ppd.gz
+share/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
+share/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
+share/cups/model/Kyocera-KM-1635.ppd.gz
+share/cups/model/Kyocera-KM-2035.ppd.gz
 share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz
 share/cups/model/Minolta-magicolor_2200_DL.ppd.gz
 share/cups/model/Minolta-magicolor_2300_DL.ppd.gz
 share/cups/model/Minolta-magicolor_2430_DL.ppd.gz
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/manual.pdf
-%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
-%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd
-%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd
-%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd
-%%DATADIR%%/crd/kh.crd
-%%DATADIR%%/crd/kx.crd
-%%DATADIR%%/crd/prolog.ps
-%%DATADIR%%/crd/screen1200.ps
-%%DATADIR%%/crd/screen2400.ps
-%%DATADIR%%/gamma-lookup.ps
-%%DATADIR%%/gamma.ps
+share/cups/model/Oki-C3100.ppd.gz
+share/cups/model/Oki-C3200.ppd.gz
+share/cups/model/Oki-C3300.ppd.gz
+share/cups/model/Oki-C3400.ppd.gz
+share/cups/model/Oki-C3530_MFP.ppd.gz
+share/cups/model/Oki-C5100.ppd.gz
+share/cups/model/Oki-C5200.ppd.gz
+share/cups/model/Oki-C5500.ppd.gz
+share/cups/model/Oki-C5600.ppd.gz
+share/cups/model/Oki-C5800.ppd.gz
+share/cups/model/Samsung-CLP-300.ppd.gz
+share/cups/model/Samsung-CLP-310.ppd.gz
+share/cups/model/Samsung-CLP-315.ppd.gz
+share/cups/model/Samsung-CLP-600.ppd.gz
+share/cups/model/Samsung-CLP-610.ppd.gz
+share/cups/model/Samsung-CLX-2160.ppd.gz
+share/cups/model/Samsung-CLX-3160.ppd.gz
+share/cups/model/Samsung-CLX-3175.ppd.gz
+share/cups/model/Xerox-Phaser_6110.ppd.gz
+share/cups/model/Xerox-Phaser_6115MFP.ppd.gz
+foomatic/db/source/printer/HP-LaserJet_M1319_MFP.xml
+foomatic/db/source/printer/HP-LaserJet_P2035.xml
+foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
+foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
+foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
+foomatic/db/source/printer/Samsung-CLP-310.xml
+foomatic/db/source/opt/foo2hiperc-ColorMode.xml
+foomatic/db/source/opt/foo2hiperc-Compression.xml
+foomatic/db/source/opt/foo2hiperc-Duplex.xml
+foomatic/db/source/opt/foo2hiperc-ICM.xml
+foomatic/db/source/opt/foo2hiperc-InputSlot.xml
+foomatic/db/source/opt/foo2hiperc-MediaType.xml
+foomatic/db/source/opt/foo2hiperc-PageSize.xml
+foomatic/db/source/opt/foo2hiperc-Resolution.xml
+foomatic/db/source/opt/foo2hp-BitsPerPlane.xml
+foomatic/db/source/opt/foo2hp-ColorMode.xml
+foomatic/db/source/opt/foo2hp-Duplex.xml
+foomatic/db/source/opt/foo2hp-ICM.xml
+foomatic/db/source/opt/foo2hp-InputSlot.xml
+foomatic/db/source/opt/foo2hp-MediaType.xml
+foomatic/db/source/opt/foo2hp-PrinterType.xml
+foomatic/db/source/opt/foo2lava-ColorMode.xml
+foomatic/db/source/opt/foo2lava-Duplex.xml
+foomatic/db/source/opt/foo2lava-ICM.xml
+foomatic/db/source/opt/foo2lava-InputSlot.xml
+foomatic/db/source/opt/foo2lava-MediaType.xml
+foomatic/db/source/opt/foo2lava-PageSize.xml
+foomatic/db/source/opt/foo2lava-PrinterType.xml
+foomatic/db/source/opt/foo2lava-Resolution.xml
+foomatic/db/source/opt/foo2oak-BitsPerPlane.xml
+foomatic/db/source/opt/foo2oak-ColorMode.xml
+foomatic/db/source/opt/foo2oak-ICM.xml
+foomatic/db/source/opt/foo2oak-InputSlot.xml
+foomatic/db/source/opt/foo2oak-MediaType.xml
+foomatic/db/source/opt/foo2oak-z1-InputSlot.xml
+foomatic/db/source/opt/foo2oak-z1-MediaType.xml
+foomatic/db/source/opt/foo2oak-z1-PageSize.xml
+foomatic/db/source/opt/foo2qpdl-ColorMode.xml
+foomatic/db/source/opt/foo2qpdl-Duplex.xml
+foomatic/db/source/opt/foo2qpdl-ICM.xml
+foomatic/db/source/opt/foo2qpdl-InputSlot.xml
+foomatic/db/source/opt/foo2qpdl-MediaType.xml
+foomatic/db/source/opt/foo2qpdl-PageSize.xml
+foomatic/db/source/opt/foo2qpdl-PrinterType.xml
+foomatic/db/source/opt/foo2qpdl-Resolution.xml
+foomatic/db/source/opt/foo2slx-ColorMode.xml
+foomatic/db/source/opt/foo2slx-ICM.xml
+foomatic/db/source/opt/foo2slx-InputSlot.xml
+foomatic/db/source/opt/foo2slx-MediaType.xml
+foomatic/db/source/opt/foo2slx-PageSize.xml
+foomatic/db/source/opt/foo2slx-Resolution.xml
+foomatic/db/source/opt/foo2xqx-Duplex.xml
+foomatic/db/source/opt/foo2xqx-InputSlot.xml
+foomatic/db/source/opt/foo2xqx-MediaType.xml
+foomatic/db/source/opt/foo2xqx-Resolution.xml
+foomatic/db/source/opt/foo2xxx-Copies.xml
+foomatic/db/source/opt/foo2xxx-Nup.xml
+foomatic/db/source/opt/foo2xxx-NupOrient.xml
+foomatic/db/source/opt/foo2xxx-Quality.xml
+foomatic/db/source/opt/foo2zjs-ColorMode.xml
+foomatic/db/source/opt/foo2zjs-Duplex.xml
+foomatic/db/source/opt/foo2zjs-ICM.xml
+foomatic/db/source/opt/foo2zjs-InputSlot.xml
+foomatic/db/source/opt/foo2zjs-Intent.xml
+foomatic/db/source/opt/foo2zjs-MediaType.xml
+foomatic/db/source/opt/foo2zjs-PageSize.xml
+foomatic/db/source/opt/foo2zjs-PrinterType.xml
+foomatic/db/source/opt/foo2zjs-Resolution.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry foomatic/db/source/printer
+@dirrmtry foomatic/db/source/opt
+@dirrmtry foomatic/db/source
+@dirrmtry foomatic/db/
+@dirrmtry foomatic
 @dirrmtry %%DATADIR%%/icm
 @dirrmtry %%DATADIR%%/firmware
 @dirrmtry %%DATADIR%%/crd
@@ -57,3 +191,6 @@ share/cups/model/Minolta-magicolor_2430_DL.ppd.gz
 @dirrmtry share/foo2xqx
 @dirrmtry share/foo2lava/icm
 @unexec rmdir %D/share/foo2lava 2>/dev/null || echo "Note: %D/share/foo2lava: icm directory not empty, remove it manually"
+@dirrmtry share/foo2hiperc
+@dirrmtry share/foo2qpdl/crd
+@dirrmtry share/foo2qpdl