Update to 0.30.0

ok'ed by epg@

 User-visible changes:
 * SSL changes:  (r7134, #1330)
      - client now prompts to cache server certificates
      - no more 'ssl-ignore-unknown-ca' option
      - 'ssl-ignore-host-mismatch' is renamed to 'ssl-override-cert-hostname'
      - new 'ssl-trust-default-ca' option to trust 'default' openssl CAs
 * 'svn log' no longer dies on unversioned args (r6989, #777)
 * local mods now obstruct 'svn up' deletions (r7050, #1196)
 * 'svnserve' now notices (unauthenticated) --username arg (r7060)
 * no more 'svnadmin createtxn' subcommand. (r7062)
 * 'svn ls -v' shows years when appropriate
 * document some new things in Book (r7014), plus minor technical fixes
 * website changes:  new sidebar, new 'svn links' page, new tigris.org!!
 * other bugfixes:  hooks use proper stdout handles on win32 (r7001),
   prevent copies of copies in wc (r7077, #1259), display failed
   revprop change over ra_dav (r7081, #1520), 'svn st -u' throws RA
   error properly (r7094, #1506)

 Developer-visible changes:
 * ra_dav now requires neon-0.24.X
 * many gen_make.py/gen-base.py improvements, especially for win32 builds
 * many improvements to swig/perl bindings
 * improvements to contrib/:  psvn.el, and new svn-push program.
 * more cvs2svn bugfixes:  issue #1504, #1421, #1514, and new --username arg.
 * python testsuite only raises exceptions, never status codes. (#1192)
 * various libsvn_fs re-org (prepwork) for issue #1499.
 * other bugfixes: code-complete timestamp feature (r6983, #1445), add
   op-counting features to trails (r6984, #655), fs UUID caching
   (r7037), almost finish win32 iconv issues (#872), restored-file
   entry-timestamp bugfix (r7090, #1523), always print CWD as '.' (r7097)

2 files changed, 47 insertions, 47 deletions

diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
index dd2b997c486..bac5ccea9b0 100644
--- a/devel/subversion/patches/patch-aa
+++ b/devel/subversion/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.6 2003/08/29 01:58:49 epg Exp $
+$NetBSD: patch-aa,v 1.7 2003/09/27 20:14:41 recht Exp $
 
---- build-outputs.mk.orig	Thu Aug 28 11:53:06 2003
-+++ build-outputs.mk
-@@ -114,10 +114,10 @@ libsvn_swig_perl_OBJECTS = swigutil_pl.l
+--- build-outputs.mk.orig	2003-09-24 17:29:35.000000000 +0200
++++ build-outputs.mk	2003-09-27 12:12:20.000000000 +0200
+@@ -59,10 +59,10 @@
  subversion/bindings/swig/libsvn_swig_perl-1.la: $(libsvn_swig_perl_DEPS)
  	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_perl-1.la $(libsvn_swig_perl_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
  
@@ -13,80 +13,80 @@ $NetBSD: patch-aa,v 1.6 2003/08/29 01:58:49 epg Exp $
 -	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_py-1.la $(libsvn_swig_py_OBJECTS) ../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../subversion/libsvn_delta/libsvn_delta-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
 +	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_py-1.la $(libsvn_swig_py_OBJECTS) -lsvn_subr-1 -lsvn_delta-1 $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
  
- 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
-@@ -139,15 +139,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
- mod_dav_svn_OBJECTS = activity.lo deadprops.lo liveprops.lo log.lo merge.lo mod_dav_svn.lo repos.lo update.lo util.lo version.lo
- subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS)
--	cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(mod_dav_svn_OBJECTS) ../../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 $(LIBS)
-+	cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(mod_dav_svn_OBJECTS) -lsvn_repos-1 -lsvn_fs-1 -lsvn_delta-1 -lsvn_subr-1 $(LIBS)
- 
- 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
-@@ -264,40 +264,40 @@ perl_runtime_OBJECTS = swigpl.lo
+ perl_client_DEPS = subversion/bindings/swig/perl/svn_client.lo subversion/bindings/swig/libsvn_swig_perl-1.la subversion/libsvn_client/libsvn_client-1.la 
+ perl_client_OBJECTS = svn_client.lo
+@@ -104,40 +104,40 @@
  subversion/bindings/swig/perl/swigpl.la: $(perl_runtime_DEPS)
  	cd subversion/bindings/swig/perl && $(LINK_PL_WRAPPER) -o swigpl.la $(perl_runtime_OBJECTS)  $(LIBS)
  
--python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/libsvn_client/libsvn_client-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+-python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_client/libsvn_client-1.la 
 +python_client_DEPS = subversion/bindings/swig/python/svn_client.lo subversion/bindings/swig/libsvn_swig_py-1.la 
  python_client_OBJECTS = svn_client.lo
  subversion/bindings/swig/python/_client.la: $(python_client_DEPS)
--	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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_client/libsvn_client-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 subversion/libsvn_subr/libsvn_subr-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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la $(SVN_APR_LIBS) $(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 subversion/libsvn_delta/libsvn_delta-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
  subversion/bindings/swig/python/_delta.la: $(python_delta_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(python_delta_OBJECTS) ../../../../subversion/libsvn_delta/libsvn_delta-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(python_delta_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _delta.la $(python_delta_OBJECTS) -lsvn_delta-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
--python_fs_DEPS = subversion/bindings/swig/python/svn_fs.lo subversion/libsvn_fs/libsvn_fs-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+-python_fs_DEPS = subversion/bindings/swig/python/svn_fs.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_fs/libsvn_fs-1.la 
 +python_fs_DEPS = subversion/bindings/swig/python/svn_fs.lo subversion/bindings/swig/libsvn_swig_py-1.la 
  python_fs_OBJECTS = svn_fs.lo
  subversion/bindings/swig/python/_fs.la: $(python_fs_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(python_fs_OBJECTS) ../../../../subversion/libsvn_fs/libsvn_fs-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(python_fs_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _fs.la $(python_fs_OBJECTS) -lsvn_fs-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
--python_ra_DEPS = subversion/bindings/swig/python/svn_ra.lo subversion/libsvn_ra/libsvn_ra-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+-python_ra_DEPS = subversion/bindings/swig/python/svn_ra.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_ra/libsvn_ra-1.la 
 +python_ra_DEPS = subversion/bindings/swig/python/svn_ra.lo subversion/bindings/swig/libsvn_swig_py-1.la 
  python_ra_OBJECTS = svn_ra.lo
  subversion/bindings/swig/python/_ra.la: $(python_ra_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(python_ra_OBJECTS) ../../../../subversion/libsvn_ra/libsvn_ra-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(python_ra_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _ra.la $(python_ra_OBJECTS) -lsvn_ra-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
--python_repos_DEPS = subversion/bindings/swig/python/svn_repos.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/bindings/swig/libsvn_swig_py-1.la 
+-python_repos_DEPS = subversion/bindings/swig/python/svn_repos.lo subversion/bindings/swig/libsvn_swig_py-1.la subversion/libsvn_repos/libsvn_repos-1.la 
 +python_repos_DEPS = subversion/bindings/swig/python/svn_repos.lo subversion/bindings/swig/libsvn_swig_py-1.la 
  python_repos_OBJECTS = svn_repos.lo
  subversion/bindings/swig/python/_repos.la: $(python_repos_DEPS)
--	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) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_repos/libsvn_repos-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_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 subversion/libsvn_wc/libsvn_wc-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
  subversion/bindings/swig/python/_wc.la: $(python_wc_DEPS)
--	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) ../../../../subversion/libsvn_wc/libsvn_wc-1.la -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+-	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la $(LIBS)
 +	cd subversion/bindings/swig/python && $(LINK_PY_WRAPPER) -o _wc.la $(python_wc_OBJECTS) -lsvn_wc-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
  
  python_runtime_DEPS = subversion/bindings/swig/python/swigpy.lo 
  python_runtime_OBJECTS = swigpy.lo
+@@ -204,15 +204,15 @@
+ subversion/libsvn_wc/libsvn_wc-1.la: $(libsvn_wc_DEPS)
+ 	cd subversion/libsvn_wc && $(LINK) -o libsvn_wc-1.la $(libsvn_wc_OBJECTS) ../../subversion/libsvn_delta/libsvn_delta-1.la ../../subversion/libsvn_subr/libsvn_subr-1.la ../../subversion/libsvn_diff/libsvn_diff-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
+ mod_dav_svn_OBJECTS = activity.lo deadprops.lo liveprops.lo log.lo merge.lo mod_dav_svn.lo repos.lo update.lo util.lo version.lo
+ subversion/mod_dav_svn/mod_dav_svn.la: $(mod_dav_svn_DEPS)
+-	cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(mod_dav_svn_OBJECTS) ../../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 $(LIBS)
++	cd subversion/mod_dav_svn && $(LINK_APACHE_MOD) -o mod_dav_svn.la $(mod_dav_svn_OBJECTS) -lsvn_repos-1 -lsvn_fs-1 -lsvn_delta-1 -lsvn_subr-1 $(LIBS)
+ 
+ svnadmin_DEPS = subversion/svnadmin/main.o 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 
+ svnadmin_OBJECTS = main.o
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
index 4f10e4c6271..97301d3f36a 100644
--- a/devel/subversion/patches/patch-ae
+++ b/devel/subversion/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.3 2003/08/15 19:27:45 recht Exp $
+$NetBSD: patch-ae,v 1.4 2003/09/27 20:14:41 recht Exp $
 
---- configure.orig	2003-08-14 14:26:55.000000000 +0200
-+++ configure	2003-08-15 18:06:50.000000000 +0200
-@@ -10358,8 +10358,9 @@
+--- configure.orig	2003-09-24 17:29:51.000000000 +0200
++++ configure	2003-09-27 12:13:39.000000000 +0200
+@@ -10622,8 +10622,9 @@
      esac
      if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
        ### TODO: When it's ready, add the swig-java-lib rule here.
@@ -14,7 +14,7 @@ $NetBSD: patch-ae,v 1.3 2003/08/15 19:27:45 recht Exp $
  
        echo "$as_me:$LINENO: checking for swig library directory" >&5
  echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -10535,8 +10536,9 @@
+@@ -10799,8 +10800,9 @@
      esac
      if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
        ### TODO: When it's ready, add the swig-java-lib rule here.
@@ -26,7 +26,7 @@ $NetBSD: patch-ae,v 1.3 2003/08/15 19:27:45 recht Exp $
  
        echo "$as_me:$LINENO: checking for swig library directory" >&5
  echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
-@@ -10715,8 +10717,9 @@
+@@ -10979,8 +10981,9 @@
      esac
      if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
        ### TODO: When it's ready, add the swig-java-lib rule here.