From tom@tomjudge.com  Wed Nov 10 16:40:35 2010
Return-Path: <tom@tomjudge.com>
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" <tom@tomjudge.com>
Reply-To: Tom Judge <tom@tomjudge.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@FreeBSD.org
Subject: [new port] devel/svnmerge Subversion merge tracking tool from Subversion contrib
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         152112
>Category:       ports
>Synopsis:       [new port] devel/svnmerge Subversion merge tracking tool from Subversion contrib
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jpaetzel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 10 16:50:09 UTC 2010
>Closed-Date:    Sat Nov 13 15:39:18 UTC 2010
>Last-Modified:  Sat Nov 13 15:40:10 UTC 2010
>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:
State-Changed-From-To: open->analyzed 
State-Changed-By: jpaetzel 
State-Changed-When: Fri Nov 12 17:14:38 UTC 2010 
State-Changed-Why:  
I'll take it 


Responsible-Changed-From-To: freebsd-ports-bugs->jpaetzel 
Responsible-Changed-By: jpaetzel 
Responsible-Changed-When: Fri Nov 12 17:14:38 UTC 2010 
Responsible-Changed-Why:  
I'll take it 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152112 
State-Changed-From-To: analyzed->closed 
State-Changed-By: jpaetzel 
State-Changed-When: Sat Nov 13 15:38:57 UTC 2010 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=152112 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/152112: commit references a PR
Date: Sat, 13 Nov 2010 15:38:29 +0000 (UTC)

 jpaetzel    2010-11-13 15:38:25 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel                Makefile 
   Added files:
     devel/svnmerge       Makefile pkg-descr 
   Log:
   This is a python script to help manage merges in the repository.
   
   This script is part of the Subversion distribution and it is assumed
   that it can be used under the same license terms as Subversion itself.
   
   WWW:    http://subversion.tigris.org/tools_contrib.html#client_side
   
   PR:             ports/152112
   Submitted by:   Tom Judge <tom at tomjudge.com>
   
   Revision  Changes    Path
   1.4113    +1 -0      ports/devel/Makefile
   1.1       +45 -0     ports/devel/svnmerge/Makefile (new)
   1.1       +6 -0      ports/devel/svnmerge/pkg-descr (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
