From 9004d89c859dec2213aed2db106d6509a1641a2c Mon Sep 17 00:00:00 2001
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Fri, 26 Jun 2009 11:37:13 +0000
Subject: [PATCH]   (1) Update to 1.6.3   (2) Cleanup DBD usage

PR:	(2) ports/135397
---
 devel/subversion/Makefile          |  2 +-
 devel/subversion/Makefile.common   | 21 +++++++--------------
 devel/subversion/distinfo          |  6 +++---
 devel/subversion16/Makefile        |  2 +-
 devel/subversion16/Makefile.common | 21 +++++++--------------
 devel/subversion16/distinfo        |  6 +++---
 6 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 0d7b57a707d1..d027a996c339 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -62,7 +62,7 @@ PLIST_SUB+=	BOOK="@comment "
 .endif
 
 .if defined(WITH_ASVN)
-RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
+RUN_DEPENDS+=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 80d82fc64be2..be40cf906998 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
@@ -13,12 +13,11 @@ MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-
+MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
+
 CONFIGURE_ARGS=	--with-ssl
-MAKE_JOBS_SAFE=	yes
-WANT_PERL=	yes
 
 .if defined(SVN_BUILD_BINDINGS)
 # Bindings ports should use the same, as main port
@@ -54,6 +53,7 @@ PLIST_SUB+=		SASL="@comment "
 
 # Default us "on"
 .if !defined(WITHOUT_BDB)
+USE_BDB=		42+
 PLIST_SUB+=		BDB=""
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
@@ -92,21 +92,14 @@ APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE_PORT}
-.if !defined(WITHOUT_BDB)
-DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
-OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
-.endif
 .else
-LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
+APR_PORT=	devel/apr
+LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/${APR_PORT}
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
-APR_PORT=	devel/apr
-.if !defined(WITHOUT_BDB)
-OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
-DEPENDS_ARGS+=	WITH_BDB=yes
-.endif
 .endif
+
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index c3075aa47b56..f83703b8b87d 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.2.tar.bz2) = ebb1cecd313533ca0876f9bfc86bd5d9
-SHA256 (subversion/subversion-1.6.2.tar.bz2) = 9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
-SIZE (subversion/subversion-1.6.2.tar.bz2) = 5470969
+MD5 (subversion/subversion-1.6.3.tar.bz2) = 8bf7637ac99368db0890e3f085fa690d
+SHA256 (subversion/subversion-1.6.3.tar.bz2) = 1dfd4550ae87687c5031665d3b1624082130b4dc235b1084eb0c6279f8e2ee6c
+SIZE (subversion/subversion-1.6.3.tar.bz2) = 5483625
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 0d7b57a707d1..d027a996c339 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -62,7 +62,7 @@ PLIST_SUB+=	BOOK="@comment "
 .endif
 
 .if defined(WITH_ASVN)
-RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
+RUN_DEPENDS+=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 80d82fc64be2..be40cf906998 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.2
+PORTVERSION=	1.6.3
 PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
@@ -13,12 +13,11 @@ MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
 DIST_SUBDIR=	subversion
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
-
+MAKE_JOBS_SAFE=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
+
 CONFIGURE_ARGS=	--with-ssl
-MAKE_JOBS_SAFE=	yes
-WANT_PERL=	yes
 
 .if defined(SVN_BUILD_BINDINGS)
 # Bindings ports should use the same, as main port
@@ -54,6 +53,7 @@ PLIST_SUB+=		SASL="@comment "
 
 # Default us "on"
 .if !defined(WITHOUT_BDB)
+USE_BDB=		42+
 PLIST_SUB+=		BDB=""
 .else
 CONFIGURE_ARGS+=	--without-berkeley-db
@@ -92,21 +92,14 @@ APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 .endif
 APR_PORT=	${APACHE_PORT}
-.if !defined(WITHOUT_BDB)
-DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
-OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
-.endif
 .else
-LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/devel/apr
+APR_PORT=	devel/apr
+LIB_DEPENDS+=	apr-1.3:${PORTSDIR}/${APR_PORT}
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
-APR_PORT=	devel/apr
-.if !defined(WITHOUT_BDB)
-OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
-DEPENDS_ARGS+=	WITH_BDB=yes
-.endif
 .endif
+
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
 
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index c3075aa47b56..f83703b8b87d 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.2.tar.bz2) = ebb1cecd313533ca0876f9bfc86bd5d9
-SHA256 (subversion/subversion-1.6.2.tar.bz2) = 9788a5a19d032b7711b54f462f40b72ee0c6180069335db6994d96b7b23c4075
-SIZE (subversion/subversion-1.6.2.tar.bz2) = 5470969
+MD5 (subversion/subversion-1.6.3.tar.bz2) = 8bf7637ac99368db0890e3f085fa690d
+SHA256 (subversion/subversion-1.6.3.tar.bz2) = 1dfd4550ae87687c5031665d3b1624082130b4dc235b1084eb0c6279f8e2ee6c
+SIZE (subversion/subversion-1.6.3.tar.bz2) = 5483625
 MD5 (subversion/svn-book-html.tar.bz2) = b5c8723bf2951e93bc468441ebc71011
 SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
 SIZE (subversion/svn-book-html.tar.bz2) = 406484