Update to latest version, added a missing run dependency.
Comments ? Ok ?
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 18 Feb 2009 14:06:45 -0000 1.5
+++ Makefile 30 Jul 2009 13:40:47 -0000
@@ -2,21 +2,21 @@
COMMENT= driver for ZjStream wire protocol compatible printers
-VERSION= 20071102
+VERSION= 20090623
DISTNAME= foo2zjs-${VERSION}
CATEGORIES= print
HOMEPAGE= http://foo2hp.rkkda.com/
-MAINTAINER= Giovanni Bechis <[email protected]>
+MAINTAINER= Giovanni Bechis <[email protected]>
-# GPL
+# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c
+WANTLIB= c m
MASTER_SITES= http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
@@ -28,7 +28,7 @@ USE_GMAKE= Yes
WRKDIST= ${WRKDIR}/foo2zjs
BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
-RUN_DEPENDS= ::print/ghostscript/gnu
+RUN_DEPENDS= ::print/foomatic-filters
NO_REGRESS= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 4 Nov 2007 15:47:45 -0000 1.2
+++ distinfo 30 Jul 2009 13:40:47 -0000
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20071102.tar.gz) = eTGAgkREeKyvjOfTQoThEw==
-RMD160 (foo2zjs-20071102.tar.gz) = AXYJLlCWZY7n6adNxQFz6auYVFc=
-SHA1 (foo2zjs-20071102.tar.gz) = RzuyK+qm7P0VRPmYpyhcx9sVOU8=
-SHA256 (foo2zjs-20071102.tar.gz) = gp3IgSeQhIlU3iwLXf3/CxDJoXEO68zuq+lhxnOtQeA=
-SIZE (foo2zjs-20071102.tar.gz) = 1517426
+MD5 (foo2zjs-20090623.tar.gz) = N0IgNvk5/PPL4luQ0ASwqw==
+RMD160 (foo2zjs-20090623.tar.gz) = XfZwC6WAnAXObFeD5wlwj8utz0g=
+SHA1 (foo2zjs-20090623.tar.gz) = gDgLApJ7qzvF+3LLNCv1KXTHa7E=
+SHA256 (foo2zjs-20090623.tar.gz) = cTlsxzd5pAkJCnOFRVaNuHq/w9JDsGv66pPuorxeDc0=
+SIZE (foo2zjs-20090623.tar.gz) = 1574001
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile 4 Nov 2007 15:47:45 -0000 1.2
+++ patches/patch-Makefile 30 Jul 2009 13:40:47 -0000
@@ -1,53 +1,34 @@
$OpenBSD: patch-Makefile,v 1.2 2007/11/04 15:47:45 merdely Exp $
---- Makefile.orig Sat Nov 3 05:22:39 2007
-+++ Makefile Sat Nov 3 17:19:32 2007
-@@ -6,10 +6,6 @@ SYSNAME := $(shell uname -n)
+--- Makefile.orig Sun Jun 14 13:52:03 2009
++++ Makefile Sun Jul 19 13:16:11 2009
+@@ -15,11 +15,6 @@ SYSNAME := $(shell uname -n)
# No version number yet...
VERSION=0.0
-# Installation prefix...
-PREFIX=/usr/local
-PREFIX=/usr
+-PREFIX=$(DESTDIR)/usr
-
# Pathnames for this package...
BIN=$(PREFIX)/bin
SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
- SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -30,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
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
# Pathnames for referenced packages...
--FOODB=/usr/share/foomatic/db/source
+-FOODB=$(DESTDIR)/usr/share/foomatic/db/source
+FOODB=${PREFIX}/share/foo2zjs/db/source
# User ID's
- LPuid=-olp
-@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
- LPuid=-oroot
- LPgid=-gwheel
- endif
-+ifeq ($(UNAME),OpenBSD)
-+ LPuid=-oroot
-+ LPgid=-gwheel
-+endif
- # If we aren't root, don't try to set ownership
- ifneq ($(EUID),0)
- LPuid=
-@@ -54,6 +54,9 @@ endif
- ifeq ($(UNAME),OpenBSD)
- MODTIME= stat -f "%Sm" -t "%a %b %d %T %Y" $$1
- endif
-+ifeq ($(UNAME),OpenBSD)
-+ MODTIME= stat -f "%Sm" -t "%a %b %d %T %Y" $$1
-+endif
- ifeq ($(UNAME),Darwin)
- MODTIME= stat -f "%Sm" -t "%a %b %d %T %Y" $$1
- endif
-@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
+ LPuid=-oroot
+@@ -255,7 +250,6 @@ ifeq ($(UNAME),Linux)
endif
# Compiler flags
@@ -55,138 +36,94 @@ $OpenBSD: patch-Makefile,v 1.2 2007/11/0
#CFLAGS += -g
#
-@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
+@@ -505,9 +499,8 @@ gipddecode: gipddecode.o $(LIBJBG)
#
# Installation rules
#
-install: all install-test install-prog install-icc2ps install-extra \
-+install: all install-prog install-icc2ps \
- install-crd install-foo install-ppd install-man install-doc
++install: all install-prog install-icc2ps install-extra \
+ install-crd install-foo install-ppd \
+- install-gui install-desktop \
+ install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -493,10 +495,6 @@ install-prog:
- install -d $(SHAREZJS)/
- install -c -m 644 gamma.ps $(SHAREZJS)/
- install -c -m 644 gamma-lookup.ps $(SHAREZJS)/
-- install -d $(SHAREOAK)/
-- install -d $(SHAREHP)/
-- install -d $(SHAREXQX)/
-- install -d $(SHARELAVA)/
+@@ -564,11 +557,6 @@ install-prog:
+ $(INSTALL) -d $(SHAREZJS)/
+ $(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
+ $(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
+- $(INSTALL) -d $(SHAREOAK)/
+- $(INSTALL) -d $(SHAREHP)/
+- $(INSTALL) -d $(SHAREXQX)/
+- $(INSTALL) -d $(SHARELAVA)/
+- $(INSTALL) -d $(SHAREHC)/
install-foo:
#
-@@ -509,6 +507,7 @@ install-foo:
- #
- # Install current database files
- #
-+ mkdir -p $(FOODB)/{driver,printer,opt}
- @if [ -d $(FOODB) ]; then \
- for dir in driver printer opt; do \
- echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
-@@ -535,40 +534,6 @@ install-foo:
- foomatic-combo-xml -O >overview.xml; \
- fi
-
--install-icc2ps:
-- #
-- # Install ICM to Postscript file conversion utility
-- #
-- cd icc2ps; $(MAKE) PREFIX=$(PREFIX) install
--
--install-crd:
-- #
-- # Install prebuilt CRD files (from m2300w project)
-- #
-- install -d $(SHAREZJS)/
-- install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/crd/
-- for i in crd/zjs/*.*; do \
-- install -c -m 644 $$i $(SHAREZJS)/crd/; \
-- done
-- #
-- # Install prebuilt CRD files for CLP-300/CLP-600
-- #
-- install -d $(SHAREQPDL)/
-- install $(LPuid) $(LPgid) -m 775 -d $(SHAREQPDL)/crd/
-- for i in crd/qpdl/*cms* crd/qpdl/*.ps; do \
-- install -c -m 644 $$i $(SHAREQPDL)/crd/; \
-- done
--
--install-psfiles:
-- #
-- # Install prebuilt psfiles files (from m2300w project)
-- #
-- install -d $(SHAREHP)/
-- install $(LPuid) $(LPgid) -m 775 -d $(SHAREHP)/psfiles/
-- for i in psfiles/*.*; do \
-- install -c -m 644 $$i $(SHAREHP)/psfiles/; \
-- done
--
- install-extra:
- #
- # Install extra files (ICM and firmware), if any exist here.
-@@ -629,34 +594,33 @@ install-extra:
- fi; \
+@@ -723,49 +711,21 @@ install-extra:
done
-+install-icc2ps:
-+ #
-+ # Install ICM to Postscript file conversion utility
-+ #
-+ cd icc2ps; $(MAKE) PREFIX=$(PREFIX) install
-+
-+install-crd:
-+ #
-+ # Install prebuilt CRD files (from m2300w project)
-+ #
-+ install -d $(SHAREZJS)/
-+ install $(LPuid) $(LPgid) -m 775 -d $(SHAREZJS)/crd/
-+ for i in crd/zjs/*.*; do \
-+ install -c -m 644 $$i $(SHAREZJS)/crd/; \
-+ done
-+
- MODEL=/usr/share/cups/model
--LOCALMODEL=/usr/local/share/cups/model
+ MODEL=$(DESTDIR)/usr/share/cups/model
+-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
+LOCALMODEL=${PREFIX}/share/foo2zjs/db/source/PPD
- PPD=/usr/share/ppd
+ PPD=$(DESTDIR)/usr/share/ppd
+ VARPPD=/var/lp/ppd
install-ppd:
#
# Install PPD files for CUPS
#
-- if [ -d $(PPD) ]; then \
-- find $(PPD) -name '*foo2zjs*' | xargs rm -f; \
-- find $(PPD) -name '*foo2hp*' | xargs rm -f; \
-- find $(PPD) -name '*foo2xqx*' | xargs rm -f; \
-- find $(PPD) -name '*foo2lava*' | xargs rm -f; \
-- find $(PPD) -name '*foo2qpdl*' | xargs rm -f; \
-- find $(PPD) -name '*foo2slx*' | xargs rm -f; \
+- if [ -x /usr/sbin/ppdmgr -a -s $(VARPPD)/ppdcache ]; then \
+- $(INSTALL) $(LPgid) -d $(VARPPD)/user; \
+- cd PPD; \
+- for ppd in *.ppd; do \
+- manuf=`echo "$$ppd" | sed 's/-.*//'`; \
+- $(INSTALL) $(LPgid) -d $(VARPPD)/user/$$manuf; \
+- gzip < $$ppd > $(VARPPD)/user/$$manuf/$$ppd.gz; \
+- done; \
+- ppdmgr -u; \
+- elif [ -d $(PPD) ]; then \
+- find $(PPD) -name '*foo2zjs*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hp*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2xqx*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2lava*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2qpdl*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2slx*' | xargs rm -rf; \
+- find $(PPD) -name '*foo2hiperc*' | xargs rm -rf; \
- [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
-+ mkdir -p $(LOCALMODEL)
-+ if [ -d $(LOCALMODEL) ]; then \
- cd PPD; \
- for ppd in *.ppd; do \
+- cd PPD; \
+- for ppd in *.ppd; do \
- gzip < $$ppd > $(PPD)/foo2zjs/$$ppd.gz; \
- done; \
- fi
- if [ -d $(MODEL) ]; then \
+- rm -f $(MODEL)/KonicaMinolta*; \
- cd PPD; \
- for ppd in *.ppd; do \
- gzip < $$ppd > $(MODEL)/$$ppd.gz; \
- done; \
- elif [ -d $(LOCALMODEL) ]; then \
-- cd PPD; \
-- for ppd in *.ppd; do \
- gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
- done; \
- fi
-@@ -1027,11 +991,8 @@ install-doc: doc
- #
- install -d -m 755 $(DOCDIR)
- install -c -m 644 manual.pdf $(DOCDIR)
-- install -c -m 644 COPYING $(DOCDIR)
- install -c -m 644 INSTALL $(DOCDIR)
-- install -c -m 644 INSTALL.osx $(DOCDIR)
- install -c -m 644 README $(DOCDIR)
-- install -c -m 644 ChangeLog $(DOCDIR)
++ mkdir -p $(LOCALMODEL)
++ if [ -d $(LOCALMODEL) ]; then \
+ rm -f $(LOCALMODEL)/KonicaMinolta*; \
+ cd PPD; \
+ for ppd in *.ppd; do \
+- gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
+- done; \
+- fi
++ gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
++ done; \
++ fi
+
+ APPL=$(DESTDIR)/usr/share/applications
+ OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
+@@ -1225,11 +1185,8 @@ install-doc: doc
+ #
+ $(INSTALL) -d -m 755 $(DOCDIR)
+ $(INSTALL) -c -m 644 manual.pdf $(DOCDIR)
+- $(INSTALL) -c -m 644 COPYING $(DOCDIR)
+ $(INSTALL) -c -m 644 INSTALL $(DOCDIR)
+- $(INSTALL) -c -m 644 INSTALL.osx $(DOCDIR)
+ $(INSTALL) -c -m 644 README $(DOCDIR)
+- $(INSTALL) -c -m 644 ChangeLog $(DOCDIR)
GROFF=/usr/local/test/bin/groff
GROFF=groff
Index: patches/patch-foo2oak_c
===================================================================
RCS file: patches/patch-foo2oak_c
diff -N patches/patch-foo2oak_c
--- patches/patch-foo2oak_c 4 Nov 2007 15:47:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-$OpenBSD: patch-foo2oak_c,v 1.1 2007/11/04 15:47:45 merdely Exp $
---- foo2oak.c.orig Sat Nov 3 17:20:33 2007
-+++ foo2oak.c Sat Nov 3 17:38:20 2007
-@@ -717,19 +717,6 @@ long JbgOptions[5] =
- 0
- };
-
--void
--swap32(void *p)
--{
-- char *cp = (char *) p;
-- char tmp;
-- tmp = cp[0];
-- cp[0] = cp[3];
-- cp[3] = tmp;
-- tmp = cp[1];
-- cp[1] = cp[2];
-- cp[2] = tmp;
--}
--
- static void
- fill_image_plane_unknown(OAK_IMAGE_PLANE *ip)
- {
-@@ -883,9 +870,9 @@ cmyk_page(unsigned char *raw, int w, int h, FILE *ofp)
- memcpy(&recdata.bih, chain->data, sizeof(recdata.bih));
-
- // Oak is little-endian, but JBIG-kit is big-endian
-- swap32(&recdata.bih.xd);
-- swap32(&recdata.bih.yd);
-- swap32(&recdata.bih.l0);
-+ swap32(recdata.bih.xd);
-+ swap32(recdata.bih.yd);
-+ swap32(recdata.bih.l0);
-
- recdata.datalen = chainlen;
- recdata.padlen = (recdata.datalen + 15) & ~0x0f;
-@@ -1014,9 +1001,9 @@ pbm_page(unsigned char *buf, int w, int h, FILE *ofp)
- memcpy(&recdata.bih, chain->data, sizeof(recdata.bih));
-
- // Oak is little-endian, but JBIG-kit is big-endian
-- swap32(&recdata.bih.xd);
-- swap32(&recdata.bih.yd);
-- swap32(&recdata.bih.l0);
-+ swap32(recdata.bih.xd);
-+ swap32(recdata.bih.yd);
-+ swap32(recdata.bih.l0);
-
- recdata.datalen = chainlen;
- recdata.padlen = (recdata.datalen + 15) & ~0x0f;
-@@ -1155,9 +1142,9 @@ pgm_page(unsigned char *raw, int w, int h, FILE *ofp)
- memcpy(&recdata.bih, chain->data, sizeof(recdata.bih));
-
- // Oak is little-endian, but JBIG-kit is big-endian
-- swap32(&recdata.bih.xd);
-- swap32(&recdata.bih.yd);
-- swap32(&recdata.bih.l0);
-+ swap32(recdata.bih.xd);
-+ swap32(recdata.bih.yd);
-+ swap32(recdata.bih.l0);
-
- recdata.datalen = chainlen;
- recdata.padlen = (recdata.datalen + 15) & ~0x0f;
-@@ -1332,9 +1319,9 @@ cups_page(unsigned char *raw, int w, int h, FILE *ofp)
- memcpy(&recdata.bih, chain->data, sizeof(recdata.bih));
-
- // Oak is little-endian, but JBIG-kit is big-endian
-- swap32(&recdata.bih.xd);
-- swap32(&recdata.bih.yd);
-- swap32(&recdata.bih.l0);
-+ swap32(recdata.bih.xd);
-+ swap32(recdata.bih.yd);
-+ swap32(recdata.bih.l0);
-
- recdata.datalen = chainlen;
- recdata.padlen = (recdata.datalen + 15) & ~0x0f;
Index: patches/patch-icc2ps_Makefile
===================================================================
RCS file: /cvs/ports/print/foo2zjs/patches/patch-icc2ps_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-icc2ps_Makefile
--- patches/patch-icc2ps_Makefile 26 Sep 2007 06:26:19 -0000 1.1.1.1
+++ patches/patch-icc2ps_Makefile 30 Jul 2009 13:40:47 -0000
@@ -1,14 +1,17 @@
$OpenBSD: patch-icc2ps_Makefile,v 1.1.1.1 2007/09/26 06:26:19 ajacoutot Exp $
---- icc2ps/Makefile.orig Tue Sep 25 16:15:36 2007
-+++ icc2ps/Makefile Tue Sep 25 16:15:43 2007
-@@ -1,10 +1,8 @@
+--- icc2ps/Makefile.orig Sun Mar 1 23:04:53 2009
++++ icc2ps/Makefile Sun Jul 19 13:00:16 2009
+@@ -1,11 +1,11 @@
+ UNAME := $(shell uname)
-PREFIX= /usr
++
BIN= $(PREFIX)/bin
SRC= icc2ps.c xgetopt.c
LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
-CFLAGS= -O3
-
- all: foo2zjs-icc2ps
-
++
+ INSTALL=install
+ ifeq ($(UNAME),SunOS)
+ INSTALL=/usr/ucb/install
Index: patches/patch-oakdecode_c
===================================================================
RCS file: patches/patch-oakdecode_c
diff -N patches/patch-oakdecode_c
--- patches/patch-oakdecode_c 4 Nov 2007 15:47:45 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-$OpenBSD: patch-oakdecode_c,v 1.1 2007/11/04 15:47:45 merdely Exp $
---- oakdecode.c.orig Sat Nov 3 17:37:58 2007
-+++ oakdecode.c Sat Nov 3 17:38:50 2007
-@@ -88,19 +88,6 @@ usage(void)
- exit(1);
- }
-
--void
--swap32(void *p)
--{
-- char *cp = (char *) p;
-- char tmp;
-- tmp = cp[0];
-- cp[0] = cp[3];
-- cp[3] = tmp;
-- tmp = cp[1];
-- cp[1] = cp[2];
-- cp[2] = tmp;
--}
--
- #if 0
- BIH-style from foo2zjs/pbmtojbg...
-
-@@ -489,9 +476,9 @@ decode(FILE *fp)
- // inside the compressed stream itself????
- if (*cp == 1)
- {
-- swap32(&hdr3c.bih.xd);
-- swap32(&hdr3c.bih.yd);
-- swap32(&hdr3c.bih.l0);
-+ swap32(hdr3c.bih.xd);
-+ swap32(hdr3c.bih.yd);
-+ swap32(hdr3c.bih.l0);
- }
- if (!SupressImage || !ImageRec[plane])
- if (first_bih)
-@@ -501,9 +488,9 @@ decode(FILE *fp)
- }
- if (0 && *cp == 1)
- {
-- swap32(&hdr3c.bih.xd);
-- swap32(&hdr3c.bih.yd);
-- swap32(&hdr3c.bih.l0);
-+ swap32(hdr3c.bih.xd);
-+ swap32(hdr3c.bih.yd);
-+ swap32(hdr3c.bih.l0);
- }
- if (FpRaw[plane][subplane])
- fwrite(&hdr3c.bih, 1, 20, FpRaw[plane][subplane]);
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/print/foo2zjs/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 4 Nov 2007 15:47:45 -0000 1.2
+++ pkg/PLIST 30 Jul 2009 13:40:47 -0000
@@ -1,27 +1,36 @@
@comment $OpenBSD: PLIST,v 1.2 2007/11/04 15:47:45 merdely Exp $
-bin/arm2hpdl
-bin/foo2hp
+...@bin bin/arm2hpdl
+...@bin bin/foo2hiperc
+bin/foo2hiperc-wrapper
+...@bin bin/foo2hp
bin/foo2hp2600-wrapper
-bin/foo2lava
+...@bin bin/foo2lava
bin/foo2lava-wrapper
-bin/foo2oak
+...@bin bin/foo2oak
bin/foo2oak-wrapper
-bin/foo2qpdl
+...@bin bin/foo2qpdl
bin/foo2qpdl-wrapper
-bin/foo2slx
+...@bin bin/foo2slx
bin/foo2slx-wrapper
-bin/foo2xqx
+...@bin bin/foo2xqx
bin/foo2xqx-wrapper
-bin/foo2zjs
+...@bin bin/foo2zjs
+...@bin bin/foo2zjs-icc2ps
bin/foo2zjs-pstops
bin/foo2zjs-wrapper
-bin/lavadecode
-bin/oakdecode
-bin/opldecode
-bin/qpdldecode
-bin/slxdecode
-bin/xqxdecode
-bin/zjsdecode
+...@bin bin/gipddecode
+...@bin bin/hipercdecode
+...@bin bin/lavadecode
+...@bin bin/oakdecode
+...@bin bin/opldecode
+bin/printer-profile
+...@bin bin/qpdldecode
+...@bin bin/slxdecode
+...@bin bin/xqxdecode
+...@bin bin/zjsdecode
+...@man man/man1/arm2hpdl.1
+...@man man/man1/foo2hiperc-wrapper.1
+...@man man/man1/foo2hiperc.1
@man man/man1/foo2hp.1
@man man/man1/foo2hp2600-wrapper.1
@man man/man1/foo2lava-wrapper.1
@@ -34,13 +43,17 @@ bin/zjsdecode
@man man/man1/foo2slx.1
@man man/man1/foo2xqx-wrapper.1
@man man/man1/foo2xqx.1
+...@man man/man1/foo2zjs-pstops.1
@man man/man1/foo2zjs-wrapper.1
@man man/man1/foo2zjs.1
+...@man man/man1/hipercdecode.1
@man man/man1/lavadecode.1
@man man/man1/oakdecode.1
@man man/man1/opldecode.1
+...@man man/man1/printer-profile.1
@man man/man1/qpdldecode.1
@man man/man1/slxdecode.1
+...@man man/man1/usb_printerid.1
@man man/man1/xqxdecode.1
@man man/man1/zjsdecode.1
share/doc/foo2zjs/
@@ -49,6 +62,30 @@ share/doc/foo2zjs/README
share/doc/foo2zjs/getweb
share/doc/foo2zjs/manual.pdf
share/doc/foo2zjs/msexpand
+share/foo2hiperc/
+share/foo2hiperc/icm/
+share/foo2hp/
+share/foo2hp/icm/
+share/foo2lava/
+share/foo2lava/icm/
+share/foo2oak/
+share/foo2oak/icm/
+share/foo2qpdl/
+share/foo2qpdl/crd/
+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/foo2qpdl/icm/
+share/foo2slx/
+share/foo2slx/icm/
+share/foo2xqx/
+share/foo2xqx/firmware/
share/foo2zjs/
share/foo2zjs/crd/
share/foo2zjs/crd/2300w-1...@150-l250-kx,ucr100,0-per.crd
@@ -68,114 +105,56 @@ share/foo2zjs/db/source/PPD/Generic-ZjSt
share/foo2zjs/db/source/PPD/HP-Color_LaserJet_1500.ppd.gz
share/foo2zjs/db/source/PPD/HP-Color_LaserJet_1600.ppd.gz
share/foo2zjs/db/source/PPD/HP-Color_LaserJet_2600n.ppd.gz
+share/foo2zjs/db/source/PPD/HP-Color_LaserJet_CP1215.ppd.gz
share/foo2zjs/db/source/PPD/HP-LaserJet_1000.ppd.gz
share/foo2zjs/db/source/PPD/HP-LaserJet_1005.ppd.gz
share/foo2zjs/db/source/PPD/HP-LaserJet_1018.ppd.gz
share/foo2zjs/db/source/PPD/HP-LaserJet_1020.ppd.gz
share/foo2zjs/db/source/PPD/HP-LaserJet_1022.ppd.gz
share/foo2zjs/db/source/PPD/HP-LaserJet_M1005_MFP.ppd.gz
-share/foo2zjs/db/source/PPD/KonicaMinolta-magicolor_2480_MF.ppd.gz
-share/foo2zjs/db/source/PPD/KonicaMinolta-magicolor_2490_MF.ppd.gz
-share/foo2zjs/db/source/PPD/KonicaMinolta-magicolor_2530_DL.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_M1120_MFP.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_M1319_MFP.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P1005.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P1006.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P1007.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P1008.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P1505.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P2014.ppd.gz
+share/foo2zjs/db/source/PPD/HP-LaserJet_P2035.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_1600W.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
+share/foo2zjs/db/source/PPD/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+share/foo2zjs/db/source/PPD/Kyocera-KM-1635.ppd.gz
+share/foo2zjs/db/source/PPD/Kyocera-KM-2035.ppd.gz
share/foo2zjs/db/source/PPD/Lexmark-C500.ppd.gz
share/foo2zjs/db/source/PPD/Minolta-Color_PageWorks_Pro_L.ppd.gz
share/foo2zjs/db/source/PPD/Minolta-magicolor_2200_DL.ppd.gz
share/foo2zjs/db/source/PPD/Minolta-magicolor_2300_DL.ppd.gz
share/foo2zjs/db/source/PPD/Minolta-magicolor_2430_DL.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C3100.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C3200.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C3300.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C3400.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C3530_MFP.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C5100.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C5200.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C5500.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C5600.ppd.gz
+share/foo2zjs/db/source/PPD/Oki-C5800.ppd.gz
share/foo2zjs/db/source/PPD/Samsung-CLP-300.ppd.gz
+share/foo2zjs/db/source/PPD/Samsung-CLP-310.ppd.gz
+share/foo2zjs/db/source/PPD/Samsung-CLP-315.ppd.gz
share/foo2zjs/db/source/PPD/Samsung-CLP-600.ppd.gz
+share/foo2zjs/db/source/PPD/Samsung-CLP-610.ppd.gz
share/foo2zjs/db/source/PPD/Samsung-CLX-2160.ppd.gz
share/foo2zjs/db/source/PPD/Samsung-CLX-3160.ppd.gz
-share/foo2zjs/db/source/PPD/Xerox-Phaser-6110.ppd.gz
-share/foo2zjs/db/source/PPD/Xerox-Phaser-6115MFP.ppd.gz
-share/foo2zjs/db/source/driver/
-share/foo2zjs/db/source/driver/foo2hp.xml
-share/foo2zjs/db/source/driver/foo2lava.xml
-share/foo2zjs/db/source/driver/foo2oak.xml
-share/foo2zjs/db/source/driver/foo2qpdl.xml
-share/foo2zjs/db/source/driver/foo2slx.xml
-share/foo2zjs/db/source/driver/foo2xqx.xml
-share/foo2zjs/db/source/driver/foo2zjs.xml
-share/foo2zjs/db/source/opt/
-share/foo2zjs/db/source/opt/foo2hp-BitsPerPlane.xml
-share/foo2zjs/db/source/opt/foo2hp-ColorMode.xml
-share/foo2zjs/db/source/opt/foo2hp-Duplex.xml
-share/foo2zjs/db/source/opt/foo2hp-ICM.xml
-share/foo2zjs/db/source/opt/foo2hp-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2hp-MediaType.xml
-share/foo2zjs/db/source/opt/foo2hp-Quality.xml
-share/foo2zjs/db/source/opt/foo2lava-ColorMode.xml
-share/foo2zjs/db/source/opt/foo2lava-Duplex.xml
-share/foo2zjs/db/source/opt/foo2lava-ICM.xml
-share/foo2zjs/db/source/opt/foo2lava-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2lava-MediaType.xml
-share/foo2zjs/db/source/opt/foo2lava-PageSize.xml
-share/foo2zjs/db/source/opt/foo2lava-PrinterType.xml
-share/foo2zjs/db/source/opt/foo2lava-Quality.xml
-share/foo2zjs/db/source/opt/foo2lava-Resolution.xml
-share/foo2zjs/db/source/opt/foo2oak-BitsPerPlane.xml
-share/foo2zjs/db/source/opt/foo2oak-ColorMode.xml
-share/foo2zjs/db/source/opt/foo2oak-ICM.xml
-share/foo2zjs/db/source/opt/foo2oak-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2oak-MediaType.xml
-share/foo2zjs/db/source/opt/foo2qpdl-ColorMode.xml
-share/foo2zjs/db/source/opt/foo2qpdl-Duplex.xml
-share/foo2zjs/db/source/opt/foo2qpdl-ICM.xml
-share/foo2zjs/db/source/opt/foo2qpdl-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2qpdl-MediaType.xml
-share/foo2zjs/db/source/opt/foo2qpdl-PageSize.xml
-share/foo2zjs/db/source/opt/foo2qpdl-Quality.xml
-share/foo2zjs/db/source/opt/foo2qpdl-Resolution.xml
-share/foo2zjs/db/source/opt/foo2slx-ColorMode.xml
-share/foo2zjs/db/source/opt/foo2slx-ICM.xml
-share/foo2zjs/db/source/opt/foo2slx-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2slx-MediaType.xml
-share/foo2zjs/db/source/opt/foo2slx-PageSize.xml
-share/foo2zjs/db/source/opt/foo2slx-Resolution.xml
-share/foo2zjs/db/source/opt/foo2xqx-Duplex.xml
-share/foo2zjs/db/source/opt/foo2xqx-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2xqx-MediaType.xml
-share/foo2zjs/db/source/opt/foo2xqx-Quality.xml
-share/foo2zjs/db/source/opt/foo2xqx-Resolution.xml
-share/foo2zjs/db/source/opt/foo2zjs-ColorMode.xml
-share/foo2zjs/db/source/opt/foo2zjs-Copies.xml
-share/foo2zjs/db/source/opt/foo2zjs-Duplex.xml
-share/foo2zjs/db/source/opt/foo2zjs-ICM.xml
-share/foo2zjs/db/source/opt/foo2zjs-InputSlot.xml
-share/foo2zjs/db/source/opt/foo2zjs-Intent.xml
-share/foo2zjs/db/source/opt/foo2zjs-MediaType.xml
-share/foo2zjs/db/source/opt/foo2zjs-Nup.xml
-share/foo2zjs/db/source/opt/foo2zjs-NupOrient.xml
-share/foo2zjs/db/source/opt/foo2zjs-PageSize.xml
-share/foo2zjs/db/source/opt/foo2zjs-PrinterType.xml
-share/foo2zjs/db/source/opt/foo2zjs-Quality.xml
-share/foo2zjs/db/source/opt/foo2zjs-Resolution.xml
-share/foo2zjs/db/source/printer/
-share/foo2zjs/db/source/printer/Generic-OAKT_Printer.xml
-share/foo2zjs/db/source/printer/Generic-ZjStream_Printer.xml
-share/foo2zjs/db/source/printer/HP-Color_LaserJet_1500.xml
-share/foo2zjs/db/source/printer/HP-Color_LaserJet_1600.xml
-share/foo2zjs/db/source/printer/HP-Color_LaserJet_2600n.xml
-share/foo2zjs/db/source/printer/HP-LaserJet_1000.xml
-share/foo2zjs/db/source/printer/HP-LaserJet_1005.xml
-share/foo2zjs/db/source/printer/HP-LaserJet_1018.xml
-share/foo2zjs/db/source/printer/HP-LaserJet_1020.xml
-share/foo2zjs/db/source/printer/HP-LaserJet_1022.xml
-share/foo2zjs/db/source/printer/HP-LaserJet_M1005_MFP.xml
-share/foo2zjs/db/source/printer/KonicaMinolta-magicolor_2480_MF.xml
-share/foo2zjs/db/source/printer/KonicaMinolta-magicolor_2490_MF.xml
-share/foo2zjs/db/source/printer/KonicaMinolta-magicolor_2530_DL.xml
-share/foo2zjs/db/source/printer/Lexmark-C500.xml
-share/foo2zjs/db/source/printer/Minolta-Color_PageWorks_Pro_L.xml
-share/foo2zjs/db/source/printer/Minolta-magicolor_2200_DL.xml
-share/foo2zjs/db/source/printer/Minolta-magicolor_2300_DL.xml
-share/foo2zjs/db/source/printer/Minolta-magicolor_2430_DL.xml
-share/foo2zjs/db/source/printer/Samsung-CLP-300.xml
-share/foo2zjs/db/source/printer/Samsung-CLP-600.xml
-share/foo2zjs/db/source/printer/Samsung-CLX-2160.xml
-share/foo2zjs/db/source/printer/Samsung-CLX-3160.xml
-share/foo2zjs/db/source/printer/Xerox-Phaser-6110.xml
-share/foo2zjs/db/source/printer/Xerox-Phaser-6115MFP.xml
+share/foo2zjs/db/source/PPD/Samsung-CLX-3175.ppd.gz
+share/foo2zjs/db/source/PPD/Xerox-Phaser_6110.ppd.gz
+share/foo2zjs/db/source/PPD/Xerox-Phaser_6115MFP.ppd.gz
share/foo2zjs/firmware/
share/foo2zjs/gamma-lookup.ps
share/foo2zjs/gamma.ps
