summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortron <tron>2009-02-07 22:27:44 +0000
committertron <tron>2009-02-07 22:27:44 +0000
commitf39a6c2154e33fa98dfddc65d0fa23aafab4988f (patch)
tree9092e7c6f16a19d5929aa46d75e970a996819810 /net
parent940fde00b77131a89209805b9ebe0161dd5799bc (diff)
downloadpkgsrc-f39a6c2154e33fa98dfddc65d0fa23aafab4988f.tar.gz
Pullup ticket #2691 - requested by joerg
xorp: build fixe Revisions pulled up: - net/xorp/distinfo 1.15 - net/xorp/patches/patch-ab 1.8 --- Module Name: pkgsrc Committed By: joerg Date: Sat Feb 7 18:39:20 UTC 2009 Modified Files: pkgsrc/net/xorp: distinfo pkgsrc/net/xorp/patches: patch-ab Log Message: Fix patch to actually work by using the right name of the version macro. Fixes build on NetBSD 4.99.24+.
Diffstat (limited to 'net')
-rw-r--r--net/xorp/distinfo4
-rw-r--r--net/xorp/patches/patch-ab4
2 files changed, 4 insertions, 4 deletions
diff --git a/net/xorp/distinfo b/net/xorp/distinfo
index e9e154f7f29..54af6a68110 100644
--- a/net/xorp/distinfo
+++ b/net/xorp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2008/10/18 12:51:24 obache Exp $
+$NetBSD: distinfo,v 1.14.2.1 2009/02/07 22:27:44 tron Exp $
SHA1 (xorp-1.5.tar.gz) = cc6a0ec42d5dd49b57b9dab365a247c646d5e843
RMD160 (xorp-1.5.tar.gz) = 4dd5cc7162a0f8087ed973b45279718ea2a337b8
Size (xorp-1.5.tar.gz) = 7384564 bytes
SHA1 (patch-aa) = b4d698f072cfc6f822716ef3193cb43f6f282f7c
-SHA1 (patch-ab) = 3c525c31307090771648be67a6fb2511a84e4c1a
+SHA1 (patch-ab) = 87ccbf0370386e50b3b5a3bd78e1ed66d4ebdba2
SHA1 (patch-ac) = ebf26bd28368b50633c900c3041d15e2853eb57e
diff --git a/net/xorp/patches/patch-ab b/net/xorp/patches/patch-ab
index 5fe7eb284cc..2f5ceb13130 100644
--- a/net/xorp/patches/patch-ab
+++ b/net/xorp/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.7 2008/10/18 12:51:24 obache Exp $
+$NetBSD: patch-ab,v 1.7.2.1 2009/02/07 22:27:44 tron Exp $
--- fea/data_plane/control_socket/click_socket.cc.orig 2008-07-23 07:10:15.000000000 +0200
+++ fea/data_plane/control_socket/click_socket.cc
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.7 2008/10/18 12:51:24 obache Exp $
ret_value = mount("none", _kernel_click_mount_directory.c_str(),
CLICK_FILE_SYSTEM_TYPE.c_str(), 0, 0);
-#else // ! HOST_OS_LINUX
-+#elif defined(__NetBSD__) && __NetBSD_Version >= 499002400
++#elif defined(__NetBSD__) && __NetBSD_Version__ >= 499002400
+ ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(),
+ _kernel_click_mount_directory.c_str(), 0, 0, 0);
+#else