- Update to 1.4.6

- Add OPTIONS

PR:		ports/119152
Submitted by:	mm
Approved by:	maintainer (timeout)

12 files changed, 88 insertions, 88 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 7a3cfa7c55a..d86820b8f90 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.2/:bookhtml \
@@ -21,7 +20,7 @@ COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -41,9 +40,20 @@ TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 PORTDOCS=	${TXT_DOCS}
 .endif
 
-.if defined(WITH_ASVN)
-RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
-.endif
+OPTIONS=	PERL		"Perl bindings" off \
+		PYTHON		"Python bindings" off \
+		RUBY		"Ruby bindings" off \
+		JAVA		"Java (JavaHL) bindings" off \
+		MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
+		APACHE2_APR	"Use APR from Apache 2.X" off \
+		NEON		"WebDAV/Delta-V repository access module" on \
+		BDB		"db4 repository backend" on \
+		ASVN		"Build and install Archive SVN (asvn)" off \
+		MAINTAINER_DEBUG	"Build debug version" off \
+		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
+		BOOK		"Install the Subversion Book" off
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
@@ -53,8 +63,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
@@ -216,6 +224,7 @@ DISTFILES+=	svn-book.html:bookhtml \
 .endif
 
 .if defined(WITH_ASVN)
+RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index d807ff57ff1..efda8a51b50 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895
-SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
-SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349
+MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
+SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
+SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
 MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
 SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
 SIZE (subversion/svn-book.html) = 1151598
diff --git a/devel/subversion-devel/files/patch-configure b/devel/subversion-devel/files/patch-configure
index f5d6cf5fed7..562bede4f5a 100644
--- a/devel/subversion-devel/files/patch-configure
+++ b/devel/subversion-devel/files/patch-configure
@@ -1,14 +1,5 @@
---- configure.orig	Thu Jan 18 01:17:34 2007
-+++ configure	Sat Mar 17 10:48:49 2007
-@@ -3942,7 +3942,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
+--- configure.orig	2007-12-17 23:01:31.000000000 +0100
++++ configure	2007-12-30 11:12:10.000000000 +0100
 @@ -4004,7 +4004,7 @@
             test "$svn_allowed_neon" = "any"; then
              svn_allowed_neon_on_system="yes"
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 7a3cfa7c55a..d86820b8f90 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.2/:bookhtml \
@@ -21,7 +20,7 @@ COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -41,9 +40,20 @@ TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 PORTDOCS=	${TXT_DOCS}
 .endif
 
-.if defined(WITH_ASVN)
-RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
-.endif
+OPTIONS=	PERL		"Perl bindings" off \
+		PYTHON		"Python bindings" off \
+		RUBY		"Ruby bindings" off \
+		JAVA		"Java (JavaHL) bindings" off \
+		MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
+		APACHE2_APR	"Use APR from Apache 2.X" off \
+		NEON		"WebDAV/Delta-V repository access module" on \
+		BDB		"db4 repository backend" on \
+		ASVN		"Build and install Archive SVN (asvn)" off \
+		MAINTAINER_DEBUG	"Build debug version" off \
+		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
+		BOOK		"Install the Subversion Book" off
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
@@ -53,8 +63,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
@@ -216,6 +224,7 @@ DISTFILES+=	svn-book.html:bookhtml \
 .endif
 
 .if defined(WITH_ASVN)
+RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index d807ff57ff1..efda8a51b50 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895
-SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
-SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349
+MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
+SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
+SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
 MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
 SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
 SIZE (subversion/svn-book.html) = 1151598
diff --git a/devel/subversion-freebsd/files/patch-configure b/devel/subversion-freebsd/files/patch-configure
index f5d6cf5fed7..562bede4f5a 100644
--- a/devel/subversion-freebsd/files/patch-configure
+++ b/devel/subversion-freebsd/files/patch-configure
@@ -1,14 +1,5 @@
---- configure.orig	Thu Jan 18 01:17:34 2007
-+++ configure	Sat Mar 17 10:48:49 2007
-@@ -3942,7 +3942,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
+--- configure.orig	2007-12-17 23:01:31.000000000 +0100
++++ configure	2007-12-30 11:12:10.000000000 +0100
 @@ -4004,7 +4004,7 @@
             test "$svn_allowed_neon" = "any"; then
              svn_allowed_neon_on_system="yes"
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 7a3cfa7c55a..d86820b8f90 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.2/:bookhtml \
@@ -21,7 +20,7 @@ COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -41,9 +40,20 @@ TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 PORTDOCS=	${TXT_DOCS}
 .endif
 
-.if defined(WITH_ASVN)
-RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
-.endif
+OPTIONS=	PERL		"Perl bindings" off \
+		PYTHON		"Python bindings" off \
+		RUBY		"Ruby bindings" off \
+		JAVA		"Java (JavaHL) bindings" off \
+		MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
+		APACHE2_APR	"Use APR from Apache 2.X" off \
+		NEON		"WebDAV/Delta-V repository access module" on \
+		BDB		"db4 repository backend" on \
+		ASVN		"Build and install Archive SVN (asvn)" off \
+		MAINTAINER_DEBUG	"Build debug version" off \
+		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
+		BOOK		"Install the Subversion Book" off
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
@@ -53,8 +63,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
@@ -216,6 +224,7 @@ DISTFILES+=	svn-book.html:bookhtml \
 .endif
 
 .if defined(WITH_ASVN)
+RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index d807ff57ff1..efda8a51b50 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895
-SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
-SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349
+MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
+SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
+SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
 MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
 SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
 SIZE (subversion/svn-book.html) = 1151598
diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure
index f5d6cf5fed7..562bede4f5a 100644
--- a/devel/subversion/files/patch-configure
+++ b/devel/subversion/files/patch-configure
@@ -1,14 +1,5 @@
---- configure.orig	Thu Jan 18 01:17:34 2007
-+++ configure	Sat Mar 17 10:48:49 2007
-@@ -3942,7 +3942,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
+--- configure.orig	2007-12-17 23:01:31.000000000 +0100
++++ configure	2007-12-30 11:12:10.000000000 +0100
 @@ -4004,7 +4004,7 @@
             test "$svn_allowed_neon" = "any"; then
              svn_allowed_neon_on_system="yes"
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 7a3cfa7c55a..d86820b8f90 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.4
-PORTREVISION=	1
+PORTVERSION=	1.4.6
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.2/:bookhtml \
@@ -21,7 +20,7 @@ COMMENT=	Version control system
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool:15
@@ -41,9 +40,20 @@ TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 PORTDOCS=	${TXT_DOCS}
 .endif
 
-.if defined(WITH_ASVN)
-RUN_DEPENDS= ${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
-.endif
+OPTIONS=	PERL		"Perl bindings" off \
+		PYTHON		"Python bindings" off \
+		RUBY		"Ruby bindings" off \
+		JAVA		"Java (JavaHL) bindings" off \
+		MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
+		APACHE2_APR	"Use APR from Apache 2.X" off \
+		NEON		"WebDAV/Delta-V repository access module" on \
+		BDB		"db4 repository backend" on \
+		ASVN		"Build and install Archive SVN (asvn)" off \
+		MAINTAINER_DEBUG	"Build debug version" off \
+		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
+		BOOK		"Install the Subversion Book" off
+
+.include <bsd.port.pre.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
@@ -53,8 +63,6 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		WITHOUT_GETTEXT="@comment "
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
 CFLAGS+=	-fpic -DPIC
 .endif
@@ -216,6 +224,7 @@ DISTFILES+=	svn-book.html:bookhtml \
 .endif
 
 .if defined(WITH_ASVN)
+RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils:install
 PLIST_SUB+=	ASVN=""
 .else
 PLIST_SUB+=	ASVN="@comment "
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index d807ff57ff1..efda8a51b50 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.4.4.tar.bz2) = d4aa5aeb09acb3307841022d279ab895
-SHA256 (subversion/subversion-1.4.4.tar.bz2) = 91769f992e142eaeb5017e9ec95be52505a056ef05f93427868a3c0c89e2e966
-SIZE (subversion/subversion-1.4.4.tar.bz2) = 4723349
+MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
+SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
+SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
 MD5 (subversion/svn-book.html) = 0d1f773db342da190baf6d6567d95b83
 SHA256 (subversion/svn-book.html) = 0fd99b2f12458e91fe299a32ed585b00bb4c29bcb74b2d75bfbbfce8ddb191e7
 SIZE (subversion/svn-book.html) = 1151598
diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure
index f5d6cf5fed7..562bede4f5a 100644
--- a/devel/subversion16/files/patch-configure
+++ b/devel/subversion16/files/patch-configure
@@ -1,14 +1,5 @@
---- configure.orig	Thu Jan 18 01:17:34 2007
-+++ configure	Sat Mar 17 10:48:49 2007
-@@ -3942,7 +3942,7 @@
- 
- # Either a space-separated list of allowable Neon versions, or "any" to
- # mean allow anything.
--NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2"
-+NEON_ALLOWED_LIST="0.24.7 0.25.0 0.25.1 0.25.2 0.25.3 0.25.4 0.25.5 0.26.0 0.26.1 0.26.2 0.26.3 0.26.4"
- NEON_LATEST_WORKING_VER=0.25.5
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- # Check whether --enable-neon-version-check or --disable-neon-version-check was given.
+--- configure.orig	2007-12-17 23:01:31.000000000 +0100
++++ configure	2007-12-30 11:12:10.000000000 +0100
 @@ -4004,7 +4004,7 @@
             test "$svn_allowed_neon" = "any"; then
              svn_allowed_neon_on_system="yes"