Fri Aug 10 16:30:53 2012 UTC ()
print/foo2zjs: Remove bad dependency check of dc

The package assumes that if the dc program doesn't support -V, it must
not support -e either.  This is a bad assumption; DragonFly supports
-e but doesn't support -V.  Rather than try to fix a bad conftest, just
remove it completely.  There's a previous test for dc presence.  If dc
doesn't support -e, let it break during the build rather than before it.
It doesn't take long to build.


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

--- pkgsrc/print/foo2zjs/distinfo 2012/07/25 17:15:45 1.1
+++ pkgsrc/print/foo2zjs/distinfo 2012/08/10 16:30:53 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1 2012/07/25 17:15:45 imil Exp $ 1$NetBSD: distinfo,v 1.2 2012/08/10 16:30:53 marino 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) = f12220eb3b77bafd63386ed7a1018dbacb9ae821 6SHA1 (patch-Makefile) = 8d1971b7c70def74dc68c1943f4a629610860d85
7SHA1 (patch-icc2ps_Makefile) = 14dded40d85dcf75428277621b766963be837c12 7SHA1 (patch-icc2ps_Makefile) = 14dded40d85dcf75428277621b766963be837c12
cvs diff -r1.1 -r1.2 pkgsrc/print/foo2zjs/patches/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/print/foo2zjs/patches/patch-Makefile 2012/07/25 17:15:45 1.1
+++ pkgsrc/print/foo2zjs/patches/patch-Makefile 2012/08/10 16:30:53 1.2
@@ -1,26 +1,42 @@ @@ -1,26 +1,42 @@
1$NetBSD: patch-Makefile,v 1.1 2012/07/25 17:15:45 imil Exp $ 1$NetBSD: patch-Makefile,v 1.2 2012/08/10 16:30:53 marino Exp $
2 2
3Fix PREFIX path 3Fix PREFIX path
 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
 6actually test for -e support. Just remove it completely.
4 7
5--- Makefile.orig 2012-06-01 23:10:31.000000000 +0000 8--- Makefile.orig 2012-06-01 23:10:31.000000000 +0000
6+++ Makefile 9+++ Makefile
7@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n) 10@@ -17,9 +17,7 @@ SYSNAME := $(shell uname -n)
8 VERSION=0.0 11 VERSION=0.0
9  12
10 # Installation prefix... 13 # Installation prefix...
11-PREFIX=/usr/local 14-PREFIX=/usr/local
12-PREFIX=/usr 15-PREFIX=/usr
13-PREFIX=$(DESTDIR)/usr 16-PREFIX=$(DESTDIR)/usr
14+PREFIX=@PREFIX@ 17+PREFIX=@PREFIX@
15  18
16 # Pathnames for this package... 19 # Pathnames for this package...
17 BIN=$(PREFIX)/bin 20 BIN=$(PREFIX)/bin
18@@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava 21@@ -31,7 +29,7 @@ SHARELAVA=$(PREFIX)/share/foo2lava
19 SHAREQPDL=$(PREFIX)/share/foo2qpdl 22 SHAREQPDL=$(PREFIX)/share/foo2qpdl
20 SHARESLX=$(PREFIX)/share/foo2slx 23 SHARESLX=$(PREFIX)/share/foo2slx
21 SHAREHC=$(PREFIX)/share/foo2hiperc 24 SHAREHC=$(PREFIX)/share/foo2hiperc
22-MANDIR=$(PREFIX)/share/man 25-MANDIR=$(PREFIX)/share/man
23+MANDIR=@PKGMANDIR@ 26+MANDIR=@PKGMANDIR@
24 DOCDIR=$(PREFIX)/share/doc/foo2zjs/ 27 DOCDIR=$(PREFIX)/share/doc/foo2zjs/
25 INSTALL=install 28 INSTALL=install
26 ROOT=root 29 ROOT=root
 30@@ -409,12 +407,6 @@ all-test:
 31 echo " ***"; \
 32 exit 1; \
 33 fi
 34- @if ! dc -V >/dev/null 2>&1; then \
 35- echo " ***"; \
 36- echo " *** Error: must install GNU dc with the -e option!"; \
 37- echo " ***"; \
 38- exit 1; \
 39- fi
 40 ifeq ($(UNAME),Darwin)
 41 @if ! type gsed >/dev/null 2>&1; then \
 42 echo " ***"; \