ports/85900: [UPDATE, PATCH] devel/subversion to 1.2.3, enable javahl bindings, allow apache21 usage

Fri Sep 9 09:10:01 UTC 2005

>Number:         85900
>Category:       ports
>Synopsis:       [UPDATE, PATCH] devel/subversion to 1.2.3, enable javahl bindings, allow apache21 usage
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 09 09:10:00 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Andreas Kohn
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:


System: FreeBSD 7.0-CURRENT #20: Mon Aug 22 20:25:19 CEST 2005
    root at klamath.syndrom23.de:/usr/obj/usr/src/sys/KLAMATH



>Description:


The fix does multiple things:
1. update subversion to 1.2.3 (current in ports is 1.2.1)
2. enable javahl bindings. 
3. allow use of APACHE2_PORT=www/apache21 for mod_dav/apr.

The code for javahl was already mostly there. I tested them using subclipse (svn plugin for java), and it works well. Earlier problems reported on freebsd-java@ about subclipse hanging seem to be fixed.

Same for apache21, works well for me.

The fix also fixes some portlint warnings about bsd.port.pre.mk. I moved the include after definition of USE_JAVA, USE_PYTHON etc, and removed the explicit includes of bsd.python.mk etc.

Also, I think ports/81935, I couldn't reproduce the behavior with this version. (May require more testing)





>How-To-Repeat:





>Fix:

--- subversion-1.2.3,apache21,javahl.diff begins here ---
Index: Makefile
===================================================================
RCS file: /storage/freebsd/cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.82
diff -u -u -r1.82 Makefile
--- Makefile	1 Aug 2005 00:19:14 -0000	1.82
+++ Makefile	4 Sep 2005 19:47:53 -0000
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/devel/subversion/Makefile,v 1.82 2005/08/01 00:19:14 bmah Exp $
 
 PORTNAME=	subversion
-PORTVERSION=	1.2.1
+PORTVERSION=	1.2.3
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -40,8 +40,6 @@
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
@@ -76,9 +74,6 @@
 .endif
 
 .if defined(WITH_PERL)
-.if ${PERL_LEVEL} < 500800
-IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
-.endif
 SWIG_BINDINGS+=		perl
 DEPENDS_ARGS+=		WANT_SWIG_PERL=yes
 USE_PERL5=		yes
@@ -98,7 +93,6 @@
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=		yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 SWIG_BINDINGS+=		python
 DEPENDS_ARGS+=		WANT_SWIG_PYTHON=yes
 PLIST_SUB+=		WITH_PYTHON=""
@@ -106,9 +100,21 @@
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
+.if defined(WITH_JAVA)
+USE_JAVA=	yes
+JAVA_VERSION=	1.2+
+JAVA_OS=	native
+JAVA_BUILD=	yes
+JAVA_RUN=	yes
+CATEGORIES+=	java
+CONFIGURE_ARGS+=	--enable-javahl --with-jdk=${JAVA_HOME}
+PLIST_SUB+=		WITH_JAVA=""
+.else
+PLIST_SUB+=		WITH_JAVA="@comment "
+.endif
+
 .if defined(WITH_RUBY)
 USE_RUBY=		yes
-.include "${PORTSDIR}/Mk/bsd.ruby.mk"
 SWIG_BINDINGS+=		ruby
 DEPENDS_ARGS+=		WANT_SWIG_RUBY=yes
 PLIST_SUB+=		WITH_RUBY=""
@@ -116,19 +122,6 @@
 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(SWIG_BINDINGS) && ${SWIG_BINDINGS} != ""
 BUILD_DEPENDS+=		swig1.3:${PORTSDIR}/devel/swig13
 DEPENDS_ARGS+=		SWIG_LANGUAGES=""
@@ -153,10 +146,16 @@
 APACHE2_PORT?=	www/apache2
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
+.if ${APACHE2_PORT} == "www/apache21"
+APR_APU_DIR=	${LOCALBASE}/bin
+APR_CONFIG=	apr-1-config
+APU_CONFIG=	apu-1-config
+.else
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
-APR_PORT=	www/apache2
+.endif
+APR_PORT=	${APACHE2_PORT}
 .if !defined(WITHOUT_BDB)
 DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
@@ -188,6 +187,12 @@
 PORTDOCS+=	book
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_PERL) && ${PERL_LEVEL} < 500800
+IGNORE=	The perl bindings for subversion need perl 5.8.0 or greater. Upgrade your perl and try again
+.endif
+
 SCRIPTS=
 
 SCRIPTS_DATA=
@@ -227,19 +232,19 @@
 	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
 .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 built with threads for Java support!"
+.endif
+	@${ECHO_MSG} ""
 .if defined(WITH_RUBY)
 	@${ECHO_MSG} "Build with Ruby bindings."
 .else
 	@${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_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 .else
@@ -308,7 +313,7 @@
 pre-configure:
 	@if [ ! -x ${APR_APU_DIR}/${APR_CONFIG} -o ! -x ${APR_APU_DIR}/${APU_CONFIG} ] ; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} 'You selected to use`'"${APR_PORT}' for apr library." ; \
+		${ECHO_MSG} 'You selected to use `'"${APR_PORT}' for apr library." ; \
 		${ECHO_MSG} 'It seems that `'"${APR_PORT}' is not properly installed." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
@@ -335,15 +340,15 @@
 	cd ${WRKSRC} ; \
 	  ${MAKE} swig-py
 .endif
+.if defined(WITH_JAVA)
+	@${MKDIR} ${WRKSRC}/subversion/bindings/java/javahl/classes
+	cd ${WRKSRC} ; \
+	  ${MAKE} javahl
+.endif
 .if defined(WITH_RUBY)
 	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_MOD_DAV_SVN)
 pre-install:
@@ -374,14 +379,14 @@
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-py
 .endif
+.if defined(WITH_JAVA)
+	cd ${WRKSRC} ; \
+	  ${MAKE} install-javahl
+.endif
 .if defined(WITH_RUBY)
 	cd ${WRKSRC} ; \
 	  ${MAKE} install-swig-rb
 .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
Index: distinfo
===================================================================
RCS file: /storage/freebsd/cvs/ports/devel/subversion/distinfo,v
retrieving revision 1.37
diff -u -u -r1.37 distinfo
--- distinfo	29 Jul 2005 11:15:27 -0000	1.37
+++ distinfo	4 Sep 2005 10:55:55 -0000
@@ -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
Index: pkg-plist
===================================================================
RCS file: /storage/freebsd/cvs/ports/devel/subversion/pkg-plist,v
retrieving revision 1.29
diff -u -u -r1.29 pkg-plist
--- pkg-plist	29 Jul 2005 11:15:27 -0000	1.29
+++ pkg-plist	9 Sep 2005 08:10:36 -0000
@@ -142,6 +142,7 @@
 %%DATADIR%%/examples/svnserve-sgid.c
 %%DATADIR%%/examples/svnshell.py
 %%DATADIR%%/examples/svnshell.rb
+%%DATADIR%%/hook-scripts/README
 %%DATADIR%%/hook-scripts/commit-access-control.cfg.example
 %%DATADIR%%/hook-scripts/commit-access-control.pl
 %%DATADIR%%/hook-scripts/commit-email.pl
@@ -153,7 +154,6 @@
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py
 %%DATADIR%%/hook-scripts/propchange-email.pl
-%%DATADIR%%/hook-scripts/README
 %%DATADIR%%/hook-scripts/svnperms.conf.example
 %%DATADIR%%/hook-scripts/svnperms.py
 %%DATADIR%%/hook-scripts/verify-po.py
@@ -177,6 +177,12 @@
 %%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
Index: files/patch-subversion::bindings::swig::core.i
===================================================================
RCS file: files/patch-subversion::bindings::swig::core.i
diff -N files/patch-subversion::bindings::swig::core.i
--- files/patch-subversion::bindings::swig::core.i	29 Jul 2005 11:15:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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;
Index: files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
===================================================================
RCS file: files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
diff -N files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c
--- files/patch-subversion::bindings::swig::ruby::libsvn_swig_ruby::swigutil_rb.c	29 Jul 2005 11:15:27 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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;
--- subversion-1.2.3,apache21,javahl.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted:

