From 446d3cf222b85578d36a652fa645ba00b3e06d2f Mon Sep 17 00:00:00 2001
From: Josh Paetzel <jpaetzel@FreeBSD.org>
Date: Sat, 13 Nov 2010 15:38:25 +0000
Subject: [PATCH] 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>
---
 devel/Makefile           |  1 +
 devel/svnmerge/Makefile  | 45 ++++++++++++++++++++++++++++++++++++++++
 devel/svnmerge/pkg-descr |  6 ++++++
 3 files changed, 52 insertions(+)
 create mode 100644 devel/svnmerge/Makefile
 create mode 100644 devel/svnmerge/pkg-descr

diff --git a/devel/Makefile b/devel/Makefile
index 626484f92fb0..4e874a3de380 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3257,6 +3257,7 @@
     SUBDIR += svn_load_dirs
     SUBDIR += svndelta
     SUBDIR += svnkit
+    SUBDIR += svnmerge
     SUBDIR += svntrac
     SUBDIR += swank-clojure
     SUBDIR += swig13
diff --git a/devel/svnmerge/Makefile b/devel/svnmerge/Makefile
new file mode 100644
index 000000000000..99b129fe7c67
--- /dev/null
+++ b/devel/svnmerge/Makefile
@@ -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>
diff --git a/devel/svnmerge/pkg-descr b/devel/svnmerge/pkg-descr
new file mode 100644
index 000000000000..fe5389225707
--- /dev/null
+++ b/devel/svnmerge/pkg-descr
@@ -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