ports/164854: devel/svnmerge - Fix broken port.

[Tom Judge]

>Number:         164854
>Category:       ports
>Synopsis:       devel/svnmerge - Fix broken port.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 07 15:50:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Tom Judge
>Release:        
>Organization:
9.0-RELEASE
>Environment:
FreeBSD XXXXX.sourcefire.com 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC 2012     root at farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  amd64

>Description:
Attached is a patch to fix the devel/svnmerge port.

This patch follows the direction of devel/svn_load_dirs and depends on the older subversion16 port to provide its dist files.


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- Makefile.orig	2012-02-07 10:42:59.000000000 -0500
+++ Makefile	2012-02-07 10:44:02.000000000 -0500
@@ -13,9 +13,7 @@
 MAINTAINER=	tom at tomjudge.com
 COMMENT=	A Python script to managing merges in a Subversion repository
 
-RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion
-
-BROKEN=		does not install
+RUN_DEPENDS=	${LOCALBASE}/bin/svn:${PORTSDIR}/devel/subversion16
 
 USE_BZIP2=	yes
 USE_PYTHON=	2.5+
@@ -30,7 +28,7 @@
 
 .include <bsd.port.pre.mk>
 
-SVN_PORTDIR=		${PORTSDIR}/devel/subversion
+SVN_PORTDIR=		${PORTSDIR}/devel/subversion16
 SVN_PORTVERSION!=	cd ${SVN_PORTDIR} && ${MAKE} -V PORTVERSION
 
 do-extract:


>Release-Note:
>Audit-Trail:
>Unformatted: