print/foo2zjs: update to 20161203 (unbreak) and remove GOOGLE_CODE

from MASTER_SITES (has gone).

5 files changed, 31 insertions, 17 deletions

diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index d150dcd8f055..330dca014627 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -2,11 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	foo2zjs
-PORTVERSION=	20150511
-PORTREVISION=	4
+PORTVERSION=	20161203
 CATEGORIES=	print
-MASTER_SITES=	GOOGLE_CODE \
-		LOCAL/bsam/${PORTNAME}  \
+MASTER_SITES=	LOCAL/bsam/${PORTNAME} \
 		ftp://ftp.wart.ru/pub/FreeBSD/ports/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,8 +13,6 @@ COMMENT=	Driver for printers that use the ZjStream wire protocol
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN=		Unfetchable (google code has gone away)
-
 LIB_DEPENDS=	libcups.so:print/cups
 RUN_DEPENDS=	${LOCALBASE}/share/foomatic/db/oldprinterids:print/foomatic-db \
 		foomatic-rip:print/cups-filters \
diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo
index 813f88163729..7e1dbd35dfe6 100644
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,2 +1,3 @@
-SHA256 (foo2zjs-20150511.tar.gz) = 2fe042afc281d5433d9a6cc6c456c74a635fc701485d1947c729f10ee4537add
-SIZE (foo2zjs-20150511.tar.gz) = 1804945
+TIMESTAMP = 1481811015
+SHA256 (foo2zjs-20161203.tar.gz) = 8608c9adfc86dc4ea721f234b0f3fcbe8d0393aea953d69e7f706a3dec3c9514
+SIZE (foo2zjs-20161203.tar.gz) = 1791101
diff --git a/print/foo2zjs/files/patch-Makefile b/print/foo2zjs/files/patch-Makefile
index b79ac48f89cd..0f4488be27d8 100644
--- a/print/foo2zjs/files/patch-Makefile
+++ b/print/foo2zjs/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-03-24 16:30:37.000000000 +0400
-+++ Makefile	2014-03-31 13:19:31.290736089 +0400
+--- Makefile.orig	2016-12-03 21:16:15 UTC
++++ Makefile
 @@ -17,28 +17,26 @@ SYSNAME := $(shell uname -n)
  VERSION=0.0
  
@@ -161,21 +161,21 @@
  endif
  
  install-crd:
-@@ -847,10 +832,10 @@ install-extra:
+@@ -840,10 +825,10 @@ install-extra:
  	    fi; \
  	done
  
--MODEL=$(DESTDIR)/usr/share/cups/model
+-MODEL=$(PREFIX)/share/cups/model
 -LOCALMODEL=$(DESTDIR)/usr/local/share/cups/model
 +MODEL=$(DESTDIR)$(PREFIX)/share/cups/model
 +LOCALMODEL=$(DESTDIR)$(PREFIX)/share/cups/model
  MACMODEL=/Library/Printers/PPDs/Contents/Resources
--PPD=$(DESTDIR)/usr/share/ppd
+-PPD=$(PREFIX)/share/ppd
 +PPD=$(DESTDIR)$(PREFIX)/ppd
  VARPPD=/var/lp/ppd
  install-ppd:
  	#
-@@ -885,6 +870,7 @@ install-ppd:
+@@ -878,6 +863,7 @@ install-ppd:
  	fi
  	#
  	export PATH=$$PATH:`pwd`:; \
diff --git a/print/foo2zjs/files/patch-foo2hiperc-wrapper.in b/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
index 2a6fbc7578af..39074770bd7e 100644
--- a/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
+++ b/print/foo2zjs/files/patch-foo2hiperc-wrapper.in
@@ -1,5 +1,5 @@
---- foo2hiperc-wrapper.in.orig	2013-12-02 00:25:17.000000000 +0400
-+++ foo2hiperc-wrapper.in	2014-03-31 13:01:56.653808270 +0400
+--- foo2hiperc-wrapper.in.orig	2013-12-01 20:25:17 UTC
++++ foo2hiperc-wrapper.in
 @@ -48,10 +48,6 @@ PATH=$PATH:.
  #
  #	Log the command line, for debugging and problem reports
@@ -22,7 +22,18 @@
  else
          GSBIN=${GSBIN:-gs}
  fi
-@@ -723,18 +719,6 @@ $PREFILTER \
+@@ -539,10 +535,6 @@ create_crd() {
+ 	none | none.icm | */none.icm)
+ 	    ;;
+ 	*)
+-	    if [ -x /usr/bin/logger ]; then
+-		logger -t "$BASENAME" -p lpr.info -- \
+-		"`basename $ICC2PS` -o $GAMMAFILE -t$INTENT > $ICCTMP.crd.ps"
+-	    fi
+ 	    $ICC2PS -o $GAMMAFILE -t$INTENT > $ICCTMP.crd.ps 2>$ICCTMP.log \
+ 		|| error "Problem converting .ICM file to Postscript"
+ 	    ;;
+@@ -723,18 +715,6 @@ $PREFILTER \
  	    $BC $AIB $COLOR2MONO $NOPLANES $EXTRAPAD $COMPRESSED -D$DEBUG
  
  #
diff --git a/print/foo2zjs/pkg-plist b/print/foo2zjs/pkg-plist
index c28ff45a65b3..11d018bc9661 100644
--- a/print/foo2zjs/pkg-plist
+++ b/print/foo2zjs/pkg-plist
@@ -121,6 +121,7 @@ foomatic/db/source/opt/foo2zjs-z3-MediaType.xml
 foomatic/db/source/opt/foo2zjs-z3-PageSize.xml
 foomatic/db/source/printer/Dell-1355.xml
 foomatic/db/source/printer/Dell-C1765.xml
+foomatic/db/source/printer/Epson-AcuLaser_CX17NF.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_CM215.xml
@@ -202,6 +203,8 @@ foomatic/db/source/printer/Samsung-CLX-2160.xml
 foomatic/db/source/printer/Samsung-CLX-3160.xml
 foomatic/db/source/printer/Samsung-CLX-3175.xml
 foomatic/db/source/printer/Samsung-CLX-3185.xml
+foomatic/db/source/printer/Xerox-Phaser_3010.xml
+foomatic/db/source/printer/Xerox-Phaser_3040.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
@@ -209,6 +212,7 @@ foomatic/db/source/printer/Xerox-WorkCentre_3045.xml
 foomatic/db/source/printer/Xerox-WorkCentre_6015.xml
 share/cups/model/Dell-1355.ppd.gz
 share/cups/model/Dell-C1765.ppd.gz
+share/cups/model/Epson-AcuLaser_CX17NF.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_CM215.ppd.gz
@@ -290,6 +294,8 @@ share/cups/model/Samsung-CLX-2160.ppd.gz
 share/cups/model/Samsung-CLX-3160.ppd.gz
 share/cups/model/Samsung-CLX-3175.ppd.gz
 share/cups/model/Samsung-CLX-3185.ppd.gz
+share/cups/model/Xerox-Phaser_3010.ppd.gz
+share/cups/model/Xerox-Phaser_3040.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