Thu Jul 29 13:55:26 2010 UTC ()
Pullup ticket #3193 - requested by obache
print/gv: security update

Revisions pulled up:
- print/gv/Makefile			1.72-1.73
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Mon Jul 26 14:40:22 UTC 2010

Modified Files:
	pkgsrc/print/gv: Makefile

Log Message:
* Also need SIGCHLD-fallback for OpenBSD and DragonFly
* using iconv, so buildlink with libiconv
XXX: but failed to link with libiconv from pkgsrc, bad configure test.
---
Module Name:	pkgsrc
Committed By:	obache
Date:		Mon Jul 26 14:57:51 UTC 2010

Modified Files:
	pkgsrc/print/gv: Makefile

Log Message:
Skip iconv_open in libiconv check in configure script.
It always failed with libiconv from pkgsrc.


(tron)
diff -r1.70.4.1 -r1.70.4.2 pkgsrc/print/gv/Makefile
cvs diff -r1.70.4.1 -r1.70.4.2 pkgsrc/print/gv/Makefile (expand / switch to unified diff)

--- pkgsrc/print/gv/Makefile 2010/07/29 13:10:55 1.70.4.1
+++ pkgsrc/print/gv/Makefile 2010/07/29 13:55:26 1.70.4.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.70.4.1 2010/07/29 13:10:55 tron Exp $ 1# $NetBSD: Makefile,v 1.70.4.2 2010/07/29 13:55:26 tron Exp $
2 2
3DISTNAME= gv-3.7.1 3DISTNAME= gv-3.7.1
4CATEGORIES= print 4CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_GNU:=gv/} 5MASTER_SITES= ${MASTER_SITE_GNU:=gv/}
6 6
7MAINTAINER= pkgsrc-users@NetBSD.org 7MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://www.gnu.org/software/gv/ 8HOMEPAGE= http://www.gnu.org/software/gv/
9COMMENT= PostScript and PDF previewer 9COMMENT= PostScript and PDF previewer
10LICENSE= gnu-gpl-v3 10LICENSE= gnu-gpl-v3
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
@@ -22,33 +22,39 @@ LIBS+= ${BUILDLINK_LDADD.getopt} @@ -22,33 +22,39 @@ LIBS+= ${BUILDLINK_LDADD.getopt}
22XAW_TYPE?= 3d 22XAW_TYPE?= 3d
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24.if ${XAW_TYPE} == "standard" 24.if ${XAW_TYPE} == "standard"
25XAW_TYPE= 3d 25XAW_TYPE= 3d
26.endif 26.endif
27 27
28# Solaris-2.{8,9}/sparc are missing setenv() and unsetenv() 28# Solaris-2.{8,9}/sparc are missing setenv() and unsetenv()
29# it is probably true that 5.6, 5.7, 5.8, and 5.9 all have 29# it is probably true that 5.6, 5.7, 5.8, and 5.9 all have
30# this problem. It appears that 5.10 does not need this flag. 30# this problem. It appears that 5.10 does not need this flag.
31.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6789]) 31.if ${OPSYS} == "SunOS" && !empty(OS_VERSION:M5.[6789])
32CONFIGURE_ARGS+= --enable-setenv-code 32CONFIGURE_ARGS+= --enable-setenv-code
33.endif 33.endif
34 34
35.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" 35.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" \
 36 || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
36CONFIGURE_ARGS+= --enable-SIGCHLD-fallback 37CONFIGURE_ARGS+= --enable-SIGCHLD-fallback
37.endif 38.endif
38 39
 40# XXX: bad configure test for libiconv from pkgsrc, so skip it.
 41CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes
 42LIBS+= ${BUILDLINK_LDADD.iconv}
 43
39SUBST_CLASSES+= optlong1 44SUBST_CLASSES+= optlong1
40SUBST_STAGE.optlong1= post-extract 45SUBST_STAGE.optlong1= post-extract
41SUBST_FILES.optlong1= src/gv_message.h 46SUBST_FILES.optlong1= src/gv_message.h
42SUBST_SED.optlong1= -e 's/\[-\]-/--/' 47SUBST_SED.optlong1= -e 's/\[-\]-/--/'
43 48
44SUBST_CLASSES+= optlong2 49SUBST_CLASSES+= optlong2
45SUBST_STAGE.optlong2= post-extract 50SUBST_STAGE.optlong2= post-extract
46SUBST_FILES.optlong2= doc/gv.1 51SUBST_FILES.optlong2= doc/gv.1
47SUBST_SED.optlong2= -e 's/\[\\-\]\\-/\\-\\-/' 52SUBST_SED.optlong2= -e 's/\[\\-\]\\-/\\-\\-/'
48 53
49REPLACE_PERL+= src/gv-update-userconfig.in 54REPLACE_PERL+= src/gv-update-userconfig.in
50 55
 56.include "../../converters/libiconv/buildlink3.mk"
51.include "../../devel/libgetopt/buildlink3.mk" 57.include "../../devel/libgetopt/buildlink3.mk"
52.include "../../x11/libXinerama/buildlink3.mk" 58.include "../../x11/libXinerama/buildlink3.mk"
53.include "../../mk/xaw.buildlink3.mk" 59.include "../../mk/xaw.buildlink3.mk"
54.include "../../mk/bsd.pkg.mk" 60.include "../../mk/bsd.pkg.mk"