Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 30 Aug 2009 12:11:46 GMT
From:      Gerrit Beine <gerrit.beine@gmx.de>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/138343: Update: devel/svnkit
Message-ID:  <200908301211.n7UCBkwC075733@www.freebsd.org>
Resent-Message-ID: <200908301220.n7UCK2kk013832@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         138343
>Category:       ports
>Synopsis:       Update: devel/svnkit
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Aug 30 12:20:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Gerrit Beine
>Release:        FreeBSD 7.2-RELEASE
>Organization:
SQQD GmbH
>Environment:
FreeBSD tinderbox.intern.sapat.de 7.2-RELEASE FreeBSD 7.2-RELEASE #0: Fri May  1 08:49:13 UTC 2009     root@walker.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Update to version 1.3.0

Please notice, that this revision is no longer binary compatible with previous releases of SVNKit.
>How-To-Repeat:

>Fix:
diff -Nur /usr/ports/devel/svnkit/Makefile devel/svnkit/Makefile
--- /usr/ports/devel/svnkit/Makefile	2008-06-06 15:21:56.000000000 +0200
+++ devel/svnkit/Makefile	2009-08-30 11:24:31.000000000 +0200
@@ -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,23 @@
 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 \
 		${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 +51,7 @@
 	${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 -Nur /usr/ports/devel/svnkit/files/javasvn.sh.in devel/svnkit/files/javasvn.sh.in
--- /usr/ports/devel/svnkit/files/javasvn.sh.in	2006-12-23 06:21:38.000000000 +0100
+++ devel/svnkit/files/javasvn.sh.in	2009-08-30 11:18:07.000000000 +0200
@@ -3,7 +3,7 @@
 # $FreeBSD: ports/devel/svnkit/files/javasvn.sh.in,v 1.3 2006/12/23 05:21:38 clsung Exp $
 
 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 @@
         ${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 -Nur /usr/ports/devel/svnkit/files/jsvnadmin.sh.in devel/svnkit/files/jsvnadmin.sh.in
--- /usr/ports/devel/svnkit/files/jsvnadmin.sh.in	2007-08-02 13:47:10.000000000 +0200
+++ devel/svnkit/files/jsvnadmin.sh.in	2009-08-30 11:18:24.000000000 +0200
@@ -3,7 +3,7 @@
 # $FreeBSD: ports/devel/svnkit/files/jsvnadmin.sh.in,v 1.1 2007/08/02 11:47:10 miwi Exp $
 
 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 @@
         ${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 -Nur /usr/ports/devel/svnkit/files/jsvndumpfilter.sh.in devel/svnkit/files/jsvndumpfilter.sh.in
--- /usr/ports/devel/svnkit/files/jsvndumpfilter.sh.in	1970-01-01 01:00:00.000000000 +0100
+++ devel/svnkit/files/jsvndumpfilter.sh.in	2009-08-30 11:19:48.000000000 +0200
@@ -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 -Nur /usr/ports/devel/svnkit/files/jsvnlook.sh.in devel/svnkit/files/jsvnlook.sh.in
--- /usr/ports/devel/svnkit/files/jsvnlook.sh.in	2007-08-02 13:47:10.000000000 +0200
+++ devel/svnkit/files/jsvnlook.sh.in	2009-08-30 11:18:38.000000000 +0200
@@ -3,7 +3,7 @@
 # $FreeBSD: ports/devel/svnkit/files/jsvnlook.sh.in,v 1.1 2007/08/02 11:47:10 miwi Exp $
 
 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 @@
         ${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 -Nur /usr/ports/devel/svnkit/files/jsvnversion.sh.in devel/svnkit/files/jsvnversion.sh.in
--- /usr/ports/devel/svnkit/files/jsvnversion.sh.in	2007-08-02 13:47:10.000000000 +0200
+++ devel/svnkit/files/jsvnversion.sh.in	2009-08-30 11:19:09.000000000 +0200
@@ -3,7 +3,7 @@
 # $FreeBSD: ports/devel/svnkit/files/jsvnversion.sh.in,v 1.1 2007/08/02 11:47:10 miwi Exp $
 
 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 @@
         ${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 -Nur /usr/ports/devel/svnkit/files/svnsync.sh.in devel/svnkit/files/svnsync.sh.in
--- /usr/ports/devel/svnkit/files/svnsync.sh.in	2006-12-23 06:21:38.000000000 +0100
+++ devel/svnkit/files/svnsync.sh.in	2009-08-30 11:19:01.000000000 +0200
@@ -14,4 +14,4 @@
         ${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 "$@"


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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908301211.n7UCBkwC075733>