Date: Thu, 23 Jun 2011 19:13:01 GMT From: Martin Birgmeier <martin.birgmeier@aon.at> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/158233: [patch] enable building the javahl library for subversion Message-ID: <201106231913.p5NJD1i4020788@red.freebsd.org> Resent-Message-ID: <201106231920.p5NJK96t080110@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 158233
>Category: ports
>Synopsis: [patch] enable building the javahl library for subversion
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu Jun 23 19:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Martin Birgmeier
>Release: 7.4, 8.2
>Organization:
MBi at home
>Environment:
>Description:
This patch enables building the javahl library for subversion. The following files are optionally created:
lib/libsvnjavahl-1.a
lib/libsvnjavahl-1.la
lib/libsvnjavahl-1.so
lib/libsvnjavahl-1.so.0
lib/svn-javahl/svn-javahl.jar
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
--- ./devel/subversion/Makefile.ORIG 2011-04-02 14:08:50.700419226 +0200
+++ ./devel/subversion/Makefile 2011-06-23 15:31:25.166971338 +0200
@@ -30,7 +30,8 @@
STATIC "Build static version (no shared libs)" off \
GNOME_KEYRING "Build with GNOME Keyring auth support" off \
KDE_KWALLET "Build with KDE KWallet auth support" off \
- BOOK "Install the Subversion Book" off
+ BOOK "Install the Subversion Book" off \
+ JAVAHL "Install Java high-level bindings" off
.include "${.CURDIR}/../../devel/subversion/Makefile.common"
--- ./devel/subversion/Makefile.common.ORIG 2011-06-02 18:35:16.624473127 +0200
+++ ./devel/subversion/Makefile.common 2011-06-23 16:21:17.248575689 +0200
@@ -21,11 +21,14 @@
PATCHFILES+= svn_hacks_1.4.diff
.endif
-MAKE_JOBS_SAFE= yes
+MAKE_JOBS_UNSAFE= yes
USE_BZIP2= yes
USE_AUTOTOOLS= libtool
USE_KDE4= # Used below if KWallet support is enabled
+ALL_TARGET= all
+INSTALL_TARGET= install
+
CONFIGURE_ARGS= --with-ssl
.if defined(SVN_BUILD_BINDINGS)
@@ -177,6 +180,17 @@
PLIST_SUB+= KDE_KWALLET="@comment "
.endif
+.if defined(WITH_JAVAHL)
+USE_JAVA= yes
+CONFIGURE_ARGS+=--with-jdk=${JAVA_HOME} --enable-javahl
+ALL_TARGET+= javahl
+INSTALL_TARGET+=install-javahl
+PLIST_SUB+= JAVAHL=""
+.else
+CONFIGURE_ARGS+=--disable-javahl
+PLIST_SUB+= JAVAHL="@comment "
+.endif
+
post-extract:
@${RM} -rf ${WRKSRC}/neon
@${RM} -rf ${WRKSRC}/apr
--- ./devel/subversion/pkg-plist.ORIG 2011-04-02 14:08:50.729422546 +0200
+++ ./devel/subversion/pkg-plist 2011-06-23 15:59:10.962900105 +0200
@@ -121,6 +121,13 @@
lib/libsvn_wc-1.la
%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
+%%JAVAHL%%lib/libsvnjavahl-1.a
+%%JAVAHL%%lib/libsvnjavahl-1.la
+%%JAVAHL%%lib/libsvnjavahl-1.so
+%%JAVAHL%%lib/libsvnjavahl-1.so.0
+%%JAVAHL%%lib/svn-javahl/svn-javahl.jar
+%%JAVAHL%%@dirrm lib/svn-javahl/include
+%%JAVAHL%%@dirrm lib/svn-javahl
%%PORTDOCS%%%%DOCSDIR%%/BUGS
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
%%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106231913.p5NJD1i4020788>