Update port for XORP 1.5 release.

6 files changed, 31 insertions, 64 deletions

diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index d1ee9115d643..80f2e85c6e26 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xorp
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	net
 MASTER_SITES=	http://www.xorp.org/releases/${PORTVERSION}/	\
 		http://www2.xorp.org/releases/${PORTVERSION}/	\
@@ -36,7 +35,7 @@ OPTIONS=								\
 	    ADVMCAST	 "Build with Advanced Multicast API" On		\
 	    IPV6	 "Build with IPv6 support" On			\
 	    SNMP	 "Build with SNMP MIB support" Off		\
-	    OPTIMIZATION "Build with optimization" Off			\
+	    OPTIMIZATION "Build with optimization" On			\
 	    CHECK	 "Build with regression test dependencies " Off	\
 	    DEBUGGING	 "Enable debugging" Off				\
 	    PROFILING	 "Enable profiling" Off
@@ -47,14 +46,14 @@ pre-everything::
 	@${ECHO_MSG} "It will therefore install all its directories relative to ${PREFIX}."
 	@${ECHO_MSG} "If you do not want this, hit ^C now and set PREFIX in the"
 	@${ECHO_MSG} "build environment to something other than ${PREFIX}."
+	@${ECHO_MSG}
+	@${ECHO_MSG} "If you plan to build with SNMP support, please ensure that"
+	@${ECHO_MSG} "the net-mgmt/net-snmp port is already installed under ${LOCALBASE}"
+	@${ECHO_MSG} "before doing this."
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
-BROKEN=		Does not compile on ia64 or sparc64
-.endif
-
 XORP_GROUP=	xorp
 USE_RC_SUBR=	xorp
 
@@ -81,7 +80,7 @@ PLIST_SUB+=		XORP_SNMP="@comment "
 .endif
 
 .if defined(WITH_OPTIMIZATION)
-CONFIGURE_ARGS+=	--enable-optimize
+CONFIGURE_ARGS+=	--enable-optimize --disable-debug
 .endif
 
 # Bash and Python are only required if running the regression tests.
diff --git a/net/xorp/distinfo b/net/xorp/distinfo
index 6d882e19727b..11a7d33d40f4 100644
--- a/net/xorp/distinfo
+++ b/net/xorp/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorp-1.4.tar.gz) = 2eeacffc96d9551fdbf6786fcd033e76
-SHA256 (xorp-1.4.tar.gz) = ec34cd5be7f0bf532fc18df148047e011279d29df025df12a3eb2cee671cab91
-SIZE (xorp-1.4.tar.gz) = 8496928
+MD5 (xorp-1.5.tar.gz) = 45e7a38e406f8fa115986010bc037a19
+SHA256 (xorp-1.5.tar.gz) = 468599bff48688c5055dc113da75a1b0bdf21434f878906fed6da50c9b1b3725
+SIZE (xorp-1.5.tar.gz) = 7384564
diff --git a/net/xorp/files/patch-configure b/net/xorp/files/patch-configure
deleted file mode 100644
index 6faa12d9efbc..000000000000
--- a/net/xorp/files/patch-configure
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.orig	Thu Mar 22 18:47:54 2007
-+++ configure	Thu Mar 22 18:47:55 2007
-@@ -19126,8 +19126,6 @@
- 
- 
- case "${host_os}" in
--    *bsd*)  FLOWER_MALLOC=flower_malloc ;;
--    linux*) FLOWER_MALLOC=flower_malloc ;;
-     *) ;;
- esac
- 
-@@ -19990,7 +19988,7 @@
- fi
- 
- 
--ac_config_files="$ac_config_files Jamrules Makefile MakefileRootCheck bgp/Makefile bgp/harness/Makefile bgp/tools/Makefile cli/Makefile cli/tools/Makefile contrib/Makefile docs/Makefile docs/bgp/Makefile docs/design_arch/Makefile docs/fea/Makefile docs/libxipc/Makefile docs/libxorp/Makefile docs/mfea/Makefile docs/mld6igmp/Makefile docs/multicast/Makefile docs/pim/Makefile docs/pim_testsuite/Makefile docs/rib/Makefile docs/rtrmgr/Makefile docs/slides/Makefile docs/slides/status_2004_02/Makefile docs/snmp/Makefile docs/test_harness/Makefile docs/user_manual/Makefile docs/xorpdev_101/Makefile etc/Makefile etc/templates/Makefile fea/Makefile fea/MakefileRootCheck fea/tools/Makefile fib2mrib/Makefile libcomm/Makefile libfeaclient/Makefile libproto/Makefile libxipc/Makefile libxorp/Makefile mld6igmp/Makefile mrt/Makefile ospf/Makefile ospf/tools/Makefile pim/Makefile policy/Makefile policy/backend/Makefile policy/common/Makefile policy/test/Makefile rib/Makefile rib/tools/Makefile rip/Makefile rip/tools/Makefile rtrmgr/Makefile static_routes/Makefile utils/Makefile utils/flower_malloc/Makefile xrl/Makefile xrl/interfaces/Makefile xrl/targets/Makefile xrl/tests/Makefile"
-+ac_config_files="$ac_config_files Jamrules Makefile MakefileRootCheck bgp/Makefile bgp/harness/Makefile bgp/tools/Makefile cli/Makefile cli/tools/Makefile contrib/Makefile docs/Makefile docs/bgp/Makefile docs/design_arch/Makefile docs/fea/Makefile docs/libxipc/Makefile docs/libxorp/Makefile docs/mfea/Makefile docs/mld6igmp/Makefile docs/multicast/Makefile docs/pim/Makefile docs/pim_testsuite/Makefile docs/rib/Makefile docs/rtrmgr/Makefile docs/slides/Makefile docs/slides/status_2004_02/Makefile docs/snmp/Makefile docs/test_harness/Makefile docs/user_manual/Makefile docs/xorpdev_101/Makefile etc/Makefile etc/templates/Makefile fea/Makefile fea/MakefileRootCheck fea/tools/Makefile fib2mrib/Makefile libcomm/Makefile libfeaclient/Makefile libproto/Makefile libxipc/Makefile libxorp/Makefile mld6igmp/Makefile mrt/Makefile ospf/Makefile ospf/tools/Makefile pim/Makefile policy/Makefile policy/backend/Makefile policy/common/Makefile policy/test/Makefile rib/Makefile rib/tools/Makefile rip/Makefile rip/tools/Makefile rtrmgr/Makefile static_routes/Makefile utils/Makefile xrl/Makefile xrl/interfaces/Makefile xrl/targets/Makefile xrl/tests/Makefile"
- ac_config_commands="$ac_config_commands default"
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
-@@ -20529,7 +20527,6 @@
-   "rtrmgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES rtrmgr/Makefile" ;;
-   "static_routes/Makefile" ) CONFIG_FILES="$CONFIG_FILES static_routes/Makefile" ;;
-   "utils/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/Makefile" ;;
--  "utils/flower_malloc/Makefile" ) CONFIG_FILES="$CONFIG_FILES utils/flower_malloc/Makefile" ;;
-   "xrl/Makefile" ) CONFIG_FILES="$CONFIG_FILES xrl/Makefile" ;;
-   "xrl/interfaces/Makefile" ) CONFIG_FILES="$CONFIG_FILES xrl/interfaces/Makefile" ;;
-   "xrl/targets/Makefile" ) CONFIG_FILES="$CONFIG_FILES xrl/targets/Makefile" ;;
diff --git a/net/xorp/files/patch-configure-in b/net/xorp/files/patch-configure-in
deleted file mode 100644
index 80ef3607bc86..000000000000
--- a/net/xorp/files/patch-configure-in
+++ /dev/null
@@ -1,18 +0,0 @@
---- configure.in.orig	Wed Mar 14 18:59:04 2007
-+++ configure.in	Thu Mar 22 18:44:37 2007
-@@ -831,14 +831,9 @@
- dnl utils/flower_malloc related
- dnl ---------------------------------------------------------------------------
- 
--dnl flower_malloc in utils is an interposer and is only known to
--dnl work on systems supporting -shared.  AFAICT this needs some work for
--dnl a real test.  As a stop gap, we assume that if we are on *BSD or Linux
--dnl things work okay.  Only known failure case is OS X.
-+dnl disabled in FreeBSD 6.1 port
- 
- case "${host_os}" in
--    *bsd*)  FLOWER_MALLOC=flower_malloc ;;
--    linux*) FLOWER_MALLOC=flower_malloc ;;
-     *) ;;
- esac
- AC_SUBST(FLOWER_MALLOC)
diff --git a/net/xorp/pkg-install b/net/xorp/pkg-install
index 8c23a16363d0..e03935469846 100644
--- a/net/xorp/pkg-install
+++ b/net/xorp/pkg-install
@@ -26,9 +26,7 @@ case $2 in
 		echo "defaultrouter=\"NO\""
 		echo "xorp_enable=\"YES\""
 		echo ""
-		echo "A sample configuration has been installed at"
-		echo "${PREFIX}/etc/xorp.conf.sample.  Copy it to ${PREFIX}/etc/xorp.conf"
-		echo "before editing.  It MUST be edited before use."
+		echo "A configuration file must be created at ${PREFIX}/etc/xorp.conf before use."
 		echo ""
 		echo "Users who will be changing the xorp configuration via xorpsh"
 		echo "must be members of the group xorp."
diff --git a/net/xorp/pkg-plist b/net/xorp/pkg-plist
index 1053145faf2f..6ba050e32459 100644
--- a/net/xorp/pkg-plist
+++ b/net/xorp/pkg-plist
@@ -6,12 +6,16 @@ bgp/xorp_bgp
 bgp/tools/xorpsh_print_peers
 bgp/tools/xorpsh_print_routes
 cli/tools/send_cli_processor_xrl
-etc/xorp.conf.sample
+contrib/olsr/tools/clear_database
+contrib/olsr/tools/print_databases
+contrib/olsr/xorp_olsr4
+etc/rc.d/xorp
 etc/templates/bgp.cmds
 etc/templates/bgp.tp
 etc/templates/fea.cmds
 etc/templates/fea.tp
 etc/templates/fib2mrib.tp
+etc/templates/firewall.tp
 etc/templates/host.cmds
 etc/templates/igmp.cmds
 etc/templates/igmp.tp
@@ -23,6 +27,8 @@ etc/templates/mfea6.tp
 etc/templates/misc.cmds
 etc/templates/mld.cmds
 etc/templates/mld.tp
+etc/templates/olsr4.cmds
+etc/templates/olsr4.tp
 etc/templates/ospfv2.cmds
 etc/templates/ospfv2.tp
 etc/templates/ospfv3.cmds
@@ -38,6 +44,7 @@ etc/templates/protocols.tp
 etc/templates/rib.cmds
 etc/templates/rip.cmds
 etc/templates/rip.tp
+etc/templates/ripng.cmds
 etc/templates/ripng.tp
 etc/templates/rtrmgr.tp
 etc/templates/snmp.tp
@@ -53,12 +60,14 @@ mld6igmp/xorp_igmp
 mld6igmp/xorp_mld
 ospf/xorp_ospfv2
 ospf/xorp_ospfv3
+ospf/tools/clear_database
 ospf/tools/print_lsas
 ospf/tools/print_neighbours
 pim/xorp_pimsm4
 pim/xorp_pimsm6
 policy/xorp_policy
 rib/xorp_rib
+rib/tools/show_distances
 rib/tools/show_routes
 rip/xorp_rip
 rip/xorp_ripng
@@ -70,16 +79,15 @@ xrl/targets/bgp4_mib.xrls
 xrl/targets/cli.xrls
 xrl/targets/coord.xrls
 xrl/targets/fea.xrls
-xrl/targets/demo_fea_ifmgr_client.xrls
 xrl/targets/fea_ifmgr_mirror.xrls
 xrl/targets/fib2mrib.xrls
 xrl/targets/finder.xrls
 xrl/targets/finder_client.xrls
 xrl/targets/mfea.xrls
 xrl/targets/mld6igmp.xrls
+xrl/targets/olsr4.xrls
 xrl/targets/ospfv2.xrls
 xrl/targets/ospfv3.xrls
-xrl/targets/packet_acl.xrls
 xrl/targets/pim.xrls
 xrl/targets/policy.xrls
 xrl/targets/profiler.xrls
@@ -88,11 +96,12 @@ xrl/targets/ribclient.xrls
 xrl/targets/rip.xrls
 xrl/targets/ripng.xrls
 xrl/targets/rtrmgr.xrls
+xrl/targets/show_distances.xrls
 xrl/targets/show_routes.xrls
-xrl/targets/socket_server.xrls
 xrl/targets/static_routes.xrls
 xrl/targets/test.xrls
 xrl/targets/test_fea_ifmgr_mirror.xrls
+xrl/targets/test_fea_rawlink.xrls
 xrl/targets/test_finder_events.xrls
 xrl/targets/test_peer.xrls
 xrl/targets/test_socket4.xrls
@@ -100,6 +109,7 @@ xrl/targets/test_socket6.xrls
 xrl/targets/test_xrls.xrls
 xrl/targets/xorp_if_mib.xrls
 xrl/targets/xorpsh.xrls
+%%XORP_SNMP%%libdata/ldconfig/xorp
 %%XORP_SNMP%%mibs/bgp4_mib_1657.la
 %%XORP_SNMP%%mibs/bgp4_mib_1657.so
 %%XORP_SNMP%%mibs/libnetsnmpxorp.la
@@ -127,12 +137,18 @@ xrl/targets/xorpsh.xrls
 %%XORP_SNMP%%@dirrm mibs/snmpdscripts
 %%XORP_SNMP%%@dirrm mibs
 @dirrm libxipc
+%%XORP_SNMP%%@dirrmtry libdata/ldconfig/xorp
+%%XORP_SNMP%%@dirrmtry libdata/ldconfig
+%%XORP_SNMP%%@dirrmtry libdata
 @dirrm fib2mrib
 @dirrmtry fea/tools
 @dirrm fea
 @dirrmtry etc/templates
 @dirrmtry etc/rc.d
 @dirrmtry etc
+@dirrm contrib/olsr/tools
+@dirrm contrib/olsr
+@dirrm contrib
 @dirrm cli/tools
 @dirrm cli
 @dirrmtry bin