pkg/37058: XORP 1.4 patches

[dogan%politics.ankara.edu.tr@localhost]

>Number:         37058
>Category:       pkg
>Synopsis:       XORP 1.4 patches
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Oct 04 09:15:01 +0000 2007
>Originator:     Mustafa Dogan
>Release:        NetBSD 4.0_RC2
>Organization:
Ankara University Faculty of Political Sciences
>Environment:
NetBSD 4.0_RC2 i386
>Description:
Would you update net/xorp package?
I compiled XORP 1.4 on NetBSD 4.0 RC2 i386 machine without problem. 

patches/patch-aa
patches/patch-ac
patches/patch-ad
patches/patch-ae
files are related to Dragonfly BSD and patches already made in source file. So 
they should be removed.

>How-To-Repeat:

>Fix:
Patches are below: 
Makefile.diff
===================================================================
--- Makefile.orig
+++ Makefile
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.19 2006/05/09 21:18:49 joerg Exp $
 #
 
-DISTNAME=              xorp-1.2
+DISTNAME=              xorp-1.4
 CATEGORIES=            net
-MASTER_SITES=          http://www.xorp.org/releases/1.2/
+MASTER_SITES=          http://www.xorp.org/releases/1.4/
 
 MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=              http://www.xorp.org/


PLIST.diff
===================================================================
--- PLIST.orig
+++ PLIST
@@ -25,6 +25,8 @@ xorp/etc/templates/mld.cmds
 xorp/etc/templates/mld.tp
 xorp/etc/templates/ospfv2.cmds
 xorp/etc/templates/ospfv2.tp
+xorp/etc/templates/ospfv3.cmds
+xorp/etc/templates/ospfv3.tp
 xorp/etc/templates/pim.cmds
 xorp/etc/templates/pim6.cmds
 xorp/etc/templates/pimsm4.tp
@@ -75,7 +77,6 @@ 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/ospfv2.xrls
 xorp/xrl/targets/ospfv3.xrls
 xorp/xrl/targets/packet_acl.xrls


distinfo.diff
===================================================================
--- distinfo.orig
+++ distinfo
@@ -1,11 +1,7 @@
 $NetBSD: distinfo,v 1.8 2006/12/17 20:20:04 joerg Exp $
 
-SHA1 (xorp-1.2.tar.gz) = 061792f0810c7cf8ea9782457c8408a7f7b44516
-RMD160 (xorp-1.2.tar.gz) = 8ea6865adc587d58a6f98222a2c6b61bbedc805b
-Size (xorp-1.2.tar.gz) = 8765558 bytes
-SHA1 (patch-aa) = b4949c9ea56002a964fd530696b8477aed2c280b
-SHA1 (patch-ab) = 7dc2cc400a1b917e0962152a99cab3fcca6b1153
-SHA1 (patch-ac) = 69a3b9526262dcb4cf7f09f1d408acd43d22de6f
-SHA1 (patch-ad) = e836d2cc8f6bbca16682bf884cdaae5ed826dedd
-SHA1 (patch-ae) = 6ec968d497bc69d437ac888c4eff16f74011066a
-SHA1 (patch-af) = e13032a386dc4d6956cd668e5b1d571b8bd0771d
+SHA1 (xorp-1.4.tar.gz) = 28f27ab220ddb571a244143c87d18685d72266ee
+RMD160 (xorp-1.4.tar.gz) = 4ebbc506d52e996bf15f43c0df1960cefd0dbaf6
+Size (xorp-1.4.tar.gz) = 8496928 bytes
+SHA1 (patch-aa) = ecf552ada1067934f89dc854c36419eccc6332ed
+SHA1 (patch-ab) = 188a300ec2b18f615894b569f0381c49a76b9bfc


patches/patch.ab
===================================================================
--- configure.orig
+++ 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


patches/patch.af
===================================================================
--- mibs/configure.orig
+++ 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