Sat Feb 7 18:39:20 2009 UTC ()
Fix patch to actually work by using the right name of the version macro.
Fixes build on NetBSD 4.99.24+.


(joerg)
diff -r1.14 -r1.15 pkgsrc/net/xorp/distinfo
diff -r1.7 -r1.8 pkgsrc/net/xorp/patches/patch-ab
cvs diff -r1.14 -r1.15 pkgsrc/net/xorp/distinfo (expand / switch to unified diff)

--- pkgsrc/net/xorp/distinfo 2008/10/18 12:51:24 1.14
+++ pkgsrc/net/xorp/distinfo 2009/02/07 18:39:20 1.15
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.14 2008/10/18 12:51:24 obache Exp $ 1$NetBSD: distinfo,v 1.15 2009/02/07 18:39:20 joerg Exp $
2 2
3SHA1 (xorp-1.5.tar.gz) = cc6a0ec42d5dd49b57b9dab365a247c646d5e843 3SHA1 (xorp-1.5.tar.gz) = cc6a0ec42d5dd49b57b9dab365a247c646d5e843
4RMD160 (xorp-1.5.tar.gz) = 4dd5cc7162a0f8087ed973b45279718ea2a337b8 4RMD160 (xorp-1.5.tar.gz) = 4dd5cc7162a0f8087ed973b45279718ea2a337b8
5Size (xorp-1.5.tar.gz) = 7384564 bytes 5Size (xorp-1.5.tar.gz) = 7384564 bytes
6SHA1 (patch-aa) = b4d698f072cfc6f822716ef3193cb43f6f282f7c 6SHA1 (patch-aa) = b4d698f072cfc6f822716ef3193cb43f6f282f7c
7SHA1 (patch-ab) = 3c525c31307090771648be67a6fb2511a84e4c1a 7SHA1 (patch-ab) = 87ccbf0370386e50b3b5a3bd78e1ed66d4ebdba2
8SHA1 (patch-ac) = ebf26bd28368b50633c900c3041d15e2853eb57e 8SHA1 (patch-ac) = ebf26bd28368b50633c900c3041d15e2853eb57e
cvs diff -r1.7 -r1.8 pkgsrc/net/xorp/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/net/xorp/patches/patch-ab 2008/10/18 12:51:24 1.7
+++ pkgsrc/net/xorp/patches/patch-ab 2009/02/07 18:39:20 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1$NetBSD: patch-ab,v 1.7 2008/10/18 12:51:24 obache Exp $ 1$NetBSD: patch-ab,v 1.8 2009/02/07 18:39:20 joerg Exp $
2 2
3--- fea/data_plane/control_socket/click_socket.cc.orig 2008-07-23 07:10:15.000000000 +0200 3--- fea/data_plane/control_socket/click_socket.cc.orig 2008-07-23 07:10:15.000000000 +0200
4+++ fea/data_plane/control_socket/click_socket.cc 4+++ fea/data_plane/control_socket/click_socket.cc
5@@ -731,7 +731,10 @@ ClickSocket::mount_click_file_system(str 5@@ -731,7 +731,10 @@ ClickSocket::mount_click_file_system(str
6 #ifdef HOST_OS_LINUX 6 #ifdef HOST_OS_LINUX
7 ret_value = mount("none", _kernel_click_mount_directory.c_str(), 7 ret_value = mount("none", _kernel_click_mount_directory.c_str(),
8 CLICK_FILE_SYSTEM_TYPE.c_str(), 0, 0); 8 CLICK_FILE_SYSTEM_TYPE.c_str(), 0, 0);
9-#else // ! HOST_OS_LINUX 9-#else // ! HOST_OS_LINUX
10+#elif defined(__NetBSD__) && __NetBSD_Version >= 499002400 10+#elif defined(__NetBSD__) && __NetBSD_Version__ >= 499002400
11+ ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(), 11+ ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(),
12+ _kernel_click_mount_directory.c_str(), 0, 0, 0); 12+ _kernel_click_mount_directory.c_str(), 0, 0, 0);
13+#else 13+#else
14 ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(), 14 ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(),
15 _kernel_click_mount_directory.c_str(), 0, 0); 15 _kernel_click_mount_directory.c_str(), 0, 0);
16 #endif // ! HOST_OS_LINUX 16 #endif // ! HOST_OS_LINUX