5 files changed, 64 insertions, 10 deletions

diff --git a/devel/svnkit/Makefile b/devel/svnkit/Makefile
index 5643256c6e5f..a73bff1a7ed3 100644
--- a/devel/svnkit/Makefile
+++ b/devel/svnkit/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	svnkit
-PORTVERSION=	1.1.2
-PORTREVISION=	1
+PORTVERSION=	1.1.4
 CATEGORIES=	devel java
 MASTER_SITES=	http://svnkit.com/
 DISTNAME=	org.tmatesoft.svn_${PORTVERSION}.standalone
@@ -29,11 +28,12 @@ DATA_FILES=	COPYING GANYMED-LICENSE JAVAHL-LICENSE SEQUENCE-LICENSE \
 		svnkit-cli.jar svnkit-javahl.jar svnkit.jar ganymed.jar \
 		README.txt
 
-PLIST_FILES=	bin/javasvn bin/svnkit bin/svnsync \
+PLIST_FILES=	bin/jsvn bin/jsvnadmin bin/jsvnlook \
+		bin/jsvnsync bin/jsvnversion \
 		${DATA_FILES:S,^,%%DATADIR%%/,}
 PLIST_DIRS=	%%DATADIR%%
 
-SUB_FILES=	javasvn.sh svnsync.sh
+SUB_FILES=	javasvn.sh svnsync.sh jsvnadmin.sh jsvnlook.sh jsvnversion.sh
 
 .if !defined(NOPORTDOCS)
 PORTDOCS=	*
@@ -44,9 +44,12 @@ 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
+	${INSTALL_SCRIPT} ${WRKDIR}/javasvn.sh ${PREFIX}/bin/jsvn
+	${INSTALL_SCRIPT} ${WRKDIR}/svnsync.sh ${PREFIX}/bin/jsvnsync
+	${INSTALL_SCRIPT} ${WRKDIR}/jsvnadmin.sh ${PREFIX}/bin/jsvnadmin
+	${INSTALL_SCRIPT} ${WRKDIR}/jsvnlook.sh ${PREFIX}/bin/jsvnlook
+	${INSTALL_SCRIPT} ${WRKDIR}/jsvnversion.sh ${PREFIX}/bin/jsvnversion
+
 .if !defined(NOPORTDOCS)
 	cd ${WRKSRC}/doc/javadoc && \
 		${FIND} . -type d -exec ${MKDIR} ${DOCSDIR}/{} \;
diff --git a/devel/svnkit/distinfo b/devel/svnkit/distinfo
index 8a69528cd22b..34be500e42dc 100644
--- a/devel/svnkit/distinfo
+++ b/devel/svnkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (org.tmatesoft.svn_1.1.2.standalone.zip) = e886a83cc56f512bff9d941271a514a1
-SHA256 (org.tmatesoft.svn_1.1.2.standalone.zip) = a3c8d1155221ef55cdf3f12e3d7950b9c42bd08c8ab796981ecbc04d705ab812
-SIZE (org.tmatesoft.svn_1.1.2.standalone.zip) = 3216432
+MD5 (org.tmatesoft.svn_1.1.4.standalone.zip) = 88a074d910904668a665fffae0db0d21
+SHA256 (org.tmatesoft.svn_1.1.4.standalone.zip) = 1a0c9276fe58e2f10a77b96896100e7619dd3067f853fcb9854794b80ca3a48a
+SIZE (org.tmatesoft.svn_1.1.4.standalone.zip) = 3296959
diff --git a/devel/svnkit/files/jsvnadmin.sh.in b/devel/svnkit/files/jsvnadmin.sh.in
new file mode 100644
index 000000000000..9bf3b4e8c521
--- /dev/null
+++ b/devel/svnkit/files/jsvnadmin.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.SVNAdmin "$@"
diff --git a/devel/svnkit/files/jsvnlook.sh.in b/devel/svnkit/files/jsvnlook.sh.in
new file mode 100644
index 000000000000..aeb0fdbd1f3f
--- /dev/null
+++ b/devel/svnkit/files/jsvnlook.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.SVNLook "$@"
diff --git a/devel/svnkit/files/jsvnversion.sh.in b/devel/svnkit/files/jsvnversion.sh.in
new file mode 100644
index 000000000000..026814bc62c2
--- /dev/null
+++ b/devel/svnkit/files/jsvnversion.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.SVNVersion "$@"