On Sat, Nov 03, 2007 at 02:46:13PM -0400, Mike Erdely wrote:
> This won't build for me. Looking at the above from your diff, it seems
> you didn't 'cvs add' your new *oak* patches before creating your diff.
>
You are right, I forgot it.
Cheers
Giovanni
Index: Makefile
===================================================================
RCS file: /cvs/ports/print/foo2zjs/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 26 Sep 2007 06:26:19 -0000 1.1.1.1
+++ Makefile 3 Nov 2007 19:12:38 -0000
@@ -2,7 +2,7 @@
COMMENT= driver for ZjStream wire protocol compatible printers
-VERSION= 20070901
+VERSION= 20071102
DISTNAME= foo2zjs-${VERSION}
CATEGORIES= print
@@ -16,7 +16,7 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m
+WANTLIB= c
MASTER_SITES= http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
Index: distinfo
===================================================================
RCS file: /cvs/ports/print/foo2zjs/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 26 Sep 2007 06:26:19 -0000 1.1.1.1
+++ distinfo 3 Nov 2007 19:12:38 -0000
@@ -1,5 +1,5 @@
-MD5 (foo2zjs-20070901.tar.gz) = tLIQeYjKNf8BAu4JLGfcgQ==
-RMD160 (foo2zjs-20070901.tar.gz) = gSiXJ/e29YUvjCL7NCkf1mIUV3w=
-SHA1 (foo2zjs-20070901.tar.gz) = A3Ndn6Z6LDchXpIr9k041CClRLY=
-SHA256 (foo2zjs-20070901.tar.gz) = GcloKyridkUU07Vwuj2fJpbR6C1xbi5Tfc52hcZBzHQ=
-SIZE (foo2zjs-20070901.tar.gz) = 1457733
+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
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/print/foo2zjs/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 26 Sep 2007 06:26:19 -0000 1.1.1.1
+++ patches/patch-Makefile 3 Nov 2007 19:12:38 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2007/09/26 06:26:19 ajacoutot Exp $
---- Makefile.orig Wed Jul 18 20:34:22 2007
-+++ Makefile Tue Sep 25 17:10:02 2007
+--- 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)
# No version number yet...
VERSION=0.0
@@ -12,10 +12,10 @@
# Pathnames for this package...
BIN=$(PREFIX)/bin
SHAREZJS=$(PREFIX)/share/foo2zjs
-@@ -18,11 +14,11 @@ SHAREHP=$(PREFIX)/share/foo2hp
- SHAREXQX=$(PREFIX)/share/foo2xqx
+@@ -19,11 +15,11 @@ SHAREXQX=$(PREFIX)/share/foo2xqx
SHARELAVA=$(PREFIX)/share/foo2lava
SHAREQPDL=$(PREFIX)/share/foo2qpdl
+ SHARESLX=$(PREFIX)/share/foo2slx
-MANDIR=$(PREFIX)/share/man
+MANDIR=$(PREFIX)/man
DOCDIR=$(PREFIX)/share/doc/foo2zjs/
@@ -26,7 +26,7 @@
# User ID's
LPuid=-olp
-@@ -35,6 +31,10 @@ ifeq ($(UNAME),FreeBSD)
+@@ -40,6 +36,10 @@ ifeq ($(UNAME),OpenBSD)
LPuid=-oroot
LPgid=-gwheel
endif
@@ -37,8 +37,8 @@
# If we aren't root, don't try to set ownership
ifneq ($(EUID),0)
LPuid=
-@@ -46,6 +46,9 @@ MODTIME= date -d "1/1/1970 utc + `stat -t $$1 | cut -f
- ifeq ($(UNAME),FreeBSD)
+@@ -54,6 +54,9 @@ endif
+ ifeq ($(UNAME),OpenBSD)
MODTIME= stat -f "%Sm" -t "%a %b %d %T %Y" $$1
endif
+ifeq ($(UNAME),OpenBSD)
@@ -47,7 +47,7 @@
ifeq ($(UNAME),Darwin)
MODTIME= stat -f "%Sm" -t "%a %b %d %T %Y" $$1
endif
-@@ -196,7 +199,6 @@ ifeq ($(UNAME),Linux)
+@@ -210,7 +213,6 @@ ifeq ($(UNAME),Linux)
endif
# Compiler flags
@@ -55,7 +55,7 @@
#CFLAGS += -g
#
-@@ -388,7 +390,7 @@ opldecode: opldecode.o $(LIBJBG)
+@@ -444,7 +446,7 @@ slxdecode: slxdecode.o $(LIBJBG)
#
# Installation rules
#
@@ -64,7 +64,7 @@
install-crd install-foo install-ppd install-man install-doc
#
# If you use CUPS, then restart the spooler:
-@@ -434,10 +436,6 @@ install-prog:
+@@ -493,10 +495,6 @@ install-prog:
install -d $(SHAREZJS)/
install -c -m 644 gamma.ps $(SHAREZJS)/
install -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@@ -75,7 +75,7 @@
install-foo:
#
-@@ -450,6 +448,7 @@ install-foo:
+@@ -509,6 +507,7 @@ install-foo:
#
# Install current database files
#
@@ -83,7 +83,7 @@
@if [ -d $(FOODB) ]; then \
for dir in driver printer opt; do \
echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
-@@ -476,40 +475,6 @@ install-foo:
+@@ -535,40 +534,6 @@ install-foo:
foomatic-combo-xml -O >overview.xml; \
fi
@@ -124,24 +124,24 @@
install-extra:
#
# Install extra files (ICM and firmware), if any exist here.
-@@ -558,33 +523,33 @@ install-extra:
+@@ -629,34 +594,33 @@ install-extra:
fi; \
done
+install-icc2ps:
-+ #
-+ # Install ICM to Postscript file conversion utility
-+ #
-+ cd icc2ps; $(MAKE) PREFIX=$(PREFIX) install
++ #
++ # Install ICM to Postscript file conversion utility
++ #
++ cd icc2ps; $(MAKE) PREFIX=$(PREFIX) install
+
+install-crd:
-+ #
-+ # Install prebuilt CRD files (from m2300w project)
-+ #
++ #
++ # 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/; \
++ install -c -m 644 $$i $(SHAREZJS)/crd/; \
+ done
+
MODEL=/usr/share/cups/model
@@ -158,6 +158,7 @@
- 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; \
- [ -d $(PPD)/foo2zjs ] || mkdir $(PPD)/foo2zjs; \
+ mkdir -p $(LOCALMODEL)
+ if [ -d $(LOCALMODEL) ]; then \
@@ -177,7 +178,7 @@
gzip < $$ppd > $(LOCALMODEL)/$$ppd.gz; \
done; \
fi
-@@ -944,11 +909,8 @@ install-doc: doc
+@@ -1027,11 +991,8 @@ install-doc: doc
#
install -d -m 755 $(DOCDIR)
install -c -m 644 manual.pdf $(DOCDIR)
Index: patches/patch-foo2oak_c
===================================================================
RCS file: patches/patch-foo2oak_c
diff -N patches/patch-foo2oak_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-foo2oak_c 3 Nov 2007 19:12:38 -0000
@@ -0,0 +1,75 @@
+$OpenBSD$
+--- 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-oakdecode_c
===================================================================
RCS file: patches/patch-oakdecode_c
diff -N patches/patch-oakdecode_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-oakdecode_c 3 Nov 2007 19:12:38 -0000
@@ -0,0 +1,49 @@
+$OpenBSD$
+--- 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.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 26 Sep 2007 06:26:19 -0000 1.1.1.1
+++ pkg/PLIST 3 Nov 2007 19:12:39 -0000
@@ -4,17 +4,22 @@
bin/foo2hp2600-wrapper
bin/foo2lava
bin/foo2lava-wrapper
+bin/foo2oak
bin/foo2oak-wrapper
bin/foo2qpdl
bin/foo2qpdl-wrapper
+bin/foo2slx
+bin/foo2slx-wrapper
bin/foo2xqx
bin/foo2xqx-wrapper
bin/foo2zjs
-bin/foo2zjs-icc2ps
+bin/foo2zjs-pstops
bin/foo2zjs-wrapper
bin/lavadecode
+bin/oakdecode
bin/opldecode
bin/qpdldecode
+bin/slxdecode
bin/xqxdecode
bin/zjsdecode
@man man/man1/foo2hp.1
@@ -25,6 +30,8 @@
@man man/man1/foo2oak.1
@man man/man1/foo2qpdl-wrapper.1
@man man/man1/foo2qpdl.1
[EMAIL PROTECTED] man/man1/foo2slx-wrapper.1
[EMAIL PROTECTED] man/man1/foo2slx.1
@man man/man1/foo2xqx-wrapper.1
@man man/man1/foo2xqx.1
@man man/man1/foo2zjs-wrapper.1
@@ -33,6 +40,7 @@
@man man/man1/oakdecode.1
@man man/man1/opldecode.1
@man man/man1/qpdldecode.1
[EMAIL PROTECTED] man/man1/slxdecode.1
@man man/man1/xqxdecode.1
@man man/man1/zjsdecode.1
share/doc/foo2zjs/
@@ -69,6 +77,7 @@
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/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
@@ -84,6 +93,7 @@
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/
@@ -116,6 +126,12 @@
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
@@ -149,6 +165,7 @@
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
