Update to 0.24.1.

subversion-base no longer installs info files; drop texinfo.mk usage.

Upstream change log:

Version 0.24.1 (released 16 June 2003, revision 6249, branches/release-0.24.1)

 User-visible changes:
 * Fix bug in 'svn log'.

 Developer-visible changes:
 * none


Version 0.24.0 (released 15 June 2003, revision 6234, branches/release-0.24.0)

 User-visible changes:
 * new 'svn diff [--old OLD] [--new NEW]' syntax (#1142)
 * new --relocate option for svn switch (#951)
 * new --version option for svnadmin and svnlook
 * new path-based authorization module for apache
 * make 'svn checkout' and not just 'svn update' resume a checkout
 * .svn directories now hidden on Windows
 * config variable 'store-password = no' now actually works
 * fix 'svn merge --dry-run'
 * fix 'properties hanging after a rename' issue (#1303)
 * fix odd behavior of 'svn up -r PREV filename' (#1304)
 * fix delete-tracking bug (#1348)
 * fix dump and load corner cases (#1290)
 * ra_dav server more resilient for foreign deltaV clients
 * numerous ra_svn changes - must update clients and servers
 * fix export over ra_svn (#1318)
 * fix ra_svn error transmission bug (#1146)
 * fix ra_svn corruption in tunnel mode (#1145)
 * make svnserve multi-threaded on non-fork platforms (now works on Windows)
 * remove svnserve -F and -S options
 * various memory use improvements (#1323)
 * various performance improvements for all protocols
 * various performance improvements for 'svnadmin dump' and svnlook
 * various subversion book updates (you have read the book right?)
 * more cvs2svn.py improvements (and more to follow)
 * new debugging script normalize-dump.py to normalize dump output

 Developer-visible changes:
 * path-based editor drivers
 * no more RA->do_checkout()
 * update python and java bindings
 * various windows build fixes

7 files changed, 41 insertions, 33 deletions

diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index fd4a488faf2..301bbc2cd91 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2003/06/11 13:43:28 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2003/06/18 13:26:25 epg Exp $
 
 PKGNAME=	subversion-${SVNVER}
 COMMENT=	Version control system, meta-package
 
-DEPENDS+=	subversion-base-${SVNVER}nb1:../../devel/subversion-base
-DEPENDS+=	ap2-subversion-${SVNVER}nb1:../../www/ap2-subversion
+DEPENDS+=	subversion-base-${SVNVER}:../../devel/subversion-base
+DEPENDS+=	ap2-subversion-${SVNVER}:../../www/ap2-subversion
 # We depend on subversion-python via its buildlink2.mk so we don't
 # have to worry about which Python version it uses.
 
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
index a6fc48c783e..7ffc460cd96 100644
--- a/devel/subversion/Makefile.common
+++ b/devel/subversion/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.3 2003/06/10 09:56:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.4 2003/06/18 13:26:25 epg Exp $
 
 DISTNAME=		subversion-${SVNVER}
-PKGREVISION=		1
 CATEGORIES=		devel
 
 MAINTAINER=		epg@pretzelnet.org
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index c670bba9c61..cc5a07615eb 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.version,v 1.1 2003/05/25 09:31:28 epg Exp $
+# $NetBSD: Makefile.version,v 1.2 2003/06/18 13:26:26 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		0.23.0
+SVNVER=		0.24.1
 # This macro is in this file because the URL changes with every release.
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4218/
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4761/
 .endif
diff --git a/devel/subversion/buildlink2.mk b/devel/subversion/buildlink2.mk
index 7582b8a52fb..08c1794ddbd 100644
--- a/devel/subversion/buildlink2.mk
+++ b/devel/subversion/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.5 2003/06/10 09:56:16 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/06/18 13:26:26 epg Exp $
 
 .if !defined(SUBVERSION_BUILDLINK2_MK)
 SUBVERSION_BUILDLINK2_MK=		#defined
 
 BUILDLINK_PACKAGES+=			subversion-base
-BUILDLINK_DEPENDS.subversion-base?=	subversion-base>=${SVNVER}nb1
+BUILDLINK_DEPENDS.subversion-base?=	subversion-base>=${SVNVER}
 BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.subversion-base=subversion-base
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 21b9852fa4b..b8d7c631b2b 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2003/06/06 11:05:01 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2003/06/18 13:26:26 epg Exp $
 
-SHA1 (subversion-0.23.0.tar.gz) = c19fc76f49734556d053b4fa53f4bbe06004c12f
-Size (subversion-0.23.0.tar.gz) = 7700961 bytes
-SHA1 (patch-aa) = 9d35603f24c1dfab3c8dd3019778196ea519f228
+SHA1 (subversion-0.24.1.tar.gz) = 013c3f225cabfb19bc795b817ccc83cbd1d1482c
+Size (subversion-0.24.1.tar.gz) = 7832674 bytes
+SHA1 (patch-aa) = 994c64bce9b6f237435a2fb57364a12dc3d502e1
 SHA1 (patch-ab) = 55574e8d6ce0c697444745c018390e9efd83f5f1
 SHA1 (patch-ac) = 4468a8196a1cc151ed4bc626bbebf0bf622d5871
-SHA1 (patch-ad) = b152158db469cd5c7e5e4b5b10c341983725fa39
+SHA1 (patch-ad) = 6b786776e012917b88c9eee49f0a6c0ab34bc941
 SHA1 (patch-ae) = e60fdf9d8a978dfb12fdfe627c988e87a59e7dff
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
index ac56a6f7c12..52ebcf5e151 100644
--- a/devel/subversion/patches/patch-aa
+++ b/devel/subversion/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
+$NetBSD: patch-aa,v 1.4 2003/06/18 13:26:26 epg Exp $
 
---- build-outputs.mk.orig	Tue Apr 15 20:16:02 2003
+--- build-outputs.mk.orig	Mon Jun 16 08:27:37 2003
 +++ build-outputs.mk
 @@ -109,10 +109,10 @@ libsvn_swig_java_OBJECTS = swigutil_java
  subversion/bindings/swig/libsvn_swig_java-1.la: $(libsvn_swig_java_DEPS)
@@ -15,9 +15,16 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
  
  libsvn_test_DEPS = subversion/tests/svn_test_editor.lo subversion/tests/svn_tests_main.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
  libsvn_test_OBJECTS = svn_test_editor.lo svn_tests_main.lo
-@@ -134,10 +134,10 @@ md5args_OBJECTS = md5args.o
- subversion/tests/libsvn_repos/md5args: $(md5args_DEPS)
- 	cd subversion/tests/libsvn_repos && $(LINK) -o md5args $(md5args_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+@@ -134,15 +134,15 @@ md5args_OBJECTS = md5args.o
+ subversion/tests/libsvn_repos/md5args$(EXEEXT): $(md5args_DEPS)
+ 	cd subversion/tests/libsvn_repos && $(LINK) -o md5args$(EXEEXT) $(md5args_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+ 
+-mod_authz_svn_DEPS = subversion/mod_authz_svn/mod_authz_svn.lo subversion/libsvn_subr/libsvn_subr-1.la 
++mod_authz_svn_DEPS = subversion/mod_authz_svn/mod_authz_svn.lo
+ mod_authz_svn_OBJECTS = mod_authz_svn.lo
+ subversion/mod_authz_svn/mod_authz_svn.la: $(mod_authz_svn_DEPS)
+-	cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(mod_authz_svn_OBJECTS) ../../subversion/libsvn_subr/libsvn_subr-1.la $(LIBS)
++	cd subversion/mod_authz_svn && $(LINK_APACHE_MOD) -o mod_authz_svn.la $(mod_authz_svn_OBJECTS) -lsvn_subr-1 $(LIBS)
  
 -mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_fs/libsvn_fs-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
 +mod_dav_svn_DEPS = subversion/mod_dav_svn/activity.lo subversion/mod_dav_svn/deadprops.lo subversion/mod_dav_svn/liveprops.lo subversion/mod_dav_svn/log.lo subversion/mod_dav_svn/merge.lo subversion/mod_dav_svn/mod_dav_svn.lo subversion/mod_dav_svn/repos.lo subversion/mod_dav_svn/update.lo subversion/mod_dav_svn/util.lo subversion/mod_dav_svn/version.lo
@@ -28,7 +35,7 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
  
  path_test_DEPS = subversion/tests/libsvn_subr/path-test.o subversion/tests/libsvn_test-1.la subversion/libsvn_subr/libsvn_subr-1.la 
  path_test_OBJECTS = path-test.o
-@@ -214,40 +214,40 @@ java_wc_OBJECTS = svn_wc.lo
+@@ -219,40 +219,40 @@ java_wc_OBJECTS = svn_wc.lo
  subversion/bindings/swig/java/_wc.la: $(java_wc_DEPS)
  	cd subversion/bindings/swig/java && $(LINK_JAVA_WRAPPER) -o _wc.la $(java_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/bindings/swig/libsvn_swig_java-1.la $(LIBS)
  
@@ -39,6 +46,13 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
 -	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) ../../../../subversion/libsvn_client/libsvn_client-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _client.la $(python_client_OBJECTS) -lsvn_client-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
+-python_core_DEPS = subversion/bindings/swig/python/core.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
++python_core_DEPS = subversion/bindings/swig/python/core.lo subversion/bindings/swig/libsvn_swig_py-1.la 
+ python_core_OBJECTS = core.lo
+ subversion/bindings/swig/python/_core.la: $(python_core_DEPS)
+-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
++	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _core.la $(python_core_OBJECTS) -lsvn_subr-1 $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+ 
 -python_delta_DEPS = subversion/bindings/swig/python/svn_delta.lo subversion/libsvn_delta/libsvn_delta-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
 +python_delta_DEPS = subversion/bindings/swig/python/svn_delta.lo subversion/bindings/swig/libsvn_swig_py-1.la 
  python_delta_OBJECTS = svn_delta.lo
@@ -67,13 +81,6 @@ $NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
 -	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _repos.la $(python_repos_OBJECTS) -lsvn_repos-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
--python_util_DEPS = subversion/bindings/swig/python/util.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
-+python_util_DEPS = subversion/bindings/swig/python/util.lo subversion/bindings/swig/libsvn_swig_py-1.la 
- python_util_OBJECTS = util.lo
- subversion/bindings/swig/python/_util.la: $(python_util_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _util.la $(python_util_OBJECTS) ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
-+	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _util.la $(python_util_OBJECTS) -lsvn_subr-1 $(SVN_APR_LIBS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
- 
 -python_wc_DEPS = subversion/bindings/swig/python/svn_wc.lo subversion/libsvn_wc/libsvn_wc-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
 +python_wc_DEPS = subversion/bindings/swig/python/svn_wc.lo subversion/bindings/swig/libsvn_swig_py-1.la 
  python_wc_OBJECTS = svn_wc.lo
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
index e477b361e83..b9ea196b42c 100644
--- a/devel/subversion/patches/patch-ad
+++ b/devel/subversion/patches/patch-ad
@@ -1,14 +1,16 @@
-$NetBSD: patch-ad,v 1.3 2003/05/25 09:31:30 epg Exp $
+$NetBSD: patch-ad,v 1.4 2003/06/18 13:26:26 epg Exp $
 
---- Makefile.in.orig	Wed Apr 16 00:51:46 2003
+--- Makefile.in.orig	Mon Jun 16 08:19:41 2003
 +++ Makefile.in
-@@ -70,7 +70,8 @@ swig_py_libdir = @libdir@
+@@ -72,8 +72,9 @@ swig_py_libdir = @libdir@
  swig_java_libdir = @libdir@
  
  ### these possibly need further discussion
--swig_pydir = @libdir@/svn-python/svn
-+# XXX NetBSD: take swig_pydir from the environment
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
++# XXX pkgsrc: take swig_pydir from the environment
 +#swig_pydir = @libdir@/svn-python/svn
++swig_pydir_extra = ${swig_pydir}
  swig_javadir = @libdir@/svn-java
  
  ### should search for these...