[pkgsrc/pkgsrc-2010Q2]: pkgsrc/print/gv Pullup ticket #3193 - requested by ob...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4c2737f98bcd
branches:  pkgsrc-2010Q2
changeset: 576934:4c2737f98bcd
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Jul 29 13:55:26 2010 +0000

description:
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.

diffstat:

 print/gv/Makefile |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r b82cbf925029 -r 4c2737f98bcd print/gv/Makefile
--- a/print/gv/Makefile Thu Jul 29 13:21:39 2010 +0000
+++ b/print/gv/Makefile Thu Jul 29 13:55:26 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70.4.1 2010/07/29 13:10:55 tron Exp $
+# $NetBSD: Makefile,v 1.70.4.2 2010/07/29 13:55:26 tron Exp $
 
 DISTNAME=      gv-3.7.1
 CATEGORIES=    print
@@ -32,10 +32,15 @@
 CONFIGURE_ARGS+=       --enable-setenv-code
 .endif
 
-.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin"
+.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "Darwin" \
+       || ${OPSYS} == "OpenBSD" || ${OPSYS} == "DragonFly"
 CONFIGURE_ARGS+=       --enable-SIGCHLD-fallback
 .endif
 
+# XXX: bad configure test for libiconv from pkgsrc, so skip it.
+CONFIGURE_ENV+=                ac_cv_lib_iconv_iconv_open=yes
+LIBS+=                 ${BUILDLINK_LDADD.iconv}
+
 SUBST_CLASSES+=                optlong1
 SUBST_STAGE.optlong1=  post-extract
 SUBST_FILES.optlong1=  src/gv_message.h
@@ -48,6 +53,7 @@
 
 REPLACE_PERL+=         src/gv-update-userconfig.in
 
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libgetopt/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../mk/xaw.buildlink3.mk"