From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 10 16:50:09 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B338D1065670 for ; Wed, 10 Nov 2010 16:50:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6A5848FC18 for ; Wed, 10 Nov 2010 16:50:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id oAAGo9Us097898 for ; Wed, 10 Nov 2010 16:50:09 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id oAAGo9Bj097897; Wed, 10 Nov 2010 16:50:09 GMT (envelope-from gnats) Resent-Date: Wed, 10 Nov 2010 16:50:09 GMT Resent-Message-Id: <201011101650.oAAGo9Bj097897@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Tom Judge Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B189106564A; Wed, 10 Nov 2010 16:40:35 +0000 (UTC) (envelope-from tom@tomjudge.com) Received: from tomjudge.vm.bytemark.co.uk (tomjudge.vm.bytemark.co.uk [80.68.91.100]) by mx1.freebsd.org (Postfix) with ESMTP id 473678FC1E; Wed, 10 Nov 2010 16:40:35 +0000 (UTC) Received: from localhost (localhost.localdomain [127.0.0.1]) by tomjudge.vm.bytemark.co.uk (Postfix) with ESMTP id 3B034DCB3C; Wed, 10 Nov 2010 16:40:34 +0000 (GMT) Received: from tomjudge.vm.bytemark.co.uk ([127.0.0.1]) by localhost (tomjudge.vm.bytemark.co.uk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id D-ESxashMO0Q; Wed, 10 Nov 2010 16:40:30 +0000 (GMT) Received: from tinderbox.home.tomjudge.com (unknown [192.168.200.5]) by tomjudge.vm.bytemark.co.uk (Postfix) with SMTP id 0B957DCB3B; Wed, 10 Nov 2010 16:40:28 +0000 (GMT) Received: by tinderbox.home.tomjudge.com (sSMTP sendmail emulation); Wed, 10 Nov 2010 16:40:28 +0000 Message-Id: <20101110164029.0B957DCB3B@tomjudge.vm.bytemark.co.uk> Date: Wed, 10 Nov 2010 16:40:28 +0000 From: "Tom Judge" To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jpaetzel@FreeBSD.org Subject: ports/152112: [new port] devel/svnmerge Subversion merge tracking tool from Subversion contrib X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Tom Judge List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Nov 2010 16:50:09 -0000 >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 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 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 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: