Update to version 20140330.

10 files changed, 83 insertions, 54 deletions

diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index a9f56fc9a9cf..af53ddaaaf53 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	foo2zjs
-PORTVERSION=	20131225
-PORTREVISION=	1
+PORTVERSION=	20140330
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_LOCAL:S,$,bsam/${PORTNAME}/,}  \
diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo
index ab793f01e6b7..b6d38561d1cf 100644
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (foo2zjs-20131225.tar.gz) = 641067d1dc09a5468e41d93491e03f7b4605f30779acfc0101c7a99d7ddda694
-SIZE (foo2zjs-20131225.tar.gz) = 1761261
+SHA256 (foo2zjs-20140330.tar.gz) = 0ebcda005445b4cfa9e7ccf071b7acd553f3371c3d5195bd6ec9872bd164ea7c
+SIZE (foo2zjs-20140330.tar.gz) = 1818765
diff --git a/print/foo2zjs/files/patch-Makefile b/print/foo2zjs/files/patch-Makefile
index 3b736233d1a2..b79ac48f89cd 100644
--- a/print/foo2zjs/files/patch-Makefile
+++ b/print/foo2zjs/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2013-11-18 20:57:48.000000000 +0400
-+++ Makefile	2013-11-24 00:25:20.393194109 +0400
-@@ -17,28 +17,26 @@
+--- Makefile.orig	2014-03-24 16:30:37.000000000 +0400
++++ Makefile	2014-03-31 13:19:31.290736089 +0400
+@@ -17,28 +17,26 @@ SYSNAME := $(shell uname -n)
  VERSION=0.0
  
  # Installation prefix...
@@ -44,7 +44,7 @@
  
  # User ID's
  LPuid=-oroot
-@@ -291,7 +289,7 @@
+@@ -295,7 +293,7 @@ endif
  
  # Compiler flags
  #CFLAGS +=	-O2 -Wall -Wno-unused-but-set-variable
@@ -53,7 +53,7 @@
  #CFLAGS +=	-g
  
  #
-@@ -599,10 +597,9 @@
+@@ -612,10 +610,9 @@ command2foo2lava-pjl.o: command2foo2lava
  #
  # Installation rules
  #
@@ -67,7 +67,7 @@
  	#
  	# If you use CUPS, then restart the spooler:
  	#	make cups
-@@ -617,6 +614,7 @@
+@@ -630,6 +627,7 @@ install: all install-test install-prog i
  	# On Ubuntu 7.10/8.x/9.x, run "system-config-printer".
  
  install-test:
@@ -75,7 +75,7 @@
  	#
  	# Installation Dependencies...
  	#
-@@ -636,19 +634,22 @@
+@@ -649,19 +647,22 @@ install-test:
  	fi
  	# ... OK!
  	#
@@ -91,9 +91,9 @@
  	# Install driver, wrapper, and development tools
  	#
  	$(INSTALL) -d $(BIN)
+-	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
 +	$(INSTALL) -s -c $(PROGS) $(BIN)
 +	$(INSTALL) -c $(SHELLS) $(BIN)
--	$(INSTALL) -c $(PROGS) $(SHELLS) $(BIN)/
  	if [ "$(BINPROGS)" != "" ]; then \
  	    $(INSTALL) -d $(UDEVBIN); \
 -	    $(INSTALL) -c $(BINPROGS) $(UDEVBIN); \
@@ -101,11 +101,8 @@
  	fi
  	#
  	# Install gamma correction files.  These are just templates,
-@@ -663,25 +665,20 @@
- 	$(INSTALL) -d $(SHAREXQX)/
- 	$(INSTALL) -d $(SHARELAVA)/
+@@ -678,24 +679,16 @@ install-prog:
  	$(INSTALL) -d $(SHAREHC)/
-+	echo "install-prog: exit"
  
  install-foo:
 +	echo "install-foo:"
@@ -120,6 +117,7 @@
 -	rm -f $(FOODB)/opt/foo2zjs-Nup.xml
 -	rm -f $(FOODB)/opt/foo2zjs-NupOrient.xml
 -	rm -f $(FOODB)/opt/foo2*-Quality.xml
+-	rm -f $(FOODB)/opt/foo2hp-AlignCMYK.xml
 -	rm -f $(FOODB)/printer/KonicaMinolta*.xml
  	#
  	# Install current database files
@@ -128,11 +126,10 @@
  	@if [ -d $(FOODB) ]; then \
 -	    for dir in driver printer opt; do \
 +	    for dir in printer opt; do \
-+		mkdir -p $(FOODB)/$$dir/; \
  		echo install -d $(FOODB)/$$dir/; \
  		$(INSTALL) -d $(FOODB)/$$dir/; \
  		echo install -m 644 foomatic-db/$$dir/*.xml $(FOODB)/$$dir/; \
-@@ -698,28 +695,20 @@
+@@ -712,28 +705,20 @@ install-foo:
  	    echo "*** ... wherever foomatic is stashed on your machine."; \
  	    echo "***"; \
  	fi
@@ -164,7 +161,7 @@
  endif
  
  install-crd:
-@@ -833,10 +822,10 @@
+@@ -847,10 +832,10 @@ install-extra:
  	    fi; \
  	done
  
@@ -178,7 +175,7 @@
  VARPPD=/var/lp/ppd
  install-ppd:
  	#
-@@ -871,6 +860,7 @@
+@@ -885,6 +870,7 @@ install-ppd:
  	fi
  	#
  	export PATH=$$PATH:`pwd`:; \
@@ -186,7 +183,7 @@
  	if [ -d $(MODEL) ]; then \
  	    rm -f $(MODEL)/KonicaMinolta*; \
  	    cd PPD; \
-@@ -894,9 +884,9 @@
+@@ -908,9 +894,9 @@ install-ppd:
  	    done; \
  	fi
  
diff --git a/print/foo2zjs/files/patch-foo2hiperc-wrapper.in b/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
index 2eef76e69ff1..2a6fbc7578af 100644
--- a/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
@@ -1,6 +1,6 @@
---- foo2hiperc-wrapper.in.orig	2011-01-31 15:23:43.000000000 +0300
-+++ foo2hiperc-wrapper.in	2011-06-19 21:16:59.468615644 +0400
-@@ -46,10 +46,6 @@ PATH=$PATH:.
+--- foo2hiperc-wrapper.in.orig	2013-12-02 00:25:17.000000000 +0400
++++ foo2hiperc-wrapper.in	2014-03-31 13:01:56.653808270 +0400
+@@ -48,10 +48,6 @@ PATH=$PATH:.
  #
  #	Log the command line, for debugging and problem reports
  #
@@ -11,7 +11,7 @@
  usage() {
  	cat <<EOF
  Usage:
-@@ -154,8 +150,8 @@ nup() {
+@@ -158,8 +154,8 @@ nup() {
  #
  # N.B. := operator used here, when :- would be better, because "ash"
  # doesn't have :-
@@ -22,7 +22,7 @@
  else
          GSBIN=${GSBIN:-gs}
  fi
-@@ -676,18 +672,6 @@ $PREFILTER \
+@@ -723,18 +719,6 @@ $PREFILTER \
  	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -D$DEBUG
  
  #
diff --git a/print/foo2zjs/files/patch-foo2oak-wrapper.in b/print/foo2zjs/files/patch-foo2oak-wrapper.in
index 2ad4f54e0c87..17eaa825f4d1 100644
--- a/print/foo2zjs/files/patch-foo2oak-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2oak-wrapper.in
@@ -1,5 +1,5 @@
---- foo2oak-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
-+++ foo2oak-wrapper.in	2011-06-19 21:24:46.175611255 +0400
+--- foo2oak-wrapper.in.orig	2011-08-07 20:49:30.000000000 +0400
++++ foo2oak-wrapper.in	2014-03-31 13:01:56.689807500 +0400
 @@ -35,13 +35,6 @@ PREFIX=/usr
  SHARE=$PREFIX/share/foo2oak
  PATH=$PATH:/sw/bin:/opt/local/bin
@@ -25,7 +25,7 @@
  else
          GSBIN=${GSBIN:-gs}
  fi
-@@ -701,19 +694,6 @@ $PREFILTER \
+@@ -705,19 +698,6 @@ $PREFILTER \
  	    $BC $AIB $COLOR2MONO -D$DEBUG
  
  #
diff --git a/print/foo2zjs/files/patch-foo2qpdl-wrapper.in b/print/foo2zjs/files/patch-foo2qpdl-wrapper.in
index dc4cfc11d25d..6065b6e5939c 100644
--- a/print/foo2zjs/files/patch-foo2qpdl-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2qpdl-wrapper.in
@@ -1,6 +1,6 @@
---- foo2qpdl-wrapper.in.orig	2011-04-15 23:07:00.000000000 +0400
-+++ foo2qpdl-wrapper.in	2011-06-19 21:26:03.964850095 +0400
-@@ -43,13 +43,6 @@ PREFIX=/usr
+--- foo2qpdl-wrapper.in.orig	2014-01-27 06:34:29.000000000 +0400
++++ foo2qpdl-wrapper.in	2014-03-31 13:04:08.873802954 +0400
+@@ -45,13 +45,6 @@ PREFIX=/usr
  SHARE=$PREFIX/share/foo2qpdl
  PATH=$PATH:/sw/bin:/opt/local/bin
  
@@ -14,7 +14,7 @@
  usage() {
  	cat <<EOF
  Usage:
-@@ -161,8 +154,8 @@ nup() {
+@@ -164,8 +157,8 @@ nup() {
  #
  # N.B. := operator used here, when :- would be better, because "ash"
  # doesn't have :-
@@ -25,7 +25,7 @@
  else
          GSBIN=${GSBIN:-gs}
  fi
-@@ -708,18 +701,6 @@ $PREFILTER \
+@@ -728,19 +721,6 @@ $PREFILTER \
  	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
  
  #
@@ -37,7 +37,8 @@
 -    logger -t "$BASENAME" -p lpr.info -- \
 -	"foo2qpdl -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"
+-$SAVETONER -a$CA_B,$CA_C,$CA_S,$CA_CR,$CA_MG,$CA_YB \
+-$BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD"
 -fi
 -
 -#
diff --git a/print/foo2zjs/files/patch-foo2xqx-wrapper.in b/print/foo2zjs/files/patch-foo2xqx-wrapper.in
index 68343cd885ee..90384b157d48 100644
--- a/print/foo2zjs/files/patch-foo2xqx-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2xqx-wrapper.in
@@ -1,6 +1,6 @@
---- foo2xqx-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
-+++ foo2xqx-wrapper.in	2011-06-19 21:28:35.844620886 +0400
-@@ -41,13 +41,6 @@ PREFIX=/usr
+--- foo2xqx-wrapper.in.orig	2013-12-26 01:00:11.000000000 +0400
++++ foo2xqx-wrapper.in	2014-03-31 13:16:42.977746704 +0400
+@@ -42,13 +42,6 @@ PREFIX=/usr
  SHARE=$PREFIX/share/foo2xqx
  PATH=$PATH:/sw/bin:/opt/local/bin
  
@@ -14,7 +14,7 @@
  usage() {
  	cat <<EOF
  Usage:
-@@ -150,8 +143,8 @@ nup() {
+@@ -151,8 +144,8 @@ nup() {
  #
  # N.B. := operator used here, when :- would be better, because "ash"
  # doesn't have :-
@@ -25,7 +25,7 @@
  else
          GSBIN=${GSBIN:-gs}
  fi
-@@ -666,18 +659,6 @@ $PREFILTER \
+@@ -667,18 +660,6 @@ $PREFILTER \
  	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
  
  #
diff --git a/print/foo2zjs/files/patch-foo2zjs-wrapper.in b/print/foo2zjs/files/patch-foo2zjs-wrapper.in
index d518dc2229fe..64a48f1bc447 100644
--- a/print/foo2zjs/files/patch-foo2zjs-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2zjs-wrapper.in
@@ -1,5 +1,5 @@
---- foo2zjs-wrapper.in.orig	2011-01-15 02:21:39.000000000 +0300
-+++ foo2zjs-wrapper.in	2011-06-19 21:29:39.781636207 +0400
+--- foo2zjs-wrapper.in.orig	2012-02-24 05:25:15.000000000 +0400
++++ foo2zjs-wrapper.in	2014-03-31 13:16:42.980748747 +0400
 @@ -53,13 +53,6 @@ PREFIX=/usr
  SHARE=$PREFIX/share/foo2zjs
  PATH=$PATH:/sw/bin:/opt/local/bin
@@ -14,7 +14,7 @@
  usage() {
  	cat <<EOF
  Usage:
-@@ -187,8 +180,8 @@ nup() {
+@@ -188,8 +181,8 @@ nup() {
  #
  # N.B. := operator used here, when :- would be better, because "ash"
  # doesn't have :-
@@ -25,7 +25,7 @@
  else
          GSBIN=${GSBIN:-gs}
  fi
-@@ -900,18 +893,6 @@ $PREFILTER \
+@@ -945,18 +938,6 @@ $PREFILTER \
  	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD -D$DEBUG
  
  #
diff --git a/print/foo2zjs/files/patch-getweb.in b/print/foo2zjs/files/patch-getweb.in
index 41d62f3793f6..6857a8e2fa6d 100644
--- a/print/foo2zjs/files/patch-getweb.in
+++ b/print/foo2zjs/files/patch-getweb.in
@@ -1,15 +1,15 @@
---- getweb.in.orig	2011-05-17 13:44:16.000000000 +0400
-+++ getweb.in	2011-06-19 21:29:51.249616941 +0400
+--- getweb.in.orig	2013-12-26 01:00:11.000000000 +0400
++++ getweb.in	2014-03-31 13:16:43.001753482 +0400
 @@ -11,7 +11,7 @@
  
- VERSION='$Id: getweb.in,v 1.103 2011/05/17 09:44:16 rick Exp $'
+ VERSION='$Id: getweb.in,v 1.112 2013/12/25 21:00:11 rick Exp $'
  
 -WGETOPTS="--passive-ftp -q"
 +FETCHOPTS="-p -m -o"
  
  usage() {
  cat <<EOF
-@@ -119,7 +119,7 @@ getexe() {
+@@ -123,7 +123,7 @@ getexe() {
      exefile="$2"
      shift; shift
      
@@ -18,7 +18,7 @@
  	error "Couldn't download $url/$exefile"
      unzip -oj $exefile "$@"
      rm $exefile
-@@ -133,7 +133,7 @@ gettgz() {
+@@ -137,7 +137,7 @@ gettgz() {
      file="$2"
      what="$3"
      
@@ -27,7 +27,7 @@
  	error "Couldn't download $url/$file"
      gunzip <$file | tar xvf - $what
      rm $file
-@@ -236,7 +236,7 @@ getone() {
+@@ -241,7 +241,7 @@ getone() {
  	BASE="$BASE/openmind/technic/swfw/mswprtdl.nsf/logdwl"
  	FILE="MC2300DL_v255.zip"
  	URL="$BASE?openagent&4CE486C20839C75AC1256D9E001EBD1F/\$File/$FILE"
@@ -36,7 +36,7 @@
  	echo "*** Now use a windows box to unzip and install $FILE ***"
  	;;
      cpwl|pageworks)
-@@ -252,7 +252,7 @@ getone() {
+@@ -257,7 +257,7 @@ getone() {
  	    do
  		base=`basename $i .IC_`
  		mv $base.IC_ $base.ic_
@@ -45,7 +45,7 @@
  		rm -f $base.ic_
  	    done
  	fi
-@@ -383,7 +383,7 @@ getone() {
+@@ -400,7 +400,7 @@ getone() {
  	    URL="$URL?driver=$driver&printer=$printer"
  	    URL="$URL&.submit=Generate+PPD+file"
  	    URL="$URL&show=1&.cgifields=shortgui&.cgifields=show"
@@ -54,7 +54,7 @@
  		error "Couldn't dowload $URL"
  	done
  	;;
-@@ -420,7 +420,7 @@ getone() {
+@@ -438,7 +438,7 @@ getone() {
      update)
  	url=${URLZJS}
  	file=foo2zjs.tar.gz
diff --git a/print/foo2zjs/pkg-plist b/print/foo2zjs/pkg-plist
index bc53aecfd7f5..460b0168fe79 100644
--- a/print/foo2zjs/pkg-plist
+++ b/print/foo2zjs/pkg-plist
@@ -1,4 +1,6 @@
 bin/arm2hpdl
+bin/foo2hbpl1
+bin/foo2hbpl1-wrapper
 bin/foo2hbpl2
 bin/foo2hbpl2-wrapper
 bin/foo2hiperc
@@ -32,6 +34,10 @@ bin/qpdldecode
 bin/slxdecode
 bin/xqxdecode
 bin/zjsdecode
+foomatic/db/source/opt/foo2hbpl1-ColorMode.xml
+foomatic/db/source/opt/foo2hbpl1-ICM.xml
+foomatic/db/source/opt/foo2hbpl1-MediaType.xml
+foomatic/db/source/opt/foo2hbpl1-PageSize.xml
 foomatic/db/source/opt/foo2hbpl2-ColorMode.xml
 foomatic/db/source/opt/foo2hbpl2-ICM.xml
 foomatic/db/source/opt/foo2hbpl2-MediaType.xml
@@ -45,7 +51,9 @@ foomatic/db/source/opt/foo2hiperc-InputSlot.xml
 foomatic/db/source/opt/foo2hiperc-MediaType.xml
 foomatic/db/source/opt/foo2hiperc-PageSize.xml
 foomatic/db/source/opt/foo2hiperc-Resolution.xml
-foomatic/db/source/opt/foo2hp-AlignCMYK.xml
+foomatic/db/source/opt/foo2hp-AlignC.xml
+foomatic/db/source/opt/foo2hp-AlignM.xml
+foomatic/db/source/opt/foo2hp-AlignY.xml
 foomatic/db/source/opt/foo2hp-BitsPerPlane.xml
 foomatic/db/source/opt/foo2hp-ColorMode.xml
 foomatic/db/source/opt/foo2hp-Duplex.xml
@@ -70,6 +78,12 @@ foomatic/db/source/opt/foo2oak-z1-Duplex.xml
 foomatic/db/source/opt/foo2oak-z1-InputSlot.xml
 foomatic/db/source/opt/foo2oak-z1-MediaType.xml
 foomatic/db/source/opt/foo2oak-z1-PageSize.xml
+foomatic/db/source/opt/foo2qpdl-ColorAdjustB.xml
+foomatic/db/source/opt/foo2qpdl-ColorAdjustC.xml
+foomatic/db/source/opt/foo2qpdl-ColorAdjustCR.xml
+foomatic/db/source/opt/foo2qpdl-ColorAdjustMG.xml
+foomatic/db/source/opt/foo2qpdl-ColorAdjustS.xml
+foomatic/db/source/opt/foo2qpdl-ColorAdjustYB.xml
 foomatic/db/source/opt/foo2qpdl-ColorMode.xml
 foomatic/db/source/opt/foo2qpdl-Duplex.xml
 foomatic/db/source/opt/foo2qpdl-ICM.xml
@@ -110,8 +124,16 @@ foomatic/db/source/opt/foo2zjs-z2-MediaType.xml
 foomatic/db/source/opt/foo2zjs-z2-PageSize.xml
 foomatic/db/source/opt/foo2zjs-z3-MediaType.xml
 foomatic/db/source/opt/foo2zjs-z3-PageSize.xml
+foomatic/db/source/printer/Dell-1250c.xml
 foomatic/db/source/printer/Dell-1355.xml
+foomatic/db/source/printer/Dell-C1660.xml
+foomatic/db/source/printer/Dell-C1760.xml
+foomatic/db/source/printer/Dell-C1765.xml
+foomatic/db/source/printer/Epson-AcuLaser_C1700.xml
+foomatic/db/source/printer/Epson-AcuLaser_M1400.xml
 foomatic/db/source/printer/Fuji_Xerox-DocuPrint_CM205.xml
+foomatic/db/source/printer/Fuji_Xerox-DocuPrint_CP105.xml
+foomatic/db/source/printer/Fuji_Xerox-DocuPrint_M215.xml
 foomatic/db/source/printer/Fuji_Xerox-DocuPrint_P205.xml
 foomatic/db/source/printer/Generic-OAKT_Printer.xml
 foomatic/db/source/printer/Generic-ZjStream_Printer.xml
@@ -191,9 +213,18 @@ foomatic/db/source/printer/Samsung-CLX-3185.xml
 foomatic/db/source/printer/Xerox-Phaser_6110.xml
 foomatic/db/source/printer/Xerox-Phaser_6115MFP.xml
 foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
+foomatic/db/source/printer/Xerox-WorkCentre_3045.xml
 foomatic/db/source/printer/Xerox-WorkCentre_6015.xml
+share/cups/model/Dell-1250c.ppd.gz
 share/cups/model/Dell-1355.ppd.gz
+share/cups/model/Dell-C1660.ppd.gz
+share/cups/model/Dell-C1760.ppd.gz
+share/cups/model/Dell-C1765.ppd.gz
+share/cups/model/Epson-AcuLaser_C1700.ppd.gz
+share/cups/model/Epson-AcuLaser_M1400.ppd.gz
 share/cups/model/Fuji_Xerox-DocuPrint_CM205.ppd.gz
+share/cups/model/Fuji_Xerox-DocuPrint_CP105.ppd.gz
+share/cups/model/Fuji_Xerox-DocuPrint_M215.ppd.gz
 share/cups/model/Fuji_Xerox-DocuPrint_P205.ppd.gz
 share/cups/model/Generic-OAKT_Printer.ppd.gz
 share/cups/model/Generic-ZjStream_Printer.ppd.gz
@@ -273,6 +304,7 @@ share/cups/model/Samsung-CLX-3185.ppd.gz
 share/cups/model/Xerox-Phaser_6110.ppd.gz
 share/cups/model/Xerox-Phaser_6115MFP.ppd.gz
 share/cups/model/Xerox-Phaser_6121MFP.ppd.gz
+share/cups/model/Xerox-WorkCentre_3045.ppd.gz
 share/cups/model/Xerox-WorkCentre_6015.ppd.gz
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README