print/foo2zjs: fix runtime problems with paths and sed

* the syntax used for sed is not compatible with all sed
implementations, so depend on gsed and use it on all platforms
* before this, foo2qpdl-wrapper & co. would be searching for CMS
and other files in ${DESTDIR}${PREFIX} instead of ${PREFIX}
* also install crd files (needed for functioning CMS)

PKGREVISION bumped.

Ok@ wiz

5 files changed, 113 insertions, 11 deletions

diff --git a/print/foo2zjs/Makefile b/print/foo2zjs/Makefile
index c6ebc7cafed..bb8b664ede7 100644
--- a/print/foo2zjs/Makefile
+++ b/print/foo2zjs/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2014/09/24 13:44:21 jperkin Exp $
+# $NetBSD: Makefile,v 1.4 2015/07/28 16:42:03 rumko Exp $
 #
 
 DISTNAME=	foo2zjs
 PKGNAME=	${DISTNAME}-20120516
+PKGREVISION=	1
 CATEGORIES=	print
 MASTER_SITES=	http://foo2zjs.rkkda.com/
 
@@ -11,7 +12,7 @@ HOMEPAGE=	http://foo2zjs.rkkda.com/
 COMMENT=	Printer driver for Zenographics ZjStream wire protocol
 LICENSE=	gnu-gpl-v2
 
-USE_TOOLS+=	gmake groff
+USE_TOOLS+=	gmake groff gsed:run
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 INSTALLATION_DIRS+=	share/foo2zjs share/foomatic/ppd/foo2zjs
@@ -23,13 +24,14 @@ SUBST_MESSAGE.paths=	Fix PREFIX.
 SUBST_FILES.paths=	Makefile icc2ps/Makefile
 SUBST_SED.paths=	-e "s,@PREFIX@,${DESTDIR}${PREFIX},"
 SUBST_SED.paths+=	-e "s,@PKGMANDIR@,${DESTDIR}${PREFIX}/${PKGMANDIR},"
+SUBST_SED.paths+=	-e "s,@RUNPREFIX@,${PREFIX},"
 SUBST_STAGE.paths=	post-patch
 
 do-build:
 	cd ${WRKSRC} && ${GMAKE} ${PROGS}
 
 do-install:
-	cd ${WRKSRC} && ${GMAKE} install-prog install-man
+	cd ${WRKSRC} && ${GMAKE} install-prog install-man install-crd
 	# cheaper than upstream's "portable" Makefile
 	${INSTALL_DATA} ${WRKSRC}/PPD/*.ppd	\
 		${DESTDIR}${PREFIX}/share/foomatic/ppd/foo2zjs
diff --git a/print/foo2zjs/PLIST b/print/foo2zjs/PLIST
index a25cbf0dbab..d955906733d 100644
--- a/print/foo2zjs/PLIST
+++ b/print/foo2zjs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/25 17:15:45 imil Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/07/28 16:42:03 rumko Exp $
 bin/arm2hpdl
 bin/foo2hiperc
 bin/foo2hiperc-wrapper
@@ -59,6 +59,24 @@ man/man1/slxdecode.1
 man/man1/usb_printerid.1
 man/man1/xqxdecode.1
 man/man1/zjsdecode.1
+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/foomatic/ppd/foo2zjs/Generic-OAKT_Printer.ppd
diff --git a/print/foo2zjs/distinfo b/print/foo2zjs/distinfo
index 96cb541b2d4..c48f56f44e8 100644
--- a/print/foo2zjs/distinfo
+++ b/print/foo2zjs/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.3 2014/09/24 13:44:21 jperkin Exp $
+$NetBSD: distinfo,v 1.4 2015/07/28 16:42:03 rumko Exp $
 
 SHA1 (foo2zjs.tar.gz) = c1a3aeb88cca8b284685c3457a7cc33d78319147
 RMD160 (foo2zjs.tar.gz) = f24945860e41fda61342a9b867123202ecf82179
 Size (foo2zjs.tar.gz) = 1644122 bytes
-SHA1 (patch-Makefile) = ee1542db6f954d77e5e1dcdeb146f57cf9b8cb95
+SHA1 (patch-Makefile) = 439dcce6060d679232b66d38991e86e97a6085eb
+SHA1 (patch-foo2zjs-pstops.sh) = c872f1df99d780705773bf9bda51495975f859e2
 SHA1 (patch-icc2ps_Makefile) = dae8f19cc2fab130d1c4962a3bcbd7d37d8d2a09
diff --git a/print/foo2zjs/patches/patch-Makefile b/print/foo2zjs/patches/patch-Makefile
index 1ea1d739c01..57e5aa6bc32 100644
--- a/print/foo2zjs/patches/patch-Makefile
+++ b/print/foo2zjs/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$NetBSD: patch-Makefile,v 1.3 2014/09/24 13:44:21 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.4 2015/07/28 16:42:03 rumko Exp $
 
 Fix PREFIX path
 Remove extra dc check. The DragonFly version has dc that supports the -e
@@ -7,7 +7,7 @@ actually test for -e support.  Just remove it completely.
 
 --- Makefile.orig	2012-06-01 23:10:31.000000000 +0000
 +++ Makefile
-@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
+@@ -17,9 +17,8 @@ SYSNAME := $(shell uname -n)
  VERSION=0.0
  
  # Installation prefix...
@@ -15,10 +15,11 @@ actually test for -e support.  Just remove it completely.
 -PREFIX=/usr
 -PREFIX=$(DESTDIR)/usr
 +PREFIX=@PREFIX@
++RUNPREFIX=@RUNPREFIX@
  
  # Pathnames for this package...
  BIN=$(PREFIX)/bin
-@@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
+@@ -31,7 +30,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
  SHAREQPDL=$(PREFIX)/share/foo2qpdl
  SHARESLX=$(PREFIX)/share/foo2slx
  SHAREHC=$(PREFIX)/share/foo2hiperc
@@ -27,7 +28,7 @@ actually test for -e support.  Just remove it completely.
  DOCDIR=$(PREFIX)/share/doc/foo2zjs/
  INSTALL=install
  ROOT=root
-@@ -58,7 +56,7 @@ endif
+@@ -58,7 +57,7 @@ endif
  ifeq ($(UNAME),SunOS)
      LPuid=-oroot
      LPgid=-glp
@@ -36,7 +37,7 @@ actually test for -e support.  Just remove it completely.
  endif
  # If we aren't root, don't try to set ownership
  ifneq ($(EUID),0)
-@@ -409,12 +407,6 @@ all-test:
+@@ -409,12 +408,6 @@ all-test:
  	    echo "      ***"; \
  	    exit 1; \
  	fi
@@ -49,3 +50,68 @@ actually test for -e support.  Just remove it completely.
  ifeq ($(UNAME),Darwin)
  	@if ! type gsed >/dev/null 2>&1; then \
  	    echo "      ***"; \
+@@ -469,55 +462,55 @@ foo2hiperc: foo2hiperc.o $(LIBJBG)
+ foo2zjs-wrapper: foo2zjs-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2hp2600-wrapper: foo2hp2600-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2xqx-wrapper: foo2xqx-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2lava-wrapper: foo2lava-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2qpdl-wrapper: foo2qpdl-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2oak-wrapper: foo2oak-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2slx-wrapper: foo2slx-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2hiperc-wrapper: foo2hiperc-wrapper.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ foo2zjs-wrapper9: foo2zjs-wrapper9.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+ 	sed < $@.in > $@ \
+-	    -e 's@^PREFIX=.*@PREFIX=$(PREFIX)@' || (rm -f $@ && exit 1)
++	    -e 's@^PREFIX=.*@PREFIX=$(RUNPREFIX)@' || (rm -f $@ && exit 1)
+ 	chmod 555 $@
+ 
+ 
diff --git a/print/foo2zjs/patches/patch-foo2zjs-pstops.sh b/print/foo2zjs/patches/patch-foo2zjs-pstops.sh
new file mode 100644
index 00000000000..a63136818ec
--- /dev/null
+++ b/print/foo2zjs/patches/patch-foo2zjs-pstops.sh
@@ -0,0 +1,15 @@
+$NetBSD: patch-foo2zjs-pstops.sh,v 1.1 2015/07/28 16:42:03 rumko Exp $
+
+Use gsed on all systems instead of just Darwin.
+
+--- foo2zjs-pstops.sh.orig	2012-02-23 21:19:46.000000000 +0000
++++ foo2zjs-pstops.sh
+@@ -48,7 +48,7 @@ debug() {
+ #
+ case `uname -s` in
+ Darwin)	sed=gsed;;
+-*)	sed=sed;;
++*)	sed=gsed;;
+ esac
+ 
+ #