Updated xorp to 1.2.

Changes since 1.1:
  ALL:
    - Numerous improvements, bug fixes and cleanup.

    - The third-party ospfd implementation is replaced with a new
      OSPF implementation developed from scratch.

    - The integration of the routing policy mechanism with the rest of
      the system is completed.

    - XORP now builds on Windows Server 2003 (Service Pack 1),
      amd64+FreeBSD-6.0, FreeBSD-6.1 (BETA3), NetBSD-3.0, OpenBSD-2.8,
      MacOS X 10.4.5, Linux Fedora Core4 (among others).

    [...]

Changes since 1.0:
  ALL:
    - Numerous improvements, bug fixes and cleanup.

    - XORP now builds on amd64+OpenBSD-3.6-current.

    - The --enable-advanced-mcast-api flag to "./configure" has been
      replaced  with the --disable-advanced-multicast-api flag.

    - Addition of support for code execution profiling.

    - Currently "gmake" does not build the regression tests.
      The command "gmake check" should be used to build and run the
      regression tests.

    - Addition of two new documents:
      * "An Introduction to Writing a XORP Process"
      * "XORP User Manual"

    [...]

3 files changed, 32 insertions, 13 deletions

diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index a77532d3f6b..6a0f0196f48 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,20 +1,17 @@
-# $NetBSD: Makefile,v 1.16 2006/03/04 21:30:26 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2006/03/11 21:01:59 rillig Exp $
 #
 
-DISTNAME=		xorp-1.0
-PKGREVISION=	2
+DISTNAME=		xorp-1.2
 CATEGORIES=		net
-MASTER_SITES=		http://www.xorp.org/releases/1.0/
+MASTER_SITES=		http://www.xorp.org/releases/1.2/
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.xorp.org/
 COMMENT=		The eXtensible Open Router Platform
 
-BROKEN_IN=		pkgsrc-2005Q4
-
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 
 # The xorp people insist on their own PREFIX.
 # See http://www.xorp.org/bugzilla/show_bug.cgi?id=91
diff --git a/net/xorp/PLIST b/net/xorp/PLIST
index f1fcfb060b2..a9e46c108d0 100644
--- a/net/xorp/PLIST
+++ b/net/xorp/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2004/07/20 21:55:31 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/03/11 21:01:59 rillig Exp $
 xorp/bgp/tools/xorpsh_print_peers
 xorp/bgp/tools/xorpsh_print_routes
 xorp/bgp/xorp_bgp
 xorp/bin/call_xrl
+xorp/bin/xorp_profiler
 xorp/bin/xorp_rtrmgr
 xorp/bin/xorpsh
 xorp/cli/tools/send_cli_processor_xrl
@@ -19,30 +20,42 @@ xorp/etc/templates/mfea.cmds
 xorp/etc/templates/mfea4.tp
 xorp/etc/templates/mfea6.cmds
 xorp/etc/templates/mfea6.tp
+xorp/etc/templates/misc.cmds
 xorp/etc/templates/mld.cmds
 xorp/etc/templates/mld.tp
-xorp/etc/templates/ospf.tp
+xorp/etc/templates/ospfv2.cmds
+xorp/etc/templates/ospfv2.tp
 xorp/etc/templates/pim.cmds
 xorp/etc/templates/pim6.cmds
 xorp/etc/templates/pimsm4.tp
 xorp/etc/templates/pimsm6.tp
+xorp/etc/templates/plumbing.tp
+xorp/etc/templates/policy.tp
+xorp/etc/templates/protocols.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/rtrmgr.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_click_config_generator
 xorp/fea/xorp_fea_dummy
 xorp/fib2mrib/xorp_fib2mrib
 xorp/libxipc/xorp_finder
 xorp/mld6igmp/xorp_igmp
 xorp/mld6igmp/xorp_mld
+xorp/ospf/tools/print_lsas
+xorp/ospf/tools/print_neighbours
+xorp/ospf/xorp_ospfv2
+xorp/ospf/xorp_ospfv3
 xorp/pim/xorp_pimsm4
 xorp/pim/xorp_pimsm6
+xorp/policy/xorp_policy
 xorp/rib/tools/show_routes
 xorp/rib/xorp_rib
 xorp/rip/tools/show_peer_stats
@@ -63,7 +76,12 @@ xorp/xrl/targets/finder_client.xrls
 xorp/xrl/targets/mfea.xrls
 xorp/xrl/targets/mld6igmp.xrls
 xorp/xrl/targets/ospf.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
 xorp/xrl/targets/rib.xrls
 xorp/xrl/targets/ribclient.xrls
 xorp/xrl/targets/rip.xrls
@@ -78,6 +96,7 @@ 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/test_xrls.xrls
 xorp/xrl/targets/xorp_if_mib.xrls
 xorp/xrl/targets/xorpsh.xrls
 @dirrm xorp/xrl/targets
@@ -87,7 +106,10 @@ xorp/xrl/targets/xorpsh.xrls
 @dirrm xorp/rip
 @dirrm xorp/rib/tools
 @dirrm xorp/rib
+@dirrm xorp/policy
 @dirrm xorp/pim
+@dirrm xorp/ospf/tools
+@dirrm xorp/ospf
 @dirrm xorp/mld6igmp
 @dirrm xorp/libxipc
 @dirrm xorp/fib2mrib
diff --git a/net/xorp/distinfo b/net/xorp/distinfo
index d252b3cc18f..a7b144140ac 100644
--- a/net/xorp/distinfo
+++ b/net/xorp/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 12:14:07 agc Exp $
+$NetBSD: distinfo,v 1.4 2006/03/11 21:01:59 rillig Exp $
 
-SHA1 (xorp-1.0.tar.gz) = f5dc6ff9adbf1da2b982ef54c84d23c47142e876
-RMD160 (xorp-1.0.tar.gz) = 8cf6e36c9f463804e728a7b8b841b8eefebaecdd
-Size (xorp-1.0.tar.gz) = 7240796 bytes
+SHA1 (xorp-1.2.tar.gz) = 061792f0810c7cf8ea9782457c8408a7f7b44516
+RMD160 (xorp-1.2.tar.gz) = 8ea6865adc587d58a6f98222a2c6b61bbedc805b
+Size (xorp-1.2.tar.gz) = 8765558 bytes