diff options
| author | tron <tron> | 2010-07-29 13:55:26 +0000 |
|---|---|---|
| committer | tron <tron> | 2010-07-29 13:55:26 +0000 |
| commit | 380919794cd4255baf58d3e5b123fa5971c705b4 (patch) | |
| tree | dc7ddeca267d599893dae267a8d13155f0e59708 | |
| parent | d5634942e6ac95fac683ba00267ae19c454c4491 (diff) | |
| download | pkgsrc-380919794cd4255baf58d3e5b123fa5971c705b4.tar.gz | |
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.
| -rw-r--r-- | print/gv/Makefile | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/print/gv/Makefile b/print/gv/Makefile index 3814b3736f2..0e356ba70ef 100644 --- a/print/gv/Makefile +++ b/print/gv/Makefile @@ -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 @@ XAW_TYPE= 3d 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 @@ SUBST_SED.optlong2= -e 's/\[\\-\]\\-/\\-\\-/' 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" |