- add stage support

- BOOK is now own port

Approved by:	lev@ (explicit)

7 files changed, 250 insertions, 415 deletions

diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 0b07cc22995f..1b92fc744863 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -4,135 +4,103 @@
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	Version control system
 
-CONFLICTS_INSTALL=	subversion-1.[7|8].[0-9]*
+CONFLICTS_INSTALL=	subversion-1.[^6].[0-9]* \
+			subversion1[^6]-1.[^6].[0-9]*
 
 USE_RC_SUBR=	svnserve
 
-MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnsync.1 \
-		svnversion.1
-MAN5=		svnserve.conf.5
-MAN8=		svnserve.8
+PORTDOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
+
+OPTIONS_DEFINE=	ASVN		\
+		BDB		\
+		DOCS		\
+		ENHANCED_KEYWORD\
+		FREEBSD_TEMPLATE\
+		GNOME_KEYRING	\
+		KDE_KWALLET	\
+		MAINTAINER_DEBUG\
+		MOD_DAV_SVN	\
+		MOD_DONTDOTHAT	\
+		NLS		\
+		NEON		\
+		P4_STYLE_MARKERS\
+		SASL		\
+		SERF		\
+		STATIC		\
+		SVNSERVE_WRAPPER\
+		TOOLS
+
+OPTIONS_DEFAULT=P4_STYLE_MARKERS \
+		ENHANCED_KEYWORD \
+		FREEBSD_TEMPLATE \
+		NEON		\
+		BDB
 
-TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
-
-OPTIONS_DEFINE=	P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE MOD_DAV_SVN MOD_DONTDOTHAT \
-		NEON SERF SASL BDB ASVN MAINTAINER_DEBUG SVNSERVE_WRAPPER SVNAUTHZ_VALIDATE \
-		STATIC GNOME_KEYRING KDE_KWALLET BOOK DOCS
-OPTIONS_DEFAULT=	P4_STYLE_MARKERS ENHANCED_KEYWORD FREEBSD_TEMPLATE NEON BDB
-P4_STYLE_MARKERS_DESC=	Perforce-style conflict markers
+ASVN_DESC=		Build and install Archive SVN (asvn)
+BDB_DESC=		Berkeley DB (4 or 5) repository backend (deprected in 1.8.x)
 ENHANCED_KEYWORD_DESC=	Enhanced svn:keyword support
 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
 MOD_DONTDOTHAT_DESC=	mod_dontdothat for Apache 2.X
-NEON_DESC=		WebDAV/Delta-V repo access module (neon)
-SERF_DESC=		WebDAV/Delta-V repo access module (serf)
-SASL_DESC=		SASL2 authorization support
-BDB_DESC=		Berkeley DB (4 or 5) repository backend
-ASVN_DESC=		Build and install Archive SVN (asvn)
-MAINTAINER_DEBUG_DESC=	Build debug version
-SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper
-SVNAUTHZ_VALIDATE_DESC=	install svnauthz-validate
+NEON_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
+P4_STYLE_MARKERS_DESC=	Perforce-style conflict markers
+SERF_DESC=		WebDAV/Delta-V (HTTP/HTTPS) repo access module
 STATIC_DESC=		Build static version (no shared libs)
-GNOME_KEYRING_DESC=	Build with GNOME Keyring auth support
-KDE_KWALLET_DESC=	Build with KDE KWallet auth support
-BOOK_DESC=		Install the Subversion Book
+SVNSERVE_WRAPPER_DESC=	Enable svnserve wrapper (umask setter)
+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
+ENHANCED_KEYWORD_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-enhanced-keyword
+FREEBSD_TEMPLATE_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-fbsd-template
+SVNSERVE_WRAPPER_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-svnserve-wrapper
+
+ASVN_RUN_DEPENDS=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils
 
-NO_STAGE=	yes
 .include "Makefile.common"
 
 SVNREPOS?=	/home/svn/repos
 SVNFSTYPE?=	fsfs
 
-SUB_FILES=	pkg-install \
-		pkg-deinstall
-
-.if make(repository)
-WITH_REPOSITORY_CREATION=	yes
-.endif
-
-.if ${PORT_OPTIONS:MREPOSITORY_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:MENHANCED_KEYWORD}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-enhanced-keyword
-.endif
-.if ${PORT_OPTIONS:MFREEBSD_TEMPLATE}
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-fbsd-template
-.endif
+SUB_FILES=	pkg-install
 
 .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:MDOCS} && ${PORT_OPTIONS:MBOOK}
-BOOK_HTML=	svn-book-html.tar.bz2
-BOOK_PDF=	svn-book.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
 
-.if ${PORT_OPTIONS:MASVN}
-RUN_DEPENDS+=	${LOCALBASE}/bin/gfind:${PORTSDIR}/misc/findutils
-PLIST_SUB+=	ASVN=""
+.if ${PORT_OPTIONS:MSTATIC}
+PLIST_SUB+=	DYNAMIC_ENABLED="@comment "
 .else
-PLIST_SUB+=	ASVN="@comment "
+PLIST_SUB+=	DYNAMIC_ENABLED=""
 .endif
 
-SCRIPTS=
+.if make(repository)
+WITH_REPOSITORY_CREATION=	yes
+.endif
 
-SCRIPTS_DATA=
+.if defined(WITH_REPOSITORY_CREATION)
+MKREPOS_TARGET=	_mkrepos
+.endif
 
 pre-everything::
 	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MNEON}
-	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
-.else
-	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
-.endif
-	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MBDB}
-	@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend enabled."
-.else
-	@${ECHO_MSG} "Berkeley DB (4 or 5) repository backend disabled."
-.endif
-	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-	@${ECHO_MSG} "Build debug version."
-	@${ECHO_MSG} ""
-.endif
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
-	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
-.else
-	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
-.endif
-	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MMOD_DONTDOTHAT} && ${PORT_OPTIONS:MMOD_DAV_SVN}
-	@${ECHO_MSG} "mod_dontdothat module for Apache 2.X enabled."
-.else
-	@${ECHO_MSG} "You can enable the mod_dontdothat module for Apache 2.X"
-.endif
-	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
-	@${ECHO_MSG} "svnserve wrapper enabled."
-	@${ECHO_MSG} ""
-.endif
-.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
-	@${ECHO_MSG} "svnauthz-validate enabled."
-	@${ECHO_MSG} ""
-.endif
-.if ${PORT_OPTIONS:MREPOSITORY_CREATION}
+.if defined(WITH_REPOSITORY_CREATION)
 	@${ECHO_MSG} "I will create (or use, if it exists) '${SVNUSER}' user and '${SVNGROUP}' group."
 	@${ECHO_MSG} "Make sure that all committers are its members."
 	@${ECHO_MSG} ""
@@ -149,42 +117,29 @@ pre-everything::
 	@${ECHO_MSG} "  subdirectories of your repository"
 	@${ECHO_MSG} "* the above subdirectories are writable by this group"
 .endif
+
 	@${ECHO_MSG} ""
-.if ${PORT_OPTIONS:MDOCS} && ${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}
-	@${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:
@@ -192,68 +147,55 @@ pre-configure:
 	@BDB_VERSION=`${APR_APU_DIR}/${APU_CONFIG} --db-version`; \
 	if [ "$${BDB_VERSION}" != "4" -a "$${BDB_VERSION}" != "5" ] ; then \
 		${ECHO_MSG} "" ; \
-		${ECHO_MSG} 'You should build `'"${APR_PORT}' with Berkeley DB (4 or 5) support to use subversion with it." ; \
-		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
+		${ECHO_MSG} 'You should build `'"devel/apr1' with Berkeley DB (4 or 5) support to use subversion with it." ; \
+		${ECHO_MSG} 'Please rebuild `'"devel/apr1' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
 		${ECHO_MSG} "Or you can disable Berkeley DB support. Only 'fs' repository backend will be available." ; \
-		${ECHO_MSG} "To disable Berkeley DB support, define WITHOUT_BDB." ; \
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	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
+
 post-build:
+.if ${PORT_OPTIONS:MTOOLS}
+	@${MAKE} -C ${WRKSRC} tools ${MAKE_ARGS}
+.endif
+
 .if ${PORT_OPTIONS:MMOD_DAV_SVN} && ${PORT_OPTIONS:MMOD_DONTDOTHAT}
 	cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
 		${APXS} -c -I${WRKSRC}/subversion/include -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_subr-1 mod_dontdothat.c
 .endif
-.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
-	# place binary in ${WRKDIR}, else we install it twice
-	cd ${WRKSRC}/tools/server-side && \
-		${CC} svnauthz-validate.c -o ../../svnauthz-validate -I${WRKSRC}/subversion/include -I${APR_INCLUDE_DIR} \
-		-L${WRKSRC}/subversion/libsvn_repos/.libs -L${WRKSRC}/subversion/libsvn_subr/.libs -lsvn_repos-1 -lsvn_subr-1
-.endif
-
-pre-install:
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
-# activate dav_module now in pkg-install to prevent double activation.
-# workaround for apxs bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47397
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-.endif
 
 post-install:	${MKREPOS_TARGET}
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
-	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n authz_svn ${PREFIX}/${APACHEMODDIR}/mod_authz_svn.so
-.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
-	cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
-		${APXS} -i -n dontdothat mod_dontdothat.la
-	${APXS} -e -S LIBEXECDIR=${PREFIX}/${APACHEMODDIR} -a -n dontdothat ${PREFIX}/${APACHEMODDIR}/mod_dontdothat.so
-.endif
-.endif
-.if ${PORT_OPTIONS:MSVNAUTHZ_VALIDATE}
-	${INSTALL_PROGRAM} ${WRKSRC}/svnauthz-validate ${PREFIX}/bin
+.if ${PORT_OPTIONS:MMOD_DAV_SVN} && ${PORT_OPTIONS:MMOD_DONTDOTHAT}
+# install only, activation will be done during installation by pkg-plist
+	(cd ${WRKSRC}/contrib/server-side/mod_dontdothat && \
+		${APXS} -S LIBEXECDIR=${STAGEDIR}${PREFIX}/${APACHEMODDIR} -i -n dontdothat mod_dontdothat.la )
 .endif
-	@${MKDIR} ${DATADIR}
-	cd ${WRKSRC}/tools ; \
-	  ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${DATADIR} -xf -
-	@${CHMOD} -R a-st,o+rX ${DATADIR}
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	for f in ${TXT_DOCS}; do \
-	  ${INSTALL_MAN} ${WRKSRC}/$$f ${DOCSDIR}; \
-	done
-.if ${PORT_OPTIONS:MBOOK}
-	${TAR} -xof ${DISTDIR}/${DIST_SUBDIR}/${BOOK_HTML} -C ${DOCSDIR}
-	${INSTALL_MAN} ${DISTDIR}/${DIST_SUBDIR}/${BOOK_PDF} ${DOCSDIR}
+
+.if ${PORT_OPTIONS:MTOOLS}
+	@${MAKE} -C ${WRKSRC} install-tools ${MAKE_ARGS}
 .endif
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/tools.examples && ${TAR} --exclude '*.in' -cf - * | ${TAR} -C ${STAGEDIR}${DATADIR} -xof - )
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
+	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve
 .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
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${STAGEDIR}${PREFIX}/bin
 .endif
 
+# ===============================================================================
 repository:	_mkrepos
 
 _SVNGRPFILES=	db locks locks/db.lock locks/db-logs.lock
diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common
index 40c70a5709bc..991f8eec5075 100644
--- a/devel/subversion16/Makefile.common
+++ b/devel/subversion16/Makefile.common
@@ -5,149 +5,96 @@ PORTNAME=	subversion
 PORTVERSION=	#please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync.
 PORTREVISION?=	2
 CATEGORIES+=	devel
-MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/en/1.5/:book
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
+MASTER_SITES=	http://subversion.tigris.org/downloads/
 DIST_SUBDIR=	subversion
+
 EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_KDE4=	# Used below if KWallet support is enabled
+USES=		pkgconfig
 
 LICENSE=	AL2
 
-CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[7|8].[0-9]*
+CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^6].[0-9]*
+
 LATEST_LINK=		${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX}
 
-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+=	--with-ssl \
-			--without-swig \
+CONFIGURE_ARGS+=	--without-swig \
+			--with-ssl \
 			--with-sqlite=${LOCALBASE} \
-			--with-expat=/usr/local/include:/usr/local/lib:expat
+			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 .if defined(SVN_BUILD_BINDINGS)
-CONFLICTS_BUILD+=	${PORTNAME}-1.[7|8].[0-9]*
+CONFLICTS_BUILD+=	${PORTNAME}-1.[^6].[0-9]*
 LIB_DEPENDS+=		libsvn_client-1.so:${PORTSDIR}/devel/subversion16
 OPTIONSFILE=		${PORT_DBDIR}/${PORTNAME}16/options
 OPTIONS=		# Dirty hack: if OPTIONS is not defined, OPTIONSFILE will not be included
 .endif
 
-.include <bsd.port.options.mk>
-.include "Makefile.inc"
+# ===============================================================
+OPTIONS_SUB=			yes
 
-# Default is "on"
-.if ${PORT_OPTIONS:MNEON}
-LIB_DEPENDS+=	libneon.so:${PORTSDIR}/www/neon29
-PLIST_SUB+=	NEON=""
-.else
-CONFIGURE_ARGS+=--without-neon
-PLIST_SUB+=	NEON="@comment "
-.endif
+BDB_CONFIGURE_OFF=		--without-berkeley-db
+BDB_USE=			BDB=42+
 
-.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
+GNOME_KEYRING_CONFIGURE_OFF=	--without-gnome-keyring
+GNOME_KEYRING_CONFIGURE_ON=	--with-gnome-keyring
+GNOME_KEYRING_LIB_DEPENDS=	libgcr.so:${PORTSDIR}/security/gnome-keyring
 
-# Default is "on"
-.if ${PORT_OPTIONS:MBDB}
-USE_BDB=	42+
-PLIST_SUB+=	BDB=""
-.else
-CONFIGURE_ARGS+=--without-berkeley-db
-PLIST_SUB+=	BDB="@comment "
-.endif
+KDE_KWALLET_CONFIGURE_OFF=	--without-kwallet
+KDE_KWALLET_CONFIGURE_ON=	--with-kwallet=${KDE4_PREFIX}
+KDE_KWALLET_USE=		KDE4=kdelibs runtime
 
-.if ${PORT_OPTIONS:MMOD_DAV_SVN}
-USE_APACHE=   22+
-CONFIGURE_ARGS+=--with-apxs=${APXS}
-PLIST_SUB+=	MOD_DAV_SVN=""
-SUB_LIST+=	MOD_DAV_SVN_INSTALL="YES"
-SVNGROUP?=	www
-SVNUSER?=	www
-.if ${PORT_OPTIONS:MMOD_DONTDOTHAT}
-PLIST_SUB+=	MOD_DONTDOTHAT=""
-.else
-PLIST_SUB+=	MOD_DONTDOTHAT="@comment "
-.endif
-.else
-CONFIGURE_ARGS+=--with-apxs=no
-PLIST_SUB+=	MOD_DAV_SVN="@comment "
-PLIST_SUB+=	MOD_DONTDOTHAT="@comment "
-SUB_LIST+=	MOD_DAV_SVN_INSTALL="NO"
-SVNGROUP?=	svn
-SVNUSER?=	svn
-.endif
+MAINTAINER_DEBUG_CFLAGS=	-g
+MAINTAINER_DEBUG_CONFIGURE_ON=	--enable-maintainer-mode --enable-debug
 
-LIB_DEPENDS+=	libapr-1.so:${PORTSDIR}/devel/apr1
-APR_CONFIG=   ${LOCALBASE}/bin/apr-1-config
-APU_CONFIG=   ${LOCALBASE}/bin/apu-1-config
+MOD_DAV_SVN_CONFIGURE_OFF=	--with-apxs=no
+MOD_DAV_SVN_CONFIGURE_ON=	--with-apxs=${APXS}
+MOD_DAV_SVN_USE=		APACHE=22+
 
-CONFIGURE_ARGS+=  --with-apr=${APR_CONFIG} --with-apr-util=${APU_CONFIG}
+NEON_CONFIGURE_OFF=		--without-neon
+NEON_CONFIGURE_ON=		--with-neon=${LOCALBASE}
+NEON_LIB_DEPENDS=		libneon.so:${PORTSDIR}/www/neon29
 
-.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 ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-PLIST_SUB+=	WITHOUT_GETTEXT=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	WITHOUT_GETTEXT="@comment "
-.endif
+# serf >= 0.7.2 not supported, serf 1.0.0 was committed in r287686
+SERF_CONFIGURE_OFF=		--without-serf
+SERF_CONFIGURE_ON=		--with-serf=${LOCALBASE}
+SERF_LIB_DEPENDS=		libserf-0.so:${PORTSDIR}/www/serf
 
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fpic -DPIC
-.endif
+STATIC_CONFIGURE_ON=		--enable-all-static
 
-.if ${PORT_OPTIONS:MMAINTAINER_DEBUG}
-CONFIGURE_ARGS+=--enable-maintainer-mode --enable-debug
-CFLAGS+=	-g
-.endif
+# ===============================================================
+.include <bsd.port.options.mk>
+.include "Makefile.inc"
 
-.if ${PORT_OPTIONS:MSTATIC}
-CONFIGURE_ARGS+=--enable-all-static
-PLIST_SUB+=	DYNAMIC_ENABLED="@comment "
-.else
-PLIST_SUB+=	DYNAMIC_ENABLED=""
+.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: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 "
+.if ${PORT_OPTIONS:MSERF}
+IGNORE=	port is to old for current serf, please use neon
 .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 "
+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
 
 .include <bsd.port.pre.mk>
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 33cc7d447ea2..64227168d101 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,2 @@
 SHA256 (subversion/subversion-1.6.23.tar.bz2) = 214abc6b9359ea3a5fda2dee87dad110d1b33dcf888c1f8e361d69fbfa053943
 SIZE (subversion/subversion-1.6.23.tar.bz2) = 5566442
-SHA256 (subversion/svn-book-html.tar.bz2) = 5c4788e1f225b3186db5979b071fcc4c9543bfb5916cd62e003eea4507b8c8cb
-SIZE (subversion/svn-book-html.tar.bz2) = 406484
-SHA256 (subversion/svn-book.pdf) = 64e483cd27be6752eb8dfc1b00749f8dc46adfc4fb1ab1356dd8e2406d878225
-SIZE (subversion/svn-book.pdf) = 1671317
diff --git a/devel/subversion16/files/patch-Makefile.in b/devel/subversion16/files/patch-Makefile.in
index 81849c005a3a..e33ebe96d60f 100644
--- a/devel/subversion16/files/patch-Makefile.in
+++ b/devel/subversion16/files/patch-Makefile.in
@@ -1,5 +1,14 @@
---- Makefile.in.orig	2011-04-11 01:50:03.390898319 +0200
-+++ Makefile.in	2011-04-11 01:51:34.081021527 +0200
+--- ./Makefile.in.orig	2010-11-25 18:55:59.000000000 +0100
++++ ./Makefile.in	2013-11-05 22:29:01.000000000 +0100
+@@ -81,7 +81,7 @@
+ swig_pldir = @libdir@/svn-perl
+ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ contribdir = @bindir@/svn-contrib
+-toolsdir = @bindir@/svn-tools
++toolsdir = @bindir@
+ 
+ javahl_javadir = @libdir@/svn-javahl
+ javahl_javahdir = @libdir@/svn-javahl/include
 @@ -110,8 +110,9 @@
  LT_CXX_LIBADD = @LT_CXX_LIBADD@
  
@@ -11,3 +20,12 @@
             @SVN_NEON_INCLUDES@ @SVN_SASL_INCLUDES@ @SVN_SERF_INCLUDES@ \
             @SVN_SQLITE_INCLUDES@ @SVN_ZLIB_INCLUDES@
  
+@@ -188,7 +189,7 @@
+ LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
+ 
+ # special link rule for mod_dav_svn
+-LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
++LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) -inst-prefix-dir ${DESTDIR}
+ 
+ # Compilation of SWIG-generated C source code
+ COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
diff --git a/devel/subversion16/files/patch-build-outputs.mk b/devel/subversion16/files/patch-build-outputs.mk
new file mode 100644
index 000000000000..7a44e750f940
--- /dev/null
+++ b/devel/subversion16/files/patch-build-outputs.mk
@@ -0,0 +1,15 @@
+--- ./build-outputs.mk.orig	2013-11-05 22:37:50.000000000 +0100
++++ ./build-outputs.mk	2013-11-05 22:38:41.000000000 +0100
+@@ -895,9 +895,9 @@
+ 
+ install-tools: tools/diff/diff$(EXEEXT) tools/diff/diff3$(EXEEXT) tools/diff/diff4$(EXEEXT) tools/server-side/svn-populate-node-origins-index$(EXEEXT) tools/server-side/svnauthz-validate$(EXEEXT) tools/client-side/svnmucc/svnmucc$(EXEEXT)
+ 	$(MKDIR) $(DESTDIR)$(toolsdir)
+-	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
+-	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
+-	cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT)
++#	cd tools/diff ; $(INSTALL_TOOLS) diff$(EXEEXT) $(DESTDIR)$(toolsdir)/diff$(EXEEXT)
++#	cd tools/diff ; $(INSTALL_TOOLS) diff3$(EXEEXT) $(DESTDIR)$(toolsdir)/diff3$(EXEEXT)
++#	cd tools/diff ; $(INSTALL_TOOLS) diff4$(EXEEXT) $(DESTDIR)$(toolsdir)/diff4$(EXEEXT)
+ 	cd tools/server-side ; $(INSTALL_TOOLS) svn-populate-node-origins-index$(EXEEXT) $(DESTDIR)$(toolsdir)/svn-populate-node-origins-index$(EXEEXT)
+ 	cd tools/server-side ; $(INSTALL_TOOLS) svnauthz-validate$(EXEEXT) $(DESTDIR)$(toolsdir)/svnauthz-validate$(EXEEXT)
+ 	cd tools/client-side/svnmucc ; $(INSTALL_TOOLS) svnmucc$(EXEEXT) $(DESTDIR)$(toolsdir)/svnmucc$(EXEEXT)
diff --git a/devel/subversion16/files/pkg-deinstall.in b/devel/subversion16/files/pkg-deinstall.in
deleted file mode 100644
index a0439b700b4c..000000000000
--- a/devel/subversion16/files/pkg-deinstall.in
+++ /dev/null
@@ -1,75 +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/subversion16/files/pkg-deinstall.in,v 1.1 2010-04-19 10:39:12 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 dav_svn_module/    && 
-		  !/^AddModule mod_dav_svn.c/      && \
-		  !/^LoadModule authz_svn_module/  && \
-		  !/^AddModule mod_authz_svn.c/    && \
-		  !/^LoadModule dontdothat_module/ && \
-		  !/^AddModule mod_dontdothat.c/    ) \
-	    print $0}' < "${confdir}/$i" > "${tmpdir}/$i"
-	AWKRC=$?
-	diff "${confdir}/$i" "${tmpdir}/$i" | grep "^[<>]" | grep -Evq "^< (Load|Add)Module "
-	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/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index 0d69101b0622..f20f39ee2e16 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -1,13 +1,15 @@
 @comment $FreeBSD$
+%%ASVN%%bin/asvn
 bin/svn
+%%TOOLS%%bin/svn-populate-node-origins-index
 bin/svnadmin
+%%TOOLS%%bin/svnauthz-validate
 bin/svndumpfilter
 bin/svnlook
+%%TOOLS%%bin/svnmucc
 bin/svnserve
-bin/svnsync
-%%ASVN%%bin/asvn
-%%SVNAUTHZ_VALIDATE%%bin/svnauthz-validate
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
+bin/svnsync
 bin/svnversion
 include/subversion-1/mod_authz_svn.h
 include/subversion-1/mod_dav_svn.h
@@ -52,7 +54,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
@@ -93,14 +94,14 @@ lib/libsvn_ra-1.a
 lib/libsvn_ra-1.la
 %%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
-%%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
 %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so
 %%DYNAMIC_ENABLED%%lib/libsvn_ra_local-1.so.0
+%%NEON%%lib/libsvn_ra_neon-1.a
+%%NEON%%lib/libsvn_ra_neon-1.la
+%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so
+%%DYNAMIC_ENABLED%%%%NEON%%lib/libsvn_ra_neon-1.so.0
 lib/libsvn_ra_svn-1.a
 lib/libsvn_ra_svn-1.la
 %%DYNAMIC_ENABLED%%lib/libsvn_ra_svn-1.so
@@ -121,6 +122,24 @@ 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 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_DONTDOTHAT%%@unexec %%SED%% -i '' -E '/LoadModule[[:blank:]]+dontdothat_module/d' %D/%%APACHEETCDIR%%/httpd.conf
+%%MOD_DONTDOTHAT%%%%APACHEMODDIR%%/mod_dontdothat.so
+%%MOD_DONTDOTHAT%%@exec %D/sbin/apxs -e -a -n dontdothat %D/%F
+man/man1/svn.1.gz
+man/man1/svnadmin.1.gz
+man/man1/svndumpfilter.1.gz
+man/man1/svnlook.1.gz
+man/man1/svnsync.1.gz
+man/man1/svnversion.1.gz
+man/man5/svnserve.conf.5.gz
+man/man8/svnserve.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/BUGS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/COMMITTERS
@@ -128,38 +147,18 @@ lib/libsvn_wc-1.la
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch01dia1.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia1.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia2.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia3.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia4.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia5.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia6.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch02dia7.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia1.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia2.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia3.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch04dia4.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia1.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/ch08dia2.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/note.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/tip.png
-%%PORTDOCS%%%%BOOK%%%%DOCSDIR%%/svn-book-html/images/warning.png
-%%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
+%%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%%/README
 %%DATADIR%%/backup/hot-backup.py
 %%DATADIR%%/bdb/erase-all-text-data.py
@@ -296,35 +295,28 @@ lib/libsvn_wc-1.la
 %%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_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
-%%PORTDOCS%%%%BOOK%%@dirrm %%DOCSDIR%%/svn-book-html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/backup
-@dirrm %%DATADIR%%/bdb
-@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
-@dirrm %%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32
-@dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64
-@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/svnmucc
-@dirrm %%DATADIR%%/client-side
-@dirrm %%DATADIR%%/dev/iz
-@dirrm %%DATADIR%%/dev
-@dirrm %%DATADIR%%/diff
-@dirrm %%DATADIR%%/dist
-@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/server-side
+@dirrm %%DATADIR%%/po
 @dirrm %%DATADIR%%/hook-scripts/mailer/tests
 @dirrm %%DATADIR%%/hook-scripts/mailer
 @dirrm %%DATADIR%%/hook-scripts
-@dirrm %%DATADIR%%/po
-@dirrm %%DATADIR%%/server-side
-@dirrm %%DATADIR%%/xslt
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/dist
+@dirrm %%DATADIR%%/diff
+@dirrm %%DATADIR%%/dev/iz
+@dirrm %%DATADIR%%/dev
+@dirrm %%DATADIR%%/client-side/svnmucc
+@dirrm %%DATADIR%%/client-side
+@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
+@dirrm %%DATADIR%%/buildbot/slaves/win32-xp-VS2005
+@dirrm %%DATADIR%%/buildbot/slaves/ubuntu-x64
+@dirrm %%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32
+@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
+@dirrm %%DATADIR%%/buildbot/slaves
+@dirrm %%DATADIR%%/buildbot
+@dirrm %%DATADIR%%/bdb
+@dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm include/subversion-1