8 files changed, 24 insertions, 40 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 81459f01b9fb..9876158a794c 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1467
+PORTVERSION=	r1537
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tigris.org/files/15/38/
 
@@ -15,17 +15,13 @@ LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.19:${PORTSDIR}/www/neon \
 		expat:${PORTSDIR}/textproc/expat \
 		apr:${PORTSDIR}/devel/apr-devel
-
-RUN_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch
-
-BUILD_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch \
-		python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+	 	python:${PORTSDIR}/lang/python
 
 MAN1=		svn.1
 
-WRKSRC=	${WRKDIR}/subversion-r1467
+WRKSRC=	${WRKDIR}/subversion-r1537
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index 4c6c11dabbb6..d647d395e5bd 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1467.tar.gz) = dd945c0150062cc4d1965df0b23cb22d
+MD5 (subversion-r1537.tar.gz) = 0bd886859b86142b4d11f2bbe91706f4
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 81459f01b9fb..9876158a794c 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1467
+PORTVERSION=	r1537
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tigris.org/files/15/38/
 
@@ -15,17 +15,13 @@ LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.19:${PORTSDIR}/www/neon \
 		expat:${PORTSDIR}/textproc/expat \
 		apr:${PORTSDIR}/devel/apr-devel
-
-RUN_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch
-
-BUILD_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch \
-		python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+	 	python:${PORTSDIR}/lang/python
 
 MAN1=		svn.1
 
-WRKSRC=	${WRKDIR}/subversion-r1467
+WRKSRC=	${WRKDIR}/subversion-r1537
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 4c6c11dabbb6..d647d395e5bd 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1467.tar.gz) = dd945c0150062cc4d1965df0b23cb22d
+MD5 (subversion-r1537.tar.gz) = 0bd886859b86142b4d11f2bbe91706f4
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 81459f01b9fb..9876158a794c 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1467
+PORTVERSION=	r1537
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tigris.org/files/15/38/
 
@@ -15,17 +15,13 @@ LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.19:${PORTSDIR}/www/neon \
 		expat:${PORTSDIR}/textproc/expat \
 		apr:${PORTSDIR}/devel/apr-devel
-
-RUN_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch
-
-BUILD_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch \
-		python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+	 	python:${PORTSDIR}/lang/python
 
 MAN1=		svn.1
 
-WRKSRC=	${WRKDIR}/subversion-r1467
+WRKSRC=	${WRKDIR}/subversion-r1537
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 4c6c11dabbb6..d647d395e5bd 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1467.tar.gz) = dd945c0150062cc4d1965df0b23cb22d
+MD5 (subversion-r1537.tar.gz) = 0bd886859b86142b4d11f2bbe91706f4
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 81459f01b9fb..9876158a794c 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1467
+PORTVERSION=	r1537
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tigris.org/files/15/38/
 
@@ -15,17 +15,13 @@ LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.19:${PORTSDIR}/www/neon \
 		expat:${PORTSDIR}/textproc/expat \
 		apr:${PORTSDIR}/devel/apr-devel
-
-RUN_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch
-
-BUILD_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
-		gpatch:${PORTSDIR}/devel/patch \
-		python:${PORTSDIR}/lang/python
+RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
+	 	python:${PORTSDIR}/lang/python
 
 MAN1=		svn.1
 
-WRKSRC=	${WRKDIR}/subversion-r1467
+WRKSRC=	${WRKDIR}/subversion-r1537
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --with-ssl \
 		--with-neon=${LOCALBASE} \
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 4c6c11dabbb6..d647d395e5bd 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1467.tar.gz) = dd945c0150062cc4d1965df0b23cb22d
+MD5 (subversion-r1537.tar.gz) = 0bd886859b86142b4d11f2bbe91706f4