summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2013-09-02 16:04:13 +0000
committerjperkin <jperkin@pkgsrc.org>2013-09-02 16:04:13 +0000
commit6fbe3b7602a72391e301103d9112a4f65d494b93 (patch)
treea7aba6cb124d45fd4821d4d2b3901945e600c643
parent298ec6e4d401c3a292fea9b6be87d593163c01f8 (diff)
downloadpkgsrc-6fbe3b7602a72391e301103d9112a4f65d494b93.tar.gz
Avoid use of non-portable "local" keyword in shell scripts. Fixes build on
SunOS >= 5.11 where /bin/sh is ksh93.
-rw-r--r--mail/exim/distinfo3
-rw-r--r--mail/exim/patches/patch-lookups_Makefile37
2 files changed, 39 insertions, 1 deletions
diff --git a/mail/exim/distinfo b/mail/exim/distinfo
index a5559132dee..5df4796031e 100644
--- a/mail/exim/distinfo
+++ b/mail/exim/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.54 2012/10/30 20:12:20 abs Exp $
+$NetBSD: distinfo,v 1.55 2013/09/02 16:04:13 jperkin Exp $
SHA1 (exim-4.80.1.tar.bz2) = 714e40d440641050a1d9946cd937aad0d1a6b746
RMD160 (exim-4.80.1.tar.bz2) = 48f79c244b8e3573dd7c898580ea903ac23852e0
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 24a12631b7df17930349b8a0d03adc80d27efbe2
SHA1 (patch-ab) = 6af17f036ed02a3bc37c1f303269eea447fcb691
SHA1 (patch-ae) = 7daf63727e222bbaa7e5b8289c4fcb6a8c0272cf
SHA1 (patch-ag) = dd93bb718c996f18b4e985806eb6d4ff5f25a67f
+SHA1 (patch-lookups_Makefile) = ea62db47ea2a09f6abf1dc1db8fb2dae23717396
diff --git a/mail/exim/patches/patch-lookups_Makefile b/mail/exim/patches/patch-lookups_Makefile
new file mode 100644
index 00000000000..52063312aca
--- /dev/null
+++ b/mail/exim/patches/patch-lookups_Makefile
@@ -0,0 +1,37 @@
+$NetBSD: patch-lookups_Makefile,v 1.1 2013/09/02 16:04:13 jperkin Exp $
+
+Avoid use of non-portable "local" keyword.
+
+--- scripts/lookups-Makefile.orig 2012-10-25 03:37:38.000000000 +0000
++++ scripts/lookups-Makefile
+@@ -62,16 +62,16 @@ tmp="$target.t"
+ # command-line, not just check the Makefile.
+
+ want_dynamic() {
+- local dyn_name="$1"
+- local re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
++ dyn_name="$1"
++ re="LOOKUP_${dyn_name}[ $tab]*=[ $tab]*2"
+ env | grep -q "^$re"
+ if [ $? -eq 0 ]; then return 0; fi
+ grep -q "^[ $tab]*$re" "$defs_source"
+ }
+
+ want_at_all() {
+- local want_name="$1"
+- local re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
++ want_name="$1"
++ re="LOOKUP_${want_name}[ $tab]*=[ $tab]*."
+ env | grep -q "^$re"
+ if [ $? -eq 0 ]; then return 0; fi
+ grep -q "^[ $tab]*$re" "$defs_source"
+@@ -83,8 +83,7 @@ MODS=""
+ OBJ=""
+
+ emit_module_rule() {
+- local lookup_name="$1"
+- local mod_name pkgconf
++ lookup_name="$1"
+ if [ "${lookup_name%:*}" = "$lookup_name" ]
+ then
+ mod_name=$(echo $lookup_name | tr A-Z a-z)