Update to foo2zjs-20101208.

* new printer: HP LaserJet Pro CP1025nw (alpha quality)
This commit is contained in:
ajacoutot 2010-12-09 07:04:48 +00:00
parent a08a210f0b
commit 3297824871
6 changed files with 40 additions and 32 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2010/11/20 09:48:39 espie Exp $
# $OpenBSD: Makefile,v 1.22 2010/12/09 07:04:48 ajacoutot Exp $
COMMENT-main= driver for ZjStream wire protocol compatible printers
COMMENT-cups= Konica-Minolta foo2zjs command filter for CUPS
VERSION= 20101112
VERSION= 20101208
DISTNAME= foo2zjs-${VERSION}
PKGNAME-main= ${DISTNAME}

View File

@ -1,5 +1,5 @@
MD5 (foo2zjs-20101112.tar.gz) = g/t36TfpQB7ec4dcYx8Rjg==
RMD160 (foo2zjs-20101112.tar.gz) = 9d0GV59ypFldUfMLipi+6d79Sro=
SHA1 (foo2zjs-20101112.tar.gz) = EwRXiD2hKVbPCP+RzLS8l6qsdNE=
SHA256 (foo2zjs-20101112.tar.gz) = egupaSpSwPJps3Zm4sNXi8Un2nPq/jtK8SL086Y/Te4=
SIZE (foo2zjs-20101112.tar.gz) = 1618863
MD5 (foo2zjs-20101208.tar.gz) = oKRaGW0erOVluhVI4rodbQ==
RMD160 (foo2zjs-20101208.tar.gz) = 9oWRrce8GSTXKvgxHjbZqobDTBU=
SHA1 (foo2zjs-20101208.tar.gz) = yhNQHWQnphoRmbDxFbYDDQgCbeY=
SHA256 (foo2zjs-20101208.tar.gz) = hyqjDAzmyGCkEmc5oIz/2+lTU4xfEIs6ofKUAdaWVNg=
SIZE (foo2zjs-20101208.tar.gz) = 1621005

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
--- Makefile.orig Fri Nov 12 13:05:04 2010
+++ Makefile Fri Nov 12 17:01:51 2010
$OpenBSD: patch-Makefile,v 1.11 2010/12/09 07:04:48 ajacoutot Exp $
--- Makefile.orig Wed Dec 8 21:42:15 2010
+++ Makefile Thu Dec 9 07:59:45 2010
@@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n)
# No version number yet...
VERSION=0.0
@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
#CFLAGS += -g
#
@@ -522,7 +516,7 @@ gipddecode: gipddecode.o $(LIBJBG)
@@ -531,7 +525,7 @@ gipddecode: gipddecode.o $(LIBJBG)
$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
command2foo2lava-pjl: command2foo2lava-pjl.o
@ -55,7 +55,7 @@ $OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
command2foo2lava-pjl.o: command2foo2lava-pjl.c
$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
@@ -530,9 +524,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
@@ -539,9 +533,8 @@ command2foo2lava-pjl.o: command2foo2lava-pjl.c
#
# Installation rules
#
@ -66,7 +66,7 @@ $OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
install-man install-doc
#
# If you use CUPS, then restart the spooler:
@@ -589,11 +582,6 @@ install-prog:
@@ -598,11 +591,6 @@ install-prog:
$(INSTALL) -d $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@ -78,7 +78,7 @@ $OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
install-foo:
#
@@ -611,24 +599,14 @@ install-foo:
@@ -620,24 +608,14 @@ install-foo:
#
# Install current database files
#
@ -105,7 +105,7 @@ $OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
#
# Clear foomatic cache and rebuild database if needed
#
@@ -749,47 +727,16 @@ install-extra:
@@ -758,47 +736,16 @@ install-extra:
fi; \
done
@ -157,7 +157,7 @@ $OpenBSD: patch-Makefile,v 1.10 2010/11/12 16:06:33 ajacoutot Exp $
rm -f $(LOCALMODEL)/KonicaMinolta*; \
cd PPD; \
for ppd in *.ppd; do \
@@ -1314,11 +1261,8 @@ install-doc: doc
@@ -1324,11 +1271,8 @@ install-doc: doc
#
$(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-getweb_in,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $
--- getweb.in.orig Fri Nov 12 14:42:25 2010
+++ getweb.in Fri Nov 12 17:01:51 2010
$OpenBSD: patch-getweb_in,v 1.5 2010/12/09 07:04:48 ajacoutot Exp $
--- getweb.in.orig Wed Dec 8 22:20:53 2010
+++ getweb.in Thu Dec 9 07:59:45 2010
@@ -11,7 +11,7 @@
VERSION='$Id: patch-getweb_in,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $'
VERSION='$Id: patch-getweb_in,v 1.5 2010/12/09 07:04:48 ajacoutot Exp $'
-WGETOPTS="--passive-ftp -q"
+WGETOPTS="-V"
usage() {
cat <<EOF
@@ -98,11 +98,11 @@ error() {
@@ -99,11 +99,11 @@ error() {
}
SYSTEM=`uname -s`
@ -24,7 +24,7 @@ $OpenBSD: patch-getweb_in,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $
shift
curl -o $*
}
@@ -116,7 +116,7 @@ getexe() {
@@ -117,7 +117,7 @@ getexe() {
exefile="$2"
shift; shift
@ -33,7 +33,7 @@ $OpenBSD: patch-getweb_in,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $
error "Couldn't download $url/$exefile"
unzip -oj $exefile "$@"
rm $exefile
@@ -130,7 +130,7 @@ gettgz() {
@@ -131,7 +131,7 @@ gettgz() {
file="$2"
what="$3"
@ -42,7 +42,7 @@ $OpenBSD: patch-getweb_in,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $
error "Couldn't download $url/$file"
gunzip <$file | tar xvf - $what
rm $file
@@ -229,7 +229,7 @@ getone() {
@@ -230,7 +230,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.4 2010/11/12 16:06:33 ajacoutot Exp $
echo "*** Now use a windows box to unzip and install $FILE ***"
;;
cpwl|pageworks)
@@ -245,7 +245,7 @@ getone() {
@@ -246,7 +246,7 @@ getone() {
do
base=`basename $i .IC_`
mv $base.IC_ $base.ic_
@ -60,7 +60,7 @@ $OpenBSD: patch-getweb_in,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $
rm -f $base.ic_
done
fi
@@ -364,7 +364,7 @@ getone() {
@@ -371,7 +371,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.4 2010/11/12 16:06:33 ajacoutot Exp $
error "Couldn't dowload $URL"
done
;;
@@ -401,7 +401,7 @@ getone() {
@@ -408,7 +408,7 @@ getone() {
update)
url=${URLZJS}
file=foo2zjs.tar.gz

View File

@ -1,12 +1,15 @@
$OpenBSD: patch-icc2ps_Makefile,v 1.3 2010/07/31 10:31:58 ajacoutot Exp $
--- icc2ps/Makefile.orig Wed Jul 28 14:13:19 2010
+++ icc2ps/Makefile Sat Jul 31 11:09:12 2010
@@ -1,12 +1,10 @@
$OpenBSD: patch-icc2ps_Makefile,v 1.4 2010/12/09 07:04:48 ajacoutot Exp $
--- icc2ps/Makefile.orig Sat Nov 27 11:04:56 2010
+++ icc2ps/Makefile Thu Dec 9 08:01:15 2010
@@ -1,15 +1,12 @@
UNAME := $(shell uname)
-PREFIX= /usr
-PREFIX= $(DESTDIR)/usr
BIN= $(PREFIX)/bin
-MANDIR=$(PREFIX)/share/man
+MANDIR=$(PREFIX)/man
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 \

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.4 2010/11/12 16:06:33 ajacoutot Exp $
@comment $OpenBSD: PLIST-main,v 1.5 2010/12/09 07:04:48 ajacoutot Exp $
@conflict foomatic-db-<4.0.20091207p1
@bin bin/arm2hpdl
@bin bin/foo2hiperc
@ -134,6 +134,7 @@ share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P2014.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P2014n.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P2035.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P2035n.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_Pro_CP1025nw.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_Pro_P1102.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_Pro_P1102w.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_Pro_P1566.ppd.gz
@ -188,6 +189,7 @@ share/foomatic/db/source/driver/foo2slx.xml
share/foomatic/db/source/driver/foo2xqx.xml
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
@ -260,6 +262,8 @@ share/foomatic/db/source/opt/foo2zjs-z1-PageSize.xml
share/foomatic/db/source/opt/foo2zjs-z12-Density.xml
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
@ -285,6 +289,7 @@ share/foomatic/db/source/printer/HP-LaserJet_P2014.xml
share/foomatic/db/source/printer/HP-LaserJet_P2014n.xml
share/foomatic/db/source/printer/HP-LaserJet_P2035.xml
share/foomatic/db/source/printer/HP-LaserJet_P2035n.xml
share/foomatic/db/source/printer/HP-LaserJet_Pro_CP1025nw.xml
share/foomatic/db/source/printer/HP-LaserJet_Pro_P1102.xml
share/foomatic/db/source/printer/HP-LaserJet_Pro_P1102w.xml
share/foomatic/db/source/printer/HP-LaserJet_Pro_P1566.xml