Update to 0.29.0.

Remove patch-ad (fixed in this release).

 User-visible changes:
 * 'svn status' now streams its response.  (r6913, #1426)
 * 'svn status' now recurses into externals (r6913, #1428)
 * new 'svnadmin verify' command to verify repository data (r6851, #1074)
 * SSL changes:  (r6958, #1371)
     - dropped support for PEM-encoded client certs, only accept PKCS12 now.
     - 'ssl-authority-files' is now a list of CA files
     - no more 'ssl-client-cert-type' and 'ssl-client-key-file' variables.
 * new svndumpfilter option: '--preserve-revprops' to keep props on empty revs
 * mailer.py improvement:  handle multiple match groups (r6940)
 * remove in-repos/on-disk repository template features, till post-1.0 (r6965)
 * various cleanups to the Book
 * other bugfixes: switch deletion bug (r6890, #1496), status
   repos-delete bug (r6913, #1469), reversion of '.' (r6953, #854).

 Developer-visible changes:
 * GUI developers take note: prompting API changed (r6928, #1214)
 * now compile against neon-0.24; 0.23.9 support to be dropped soon. (r6958)
 * various improvements to Perl/SWIG bindings
 * tree re-org:  non-core utilities split into 'tools' and 'contrib' areas.
 * some gen_make.py/gen-base.py improvements
 * configure.in CFLAGS bugfix (r6963)
 * stop callng deprecated APIs in APR, in preparation for upcoming APR-1.0.

7 files changed, 24 insertions, 39 deletions

diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index 9044987a894..76a2bf16672 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/12 05:39:43 epg Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/08 04:47:52 epg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
@@ -15,7 +15,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA} ${WRKSRC}/tools/backup/hot-backup.py \
 		${SVNEXAMPLES}/backup
-	${INSTALL_DATA} ${WRKSRC}/tools/cgi/tweak-log.cgi ${SVNEXAMPLES}/cgi
+	${INSTALL_DATA} ${WRKSRC}/contrib/cgi/tweak-log.cgi ${SVNEXAMPLES}/cgi
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/commit-email.pl \
 		${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/propchange-email.pl \
diff --git a/devel/subversion-python/Makefile b/devel/subversion-python/Makefile
index 6f9b402ead6..4ae344b547f 100644
--- a/devel/subversion-python/Makefile
+++ b/devel/subversion-python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/08/15 23:42:59 epg Exp $
+# $NetBSD: Makefile,v 1.4 2003/09/08 04:47:52 epg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
 COMMENT=	Python bindings and tools for Subversion
@@ -9,13 +9,14 @@ CONFIGURE_ENV+=		PYTHON2=${PYTHONBIN}
 
 PY_PATCHPLIST=		YES
 PYBINMODULE=		YES
-PYTHON_PATCH_SCRIPTS=	tools/cvs2svn/cvs2svn.py tools/hook-scripts/mailer.py
+PYTHON_PATCH_SCRIPTS=	tools/cvs2svn/cvs2svn.py \
+			tools/hook-scripts/mailer/mailer.py
 
 ALL_TARGET=		swig-py-lib swig-py
 INSTALL_TARGET=		install-swig-py-lib install-swig-py
 
 MAKE_ENV+=		EXTRA_CPPFLAGS=${BUILDLINK_CPPFLAGS}
-MAKEFLAGS+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn		\
+MAKEFLAGS+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn \
 			swig_pydir_extra=${LOCALBASE}/${PYSITELIB}/svn
 
 TEST_TARGET=		all check
@@ -25,9 +26,10 @@ post-install:
 	${RM} ${LOCALBASE}/${PYSITELIB}/libsvn/*.la
 	${INSTALL_DATA_DIR} ${SVNEXAMPLES}/python
 	${INSTALL_DATA} ${WRKSRC}/tools/examples/*.py ${SVNEXAMPLES}/python
-	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer.py \
+	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer/mailer.py \
 		${SVNEXAMPLES}/hook-scripts
-	${INSTALL_DATA} ${WRKSRC}/tools/hook-scripts/mailer.conf.example \
+	${INSTALL_DATA} \
+		${WRKSRC}/tools/hook-scripts/mailer/mailer.conf.example \
 		${SVNEXAMPLES}/hook-scripts
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/subversion/cvs2svn
 	${INSTALL_DATA} ${WRKSRC}/tools/cvs2svn/README ${SVNDOC}/cvs2svn
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index 7ffc460cd96..bc694b3a5bd 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2003/06/18 13:26:25 epg Exp $
+# $NetBSD: Makefile.common,v 1.5 2003/09/08 04:47:51 epg Exp $
 
 DISTNAME=		subversion-${SVNVER}
 CATEGORIES=		devel
@@ -33,7 +33,7 @@ pre-configure:
 	${MV} ${WRKSRC}/tools/backup/hot-backup.py.in.new \
 		${WRKSRC}/tools/backup/hot-backup.py.in
 	${SED} -e 's|@PREFIX@|${PREFIX}|g' \
-		< ${WRKSRC}/tools/cgi/tweak-log.cgi \
-		> ${WRKSRC}/tools/cgi/tweak-log.cgi.new
-	${MV} ${WRKSRC}/tools/cgi/tweak-log.cgi.new \
-		${WRKSRC}/tools/cgi/tweak-log.cgi
+		< ${WRKSRC}/contrib/cgi/tweak-log.cgi \
+		> ${WRKSRC}/contrib/cgi/tweak-log.cgi.new
+	${MV} ${WRKSRC}/contrib/cgi/tweak-log.cgi.new \
+		${WRKSRC}/contrib/cgi/tweak-log.cgi
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index e56c7e8d2ae..6b4ba574ce4 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.6 2003/09/02 17:57:21 epg Exp $
+# $NetBSD: Makefile.version,v 1.7 2003/09/08 04:47:51 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		0.28.2
+SVNVER=		0.29.0
 # This macro is in this file because the URL changes with every release.
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/5940/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/5977/
 .endif
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 21c8926b9e1..50f296062c4 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.15 2003/09/02 17:57:22 epg Exp $
+$NetBSD: distinfo,v 1.16 2003/09/08 04:47:51 epg Exp $
 
-SHA1 (subversion-0.28.2.tar.gz) = 55795299bf7b6dceadcf715c4bbdb2cf327b77db
-Size (subversion-0.28.2.tar.gz) = 7323914 bytes
+SHA1 (subversion-0.29.0.tar.gz) = 3510d7b72d75a6ece5b0f0b0a23f447880672787
+Size (subversion-0.29.0.tar.gz) = 7367378 bytes
 SHA1 (patch-aa) = a4cbb157bd0f3c5d0e0061be6d68903a8357d92d
-SHA1 (patch-ac) = 6f57283a7b0088d596461b31ebf2838be3f440c6
-SHA1 (patch-ad) = 3c203f02fbe1f38c973c2c4ab30d8d0ee332dd43
+SHA1 (patch-ac) = 25da4e7166f79d47a8da47af1bfecc2208202aea
 SHA1 (patch-ae) = c44ab54dccdec60fa83a86464bef1eba68597615
diff --git a/devel/subversion/patches/patch-ac b/devel/subversion/patches/patch-ac
index 01ad85d5f5e..6cf7a4ad940 100644
--- a/devel/subversion/patches/patch-ac
+++ b/devel/subversion/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.5 2003/08/15 19:27:45 recht Exp $
+$NetBSD: patch-ac,v 1.6 2003/09/08 04:47:51 epg Exp $
 
---- tools/cgi/tweak-log.cgi.orig	2003-08-14 14:25:11.000000000 +0200
-+++ tools/cgi/tweak-log.cgi	2003-08-15 18:05:37.000000000 +0200
+--- contrib/cgi/tweak-log.cgi.orig	2003-08-14 14:25:11.000000000 +0200
++++ contrib/cgi/tweak-log.cgi	2003-08-15 18:05:37.000000000 +0200
 @@ -29,8 +29,8 @@
  ###############################################################################
  # Configuration Section
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
deleted file mode 100644
index 21465a5d3c3..00000000000
--- a/devel/subversion/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.7 2003/08/31 22:09:52 epg Exp $
-
---- Makefile.in.orig	Thu Aug 28 11:47:57 2003
-+++ Makefile.in
-@@ -149,9 +149,9 @@ RUN_SWIG_PL = $(SWIG) -c -perl $(SWIG_IN
- RUN_SWIG_JAVA = cd ${SWIG_SRC_DIR}/java/org/tigris/subversion/swig && $(SWIG) -c -java -package 'org.tigris.subversion.swig' $(SWIG_INCLUDES) -o ${abs_builddir}/$@
- 
- # Compilation of SWIG-generated C source code
--COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
-+COMPILE_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PY_COMPILE) $(CPPFLAGS) $(SWIG_INCLUDES) $(SWIG_PY_INCLUDES) -prefer-pic -c -o $@
- COMPILE_JAVA_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_JAVA_COMPILE) -DSWIGJAVA $(SWIG_INCLUDES) $(SWIG_JAVA_INCLUDES) -prefer-pic -c -o $@
--COMPILE_PL_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PL_COMPILE) $(SWIG_INCLUDES) $(SWIG_PL_INCLUDES) -prefer-pic -c -o $@
-+COMPILE_PL_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=compile $(SWIG_PL_COMPILE) $(CPPFLAGS) $(SWIG_INCLUDES) $(SWIG_PL_INCLUDES) -prefer-pic -c -o $@
- 
- # these commands link the wrapper objects into an extension library/module
- LINK_PY_WRAPPER = $(LIBTOOL) $(LTFLAGS) --mode=link $(SWIG_PY_LINK) $(SWIG_LDFLAGS) -rpath $(swig_pydir) -avoid-version -module