summaryrefslogtreecommitdiff
path: root/lang/perl5
diff options
context:
space:
mode:
authordsainty <dsainty@pkgsrc.org>2014-06-04 00:21:33 +0000
committerdsainty <dsainty@pkgsrc.org>2014-06-04 00:21:33 +0000
commite1ce4c95f95d57c652aa9721a0576696b329519b (patch)
tree99ed0e5ab108b4e38097bbb583059d31ec9ddb16 /lang/perl5
parente5d491b57fda9f8187cf4d1ee6b93f83cec7fdbe (diff)
downloadpkgsrc-e1ce4c95f95d57c652aa9721a0576696b329519b.tar.gz
For Perl 5.20.0, update patch to not introduce an empty if/then/else block,
which some shells prohibit. Fixes build on Linux.
Diffstat (limited to 'lang/perl5')
-rw-r--r--lang/perl5/distinfo4
-rw-r--r--lang/perl5/patches/patch-ac13
2 files changed, 10 insertions, 7 deletions
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 39222574ba8..49687515c41 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.117 2014/05/29 07:57:07 adam Exp $
+$NetBSD: distinfo,v 1.118 2014/06/04 00:21:33 dsainty Exp $
SHA1 (perl-5.20.0.tar.bz2) = e925e4fc36e90eace19a1ca850f912618ba6788f
RMD160 (perl-5.20.0.tar.bz2) = a14fa854f2d50aa5f16ff3a982244dd6cd0c4730
@@ -6,7 +6,7 @@ Size (perl-5.20.0.tar.bz2) = 13770469 bytes
SHA1 (patch-Makefile.SH) = 4fceb8bc225ea784ecda3920e888f0ddb1aad997
SHA1 (patch-aa) = 441ad4f0d27d9be0fcdce31c9d35d35d98958518
SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
-SHA1 (patch-ac) = 7e26ac37d540fdb64a8c1b379f0bbb96efa77e56
+SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7
SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953
SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
SHA1 (patch-ca) = 7340d2858d5969d519b43b12e5701677b219bc84
diff --git a/lang/perl5/patches/patch-ac b/lang/perl5/patches/patch-ac
index 6144d12e5ac..c83eec3435b 100644
--- a/lang/perl5/patches/patch-ac
+++ b/lang/perl5/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.18 2014/05/29 07:57:07 adam Exp $
+$NetBSD: patch-ac,v 1.19 2014/06/04 00:21:33 dsainty Exp $
We intentionally wire down the 'libswanted' list in the package Makefile,
so don't let the hints file add new libraries that may be found outside
@@ -6,11 +6,14 @@ Pkgsrc control.
--- hints/linux.sh.orig 2014-05-26 13:34:20.000000000 +0000
+++ hints/linux.sh
-@@ -61,7 +61,6 @@ libswanted="$*"
+@@ -61,10 +61,6 @@
+
+ # Debian 4.0 puts ndbm in the -lgdbm_compat library.
echo $libs
- if echo " $libswanted " | grep -q ' gdbm '; then
- # Only add if gdbm is in libswanted.
+-if echo " $libswanted " | grep -q ' gdbm '; then
+- # Only add if gdbm is in libswanted.
- libswanted="$libswanted gdbm_compat"
- fi
+-fi
# Configure may fail to find lstat() since it's a static/inline
+ # function in <sys/stat.h>.