Update to foo2zjs-20100329, needed for upcoming CUPS update.

Install icm and firmware directories.
Add a MESSAGE about getting ICM profiles from the net using 'getweb'.
This commit is contained in:
ajacoutot 2010-03-31 16:01:45 +00:00
parent 939a18fbbc
commit ae8ce23957
6 changed files with 146 additions and 51 deletions

View File

@ -1,15 +1,15 @@
# $OpenBSD: Makefile,v 1.9 2010/03/21 10:14:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.10 2010/03/31 16:01:45 ajacoutot Exp $
COMMENT= driver for ZjStream wire protocol compatible printers
COMMENT= driver for ZjStream wire protocol compatible printers
VERSION= 20090623
DISTNAME= foo2zjs-${VERSION}
PKGNAME= ${DISTNAME}p2
CATEGORIES= print
VERSION= 20100329
DISTNAME= foo2zjs-${VERSION}
HOMEPAGE= http://foo2hp.rkkda.com/
CATEGORIES= print
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
HOMEPAGE= http://foo2hp.rkkda.com/
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@ -17,28 +17,24 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m
WANTLIB= c m
MASTER_SITES= http://bigio.snb.it/openbsd/distfiles/ \
http://openbsd.dead-parrot.de/distfiles/ \
http://spacehopper.org/mirrors/ \
http://meta-planets.net/~openbsd/ \
http://www.phxbsd.com/OpenBSD/distfiles/
MASTER_SITES= http://www.bsdfrog.org/OpenBSD/distfiles/
USE_GMAKE= Yes
WRKDIST= ${WRKDIR}/foo2zjs
USE_GMAKE= Yes
WRKDIST= ${WRKDIR}/foo2zjs
BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
RUN_DEPENDS= ::print/foomatic-filters
BUILD_DEPENDS= ::print/ghostscript/gnu # ps2pdf
RUN_DEPENDS= ::print/foomatic-filters
NO_REGRESS= Yes
NO_REGRESS= Yes
pre-configure:
@perl -pi -e 's,/usr/bin,${PREFIX}/bin,g' \
${WRKSRC}/*.1in
${SUBST_CMD} ${WRKSRC}/getweb.in
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/foo2zjs/{firmware,icm}
${INSTALL_SCRIPT} ${WRKSRC}/{getweb,msexpand} \
${PREFIX}/share/doc/foo2zjs

View File

@ -1,5 +1,5 @@
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
MD5 (foo2zjs-20100329.tar.gz) = Go7EQbrVdK6xwzTrsH/A3A==
RMD160 (foo2zjs-20100329.tar.gz) = AFKKXsIIGEJ3ix4l86T0YyJt1NE=
SHA1 (foo2zjs-20100329.tar.gz) = 3Yee+DjtGoluQMHdG9iqo4cX3fw=
SHA256 (foo2zjs-20100329.tar.gz) = yMKXglK+nbwkg+fdoms4StIi1UirRCUfOfng3IPPKGI=
SIZE (foo2zjs-20100329.tar.gz) = 1595574

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
--- 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)
$OpenBSD: patch-Makefile,v 1.5 2010/03/31 16:01:45 ajacoutot Exp $
--- Makefile.orig Fri Mar 26 17:17:27 2010
+++ Makefile Wed Mar 31 16:51:15 2010
@@ -16,11 +16,6 @@ SYSNAME := $(shell uname -n)
# No version number yet...
VERSION=0.0
@ -13,7 +13,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
# Pathnames for this package...
BIN=$(PREFIX)/bin
SHAREZJS=$(PREFIX)/share/foo2zjs
@@ -30,12 +25,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
@@ -31,12 +26,12 @@ SHARELAVA=$(PREFIX)/share/foo2lava
SHAREQPDL=$(PREFIX)/share/foo2qpdl
SHARESLX=$(PREFIX)/share/foo2slx
SHAREHC=$(PREFIX)/share/foo2hiperc
@ -28,7 +28,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
# User ID's
LPuid=-oroot
@@ -255,7 +250,6 @@ ifeq ($(UNAME),Linux)
@@ -258,7 +253,6 @@ ifeq ($(UNAME),Linux)
endif
# Compiler flags
@ -36,7 +36,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
#CFLAGS += -g
#
@@ -505,9 +499,8 @@ gipddecode: gipddecode.o $(LIBJBG)
@@ -508,9 +502,8 @@ gipddecode: gipddecode.o $(LIBJBG)
#
# Installation rules
#
@ -47,7 +47,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
install-man install-doc
#
# If you use CUPS, then restart the spooler:
@@ -564,11 +557,6 @@ install-prog:
@@ -567,11 +560,6 @@ install-prog:
$(INSTALL) -d $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma.ps $(SHAREZJS)/
$(INSTALL) -c -m 644 gamma-lookup.ps $(SHAREZJS)/
@ -59,7 +59,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
install-foo:
#
@@ -723,49 +711,21 @@ install-extra:
@@ -728,49 +716,21 @@ install-extra:
done
MODEL=$(DESTDIR)/usr/share/cups/model
@ -115,7 +115,7 @@ $OpenBSD: patch-Makefile,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
APPL=$(DESTDIR)/usr/share/applications
OLDAPPL=$(DESTDIR)/usr/share/gnome/apps/System
@@ -1225,11 +1185,8 @@ install-doc: doc
@@ -1253,11 +1213,8 @@ install-doc: doc
#
$(INSTALL) -d -m 755 $(DOCDIR)
$(INSTALL) -c -m 644 manual.pdf $(DOCDIR)

View File

@ -0,0 +1,80 @@
$OpenBSD: patch-getweb_in,v 1.1 2010/03/31 16:01:45 ajacoutot Exp $
--- getweb.in.orig Tue Jun 23 20:31:20 2009
+++ getweb.in Wed Mar 31 17:49:42 2010
@@ -11,7 +11,7 @@
VERSION='$Id: patch-getweb_in,v 1.1 2010/03/31 16:01:45 ajacoutot Exp $'
-WGETOPTS="--passive-ftp -q"
+WGETOPTS="-V"
usage() {
cat <<EOF
@@ -94,11 +94,11 @@ error() {
}
SYSTEM=`uname -s`
-WGET=`type wget 2>/dev/null`
+WGET=`type ftp 2>/dev/null`
if [ "$SYSTEM" = Darwin -a "$WGET" = "" ]
then
WGETOPTS=
- wget() {
+ ftp() {
shift
curl -o $*
}
@@ -112,7 +112,7 @@ getexe() {
exefile="$2"
shift; shift
- wget $WGETOPTS -O $exefile "$url/$exefile" ||
+ ftp $WGETOPTS -o $exefile "$url/$exefile" ||
error "Couldn't download $url/$exefile"
unzip -oj $exefile "$@"
rm $exefile
@@ -126,7 +126,7 @@ gettgz() {
file="$2"
what="$3"
- wget $WGETOPTS -O $file "$url/$file" ||
+ ftp $WGETOPTS -o $file "$url/$file" ||
error "Couldn't download $url/$file"
gunzip <$file | tar xvf - $what
rm $file
@@ -225,7 +225,7 @@ getone() {
BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
FILE="MC2300DL_v255.zip"
URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
- wget $WGETOPTS "$URL" || error "Couldn't download $URL"
+ ftp $WGETOPTS "$URL" || error "Couldn't download $URL"
echo "*** Now use a windows box to unzip and install $FILE ***"
;;
cpwl|pageworks)
@@ -241,7 +241,7 @@ getone() {
do
base=`basename $i .IC_`
mv $base.IC_ $base.ic_
- ./msexpand $base.ic_
+ ${PREFIX}/share/doc/foo2zjs/msexpand $base.ic_
rm -f $base.ic_
done
fi
@@ -349,7 +349,7 @@ getone() {
URL="$URL?driver=$driver&printer=$printer"
URL="$URL&.submit=Generate+PPD+file"
URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
- wget $WGETOPTS -O PPD/$printer.ppd "$URL" ||
+ ftp $WGETOPTS -o PPD/$printer.ppd "$URL" ||
error "Couldn't dowload $URL"
done
;;
@@ -385,7 +385,7 @@ getone() {
update)
url=${URLZJS}
file=foo2zjs.tar.gz
- wget $WGETOPTS -O $file $url/$file ||
+ ftp $WGETOPTS -o $file $url/$file ||
error "Couldn't download $url/$exefile"
mv getweb getweb.old
HERE=`pwd`

View File

@ -0,0 +1,6 @@
Before using foo2zjs you should get extra files from the web, such as
.ICM profiles (for color correction) and firmware using the command
${PREFIX}/share/doc/foo2zjs/getweb
Then copy the downloaded file(s) into the corresponding directory under
${PREFIX}/share/foo2*

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2009/12/10 10:59:00 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.5 2010/03/31 16:01:45 ajacoutot Exp $
@bin bin/arm2hpdl
@bin bin/foo2hiperc
bin/foo2hiperc-wrapper
@ -62,14 +62,14 @@ share/doc/foo2zjs/README
share/doc/foo2zjs/getweb
share/doc/foo2zjs/manual.pdf
share/doc/foo2zjs/msexpand
@comment share/foo2hiperc/
@comment share/foo2hiperc/icm/
@comment share/foo2hp/
@comment share/foo2hp/icm/
@comment share/foo2lava/
@comment share/foo2lava/icm/
@comment share/foo2oak/
@comment share/foo2oak/icm/
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
@ -81,11 +81,11 @@ share/foo2qpdl/crd/CLP-600-1200x600cms2
share/foo2qpdl/crd/CLP-600-600x600cms2
share/foo2qpdl/crd/CLP-600cms
share/foo2qpdl/crd/black-text.ps
@comment share/foo2qpdl/icm/
@comment share/foo2slx/
@comment share/foo2slx/icm/
@comment share/foo2xqx/
@comment share/foo2xqx/firmware/
share/foo2qpdl/icm/
share/foo2slx/
share/foo2slx/icm/
share/foo2xqx/
share/foo2xqx/firmware/
share/foo2zjs/
share/foo2zjs/crd/
share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd
@ -97,10 +97,10 @@ share/foo2zjs/crd/kx.crd
share/foo2zjs/crd/prolog.ps
share/foo2zjs/crd/screen1200.ps
share/foo2zjs/crd/screen2400.ps
@comment share/foo2zjs/firmware/
share/foo2zjs/firmware/
share/foo2zjs/gamma-lookup.ps
share/foo2zjs/gamma.ps
@comment share/foo2zjs/icm/
share/foo2zjs/icm/
share/foomatic/
share/foomatic/db/
share/foomatic/db/source/
@ -125,8 +125,11 @@ share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P1006.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P1007.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P1008.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P1505.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/HP-LaserJet_P1505n.ppd.gz
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/KONICA_MINOLTA-magicolor_1600W.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
@ -156,8 +159,18 @@ 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-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
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLX-2160.ppd.gz
share/foomatic/db/source/PPD/foo2zjs/Samsung-CLX-3160.ppd.gz
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
@unexec-delete rm -f %D/share/foo2hiperc/icm/*
@unexec-delete rm -f %D/share/foo2hp/icm/*
@unexec-delete rm -f %D/share/foo2lava/icm/*
@unexec-delete rm -f %D/share/foo2oak/icm/*
@unexec-delete rm -f %D/share/foo2qpdl/icm/*
@unexec-delete rm -f %D/share/foo2slx/icm/*
@unexec-delete rm -f %D/share/foo2xqx/firmware/*
@unexec-delete rm -f %D/share/foo2zjs/firmware/*
@unexec-delete rm -f %D/share/foo2zjs/icm/*