(1) Update to 1.6.5

  (2) Unbroke Ruby bindings

PR:		[1] ports/138077, [2] ports/136621

7 files changed, 37 insertions, 9 deletions

diff --git a/devel/ruby-subversion/Makefile b/devel/ruby-subversion/Makefile
index f0eed40767fc..c078185f193d 100644
--- a/devel/ruby-subversion/Makefile
+++ b/devel/ruby-subversion/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Ruby bindings for version control system
 MASTERDIR=	${.CURDIR}/../../devel/subversion
 PKGDIR=		${.CURDIR}
 
-BROKEN=		does not compile
+CONFIGURE_ENV+=	PTHREAD_LIBS=${PTHREAD_LIBS}
 
 USE_RUBY=		yes
 
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index d7362a139a2b..53b4978fa6fe 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.4
+PORTVERSION=	1.6.5
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 57fa2e0bc4d3..c15ea9a3cb30 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.4.tar.bz2) = 11e3fa838c9a558cadc378f2807572e2
-SHA256 (subversion/subversion-1.6.4.tar.bz2) = 7c9bf6e6737c84fe3707206c0ca7e1e163cf6a74172289f850936fbbc0af0e52
-SIZE (subversion/subversion-1.6.4.tar.bz2) = 5484272
+MD5 (subversion/subversion-1.6.5.tar.bz2) = 1a53a0e72bee0bf814f4da83a9b6a636
+SHA256 (subversion/subversion-1.6.5.tar.bz2) = 64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad
+SIZE (subversion/subversion-1.6.5.tar.bz2) = 5491251
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484
diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure
new file mode 100644
index 000000000000..ca1fd0253976
--- /dev/null
+++ b/devel/subversion/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2009-07-09 17:23:21.000000000 +0400
++++ configure	2009-07-09 17:25:20.000000000 +0400
+@@ -27683,7 +27683,10 @@
+ 
+ 
+ if test "$RUBY" != "none"; then
+-  if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then
++  if [ -z "$PTHREAD_LIBS" ]; then
++    PTHREAD_LIBS=-pthread
++  fi
++  if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then
+     # Extract the first word of "rdoc", so it can be a program name with args.
+ set dummy rdoc; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index d7362a139a2b..53b4978fa6fe 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.4
+PORTVERSION=	1.6.5
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 57fa2e0bc4d3..c15ea9a3cb30 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.4.tar.bz2) = 11e3fa838c9a558cadc378f2807572e2
-SHA256 (subversion/subversion-1.6.4.tar.bz2) = 7c9bf6e6737c84fe3707206c0ca7e1e163cf6a74172289f850936fbbc0af0e52
-SIZE (subversion/subversion-1.6.4.tar.bz2) = 5484272
+MD5 (subversion/subversion-1.6.5.tar.bz2) = 1a53a0e72bee0bf814f4da83a9b6a636
+SHA256 (subversion/subversion-1.6.5.tar.bz2) = 64331bda459e984b8d369b449eec89daa2f3cd288186f1d2a9ad8011badd4dad
+SIZE (subversion/subversion-1.6.5.tar.bz2) = 5491251
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484
diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure
new file mode 100644
index 000000000000..ca1fd0253976
--- /dev/null
+++ b/devel/subversion16/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2009-07-09 17:23:21.000000000 +0400
++++ configure	2009-07-09 17:25:20.000000000 +0400
+@@ -27683,7 +27683,10 @@
+ 
+ 
+ if test "$RUBY" != "none"; then
+-  if "$RUBY" -r mkmf -e 'exit(have_func("rb_hash_foreach") ? 0 : 1)'; then
++  if [ -z "$PTHREAD_LIBS" ]; then
++    PTHREAD_LIBS=-pthread
++  fi
++  if "$RUBY" -r mkmf -e 'with_ldflags("'"$PTHREAD_LIBS"'") { exit(have_func("rb_hash_foreach") ? 0 : 1) }'; then
+     # Extract the first word of "rdoc", so it can be a program name with args.
+ set dummy rdoc; ac_word=$2
+ { $as_echo "$as_me:$LINENO: checking for $ac_word" >&5