Update xorp to 1.5.

Based on patch provided by Mustafa Dogan in PR 39503.
Add DESTDIR support and note that test target require bash and python.

Release 1.5 (2008/07/22)
========================
  ALL:
    - XORP now builds on DragonFlyBSD-1.10.1, DragonFlyBSD-1.12.2,
      FreeBSD-7.0, Linux Debian-4.0 (etch), Linux Fedora 7,
      Linux Fedora 8, Linux Fedora 9, Linux Gentoo 2008.0,
      Linux Ubuntu-7.04, Linux Ubuntu-7.10, Linux Ubuntu-8.04.1,
      NetBSD-4.0, OpenBSD-4.1, OpenBSD-4.2, OpenBSD-4.3, Mac OS X 10.5.2,
      Mac OS 10.5.3, and Mac OS X 10.5.4.

  CONFIGURATION:
    - Addition of new FEA configuration statements to set the IPv4/IPv6
      unicast forwarding table IDs:

      fea {
          unicast-forwarding4 {
              table-id: 254
          }
          unicast-forwarding6 {
              table-id: 254
          }
      }

      If the table ID is not configured, the FEA will use the default
      table ID for the system.
      Note that not all systems support multiple forwarding tables.
      Currently, they exist only on Linux (among all systems supported by
      XORP).

    - The "DISCARD" network interface flag is printed as appropriate
      when displaying the list of interfaces in the CLI.

    - Addition of new FEA configuration statement to support
      "unreachable" interfaces. Such interfaces are similar to "discard"
      interfaces, except that instead of silently throwing away packets,
      the system will respond with "ICMP destination unreachable".

      interfaces {
          interface my_unreachable {
              unreachable: true
              vif my_unreachable {
              }
          }
      }

      The default value for the "unreachable" statement is false.

    - Addition of new FEA configuration statement to flag an interface
      for "management" purpose. An interface that is flagged as
      "management" might be used in the future by some of the protocols
      for protocol-specific purpose.

      interfaces {
          interface fxp0 {
              management: true
              vif fxp0 {
                  address 10.10.10.10 {
                      prefix-length: 24
                  }
              }
          }
      }

      The default value for the "management" statement is false.

    - Addition of support to configure VLANs on an interface.
      A VLAN is configured by using a "vlan" block that includes
      the VLAN ID:

      interfaces {
          interface fxp0 {
              vif fxp0 {
                  address 10.10.10.10 {
                      prefix-length: 24
                  }
              }
              vif vlan1 {
                  vlan {
                      vlan-id: 1
                  }
                  address 10.10.20.20 {
                      prefix-length: 24
                  }
              }
          }
      }

    - Addition of preliminary support to configure firewall rules.
      Firewall rules are configured by using numbered entries:

      firewall {
          rule4 100 {
              action: "drop"
              protocol: 6		/* TCP */
              source {
                  interface: "fxp0"
                  vif: "fxp0"
                  network: 0.0.0.0/0
                  port-begin: 0
                  port-end: 65535
              }
              destination {
                  network: 10.10.0.0/24
                  port-begin: 0
                  port-end: 1024
              }
          }
      }
      Note that compiling firewall support on Linux systems require
      patching some of the system header files. See ERRATA for details.

    - The following PIM-SM configuration statements have been deprecated,
      because PIM-SM doesn't use Router Alert IP option anymore:

      protocols {
          pimsm4 {
              interface foo {
                  vif foo {
                      enable-ip-router-alert-option-check: true
                  }
              }
          }
      }

      protocols {
          pimsm6 {
              interface foo {
                  vif foo {
                      enable-ip-router-alert-option-check: true
                  }
              }
          }
      }

  LIBXORP:
    - The local system-independent xorp_random() implemenation is used
      instead of the random(3) provided by the system.

    - Improved MAC address support (classes Mac and EtherMac).

    - More consistent usage of XORP_OK and XORP_ERROR to return error
      codes.

  LIBXIPC:
    - Bug fix in the internal mechanism for obtaining the IPv4 addresses
      from the system. After the bug fix, a secondary (alias) IP address
      can be specified with the "-i <addr>" command-line option to
      the xorp_rtrmgr or xorp_finder binaries.

  LIBFEACLIENT:
    - No significant changes.

  XRL:
    - Critical bug fix that can be triggered by malformatted XRLs.

    - Addition of support for 64-bit integers: i64 and u64 for
      signed and unsigned respectively.

  RTRMGR:
    - Addition of preliminary mechanism to log events to a file or
      to a syslog facility.

    - Addition of support to run XORP in background (in daemon mode).

  XORPSH:
    - Bug fix related to assigning the node ID position in case the
      previous (sibling) node was deleted at the same time a new node
      was added.
      This fixes "Found out-of-order term(s) inside policy ..." error
      inside the policy manager.

    - The "-c <cmd>" command line option can be used more than once to
      run multiple commands.

    - Fix a long configuration delay when using xorpsh in
      non-interactive mode (e.g., "cat commands.txt | xorpsh").

    - Addition of a new "-e" command line option. It can be used to tell
      xorpsh to exit immediately if the connection to the Finder fails.

  POLICY:
    - No significant changes.

  FEA/MFEA:
    - Major refactoring of the FEA/MFEA internals.

    - Critical bug fix that affects recent NetBSD and OpenBSD releases.

    - Critical IPv6-related bug fix when adding unicast forwarding
      entries to the kernel. This bug was exposed only on *BSD systems
      with 64-bit CPU.

    - If MFEA is started, it will explicitly enable the multicast
      forwarding flags that have been added to recent OpenBSD releases:
      net.inet.ip.mforwarding (for OpenBSD-3.9 and later) and
      net.inet6.ip6.mforwarding (for OpenBSD-4.0 and later).

  RIB:
    - No significant changes.

  RIP/RIPng:
    - Addition of support for "show ripng" xorpsh operational commands.

    - Critical RIPng-related bug fix. Previously the RIPng installed
      routes had incorrect outgoing interface toward the destination.

    - Bug fix related to the TTL for RIPng multicast packets: now it is
      set to 255 as specified in the protocol specification (RFC 2080)
      instead of 1.

  OLSR:
    - Added support for RFC 3626 Optimized Link State Routing Protocol.
      This is a fully fledged XORP routing process with policy route
      redistribution capability. The work was generously funded over
      2007/2008 by CenGen, Inc.

  OSPF:
    - Bug fix related to OSPFv3 link-local scope LSAs. Previously the
      link-local scope LSAs were incorrectly flooded to links other
      than the one they belonged to.

    - Bug fix related to OSPFv3 Inter-Area-Prefix-LSAs. The check for
      the minimum size of an Inter-Area-Prefix-LSA was incorrect so
      short prefixes such as the default route would be rejected.

    - Added a clear database command.

    - In the OSPFv2 configuration "passive" is no longer a bool but a
      directive. Previously setting an interface to passive would set
      the interface to loopback and announce a host route for the
      interface. Using the passive keyword will still set the
      interface to loopback but now the network will be announced. If
      the previous behaviour of of announcing the host route is
      required the host variable can be set to true.

  BGP:
    - Added support for 4-byte AS numbers, as detailed in RFC 4893.
      From 1st Jan 2009 4-byte AS numbers will be allocated by default
      by RIPE, so it is desirable that all BGP implementations support
      four-byte AS numbers by that time.  Currently 4-byte support is
      not enabled in XORP by default, but can be enabled using the
      "enable-4byte-as-numbers" configuration option.

  STATIC_ROUTES:
    - Bug fix that prevented the deletion of interface-specific routes
      using xorpsh.

  MLD/IGMP:
    - No significant changes.

  MLD/IGMP-Lite:
    - An implementation of Lightweight IGMP/MLD is available in
      directory ${XORP}/contrib/mld6igmp_lite. It can be used instead
      of the existing MLD/IGMP vanilla implementation by using the
      following command before compiling XORP:
        ./configure --with-mld6igmp_lite

  PIM-SM:
    - No significant changes.

  FIB2MRIB:
    - No significant changes.

  CLI:
    - No significant changes.

  SNMP:
    - No significant changes.

6 files changed, 27 insertions, 59 deletions

diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 7396d90a8d8..1c593cf6461 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2008/01/18 05:08:52 tnn Exp $
+# $NetBSD: Makefile,v 1.22 2008/09/11 10:59:03 obache Exp $
 #
 
-DISTNAME=		xorp-1.4
-PKGREVISION=		1
+DISTNAME=		xorp-1.5
 CATEGORIES=		net
-MASTER_SITES=		http://www.xorp.org/releases/1.4/
+MASTER_SITES=		http://www.xorp.org/releases/1.5/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.xorp.org/
 COMMENT=		The eXtensible Open Router Platform
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
@@ -20,6 +21,7 @@ CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 #
 GNU_CONFIGURE_PREFIX=	${PREFIX}/xorp
 
+# Test target require bash and python (really it, not python2.4 and so on).
 TEST_TARGET=		check
 
 .include "../../security/openssl/buildlink3.mk"
diff --git a/net/xorp/PLIST b/net/xorp/PLIST
index 144f2bffb29..7b10640206a 100644
--- a/net/xorp/PLIST
+++ b/net/xorp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2007/10/13 15:15:49 obache Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/09/11 10:59:03 obache Exp $
 xorp/bgp/tools/xorpsh_print_peers
 xorp/bgp/tools/xorpsh_print_routes
 xorp/bgp/xorp_bgp
@@ -7,11 +7,15 @@ xorp/bin/xorp_profiler
 xorp/bin/xorp_rtrmgr
 xorp/bin/xorpsh
 xorp/cli/tools/send_cli_processor_xrl
+xorp/contrib/olsr/tools/clear_database
+xorp/contrib/olsr/tools/print_databases
+xorp/contrib/olsr/xorp_olsr4
 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/firewall.tp
 xorp/etc/templates/host.cmds
 xorp/etc/templates/igmp.cmds
 xorp/etc/templates/igmp.tp
@@ -23,6 +27,8 @@ xorp/etc/templates/mfea6.tp
 xorp/etc/templates/misc.cmds
 xorp/etc/templates/mld.cmds
 xorp/etc/templates/mld.tp
+xorp/etc/templates/olsr4.cmds
+xorp/etc/templates/olsr4.tp
 xorp/etc/templates/ospfv2.cmds
 xorp/etc/templates/ospfv2.tp
 xorp/etc/templates/ospfv3.cmds
@@ -38,6 +44,7 @@ xorp/etc/templates/rib.cmds
 xorp/etc/templates/rib.tp
 xorp/etc/templates/rip.cmds
 xorp/etc/templates/rip.tp
+xorp/etc/templates/ripng.cmds
 xorp/etc/templates/ripng.tp
 xorp/etc/templates/rtrmgr.tp
 xorp/etc/templates/snmp.tp
@@ -51,6 +58,7 @@ xorp/fib2mrib/xorp_fib2mrib
 xorp/libxipc/xorp_finder
 xorp/mld6igmp/xorp_igmp
 xorp/mld6igmp/xorp_mld
+xorp/ospf/tools/clear_database
 xorp/ospf/tools/print_lsas
 xorp/ospf/tools/print_neighbours
 xorp/ospf/xorp_ospfv2
@@ -58,6 +66,7 @@ xorp/ospf/xorp_ospfv3
 xorp/pim/xorp_pimsm4
 xorp/pim/xorp_pimsm6
 xorp/policy/xorp_policy
+xorp/rib/tools/show_distances
 xorp/rib/tools/show_routes
 xorp/rib/xorp_rib
 xorp/rip/tools/show_peer_stats
@@ -69,7 +78,6 @@ 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
@@ -77,9 +85,9 @@ xorp/xrl/targets/finder.xrls
 xorp/xrl/targets/finder_client.xrls
 xorp/xrl/targets/mfea.xrls
 xorp/xrl/targets/mld6igmp.xrls
+xorp/xrl/targets/olsr4.xrls
 xorp/xrl/targets/ospfv2.xrls
 xorp/xrl/targets/ospfv3.xrls
-xorp/xrl/targets/packet_acl.xrls
 xorp/xrl/targets/pim.xrls
 xorp/xrl/targets/policy.xrls
 xorp/xrl/targets/profiler.xrls
@@ -88,11 +96,12 @@ xorp/xrl/targets/ribclient.xrls
 xorp/xrl/targets/rip.xrls
 xorp/xrl/targets/ripng.xrls
 xorp/xrl/targets/rtrmgr.xrls
+xorp/xrl/targets/show_distances.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_fea_rawlink.xrls
 xorp/xrl/targets/test_finder_events.xrls
 xorp/xrl/targets/test_peer.xrls
 xorp/xrl/targets/test_socket4.xrls
@@ -118,9 +127,12 @@ xorp/xrl/targets/xorpsh.xrls
 @dirrm xorp/fea
 @dirrm xorp/etc/templates
 @dirrm xorp/etc
+@dirrm xorp/contrib/olsr/tools
+@dirrm xorp/contrib/olsr
+@dirrm xorp/contrib
 @dirrm xorp/cli/tools
 @dirrm xorp/cli
+@dirrm xorp/bin
 @dirrm xorp/bgp/tools
 @dirrm xorp/bgp
-@dirrm xorp/bin
 @dirrm xorp
diff --git a/net/xorp/distinfo b/net/xorp/distinfo
index 0a8e6ba2da8..08f08c9f7af 100644
--- a/net/xorp/distinfo
+++ b/net/xorp/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/05/24 10:37:32 obache Exp $
+$NetBSD: distinfo,v 1.11 2008/09/11 10:59:03 obache Exp $
 
-SHA1 (xorp-1.4.tar.gz) = 28f27ab220ddb571a244143c87d18685d72266ee
-RMD160 (xorp-1.4.tar.gz) = 4ebbc506d52e996bf15f43c0df1960cefd0dbaf6
-Size (xorp-1.4.tar.gz) = 8496928 bytes
-SHA1 (patch-ab) = a3782f5ff1d2e8de640ecb72b7473e35d17ff56e
-SHA1 (patch-af) = 0b05653dda8067856967fe033851f7466525cf40
-SHA1 (patch-ag) = eeca71c1e2908040f9e3b2dc0ec056884d2c77f2
+SHA1 (xorp-1.5.tar.gz) = cc6a0ec42d5dd49b57b9dab365a247c646d5e843
+RMD160 (xorp-1.5.tar.gz) = 4dd5cc7162a0f8087ed973b45279718ea2a337b8
+Size (xorp-1.5.tar.gz) = 7384564 bytes
diff --git a/net/xorp/patches/patch-ab b/net/xorp/patches/patch-ab
deleted file mode 100644
index e772f78922f..00000000000
--- a/net/xorp/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2007/10/13 15:15:51 obache Exp $
-
---- configure.orig	2007-03-14 18:59:03.000000000 +0000
-+++ configure
-@@ -19612,7 +19612,7 @@ echo "${ECHO_T}no" >&6
-   done
- 
- 
--					if test "${enable_compiler_pipe}" == "yes" ; then
-+					if test "${enable_compiler_pipe}" = "yes" ; then
- 		for ac_flag in "-pipe"
-   do
-       ac_safe=xr_check_cflag
diff --git a/net/xorp/patches/patch-af b/net/xorp/patches/patch-af
deleted file mode 100644
index 41003b6c473..00000000000
--- a/net/xorp/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.2 2007/10/13 15:15:52 obache Exp $
-
---- mibs/configure.orig	2007-03-14 18:59:04.000000000 +0000
-+++ mibs/configure
-@@ -6415,7 +6415,7 @@ echo "${ECHO_T}no" >&6
-   done
- 
- 
--					if test "${enable_compiler_pipe}" == "yes" ; then
-+					if test "${enable_compiler_pipe}" = "yes" ; then
- 		for ac_flag in "-pipe"
-   do
-       ac_safe=xr_check_cflag
diff --git a/net/xorp/patches/patch-ag b/net/xorp/patches/patch-ag
deleted file mode 100644
index 43501bea1dc..00000000000
--- a/net/xorp/patches/patch-ag
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2008/05/24 10:37:32 obache Exp $
-
---- fea/ifconfig_media.cc.orig	2007-02-16 22:45:42.000000000 +0000
-+++ fea/ifconfig_media.cc
-@@ -94,8 +94,12 @@ ifconfig_media_get_link_status(const str
- 
- 	switch (IFM_TYPE(ifmr.ifm_active)) {
- 	case IFM_ETHER:
-+#ifdef IFM_FDDI
- 	case IFM_FDDI:
-+#endif
-+#ifdef IFM_TOKEN
- 	case IFM_TOKEN:
-+#endif
- 	case IFM_IEEE80211:
- 	    if ((ifmr.ifm_status & IFM_AVALID)
- 		&& (ifmr.ifm_status & IFM_ACTIVE)) {