Date: Sun, 30 Aug 2009 14:49:46 +0200 From: Gerrit Beine <gerrit.beine@gmx.de> To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org Subject: Re: ports/138343: Update: devel/svnkit Message-ID: <200908301449.47039.gerrit.beine@gmx.de> In-Reply-To: <200908301220.n7UCK2S9013819@freefall.freebsd.org> References: <200908301220.n7UCK2S9013819@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_rVnmKAKmso2k61z Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Am Sunday 30 August 2009 14:20:02 schrieb FreeBSD-gnats-submit@freebsd.org: > Thank you very much for your problem report. > It has the internal identification `ports/138343'. > The individual assigned to look at your > report is: freebsd-ports-bugs. > > You can access the state of your problem report at any time > via this link: > > http://www.freebsd.org/cgi/query-pr.cgi?pr=138343 > > >Category: ports > >Responsible: freebsd-ports-bugs > >Synopsis: Update: devel/svnkit > >Arrival-Date: Sun Aug 30 12:20:02 UTC 2009 The first patch on this PR was not correct, sorry for that. --Boundary-00=_rVnmKAKmso2k61z Content-Type: text/x-diff; charset="iso 8859-15"; name="devel_svnkit.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="devel_svnkit.patch" 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 14:46:51.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 \ + 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 +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/distinfo devel/svnkit/distinfo --- /usr/ports/devel/svnkit/distinfo 2008-05-01 15:48:28.000000000 +0200 +++ devel/svnkit/distinfo 2009-08-30 14:29:06.000000000 +0200 @@ -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 -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 "$@" --Boundary-00=_rVnmKAKmso2k61z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200908301449.47039.gerrit.beine>