cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to foo2zjs-20110609.

Browse Source
This commit is contained in:
ajacoutot 2011-07-09 00:36:10 +00:00
parent 1c42db55a3
commit 8c73697fc4
6 changed files with 49 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
print/foo2zjs/Makefile
View File

@ -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/

10
print/foo2zjs/distinfo
View File

@ -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

42
print/foo2zjs/patches/patch-Makefile
View File

@ -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)

18
print/foo2zjs/patches/patch-foo2hp2600-wrapper_in
View File

@ -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
;;

22
print/foo2zjs/patches/patch-getweb_in
View File

@ -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 <<EOF
@@ -99,11 +99,11 @@ error() {
@@ -101,11 +101,11 @@ error() {
}
SYSTEM=`uname -s`
@ -24,7 +24,7 @@ $OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $
shift
curl -o $*
}
@@ -117,7 +117,7 @@ getexe() {
@@ -119,7 +119,7 @@ getexe() {
exefile="$2"
shift; shift
@ -33,7 +33,7 @@ $OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $
error "Couldn't download $url/$exefile"
unzip -oj $exefile "$@"
rm $exefile
@@ -131,7 +131,7 @@ gettgz() {
@@ -133,7 +133,7 @@ gettgz() {
file="$2"
what="$3"
@ -42,7 +42,7 @@ $OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $
error "Couldn't download $url/$file"
gunzip <$file | tar xvf - $what
rm $file
@@ -230,7 +230,7 @@ getone() {
@@ -236,7 +236,7 @@ getone() {
BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
FILE="MC2300DL_v255.zip"
URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
@ -51,7 +51,7 @@ $OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $
echo "*** Now use a windows box to unzip and install $FILE ***"
;;
cpwl|pageworks)
@@ -246,7 +246,7 @@ getone() {
@@ -252,7 +252,7 @@ getone() {
do
base=`basename $i .IC_`
mv $base.IC_ $base.ic_
@ -60,7 +60,7 @@ $OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $
rm -f $base.ic_
done
fi
@@ -371,7 +371,7 @@ getone() {
@@ -383,7 +383,7 @@ getone() {
URL="$URL?driver=$driver&printer=$printer"
URL="$URL&.submit=Generate+PPD+file"
URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
@ -69,7 +69,7 @@ $OpenBSD: patch-getweb_in,v 1.6 2011/01/02 07:38:52 ajacoutot Exp $
error "Couldn't dowload $URL"
done
;;
@@ -408,7 +408,7 @@ getone() {
@@ -420,7 +420,7 @@ getone() {
update)
url=${URLZJS}
file=foo2zjs.tar.gz

16
print/foo2zjs/pkg/PLIST-main
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.7 2011/05/11 07:45:53 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.8 2011/07/09 00:36:11 ajacoutot Exp $
@conflict foomatic-db-<4.0.20091207p1
@unexec-delete rm -f %D/share/foo2hiperc/icm/*
@unexec-delete rm -f %D/share/foo2hp/icm/*
@ -29,6 +29,7 @@ bin/foo2xqx-wrapper
bin/foo2zjs-pstops
bin/foo2zjs-wrapper
@bin bin/gipddecode
@bin bin/hbpldecode
@bin bin/hipercdecode
@bin bin/lavadecode
@bin bin/oakdecode
@ -58,6 +59,7 @@ bin/printer-profile
@man man/man1/foo2zjs-wrapper.1
@man man/man1/foo2zjs.1
@man man/man1/gipddecode.1
@man man/man1/hbpldecode.1
@man man/man1/hipercdecode.1
@man man/man1/lavadecode.1
@man man/man1/oakdecode.1
@ -114,10 +116,6 @@ share/foo2zjs/firmware/
share/foo2zjs/gamma-lookup.ps
share/foo2zjs/gamma.ps
share/foo2zjs/icm/
share/foomatic/
share/foomatic/db/
share/foomatic/db/source/
share/foomatic/db/source/PPD/
share/foomatic/db/source/PPD/foo2zjs/
share/foomatic/db/source/PPD/foo2zjs/Generic-OAKT_Printer.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Generic-ZjStream_Printer.ppd.gz
@ -166,6 +164,7 @@ share/foomatic/db/source/PPD/foo2zjs/Minolta-magicolor_2300_DL.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Minolta-magicolor_2430_DL.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C110.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3100.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C310dn.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3200.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3300.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Oki-C3400.ppd.gz
@ -180,6 +179,7 @@ share/foomatic/db/source/PPD/foo2zjs/Olivetti-d-Color_P160W.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-300.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-310.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-315.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-325.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-600.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-610.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLP-620.ppd.gz
@ -189,7 +189,6 @@ share/foomatic/db/source/PPD/foo2zjs/Samsung-CLX-3175.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Xerox-Phaser_6110.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Xerox-Phaser_6115MFP.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Xerox-Phaser_6121MFP.ppd.gz
share/foomatic/db/source/driver/
share/foomatic/db/source/driver/foo2hiperc.xml
share/foomatic/db/source/driver/foo2hp.xml
share/foomatic/db/source/driver/foo2lava.xml
@ -202,7 +201,6 @@ share/foomatic/db/source/driver/foo2zjs-z1.xml
share/foomatic/db/source/driver/foo2zjs-z2.xml
share/foomatic/db/source/driver/foo2zjs-z3.xml
share/foomatic/db/source/driver/foo2zjs.xml
share/foomatic/db/source/opt/
share/foomatic/db/source/opt/foo2hiperc-ColorMode.xml
share/foomatic/db/source/opt/foo2hiperc-Compression.xml
share/foomatic/db/source/opt/foo2hiperc-Duplex.xml
@ -256,6 +254,7 @@ share/foomatic/db/source/opt/foo2xqx-InputSlot.xml
share/foomatic/db/source/opt/foo2xqx-MediaType.xml
share/foomatic/db/source/opt/foo2xqx-Resolution.xml
share/foomatic/db/source/opt/foo2xxx-Copies.xml
share/foomatic/db/source/opt/foo2xxx-Halftone.xml
share/foomatic/db/source/opt/foo2xxx-Nup.xml
share/foomatic/db/source/opt/foo2xxx-NupOrient.xml
share/foomatic/db/source/opt/foo2xxx-Quality.xml
@ -275,7 +274,6 @@ share/foomatic/db/source/opt/foo2zjs-z2-MediaType.xml
share/foomatic/db/source/opt/foo2zjs-z2-PageSize.xml
share/foomatic/db/source/opt/foo2zjs-z3-MediaType.xml
share/foomatic/db/source/opt/foo2zjs-z3-PageSize.xml
share/foomatic/db/source/printer/
share/foomatic/db/source/printer/Generic-OAKT_Printer.xml
share/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
share/foomatic/db/source/printer/HP-Color_LaserJet_1500.xml
@ -323,6 +321,7 @@ share/foomatic/db/source/printer/Minolta-magicolor_2300_DL.xml
share/foomatic/db/source/printer/Minolta-magicolor_2430_DL.xml
share/foomatic/db/source/printer/Oki-C110.xml
share/foomatic/db/source/printer/Oki-C3100.xml
share/foomatic/db/source/printer/Oki-C310dn.xml
share/foomatic/db/source/printer/Oki-C3200.xml
share/foomatic/db/source/printer/Oki-C3300.xml
share/foomatic/db/source/printer/Oki-C3400.xml
@ -337,6 +336,7 @@ share/foomatic/db/source/printer/Olivetti-d-Color_P160W.xml
share/foomatic/db/source/printer/Samsung-CLP-300.xml
share/foomatic/db/source/printer/Samsung-CLP-310.xml
share/foomatic/db/source/printer/Samsung-CLP-315.xml
share/foomatic/db/source/printer/Samsung-CLP-325.xml
share/foomatic/db/source/printer/Samsung-CLP-600.xml
share/foomatic/db/source/printer/Samsung-CLP-610.xml
share/foomatic/db/source/printer/Samsung-CLP-620.xml