Fix building with new apr on 4-STABLE systems

8 files changed, 104 insertions, 0 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 38d186d09a34..291ce951c636 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	0.32.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://svn.collab.net/tarballs/
 
diff --git a/devel/subversion-devel/files/patch-ac-helpers::ltmain.sh b/devel/subversion-devel/files/patch-ac-helpers::ltmain.sh
new file mode 100644
index 000000000000..195f87417c03
--- /dev/null
+++ b/devel/subversion-devel/files/patch-ac-helpers::ltmain.sh
@@ -0,0 +1,25 @@
+--- ac-helpers/ltmain.sh.orig	Thu Oct 23 17:15:47 2003
++++ ac-helpers/ltmain.sh	Tue Nov 11 15:04:17 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1212,7 +1212,12 @@
+ 	;;
+ 
+       -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
+-        compiler_flags="$compiler_flags $arg"
++        pthread=yes
++	arg=$arg
++	linker_flags="$linker_flags $arg"
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
+ 	continue
+ 	;;
+ 
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 38d186d09a34..291ce951c636 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	0.32.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://svn.collab.net/tarballs/
 
diff --git a/devel/subversion-freebsd/files/patch-ac-helpers::ltmain.sh b/devel/subversion-freebsd/files/patch-ac-helpers::ltmain.sh
new file mode 100644
index 000000000000..195f87417c03
--- /dev/null
+++ b/devel/subversion-freebsd/files/patch-ac-helpers::ltmain.sh
@@ -0,0 +1,25 @@
+--- ac-helpers/ltmain.sh.orig	Thu Oct 23 17:15:47 2003
++++ ac-helpers/ltmain.sh	Tue Nov 11 15:04:17 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1212,7 +1212,12 @@
+ 	;;
+ 
+       -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
+-        compiler_flags="$compiler_flags $arg"
++        pthread=yes
++	arg=$arg
++	linker_flags="$linker_flags $arg"
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
+ 	continue
+ 	;;
+ 
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 38d186d09a34..291ce951c636 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	0.32.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://svn.collab.net/tarballs/
 
diff --git a/devel/subversion/files/patch-ac-helpers::ltmain.sh b/devel/subversion/files/patch-ac-helpers::ltmain.sh
new file mode 100644
index 000000000000..195f87417c03
--- /dev/null
+++ b/devel/subversion/files/patch-ac-helpers::ltmain.sh
@@ -0,0 +1,25 @@
+--- ac-helpers/ltmain.sh.orig	Thu Oct 23 17:15:47 2003
++++ ac-helpers/ltmain.sh	Tue Nov 11 15:04:17 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1212,7 +1212,12 @@
+ 	;;
+ 
+       -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
+-        compiler_flags="$compiler_flags $arg"
++        pthread=yes
++	arg=$arg
++	linker_flags="$linker_flags $arg"
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
+ 	continue
+ 	;;
+ 
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 38d186d09a34..291ce951c636 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	0.32.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://svn.collab.net/tarballs/
 
diff --git a/devel/subversion16/files/patch-ac-helpers::ltmain.sh b/devel/subversion16/files/patch-ac-helpers::ltmain.sh
new file mode 100644
index 000000000000..195f87417c03
--- /dev/null
+++ b/devel/subversion16/files/patch-ac-helpers::ltmain.sh
@@ -0,0 +1,25 @@
+--- ac-helpers/ltmain.sh.orig	Thu Oct 23 17:15:47 2003
++++ ac-helpers/ltmain.sh	Tue Nov 11 15:04:17 2003
+@@ -1072,7 +1072,7 @@
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd* | *-*-freebsd4*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -1212,7 +1212,12 @@
+ 	;;
+ 
+       -Kthread | -mthreads | -mt | -pthread | -pthreads | -threads | -qthreaded | -kthread )
+-        compiler_flags="$compiler_flags $arg"
++        pthread=yes
++	arg=$arg
++	linker_flags="$linker_flags $arg"
++	compiler_flags="$compiler_flags $arg"
++	compile_command="$compile_command $arg"
++	finalize_command="$finalize_command $arg"
+ 	continue
+ 	;;
+