diff options
| author | obache <obache@pkgsrc.org> | 2008-10-18 12:51:24 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2008-10-18 12:51:24 +0000 |
| commit | 40ce44784c0880c413707a328f437ab70ab6e089 (patch) | |
| tree | ed28de92110423c60b6aa4d31a88671e6f10e3b4 /net/xorp | |
| parent | 6fb5c8d654dcd1f1733f360ec5f17166f98621a9 (diff) | |
| download | pkgsrc-40ce44784c0880c413707a328f437ab70ab6e089.tar.gz | |
__NetBSD_Prereq__ is incompatible with 4/current and 3.
Use __NetBSD_Version instead.
Fixed PR 39705.
Diffstat (limited to 'net/xorp')
| -rw-r--r-- | net/xorp/distinfo | 4 | ||||
| -rw-r--r-- | net/xorp/patches/patch-ab | 13 |
2 files changed, 6 insertions, 11 deletions
diff --git a/net/xorp/distinfo b/net/xorp/distinfo index b3868a0bbed..e9e154f7f29 100644 --- a/net/xorp/distinfo +++ b/net/xorp/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.13 2008/10/02 13:13:05 joerg Exp $ +$NetBSD: distinfo,v 1.14 2008/10/18 12:51:24 obache 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) = 5af8a949ddfd655815ea12ce2cc02867a5499c05 +SHA1 (patch-ab) = 3c525c31307090771648be67a6fb2511a84e4c1a SHA1 (patch-ac) = ebf26bd28368b50633c900c3041d15e2853eb57e diff --git a/net/xorp/patches/patch-ab b/net/xorp/patches/patch-ab index 2e7dfcd152b..5fe7eb284cc 100644 --- a/net/xorp/patches/patch-ab +++ b/net/xorp/patches/patch-ab @@ -1,20 +1,15 @@ -$NetBSD: patch-ab,v 1.6 2008/10/02 13:13:05 joerg Exp $ +$NetBSD: patch-ab,v 1.7 2008/10/18 12:51:24 obache Exp $ ---- fea/data_plane/control_socket/click_socket.cc.orig 2008-09-30 15:43:19.000000000 +0200 +--- 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 -@@ -731,7 +731,15 @@ ClickSocket::mount_click_file_system(str +@@ -731,7 +731,10 @@ ClickSocket::mount_click_file_system(str #ifdef HOST_OS_LINUX 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__) && defined(__NetBSD_Prereq__) -+# if __NetBSD_Prereq__(4,99,24) ++#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 -+ ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(), -+ _kernel_click_mount_directory.c_str(), 0, 0); -+# endif +#else ret_value = mount(CLICK_FILE_SYSTEM_TYPE.c_str(), _kernel_click_mount_directory.c_str(), 0, 0); |