Date: Wed, 12 Nov 2008 21:12:30 +1000 (EST) From: Fraser Tweedale <frase@frase.id.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/128813: [PATCH] print/foo2zjs update to 2008-10-08 Message-ID: <200811121112.mACBCUfn019853@bacardi.frase.id.au> Resent-Message-ID: <200811121140.mACBe00t006147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 128813 >Category: ports >Synopsis: [PATCH] print/foo2zjs update to 2008-10-08 >Confidential: no >Severity: non-critical >Priority: high >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 12 11:40:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Fraser Tweedale >Release: FreeBSD 7.0-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD bacardi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #38: Wed Oct 29 20:09:40 EST 2008 Fraser@bacardi:/usr/obj/usr/src/sys/BACARDI i386 >Description: Update to 20081008 release. Last update was a while back, and my printer was only supported in more recent releases :) >How-To-Repeat: >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/Makefile,v retrieving revision 1.20 diff -u -r1.20 Makefile --- Makefile 6 Jun 2008 13:57:46 -0000 1.20 +++ Makefile 12 Nov 2008 11:11:25 -0000 @@ -6,8 +6,7 @@ # PORTNAME= foo2zjs -PORTVERSION= 20070120 -PORTREVISION= 2 +PORTVERSION= 20081008 CATEGORIES= print MASTER_SITES= http://foo2zjs.rkkda.com/ \ ${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} @@ -21,11 +20,12 @@ foomatic-rip:${PORTSDIR}/print/foomatic-filters \ espgs:${PORTSDIR}/print/cups-pstoraster -USE_GHOSTSCRIPT= yes +USE_GHOSTSCRIPT=yes USE_GMAKE= yes SUB_FILES= pkg-message -MAN1= foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1 +MAN1= foo2hp.1 foo2oak-wrapper.1 foo2zjs-wrapper.1 oakdecode.1 foo2hp2600-wrapper.1 foo2oak.1 foo2zjs.1 zjsdecode.1 +PORTDOCS= ChangeLog README manual.pdf EXTRAFILES= msexpand getweb post-patch: @@ -33,14 +33,11 @@ post-install: @cd ${WRKSRC} && \ - ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/ && \ - ${INSTALL_SCRIPT} ${EXTRAFILES} ${PREFIX}/bin/ - + ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1/ && \ + ${INSTALL_SCRIPT} ${EXTRAFILES} ${PREFIX}/bin/ .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} -.for FILE in ChangeLog README manual.pdf - ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} -.endfor + @${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ .endif @${CAT} ${PKGMESSAGE} Index: distinfo =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/distinfo,v retrieving revision 1.16 diff -u -r1.16 distinfo --- distinfo 25 Jan 2007 13:56:51 -0000 1.16 +++ distinfo 12 Nov 2008 11:11:25 -0000 @@ -1,3 +1,3 @@ -MD5 (foo2zjs.tar.gz) = b0d65c5a93708eb778fee68fd52a320c -SHA256 (foo2zjs.tar.gz) = 6a45579dbada5c71b9ad2ad6e9c63784a469c3d3e675b25fb5b7006060fa5240 -SIZE (foo2zjs.tar.gz) = 935615 +MD5 (foo2zjs.tar.gz) = 78c0f2192f063b27692b5364e162f977 +SHA256 (foo2zjs.tar.gz) = 216c4f5809a89a6a13609be74815cfaacc2c3b370e0572a78bb73242d179d6d3 +SIZE (foo2zjs.tar.gz) = 1556390 Index: pkg-plist =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/pkg-plist,v retrieving revision 1.5 diff -u -r1.5 pkg-plist --- pkg-plist 26 Dec 2006 22:29:39 -0000 1.5 +++ pkg-plist 12 Nov 2008 11:11:25 -0000 @@ -1,59 +1,71 @@ bin/arm2hpdl +bin/foo2hiperc +bin/foo2hiperc-wrapper bin/foo2hp 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/getweb +bin/gipddecode +bin/hipercdecode bin/lavadecode bin/msexpand +bin/oakdecode +bin/opldecode +bin/qpdldecode +bin/slxdecode bin/xqxdecode bin/zjsdecode -share/cups/model/Generic-OAKT_Printer.ppd.gz -share/cups/model/Generic-ZjStream_Printer.ppd.gz -share/cups/model/KonicaMinolta-magicolor_2490_MF.ppd.gz -share/cups/model/KonicaMinolta-magicolor_2530_DL.ppd.gz -share/cups/model/HP-Color_LaserJet_1500.ppd.gz -share/cups/model/HP-Color_LaserJet_1600.ppd.gz -share/cups/model/HP-Color_LaserJet_2600n.ppd.gz -share/cups/model/HP-LaserJet_M1005_MFP.ppd.gz -share/cups/model/HP-LaserJet_1000.ppd.gz -share/cups/model/HP-LaserJet_1005.ppd.gz -share/cups/model/HP-LaserJet_1018.ppd.gz -share/cups/model/HP-LaserJet_1020.ppd.gz -share/cups/model/HP-LaserJet_1022.ppd.gz -share/cups/model/Minolta-Color_PageWorks_Pro_L.ppd.gz -share/cups/model/Minolta-magicolor_2200_DL.ppd.gz -share/cups/model/Minolta-magicolor_2300_DL.ppd.gz -share/cups/model/Minolta-magicolor_2430_DL.ppd.gz -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README -%%PORTDOCS%%%%DOCSDIR%%/manual.pdf -%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd -%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd -%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd -%%DATADIR%%/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd -%%DATADIR%%/crd/kh.crd -%%DATADIR%%/crd/kx.crd -%%DATADIR%%/crd/prolog.ps -%%DATADIR%%/crd/screen1200.ps -%%DATADIR%%/crd/screen2400.ps -%%DATADIR%%/gamma-lookup.ps -%%DATADIR%%/gamma.ps -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry %%DATADIR%%/icm -@dirrmtry %%DATADIR%%/firmware -@dirrmtry %%DATADIR%%/crd -@unexec rmdir %D/%%DATADIR%% 2>/dev/null || echo "Note: %D/%%DATADIR%%: icm and firmware directories not empty, remove it manually" -@dirrmtry share/foo2oak/icm -@unexec rmdir %D/share/foo2oak 2>/dev/null || echo "Note: %D/share/foo2oak: icm directory not empty, remove it manually" -@dirrmtry share/foo2hp/icm -@unexec rmdir %D/share/foo2hp 2>/dev/null || echo "Note: %D/share/foo2hp: icm directory not empty, remove it manually" +share/foo2qpdl/crd/CLP-300-1200x1200cms2 +share/foo2qpdl/crd/CLP-300-1200x600cms2 +share/foo2qpdl/crd/CLP-300-600x600cms2 +share/foo2qpdl/crd/CLP-300cms +share/foo2qpdl/crd/CLP-600-1200x1200cms2 +share/foo2qpdl/crd/CLP-600-1200x600cms2 +share/foo2qpdl/crd/CLP-600-600x600cms2 +share/foo2qpdl/crd/CLP-600cms +share/foo2qpdl/crd/black-text.ps +share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,0-per.crd +share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,50-per.crd +share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr100,75-per.crd +share/foo2zjs/crd/2300w-1200@150-l250-kx,ucr125,75-per.crd +share/foo2zjs/crd/kh.crd +share/foo2zjs/crd/kx.crd +share/foo2zjs/crd/prolog.ps +share/foo2zjs/crd/screen1200.ps +share/foo2zjs/crd/screen2400.ps +share/foo2zjs/gamma-lookup.ps +share/foo2zjs/gamma.ps +share/foo2zjs/hplj1020_icon.gif +share/foo2zjs/hplj10xx_gui.tcl +@dirrmtry share/foo2zjs/icm +@dirrmtry share/foo2zjs/firmware +@dirrm share/foo2zjs/crd +@dirrm share/foo2zjs +@dirrmtry share/foo2xqx/firmware @dirrmtry share/foo2xqx +@dirrmtry share/foo2slx/icm +@dirrmtry share/foo2slx +@dirrmtry share/foo2qpdl/icm +@dirrm share/foo2qpdl/crd +@dirrm share/foo2qpdl +@dirrmtry share/foo2oak/icm +@dirrmtry share/foo2oak @dirrmtry share/foo2lava/icm -@unexec rmdir %D/share/foo2lava 2>/dev/null || echo "Note: %D/share/foo2lava: icm directory not empty, remove it manually" +@dirrmtry share/foo2lava +@dirrmtry share/foo2hp/icm +@dirrmtry share/foo2hp +@dirrmtry share/foo2hiperc/icm +@dirrmtry share/foo2hiperc Index: files/patch-Makefile =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/files/patch-Makefile,v retrieving revision 1.2 diff -u -r1.2 patch-Makefile --- files/patch-Makefile 8 Oct 2006 22:35:59 -0000 1.2 +++ files/patch-Makefile 12 Nov 2008 11:11:25 -0000 @@ -1,66 +1,54 @@ ---- Makefile Fri Sep 29 23:28:51 2006 -+++ Makefile Sun Oct 8 17:29:53 2006 -@@ -6,8 +6,7 @@ +--- Makefile 2008-09-23 23:56:20.000000000 +1000 ++++ Makefile.new 2008-10-30 21:27:10.000000000 +1000 +@@ -16,9 +16,7 @@ VERSION=0.0 # Installation prefix... -PREFIX=/usr/local -PREFIX=/usr +-PREFIX=$(DESTDIR)/usr +PREFIX?= # Pathnames for this package... BIN=$(PREFIX)/bin -@@ -18,7 +17,7 @@ - DOCDIR=$(PREFIX)/share/doc/foo2zjs/ +@@ -35,7 +33,7 @@ + INSTALL=install # Pathnames for referenced packages... --FOODB=/usr/share/foomatic/db/source +-FOODB=$(DESTDIR)/usr/share/foomatic/db/source +FOODB=$(PREFIX)/share/foomatic/db/source # User ID's LPuid=-olp -@@ -154,7 +153,7 @@ +@@ -251,7 +249,7 @@ endif # Compiler flags -CFLAGS += -O2 -Wall +CFLAGS?= + #CFLAGS += -g # - # Rules to create test documents -@@ -291,7 +290,7 @@ +@@ -502,9 +500,8 @@ # Installation rules # install: all install-test install-prog install-icc2ps install-extra \ -- install-crd install-foo install-ppd install-man install-doc -+ install-crd install-ppd +- install-crd install-foo install-ppd \ +- install-gui install-desktop \ +- install-man install-doc ++ install-crd install-ppd \ ++ install-gui install-desktop # # If you use CUPS, then restart the spooler: # make cups -@@ -349,8 +348,10 @@ - # - # Install current database files - # -+ mkdir -p $(FOODB) - @if [ -d $(FOODB) ]; then \ - for dir in driver printer opt; do \ -+ install -d $(FOODB)/$$dir/; \ - echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - install -c -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \ - done \ -@@ -435,12 +436,13 @@ +@@ -718,8 +715,8 @@ fi; \ done --MODEL=/usr/share/cups/model --LOCALMODEL=/usr/local/share/cups/model +-MODEL=$(DESTDIR)/usr/share/cups/model +-LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model +MODEL=$(PREFIX)/share/cups/model +LOCALMODEL=$(PREFIX)/share/cups/model + PPD=$(DESTDIR)/usr/share/ppd + VARPPD=/var/lp/ppd install-ppd: - # - # Install PPD files for CUPS - # -+ mkdir -p $(MODEL) - if [ -d /usr/share/ppd/ ]; then \ - find /usr/share/ppd/ -name '*foo2zjs*' | xargs rm -f; \ - find /usr/share/ppd/ -name '*foo2hp*' | xargs rm -f; \ Index: files/patch-foo2hp2600-wrapper.in =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/files/patch-foo2hp2600-wrapper.in,v retrieving revision 1.1 diff -u -r1.1 patch-foo2hp2600-wrapper.in --- files/patch-foo2hp2600-wrapper.in 19 Oct 2006 17:31:03 -0000 1.1 +++ files/patch-foo2hp2600-wrapper.in 12 Nov 2008 11:11:25 -0000 @@ -1,87 +1,47 @@ ---- foo2hp2600-wrapper.in Wed Oct 4 08:30:16 2006 -+++ foo2hp2600-wrapper.in Fri Oct 13 12:33:20 2006 -@@ -31,13 +31,6 @@ - PREFIX=/usr +--- foo2hp2600-wrapper.in.orig 2008-11-01 13:11:53.000000000 +1000 ++++ foo2hp2600-wrapper.in 2008-11-01 13:15:34.000000000 +1000 +@@ -32,13 +32,6 @@ SHARE=$PREFIX/share/foo2hp + PATH=$PATH:/sw/bin:/opt/local/bin -# -# Log the command line, for debugging and problem reports -# -if [ -x /usr/bin/logger ]; then -- logger -t "$BASENAME" -p lpr.info -- "foo2hp2600-wrapper $@" </dev/null +- logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null -fi - usage() { cat <<EOF Usage: -@@ -174,11 +167,7 @@ - # - # N.B. := operator used here, when :- would be better, because "ash" - # doesn't have :- --if gs8 -v >/dev/null 2>&1; then -- GSBIN=${GSBIN:-gs8} --else -- GSBIN=${GSBIN:-gs} --fi -+GSBIN=${GSBIN:-gs} - - CMDLINE="$*" - DEBUG=0 -@@ -211,24 +200,8 @@ - GSDEV=-sDEVICE=pbmraw - DefaultRGB=sRGB - # What mode to use if the user wants us to pick the "best" mode --case `$GSBIN --version` in --7*) -- DEFAULTCOLORMODE=10 -- ;; --8.1*) -- # Buggy 8.14/8.15 in Ubuntu -- DEFAULTCOLORMODE=10 -- if is32 $GSBIN; then -- GAMMAFILE=km2430_2.icm -- else -- GAMMAFILE=hpclj2600n-0.icm -- fi -- QUALITY=1 -- ;; --*) -- DEFAULTCOLORMODE=10 -- ;; --esac -+ -+DEFAULTCOLORMODE=10 - - while getopts "24o:b:cC:d:g:l:u:L:m:n:p:q:r:s:tABS:D:G:I:PX:Vh?" opt - do -@@ -302,9 +275,11 @@ +@@ -327,9 +320,11 @@ # error "2-bpp monochrome is not yet supported" GSDEV="-sDEVICE=cups -dcupsColorSpace=3 -dcupsBitsPerColor=2" GSDEV="$GSDEV -dcupsColorOrder=2" -+ GSBIN="$PREFIX/bin/espgs" ++ GSBIN="$PREFIX/bin/espgs" else GSDEV="-sDEVICE=cups -dcupsColorSpace=6 -dcupsBitsPerColor=2" GSDEV="$GSDEV -dcupsColorOrder=2" -+ GSBIN="$PREFIX/bin/espgs" ++ GSBIN="$PREFIX/bin/espgs" fi - - case "$GAMMAFILE" in -@@ -651,18 +626,6 @@ - $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \ - -J "$LPJOB" -U "$USER" \ + if [ $GSBIN = "gs.foo" ]; then + GSBIN=gs +@@ -718,18 +713,6 @@ $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG -- --# + + # -# Log the command line, for debugging and problem reports -# -if [ -x /usr/bin/logger ]; then - logger -t "$BASENAME" -p lpr.info -- \ -- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPT $GAMAFILE" +- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE" - logger -t "$BASENAME" -p lpr.info -- \ - "foo2hp -r$RES -g$DIM -p$PAPER -m$MEDIA \ --n$COPIES -d$DUPLEX -s$SOURCE $COLOR -b$BPP $CLIP_UL $CLIP_LR $CLIP_LOG \ -$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD" -fi - - # +- +-# # Remove cruft + # + if [ $DEBUG -eq 0 ]; then Index: files/patch-foo2zjs-wrapper.in =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/files/patch-foo2zjs-wrapper.in,v retrieving revision 1.1 diff -u -r1.1 patch-foo2zjs-wrapper.in --- files/patch-foo2zjs-wrapper.in 19 Oct 2006 17:31:03 -0000 1.1 +++ files/patch-foo2zjs-wrapper.in 12 Nov 2008 11:11:25 -0000 @@ -1,65 +1,35 @@ ---- foo2zjs-wrapper.in Mon May 1 23:33:58 2006 -+++ foo2zjs-wrapper.in Fri Oct 13 12:34:22 2006 -@@ -40,13 +40,6 @@ - PREFIX=/usr +--- foo2zjs-wrapper.in.orig 2008-11-01 13:17:31.000000000 +1000 ++++ foo2zjs-wrapper.in 2008-11-01 13:19:22.000000000 +1000 +@@ -41,13 +41,6 @@ SHARE=$PREFIX/share/foo2zjs + PATH=$PATH:/sw/bin:/opt/local/bin -# -# Log the command line, for debugging and problem reports -# -if [ -x /usr/bin/logger ]; then -- logger -t "$BASENAME" -p lpr.info -- "foo2zjs-wrapper $@" </dev/null +- logger -t "$BASENAME" -p lpr.info -- "$BASENAME $@" </dev/null -fi - usage() { cat <<EOF Usage: -@@ -141,11 +134,7 @@ - # - # N.B. := operator used here, when :- would be better, because "ash" - # doesn't have :- --if gs8 -v >/dev/null 2>&1; then -- GSBIN=${GSBIN:-gs8} --else -- GSBIN=${GSBIN:-gs} --fi -+GSBIN=${GSBIN:-gs} - - CMDLINE="$*" - DEBUG=0 -@@ -154,13 +143,9 @@ - COLORMODE=0 - MODEL=0 - # What mode to use if the user wants us to pick the "best" mode --case `$GSBIN --version` in --7*) DEFAULTCOLORMODE=10 -- DEFAULTCOLORMODE=2 -- ;; --*) DEFAULTCOLORMODE=2 -- ;; --esac -+ -+DEFAULTCOLORMODE=10 -+DEFAULTCOLORMODE=2 - QUALITY=1 - MEDIA=1 - COPIES=1 -@@ -600,18 +585,6 @@ - -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG $SAVETONER \ - -J "$LPJOB" -U "$USER" \ +@@ -699,18 +692,6 @@ $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG -- --# + + # -# Log the command line, for debugging and problem reports -# -if [ -x /usr/bin/logger ]; then - logger -t "$BASENAME" -p lpr.info -- \ -- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPT $GAMAFILE" +- "$GSBIN $PAPERSIZE -g$DIM -r$RES $GSDEV $GSOPTS $GAMMAFILE" - logger -t "$BASENAME" -p lpr.info -- \ - "foo2zjs -r$RES -g$DIM -p$PAPER -m$MEDIA \ --n$COPIES -d$DUPLEX -s$SOURCE -z$MODEL $COLOR $CLIP_UL $CLIP_LR $CLIP_LOG \ -$SAVETONER $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD" -fi - - # +- +-# # Remove cruft + # + if [ $DEBUG -eq 0 ]; then Index: files/patch-getweb.in =================================================================== RCS file: /home/ncvs/ports/print/foo2zjs/files/patch-getweb.in,v retrieving revision 1.1 diff -u -r1.1 patch-getweb.in --- files/patch-getweb.in 5 Jun 2006 13:01:46 -0000 1.1 +++ files/patch-getweb.in 12 Nov 2008 11:11:25 -0000 @@ -1,15 +1,15 @@ ---- getweb.in Thu May 11 17:02:59 2006 -+++ getweb.in Sun Jun 4 15:41:29 2006 -@@ -48,7 +48,7 @@ +--- getweb.in.orig 2008-08-20 10:00:10.000000000 +1000 ++++ getweb.in 2008-10-30 21:47:30.000000000 +1000 +@@ -105,7 +105,7 @@ exefile="$2" - what="$3" + shift; shift - wget $WGETOPTS -O $exefile "$url/$exefile" || + fetch -m -o $exefile "$url/$exefile" || error "Couldn't download $url/$exefile" - unzip -o $exefile "$what" + unzip -oj $exefile "$@" rm $exefile -@@ -62,7 +62,7 @@ +@@ -119,7 +119,7 @@ file="$2" what="$3" @@ -18,12 +18,12 @@ error "Couldn't download $url/$file" gunzip <$file | tar xvf - $what rm $file -@@ -130,7 +130,7 @@ - do - base=`basename $i .IC_` - mv $base.IC_ $base.ic_ -- ./msexpand $base.ic_ -+ msexpand $base.ic_ - rm -f $base.ic_ - done - ;; +@@ -218,7 +218,7 @@ + do + base=`basename $i .IC_` + mv $base.IC_ $base.ic_ +- ./msexpand $base.ic_ ++ msexpand $base.ic_ + rm -f $base.ic_ + done + copyright "(c) Copyright Minolta-QMS 1998" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811121112.mACBCUfn019853>