From 8c73697fc41fcd1ebedfde097c06cd969193b447 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sat, 9 Jul 2011 00:36:10 +0000 Subject: [PATCH] Update to foo2zjs-20110609. --- print/foo2zjs/Makefile | 6 +-- print/foo2zjs/distinfo | 10 ++--- print/foo2zjs/patches/patch-Makefile | 42 ++++++++++--------- .../patches/patch-foo2hp2600-wrapper_in | 18 -------- print/foo2zjs/patches/patch-getweb_in | 22 +++++----- print/foo2zjs/pkg/PLIST-main | 16 +++---- 6 files changed, 49 insertions(+), 65 deletions(-) delete mode 100644 print/foo2zjs/patches/patch-foo2hp2600-wrapper_in diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile index 99cbed9505d..74aa7151921 100644 --- a/print/foo2zjs/Makefile +++ b/print/foo2zjs/Makefile @@ -1,16 +1,14 @@ -# $OpenBSD: Makefile,v 1.28 2011/06/02 13:41:40 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.29 2011/07/09 00:36:10 ajacoutot Exp $ COMMENT-main= driver for ZjStream wire protocol compatible printers COMMENT-cups= Konica-Minolta foo2zjs command filter for CUPS -VERSION= 20101222 +VERSION= 20110609 DISTNAME= foo2zjs-${VERSION} PKGNAME-main= ${DISTNAME} PKGNAME-cups= foo2zjs-cup-${VERSION} -REVISION-main= 3 - CATEGORIES= print HOMEPAGE= http://foo2zjs.rkkda.com/ diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo index 6f6e1aea727..0b090e276eb 100644 --- a/print/foo2zjs/distinfo +++ b/print/foo2zjs/distinfo @@ -1,5 +1,5 @@ -MD5 (foo2zjs-20101222.tar.gz) = lQFCEb1tlstVLX67n35FWg== -RMD160 (foo2zjs-20101222.tar.gz) = GQo398YNtVmeuYAeUbU59CS6ylU= -SHA1 (foo2zjs-20101222.tar.gz) = 9YGBVpR7LSG1MO1ZPzarnuMFJEQ= -SHA256 (foo2zjs-20101222.tar.gz) = clugKXsTSDsqKWNTzfNy/0x6mR+vfcG4n7M/3wMsEWA= -SIZE (foo2zjs-20101222.tar.gz) = 1624431 +MD5 (foo2zjs-20110609.tar.gz) = ZwssHgs6McA2SDqoXfTauA== +RMD160 (foo2zjs-20110609.tar.gz) = fqEkHv+PB7+HTSecqrNwMOWqE/Q= +SHA1 (foo2zjs-20110609.tar.gz) = fBr1YbNuvH1EXREdyrD6tKWnIdM= +SHA256 (foo2zjs-20110609.tar.gz) = p6AK98fNS17d1u0mmyKM1qdI7cbsMiBChux9xZUlMIs= +SIZE (foo2zjs-20110609.tar.gz) = 1639108 diff --git a/print/foo2zjs/patches/patch-Makefile b/print/foo2zjs/patches/patch-Makefile index 600a70b2d33..291afda2485 100644 --- a/print/foo2zjs/patches/patch-Makefile +++ b/print/foo2zjs/patches/patch-Makefile @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ ---- Makefile.orig Tue Dec 14 01:55:09 2010 -+++ Makefile Sun Jan 2 08:34:43 2011 +$OpenBSD: patch-Makefile,v 1.13 2011/07/09 00:36:11 ajacoutot Exp $ +--- Makefile.orig Thu Jun 9 16:07:08 2011 ++++ Makefile Sat Jul 9 02:27:50 2011 @@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n) # No version number yet... VERSION=0.0 @@ -29,7 +29,7 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ # User ID's LPuid=-oroot -@@ -236,7 +231,7 @@ FILES = \ +@@ -241,7 +236,7 @@ FILES = \ # sihp1000.img sihp1005.img sihp1020.img sihp1018.img # sihpP1005.img sihpP1006.img sihpP1505.img @@ -38,16 +38,17 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ # Programs and libraries PROGS= foo2zjs zjsdecode arm2hpdl foo2hp foo2xqx xqxdecode -@@ -274,7 +269,6 @@ ifeq ($(UNAME),Linux) - endif +@@ -282,7 +277,7 @@ endif # Compiler flags --CFLAGS += -O2 -Wall + #CFLAGS += -O2 -Wall -Wno-unused-but-set-variable +-CFLAGS += -O2 -Wall ++#CFLAGS += -O2 -Wall #CFLAGS += -g # -@@ -531,7 +525,7 @@ gipddecode: gipddecode.o $(LIBJBG) - $(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@ +@@ -548,7 +543,7 @@ zjsdecode: zjsdecode.o $(LIBJBG) + $(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@ command2foo2lava-pjl: command2foo2lava-pjl.o - $(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@ @@ -55,18 +56,18 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ command2foo2lava-pjl.o: command2foo2lava-pjl.c $(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c -@@ -539,9 +533,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c +@@ -556,9 +551,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c # # Installation rules # --install: all install-test install-prog install-icc2ps install-extra \ -+install: all install-prog install-icc2ps install-extra \ - install-crd install-foo install-ppd \ +-install: all install-test install-prog install-icc2ps install-osx-hotplug \ ++install: all install-prog install-icc2ps install-osx-hotplug \ + install-extra install-crd install-foo install-ppd \ - install-gui install-desktop install-filter \ install-man install-doc # # If you use CUPS, then restart the spooler: -@@ -598,11 +591,6 @@ install-prog: +@@ -615,11 +609,6 @@ install-prog: $(INSTALL) -d $(SHAREZJS)/ $(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/ $(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/ @@ -78,7 +79,7 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ install-foo: # -@@ -620,24 +608,14 @@ install-foo: +@@ -637,24 +626,14 @@ install-foo: # # Install current database files # @@ -105,7 +106,7 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ # # Clear foomatic cache and rebuild database if needed # -@@ -758,47 +736,16 @@ install-extra: +@@ -783,50 +762,16 @@ install-extra: fi; \ done @@ -127,6 +128,7 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ - manuf=`echo "$$ppd" | sed 's/-.*//'`; \ - $(INSTALL) $(LPgid) -d $(VARPPD)/user/$$manuf; \ - modify-ppd <$$ppd | gzip > $(VARPPD)/user/$$manuf/$$ppd.gz; \ +- chmod 664 $(VARPPD)/user/$$manuf/$$ppd.gz; \ - done; \ - ppdmgr -u; \ - elif [ -d $(PPD) ]; then \ @@ -141,6 +143,7 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ - cd PPD; \ - for ppd in *.ppd; do \ - modify-ppd <$$ppd | gzip > $(PPD)/foo2zjs/$$ppd.gz; \ +- chmod 664 $(PPD)/foo2zjs/$$ppd.gz; \ - done; \ - fi - # @@ -150,14 +153,15 @@ $OpenBSD: patch-Makefile,v 1.12 2011/01/02 07:38:52 ajacoutot Exp $ - cd PPD; \ - for ppd in *.ppd; do \ - modify-ppd <$$ppd | gzip > $(MODEL)/$$ppd.gz; \ +- chmod 664 $(MODEL)/$$ppd.gz; \ - done; \ - elif [ -d $(LOCALMODEL) ]; then \ -+ mkdir -p $(LOCALMODEL) -+ if [ -d $(LOCALMODEL) ]; then \ ++ mkdir -p $(LOCALMODEL) ++ if [ -d $(LOCALMODEL) ]; then \ rm -f $(LOCALMODEL)/KonicaMinolta*; \ cd PPD; \ for ppd in *.ppd; do \ -@@ -1337,11 +1284,8 @@ install-doc: doc +@@ -1389,11 +1334,8 @@ install-doc: doc # $(INSTALL) -d -m 755 $(DOCDIR) $(INSTALL) -c -m 644 manual.pdf $(DOCDIR) diff --git a/print/foo2zjs/patches/patch-foo2hp2600-wrapper_in b/print/foo2zjs/patches/patch-foo2hp2600-wrapper_in deleted file mode 100644 index d984943f669..00000000000 --- a/print/foo2zjs/patches/patch-foo2hp2600-wrapper_in +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-foo2hp2600-wrapper_in,v 1.1 2010/07/31 05:20:07 ajacoutot Exp $ ---- foo2hp2600-wrapper.in.orig Fri Jul 30 18:53:10 2010 -+++ foo2hp2600-wrapper.in Fri Jul 30 18:54:10 2010 -@@ -274,10 +274,10 @@ do - G) GAMMAFILE="$OPTARG";; - I) INTENT="$OPTARG";; - O) case "$OPTARG" in -- c=*|C=*) OFF_C=`expr substr $OPTARG 3 99`;; -- m=*|M=*) OFF_M=`expr substr $OPTARG 3 99`;; -- y=*|Y=*) OFF_Y=`expr substr $OPTARG 3 99`;; -- k=*|K=*) OFF_K=`expr substr $OPTARG 3 99`;; -+ c=*|C=*) OFF_C="${OPTARG#c=}";; -+ m=*|M=*) OFF_M="${OPTARG#m=}";; -+ y=*|Y=*) OFF_Y="${OPTARG#y=}";; -+ k=*|K=*) OFF_K="${OPTARG#k=}";; - *) error "Not [cmyk]=NUM!";; - esac - ;; diff --git a/print/foo2zjs/patches/patch-getweb_in b/print/foo2zjs/patches/patch-getweb_in index 6d0be70784e..d8c8edac219 100644 --- a/print/foo2zjs/patches/patch-getweb_in +++ b/print/foo2zjs/patches/patch-getweb_in @@ -1,16 +1,16 @@ -$OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $ ---- getweb.in.orig Tue Dec 14 01:57:50 2010 -+++ getweb.in Sun Jan 2 08:34:43 2011 +$OpenBSD: patch-getweb_in,v 1.7 2011/07/09 00:36:11 ajacoutot Exp $ +--- getweb.in.orig Tue May 17 11:44:16 2011 ++++ getweb.in Sat Jul 9 02:22:01 2011 @@ -11,7 +11,7 @@ - VERSION='$Id: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $' + VERSION='$Id: patch-getweb_in,v 1.7 2011/07/09 00:36:11 ajacoutot Exp $' -WGETOPTS="--passive-ftp -q" +WGETOPTS="-V" usage() { cat <