diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/xorp/Makefile | 27 | ||||
| -rw-r--r-- | net/xorp/PLIST | 139 | ||||
| -rw-r--r-- | net/xorp/distinfo | 7 | ||||
| -rw-r--r-- | net/xorp/patches/patch-aa | 19 |
4 files changed, 121 insertions, 71 deletions
diff --git a/net/xorp/Makefile b/net/xorp/Makefile index 52a7de151d7..0ccd3253ad8 100644 --- a/net/xorp/Makefile +++ b/net/xorp/Makefile @@ -1,19 +1,22 @@ -# $NetBSD: Makefile,v 1.7 2004/02/14 15:29:15 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2004/07/20 21:55:31 wiz Exp $ # -DISTNAME= xorp-0.3 -CATEGORIES= net -MASTER_SITES= http://www.xorp.org/release-0.3/ +DISTNAME= xorp-1.0 +CATEGORIES= net +MASTER_SITES= http://www.xorp.org/releases/1.0/ -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.xorp.org/ -COMMENT= Open router software platform +MAINTAINER= tech-pkg@NetBSD.org +HOMEPAGE= http://www.xorp.org/ +COMMENT= The eXtensible Open Router Platform -# cli/libtecla/configure.in bombs if ncurses is installed -CONFLICTS+= ncurses-[0-9]* - -GNU_CONFIGURE= YES +USE_BUILDLINK3= yes +GNU_CONFIGURE= yes USE_GNU_TOOLS+= make -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} + +# The xorp people insist on their own PREFIX. +# See http://www.xorp.org/bugzilla/show_bug.cgi?id=91 +GNU_CONFIGURE_PREFIX= ${LOCALBASE}/xorp + +TEST_TARGET= check .include "../../mk/bsd.pkg.mk" diff --git a/net/xorp/PLIST b/net/xorp/PLIST index bc8acbb32c3..f1fcfb060b2 100644 --- a/net/xorp/PLIST +++ b/net/xorp/PLIST @@ -1,36 +1,103 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2003/07/15 12:15:01 itojun Exp $ -bin/bgp -bin/call_xrl -bin/coord -bin/demo_fea_ifmgr_client -bin/enhance -bin/fea -bin/fea_dummy -bin/finder -bin/main_routemap -bin/packet_test -bin/plumbing_test -bin/print_peers -bin/print_routes -bin/rib -bin/rtrmgr -bin/runit -bin/show_interfaces -bin/test_cli -bin/test_comm -bin/test_mfea -bin/test_mld6igmp -bin/test_mrib -bin/test_mrt -bin/test_peer -bin/test_pim -bin/test_policy -bin/test_register -bin/test_register_xrls -bin/test_rib_client -bin/test_rib_direct -bin/test_rib_xrls -bin/update_test -bin/xorpsh -bin/xorpsh_print_peers -bin/xorpsh_print_routes +@comment $NetBSD: PLIST,v 1.2 2004/07/20 21:55:31 wiz Exp $ +xorp/bgp/tools/xorpsh_print_peers +xorp/bgp/tools/xorpsh_print_routes +xorp/bgp/xorp_bgp +xorp/bin/call_xrl +xorp/bin/xorp_rtrmgr +xorp/bin/xorpsh +xorp/cli/tools/send_cli_processor_xrl +xorp/etc/templates/bgp.cmds +xorp/etc/templates/bgp.tp +xorp/etc/templates/fea.cmds +xorp/etc/templates/fea.tp +xorp/etc/templates/fib2mrib.tp +xorp/etc/templates/host.cmds +xorp/etc/templates/igmp.cmds +xorp/etc/templates/igmp.tp +xorp/etc/templates/interfaces.tp +xorp/etc/templates/mfea.cmds +xorp/etc/templates/mfea4.tp +xorp/etc/templates/mfea6.cmds +xorp/etc/templates/mfea6.tp +xorp/etc/templates/mld.cmds +xorp/etc/templates/mld.tp +xorp/etc/templates/ospf.tp +xorp/etc/templates/pim.cmds +xorp/etc/templates/pim6.cmds +xorp/etc/templates/pimsm4.tp +xorp/etc/templates/pimsm6.tp +xorp/etc/templates/rib.cmds +xorp/etc/templates/rib.tp +xorp/etc/templates/rip.cmds +xorp/etc/templates/rip.tp +xorp/etc/templates/ripng.tp +xorp/etc/templates/snmp.tp +xorp/etc/templates/static_routes.tp +xorp/etc/templates/xorpsh.cmds +xorp/fea/tools/show_interfaces +xorp/fea/xorp_fea +xorp/fea/xorp_fea_dummy +xorp/fib2mrib/xorp_fib2mrib +xorp/libxipc/xorp_finder +xorp/mld6igmp/xorp_igmp +xorp/mld6igmp/xorp_mld +xorp/pim/xorp_pimsm4 +xorp/pim/xorp_pimsm6 +xorp/rib/tools/show_routes +xorp/rib/xorp_rib +xorp/rip/tools/show_peer_stats +xorp/rip/tools/show_stats +xorp/rip/xorp_rip +xorp/rip/xorp_ripng +xorp/static_routes/xorp_static_routes +xorp/xrl/targets/bgp.xrls +xorp/xrl/targets/bgp4_mib.xrls +xorp/xrl/targets/cli.xrls +xorp/xrl/targets/coord.xrls +xorp/xrl/targets/demo_fea_ifmgr_client.xrls +xorp/xrl/targets/fea.xrls +xorp/xrl/targets/fea_ifmgr_mirror.xrls +xorp/xrl/targets/fib2mrib.xrls +xorp/xrl/targets/finder.xrls +xorp/xrl/targets/finder_client.xrls +xorp/xrl/targets/mfea.xrls +xorp/xrl/targets/mld6igmp.xrls +xorp/xrl/targets/ospf.xrls +xorp/xrl/targets/pim.xrls +xorp/xrl/targets/rib.xrls +xorp/xrl/targets/ribclient.xrls +xorp/xrl/targets/rip.xrls +xorp/xrl/targets/ripng.xrls +xorp/xrl/targets/rtrmgr.xrls +xorp/xrl/targets/show_routes.xrls +xorp/xrl/targets/socket_server.xrls +xorp/xrl/targets/static_routes.xrls +xorp/xrl/targets/test.xrls +xorp/xrl/targets/test_fea_ifmgr_mirror.xrls +xorp/xrl/targets/test_finder_events.xrls +xorp/xrl/targets/test_peer.xrls +xorp/xrl/targets/test_socket4.xrls +xorp/xrl/targets/test_socket6.xrls +xorp/xrl/targets/xorp_if_mib.xrls +xorp/xrl/targets/xorpsh.xrls +@dirrm xorp/xrl/targets +@dirrm xorp/xrl +@dirrm xorp/static_routes +@dirrm xorp/rip/tools +@dirrm xorp/rip +@dirrm xorp/rib/tools +@dirrm xorp/rib +@dirrm xorp/pim +@dirrm xorp/mld6igmp +@dirrm xorp/libxipc +@dirrm xorp/fib2mrib +@dirrm xorp/fea/tools +@dirrm xorp/fea +@dirrm xorp/etc/templates +@dirrm xorp/etc +@dirrm xorp/cli/tools +@dirrm xorp/cli +@dirrm xorp/bgp/tools +@dirrm xorp/bgp +@dirrm xorp/bin +@dirrm xorp diff --git a/net/xorp/distinfo b/net/xorp/distinfo index 4fcbd6298cd..0f9c73c56d7 100644 --- a/net/xorp/distinfo +++ b/net/xorp/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2003/07/15 12:15:01 itojun Exp $ +$NetBSD: distinfo,v 1.2 2004/07/20 21:55:31 wiz Exp $ -SHA1 (xorp-0.3.tar.gz) = ac0099a27b5dc2d70f8b3f4f39a2c3cfc10bb7c9 -Size (xorp-0.3.tar.gz) = 5879824 bytes -SHA1 (patch-aa) = 901247880b5fd45dc8ce8d2a39b9421dd9937abb +SHA1 (xorp-1.0.tar.gz) = f5dc6ff9adbf1da2b982ef54c84d23c47142e876 +Size (xorp-1.0.tar.gz) = 7240796 bytes diff --git a/net/xorp/patches/patch-aa b/net/xorp/patches/patch-aa deleted file mode 100644 index 2ffaaba502a..00000000000 --- a/net/xorp/patches/patch-aa +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/15 12:15:01 itojun Exp $ - ---- fea/fticonfig_table_parse_rtm.cc- 2003-07-15 20:55:57.000000000 +0900 -+++ fea/fticonfig_table_parse_rtm.cc 2003-07-15 20:56:22.000000000 +0900 -@@ -67,8 +67,14 @@ - continue; - if (! (rtm->rtm_flags & RTF_UP)) - continue; -+#ifdef RTF_WASCLONED - if (rtm->rtm_flags & RTF_WASCLONED) - continue; // XXX: ignore cloned entries -+#endif -+#ifdef RTF_CLONED -+ if (rtm->rtm_flags & RTF_CLONED) -+ continue; // XXX: ignore cloned entries -+#endif - #ifdef RTF_MULTICAST - if (rtm->rtm_flags & RTF_MULTICAST) - continue; // XXX: ignore multicast entries |