Date: Wed, 10 Nov 2010 16:40:28 +0000 From: "Tom Judge" <tom@tomjudge.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jpaetzel@FreeBSD.org Subject: ports/152112: [new port] devel/svnmerge Subversion merge tracking tool from Subversion contrib Message-ID: <20101110164029.0B957DCB3B@tomjudge.vm.bytemark.co.uk> Resent-Message-ID: <201011101650.oAAGo9Bj097897@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 152112
>Category: ports
>Synopsis: [new port] devel/svnmerge Subversion merge tracking tool from Subversion contrib
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Nov 10 16:50:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Tom Judge
>Release: FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD tinderbox.home.tomjudge.com 8.1-STABLE FreeBSD 8.1-STABLE #0 r213720: Tue Oct 12 14:02:02 UTC 2010 tj@tinderbox.home.tomjudge.com:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
New port for svnmerge from Subversion contrib. This command helps with merge tracking in SVN repositories.
Shar archive attached, tested in tinderbox and portlint.
>How-To-Repeat:
>Fix:
--- devel-svnmerge.txt begins here ---
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# svnmerge
# svnmerge/Makefile
# svnmerge/pkg-descr
#
echo c - svnmerge
mkdir -p svnmerge > /dev/null 2>&1
echo x - svnmerge/Makefile
sed 's/^X//' >svnmerge/Makefile << '4769eb0012939d1e0df9183d1ff1cceb'
X# New ports collection makefile for: svnmerge
X# Date created: 2010-11-10
X# Whom: Tom Judge <tom@tomjudge.com>
X#
X# $FreeBSD$
X
XPORTNAME= svnmerge
XPORTVERSION= ${SVN_PORTVERSION}
XCATEGORIES= devel
XMASTER_SITES= # none
XDISTFILES= # none
X
XMAINTAINER= tom@tomjudge.com
XCOMMENT= A Python script to managing merges in a Subversion repository
X
XRUN_DEPENDS= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
X
XUSE_BZIP2= yes
XUSE_PYTHON= 2.5+
XNO_BUILD= yes
X
XWRKSRC= ${WRKDIR}/subversion-${SVN_PORTVERSION}/contrib/client-side/svnmerge
X
XPLIST_FILES= bin/svnmerge
X.if !defined(NOPORTDOCS)
XPORTDOCS= *
XPORTEXAMPLES= *
X.endif
X
X.include <bsd.port.pre.mk>
X
XSVN_PORTDIR= ${PORTSDIR}/devel/subversion
XSVN_PORTVERSION!= cd ${SVN_PORTDIR} && ${MAKE} -V PORTVERSION
X
Xdo-extract:
X ${MKDIR} ${WRKDIR}
X cd ${SVN_PORTDIR} && ${MAKE} DISABLE_CONFLICTS=yes WRKDIR=${WRKDIR} extract
X
Xdo-install:
X ${INSTALL_SCRIPT} ${WRKSRC}/svnmerge.py ${PREFIX}/bin/svnmerge
X.if !defined(NOPORTDOCS)
X ${MKDIR} ${DOCSDIR}
X ${INSTALL_DATA} ${WRKSRC}/svnmerge.README ${DOCSDIR}/
X.endif
X
X.include <bsd.port.post.mk>
4769eb0012939d1e0df9183d1ff1cceb
echo x - svnmerge/pkg-descr
sed 's/^X//' >svnmerge/pkg-descr << 'cba106b30e3efcf755f52c1ae8fc1336'
XThis is a python script to help manage merges in the repository.
X
XThis script is part of the Subversion distribution and it is assumed
Xthat it can be used under the same license terms as Subversion itself.
X
XWWW: http://subversion.tigris.org/tools_contrib.html#client_side
cba106b30e3efcf755f52c1ae8fc1336
exit
--- devel-svnmerge.txt ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101110164029.0B957DCB3B>