Add necessary magic to build kppp on DragonFly.

4 files changed, 70 insertions, 9 deletions

diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo
index 644cab7a6d6..25d69cd5f77 100644
--- a/net/kdenetwork3/distinfo
+++ b/net/kdenetwork3/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.33 2005/10/13 12:48:33 markd Exp $
+$NetBSD: distinfo,v 1.34 2005/11/18 15:04:57 joerg Exp $
 
 SHA1 (kdenetwork-3.4.3.tar.bz2) = b1738ac2f2665a74eaf75458f98df948eec6ce80
 RMD160 (kdenetwork-3.4.3.tar.bz2) = b417ff363c71b30f6151e65360d615c167c90ebb
 Size (kdenetwork-3.4.3.tar.bz2) = 7364627 bytes
-SHA1 (patch-aa) = 49ca3764fae7044d1170efe03b53147732e9d470
+SHA1 (patch-aa) = 41cc42d9916b56b00cbb3031d38a95366ec4ea16
+SHA1 (patch-ab) = cd2fe9a73be928e391923947cb29cbbdeb79ae03
 SHA1 (patch-ac) = a0e2fbcf1348d5e91434878bac4977b649c94855
-SHA1 (patch-ad) = 916bcbe11ca71f7a0f5f03c91fa18a6af9197be2
+SHA1 (patch-ad) = af41193e1e8612feaf3de055ef503b97b766e559
 SHA1 (patch-am) = e0511acfd35ebde0c919612f52dd63304934e8cf
diff --git a/net/kdenetwork3/patches/patch-aa b/net/kdenetwork3/patches/patch-aa
index b596b0ae629..1ebf0f275b1 100644
--- a/net/kdenetwork3/patches/patch-aa
+++ b/net/kdenetwork3/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2004/08/21 14:56:18 markd Exp $
+$NetBSD: patch-aa,v 1.14 2005/11/18 15:04:57 joerg Exp $
 
---- configure.orig	2004-06-01 02:06:53.000000000 +1200
+--- configure.orig	2005-10-05 21:04:45.000000000 +0000
 +++ configure
-@@ -26504,72 +26504,6 @@ _ACEOF
+@@ -27460,72 +27460,6 @@ _ACEOF
  
  
  
@@ -75,3 +75,24 @@ $NetBSD: patch-aa,v 1.13 2004/08/21 14:56:18 markd Exp $
  # darwin needs this to initialize the environment
  
  for ac_header in crt_externs.h
+@@ -41114,7 +41048,11 @@ cat >>conftest.$ac_ext <<_ACEOF
+ #endif
+ #include <unistd.h>
+ #include <arpa/inet.h>
++#ifdef __DragonFly__
++#include <net/ppp_layer/ppp_defs.h>
++#else
+ #include <net/ppp_defs.h>
++#endif
+ #include <netinet/in.h>
+ 
+ #ifdef __svr4__
+@@ -41130,6 +41068,8 @@ cat >>conftest.$ac_ext <<_ACEOF
+ 
+     #if defined(linux)
+       #include <linux/if_ppp.h>
++    #elif defined(__DragonFly__)
++      #include <net/ppp/if_ppp.h>
+     #else
+       #include <net/if_ppp.h>                /* BSD, NeXT, etc. */
+     #endif
diff --git a/net/kdenetwork3/patches/patch-ab b/net/kdenetwork3/patches/patch-ab
new file mode 100644
index 00000000000..e6171bc1ffa
--- /dev/null
+++ b/net/kdenetwork3/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2005/11/18 15:04:57 joerg Exp $
+
+--- kppp/opener.cpp.orig	2005-11-16 16:45:28.000000000 +0000
++++ kppp/opener.cpp
+@@ -68,7 +68,11 @@ extern "C" int _Precvmsg(int, void*, int
+ #endif
+ 
+ #ifndef HAVE_NET_IF_PPP_H
+-#  ifdef HAVE_LINUX_IF_PPP_H
++#  if defined(__DragonFly__)
++#    include <net/ppp_layer/ppp_defs.h>
++#    include <net/if.h>
++#    include <net/ppp/if_ppp.h>
++#  elif defined(HAVE_LINUX_IF_PPP_H)
+ #    include <linux/if_ppp.h>
+ #  endif
+ #else
diff --git a/net/kdenetwork3/patches/patch-ad b/net/kdenetwork3/patches/patch-ad
index b09379da131..84ad6fe7ecd 100644
--- a/net/kdenetwork3/patches/patch-ad
+++ b/net/kdenetwork3/patches/patch-ad
@@ -1,8 +1,30 @@
-$NetBSD: patch-ad,v 1.2 2003/01/02 09:12:30 skrll Exp $
+$NetBSD: patch-ad,v 1.3 2005/11/18 15:04:57 joerg Exp $
 
---- kppp/pppstats.cpp.orig	Mon Dec 16 03:02:45 2002
+--- kppp/pppstats.cpp.orig	2005-10-05 13:24:08.000000000 +0000
 +++ kppp/pppstats.cpp
-@@ -218,27 +218,29 @@ bool PPPStats::initStats() {
+@@ -54,7 +54,11 @@
+ #include <arpa/inet.h>
+ #include <unistd.h>
+ #include <netinet/in.h>
++#ifdef __DragonFly__
++#include <net/ppp_layer/ppp_defs.h>
++#else
+ #include <net/ppp_defs.h>
++#endif
+ 
+ #include "config.h"
+ #include "pppstats.h"
+@@ -70,6 +74,9 @@
+   #ifdef HAVE_LINUX_IF_PPP_H
+    #include <linux/if.h>
+    #include <linux/if_ppp.h>
++  #elif defined(__DragonFly__)
++   #include <net/if.h>
++   #include <net/ppp/if_ppp.h>
+   #endif
+  #else
+   #include <net/if.h>
+@@ -218,27 +225,29 @@ bool PPPStats::initStats() {
  
    strlcpy(ifr.ifr_name, unitName, sizeof(ifr.ifr_name));