Add DragonFly support. Disable propolice on DragonFly. Uses C++.

7 files changed, 89 insertions, 2 deletions

diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 679f934a560..032748520fc 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2006/03/16 23:33:35 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2006/05/09 21:18:49 joerg Exp $
 #
 
 DISTNAME=		xorp-1.2
@@ -10,6 +10,7 @@ HOMEPAGE=		http://www.xorp.org/
 COMMENT=		The eXtensible Open Router Platform
 
 GNU_CONFIGURE=		yes
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 
diff --git a/net/xorp/distinfo b/net/xorp/distinfo
index a7b144140ac..7e5cc8fcca8 100644
--- a/net/xorp/distinfo
+++ b/net/xorp/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.4 2006/03/11 21:01:59 rillig Exp $
+$NetBSD: distinfo,v 1.5 2006/05/09 21:18:49 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) = e6fd2c892f53f9d412241273a3c0ec8ea8cc5637
+SHA1 (patch-ac) = 69a3b9526262dcb4cf7f09f1d408acd43d22de6f
+SHA1 (patch-ad) = e836d2cc8f6bbca16682bf884cdaae5ed826dedd
diff --git a/net/xorp/hacks.mk b/net/xorp/hacks.mk
new file mode 100644
index 00000000000..2722f8fa82d
--- /dev/null
+++ b/net/xorp/hacks.mk
@@ -0,0 +1,18 @@
+# $NetBSD: hacks.mk,v 1.1 2006/05/09 21:18:49 joerg Exp $
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "DragonFly" && ${PKGSRC_COMPILER} == "gcc"
+#
+# Workaround an ICE in the stack-smashing protection in GCC 3.4.x.
+#
+.if !defined(HAS_PROPOLICE)
+HAS_PROPOLICE!=	( ${CC} -v 2>&1 | ${GREP} 'propolice' ) 2>/dev/null || echo no
+MAKEVARS+=	HAS_PROPOLICE
+.endif
+
+.if ${HAS_PROPOLICE} != "no"
+CFLAGS+=	-fno-stack-protector
+CXXFLAGS+=	-fno-stack-protector
+.endif
+.endif
diff --git a/net/xorp/patches/patch-aa b/net/xorp/patches/patch-aa
new file mode 100644
index 00000000000..e691bd2aaf6
--- /dev/null
+++ b/net/xorp/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2006/05/09 21:18:50 joerg Exp $
+
+--- mrt/include/ip_mroute.h.orig	2006-05-09 18:33:35.000000000 +0000
++++ mrt/include/ip_mroute.h
+@@ -56,6 +56,10 @@
+ # include <netinet/ip_mroute.h>
+ #endif
+ 
++#if defined(HOST_OS_DRAGONFLY)
++#include <net/ip_mroute/ip_mroute.h>
++#endif
++
+ /*
+  * NetBSD (all versions)
+  * OpenBSD (all versions)
diff --git a/net/xorp/patches/patch-ab b/net/xorp/patches/patch-ab
new file mode 100644
index 00000000000..d4d18a681cf
--- /dev/null
+++ b/net/xorp/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1 2006/05/09 21:18:50 joerg Exp $
+
+--- configure.orig	2006-05-09 19:56:35.000000000 +0000
++++ configure
+@@ -1806,6 +1806,18 @@ cat >>confdefs.h <<\_ACEOF
+ _ACEOF
+ 
+     ;;
++    dragonfly* )
++
++cat >>confdefs.h <<\_ACEOF
++#define HOST_OS_DRAGONFLY 1
++_ACEOF
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HOST_OS_NAME "DragonFly"
++_ACEOF
++
++    ;;
+     linux* )
+ 
+ cat >>confdefs.h <<\_ACEOF
diff --git a/net/xorp/patches/patch-ac b/net/xorp/patches/patch-ac
new file mode 100644
index 00000000000..be78918a415
--- /dev/null
+++ b/net/xorp/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2006/05/09 21:18:50 joerg Exp $
+
+--- libxipc/sockutil.cc.orig	2006-05-09 20:01:15.000000000 +0000
++++ libxipc/sockutil.cc
+@@ -390,7 +390,7 @@ get_preferred_ipv4_addr()
+ static uint32_t
+ if_count()
+ {
+-#ifdef HOST_OS_FREEBSD
++#if defined(HOST_OS_FREEBSD) || defined(HOST_OS_DRAGONFLY)
+     int cnt, error;
+     size_t cntlen = sizeof(cnt);
+     error = sysctlbyname("net.link.generic.system.ifcount",
diff --git a/net/xorp/patches/patch-ad b/net/xorp/patches/patch-ad
new file mode 100644
index 00000000000..f7c4ae98cf3
--- /dev/null
+++ b/net/xorp/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/05/09 21:18:50 joerg Exp $
+
+--- fea/ifconfig_set_ioctl.cc.orig	2006-05-09 20:01:45.000000000 +0000
++++ fea/ifconfig_set_ioctl.cc
+@@ -175,7 +175,7 @@ IfConfigSetIoctl::is_discard_emulated(co
+ {
+     UNUSED(i);
+ 
+-#if defined(HOST_OS_BSDI) || defined(HOST_OS_FREEBSD) || defined(HOST_OS_MACOSX) || defined(HOST_OS_NETBSD) || defined(HOST_OS_OPENBSD)
++#if defined(HOST_OS_BSDI) || defined(HOST_OS_FREEBSD) || defined(HOST_OS_MACOSX) || defined(HOST_OS_NETBSD) || defined(HOST_OS_OPENBSD) || defined(HOST_OS_DRAGONFLY)
+     return (true);
+ #else
+     return (false);