(1) Update to version 1.6.1

  (2) Fix asvn knoweledge about svn command location [1]
  (3) Add STATIC option to build only static binaries [2]
  (4) Activate mod_authz_svn in package installation [3]

PR:		[1] ports/133778, [3] ports/133898
Submitted by:	[2] David O'Brien

6 files changed, 67 insertions, 41 deletions

diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index bd699c1615d5..0d7b57a707d1 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -27,6 +27,7 @@ OPTIONS=	MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
 		ASVN		"Build and install Archive SVN (asvn)" off \
 		MAINTAINER_DEBUG	"Build debug version" off \
 		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
+		STATIC		"Build static version (no shared libs)" off \
 		BOOK		"Install the Subversion Book" off
 
 .include "${.CURDIR}/../../devel/subversion/Makefile.common"
@@ -90,6 +91,12 @@ pre-everything::
 	@${ECHO_MSG} ""
 .endif
 .if defined(WITH_MOD_DAV_SVN)
+.if defined(WITH_STATIC)
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!"
+	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${FALSE}
+.endif
 	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
 	@${ECHO_MSG} "This option implies the WITH_APACHE2_APR option."
 .else
@@ -104,9 +111,8 @@ pre-everything::
 	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port."
 .endif
 	@${ECHO_MSG} ""
-.if defined(WITH_MOD_DONTDOTHAT)
+.if defined(WITH_MOD_DONTDOTHAT) && defined(WITH_MOD_DAV_SVN)
 	@${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled."
-	@${ECHO_MSG} "This option implies the WITH_MOD_DAV_SVN option."
 .else
 	@${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X"
 .endif
@@ -141,6 +147,9 @@ pre-everything::
 	@${ECHO_MSG} "asvn will be installed"
 	@${ECHO_MSG} ""
 .endif
+.if defined(WITH_STATIC)
+	@${ECHO_MSG} "Static binaries will be built."
+.endif
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 20609b188b91..698b8b88776f 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.6.0
-PORTREVISION?=	2
+PORTVERSION=	1.6.1
+PORTREVISION?=	0
 CATEGORIES+=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.5/:book
@@ -145,6 +145,13 @@ CONFIGURE_ARGS+=--enable-maintainer-mode \
 CFLAGS+=	-g
 .endif
 
+.if defined(WITH_STATIC)
+CONFIGURE_ARGS+=--enable-all-static
+PLIST_SUB+=	DYNAMIC_ENABLED="@comment "
+.else
+PLIST_SUB+=	DYNAMIC_ENABLED=""
+.endif
+
 post-extract:
 	@${RM} -rf ${WRKSRC}/neon
 	@${RM} -rf ${WRKSRC}/apr
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 4fa848d0bd95..40601da2bbcb 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,6 @@
-MD5 (subversion/subversion-1.6.0.tar.bz2) = db9f19671c1f5286be3a930c0a7d18f3
-SHA256 (subversion/subversion-1.6.0.tar.bz2) = d6fb8bf61638580a0ad661edb642c38fbffad2a4c273e3f8631c6cc0da14d0a2
-SIZE (subversion/subversion-1.6.0.tar.bz2) = 5477732
+MD5 (subversion/subversion-1.6.1.tar.bz2) = 95708b96b920faeffca017f43ec96777
+SHA256 (subversion/subversion-1.6.1.tar.bz2) = cdd4a7a4e2c6e67967b99fe7857a409b2ff5e57126214fdc0f6d835ff789e6ca
+SIZE (subversion/subversion-1.6.1.tar.bz2) = 5462507
 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/files/build-outputs.mk b/devel/subversion16/files/build-outputs.mk
index e4c8a8b7b5f4..013a5b9bd94c 100644
--- a/devel/subversion16/files/build-outputs.mk
+++ b/devel/subversion16/files/build-outputs.mk
@@ -248,10 +248,10 @@ subversion/libsvn_diff/libsvn_diff-1.la: $(libsvn_diff_DEPS)
 
 libsvn_fs_PATH = subversion/libsvn_fs
 install-ramod-lib: $(SVN_FS_LIB_INSTALL_DEPS)
-libsvn_fs_DEPS = $(SVN_FS_LIB_DEPS) subversion/libsvn_fs/access.lo subversion/libsvn_fs/fs-loader.lo
+libsvn_fs_DEPS = $(SVN_FS_LIB_DEPS) subversion/libsvn_fs/access.lo subversion/libsvn_fs/fs-loader.lo subversion/libsvn_fs_util/libsvn_fs_util-1.la
 libsvn_fs_OBJECTS = access.lo fs-loader.lo
 subversion/libsvn_fs/libsvn_fs-1.la: $(libsvn_fs_DEPS)
-	cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la $(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS) -lsvn_subr-1 $(SVN_FS_LIB_LINK) $(SVN_APR_LIBS) $(LIBS)
+	cd subversion/libsvn_fs && $(LINK) -o libsvn_fs-1.la $(LT_NO_UNDEFINED) $(libsvn_fs_OBJECTS) ../../subversion/libsvn_fs_util/libsvn_fs_util-1.la -lsvn_subr-1 $(SVN_FS_LIB_LINK) $(SVN_APR_LIBS) $(LIBS)
 
 libsvn_fs_base_PATH = subversion/libsvn_fs_base
 libsvn_fs_base_DEPS =  subversion/libsvn_fs_base/bdb/bdb-err.lo subversion/libsvn_fs_base/bdb/bdb_compat.lo subversion/libsvn_fs_base/bdb/changes-table.lo subversion/libsvn_fs_base/bdb/checksum-reps-table.lo subversion/libsvn_fs_base/bdb/copies-table.lo subversion/libsvn_fs_base/bdb/dbt.lo subversion/libsvn_fs_base/bdb/env.lo subversion/libsvn_fs_base/bdb/lock-tokens-table.lo subversion/libsvn_fs_base/bdb/locks-table.lo subversion/libsvn_fs_base/bdb/miscellaneous-table.lo subversion/libsvn_fs_base/bdb/node-origins-table.lo subversion/libsvn_fs_base/bdb/nodes-table.lo subversion/libsvn_fs_base/bdb/reps-table.lo subversion/libsvn_fs_base/bdb/rev-table.lo subversion/libsvn_fs_base/bdb/strings-table.lo subversion/libsvn_fs_base/bdb/txn-table.lo subversion/libsvn_fs_base/bdb/uuids-table.lo subversion/libsvn_fs_base/dag.lo subversion/libsvn_fs_base/err.lo subversion/libsvn_fs_base/fs.lo subversion/libsvn_fs_base/id.lo subversion/libsvn_fs_base/key-gen.lo subversion/libsvn_fs_base/lock.lo subversion/libsvn_fs_base/node-rev.lo subversion/libsvn_fs_base/reps-strings.lo subversion/libsvn_fs_base/revs-txns.lo subversion/libsvn_fs_base/trail.lo subversion/libsvn_fs_base/tree.lo subversion/libsvn_fs_base/util/fs_skels.lo subversion/libsvn_fs_base/uuid.lo subversion/libsvn_fs_util/libsvn_fs_util-1.la
@@ -1672,7 +1672,7 @@ subversion/libsvn_diff/util.lo: subversion/libsvn_diff/util.c subversion/include
 
 subversion/libsvn_fs/access.lo: subversion/libsvn_fs/access.c subversion/include/private/svn_fs_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h
 
-subversion/libsvn_fs/fs-loader.lo: subversion/libsvn_fs/fs-loader.c subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_fs/fs-loader.h subversion/svn_private_config.h
+subversion/libsvn_fs/fs-loader.lo: subversion/libsvn_fs/fs-loader.c subversion/include/private/svn_fs_util.h subversion/include/private/svn_utf_private.h subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_dso.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_path.h subversion/include/svn_pools.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/include/svn_xml.h subversion/libsvn_fs/fs-loader.h subversion/svn_private_config.h
 
 subversion/libsvn_fs_base/bdb/bdb-err.lo: subversion/libsvn_fs_base/bdb/bdb-err.c subversion/include/svn_checksum.h subversion/include/svn_delta.h subversion/include/svn_error.h subversion/include/svn_error_codes.h subversion/include/svn_fs.h subversion/include/svn_io.h subversion/include/svn_mergeinfo.h subversion/include/svn_string.h subversion/include/svn_types.h subversion/include/svn_version.h subversion/libsvn_fs/fs-loader.h subversion/libsvn_fs_base/bdb/bdb-err.h subversion/libsvn_fs_base/bdb/bdb_compat.h subversion/libsvn_fs_base/bdb/env.h subversion/libsvn_fs_base/err.h subversion/libsvn_fs_base/fs.h subversion/svn_private_config.h
 
diff --git a/devel/subversion16/files/patch-contrib--client-side--asvn b/devel/subversion16/files/patch-contrib--client-side--asvn
index bdf407f6ee8e..1532ab68f800 100644
--- a/devel/subversion16/files/patch-contrib--client-side--asvn
+++ b/devel/subversion16/files/patch-contrib--client-side--asvn
@@ -1,5 +1,14 @@
 --- contrib/client-side/asvn.orig	2008-01-28 03:24:25.000000000 +0300
-+++ contrib/client-side/asvn	2008-06-28 12:10:05.554369000 +0400
++++ contrib/client-side/asvn	2009-04-29 15:41:48.000000000 +0400
+@@ -42,7 +42,7 @@
+ # $LastChangedBy: blair $
+ # $LastChangedRevision: 29065 $
+ 
+-SVN=/usr/bin/svn
++SVN=/usr/local/bin/svn
+ ACTION=""
+ DEV_PROP="dir:devices"
+ SYM_PROP="dir:symlinks"
 @@ -52,7 +52,7 @@
  TMPFILE2=/tmp/asvn.tmp2.$$
  PCWD=`/bin/pwd`
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 09e9cbf2463a..565b6f583679 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -54,64 +54,64 @@ include/subversion-1/svn_xml.h
 @dirrm include/subversion-1
 lib/libsvn_client-1.a
 lib/libsvn_client-1.la
-lib/libsvn_client-1.so
-lib/libsvn_client-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_client-1.so.0
 lib/libsvn_delta-1.a
 lib/libsvn_delta-1.la
-lib/libsvn_delta-1.so
-lib/libsvn_delta-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_delta-1.so.0
 lib/libsvn_diff-1.a
 lib/libsvn_diff-1.la
-lib/libsvn_diff-1.so
-lib/libsvn_diff-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_diff-1.so.0
 lib/libsvn_fs-1.a
 lib/libsvn_fs-1.la
-lib/libsvn_fs-1.so
-lib/libsvn_fs-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_fs-1.so.0
 %%BDB%%lib/libsvn_fs_base-1.a
 %%BDB%%lib/libsvn_fs_base-1.la
-%%BDB%%lib/libsvn_fs_base-1.so
-%%BDB%%lib/libsvn_fs_base-1.so.0
+%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so
+%%DYNAMIC_ENABLED%%%%BDB%%lib/libsvn_fs_base-1.so.0
 lib/libsvn_fs_fs-1.a
 lib/libsvn_fs_fs-1.la
-lib/libsvn_fs_fs-1.so
-lib/libsvn_fs_fs-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_fs_fs-1.so.0
 lib/libsvn_fs_util-1.a
 lib/libsvn_fs_util-1.la
-lib/libsvn_fs_util-1.so
-lib/libsvn_fs_util-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_fs_util-1.so.0
 lib/libsvn_ra-1.a
 lib/libsvn_ra-1.la
-lib/libsvn_ra-1.so
-lib/libsvn_ra-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_ra-1.so.0
 %%NEON%%lib/libsvn_ra_neon-1.a
 %%NEON%%lib/libsvn_ra_neon-1.la
-%%NEON%%lib/libsvn_ra_neon-1.so
-%%NEON%%lib/libsvn_ra_neon-1.so.0
+%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
+%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
 lib/libsvn_ra_local-1.a
 lib/libsvn_ra_local-1.la
-lib/libsvn_ra_local-1.so
-lib/libsvn_ra_local-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
 lib/libsvn_ra_svn-1.a
 lib/libsvn_ra_svn-1.la
-lib/libsvn_ra_svn-1.so
-lib/libsvn_ra_svn-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so.0
 lib/libsvn_repos-1.a
 lib/libsvn_repos-1.la
-lib/libsvn_repos-1.so
-lib/libsvn_repos-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_repos-1.so.0
 %%SERF%%lib/libsvn_ra_serf-1.a
 %%SERF%%lib/libsvn_ra_serf-1.la
-%%SERF%%lib/libsvn_ra_serf-1.so
-%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
 lib/libsvn_subr-1.a
 lib/libsvn_subr-1.la
-lib/libsvn_subr-1.so
-lib/libsvn_subr-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so.0
 lib/libsvn_wc-1.a
 lib/libsvn_wc-1.la
-lib/libsvn_wc-1.so
-lib/libsvn_wc-1.so.0
+%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
+%%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
@@ -291,6 +291,7 @@ lib/libsvn_wc-1.so.0
 %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav libexec/%%APACHEDIR%%/mod_dav.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dav_svn libexec/%%APACHEDIR%%/mod_dav_svn.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n authz_svn libexec/%%APACHEDIR%%/mod_authz_svn.so
 %%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so
 %%MOD_DONTDOTHAT%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/%%APACHEMODDIR%% -a -n dontdothat libexec/%%APACHEDIR%%/mod_dontdothat.so
 %%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images