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>
This commit is contained in:
Josh Paetzel 2010-11-13 15:38:25 +00:00
parent 92ed34ec4a
commit 446d3cf222
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=264488
3 changed files with 52 additions and 0 deletions

View file

@ -3257,6 +3257,7 @@
SUBDIR += svn_load_dirs
SUBDIR += svndelta
SUBDIR += svnkit
SUBDIR += svnmerge
SUBDIR += svntrac
SUBDIR += swank-clojure
SUBDIR += swig13

45
devel/svnmerge/Makefile Normal file
View file

@ -0,0 +1,45 @@
# New ports collection makefile for: svnmerge
# Date created: 2010-11-10
# Whom: Tom Judge <tom@tomjudge.com>
#
# $FreeBSD$
PORTNAME= svnmerge
PORTVERSION= ${SVN_PORTVERSION}
CATEGORIES= devel
MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= tom@tomjudge.com
COMMENT= A Python script to managing merges in a Subversion repository
RUN_DEPENDS= ${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
USE_BZIP2= yes
USE_PYTHON= 2.5+
NO_BUILD= yes
WRKSRC= ${WRKDIR}/subversion-${SVN_PORTVERSION}/contrib/client-side/svnmerge
PLIST_FILES= bin/svnmerge
.if !defined(NOPORTDOCS)
PORTDOCS= *
.endif
.include <bsd.port.pre.mk>
SVN_PORTDIR= ${PORTSDIR}/devel/subversion
SVN_PORTVERSION!= cd ${SVN_PORTDIR} && ${MAKE} -V PORTVERSION
do-extract:
${MKDIR} ${WRKDIR}
cd ${SVN_PORTDIR} && ${MAKE} DISABLE_CONFLICTS=yes WRKDIR=${WRKDIR} extract
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/svnmerge.py ${PREFIX}/bin/svnmerge
.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/svnmerge.README ${DOCSDIR}/
.endif
.include <bsd.port.post.mk>

6
devel/svnmerge/pkg-descr Normal file
View file

@ -0,0 +1,6 @@
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