summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2009-07-24 07:08:10 +0000
committerjoerg <joerg>2009-07-24 07:08:10 +0000
commitd8ae6d3b9d4574298cf29a75df38896541e61869 (patch)
tree2dae51e64cce06e9b180c69ba8b1bac3a0d4a2db
parentd26e423629289b87e2a878974a5338ab70f78181 (diff)
downloadpkgsrc-d8ae6d3b9d4574298cf29a75df38896541e61869.tar.gz
Redirecting stdout and stderr with &> is not portable, fix this.
Issue raised by Koh-ichi Ito on nsd-users.
-rw-r--r--net/nsd/Makefile3
-rw-r--r--net/nsd/distinfo3
-rw-r--r--net/nsd/patches/patch-ab18
3 files changed, 22 insertions, 2 deletions
diff --git a/net/nsd/Makefile b/net/nsd/Makefile
index 2de7757bf9c..c2e832df21d 100644
--- a/net/nsd/Makefile
+++ b/net/nsd/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2009/05/20 01:55:55 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2009/07/24 07:08:10 joerg Exp $
DISTNAME= nsd-3.2.2
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.nlnetlabs.nl/downloads/nsd/
diff --git a/net/nsd/distinfo b/net/nsd/distinfo
index 7a5d5fb7000..7ea15f465ef 100644
--- a/net/nsd/distinfo
+++ b/net/nsd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.25 2009/05/20 01:55:55 joerg Exp $
+$NetBSD: distinfo,v 1.26 2009/07/24 07:08:10 joerg Exp $
SHA1 (nsd-3.2.2.tar.gz) = 23fc0be5d447ea852acd49f64743c96403a091fa
RMD160 (nsd-3.2.2.tar.gz) = 740b81386488d3f45b82e9ae26dbd7a2bfc85aa9
Size (nsd-3.2.2.tar.gz) = 840917 bytes
SHA1 (patch-aa) = 81b820eb4f2056ab85cad16b7dc526f1ba2737aa
+SHA1 (patch-ab) = 53fad0fe0fec84da8f06909070f1d60bb8c74f85
diff --git a/net/nsd/patches/patch-ab b/net/nsd/patches/patch-ab
new file mode 100644
index 00000000000..19e43e847fb
--- /dev/null
+++ b/net/nsd/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.3 2009/07/24 07:08:10 joerg Exp $
+
+--- nsdc.sh.in.orig 2009-07-24 09:04:04.000000000 +0200
++++ nsdc.sh.in
+@@ -195,11 +195,11 @@ controlled_stop() {
+ if [ $try -eq 1 ]; then
+ kill -TERM ${pid}
+ else
+- kill -TERM ${pid} &>/dev/null
++ kill -TERM ${pid} > /dev/null 2>&1
+ fi
+
+ # really stopped?
+- kill -0 ${pid} &>/dev/null
++ kill -0 ${pid} > /dev/null 2>&1
+ if [ $? -eq 0 ]; then
+ controlled_sleep ${try}
+ try=`expr ${try} + 1`