5 files changed, 124 insertions, 133 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index bcaf693cb11f..c075905f9f71 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.3
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/tarballs/
 
@@ -16,7 +16,6 @@ LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 INSTALLS_SHLIB=	yes
 
-USE_SIZE=	yes
 USE_BZIP2=	yes
 USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
@@ -60,6 +59,13 @@ CONFIGURE_ARGS+=	--without-neon
 PLIST_SUB+=		WITHOUT_NEON="@comment "
 .endif
 
+.if defined(WITHOUT_BDB)
+CONFIGURE_ARGS+=	--without-berkeley-db
+PLIST_SUB+=		WITHOUT_BDB="@comment "
+.else
+PLIST_SUB+=		WITHOUT_BDB=""
+.endif
+
 .if defined(WITH_PERL)
 .if ${PERL_LEVEL} < 500800
 IGNORE=	"Subversion\'s Perl bindings need perl 5.8.0 or greater. Upgrade your perl and try again"
@@ -108,7 +114,7 @@ DEPENDS_ARGS+=		SWIG_LANGUAGES='${SWIG_BINDINGS}'
 CONFIGURE_ARGS+=	--with-swig=${LOCALBASE} \
 			--enable-swig-bindings=${SWIG_BINDINGS:Q:S/ /,/g:S/\\//g}
 .else
-CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings 
+CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
@@ -126,19 +132,26 @@ SVNGROUP?=	svn
 APACHE2_PORT?=	www/apache2
 BUILD_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
 RUN_DEPENDS+=	${APXS}:${PORTSDIR}/${APACHE2_PORT}
-DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 APR_APU_DIR=	${LOCALBASE}/lib/apache2
 APR_CONFIG=	apr-config
 APU_CONFIG=	apu-config
 APR_PORT=	www/apache2
+.if !defined(WITHOUT_BDB)
+DEPENDS_ARGS+=	WITH_BERKELEYDB=db4
 OPT_NAME=	WITH_BERKELEYDB=(db4|db41|db42)
+.endif
 .else
-LIB_DEPENDS+=	apr-1.0:${PORTSDIR}/devel/apr-svn
 APR_APU_DIR=	${LOCALBASE}/bin
 APR_CONFIG=	apr-1-config
 APU_CONFIG=	apu-1-config
-APR_PORT=	devel/apr
+.if !defined(WITHOUT_BDB)
+LIB_DEPENDS+=	apr-1.0:${PORTSDIR}/devel/apr-svn
+APR_PORT=	devel/apr-svn
 OPT_NAME=	APR_UTIL_WITH_BERKELEY_DB=yes
+.else
+LIB_DEPENDS+=	apr-1.0:${PORTSDIR}/devel/apr
+APR_PORT=	devel/apr
+.endif
 .endif
 CONFIGURE_ARGS+=--with-apr=${APR_APU_DIR}/${APR_CONFIG} \
 		--with-apr-util=${APR_APU_DIR}/${APU_CONFIG}
@@ -150,10 +163,8 @@ EXTRA_PATCHES=	${PATCHDIR}/build-outputs.mk.patch
 PLIST_SUB+=	SVNSERVE_WRAPPER="@comment "
 .endif
 
-.if defined(WITH_BOOK_HTML)
+.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
 PORTDOCS+=	book
-BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \
-		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
 .endif
 
 SCRIPTS=
@@ -169,6 +180,13 @@ pre-extract:
 	@${ECHO_MSG} "To disable it define WITHOUT_NEON"
 .endif
 	@${ECHO_MSG} ""
+.if defined(WITHOUT_BDB)
+	@${ECHO_MSG} "db4 repository backend disabled."
+.else
+	@${ECHO_MSG} "db4 repository backend enabled."
+	@${ECHO_MSG} "To disable it define WITHOUT_DBD"
+.endif
+	@${ECHO_MSG} ""
 .if defined(WITH_MAINTAINER_DEBUG)
 	@${ECHO_MSG} "Build debug version."
 .else
@@ -237,11 +255,10 @@ pre-extract:
 	@${ECHO_MSG} ""
 .endif
 	@${ECHO_MSG} ""
-.if defined(WITH_BOOK_HTML)
-	@${ECHO_MSG} "Subversion Book (HTML) enabled."
+.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
+	@${ECHO_MSG} "Subversion Book will be installed."
 .else
-	@${ECHO_MSG} "You can install the Subversion Book (HTML) by defining"
-	@${ECHO_MSG} "WITH_BOOK_HTML."
+	@${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
 .endif
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "May useful scripts will be installed into ${PREFIX}/share/subversion"
@@ -268,13 +285,18 @@ pre-configure:
 		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
+.if !defined(WITHOUT_BDB)
 	@if [ `${APR_APU_DIR}/${APU_CONFIG} --db-version` != "4" ] ; then \
 		${ECHO_MSG} "" ; \
  		${ECHO_MSG} 'You should build `'"${APR_PORT}' with db4 support to use subversion with it." ; \
  		${ECHO_MSG} 'Please rebuild `'"${APR_PORT}' with option "'`'"${OPT_NAME}' and try again." ; \
 		${ECHO_MSG} "" ; \
+		${ECHO_MSG} "Or you can disable db4 support. Only 'fs' repository backend will be availible." ; \
+		${ECHO_MSG} "To disable db4 support, define WITHOUT_BDB." ; \
+		${ECHO_MSG} "" ; \
 		${FALSE} ; \
 	fi
+.endif
 
 post-build:
 .if defined(WITH_PERL)
@@ -290,12 +312,6 @@ post-build:
 #	cd ${WRKSRC} ; \
 #	  ${MAKE} javahl
 #.endif
-.if defined(WITH_BOOK_HTML)
-	cd ${WRKSRC}/doc/book/tools/ ; \
-	  ${LN} -s ${PREFIX}/share/xsl/docbook xsl
-	cd ${WRKSRC}/doc/book ; \
-	  ${MAKE} all-html
-.endif
 
 .if defined(WITH_MOD_DAV_SVN)
 pre-install:
@@ -311,9 +327,12 @@ post-install:
 	for f in ${TXT_DOCS}; do \
 	  ${INSTALL_DATA} ${WRKSRC}/$$f ${DOCSDIR}; \
 	done
-.if defined(WITH_BOOK_HTML)
-	cd ${WRKSRC}/doc/book ; \
-	  ${MAKE} install-book-html install-book-html-chunk INSTALL_DIR=${DOCSDIR}
+.if defined(WITH_BOOK)
+	@${MKDIR} ${DOCSDIR}/book/images
+	cd ${WRKSRC}/doc/book/book ; \
+	  ${INSTALL_DATA} svn-book.html svn-book.pdf ${DOCSDIR}/book
+	cd ${WRKSRC}/doc/book/book/images ; \
+	  ${INSTALL_DATA} *.png ${DOCSDIR}/book/images
 .endif
 .endif
 .if defined(WITH_PERL)
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 8ee34a7a0885..83fec4ee9a16 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,2 +1,2 @@
-MD5 (subversion-1.1.1.tar.bz2) = a180c3fe91680389c210c99def54d9e0
-SIZE (subversion-1.1.1.tar.bz2) = 6768086
+MD5 (subversion-1.1.3.tar.bz2) = a09c2b2fa1a09566c024547954a48478
+SIZE (subversion-1.1.3.tar.bz2) = 6793419
diff --git a/devel/subversion/files/patch-doc::book::Makefile b/devel/subversion/files/patch-doc::book::Makefile
deleted file mode 100644
index dce562b68f18..000000000000
--- a/devel/subversion/files/patch-doc::book::Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
---- doc/book/Makefile.orig	2004-09-14 06:50:26.000000000 +0400
-+++ doc/book/Makefile	2004-11-05 11:33:23.265625000 +0300
-@@ -1,5 +1,5 @@
- XSLTPROC = xsltproc
--INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
-+#INSTALL_DIR = $(DESTDIR)/usr/share/doc/subversion
- INSTALL = install
- 
- ## You shouldn't normally need to edit anything below here.
-@@ -118,7 +118,7 @@
- $(BOOK_INSTALL_DIR):
- 	$(INSTALL) -d $(BOOK_INSTALL_DIR)
- 
--install-book-html: $(BOOK_HTML_TARGET)
-+install-book-html:
- 	$(INSTALL) -d $(BOOK_INSTALL_DIR)/images
- 	$(INSTALL) $(BOOK_HTML_TARGET) $(BOOK_INSTALL_DIR)
- 	$(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
-@@ -130,10 +130,10 @@
- 	$(INSTALL) $(BOOK_DIR)/styles.css $(BOOK_INSTALL_DIR)
- 	$(INSTALL) $(BOOK_IMAGES) $(BOOK_INSTALL_DIR)/images
- 
--install-book-pdf: $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)
-+install-book-pdf:
- 	$(INSTALL) $(BOOK_PDF_TARGET) $(BOOK_INSTALL_DIR)
- 
--install-book-ps: $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR)
-+install-book-ps:
- 	$(INSTALL) $(BOOK_PS_TARGET) $(BOOK_INSTALL_DIR)
- 
- book-clean:
diff --git a/devel/subversion/files/svnserve.wrapper b/devel/subversion/files/svnserve.wrapper
index 6797f9478ad5..92fffc384652 100644
--- a/devel/subversion/files/svnserve.wrapper
+++ b/devel/subversion/files/svnserve.wrapper
@@ -1,4 +1,6 @@
 #!/bin/sh
+#
+# $FreeBSD$
 
 SVNSERVE=$(dirname $(realpath $0))/svnserve.bin
 
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index c13580cb360d..52c762cd9073 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/svn
 bin/svnadmin
 bin/svndumpfilter
@@ -52,9 +53,9 @@ lib/libsvn_diff-1.so.0
 lib/libsvn_fs-1.a
 lib/libsvn_fs-1.so
 lib/libsvn_fs-1.so.0
-lib/libsvn_fs_base-1.a
-lib/libsvn_fs_base-1.so
-lib/libsvn_fs_base-1.so.0
+%%WITHOUT_BDB%%lib/libsvn_fs_base-1.a
+%%WITHOUT_BDB%%lib/libsvn_fs_base-1.so
+%%WITHOUT_BDB%%lib/libsvn_fs_base-1.so.0
 lib/libsvn_fs_fs-1.a
 lib/libsvn_fs_fs-1.so
 lib/libsvn_fs_fs-1.so.0
@@ -88,68 +89,68 @@ lib/libsvn_wc-1.so.0
 %%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
-share/subversion/backup/hot-backup.py
-share/subversion/client-side/bash_completion
-share/subversion/client-side/bash_completion_test
-share/subversion/client-side/server-vsn.py
-share/subversion/client-side/showchange.pl
-share/subversion/cvs2svn/README
-share/subversion/dev/check-license.py
-share/subversion/dev/datecheck.py
-share/subversion/dev/find-textfiles.sh
-share/subversion/dev/gcov.patch
-share/subversion/dev/gnuify-changelog.pl
-share/subversion/dev/iz/defect.dem
-share/subversion/dev/iz/ff2csv.command
-share/subversion/dev/iz/ff2csv.py
-share/subversion/dev/iz/find-fix.py
-share/subversion/dev/iz/run-queries.sh
-share/subversion/dev/normalize-dump.py
-share/subversion/dev/prebuild-cleanup.sh
-share/subversion/dev/random-commits.py
-share/subversion/dev/scramble-tree.py
-share/subversion/dev/stress.pl
-share/subversion/dev/svn-dev.el
-share/subversion/dev/svn-dev.vim
-share/subversion/dev/trails.py
-share/subversion/dev/verify-history.py
-share/subversion/examples/blame.py
-share/subversion/examples/check-modified.py
-share/subversion/examples/dumpprops.py
-share/subversion/examples/getfile.py
-share/subversion/examples/geturl.py
-share/subversion/examples/minimal_client.c
-share/subversion/examples/putfile.py
-share/subversion/examples/revplist.py
-share/subversion/examples/svnlook.py
-share/subversion/examples/svnserve-sgid.c
-share/subversion/examples/svnshell.py
-share/subversion/hook-scripts/commit-access-control.cfg.example
-share/subversion/hook-scripts/commit-access-control.pl
-share/subversion/hook-scripts/commit-email.pl
-share/subversion/hook-scripts/mailer/mailer.conf.example
-share/subversion/hook-scripts/mailer/mailer.py
-share/subversion/hook-scripts/mailer/tests/mailer-init.sh
-share/subversion/hook-scripts/mailer/tests/mailer-t1.output
-share/subversion/hook-scripts/mailer/tests/mailer-t1.sh
-share/subversion/hook-scripts/mailer/tests/mailer-tweak.py
-share/subversion/hook-scripts/propchange-email.pl
-share/subversion/hook-scripts/README
-share/subversion/hook-scripts/svnperms.conf.example
-share/subversion/hook-scripts/svnperms.py
-share/subversion/hook-scripts/verify-po.py
-share/subversion/po/svn-po-status-report.sh
-share/subversion/test-scripts/svntest/README
-share/subversion/test-scripts/svntest/svntest-check-configuration.sh
-share/subversion/test-scripts/svntest/svntest-config.sh
-share/subversion/test-scripts/svntest/svntest-rebuild-generic.sh
-share/subversion/test-scripts/svntest/svntest-rebuild.sh
-share/subversion/test-scripts/svntest/svntest-run.sh
-share/subversion/test-scripts/svntest/svntest-sendmail.sh
-share/subversion/test-scripts/svntest/svntest-update.sh
-share/subversion/test-scripts/svntest/svntest.sh
-share/subversion/xslt/svnindex.css
-share/subversion/xslt/svnindex.xsl
+%%DATADIR%%/backup/hot-backup.py
+%%DATADIR%%/client-side/bash_completion
+%%DATADIR%%/client-side/bash_completion_test
+%%DATADIR%%/client-side/server-vsn.py
+%%DATADIR%%/client-side/showchange.pl
+%%DATADIR%%/cvs2svn/README
+%%DATADIR%%/dev/check-license.py
+%%DATADIR%%/dev/datecheck.py
+%%DATADIR%%/dev/find-textfiles.sh
+%%DATADIR%%/dev/gcov.patch
+%%DATADIR%%/dev/gnuify-changelog.pl
+%%DATADIR%%/dev/iz/defect.dem
+%%DATADIR%%/dev/iz/ff2csv.command
+%%DATADIR%%/dev/iz/ff2csv.py
+%%DATADIR%%/dev/iz/find-fix.py
+%%DATADIR%%/dev/iz/run-queries.sh
+%%DATADIR%%/dev/normalize-dump.py
+%%DATADIR%%/dev/prebuild-cleanup.sh
+%%DATADIR%%/dev/random-commits.py
+%%DATADIR%%/dev/scramble-tree.py
+%%DATADIR%%/dev/stress.pl
+%%DATADIR%%/dev/svn-dev.el
+%%DATADIR%%/dev/svn-dev.vim
+%%DATADIR%%/dev/trails.py
+%%DATADIR%%/dev/verify-history.py
+%%DATADIR%%/examples/blame.py
+%%DATADIR%%/examples/check-modified.py
+%%DATADIR%%/examples/dumpprops.py
+%%DATADIR%%/examples/getfile.py
+%%DATADIR%%/examples/geturl.py
+%%DATADIR%%/examples/minimal_client.c
+%%DATADIR%%/examples/putfile.py
+%%DATADIR%%/examples/revplist.py
+%%DATADIR%%/examples/svnlook.py
+%%DATADIR%%/examples/svnserve-sgid.c
+%%DATADIR%%/examples/svnshell.py
+%%DATADIR%%/hook-scripts/commit-access-control.cfg.example
+%%DATADIR%%/hook-scripts/commit-access-control.pl
+%%DATADIR%%/hook-scripts/commit-email.pl
+%%DATADIR%%/hook-scripts/mailer/mailer.conf.example
+%%DATADIR%%/hook-scripts/mailer/mailer.py
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-init.sh
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.output
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh
+%%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py
+%%DATADIR%%/hook-scripts/propchange-email.pl
+%%DATADIR%%/hook-scripts/README
+%%DATADIR%%/hook-scripts/svnperms.conf.example
+%%DATADIR%%/hook-scripts/svnperms.py
+%%DATADIR%%/hook-scripts/verify-po.py
+%%DATADIR%%/po/svn-po-status-report.sh
+%%DATADIR%%/test-scripts/svntest/README
+%%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh
+%%DATADIR%%/test-scripts/svntest/svntest-config.sh
+%%DATADIR%%/test-scripts/svntest/svntest-rebuild-generic.sh
+%%DATADIR%%/test-scripts/svntest/svntest-rebuild.sh
+%%DATADIR%%/test-scripts/svntest/svntest-run.sh
+%%DATADIR%%/test-scripts/svntest/svntest-sendmail.sh
+%%DATADIR%%/test-scripts/svntest/svntest-update.sh
+%%DATADIR%%/test-scripts/svntest/svntest.sh
+%%DATADIR%%/xslt/svnindex.css
+%%DATADIR%%/xslt/svnindex.xsl
 %%MOD_DAV_SVN%%libexec/apache2/mod_dav_svn.so
 %%MOD_DAV_SVN%%libexec/apache2/mod_authz_svn.so
 %%MOD_DAV_SVN%%@exec %D/sbin/apxs -e -S LIBEXECDIR=%D/libexec/apache2 -a -n dav libexec/apache2/mod_dav.so
@@ -235,17 +236,17 @@ share/subversion/xslt/svnindex.xsl
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/wc.pyc
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/libsvn
 %%WITH_PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/svn
-@dirrm share/subversion/backup
-@dirrm share/subversion/client-side
-@dirrm share/subversion/cvs2svn
-@dirrm share/subversion/dev/iz
-@dirrm share/subversion/dev
-@dirrm share/subversion/examples
-@dirrm share/subversion/hook-scripts/mailer/tests
-@dirrm share/subversion/hook-scripts/mailer
-@dirrm share/subversion/hook-scripts
-@dirrm share/subversion/po
-@dirrm share/subversion/test-scripts/svntest
-@dirrm share/subversion/test-scripts
-@dirrm share/subversion/xslt
+@dirrm %%DATADIR%%/backup
+@dirrm %%DATADIR%%/client-side
+@dirrm %%DATADIR%%/cvs2svn
+@dirrm %%DATADIR%%/dev/iz
+@dirrm %%DATADIR%%/dev
+@dirrm %%DATADIR%%/examples
+@dirrm %%DATADIR%%/hook-scripts/mailer/tests
+@dirrm %%DATADIR%%/hook-scripts/mailer
+@dirrm %%DATADIR%%/hook-scripts
+@dirrm %%DATADIR%%/po
+@dirrm %%DATADIR%%/test-scripts/svntest
+@dirrm %%DATADIR%%/test-scripts
+@dirrm %%DATADIR%%/xslt
 @dirrm share/subversion