(1) Make possible to build subversion with db6.

 (2) Fix and STAGEfy subversion-static.
 (3) Allow not to override/deinstall modified svnserve script if it is used.

PR:		ports/185005, ports/180121, ports/181340, ports/186446, ports/186764

3 files changed, 15 insertions, 5 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 3754546c089b..1a2e9f06617a 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -62,8 +62,10 @@ EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-Makefile.in
 
 .if ${PORT_OPTIONS:MSVNSERVE_WRAPPER}
 SUB_LIST+=	SVNSERVE_BIN_EXT=".bin"
+PLIST_SUB+=	NO_SVNSERVE_WRAPPER="@comment "
 .else
 SUB_LIST+=	SVNSERVE_BIN_EXT=""
+PLIST_SUB+=	NO_SVNSERVE_WRAPPER=""
 .endif
 
 .if ${PORT_OPTIONS:MMOD_DAV_SVN}
@@ -87,6 +89,7 @@ USES+=			gettext:build
 .  endif
 .  if ${PORT_OPTIONS:MBDB}
 BDB_BUILD_DEPENDS=	yes
+.else
 .  endif
 OLD_LIB_DEPENDS:=	${LIB_DEPENDS:S!^!${LOCALBASE}/lib/!:C!(\.so|\.[0-9]+)?:!.a:!}
 BUILD_DEPENDS+=		${OLD_LIB_DEPENDS}
@@ -96,6 +99,12 @@ PLIST_SUB+=		DYNAMIC_ENABLED="@comment "
 PLIST_SUB+=		DYNAMIC_ENABLED=""
 .endif
 
+.if ${PORT_OPTIONS:MBDB}
+CONFIGURE_ARGS+=	--enable-bdb6
+.else
+CONFIGURE_ARGS+=	--without-berkeley-db
+.endif
+
 .if make(repository)
 WITH_REPOSITORY_CREATION=	yes
 .endif
@@ -193,12 +202,10 @@ post-install:	${MKREPOS_TARGET}
 .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
+	@${INSTALL_SCRIPT} ${FILESDIR}/svnserve.wrapper ${STAGEDIR}${PREFIX}/bin/svnserve.sample
 .endif
 
 # ===============================================================================
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 2a573e1f0b51..6174cf90b6c9 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -3,7 +3,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.8.5
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES+=	devel
 MASTER_SITES=	${MASTER_SITE_APACHE}
 DIST_SUBDIR=	subversion18
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index ff860d6bb3d5..54c2462a2522 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -13,8 +13,11 @@ bin/svnlook
 bin/svnmucc
 %%TOOLS%%bin/svnraisetreeconflict
 bin/svnrdump
-bin/svnserve
+%%NO_SVNSERVE_WRAPPER%%bin/svnserve
+%%SVNSERVE_WRAPPER%%@unexec if cmp -s %D/bin/svnserve.sample %D/bin/svnserve; then rm -r %D/bin/svnserve; fi
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
+%%SVNSERVE_WRAPPER%%bin/svnserve.sample
+%%SVNSERVE_WRAPPER%%@exec if [ ! -f %D/bin/svnserve ] ; then cp -p %D/%F %B/bin/svnserve; fi
 bin/svnsync
 bin/svnversion
 include/subversion-1/mod_authz_svn.h