Honor `--disable-threads' in configure scripts [1]

  Support latest 5-CURRENT (-lpthread instad of -lc_r) [2]

Submitted by:	lev [1]
		Craig Rodrigues <rodrigc@crodrigues.org> (maintainer) [2]
Reviewed by:	Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)
Approved by:	Craig Rodrigues <rodrigc@crodrigues.org> (maintainer)

12 files changed, 68 insertions, 44 deletions

diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index e79d464d98db..dca3a11e02be 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	0.9.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 #MASTER_SITES=	http://www.apache.org/dist/apr/
 #DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
diff --git a/devel/apr/files/patch-apr_hints.m4 b/devel/apr/files/patch-apr_hints.m4
index 0421617617bb..dacf60b85454 100644
--- a/devel/apr/files/patch-apr_hints.m4
+++ b/devel/apr/files/patch-apr_hints.m4
@@ -1,6 +1,6 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Tue Dec 23 08:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 23 12:23:36 2004
-@@ -129,14 +129,17 @@
+--- 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*)
@@ -16,11 +16,13 @@
 -	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="none"
-+		LIBS="$LIBS -pthread"
-+	else
++		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*)
diff --git a/devel/apr/files/patch-apr_threads.m4 b/devel/apr/files/patch-apr_threads.m4
index bda6cbb72f4e..23e679ddc031 100644
--- a/devel/apr/files/patch-apr_threads.m4
+++ b/devel/apr/files/patch-apr_threads.m4
@@ -1,5 +1,5 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 08:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Fri Jan 23 12:25:00 2004
+--- 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],
@@ -28,12 +28,16 @@
    for lib in -lpthread -lpthreads -lc_r; do
      LIBS="$apr_ptc_libs $lib"
      APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,9 @@
+@@ -143,6 +150,13 @@
        break
      ])
    done
 +  else
-+    test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
++    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
  ])
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index e79d464d98db..dca3a11e02be 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	0.9.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 #MASTER_SITES=	http://www.apache.org/dist/apr/
 #DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
diff --git a/devel/apr0/files/patch-apr_hints.m4 b/devel/apr0/files/patch-apr_hints.m4
index 0421617617bb..dacf60b85454 100644
--- a/devel/apr0/files/patch-apr_hints.m4
+++ b/devel/apr0/files/patch-apr_hints.m4
@@ -1,6 +1,6 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Tue Dec 23 08:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 23 12:23:36 2004
-@@ -129,14 +129,17 @@
+--- 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*)
@@ -16,11 +16,13 @@
 -	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="none"
-+		LIBS="$LIBS -pthread"
-+	else
++		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*)
diff --git a/devel/apr0/files/patch-apr_threads.m4 b/devel/apr0/files/patch-apr_threads.m4
index bda6cbb72f4e..23e679ddc031 100644
--- a/devel/apr0/files/patch-apr_threads.m4
+++ b/devel/apr0/files/patch-apr_threads.m4
@@ -1,5 +1,5 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 08:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Fri Jan 23 12:25:00 2004
+--- 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],
@@ -28,12 +28,16 @@
    for lib in -lpthread -lpthreads -lc_r; do
      LIBS="$apr_ptc_libs $lib"
      APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,9 @@
+@@ -143,6 +150,13 @@
        break
      ])
    done
 +  else
-+    test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
++    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
  ])
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index e79d464d98db..dca3a11e02be 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	0.9.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 #MASTER_SITES=	http://www.apache.org/dist/apr/
 #DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
diff --git a/devel/apr1/files/patch-apr_hints.m4 b/devel/apr1/files/patch-apr_hints.m4
index 0421617617bb..dacf60b85454 100644
--- a/devel/apr1/files/patch-apr_hints.m4
+++ b/devel/apr1/files/patch-apr_hints.m4
@@ -1,6 +1,6 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Tue Dec 23 08:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 23 12:23:36 2004
-@@ -129,14 +129,17 @@
+--- 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*)
@@ -16,11 +16,13 @@
 -	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="none"
-+		LIBS="$LIBS -pthread"
-+	else
++		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*)
diff --git a/devel/apr1/files/patch-apr_threads.m4 b/devel/apr1/files/patch-apr_threads.m4
index bda6cbb72f4e..23e679ddc031 100644
--- a/devel/apr1/files/patch-apr_threads.m4
+++ b/devel/apr1/files/patch-apr_threads.m4
@@ -1,5 +1,5 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 08:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Fri Jan 23 12:25:00 2004
+--- 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],
@@ -28,12 +28,16 @@
    for lib in -lpthread -lpthreads -lc_r; do
      LIBS="$apr_ptc_libs $lib"
      APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,9 @@
+@@ -143,6 +150,13 @@
        break
      ])
    done
 +  else
-+    test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
++    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
  ])
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index e79d464d98db..dca3a11e02be 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -14,7 +14,7 @@
 
 PORTNAME=	apr
 PORTVERSION=	0.9.4
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	devel
 #MASTER_SITES=	http://www.apache.org/dist/apr/
 #DISTFILES=	apr-${PORTVERSION}.tar.gz apr-util-${PORTVERSION}.tar.gz
diff --git a/devel/apr2/files/patch-apr_hints.m4 b/devel/apr2/files/patch-apr_hints.m4
index 0421617617bb..dacf60b85454 100644
--- a/devel/apr2/files/patch-apr_hints.m4
+++ b/devel/apr2/files/patch-apr_hints.m4
@@ -1,6 +1,6 @@
---- apr-0.9.4/build/apr_hints.m4.orig	Tue Dec 23 08:26:10 2003
-+++ apr-0.9.4/build/apr_hints.m4	Fri Jan 23 12:23:36 2004
-@@ -129,14 +129,17 @@
+--- 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*)
@@ -16,11 +16,13 @@
 -	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="none"
-+		LIBS="$LIBS -pthread"
-+	else
++		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*)
diff --git a/devel/apr2/files/patch-apr_threads.m4 b/devel/apr2/files/patch-apr_threads.m4
index bda6cbb72f4e..23e679ddc031 100644
--- a/devel/apr2/files/patch-apr_threads.m4
+++ b/devel/apr2/files/patch-apr_threads.m4
@@ -1,5 +1,5 @@
---- apr-0.9.4/build/apr_threads.m4.orig	Sun Nov 16 08:42:33 2003
-+++ apr-0.9.4/build/apr_threads.m4	Fri Jan 23 12:25:00 2004
+--- 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],
@@ -28,12 +28,16 @@
    for lib in -lpthread -lpthreads -lc_r; do
      LIBS="$apr_ptc_libs $lib"
      APR_PTHREADS_TRY_RUN([
-@@ -143,6 +150,9 @@
+@@ -143,6 +150,13 @@
        break
      ])
    done
 +  else
-+    test "x$ac_cv_pthreads_lib" != "xnone" && apr_cv_pthreads_lib="-l$ac_cv_pthreads_lib"
++    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
  ])