From 6eb29839a6f50f0c69f35cea8bf10c15a8faebfd Mon Sep 17 00:00:00 2001
From: joerg <joerg>
Date: Thu, 23 Mar 2006 00:53:48 +0000
Subject: DragonFly support.

---
 net/poptop/distinfo         |  5 +++--
 net/poptop/patches/patch-ac | 14 +++++++++-----
 net/poptop/patches/patch-ai | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 net/poptop/patches/patch-ai

(limited to 'net')

diff --git a/net/poptop/distinfo b/net/poptop/distinfo
index 9843df90ad0..921178906bc 100644
--- a/net/poptop/distinfo
+++ b/net/poptop/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:14:01 agc Exp $
+$NetBSD: distinfo,v 1.8 2006/03/23 00:53:48 joerg Exp $
 
 SHA1 (pptpd-1.2.1.tar.gz) = ffbeff5d8a8c0725125ec0682b0871e927aefba4
 RMD160 (pptpd-1.2.1.tar.gz) = c51eaf792d526755dde0aae591a598e02667bb1d
 Size (pptpd-1.2.1.tar.gz) = 180974 bytes
 SHA1 (patch-aa) = 40e5873fc582040112e97477e3709e729245d4c9
 SHA1 (patch-ab) = 43741ecf4f1f52113814ccd0f70a9ab173c0667f
-SHA1 (patch-ac) = e2e9ef357670eb394457218ee2c9468d2400bbb1
+SHA1 (patch-ac) = 448650262bdb4ac13c06786a0e2fbdb961788730
 SHA1 (patch-ad) = 451e6811622114c4e99df3b9ff31238bfa6623ed
 SHA1 (patch-ae) = 7072ce9eacbdc52632c2eb8341dc4519d6d79d78
 SHA1 (patch-af) = f087f8b16566701ab51dbb967a126c710f785213
 SHA1 (patch-ag) = 7810baae4607113684a00bcdf13140242f8744b9
 SHA1 (patch-ah) = 54506391dfc52ce71550aec6225d96b069560581
+SHA1 (patch-ai) = c03b43e2d3c1df51df8ab030560a44949557046f
diff --git a/net/poptop/patches/patch-ac b/net/poptop/patches/patch-ac
index ee5bdc51518..131be4a9bdf 100644
--- a/net/poptop/patches/patch-ac
+++ b/net/poptop/patches/patch-ac
@@ -1,21 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2005/01/12 12:28:04 cube Exp $
+$NetBSD: patch-ac,v 1.3 2006/03/23 00:53:48 joerg Exp $
 
---- pptpctrl.c.orig	2004-04-28 13:36:07.000000000 +0200
+--- pptpctrl.c.orig	2004-04-28 11:36:07.000000000 +0000
 +++ pptpctrl.c
-@@ -32,6 +32,7 @@
+@@ -32,6 +32,11 @@
  #include <netinet/in.h>
  #include <arpa/inet.h>
  #ifdef HAVE_OPENPTY
++#if defined(__DragonFly__)
++#include <libutil.h>
++#else
 +#include <util.h>
++#endif
  #ifdef HAVE_PTY_H
  #include <pty.h>
  #endif
-@@ -734,7 +735,7 @@ static void launch_pppd(char **pppaddrs,
+@@ -734,7 +739,7 @@ static void launch_pppd(char **pppaddrs,
  
          if (pptp_logwtmp) {
                   pppd_argv[an++] = "plugin";
 -                 pppd_argv[an++] = "/usr/lib/pptpd/pptpd-logwtmp.so";
-+                 pppd_argv[an++] = "@@PREFIX@@/lib/pptpd/pptpd-logwtmp.so";
++                 pppd_argv[an++] = "/usr/pkg/lib/pptpd/pptpd-logwtmp.so";
                   pppd_argv[an++] = "pptpd-original-ip";
                   pppd_argv[an++] = inet_ntoa(inetaddrs[1]);
          }
diff --git a/net/poptop/patches/patch-ai b/net/poptop/patches/patch-ai
new file mode 100644
index 00000000000..39d00aaba39
--- /dev/null
+++ b/net/poptop/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1 2006/03/23 00:53:48 joerg Exp $
+
+--- plugins/pppd.h.orig	2006-03-23 00:44:01.000000000 +0000
++++ plugins/pppd.h
+@@ -55,7 +55,11 @@
+ #include <sys/param.h>		/* for MAXPATHLEN and BSD4_4, if defined */
+ #include <sys/types.h>		/* for u_int32_t, if defined */
+ #include <sys/time.h>		/* for struct timeval */
++#if defined(__DragonFly__)
++#include <net/ppp_layer/ppp_defs.h>
++#else
+ #include <net/ppp_defs.h>
++#endif
+ #include "patchlevel.h"
+ 
+ #if defined(__STDC__)
-- 
cgit v1.2.3