Index: head/net/xorp/Makefile =================================================================== --- head/net/xorp/Makefile (revision 217378) +++ head/net/xorp/Makefile (revision 217379) @@ -1,104 +1,103 @@ # New ports collection makefile for: xorp # Date created: 22nd September 2006 # Whom: Bruce M Simpson # # $FreeBSD$ # 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}/ \ http://www5.xorp.org/releases/${PORTVERSION}/ \ http://www3.xorp.org/releases/${PORTVERSION}/ DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= bms@FreeBSD.org COMMENT= The eXtensible Open Router Platform NOMAN= defined USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --prefix=${PREFIX}/${PORTNAME} \ --with-comment='FreeBSD port: ${PKGNAME}' \ --with-openssl=/usr \ ${CONFIGURE_TARGET} CONFIGURE_ENV+= CXXFLAGS="-Wno-uninitialized" 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 pre-everything:: .if !defined(PREFIX) || ${PREFIX} == "/usr/local" @${ECHO_MSG} "XORP does not currently follow the hier(7) filesystem layout." @${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 -.if ${ARCH} == "ia64" || ${ARCH} == "sparc64" -BROKEN= Does not compile on ia64 or sparc64 -.endif - XORP_GROUP= xorp USE_RC_SUBR= xorp .if defined(WITH_ADVMCAST) CONFIGURE_ARGS+= --enable-advanced-mcast-api .endif .if defined(WITH_IPV6) CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif .if defined(WITH_SNMP) BUILD_DEPENDS= ${LOCALBASE}/sbin/snmpd:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+= --with-snmp \ --with-path-to-snmpd=${LOCALBASE}/sbin \ --with-path-to-net-snmpd-config=${LOCALBASE}/bin/net-snmp-config \ --enable-shared PLIST_SUB+= XORP_SNMP="" USE_LDCONFIG= ${PREFIX}/mibs .else 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. .if defined(WITH_CHECK) BUILD_DEPENDS= ${LOCALBASE}/bin/python:${PORTSDIR}/lang/python \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash .endif .if defined(WITH_DEBUGGING) CONFIGURE_ARGS+= --enable-debug-msgs --enable-debug-fnames .endif .if defined(WITH_PROFILING) CONFIGURE_ARGS+= --enable-profile .endif post-install: ${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include Property changes on: head/net/xorp/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.9 \ No newline at end of property +1.10 \ No newline at end of property Index: head/net/xorp/distinfo =================================================================== --- head/net/xorp/distinfo (revision 217378) +++ head/net/xorp/distinfo (revision 217379) @@ -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 Property changes on: head/net/xorp/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/net/xorp/files/patch-configure =================================================================== --- head/net/xorp/files/patch-configure (revision 217378) +++ head/net/xorp/files/patch-configure (nonexistent) @@ -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" ;; Property changes on: head/net/xorp/files/patch-configure ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/xorp/files/patch-configure-in =================================================================== --- head/net/xorp/files/patch-configure-in (revision 217378) +++ head/net/xorp/files/patch-configure-in (nonexistent) @@ -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) Property changes on: head/net/xorp/files/patch-configure-in ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.2 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/net/xorp/pkg-install =================================================================== --- head/net/xorp/pkg-install (revision 217378) +++ head/net/xorp/pkg-install (revision 217379) @@ -1,37 +1,35 @@ #!/bin/sh # # $FreeBSD$ # PATH=/bin:/usr/bin:/usr/sbin if [ -z "${XORP_GROUP}" ]; then XORP_GROUP=xorp fi case $2 in POST-INSTALL) if [ ! -f ${PREFIX}/etc/xorp.conf.sample ]; then \ cp ${WRKSRC}/rtrmgr/config.boot.sample ${PREFIX}/etc/xorp.conf.sample; \ fi if pw group show "${XORP_GROUP}" 2>/dev/null; then \ echo "You already have a group \"${XORP_GROUP}\", so I will use it."; \ else \ echo "Adding group \"${XORP_GROUP}\"."; \ pw groupadd -n ${XORP_GROUP} 2>/dev/null; \ fi echo "" echo "Add the following lines to /etc/rc.conf to enable xorp:" echo "" 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." echo "" ;; esac Property changes on: head/net/xorp/pkg-install ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/net/xorp/pkg-plist =================================================================== --- head/net/xorp/pkg-plist (revision 217378) +++ head/net/xorp/pkg-plist (revision 217379) @@ -1,140 +1,156 @@ bin/call_xrl bin/xorp_profiler bin/xorp_rtrmgr bin/xorpsh 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 etc/templates/interfaces.tp etc/templates/mfea.cmds etc/templates/mfea4.tp etc/templates/mfea6.cmds 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 etc/templates/ospfv3.tp etc/templates/pim.cmds etc/templates/pim6.cmds etc/templates/rib.tp etc/templates/pimsm4.tp etc/templates/pimsm6.tp etc/templates/plumbing.tp etc/templates/policy.tp 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 etc/templates/static_routes.tp etc/templates/xorpsh.cmds fea/xorp_fea fea/xorp_fea_click_config_generator fea/xorp_fea_dummy fea/tools/show_interfaces fib2mrib/xorp_fib2mrib libxipc/xorp_finder 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 rip/tools/show_peer_stats rip/tools/show_stats static_routes/xorp_static_routes xrl/targets/bgp.xrls 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 xrl/targets/rib.xrls 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 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 %%XORP_SNMP%%mibs/libnetsnmpxorp.so %%XORP_SNMP%%mibs/ospf_mib_1850.la %%XORP_SNMP%%mibs/ospf_mib_1850.so %%XORP_SNMP%%mibs/xorp_if_mib_module.la %%XORP_SNMP%%mibs/xorp_if_mib_module.so %%XORP_SNMP%%mibs/snmpdscripts/getbgppeertable %%XORP_SNMP%%mibs/snmpdscripts/getbgpversion %%XORP_SNMP%%mibs/snmpdscripts/startsnmp %%XORP_SNMP%%mibs/snmpdscripts/stopsnmp @dirrm xrl/targets @dirrm xrl @dirrm static_routes @dirrm rip/tools @dirrm rip @dirrm rib/tools @dirrm rib @dirrm policy @dirrm pim @dirrm ospf/tools @dirrm ospf @dirrm mld6igmp %%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 @dirrm bgp/tools @dirrm bgp Property changes on: head/net/xorp/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property