- adopt new ${opt}_ syntax

- move pkg-deinstall code to pkg-plist
- cleaner way to install tools

4 files changed, 281 insertions, 404 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 0f2e8adbadcc..8a3b75969314 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -15,26 +15,46 @@ MAN8=		svnserve.8
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS INSTALL README
 
-OPTIONS_DEFINE=	BDB BOOK DOCS GNOME_KEYRING KDE_KWALLET \
-		MAINTAINER_DEBUG MOD_DAV_SVN NLS P4_STYLE_MARKERS \
-		FREEBSD_TEMPLATE SASL SERF STATIC SVNSERVE_WRAPPER \
-		TEST TOOLS
-
-OPTIONS_DEFAULT=P4_STYLE_MARKERS FREEBSD_TEMPLATE SERF
+OPTIONS_DEFINE=	\
+		BDB		\
+		BOOK		\
+		DOCS		\
+		FREEBSD_TEMPLATE\
+		GNOME_KEYRING	\
+		KDE_KWALLET	\
+		MAINTAINER_DEBUG\
+		MOD_DAV_SVN	\
+		NLS		\
+		P4_STYLE_MARKERS\
+		SASL		\
+		SERF		\
+		STATIC		\
+		SVNSERVE_WRAPPER\
+		TEST		\
+		TOOLS
+
+OPTIONS_DEFAULT=P4_STYLE_MARKERS \
+		FREEBSD_TEMPLATE \
+		SERF
 
 BOOK_DESC=		Install the Subversion Book
+FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
 GNOME_KEYRING_DESC=	Build with GNOME Keyring auth support
 KDE_KWALLET_DESC=	Build with KDE KWallet auth support
 MAINTAINER_DEBUG_DESC=	Build debug version
 MOD_DAV_SVN_DESC=	mod_dav_svn module for Apache 2.X
 P4_STYLE_MARKERS_DESC=	Perforce-style conflict markers
-FREEBSD_TEMPLATE_DESC=	FreeBSD Project log template
 SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
 STATIC_DESC=		Build static version (no shared libs)
 SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
 TEST_DESC=		Run subversion test suite
 TOOLS_DESC=		Install several tools (svnauthz-validate and mod_dontdothat are among them)
 
+# Patches required for use with the FreeBSD Project repository only
+P4_STYLE_MARKERS_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-3way-conflict-markers
+FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
+SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
+
 NO_STAGE=	yes
 .include "Makefile.common"
 
@@ -43,90 +63,63 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
-SUB_FILES=	pkg-install \
-		pkg-deinstall
+SUB_FILES=	pkg-install
 
 BOOK_VERSION=	4515
 
-.if make(repository)
-WITH_REPOSITORY_CREATION=	yes
-.endif
-
-.if defined(WITH_REPOSITORY_CREATION)
-MKREPOS_TARGET=	_mkrepos
-.endif
-
-# Patches required for use with the FreeBSD Project repository only
-.if ${PORT_OPTIONS:MP4_STYLE_MARKERS}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-3way-conflict-markers
-.endif
-.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-fbsd-template
+.if !${PORT_OPTIONS:MMAINTAINER_DEBUG}
+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
 .endif
 
-.if empty(PORT_OPTIONS:MMAINTAINER_DEBUG)
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
+.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK}
+BOOK_HTML=	svn-book-html-r${BOOK_VERSION}.tar.bz2
+BOOK_PDF=	svn-book-r${BOOK_VERSION}.pdf
+DISTFILES+=	${BOOK_HTML}:book ${BOOK_PDF}:book
 .endif
 
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
-PLIST_SUB+=	SVNSERVE_WRAPPER=""
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-svnserve-wrapper
 .else
-PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
 SUB_LIST+=	SVNSERVE_BIN_EXT=""
 .endif
 
-.if ${PORT_OPTIONS:MTOOLS}
-PLIST_SUB+=	TOOLS=""
-.else
-PLIST_SUB+=	TOOLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS} && ${PORT_OPTIONS:MBOOK}
-BOOK_HTML=	svn-book-html-r${BOOK_VERSION}.tar.bz2
-BOOK_PDF=	svn-book-r${BOOK_VERSION}.pdf
-DISTFILES+=	${BOOK_HTML}:book ${BOOK_PDF}:book
-PLIST_SUB+=	BOOK=""
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
+SUB_LIST+=	MOD_DAV_SVN_INSTALL="YES"
+PLIST_SUB+=	SED=${SED}
+SVNGROUP?=	www
+SVNUSER?=	www
 .else
-PLIST_SUB+=	BOOK="@comment "
+SUB_LIST+=	MOD_DAV_SVN_INSTALL="NO"
+SVNGROUP?=	svn
+SVNUSER?=	svn
 .endif
 
-# testsuite will fail until PR156076 is committed
 .if ${PORT_OPTIONS:MTEST}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 .endif
 
-#.if ${PORT_OPTIONS:MASVN}
-#RUN_DEPENDS+=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils
-#PLIST_SUB+=	ASVN=""
-#.else
-PLIST_SUB+=	ASVN="@comment "
-#.endif
-
-SCRIPTS=
-
-SCRIPTS_DATA=
-
 .if ${PORT_OPTIONS:MSTATIC}
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext:build
-.endif
-.if ${PORT_OPTIONS:MBDB}
+.  if ${PORT_OPTIONS:MNLS}
+USES+=			gettext:build
+.  endif
+.  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
-.endif
+.  endif
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
 LIB_DEPENDS=
+PLIST_SUB+=		DYNAMIC_ENABLED="@comment "
+.else
+PLIST_SUB+=		DYNAMIC_ENABLED=""
+.endif
+
+.if make(repository)
+WITH_REPOSITORY_CREATION=	yes
 .endif
 
-TOOLS_STATIC_BINARIES=	client-side/svn-bench/svn-bench server-side/svnauthz \
-			server-side/fsfs-stats \
-			server-side/svn-populate-node-origins-index \
-			server-side/svnauthz-validate \
-			server-side/svn-rep-sharing-stats dev/fsfs-reorg \
-			dev/svnraisetreeconflict/svnraisetreeconflict \
-			dev/fsfs-access-map diff/diff3 diff/diff diff/diff4
+.if defined(WITH_REPOSITORY_CREATION)
+MKREPOS_TARGET=	_mkrepos
+.endif
 
 pre-everything::
 	@${ECHO_MSG} ""
@@ -179,42 +172,39 @@ pre-everything::
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
+
 	@${ECHO_MSG} ""
 .if !defined(NOPORTDOCS) && ${PORT_OPTIONS:MBOOK}
 	@${ECHO_MSG} "Subversion Book will be installed."
 	@${ECHO_MSG} ""
 .endif
-#.if ${PORT_OPTIONS:MASVN}
-#	@${ECHO_MSG} "asvn will be installed"
-#	@${ECHO_MSG} ""
-#.endif
 .if ${PORT_OPTIONS:MSTATIC}
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
+.  if ${PORT_OPTIONS:MMOD_DAV_SVN}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! mod_dav_svn and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
-.endif
-.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
+.  endif
+.  if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! svnauthz_validate and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
-.endif
-.if ${PORT_OPTIONS:MGNOME_KEYRING}
+.  endif
+.  if ${PORT_OPTIONS:MGNOME_KEYRING}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! Gnome Keyring and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
-.endif
-.if ${PORT_OPTIONS:MKDE_WALLET}
+.  endif
+.  if ${PORT_OPTIONS:MKDE_WALLET}
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${ECHO_MSG} "!!! KDE Wallet and static build are not compatible !!!"
 	@${ECHO_MSG} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 	@${FALSE}
-.endif
+.  endif
 	@${ECHO_MSG} "Static binaries will be built."
-.endif
+.endif # STATIC
 	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}"
 
 pre-configure:
@@ -231,7 +221,7 @@ pre-configure:
 	fi
 .endif
 .if ${PORT_OPTIONS:MSTATIC}
-	@if grep -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \
+	@if ${GREP} -q icui18n ${LOCALBASE}/lib/libsqlite3.la ; then \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "You can not build static subversion if your SQLite3 is built with ICU enabled."; \
 		${ECHO_MSG} "Please, reinstall 'devel/sqlite3' port with disabled ICU support."; \
@@ -240,13 +230,22 @@ pre-configure:
 	fi
 .endif
 
+post-configure:
+# ugly hack: save tools directory so we don't have to cleanup before installing
+	@${CP} -R ${WRKSRC}/tools ${WRKSRC}/tools.examples
+	@${CHMOD} -R a-st,o+rX ${WRKSRC}/tools.examples
+
 # takes a long time, and will fail but gives maintainer a good oversight
 .if ${PORT_OPTIONS:MTEST}
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 test: build
 	-@make check -C ${WRKSRC}
 .endif
 
+post-build:
+.if ${PORT_OPTIONS:MTOOLS}
+	@${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS}
+.endif
+
 pre-install:
 .if ${PORT_OPTIONS:MMOD_DAV_SVN}
 # activate dav_module now in pkg-install to prevent double activation.
@@ -256,42 +255,34 @@ pre-install:
 
 post-install:	${MKREPOS_TARGET}
 .if ${PORT_OPTIONS:MTOOLS}
-	cd ${WRKSRC} && ${MAKE} install-tools
-.endif
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
-	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so
-	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
-.if ${PORT_OPTIONS:MTOOLS}
-	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
-.endif
+	@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
 .endif
+
 	@${MKDIR} ${DATADIR}
-.if ${PORT_OPTIONS:MSTATIC}
-	cd ${WRKSRC}/tools ; \
-	  ${RM} ${TOOLS_STATIC_BINARIES}
-.endif
-	cd ${WRKSRC}/tools ; \
-	  ${TAR} --exclude '*.in' --exclude '.libs' --exclude '*.o' --exclude '*.lo' --exclude '*.la' --exclude='*.slo' -cf - * | ${TAR} -C ${DATADIR} -xf -
-# ugly hack to remove libtool scripts ...
-	@${GREP} -R ${WRKSRC} ${DATADIR} | ${CUT} -d\: -f 1 | ${XARGS} ${RM} -f
-	@${CHMOD} -R a-st,o+rX ${DATADIR}
-.if !defined(NOPORTDOCS)
+	@(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${DATADIR} -xof - )
+
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-	for f in ${TXT_DOCS}; do \
-	  ${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
-	done
-.if ${PORT_OPTIONS:MBOOK}
+	${INSTALL_MAN} ${TXT_DOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.  if ${PORT_OPTIONS:MBOOK}
 	${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR}
 	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}/svn-book.pdf
+.  endif
 .endif
-.endif
-.if ${PORT_OPTIONS:MASVN}
-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
-.endif
+
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${PREFIX}/bin/svnserve
 .endif
 
+.if ${PORT_OPTIONS:MMOD_DAV_SVN}
+	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dav_svn ${PREFIX}/${APACHEMODDIR}/mod_dav_svn.so
+	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
+.  if ${PORT_OPTIONS:MTOOLS}
+	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
+.  endif
+.endif
+
+# ===============================================================================
 repository:	_mkrepos
 
 _SVNGRPFILES=	db locks locks/db.lock locks/db-logs.lock
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 41ac9d8ec903..8227fcd20d2e 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -20,7 +20,8 @@ LICENSE=	AL2
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]*
 
-LIB_DEPENDS+=		libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
+LIB_DEPENDS+=		libapr-1.so:${PORTSDIR}/devel/apr1 \
+			libsqlite3.so:${PORTSDIR}/databases/sqlite3 \
 			libexpat.so:${PORTSDIR}/textproc/expat2
 
 CONFIGURE_ARGS+=	--without-swig \
@@ -34,112 +35,66 @@ OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}/options
 OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
 .endif
 
-.include <bsd.port.options.mk>
+# ===============================================================
+OPTIONS_SUB=			yes
 
-.if ${PORT_OPTIONS:MSASL}
-LIB_DEPENDS+=	libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
-CONFIGURE_ARGS+=--with-sasl=${LOCALBASE}
-PLIST_SUB+=	SASL=""
-.else
-CONFIGURE_ARGS+=--without-sasl
-PLIST_SUB+=	SASL="@comment "
-.endif
+BDB_CONFIGURE_OFF=		--without-berkeley-db
+BDB_USE=			BDB=42+
 
-# Default is "on"
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=	42+
-PLIST_SUB+=	BDB=""
-.else
-CONFIGURE_ARGS+=--without-berkeley-db
-PLIST_SUB+=	BDB="@comment "
-.endif
+GNOME_KEYRING_CONFIGURE_OFF=	--without-gnome-keyring
+GNOME_KEYRING_CONFIGURE_ON=	--with-gnome-keyring
+GNOME_KEYRING_LIB_DEPENDS=	libgcr.so:${PORTSDIR}/security/gnome-keyring
 
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
-USE_APACHE=   22+
-CONFIGURE_ARGS+=--with-apxs=${APXS} --with-apache-libexecdir
-PLIST_SUB+=	MOD_DAV_SVN=""
-SUB_LIST+=	MOD_DAV_SVN_INSTALL="YES"
-SVNGROUP?=	www
-SVNUSER?=	www
-.else
-CONFIGURE_ARGS+=--with-apxs=no
-PLIST_SUB+=	MOD_DAV_SVN="@comment "
-SUB_LIST+=	MOD_DAV_SVN_INSTALL="NO"
-SVNGROUP?=	svn
-SVNUSER?=	svn
-.endif
+KDE_KWALLET_CONFIGURE_OFF=	--without-kwallet
+KDE_KWALLET_CONFIGURE_ON=	--with-kwallet=${KDE4_PREFIX}
+KDE_KWALLET_USE=		KDE4=kdelibs runtime
 
-LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
-APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
-APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
+MAINTAINER_DEBUG_CFLAGS=	-g
+MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug
 
-CONFIGURE_ARGS+=  --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
+MOD_DAV_SVN_CONFIGURE_OFF=	--with-apxs=no
+MOD_DAV_SVN_CONFIGURE_ON=	--with-apxs=${APXS} --with-apache-libexecdir
+MOD_DAV_SVN_USE=		APACHE=22+
 
-.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
-APR_INCLUDE_DIR!=	${APR_CONFIG} --includedir
-PLIST_SUB+=     SVNAUTHZ_VALIDATE=""
-.else
-PLIST_SUB+=     SVNAUTHZ_VALIDATE="@comment "
-.endif
+NLS_CONFIGURE_OFF=		--disable-nls
+NLS_USES=			gettext
 
-.if ${PORT_OPTIONS:MSERF}
-LIB_DEPENDS+=	libserf-1.so:${PORTSDIR}/www/serf
-CONFIGURE_ARGS+=--with-serf=${LOCALBASE}
-PLIST_SUB+=	SERF=""
-.else
-CONFIGURE_ARGS+=--without-serf
-PLIST_SUB+=	SERF="@comment "
-.endif
+SASL_CONFIGURE_OFF=		--without-sasl
+SASL_CONFIGURE_ON=		--with-sasl=${LOCALBASE}
+SASL_LIB_DEPENDS=		libsasl2.so:${PORTSDIR}/security/cyrus-sasl2
 
-.if defined(SVN_BUILD_BINDINGS)
-LIB_DEPENDS+=	libsvn_client-1.so:${PORTSDIR}/devel/subversion
-.endif
+SERF_CONFIGURE_OFF=		--without-serf
+SERF_CONFIGURE_ON=		--with-serf=${LOCALBASE}
+SERF_LIB_DEPENDS=		libserf-1.so:${PORTSDIR}/www/serf
 
-# KWallet requires NLS to be enabled.
-.if ${PORT_OPTIONS:MNLS} || ${PORT_OPTIONS:MKDE_KWALLET}
-USES+=	gettext
-PLIST_SUB+=	WITHOUT_GETTEXT=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	WITHOUT_GETTEXT="@comment "
-.endif
+STATIC_CONFIGURE_ON=		--enable-all-static
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fpic -DPIC
-.endif
+# ===============================================================
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug
-CFLAGS+=	-g
+.if ${PORT_OPTIONS:MBOOK} && !${PORT_OPTIONS:MDOCS}
+IGNORE=	SVN book requires OPTION DOCS set to ON
 .endif
 
-.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION)
-CFLAGS+= -DHAS_ORGANIZATION_NAME
+.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && !${PORT_OPTIONS:MMOD_DAV_SVN}
+IGNORE=	to build mod_dontdothat OPTION mod_dav_svn is required
 .endif
 
-.if ${PORT_OPTIONS:MSTATIC}
-CONFIGURE_ARGS+=--enable-all-static
-PLIST_SUB+=	DYNAMIC_ENABLED="@comment "
-.else
-PLIST_SUB+=	DYNAMIC_ENABLED=""
+.if ${PORT_OPTIONS:MKDE_KWALLET} && !${PORT_OPTIONS:MNLS}
+IGNORE= KWallet requires OPTION NLS set to ON
 .endif
 
-.if ${PORT_OPTIONS:MGNOME_KEYRING}
-LIB_DEPENDS+=	libgcr.so:${PORTSDIR}/security/gnome-keyring
-CONFIGURE_ARGS+=--with-gnome-keyring
-PLIST_SUB+=	GNOME_KEYRING=""
-.else
-CONFIGURE_ARGS+=--without-gnome-keyring
-PLIST_SUB+=	GNOME_KEYRING="@comment "
+APR_CONFIG=	${LOCALBASE}/bin/apr-1-config
+APU_CONFIG=	${LOCALBASE}/bin/apu-1-config
+
+CONFIGURE_ARGS+=--with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
+
+.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
+CFLAGS+=	-fpic -DPIC
 .endif
 
-.if ${PORT_OPTIONS:MKDE_KWALLET}
-USE_KDE4=	kdelibs runtime
-CONFIGURE_ARGS+=--with-kwallet=${KDE4_PREFIX}
-PLIST_SUB+=	KDE_KWALLET=""
-.else
-CONFIGURE_ARGS+=--without-kwallet
-PLIST_SUB+=	KDE_KWALLET="@comment "
+.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE} && defined(ORGANIZATION)
+CFLAGS+=	-DHAS_ORGANIZATION_NAME
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/devel/subversion/files/pkg-deinstall.in b/devel/subversion/files/pkg-deinstall.in
deleted file mode 100644
index 52433a41ddad..000000000000
--- a/devel/subversion/files/pkg-deinstall.in
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-#
-# Try to de-activate mod_dav_svn in the installed httpd.conf and warn
-# if this fails.
-#
-# $FreeBSD: /tmp/pcvs/ports/devel/subversion/files/pkg-deinstall.in,v 1.2 2012-02-14 16:06:21 lev Exp $
-#
-
-if [ "%%MOD_DAV_SVN_INSTALL%%" != "YES" ] ; then
-	exit 0
-fi
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-	exit 0
-fi
-
-TMPDIR=${TMPDIR:=/tmp}
-PKG_TMPDIR=${PKG_TMPDIR:=${TMPDIR}}
-
-apxscmd=${PKG_PREFIX}/sbin/apxs
-tmpdir=${PKG_TMPDIR}/deinstmod_dav_svn.$$
-
-if [ ! -x ${apxscmd} ]; then
-	echo Can\'t find the apxs program: ${apxscmd}.
-	exit 1
-fi
-
-confdir=`${apxscmd} -q SYSCONFDIR`
-
-if [ ! -d "${confdir}" ]; then
-	echo Can\'t find Apache conf dir: ${confdir}
-	exit 1
-fi
-
-if [ -f "${confdir}/httpd.conf" ]; then
-	conffile=httpd.conf
-fi
-if [ -f "${confdir}/httpd.conf.default" ]; then
-	conffile="${conffile} httpd.conf.default"
-fi
-if [ -z "${conffile}" ]; then
-	echo Can\'t find either of ${confdir}/httpd.conf or
-	echo ${confdir}/httpd.conf.default.
-	exit 1
-fi
-
-if ! mkdir ${tmpdir}; then
-	echo Can\'t create temporary directory: ${tmpdir}
-	exit 1
-fi
-
-for i in ${conffile}; do
-	echo -n Removing dav_svn_module, authz_svn_module and dontdothat_module from $i in config dir: ${confdir}...
-	awk '{if (!/LoadModule[[:blank:]]+dav_svn_module/    &&
-		  !/LoadModule[[:blank:]]+authz_svn_module/  &&
-		  !/LoadModule[[:blank:]]+dontdothat_module/ )
-	    print $0}' < "${confdir}/$i" > "${tmpdir}/$i"
-	AWKRC=$?
-	diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | sed -e 's/#//g' | grep -Evq "^<[[:blank:]]+LoadModule"
-	GREPRC=$?
-	# last grep should not find anything
-	if [ "x${AWKRC}" = "x0" -a "x${GREPRC}" = "x1"  ] ; then
-		echo " Ok"
-		cat "${tmpdir}/$i" > "${confdir}/$i"
-	else
-		echo " Error! Please, remove these modules manually"
-	fi
-done
-
-rm -rf "${tmpdir}"
-
-exit 0
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index d89df48c5999..fd0ea22344ce 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -1,13 +1,5 @@
 @comment $FreeBSD$
 bin/svn
-bin/svnadmin
-bin/svndumpfilter
-bin/svnlook
-bin/svnmucc
-bin/svnrdump
-bin/svnserve
-bin/svnsync
-%%ASVN%%bin/asvn
 %%TOOLS%%bin/fsfs-access-map
 %%TOOLS%%bin/fsfs-reorg
 %%TOOLS%%bin/fsfs-stats
@@ -17,7 +9,14 @@ bin/svnsync
 %%TOOLS%%bin/svnauthz
 %%TOOLS%%bin/svnauthz-validate
 %%TOOLS%%bin/svnraisetreeconflict
+bin/svnadmin
+bin/svndumpfilter
+bin/svnlook
+bin/svnmucc
+bin/svnrdump
+bin/svnserve
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
+bin/svnsync
 bin/svnversion
 include/subversion-1/mod_authz_svn.h
 include/subversion-1/mod_dav_svn.h
@@ -63,7 +62,6 @@ include/subversion-1/svn_utf.h
 include/subversion-1/svn_version.h
 include/subversion-1/svn_wc.h
 include/subversion-1/svn_xml.h
-@dirrm include/subversion-1
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.a
 %%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.la
 %%DYNAMIC_ENABLED%%%%GNOME_KEYRING%%lib/libsvn_auth_gnome_keyring-1.so
@@ -108,6 +106,10 @@ lib/libsvn_ra_local-1.a
 lib/libsvn_ra_local-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
 %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
+%%SERF%%lib/libsvn_ra_serf-1.a
+%%SERF%%lib/libsvn_ra_serf-1.la
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so
+%%DYNAMIC_ENABLED%%%%SERF%%lib/libsvn_ra_serf-1.so.0
 lib/libsvn_ra_svn-1.a
 lib/libsvn_ra_svn-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
@@ -116,10 +118,6 @@ lib/libsvn_repos-1.a
 lib/libsvn_repos-1.la
 %%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
-%%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
 %%DYNAMIC_ENABLED%%lib/libsvn_subr-1.so
@@ -128,6 +126,16 @@ lib/libsvn_wc-1.a
 lib/libsvn_wc-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so
 %%DYNAMIC_ENABLED%%lib/libsvn_wc-1.so.0
+@comment enable / disable modules in this order: dav_svn, authz_svn, dontdothat
+%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dav_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n dav_svn %D/%F
+%%MOD_DAV_SVN%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+authz_svn_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.so
+%%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -a -n authz_svn %D/%F
+%%MOD_DAV_SVN%%%%TOOLS%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+%%MOD_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so
+%%MOD_DAV_SVN%%%%TOOLS%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
@@ -154,77 +162,18 @@ lib/libsvn_wc-1.la
 %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/styles.css
 %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/svn-book.html
 %%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book.pdf
-%%WITHOUT_GETTEXT%%share/locale/de/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/es/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/fr/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/it/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/ja/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/ko/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/nb/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/pl/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/pt_BR/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/sv/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
-%%WITHOUT_GETTEXT%%share/locale/zh_TW/LC_MESSAGES/subversion.mo
-%%DATADIR%%/client-side/detach.py
-%%DATADIR%%/client-side/mergeinfo-sanitizer.py
-%%DATADIR%%/client-side/svn-bench/cl.h
-%%DATADIR%%/client-side/svn-bench/client_errors.h
-%%DATADIR%%/client-side/svn-bench/help-cmd.c
-%%DATADIR%%/client-side/svn-bench/notify.c
-%%DATADIR%%/client-side/svn-bench/null-export-cmd.c
-%%DATADIR%%/client-side/svn-bench/null-list-cmd.c
-%%DATADIR%%/client-side/svn-bench/null-log-cmd.c
-%%DATADIR%%/client-side/svn-bench/svn-bench.c
-%%DATADIR%%/client-side/svn-bench/util.c
-%%DATADIR%%/dev/aprerr.txt
-%%DATADIR%%/dev/benchmarks/suite1/generate_charts
-%%DATADIR%%/dev/fsfs-access-map.c
-%%DATADIR%%/dev/fsfs-reorg.c
-%%DATADIR%%/dev/gdb-py/README
-%%DATADIR%%/dev/gdb-py/svndbg/__init__.py
-%%DATADIR%%/dev/gdb-py/svndbg/printers.py
-%%DATADIR%%/dev/histogram.py
-%%DATADIR%%/dev/merge-graph.py
-%%DATADIR%%/dev/mergegraph/__init__.py
-%%DATADIR%%/dev/mergegraph/mergegraph.py
-%%DATADIR%%/dev/mergegraph/save_as_sh.py
-%%DATADIR%%/dev/remove-trailing-whitespace.sh
-%%DATADIR%%/dev/sbox-ospath.py
-%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict.c
-%%DATADIR%%/dist/_gnupg.py
-%%DATADIR%%/dist/make-deps-tarball.sh
-%%DATADIR%%/dist/templates/download.ezt
-%%DATADIR%%/dist/templates/stable-news.ezt
-%%DATADIR%%/examples/walk-config-auth.py
-%%DATADIR%%/hook-scripts/control-chars.py
-%%DATADIR%%/hook-scripts/persist-ephemeral-txnprops.py
-%%DATADIR%%/hook-scripts/validate-files.conf.example
-%%DATADIR%%/hook-scripts/validate-files.py
-%%DATADIR%%/server-side/fsfs-stats.c
-%%DATADIR%%/server-side/svnauthz.c
-%%DATADIR%%/server-side/svnpredumpfilter.py
-%%DATADIR%%/server-side/svnpubsub/README.txt
-%%DATADIR%%/server-side/svnpubsub/commit-hook.py
-%%DATADIR%%/server-side/svnpubsub/daemonize.py
-%%DATADIR%%/server-side/svnpubsub/irkerbridge.py
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.debian
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.freebsd
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.solaris
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd
-%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris
-%%DATADIR%%/server-side/svnpubsub/svnpubsub.tac
-%%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py
-%%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py
-%%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py
-%%DATADIR%%/server-side/svnpubsub/svntweet.py
-%%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example
-%%DATADIR%%/server-side/svnpubsub/svnwcsub.py
-%%DATADIR%%/server-side/svnpubsub/testserver.py
-%%DATADIR%%/server-side/svnpubsub/watcher.py
+%%NLS%%share/locale/de/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/es/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/it/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/subversion.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/subversion.mo
 %%DATADIR%%/backup/hot-backup.py
 %%DATADIR%%/bdb/erase-all-text-data.py
 %%DATADIR%%/bdb/skel.py
@@ -232,12 +181,13 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/bdb/svnfs.py
 %%DATADIR%%/bdb/whatis-rep.py
 %%DATADIR%%/buildbot/master/Feeder.py
+%%DATADIR%%/buildbot/master/SVNMailNotifier.py
 %%DATADIR%%/buildbot/master/master.cfg
 %%DATADIR%%/buildbot/master/private-sample.py
 %%DATADIR%%/buildbot/master/public_html/buildbot.css
 %%DATADIR%%/buildbot/master/public_html/index.html
 %%DATADIR%%/buildbot/master/public_html/robots.txt
-%%DATADIR%%/buildbot/master/SVNMailNotifier.py
+%%DATADIR%%/buildbot/slaves/README
 %%DATADIR%%/buildbot/slaves/bb-openbsd/svnbuild.sh
 %%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck-bindings.sh
 %%DATADIR%%/buildbot/slaves/bb-openbsd/svncheck.sh
@@ -253,7 +203,6 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh
 %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh
 %%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c
-%%DATADIR%%/buildbot/slaves/README
 %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnbuild.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svncheck.sh
 %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf/svnclean.sh
@@ -288,17 +237,30 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/client-side/bash_completion
 %%DATADIR%%/client-side/bash_completion_test
 %%DATADIR%%/client-side/change-svn-wc-format.py
+%%DATADIR%%/client-side/detach.py
+%%DATADIR%%/client-side/mergeinfo-sanitizer.py
 %%DATADIR%%/client-side/server-version.py
 %%DATADIR%%/client-side/showchange.pl
+%%DATADIR%%/client-side/svn-bench/cl.h
+%%DATADIR%%/client-side/svn-bench/client_errors.h
+%%DATADIR%%/client-side/svn-bench/help-cmd.c
+%%DATADIR%%/client-side/svn-bench/notify.c
+%%DATADIR%%/client-side/svn-bench/null-export-cmd.c
+%%DATADIR%%/client-side/svn-bench/null-list-cmd.c
+%%DATADIR%%/client-side/svn-bench/null-log-cmd.c
+%%DATADIR%%/client-side/svn-bench/svn-bench.c
+%%DATADIR%%/client-side/svn-bench/util.c
 %%DATADIR%%/client-side/svn-graph.pl
 %%DATADIR%%/client-side/svn-ssl-fingerprints.sh
 %%DATADIR%%/client-side/svn-viewspec.py
 %%DATADIR%%/client-side/wcfind
 %%DATADIR%%/dev/analyze-svnlogs.py
+%%DATADIR%%/dev/aprerr.txt
 %%DATADIR%%/dev/benchmarks/large_dirs/create_bigdir.sh
 %%DATADIR%%/dev/benchmarks/suite1/benchmark.py
 %%DATADIR%%/dev/benchmarks/suite1/cronjob
 %%DATADIR%%/dev/benchmarks/suite1/crontab.entry
+%%DATADIR%%/dev/benchmarks/suite1/generate_charts
 %%DATADIR%%/dev/benchmarks/suite1/run
 %%DATADIR%%/dev/benchmarks/suite1/run.bat
 %%DATADIR%%/dev/check-license.py
@@ -306,11 +268,17 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/dev/datecheck.py
 %%DATADIR%%/dev/find-bad-style.py
 %%DATADIR%%/dev/find-unmoved-deprecated.sh
+%%DATADIR%%/dev/fsfs-access-map.c
+%%DATADIR%%/dev/fsfs-reorg.c
+%%DATADIR%%/dev/gdb-py/README
+%%DATADIR%%/dev/gdb-py/svndbg/__init__.py
+%%DATADIR%%/dev/gdb-py/svndbg/printers.py
 %%DATADIR%%/dev/gen-javahl-errors.py
 %%DATADIR%%/dev/gen-py-errors.py
 %%DATADIR%%/dev/gen_junit_report.py
 %%DATADIR%%/dev/gnuify-changelog.pl
 %%DATADIR%%/dev/graph-dav-servers.py
+%%DATADIR%%/dev/histogram.py
 %%DATADIR%%/dev/iz/defect.dem
 %%DATADIR%%/dev/iz/ff2csv.command
 %%DATADIR%%/dev/iz/ff2csv.py
@@ -318,6 +286,10 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/dev/iz/run-queries.sh
 %%DATADIR%%/dev/lock-check.py
 %%DATADIR%%/dev/log_revnum_change_asf.py
+%%DATADIR%%/dev/merge-graph.py
+%%DATADIR%%/dev/mergegraph/__init__.py
+%%DATADIR%%/dev/mergegraph/mergegraph.py
+%%DATADIR%%/dev/mergegraph/save_as_sh.py
 %%DATADIR%%/dev/min-includes.sh
 %%DATADIR%%/dev/mklog.py
 %%DATADIR%%/dev/mlpatch.py
@@ -325,6 +297,8 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/dev/po-merge.py
 %%DATADIR%%/dev/prebuild-cleanup.sh
 %%DATADIR%%/dev/random-commits.py
+%%DATADIR%%/dev/remove-trailing-whitespace.sh
+%%DATADIR%%/dev/sbox-ospath.py
 %%DATADIR%%/dev/scramble-tree.py
 %%DATADIR%%/dev/stress.pl
 %%DATADIR%%/dev/svn-dev.el
@@ -332,6 +306,7 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/dev/svn-entries.el
 %%DATADIR%%/dev/svn-merge-revs.py
 %%DATADIR%%/dev/svnqlite3-dump
+%%DATADIR%%/dev/svnraisetreeconflict/svnraisetreeconflict.c
 %%DATADIR%%/dev/trails.py
 %%DATADIR%%/dev/unix-build/Makefile.svn
 %%DATADIR%%/dev/unix-build/README
@@ -344,39 +319,43 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/dev/wc-ng/graph-data.py
 %%DATADIR%%/dev/wc-ng/populate-pristine.py
 %%DATADIR%%/dev/which-error.py
-%%DATADIR%%/dev/windows-build/document-version.pl
 %%DATADIR%%/dev/windows-build/Makefile
 %%DATADIR%%/dev/windows-build/README
+%%DATADIR%%/dev/windows-build/document-version.pl
 %%DATADIR%%/diff/diff.c
 %%DATADIR%%/diff/diff3.c
 %%DATADIR%%/diff/diff4.c
+%%DATADIR%%/dist/_gnupg.py
 %%DATADIR%%/dist/backport.pl
 %%DATADIR%%/dist/checksums.py
 %%DATADIR%%/dist/collect_sigs.py
 %%DATADIR%%/dist/dist.sh
 %%DATADIR%%/dist/download-release.sh
 %%DATADIR%%/dist/extract-for-examination.sh
+%%DATADIR%%/dist/make-deps-tarball.sh
 %%DATADIR%%/dist/nightly.sh
 %%DATADIR%%/dist/rat-excludes
 %%DATADIR%%/dist/release.py
+%%DATADIR%%/dist/templates/download.ezt
 %%DATADIR%%/dist/templates/nightly-candidates.ezt
 %%DATADIR%%/dist/templates/rc-news.ezt
 %%DATADIR%%/dist/templates/rc-release-ann.ezt
+%%DATADIR%%/dist/templates/stable-news.ezt
 %%DATADIR%%/dist/templates/stable-release-ann.ezt
 %%DATADIR%%/dist/test.sh
+%%DATADIR%%/examples/SvnCLBrowse
 %%DATADIR%%/examples/blame.py
 %%DATADIR%%/examples/check-modified.py
 %%DATADIR%%/examples/dumpprops.py
-%%DATADIR%%/examples/info.rb
 %%DATADIR%%/examples/get-location-segments.py
 %%DATADIR%%/examples/getfile.py
 %%DATADIR%%/examples/getlocks_test.c
 %%DATADIR%%/examples/geturl.py
 %%DATADIR%%/examples/headrev.c
+%%DATADIR%%/examples/info.rb
 %%DATADIR%%/examples/minimal_client.c
 %%DATADIR%%/examples/putfile.py
 %%DATADIR%%/examples/revplist.py
-%%DATADIR%%/examples/SvnCLBrowse
 %%DATADIR%%/examples/svnlog2html.rb
 %%DATADIR%%/examples/svnlook.py
 %%DATADIR%%/examples/svnlook.rb
@@ -385,9 +364,11 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/examples/svnshell.py
 %%DATADIR%%/examples/svnshell.rb
 %%DATADIR%%/examples/testwrite.c
+%%DATADIR%%/examples/walk-config-auth.py
 %%DATADIR%%/hook-scripts/commit-access-control.cfg.example
 %%DATADIR%%/hook-scripts/commit-access-control.pl
 %%DATADIR%%/hook-scripts/commit-email.rb
+%%DATADIR%%/hook-scripts/control-chars.py
 %%DATADIR%%/hook-scripts/log-police.py
 %%DATADIR%%/hook-scripts/mailer/mailer.conf.example
 %%DATADIR%%/hook-scripts/mailer/mailer.py
@@ -396,74 +377,96 @@ lib/libsvn_wc-1.la
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py
 %%DATADIR%%/hook-scripts/mailer/tests/mailer.conf
+%%DATADIR%%/hook-scripts/persist-ephemeral-txnprops.py
 %%DATADIR%%/hook-scripts/svn2feed.py
 %%DATADIR%%/hook-scripts/svnperms.conf.example
 %%DATADIR%%/hook-scripts/svnperms.py
 %%DATADIR%%/hook-scripts/validate-extensions.py
+%%DATADIR%%/hook-scripts/validate-files.conf.example
+%%DATADIR%%/hook-scripts/validate-files.py
 %%DATADIR%%/hook-scripts/verify-po.py
 %%DATADIR%%/po/l10n-report.py
 %%DATADIR%%/po/po-update.sh
+%%DATADIR%%/server-side/fsfs-reshard.py
+%%DATADIR%%/server-side/fsfs-stats.c
 %%DATADIR%%/server-side/mod_dontdothat/README
 %%DATADIR%%/server-side/mod_dontdothat/mod_dontdothat.c
-%%DATADIR%%/server-side/fsfs-reshard.py
 %%DATADIR%%/server-side/svn-backup-dumps.py
 %%DATADIR%%/server-side/svn-populate-node-origins-index.c
 %%DATADIR%%/server-side/svn-rep-sharing-stats.c
 %%DATADIR%%/server-side/svn_server_log_parse.py
+%%DATADIR%%/server-side/svnauthz.c
+%%DATADIR%%/server-side/svnpredumpfilter.py
+%%DATADIR%%/server-side/svnpubsub/README.txt
+%%DATADIR%%/server-side/svnpubsub/commit-hook.py
+%%DATADIR%%/server-side/svnpubsub/daemonize.py
+%%DATADIR%%/server-side/svnpubsub/irkerbridge.py
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.debian
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.freebsd
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnpubsub.solaris
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.debian
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.freebsd
+%%DATADIR%%/server-side/svnpubsub/rc.d/svnwcsub.solaris
+%%DATADIR%%/server-side/svnpubsub/svnpubsub.tac
+%%DATADIR%%/server-side/svnpubsub/svnpubsub/__init__.py
+%%DATADIR%%/server-side/svnpubsub/svnpubsub/client.py
+%%DATADIR%%/server-side/svnpubsub/svnpubsub/server.py
+%%DATADIR%%/server-side/svnpubsub/svntweet.py
+%%DATADIR%%/server-side/svnpubsub/svnwcsub.conf.example
+%%DATADIR%%/server-side/svnpubsub/svnwcsub.py
+%%DATADIR%%/server-side/svnpubsub/testserver.py
+%%DATADIR%%/server-side/svnpubsub/watcher.py
 %%DATADIR%%/server-side/test_svn_server_log_parse.py
 %%DATADIR%%/xslt/svnindex.css
 %%DATADIR%%/xslt/svnindex.xsl
-%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
-%%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_authz_svn.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_DAV_SVN%%%%TOOLS%%%%APACHEMODDIR%%/mod_dontdothat.so
-%%MOD_DAV_SVN%%%%TOOLS%%@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
-%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/backup
-@dirrm %%DATADIR%%/bdb
-@dirrm %%DATADIR%%/buildbot/master/public_html
-@dirrm %%DATADIR%%/buildbot/master
-@dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd
-@dirrm %%DATADIR%%/buildbot/slaves/centos
-@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
-@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared
-@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf
-@dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64
-@dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn
-@dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005
-@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
-@dirrm %%DATADIR%%/buildbot/slaves
-@dirrm %%DATADIR%%/buildbot
-@dirrm %%DATADIR%%/client-side/svn-bench
-@dirrm %%DATADIR%%/client-side
-@dirrm %%DATADIR%%/dev/benchmarks/large_dirs
-@dirrm %%DATADIR%%/dev/benchmarks/suite1
-@dirrm %%DATADIR%%/dev/benchmarks
+@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/server-side/svnpubsub/svnpubsub
+@dirrm %%DATADIR%%/server-side/svnpubsub/rc.d
+@dirrm %%DATADIR%%/server-side/svnpubsub/notes
+@dirrm %%DATADIR%%/server-side/svnpubsub
+@dirrm %%DATADIR%%/server-side/mod_dontdothat
+@dirrm %%DATADIR%%/server-side
+@dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/hook-scripts/mailer/tests
+@dirrm %%DATADIR%%/hook-scripts/mailer
+@dirrm %%DATADIR%%/hook-scripts
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/dist/templates
+@dirrm %%DATADIR%%/dist
+@dirrm %%DATADIR%%/diff
+@dirrm %%DATADIR%%/dev/windows-build
+@dirrm %%DATADIR%%/dev/wc-ng
+@dirrm %%DATADIR%%/dev/unix-build
+@dirrm %%DATADIR%%/dev/svnraisetreeconflict
+@dirrm %%DATADIR%%/dev/mergegraph
 @dirrm %%DATADIR%%/dev/iz
 @dirrm %%DATADIR%%/dev/gdb-py/svndbg
 @dirrm %%DATADIR%%/dev/gdb-py
-@dirrm %%DATADIR%%/dev/mergegraph
-@dirrm %%DATADIR%%/dev/svnraisetreeconflict
-@dirrm %%DATADIR%%/dev/unix-build
-@dirrm %%DATADIR%%/dev/wc-ng
-@dirrm %%DATADIR%%/dev/windows-build
+@dirrm %%DATADIR%%/dev/benchmarks/suite1
+@dirrm %%DATADIR%%/dev/benchmarks/large_dirs
+@dirrm %%DATADIR%%/dev/benchmarks
 @dirrm %%DATADIR%%/dev
-@dirrm %%DATADIR%%/diff
-@dirrm %%DATADIR%%/dist/templates
-@dirrm %%DATADIR%%/dist
-@dirrm %%DATADIR%%/examples
-@dirrm %%DATADIR%%/hook-scripts/mailer/tests
-@dirrm %%DATADIR%%/hook-scripts/mailer
-@dirrm %%DATADIR%%/hook-scripts
-@dirrm %%DATADIR%%/po
-@dirrm %%DATADIR%%/server-side/mod_dontdothat
-@dirrm %%DATADIR%%/server-side/svnpubsub/notes
-@dirrm %%DATADIR%%/server-side/svnpubsub/rc.d
-@dirrm %%DATADIR%%/server-side/svnpubsub/svnpubsub
-@dirrm %%DATADIR%%/server-side/svnpubsub
-@dirrm %%DATADIR%%/server-side
-@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/client-side/svn-bench
+@dirrm %%DATADIR%%/client-side
+@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
+@dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005
+@dirrm %%DATADIR%%/buildbot/slaves/win32-SharpSvn
+@dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64
+@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared-daily-ra_serf
+@dirrm %%DATADIR%%/buildbot/slaves/svn-x64-macosx-gnu-shared
+@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
+@dirrm %%DATADIR%%/buildbot/slaves/centos
+@dirrm %%DATADIR%%/buildbot/slaves/bb-openbsd
+@dirrm %%DATADIR%%/buildbot/slaves
+@dirrm %%DATADIR%%/buildbot/master/public_html
+@dirrm %%DATADIR%%/buildbot/master
+@dirrm %%DATADIR%%/buildbot
+@dirrm %%DATADIR%%/bdb
+@dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%
+%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html/images
+%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/subversion-1