8 files changed, 38 insertions, 19 deletions

diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile
index 40b9af301737..689b0e70fc19 100644
--- a/devel/svnkit/Makefile
+++ b/devel/svnkit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	svnkit
-PORTVERSION=	1.1.7
-PORTREVISION=	1
+PORTVERSION=	1.3.0
 CATEGORIES=	devel java
 MASTER_SITES=	http://svnkit.com/
 DISTNAME=	org.tmatesoft.svn_${PORTVERSION}.standalone
@@ -20,22 +19,24 @@ RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
 NO_BUILD=	yes
 USE_ZIP=	yes
 USE_JAVA=	yes
-JAVA_VERSION=	1.3+
+JAVA_VERSION=	1.5+
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.4142
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}.5847
 
 DATA_FILES=	COPYING \
 		JNA-LICENSE JAVAHL-LICENSE SEQUENCE-LICENSE TRILEAD-LICENSE \
-		changelog.txt logging.properties.disabled svnkitsrc.zip \
+		changelog.txt logging.properties.disabled \
+		svnkitclisrc.zip svnkitsrc.zip \
 		jna.jar svnkit-cli.jar svnkit-javahl.jar svnkit.jar trilead.jar \
-		README.txt THIRD-PARTY.txt
+		README.txt
 
 PLIST_FILES=	bin/jsvn bin/jsvnadmin bin/jsvnlook \
 		bin/jsvnsync bin/jsvnversion \
+		bin/jsvndumpfilter \
 		${DATA_FILES:S,^,%%DATADIR%%/,}
 PLIST_DIRS=	%%DATADIR%%
 
-SUB_FILES=	javasvn.sh svnsync.sh jsvnadmin.sh jsvnlook.sh jsvnversion.sh
+SUB_FILES=	javasvn.sh svnsync.sh jsvnadmin.sh jsvnlook.sh jsvnversion.sh jsvndumpfilter.sh
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -51,6 +52,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/jsvnadmin.sh ${PREFIX}/bin/jsvnadmin
 	${INSTALL_SCRIPT} ${WRKDIR}/jsvnlook.sh ${PREFIX}/bin/jsvnlook
 	${INSTALL_SCRIPT} ${WRKDIR}/jsvnversion.sh ${PREFIX}/bin/jsvnversion
+	${INSTALL_SCRIPT} ${WRKDIR}/jsvndumpfilter.sh ${PREFIX}/bin/jsvndumpfilter
 
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/javadoc && \
diff --git a/devel/svnkit/distinfo b/devel/svnkit/distinfo
index f0bc3af0bbde..da343205e442 100644
--- a/devel/svnkit/distinfo
+++ b/devel/svnkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (org.tmatesoft.svn_1.1.7.standalone.zip) = d7a1e4af25957bccd9259bbd1ea895b0
-SHA256 (org.tmatesoft.svn_1.1.7.standalone.zip) = 4f6b034b0e347970dd3a54e6c2b16787a1e30f610896c8efe1d8f11383383e14
-SIZE (org.tmatesoft.svn_1.1.7.standalone.zip) = 3756468
+MD5 (org.tmatesoft.svn_1.3.0.standalone.zip) = 4d83a03bc915013836e2ceb79aec0ddd
+SHA256 (org.tmatesoft.svn_1.3.0.standalone.zip) = 93e78b3d193334c0fd42eb21937596f04f3b06f4f8b82b060e571da371473f67
+SIZE (org.tmatesoft.svn_1.3.0.standalone.zip) = 5602518
diff --git a/devel/svnkit/files/javasvn.sh.in b/devel/svnkit/files/javasvn.sh.in
index f7c0af136935..06cab2268361 100644
--- a/devel/svnkit/files/javasvn.sh.in
+++ b/devel/svnkit/files/javasvn.sh.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 SVNKIT_HOME=${SVNKIT_HOME:-"%%DATADIR%%"}
-SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/ganymed.jar
+SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/trilead.jar:${SVNKIT_HOME}/jna.jar
 SVNKIT_LOGDIR=${SVNKIT_LOGDIR:-"${HOME}/.svnkit"}
 
 if [ ! -d ${SVNKIT_LOGDIR} ]; then
@@ -14,4 +14,4 @@ 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.SVN "$@"
+        org.tmatesoft.svn.cli.svn.SVN "$@"
diff --git a/devel/svnkit/files/jsvnadmin.sh.in b/devel/svnkit/files/jsvnadmin.sh.in
index 9bf3b4e8c521..1712da66d846 100644
--- a/devel/svnkit/files/jsvnadmin.sh.in
+++ b/devel/svnkit/files/jsvnadmin.sh.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 SVNKIT_HOME=${SVNKIT_HOME:-"%%DATADIR%%"}
-SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/ganymed.jar
+SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/trilead.jar:${SVNKIT_HOME}/jna.jar
 SVNKIT_LOGDIR=${SVNKIT_LOGDIR:-"${HOME}/.svnkit"}
 
 if [ ! -d ${SVNKIT_LOGDIR} ]; then
@@ -14,4 +14,4 @@ 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.SVNAdmin "$@"
+        org.tmatesoft.svn.cli.svnadmin.SVNAdmin "$@"
diff --git a/devel/svnkit/files/jsvndumpfilter.sh.in b/devel/svnkit/files/jsvndumpfilter.sh.in
new file mode 100644
index 000000000000..d0fd4e2ed954
--- /dev/null
+++ b/devel/svnkit/files/jsvndumpfilter.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}/trilead.jar:${SVNKIT_HOME}/jna.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.svndumpfilter.SVNDumpFilter "$@"
diff --git a/devel/svnkit/files/jsvnlook.sh.in b/devel/svnkit/files/jsvnlook.sh.in
index aeb0fdbd1f3f..224d98cd2d48 100644
--- a/devel/svnkit/files/jsvnlook.sh.in
+++ b/devel/svnkit/files/jsvnlook.sh.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 SVNKIT_HOME=${SVNKIT_HOME:-"%%DATADIR%%"}
-SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/ganymed.jar
+SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/trilead.jar:${SVNKIT_HOME}/jna.jar
 SVNKIT_LOGDIR=${SVNKIT_LOGDIR:-"${HOME}/.svnkit"}
 
 if [ ! -d ${SVNKIT_LOGDIR} ]; then
@@ -14,4 +14,4 @@ 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.SVNLook "$@"
+        org.tmatesoft.svn.cli.svnlook.SVNLook "$@"
diff --git a/devel/svnkit/files/jsvnversion.sh.in b/devel/svnkit/files/jsvnversion.sh.in
index 026814bc62c2..7da254621b53 100644
--- a/devel/svnkit/files/jsvnversion.sh.in
+++ b/devel/svnkit/files/jsvnversion.sh.in
@@ -3,7 +3,7 @@
 # $FreeBSD$
 
 SVNKIT_HOME=${SVNKIT_HOME:-"%%DATADIR%%"}
-SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/ganymed.jar
+SVNKIT_CP=${SVNKIT_HOME}/svnkit.jar:${SVNKIT_HOME}/svnkit-cli.jar:${SVNKIT_HOME}/trilead.jar:${SVNKIT_HOME}/jna.jar
 SVNKIT_LOGDIR=${SVNKIT_LOGDIR:-"${HOME}/.svnkit"}
 
 if [ ! -d ${SVNKIT_LOGDIR} ]; then
@@ -14,4 +14,4 @@ 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.SVNVersion "$@"
+        org.tmatesoft.svn.cli.svnversion.SVNVersion "$@"
diff --git a/devel/svnkit/files/svnsync.sh.in b/devel/svnkit/files/svnsync.sh.in
index 9095e4044299..15281508d427 100644
--- a/devel/svnkit/files/svnsync.sh.in
+++ b/devel/svnkit/files/svnsync.sh.in
@@ -14,4 +14,4 @@ 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 "$@"
+        org.tmatesoft.svn.cli.svnsync.SVNSync "$@"