Wed Sep 24 13:44:21 2014 UTC ()
Requires USE_TOOLS+=groff, fix $INSTALL command on SunOS.


(jperkin)
diff -r1.2 -r1.3 pkgsrc/print/foo2zjs/Makefile
diff -r1.2 -r1.3 pkgsrc/print/foo2zjs/distinfo
diff -r1.2 -r1.3 pkgsrc/print/foo2zjs/patches/patch-Makefile
diff -r1.1 -r1.2 pkgsrc/print/foo2zjs/patches/patch-icc2ps_Makefile
cvs diff -r1.2 -r1.3 pkgsrc/print/foo2zjs/Makefile (expand / switch to unified diff)

--- pkgsrc/print/foo2zjs/Makefile 2012/10/08 13:45:38 1.2
+++ pkgsrc/print/foo2zjs/Makefile 2014/09/24 13:44:21 1.3
@@ -1,27 +1,27 @@ @@ -1,27 +1,27 @@
1# $NetBSD: Makefile,v 1.2 2012/10/08 13:45:38 asau Exp $ 1# $NetBSD: Makefile,v 1.3 2014/09/24 13:44:21 jperkin Exp $
2# 2#
3 3
4DISTNAME= foo2zjs 4DISTNAME= foo2zjs
5PKGNAME= ${DISTNAME}-20120516 5PKGNAME= ${DISTNAME}-20120516
6CATEGORIES= print 6CATEGORIES= print
7MASTER_SITES= http://foo2zjs.rkkda.com/ 7MASTER_SITES= http://foo2zjs.rkkda.com/
8 8
9MAINTAINER= imil@NetBSD.org 9MAINTAINER= imil@NetBSD.org
10HOMEPAGE= http://foo2zjs.rkkda.com/ 10HOMEPAGE= http://foo2zjs.rkkda.com/
11COMMENT= Printer driver for Zenographics ZjStream wire protocol 11COMMENT= Printer driver for Zenographics ZjStream wire protocol
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14USE_TOOLS+= gmake 14USE_TOOLS+= gmake groff
15 15
16INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 16INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1
17INSTALLATION_DIRS+= share/foo2zjs share/foomatic/ppd/foo2zjs 17INSTALLATION_DIRS+= share/foo2zjs share/foomatic/ppd/foo2zjs
18 18
19DEPENDS+= foomatic-filters-cups>=3.0:../../print/foomatic-filters-cups 19DEPENDS+= foomatic-filters-cups>=3.0:../../print/foomatic-filters-cups
20 20
21SUBST_CLASSES+= paths 21SUBST_CLASSES+= paths
22SUBST_MESSAGE.paths= Fix PREFIX. 22SUBST_MESSAGE.paths= Fix PREFIX.
23SUBST_FILES.paths= Makefile icc2ps/Makefile 23SUBST_FILES.paths= Makefile icc2ps/Makefile
24SUBST_SED.paths= -e "s,@PREFIX@,${DESTDIR}${PREFIX}," 24SUBST_SED.paths= -e "s,@PREFIX@,${DESTDIR}${PREFIX},"
25SUBST_SED.paths+= -e "s,@PKGMANDIR@,${DESTDIR}${PREFIX}/${PKGMANDIR}," 25SUBST_SED.paths+= -e "s,@PKGMANDIR@,${DESTDIR}${PREFIX}/${PKGMANDIR},"
26SUBST_STAGE.paths= post-patch 26SUBST_STAGE.paths= post-patch
27 27
cvs diff -r1.2 -r1.3 pkgsrc/print/foo2zjs/distinfo (expand / switch to unified diff)

--- pkgsrc/print/foo2zjs/distinfo 2012/08/10 16:30:53 1.2
+++ pkgsrc/print/foo2zjs/distinfo 2014/09/24 13:44:21 1.3
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.2 2012/08/10 16:30:53 marino Exp $ 1$NetBSD: distinfo,v 1.3 2014/09/24 13:44:21 jperkin Exp $
2 2
3SHA1 (foo2zjs.tar.gz) = c1a3aeb88cca8b284685c3457a7cc33d78319147 3SHA1 (foo2zjs.tar.gz) = c1a3aeb88cca8b284685c3457a7cc33d78319147
4RMD160 (foo2zjs.tar.gz) = f24945860e41fda61342a9b867123202ecf82179 4RMD160 (foo2zjs.tar.gz) = f24945860e41fda61342a9b867123202ecf82179
5Size (foo2zjs.tar.gz) = 1644122 bytes 5Size (foo2zjs.tar.gz) = 1644122 bytes
6SHA1 (patch-Makefile) = 8d1971b7c70def74dc68c1943f4a629610860d85 6SHA1 (patch-Makefile) = ee1542db6f954d77e5e1dcdeb146f57cf9b8cb95
7SHA1 (patch-icc2ps_Makefile) = 14dded40d85dcf75428277621b766963be837c12 7SHA1 (patch-icc2ps_Makefile) = dae8f19cc2fab130d1c4962a3bcbd7d37d8d2a09
cvs diff -r1.2 -r1.3 pkgsrc/print/foo2zjs/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/print/foo2zjs/patches/patch-Makefile 2012/08/10 16:30:53 1.2
+++ pkgsrc/print/foo2zjs/patches/patch-Makefile 2014/09/24 13:44:21 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-Makefile,v 1.2 2012/08/10 16:30:53 marino Exp $ 1$NetBSD: patch-Makefile,v 1.3 2014/09/24 13:44:21 jperkin Exp $
2 2
3Fix PREFIX path 3Fix PREFIX path
4Remove extra dc check. The DragonFly version has dc that supports the -e 4Remove extra dc check. The DragonFly version has dc that supports the -e
5option, but it doesn't support -V. It's a bad check, the conftest should 5option, but it doesn't support -V. It's a bad check, the conftest should
6actually test for -e support. Just remove it completely. 6actually test for -e support. Just remove it completely.
7 7
8--- Makefile.orig 2012-06-01 23:10:31.000000000 +0000 8--- Makefile.orig 2012-06-01 23:10:31.000000000 +0000
9+++ Makefile 9+++ Makefile
10@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n) 10@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
11 VERSION=0.0 11 VERSION=0.0
12  12
13 # Installation prefix... 13 # Installation prefix...
14-PREFIX=/usr/local 14-PREFIX=/usr/local
@@ -17,26 +17,35 @@ actually test for -e support. Just remo @@ -17,26 +17,35 @@ actually test for -e support. Just remo
17+PREFIX=@PREFIX@ 17+PREFIX=@PREFIX@
18  18
19 # Pathnames for this package... 19 # Pathnames for this package...
20 BIN=$(PREFIX)/bin 20 BIN=$(PREFIX)/bin
21@@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava 21@@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
22 SHAREQPDL=$(PREFIX)/share/foo2qpdl 22 SHAREQPDL=$(PREFIX)/share/foo2qpdl
23 SHARESLX=$(PREFIX)/share/foo2slx 23 SHARESLX=$(PREFIX)/share/foo2slx
24 SHAREHC=$(PREFIX)/share/foo2hiperc 24 SHAREHC=$(PREFIX)/share/foo2hiperc
25-MANDIR=$(PREFIX)/share/man 25-MANDIR=$(PREFIX)/share/man
26+MANDIR=@PKGMANDIR@ 26+MANDIR=@PKGMANDIR@
27 DOCDIR=$(PREFIX)/share/doc/foo2zjs/ 27 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
28 INSTALL=install 28 INSTALL=install
29 ROOT=root 29 ROOT=root
 30@@ -58,7 +56,7 @@ endif
 31 ifeq ($(UNAME),SunOS)
 32 LPuid=-oroot
 33 LPgid=-glp
 34- INSTALL=/usr/ucb/install
 35+ #INSTALL=/usr/ucb/install
 36 endif
 37 # If we aren't root, don't try to set ownership
 38 ifneq ($(EUID),0)
30@@ -409,12 +407,6 @@ all-test: 39@@ -409,12 +407,6 @@ all-test:
31 echo " ***"; \ 40 echo " ***"; \
32 exit 1; \ 41 exit 1; \
33 fi 42 fi
34- @if ! dc -V >/dev/null 2>&1; then \ 43- @if ! dc -V >/dev/null 2>&1; then \
35- echo " ***"; \ 44- echo " ***"; \
36- echo " *** Error: must install GNU dc with the -e option!"; \ 45- echo " *** Error: must install GNU dc with the -e option!"; \
37- echo " ***"; \ 46- echo " ***"; \
38- exit 1; \ 47- exit 1; \
39- fi 48- fi
40 ifeq ($(UNAME),Darwin) 49 ifeq ($(UNAME),Darwin)
41 @if ! type gsed >/dev/null 2>&1; then \ 50 @if ! type gsed >/dev/null 2>&1; then \
42 echo " ***"; \ 51 echo " ***"; \
cvs diff -r1.1 -r1.2 pkgsrc/print/foo2zjs/patches/patch-icc2ps_Makefile (expand / switch to unified diff)

--- pkgsrc/print/foo2zjs/patches/patch-icc2ps_Makefile 2012/07/25 17:15:45 1.1
+++ pkgsrc/print/foo2zjs/patches/patch-icc2ps_Makefile 2014/09/24 13:44:21 1.2
@@ -1,18 +1,27 @@ @@ -1,18 +1,27 @@
1$NetBSD: patch-icc2ps_Makefile,v 1.1 2012/07/25 17:15:45 imil Exp $ 1$NetBSD: patch-icc2ps_Makefile,v 1.2 2014/09/24 13:44:21 jperkin Exp $
2 2
3Fix PREFIX path 3Fix PREFIX path
4 4
5--- icc2ps/Makefile.orig 2010-11-27 10:04:56.000000000 +0000 5--- icc2ps/Makefile.orig 2010-11-27 10:04:56.000000000 +0000
6+++ icc2ps/Makefile 6+++ icc2ps/Makefile
7@@ -1,9 +1,8 @@ 7@@ -1,9 +1,8 @@
8 UNAME := $(shell uname) 8 UNAME := $(shell uname)
9  9
10-PREFIX= /usr 10-PREFIX= /usr
11-PREFIX= $(DESTDIR)/usr 11-PREFIX= $(DESTDIR)/usr
12+PREFIX= @PREFIX@ 12+PREFIX= @PREFIX@
13 BIN= $(PREFIX)/bin 13 BIN= $(PREFIX)/bin
14-MANDIR=$(PREFIX)/share/man 14-MANDIR=$(PREFIX)/share/man
15+MANDIR= @PKGMANDIR@ 15+MANDIR= @PKGMANDIR@
16  16
17 SRC= icc2ps.c xgetopt.c 17 SRC= icc2ps.c xgetopt.c
18 LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \ 18 LIB= cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
 19@@ -12,7 +11,7 @@ LIB= cmscam97.c cmscnvrt.c cmserr.c cmsg
 20 CFLAGS= -O3
 21 INSTALL=install
 22 ifeq ($(UNAME),SunOS)
 23- INSTALL=/usr/ucb/install
 24+ #INSTALL=/usr/ucb/install
 25 CC=gcc
 26 endif
 27