20 files changed, 168 insertions, 284 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index de3287d2ff21..68d2710bf71f 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -116,18 +116,22 @@ PLIST_SUB+=		WITH_RUBY=""
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
-#.if defined(WITH_JAVA)
-#USE_JAVA=	yes
-#JAVA_VERSION=	1.2+
-#JAVA_OS=	native
-#JAVA_BUILD=	yes
-#JAVA_RUN=	yes
-#.include "${PORTSDIR}/Mk/bsd.java.mk"
-#CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
-#PLIST_SUB+=		WITH_JAVA=""
-#.else
-#PLIST_SUB+=		WITH_JAVA="@comment "
-#.endif
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_OS=	native
+JAVA_BUILD=	yes
+JAVA_RUN=	yes
+.include "${PORTSDIR}/Mk/bsd.java.mk"
+CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
+PLIST_SUB+=		WITH_JAVA=""
+.else
+PLIST_SUB+=		WITH_JAVA="@comment "
+.endif
+
+.if defined(WITH_JAVA) && ${OSVERSION} < 503000 
+BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
+.endif
 
 .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
@@ -233,13 +237,13 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
-#.if defined(WITH_JAVA)
-#	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
-#.else
-#	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
-#	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
-#.endif
-#	@${ECHO_MSG} ""
+.if defined(WITH_JAVA)
+	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
+.else
+	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
+	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
+.endif
+	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
@@ -339,11 +343,11 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} javahl
-#.endif
+.if defined(WITH_JAVA)
+	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
+	cd ${WRKSRC} ; \
+	  ${MAKE} javahl
+.endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
@@ -378,10 +382,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} install-javahl
-#.endif
+.if defined(WITH_JAVA)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-javahl
+.endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index fc9449dd3435..dbecde5fa16e 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
-SIZE (subversion-1.2.1.tar.bz2) = 7226600
+MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1
+SIZE (subversion-1.2.3.tar.bz2) = 7238176
diff --git a/devel/subversion-devel/files/patch-subversion::bindings::swig::core.i b/devel/subversion-devel/files/patch-subversion::bindings::swig::core.i
deleted file mode 100644
index 15b2da42b450..000000000000
--- a/devel/subversion-devel/files/patch-subversion::bindings::swig::core.i
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
-+++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
-@@ -425,13 +425,13 @@
- 
- static apr_pool_t *current_pool = 0;
- 
--SWIGEXPORT(apr_pool_t *)
-+SWIGEXPORT apr_pool_t *
- svn_swig_pl_get_current_pool (void)
- {
-   return current_pool;
- }
- 
--SWIGEXPORT(void)
-+SWIGEXPORT void
- svn_swig_pl_set_current_pool (apr_pool_t *pool)
- {
-   current_pool = pool;
diff --git a/devel/subversion-devel/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion-devel/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
deleted file mode 100644
index 2b9c9787fef2..000000000000
--- a/devel/subversion-devel/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
-+++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
-@@ -1,10 +1,16 @@
--#include "swigutil_rb.h"
- #include <st.h>
- 
--#include <swigrun.swg>
-+#if SVN_SWIG_VERSION >= 103024
-+#if SVN_SWIG_VERSION >= 103025
-+#include <swiglabels.swg>
-+#endif
- #include <ruby/rubyhead.swg>
--#include <common.swg>
-+#include <swigrun.swg>
- #include <ruby/rubydef.swg>
-+#include <runtime.swg>
-+#endif
-+
-+#include "swigutil_rb.h"
- 
- static VALUE mSvn = Qnil;
- static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index 68f811d5a394..ac3222406f6b 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -177,6 +177,12 @@ lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.a
+%%WITH_JAVA%%lib/libsvnjavahl-1.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.so.0
+%%WITH_JAVA%%lib/svn-javahl/svn-javahl.jar
+%%WITH_JAVA%%@dirrm lib/svn-javahl/include
+%%WITH_JAVA%%@dirrm lib/svn-javahl
 %%WITH_PERL%%lib/libsvn_swig_perl-1.a
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
@@ -294,3 +300,4 @@ lib/libsvn_wc-1.so.0
 @dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt
 @dirrm share/subversion
+
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index de3287d2ff21..68d2710bf71f 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -116,18 +116,22 @@ PLIST_SUB+=		WITH_RUBY=""
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
-#.if defined(WITH_JAVA)
-#USE_JAVA=	yes
-#JAVA_VERSION=	1.2+
-#JAVA_OS=	native
-#JAVA_BUILD=	yes
-#JAVA_RUN=	yes
-#.include "${PORTSDIR}/Mk/bsd.java.mk"
-#CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
-#PLIST_SUB+=		WITH_JAVA=""
-#.else
-#PLIST_SUB+=		WITH_JAVA="@comment "
-#.endif
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_OS=	native
+JAVA_BUILD=	yes
+JAVA_RUN=	yes
+.include "${PORTSDIR}/Mk/bsd.java.mk"
+CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
+PLIST_SUB+=		WITH_JAVA=""
+.else
+PLIST_SUB+=		WITH_JAVA="@comment "
+.endif
+
+.if defined(WITH_JAVA) && ${OSVERSION} < 503000 
+BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
+.endif
 
 .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
@@ -233,13 +237,13 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
-#.if defined(WITH_JAVA)
-#	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
-#.else
-#	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
-#	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
-#.endif
-#	@${ECHO_MSG} ""
+.if defined(WITH_JAVA)
+	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
+.else
+	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
+	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
+.endif
+	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
@@ -339,11 +343,11 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} javahl
-#.endif
+.if defined(WITH_JAVA)
+	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
+	cd ${WRKSRC} ; \
+	  ${MAKE} javahl
+.endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
@@ -378,10 +382,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} install-javahl
-#.endif
+.if defined(WITH_JAVA)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-javahl
+.endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index fc9449dd3435..dbecde5fa16e 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
-SIZE (subversion-1.2.1.tar.bz2) = 7226600
+MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1
+SIZE (subversion-1.2.3.tar.bz2) = 7238176
diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::core.i b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::core.i
deleted file mode 100644
index 15b2da42b450..000000000000
--- a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::core.i
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
-+++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
-@@ -425,13 +425,13 @@
- 
- static apr_pool_t *current_pool = 0;
- 
--SWIGEXPORT(apr_pool_t *)
-+SWIGEXPORT apr_pool_t *
- svn_swig_pl_get_current_pool (void)
- {
-   return current_pool;
- }
- 
--SWIGEXPORT(void)
-+SWIGEXPORT void
- svn_swig_pl_set_current_pool (apr_pool_t *pool)
- {
-   current_pool = pool;
diff --git a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion-freebsd/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
deleted file mode 100644
index 2b9c9787fef2..000000000000
--- a/devel/subversion-freebsd/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
-+++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
-@@ -1,10 +1,16 @@
--#include "swigutil_rb.h"
- #include <st.h>
- 
--#include <swigrun.swg>
-+#if SVN_SWIG_VERSION >= 103024
-+#if SVN_SWIG_VERSION >= 103025
-+#include <swiglabels.swg>
-+#endif
- #include <ruby/rubyhead.swg>
--#include <common.swg>
-+#include <swigrun.swg>
- #include <ruby/rubydef.swg>
-+#include <runtime.swg>
-+#endif
-+
-+#include "swigutil_rb.h"
- 
- static VALUE mSvn = Qnil;
- static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index 68f811d5a394..ac3222406f6b 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -177,6 +177,12 @@ lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.a
+%%WITH_JAVA%%lib/libsvnjavahl-1.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.so.0
+%%WITH_JAVA%%lib/svn-javahl/svn-javahl.jar
+%%WITH_JAVA%%@dirrm lib/svn-javahl/include
+%%WITH_JAVA%%@dirrm lib/svn-javahl
 %%WITH_PERL%%lib/libsvn_swig_perl-1.a
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
@@ -294,3 +300,4 @@ lib/libsvn_wc-1.so.0
 @dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt
 @dirrm share/subversion
+
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index de3287d2ff21..68d2710bf71f 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -116,18 +116,22 @@ PLIST_SUB+=		WITH_RUBY=""
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
-#.if defined(WITH_JAVA)
-#USE_JAVA=	yes
-#JAVA_VERSION=	1.2+
-#JAVA_OS=	native
-#JAVA_BUILD=	yes
-#JAVA_RUN=	yes
-#.include "${PORTSDIR}/Mk/bsd.java.mk"
-#CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
-#PLIST_SUB+=		WITH_JAVA=""
-#.else
-#PLIST_SUB+=		WITH_JAVA="@comment "
-#.endif
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_OS=	native
+JAVA_BUILD=	yes
+JAVA_RUN=	yes
+.include "${PORTSDIR}/Mk/bsd.java.mk"
+CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
+PLIST_SUB+=		WITH_JAVA=""
+.else
+PLIST_SUB+=		WITH_JAVA="@comment "
+.endif
+
+.if defined(WITH_JAVA) && ${OSVERSION} < 503000 
+BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
+.endif
 
 .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
@@ -233,13 +237,13 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
-#.if defined(WITH_JAVA)
-#	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
-#.else
-#	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
-#	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
-#.endif
-#	@${ECHO_MSG} ""
+.if defined(WITH_JAVA)
+	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
+.else
+	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
+	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
+.endif
+	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
@@ -339,11 +343,11 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} javahl
-#.endif
+.if defined(WITH_JAVA)
+	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
+	cd ${WRKSRC} ; \
+	  ${MAKE} javahl
+.endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
@@ -378,10 +382,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} install-javahl
-#.endif
+.if defined(WITH_JAVA)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-javahl
+.endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index fc9449dd3435..dbecde5fa16e 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
-SIZE (subversion-1.2.1.tar.bz2) = 7226600
+MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1
+SIZE (subversion-1.2.3.tar.bz2) = 7238176
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::core.i b/devel/subversion/files/patch-subversion::bindings::swig::core.i
deleted file mode 100644
index 15b2da42b450..000000000000
--- a/devel/subversion/files/patch-subversion::bindings::swig::core.i
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
-+++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
-@@ -425,13 +425,13 @@
- 
- static apr_pool_t *current_pool = 0;
- 
--SWIGEXPORT(apr_pool_t *)
-+SWIGEXPORT apr_pool_t *
- svn_swig_pl_get_current_pool (void)
- {
-   return current_pool;
- }
- 
--SWIGEXPORT(void)
-+SWIGEXPORT void
- svn_swig_pl_set_current_pool (apr_pool_t *pool)
- {
-   current_pool = pool;
diff --git a/devel/subversion/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
deleted file mode 100644
index 2b9c9787fef2..000000000000
--- a/devel/subversion/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
-+++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
-@@ -1,10 +1,16 @@
--#include "swigutil_rb.h"
- #include <st.h>
- 
--#include <swigrun.swg>
-+#if SVN_SWIG_VERSION >= 103024
-+#if SVN_SWIG_VERSION >= 103025
-+#include <swiglabels.swg>
-+#endif
- #include <ruby/rubyhead.swg>
--#include <common.swg>
-+#include <swigrun.swg>
- #include <ruby/rubydef.swg>
-+#include <runtime.swg>
-+#endif
-+
-+#include "swigutil_rb.h"
- 
- static VALUE mSvn = Qnil;
- static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index 68f811d5a394..ac3222406f6b 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -177,6 +177,12 @@ lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.a
+%%WITH_JAVA%%lib/libsvnjavahl-1.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.so.0
+%%WITH_JAVA%%lib/svn-javahl/svn-javahl.jar
+%%WITH_JAVA%%@dirrm lib/svn-javahl/include
+%%WITH_JAVA%%@dirrm lib/svn-javahl
 %%WITH_PERL%%lib/libsvn_swig_perl-1.a
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
@@ -294,3 +300,4 @@ lib/libsvn_wc-1.so.0
 @dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt
 @dirrm share/subversion
+
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index de3287d2ff21..68d2710bf71f 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -116,18 +116,22 @@ PLIST_SUB+=		WITH_RUBY=""
 PLIST_SUB+=		WITH_RUBY="@comment "
 .endif
 
-#.if defined(WITH_JAVA)
-#USE_JAVA=	yes
-#JAVA_VERSION=	1.2+
-#JAVA_OS=	native
-#JAVA_BUILD=	yes
-#JAVA_RUN=	yes
-#.include "${PORTSDIR}/Mk/bsd.java.mk"
-#CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
-#PLIST_SUB+=		WITH_JAVA=""
-#.else
-#PLIST_SUB+=		WITH_JAVA="@comment "
-#.endif
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_OS=	native
+JAVA_BUILD=	yes
+JAVA_RUN=	yes
+.include "${PORTSDIR}/Mk/bsd.java.mk"
+CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME} 
+PLIST_SUB+=		WITH_JAVA=""
+.else
+PLIST_SUB+=		WITH_JAVA="@comment "
+.endif
+
+.if defined(WITH_JAVA) && ${OSVERSION} < 503000 
+BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
+.endif
 
 .if defined(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
@@ -233,13 +237,13 @@ pre-extract:
 	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
 .endif
 	@${ECHO_MSG} ""
-#.if defined(WITH_JAVA)
-#	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
-#.else
-#	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
-#	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
-#.endif
-#	@${ECHO_MSG} ""
+.if defined(WITH_JAVA)
+	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
+.else
+	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
+	@${ECHO_MSG} "You should have apr builded with threads for Java support!"
+.endif
+	@${ECHO_MSG} ""
 .if defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
@@ -339,11 +343,11 @@ post-build:
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} javahl
-#.endif
+.if defined(WITH_JAVA)
+	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
+	cd ${WRKSRC} ; \
+	  ${MAKE} javahl
+.endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
@@ -378,10 +382,10 @@ post-install:	${MKREPOS_TARGET}
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .endif
-#.if defined(WITH_JAVA)
-#	cd ${WRKSRC} ; \
-#	  ${MAKE} install-javahl
-#.endif
+.if defined(WITH_JAVA)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-javahl
+.endif
 .if defined(WITH_SVNSERVE_WRAPPER)
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index fc9449dd3435..dbecde5fa16e 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.2.1.tar.bz2) = 0b546195ca794c327c6830f2e88661f7
-SIZE (subversion-1.2.1.tar.bz2) = 7226600
+MD5 (subversion-1.2.3.tar.bz2) = a14bc6590241b6e5c2ff2b354cc184a1
+SIZE (subversion-1.2.3.tar.bz2) = 7238176
diff --git a/devel/subversion16/files/patch-subversion::bindings::swig::core.i b/devel/subversion16/files/patch-subversion::bindings::swig::core.i
deleted file mode 100644
index 15b2da42b450..000000000000
--- a/devel/subversion16/files/patch-subversion::bindings::swig::core.i
+++ /dev/null
@@ -1,18 +0,0 @@
---- subversion/bindings/swig/core.i.orig	Wed Jul 13 14:25:06 2005
-+++ subversion/bindings/swig/core.i	Wed Jul 13 14:25:24 2005
-@@ -425,13 +425,13 @@
- 
- static apr_pool_t *current_pool = 0;
- 
--SWIGEXPORT(apr_pool_t *)
-+SWIGEXPORT apr_pool_t *
- svn_swig_pl_get_current_pool (void)
- {
-   return current_pool;
- }
- 
--SWIGEXPORT(void)
-+SWIGEXPORT void
- svn_swig_pl_set_current_pool (apr_pool_t *pool)
- {
-   current_pool = pool;
diff --git a/devel/subversion16/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c b/devel/subversion16/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
deleted file mode 100644
index 2b9c9787fef2..000000000000
--- a/devel/subversion16/files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c.orig	Tue Mar 22 23:42:12 2005
-+++ subversion/bindings/swig/ruby/libsvn_swig_ruby/swigutil_rb.c	Mon Jul  4 02:40:49 2005
-@@ -1,10 +1,16 @@
--#include "swigutil_rb.h"
- #include <st.h>
- 
--#include <swigrun.swg>
-+#if SVN_SWIG_VERSION >= 103024
-+#if SVN_SWIG_VERSION >= 103025
-+#include <swiglabels.swg>
-+#endif
- #include <ruby/rubyhead.swg>
--#include <common.swg>
-+#include <swigrun.swg>
- #include <ruby/rubydef.swg>
-+#include <runtime.swg>
-+#endif
-+
-+#include "swigutil_rb.h"
- 
- static VALUE mSvn = Qnil;
- static VALUE mSvnCore = Qnil;
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 68f811d5a394..ac3222406f6b 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -177,6 +177,12 @@ lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav_svn libexec/apache2/mod_dav_svn.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.a
+%%WITH_JAVA%%lib/libsvnjavahl-1.so
+%%WITH_JAVA%%lib/libsvnjavahl-1.so.0
+%%WITH_JAVA%%lib/svn-javahl/svn-javahl.jar
+%%WITH_JAVA%%@dirrm lib/svn-javahl/include
+%%WITH_JAVA%%@dirrm lib/svn-javahl
 %%WITH_PERL%%lib/libsvn_swig_perl-1.a
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so
 %%WITH_PERL%%lib/libsvn_swig_perl-1.so.0
@@ -294,3 +300,4 @@ lib/libsvn_wc-1.so.0
 @dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt
 @dirrm share/subversion
+