- Upgrade to 1.0.0.

- Add APR_UTIL_WITH_LDAP knob.

Approved by:	maintainer (Craig Rodrigues), lev (active in this area)

3 files changed, 0 insertions, 93 deletions

diff --git a/devel/apr0/files/patch-apr_atomic.h b/devel/apr0/files/patch-apr_atomic.h
deleted file mode 100644
index c4e031f3ffd5..000000000000
--- a/devel/apr0/files/patch-apr_atomic.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- apr-0.9.4/include/apr_atomic.h.orig	Sun Nov  2 01:57:08 2003
-+++ apr-0.9.4/include/apr_atomic.h	Sun Nov  2 02:20:37 2003
-@@ -206,10 +206,16 @@
- 
- #define apr_atomic_t apr_uint32_t
- #define apr_atomic_add(mem, val)     atomic_add_int(mem,val)
--#define apr_atomic_dec(mem)          atomic_subtract_int(mem,1)
- #define apr_atomic_inc(mem)          atomic_add_int(mem,1)
- #define apr_atomic_set(mem, val)     atomic_set_int(mem, val)
- #define apr_atomic_read(mem)         (*mem)
-+
-+#define apr_atomic_dec(mem)                                     \
-+({                                                              \
-+   atomic_subtract_int(mem,1);                                  \
-+   *(int *)mem;                                                 \
-+  })
-+
- 
- #elif (defined(__linux__) || defined(__EMX__)) && defined(__i386__) && !APR_FORCE_ATOMIC_GENERIC
- 
diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4
deleted file mode 100644
index dacf60b85454..000000000000
--- a/devel/apr0/files/patch-apr_hints.m4
+++ /dev/null
@@ -1,29 +0,0 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Mon Dec 22 18:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 30 22:53:49 2004
-@@ -129,14 +129,19 @@
- 	APR_ADDTO(CPPFLAGS, [-DNETBSD])
- 	;;
-     *-freebsd*)
--	case $host in
--	    *freebsd[2345]*)
--		APR_ADDTO(CFLAGS, [-funsigned-char])
--		;;
--	esac
--	APR_SETIFNULL(enable_threads, [no])
-+	os_version=`sysctl -n kern.osreldate`
-+	APR_ADDTO(CFLAGS, [-funsigned-char])
-         APR_SETIFNULL(apr_lock_method, [USE_FLOCK_SERIALIZE])
--	APR_ADDTO(CPPFLAGS, [-D_REENTRANT -D_THREAD_SAFE])
-+	if test $os_version -lt "500016"; then
-+		ac_cv_pthreads_cflags="-D_THREAD_SAFE -D_REENTRANT"
-+		ac_cv_pthreads_lib="-pthread"
-+	elif test $os_version -lt "502102"; then
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="c_r"
-+	else
-+		ac_cv_pthreads_cflags="none"
-+		ac_cv_pthreads_lib="pthread"
-+	fi
- 	;;
-     *-next-nextstep*)
- 	APR_SETIFNULL(CFLAGS, [-O])
diff --git a/devel/apr0/files/patch-apr_threads.m4 b/devel/apr0/files/patch-apr_threads.m4
deleted file mode 100644
index 23e679ddc031..000000000000
--- a/devel/apr0/files/patch-apr_threads.m4
+++ /dev/null
@@ -1,44 +0,0 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 02:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Wed Jan 28 17:52:33 2004
-@@ -110,6 +110,7 @@
- 
- AC_CACHE_CHECK([for CFLAGS needed for pthreads], [apr_cv_pthreads_cflags],
- [apr_ptc_cflags=$CFLAGS
-+ if test "x$ac_cv_pthreads_cflags" = "x"; then
-  for flag in none -kthread -pthread -pthreads -mthreads -Kthread -threads; do 
-     CFLAGS=$apr_ptc_cflags
-     test "x$flag" != "xnone" && CFLAGS="$CFLAGS $flag"
-@@ -118,6 +119,11 @@
-       break
-     ])
-  done
-+ else
-+  if test "$ac_cv_pthreads_cflags" != "none"; then
-+   apr_cv_pthreads_cflags="$ac_cv_pthreads_cflags"
-+  fi
-+ fi
-  CFLAGS=$apr_ptc_cflags
- ])
- 
-@@ -136,6 +142,7 @@
- 
- AC_CACHE_CHECK([for LIBS needed for pthreads], [apr_cv_pthreads_lib], [
-   apr_ptc_libs=$LIBS
-+  if test "x$ac_cv_pthreads_lib" = "x"; then
-   for lib in -lpthread -lpthreads -lc_r; do
-     LIBS="$apr_ptc_libs $lib"
-     APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,13 @@
-       break
-     ])
-   done
-+  else
-+    case x$ac_cv_pthreads_lib in
-+      x-*) apr_cv_pthreads_lib="$ac_cv_pthreads_lib" ;;
-+      xnone|x) : ;;
-+      *) apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
-+    esac
-+  fi
-   LIBS=$apr_ptc_libs
- ])
-