5 files changed, 49 insertions, 28 deletions

diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile
index ad00acb7a565..07d6fac9b7de 100644
--- a/devel/svnkit/Makefile
+++ b/devel/svnkit/Makefile
@@ -5,33 +5,35 @@
 # $FreeBSD$
 #
 
-PORTNAME=	javasvn
-PORTVERSION=	1.0.6
+PORTNAME=	svnkit
+PORTVERSION=	1.1.0
 CATEGORIES=	devel java
-MASTER_SITES=	http://tmate.org/svn/
+MASTER_SITES=	http://svnkit.com/
 DISTNAME=	org.tmatesoft.svn_${PORTVERSION}.standalone
 
 MAINTAINER=	gerrit.beine@gmx.de
 COMMENT=	The only pure Java Subversion client library in the world
 
-RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+#RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 
 NO_BUILD=	yes
 USE_ZIP=	yes
-USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+#USE_JAVA=	yes
+#JAVA_VERSION=	1.3+
+JAVASHAREDIR?=  ${PREFIX}/share/java
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 DATA_FILES=	COPYING GANYMED-LICENSE JAVAHL-LICENSE SEQUENCE-LICENSE \
-		changelog.txt logging.properties.disabled javasvnsrc.zip \
-		javasvn-cli.jar javasvn-javahl.jar javasvn.jar ganymed.jar \
+		changelog.txt logging.properties.disabled svnkitsrc.zip \
+		svnkit-cli.jar svnkit-javahl.jar svnkit.jar ganymed.jar \
 		README.txt
 
-PLIST_FILES=	bin/javasvn ${DATA_FILES:S,^,%%DATADIR%%/,}
+PLIST_FILES=	bin/javasvn bin/svnkit bin/svnsync \
+		${DATA_FILES:S,^,%%DATADIR%%/,}
 PLIST_DIRS=	%%DATADIR%%
 
-SUB_FILES=	javasvn.sh
+SUB_FILES=	javasvn.sh svnsync.sh
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -42,7 +44,9 @@ do-install:
 .for file in ${DATA_FILES}
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DATADIR}
 .endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/svnsync.sh ${PREFIX}/bin/svnsync
 	${INSTALL_SCRIPT} ${WRKDIR}/javasvn.sh ${PREFIX}/bin/javasvn
+	${LN} ${PREFIX}/bin/javasvn ${PREFIX}/bin/svnkit
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/javadoc && \
 		${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
diff --git a/devel/svnkit/distinfo b/devel/svnkit/distinfo
index 4eda5791fc3f..69b0987a9280 100644
--- a/devel/svnkit/distinfo
+++ b/devel/svnkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (org.tmatesoft.svn_1.0.6.standalone.zip) = 459cae849eceef04cd65fd6fb54affcc
-SHA256 (org.tmatesoft.svn_1.0.6.standalone.zip) = 0bc50048f81f813c0222ca9cba3e376d10c8ac2c431b051dd56d03b44ff9ed93
-SIZE (org.tmatesoft.svn_1.0.6.standalone.zip) = 2244901
+MD5 (org.tmatesoft.svn_1.1.0.standalone.zip) = dd0ff83e920e543c677f0ab470638a22
+SHA256 (org.tmatesoft.svn_1.1.0.standalone.zip) = 141f65efed79f8bcb1ed7146af2f8542d745907d6ac8367cee609e657c729467
+SIZE (org.tmatesoft.svn_1.1.0.standalone.zip) = 2898270
diff --git a/devel/svnkit/files/javasvn.sh.in b/devel/svnkit/files/javasvn.sh.in
index 85d06a10d430..f7c0af136935 100644
--- a/devel/svnkit/files/javasvn.sh.in
+++ b/devel/svnkit/files/javasvn.sh.in
@@ -2,16 +2,16 @@
 #
 # $FreeBSD$
 
-JAVASVN_HOME=${JAVASVN_HOME:-"%%DATADIR%%"}
-JAVASVN_CP=${JAVASVN_HOME}/javasvn.jar:${JAVASVN_HOME}/javasvn-cli.jar:${JAVASVN_HOME}/jsch.jar
-JAVASVN_LOGDIR=${JAVASVN_LOGDIR:-"${HOME}/.javasvn"}
+SVNKIT_HOME=${SVNKIT_HOME:-"%%DATADIR%%"}
+SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/ganymed.jar
+SVNKIT_LOGDIR=${SVNKIT_LOGDIR:-"${HOME}/.svnkit"}
 
-if [ ! -d ${JAVASVN_LOGDIR} ]; then
-	mkdir ${JAVASVN_LOGDIR}
+if [ ! -d ${SVNKIT_LOGDIR} ]; then
+        mkdir ${SVNKIT_LOGDIR}
 fi
 
 JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \
-	${JAVASVN_OPTS} \
-	-Djava.util.logging.config.file="${JAVASVN_HOME}/logging.properties" \
-	-cp "${JAVASVN_CP}" \
-	org.tmatesoft.svn.cli.SVN "$@"
+        ${SVNKIT_OPTS} \
+        -Djava.util.logging.config.file="${SVNKIT_HOME}/logging.properties" \
+        -cp "${SVNKIT_CP}" \
+        org.tmatesoft.svn.cli.SVN "$@"
diff --git a/devel/svnkit/files/svnsync.sh.in b/devel/svnkit/files/svnsync.sh.in
new file mode 100644
index 000000000000..9095e4044299
--- /dev/null
+++ b/devel/svnkit/files/svnsync.sh.in
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+
+SVNKIT_HOME=${SVNKIT_HOME:-"%%DATADIR%%"}
+SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/ganymed.jar
+SVNKIT_LOGDIR=${SVNKIT_LOGDIR:-"${HOME}/.svnkit"}
+
+if [ ! -d ${SVNKIT_LOGDIR} ]; then
+        mkdir ${SVNKIT_LOGDIR}
+fi
+
+JAVA_VERSION="%%JAVA_VERSION%%" exec "%%LOCALBASE%%/bin/java" \
+        ${SVNKIT_OPTS} \
+        -Djava.util.logging.config.file="${SVNKIT_HOME}/logging.properties" \
+        -cp "${SVNKIT_CP}" \
+        org.tmatesoft.svn.cli.SVNSync "$@"
diff --git a/devel/svnkit/pkg-descr b/devel/svnkit/pkg-descr
index a5a4f913ad31..a9e653416caa 100644
--- a/devel/svnkit/pkg-descr
+++ b/devel/svnkit/pkg-descr
@@ -1,15 +1,15 @@
-JavaSVN is a pure Java Subversion client library.
+SVNKit is a pure Java Subversion client library.
 
-You would like to use JavaSVN when you need to access or modify Subversion
+You would like to use SVNKit when you need to access or modify Subversion
 repository from your Java application, be it a standalone program, plugin or
-web application. Being a pure Java program, JavaSVN doesn't need any
+web application. Being a pure Java program, SVNKit doesn't need any
 additional configuration or native binaries to work on any OS that runs Java.
 
-JavaSVN Features:
+SVNKit Features:
 
 * No external binaries or libraries are needed.
-* JavaSVN supports http, https, svn and svn+ssh connection protocols.
+* SVNKit supports http, https, svn and svn+ssh connection protocols.
 * Low level API allows effective direct Subversion repository access.
 * Compatible with applications that already use native javahl bindings.
 
-WWW: http://tmate.org/svn/
+WWW: http://svnkit.com/