Add support for DragonFly from Joerg Sonnenberger. Okayed by tron.

4 files changed, 63 insertions, 1 deletions

diff --git a/devel/apr/distinfo b/devel/apr/distinfo
index a34a4cec6cf..5ab6c116ff6 100644
--- a/devel/apr/distinfo
+++ b/devel/apr/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2005/04/25 09:13:02 adam Exp $
+$NetBSD: distinfo,v 1.14 2005/09/07 11:39:55 reed Exp $
 
 SHA1 (httpd-2.0.54.tar.bz2) = 15b4fc3024cceea6562fb03383fd624e84e5e35a
 RMD160 (httpd-2.0.54.tar.bz2) = c511cb2fa396ba04caf77bfc6ca03413df48ea08
@@ -7,3 +7,6 @@ SHA1 (patch-an) = 76d9ac0cdddec7c0f41535baee63bf0aa26ed596
 SHA1 (patch-ao) = d04d37445b7e8a50a74caa9bda3e6b10924e8322
 SHA1 (patch-ap) = 357776c7208407936e09891ae87d23b112a12756
 SHA1 (patch-aq) = 6cc1fb879fb5d9280f543ebe068a441e2e6560f3
+SHA1 (patch-ar) = defa2be14ec057e1c41151b8cd1edc0ffb219694
+SHA1 (patch-as) = 37e70ff8b1a3344e47bcd2fe2b145a6e3e6a4562
+SHA1 (patch-at) = 9935c308ba96a8c92dedd3288429a989f9d643f5
diff --git a/devel/apr/patches/patch-ar b/devel/apr/patches/patch-ar
new file mode 100644
index 00000000000..de2e9382d54
--- /dev/null
+++ b/devel/apr/patches/patch-ar
@@ -0,0 +1,20 @@
+$NetBSD: patch-ar,v 1.1 2005/09/07 11:39:55 reed Exp $
+
+--- apr/network_io/unix/sendrecv.c.orig	2005-07-15 15:11:22.000000000 +0000
++++ apr/network_io/unix/sendrecv.c
+@@ -372,11 +372,13 @@ do_select:
+     return rv < 0 ? errno : APR_SUCCESS;
+ }
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ static int include_hdrs_in_length(void)
+ {
+-#ifdef HAVE_SYS_SYSCTL_H
++#ifdef __DragonFly__
++	return(0);
++#elif defined(HAVE_SYS_SYSCTL_H)
+ /* this assumes: 
+  *   if the header exists, so does the sysctlbyname() syscall, and 
+  *   if the header doesn't exist, the kernel is really old
diff --git a/devel/apr/patches/patch-as b/devel/apr/patches/patch-as
new file mode 100644
index 00000000000..1cc5767945a
--- /dev/null
+++ b/devel/apr/patches/patch-as
@@ -0,0 +1,22 @@
+$NetBSD: patch-as,v 1.1 2005/09/07 11:39:55 reed Exp $
+
+--- apr/include/apr_atomic.h.orig	2005-07-15 15:16:55.000000000 +0000
++++ apr/include/apr_atomic.h
+@@ -28,7 +28,7 @@
+ /* Platform includes for atomics */
+ #if defined(NETWARE) || defined(__MVS__) /* OS/390 */
+ #include <stdlib.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <machine/atomic.h>
+ #endif
+ 
+@@ -159,7 +159,7 @@ inline void *apr_atomic_casptr(void **me
+     return (void*)atomic_cmpxchg((unsigned long *)mem,(unsigned long)cmp,(unsigned long)with);
+ }
+ 
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ 
+ #define apr_atomic_t apr_uint32_t
+ #define apr_atomic_add(mem, val)     (atomic_add_int(mem,val),mem)
diff --git a/devel/apr/patches/patch-at b/devel/apr/patches/patch-at
new file mode 100644
index 00000000000..19329eb730a
--- /dev/null
+++ b/devel/apr/patches/patch-at
@@ -0,0 +1,17 @@
+$NetBSD: patch-at,v 1.1 2005/09/07 11:39:55 reed Exp $
+
+--- apr/build/apr_hints.m4.orig	2005-07-15 15:19:19.000000000 +0000
++++ apr/build/apr_hints.m4
+@@ -140,6 +140,12 @@ dnl	       # Not a problem in 10.20.  Ot
+         # fcntl() lies about O_NONBLOCK on an accept()ed socket (PR kern/26950)
+         APR_SETIFNULL(ac_cv_o_nonblock_inherited, [yes])
+ 	;;
++    *-dragonfly*)
++	APR_ADDTO(CFLAGS, [-funsigned-char])
++	APR_SETIFNULL(enable_threads, [no])
++        APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
++	APR_ADDTO(CPPFLAGS, [-D_REENTRANT])
++	;;
+     *-freebsd*)
+ 	case $host in
+ 	    *freebsd[2345]*)