diff options
author | jaapb <jaapb> | 2013-08-02 13:24:10 +0000 |
---|---|---|
committer | jaapb <jaapb> | 2013-08-02 13:24:10 +0000 |
commit | dc0555cbb51d1fa9befcf40404c2464d42558798 (patch) | |
tree | 87e401a1a95fd5851b062d4ae7b15ac15dc600cd /devel | |
parent | 7508901f8a1e4f443d3298cf0436f53e8bc65f73 (diff) | |
download | pkgsrc-dc0555cbb51d1fa9befcf40404c2464d42558798.tar.gz |
Updated package to fix PR pkg/47709 - didn't fix all of the pre-existing
pkglint errors, but the problem described in the problem report is fixed.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/swig/Makefile | 4 | ||||
-rw-r--r-- | devel/swig/distinfo | 4 | ||||
-rw-r--r-- | devel/swig/patches/patch-ab | 29 | ||||
-rw-r--r-- | devel/swig/patches/patch-configure | 44 |
4 files changed, 48 insertions, 33 deletions
diff --git a/devel/swig/Makefile b/devel/swig/Makefile index 7867da2d402..2da7161a207 100644 --- a/devel/swig/Makefile +++ b/devel/swig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2013/07/06 23:11:51 wiz Exp $ +# $NetBSD: Makefile,v 1.35 2013/08/02 13:24:10 jaapb Exp $ DISTNAME= swig-1.3.36 PKGREVISION= 4 @@ -28,7 +28,7 @@ CONFLICTS= swig-build-[0-9]* CONFIGURE_ARGS+= --with-swiglibdir=${PREFIX}/share/swig/1.3 BUILD_TARGET= swig -USE_TOOLS+= gmake pax +USE_TOOLS+= gmake pax perl GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_LIBTOOL= YES diff --git a/devel/swig/distinfo b/devel/swig/distinfo index 849923ec65f..d2e2f89d9e0 100644 --- a/devel/swig/distinfo +++ b/devel/swig/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2013/07/06 23:11:51 wiz Exp $ +$NetBSD: distinfo,v 1.14 2013/08/02 13:24:10 jaapb Exp $ SHA1 (swig-1.3.36.tar.gz) = eed715da3200f45cfe688a64ab6630eadf118ae4 RMD160 (swig-1.3.36.tar.gz) = bd57f6837de1dc3aebefd9ad23a52235deefcd33 @@ -7,5 +7,5 @@ SHA1 (patch-Lib_lua_luaruntime.swg) = 0ba6aa9a053522bea896bf27dee7ffb55ed4a2be SHA1 (patch-Lib_std_std__container.i) = e4bb2b51b88651adfcec63318d8a228e7f3f8971 SHA1 (patch-Source_Modules_lua.cxx) = 946c2475f3fefa2f15a629d965c620c5de8a2002 SHA1 (patch-aa) = 23ab2782b586bc550e97eb0e599e182c58fc57f2 -SHA1 (patch-ab) = dce47bdffbd0d600aff8ca2486e4d9458c739549 SHA1 (patch-ad) = f5787be95bb896cdba0f42587c4f586caed9b7a2 +SHA1 (patch-configure) = 38e8787087364f5b8b5cc2fdb909ffff83681a9e diff --git a/devel/swig/patches/patch-ab b/devel/swig/patches/patch-ab deleted file mode 100644 index 217041be634..00000000000 --- a/devel/swig/patches/patch-ab +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ab,v 1.5 2013/07/06 23:11:51 wiz Exp $ - ---- configure.orig 2008-06-24 23:26:52.000000000 +0000 -+++ configure -@@ -8805,19 +8805,19 @@ echo $ECHO_N "checking for Ocaml version - isolate_b_regex='\([0-9]\+\).*' - for ver_part in $nodots_a ; do - b_ver_part=`echo "$ver_b" | sed -e 's/'"$isolate_b_regex"'/\1/'` -- if test \( "$ver_part" -lt "$b_ver_part" \) -a \( "x$condition" == "xequal" \) ; then -+ if test \( "$ver_part" -lt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then - condition=less -- elif test \( "$ver_part" -gt "$b_ver_part" \) -a \( "x$condition" == "xequal" \) ; then -+ elif test \( "$ver_part" -gt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then - condition=greater - fi - isolate_b_regex='[0-9]\+\.'"$isolate_b_regex" - done - -- if test "x$condition" == "xequal" ; then -+ if test "x$condition" = "xequal" ; then - : -- elif test "x$condition" == "xless" ; then -+ elif test "x$condition" = "xless" ; then - : -- elif test "x$condition" == "xgreater" ; then -+ elif test "x$condition" = "xgreater" ; then - OCAMLLOC=_loc - fi - diff --git a/devel/swig/patches/patch-configure b/devel/swig/patches/patch-configure new file mode 100644 index 00000000000..cc3694aa4ef --- /dev/null +++ b/devel/swig/patches/patch-configure @@ -0,0 +1,44 @@ +$NetBSD: patch-configure,v 1.1 2013/08/02 13:24:10 jaapb Exp $ + +Correctly detect MZScheme, and use proper test operators +--- configure.orig 2013-08-01 16:04:48.000000000 +0000 ++++ configure +@@ -8187,7 +8187,13 @@ fi + if test -n "$MZSCHEME"; then + { echo "$as_me:$LINENO: checking for MzScheme dynext object" >&5 + echo $ECHO_N "checking for MzScheme dynext object... $ECHO_C" >&6; } ++MZDYNOBJ=`$MZSCHEME --eval '(begin (require dynext/link) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (printf "~a" x)) (expand-for-link-variant (current-standard-link-libraries)))))' 2>/dev/null` ++if test -f "$MZDYNOBJ"; then ++: ++else ++# older versions (3.72 approx and earlier) + MZDYNOBJ=`$MZSCHEME --mute-banner --version --eval '(begin (require (lib "link.ss" "dynext")) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) ((current-make-standard-link-libraries)))) (with-handlers (((lambda args #t) (lambda args #f))) (for-each (lambda (x) (display x) (display " ")) (expand-for-link-variant (current-standard-link-libraries)))))'` ++fi + { echo "$as_me:$LINENO: result: $MZDYNOBJ" >&5 + echo "${ECHO_T}$MZDYNOBJ" >&6; } + fi +@@ -8805,19 +8811,19 @@ echo $ECHO_N "checking for Ocaml version + isolate_b_regex='\([0-9]\+\).*' + for ver_part in $nodots_a ; do + b_ver_part=`echo "$ver_b" | sed -e 's/'"$isolate_b_regex"'/\1/'` +- if test \( "$ver_part" -lt "$b_ver_part" \) -a \( "x$condition" == "xequal" \) ; then ++ if test \( "$ver_part" -lt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then + condition=less +- elif test \( "$ver_part" -gt "$b_ver_part" \) -a \( "x$condition" == "xequal" \) ; then ++ elif test \( "$ver_part" -gt "$b_ver_part" \) -a \( "x$condition" = "xequal" \) ; then + condition=greater + fi + isolate_b_regex='[0-9]\+\.'"$isolate_b_regex" + done + +- if test "x$condition" == "xequal" ; then ++ if test "x$condition" = "xequal" ; then + : +- elif test "x$condition" == "xless" ; then ++ elif test "x$condition" = "xless" ; then + : +- elif test "x$condition" == "xgreater" ; then ++ elif test "x$condition" = "xgreater" ; then + OCAMLLOC=_loc + fi + |