Version 1.1.0

(29 September 2004, from /branches/1.1.x)
http://svn.collab.net/repos/svn/tags/1.1.0

See the 1.1 release notes for a more verbose overview of the changes since
1.0.x: http://subversion.tigris.org/svn_1.1_releasenotes.html

 User-visible-changes:
 * new non-database repository back-end (libsvn_fs_fs)
 * symlinks can now be placed under version control (unix systems only)
 * cmdline client now supports psuedo-IRIs and autoescapes chars (issue #1910)
 * 'svnadmin recover' no longer waits forever for a lock (new '--wait' option)
 * new $Revision$ synonym for $Rev$ and $LastChangedRevision$
 * new runtime option 'store-passwords = ' gives finer control (r10794)x
 * fixed: working copies now shareable by multiple users (issue #1509)
 * fixed: diff and other subcommands correctly follow renames (issue #1093)
     - new 'peg' syntax for diff/merge:  'svn diff -r X:Y TARGET@REV'
     - now able to compare working copy with URL: 'svn diff --old WC --new URL'
 * new framework for localized error/info/help messages, initial translations:
     - German, Polish, Swedish, Norwegian Bokmål, Traditional Chinese,
       Japanese, Brazilian Portuguese.
 * speed improvements:
     - faster 'svn up' on complex working copies -- no more repos txns (r8840)
     - faster 'svn status' -- fewer stat() calls (r9182)
     - faster 'svn checkout' -- fewer sleep() calls (r9123)
     - faster 'svn blame' -- new RA->get_file_revs() func (issue #1715)
 * new switches added:
     - 'svn blame --verbose'            - show extra annotation info
     - 'svn export --native-eol TYPE'   - export using TYPE line-endings
     - 'svn add --force'                - recurse into version-controlled dirs
     - 'svnadmin dump --deltas'         - include binary diffs in dumpfile
     - 'svnadmin create --fs-type fsfs' - create fs_fs repos (default is bdb)
     - 'svnserve --tunnel-user=NAME'    - assume authenticated NAME over tunnel
     - 'svndumpfilter [cmd] --quiet'    - less chatty dumpfiltering
     - 'svnserve --version'             - show program's version
       'svnversion --version'
       'svndumpfilter --version'
 * svnadmin dump/deltify now understand -r{DATE} (r9805)
 * allow update of non-existent target entry (partial issue #1902 fix)
 * 'svnadmin create' now sets sgid bit on repos/db/  (unix systems only)
 * increase default neon (ra_dav) timeout from 120 to 3600 seconds (r9568)
 * print verbose BDB error messages (r10557, r10566)
 * fixed: don't bail when 'svn up' refuses to delete local mods (issue #1806)
 * fixed: process svn:externals in defined order (issue #1788)
 * fixed: pass new propval to stdin of pre-revprop-change hook (issue #952)
 * fixed: svndumpfilter logic/memory/display bugs (r8691, 8831, 9061)
 * fixed: 'svnadmin hotcopy PATH .' (r8659)
 * fixed: copy crash bug (r8863)
 * fixed: 'svn st -u' crash bug (r10841)
 * fixed: 'svn commit' segfault (r10676)
 * fixed: allow cleanup on .svn/ dirs containing KILLME file (r8891)
 * fixed: 'svn revert' detects corrupted text-base (r8897)
 * fixed: 'svn status -N' no longer locks entire tree (r8906)
 * fixed: several different 'svn switch' bugs (r9192, 9203, 9238, 9698)
 * fixed: some 'svn copy' bugs (r9193, 9274)
 * fixed: obscure update-deletion bug (r8976)
 * fixed: utf8 conversion 'hang' (r9233)
 * fixed: missing UTF8->native recoding in 'svn log' output (r10652, 10673)
 * fixed: 'svn blame' now defaults to  rev (r9440)
 * fixed: 'svn blame' closing files before deleting them (issue #1969)
 * fixed: 'svn diff' shows truncated paths (r9693)
 * fixed: 'svn diff --notice-ancestry' bug (r9699)
 * fixed: 'svn subcommand -r{DATE} URL' works if URL not in HEAD (issue #1840)
 * fixed: 'svn blame' on non-ascii path truncation (issue #1770)
 * fixed: svn:external 'wc not locked' bug (issue #1897)
 * fixed: proper mod_dav_svn html/xml escaping (issue #1209)
 * fixed: memleak in 'svn propset -R URL' (issue #1928)
 * fixed: potential repos corruption; ensure stdin/out/err always open (r10819)
 * fixed: stop 'svn up' from deleting schedule-add target dir (issue #1793)
 * fixed: 'svn merge' adding a directory already 'deleted' (issue #1769)
 * fixed: excessive memory use when fs deltifies revision 2^N (r10070)
 * fixed: disallow non-recursive directory commit (issue #1797)
 * fixed: allow propget of props with colon in name (issue #1807)
 * fixed: 'svnadmin load' computation of copyfrom-rev (issue #1795)
 * fixed: runtime config files created with proper line-endings (issue #1803)
 * fixed: make svnserve's authn work on usernames with spaces (r10385)
 * fixed: have svnserve use repos UUID as default authn realm (r10394)
 * fixed: segfault when history-following hits 'empty' revision (r10368)
 * fixed: overzealous out-of-dateness checks in 'svn cp wc URL' (issue 1994)
 * fixed: don't URI-encode path in mod_dav_svn XML listings (r10461)
 * fixed: 'svn info' should refuse URL targets (r10760)
 * fixed: incomplete-directory handling bug (r10956)
 * fixed: allow cancellation between files during recursive dir add (r10894)
 * general improvement and normalization of error messages
 * many improvements to contributed tools:  mailer.py, psvn.el, etc.

 Developer-visible changes:
 * libsvn_fs now loads either bdb (libsvn_fs_base) or fsfs (libsvn_fs_fs)
 * new console-printing API:  svn_cmdline_printf() family checks for errors.
 * new library-version querying API:
     - new svn_[libname]_version() in each library
     - svn_ver_*() family of functions
 * 2nd generation APIs, from svn_foo() --> svn_foo2().  old APIs deprecated.
     - svn_wc_adm_open2() & friends, svn_wc_export2(), svn_client_add2()
       svn_wc_parse_externals_description2(), svn_hash_read/write2(),
       svn_repos_dump/load_fs2() & friends, svn_wc_diff2(),
       svn_subst_copy_and_translate2()
 * other new APIs:
     - svn_stream_copy(), svn_txdelta_target_push(), svn_opt_parse_path(),
       svn_io_file_flush_to_disk, svn_repos_trace_node_locations(),
       svn_repos_get_file_revs(), RA->get_locations(), RA->get_file_revs,
       RA->get_version(), svn_sort_compare_paths(), svn_utf_initialize()
 * SVN_REVNUM_FMT_T usage replaced with %ld (r9691)
 * cache mod_authz_svn authz file per connection (r8867)
 * validate hex digits in % escape (issue #1947)
 * hashes now written to disk in sorted order (r9910)
 * do cancellation checks before loops, not after (r8918)
 * fixed: bug in svn_repos_dir_delta replacement logic (r8078)
 * fixed: tiny memory access bugs (r8229, 8230, 8313)
 * fixed: several commit buglets (r8955, 9658, 9757, 9855)
 * fixed: don't recursively lock all prop commands (r9172)
 * fixed: svnserve memory usage on many-file commits (r9185)
 * fixed: close svnserve child's listen-socket after forking (r10050)
 * fixed: 'svnadmin hotcopy' integrity improvements (issues #1817, #1818)
 * fixed: only verify media type of svn:mime-type, not encoding (r10126)
 * fixed: handle '//'  and '..' in svn_path_canonicalize (issue #1779)
 * fixed: double URI escaping (issue #1814)
 * fixed: editor-driver bug (don't delete before every copy) (r10851)
 * fixed: potential mod_dav_svn crashes/memleaks (r10478)
 * fixed: better 'svnadmin verify  verification (r10508, r10509)
 * fixed: encoding of get_repos_url_result (r10353, 10375)
 * fixed: prevent canonicalized URIs from ending in '/' (r10317)
 * stop using -std=c89 gcc flag (r11054)
 * sync with apr 1.0's find_apr.m4 and find_apu.m4 files (r10560)
 * win32 installer improvements (r10978)
 * huge improvements to python, perl, java bindings
 * huge changes to win32 build system

pkgsrc changes:

 * subversion-base no longer requires db4.  If APR_USE_DB4 is NO,
   subversion-base will only build the new native filesystem back-end;
   if it is YES subversion-base will build both back-ends.  The
   APR_USE_DB4 variable is used for this purpose because when
   Subversion uses db4 it uses it through APR; it can't use db4 if APR
   doesn't.

 * Resurrect a tiny part of patch-aa so that subpackages
   (p5-subversion, etc.) don't try to install the libraries in
   subversion-base.

 * patch-ae is no longer needed.

10 files changed, 71 insertions, 92 deletions

diff --git a/devel/p5-subversion/Makefile b/devel/p5-subversion/Makefile
index 61bfd47e4f6..25af8e293f7 100644
--- a/devel/p5-subversion/Makefile
+++ b/devel/p5-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/03/29 18:08:33 epg Exp $
+# $NetBSD: Makefile,v 1.11 2004/09/30 14:39:33 epg Exp $
 
 PKGNAME=	p5-subversion-${SVNVER}
 COMMENT=	Perl bindings for Subversion
@@ -9,20 +9,12 @@ CONFIGURE_ENV+=		PERL=${PERL5}
 
 PERL5_REQD+=		5.8
 PERL_DIR=		${WRKSRC}/subversion/bindings/swig/perl
-ALL_TARGET=		swig-pl-lib
-INSTALL_TARGET=		install-swig-pl-lib
+ALL_TARGET=		swig-pl-lib swig-pl
+INSTALL_TARGET=		install-swig-pl
 PERL5_CONFIGURE=	NO
-PERL5_CONFIGURE_DIRS=	${PERL_DIR}
+#PERL5_CONFIGURE_DIRS=	${PERL_DIR}
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/SVN/_Core/.packlist
 
-post-build: perl5-configure
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${PERL_DIR} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS}
-
-post-install:
-	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}cd ${PERL_DIR} && \
-		${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} install
-
 .include "../../devel/subversion/buildlink3.mk"
 .include "../../devel/swig-build/buildlink3.mk"
 .include "../../devel/swig-perl/buildlink3.mk"
diff --git a/devel/py-subversion/Makefile b/devel/py-subversion/Makefile
index bc312baccd6..21ed3dc707f 100644
--- a/devel/py-subversion/Makefile
+++ b/devel/py-subversion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/29 18:08:33 epg Exp $
+# $NetBSD: Makefile,v 1.8 2004/09/30 14:39:33 epg Exp $
 
 PKGNAME=	${PYPKGPREFIX}-subversion-${SVNVER}
 COMMENT=	Python bindings and tools for Subversion
@@ -12,7 +12,7 @@ PYBINMODULE=		YES
 PYTHON_PATCH_SCRIPTS=	tools/hook-scripts/mailer/mailer.py
 
 ALL_TARGET=		swig-py-lib swig-py
-INSTALL_TARGET=		install-swig-py-lib install-swig-py
+INSTALL_TARGET=		install-swig-py
 
 MAKE_ENV+=		EXTRA_CPPFLAGS="${BUILDLINK_CPPFLAGS}"
 MAKEFLAGS+=		swig_pydir=${LOCALBASE}/${PYSITELIB}/libsvn \
diff --git a/devel/subversion-base/Makefile b/devel/subversion-base/Makefile
index c6b415e2fa3..0ad09d3ec38 100644
--- a/devel/subversion-base/Makefile
+++ b/devel/subversion-base/Makefile
@@ -1,13 +1,22 @@
-# $NetBSD: Makefile,v 1.15 2004/08/25 18:46:18 seb Exp $
+# $NetBSD: Makefile,v 1.16 2004/09/30 14:39:33 epg Exp $
 
 PKGNAME=	subversion-base-${SVNVER}
 COMMENT=	Version control system, base programs and libraries
 
 .include "../subversion/Makefile.common"
 
+BUILD_DEFS+=		APR_USE_DB4
+
 CONFIGURE_ARGS+=	--without-apache
 CONFIGURE_ARGS+=	--without-apxs
 
+.include "../../mk/bsd.prefs.mk"
+.if !empty(APR_USE_DB4:M[yY][eE][sS])
+PLIST_SRC=		${PKGDIR}/PLIST ${PKGDIR}/PLIST.bdb
+.else
+CONFIGURE_ARGS+=	--without-berkeley-db
+.endif
+
 # XXX Timestamps are broken in 1.0.1 tar file; should go away in 1.0.2.
 post-build:
 	${TOUCH} ${WRKSRC}/doc/programmer/design/svn-design.info
@@ -43,7 +52,11 @@ post-install:
 BUILDLINK_DEPENDS.apr+=		apr>=0.9.5
 BUILDLINK_DEPENDS.neon+=	neon>=0.24.7
 
-.include "../../databases/db4/buildlink3.mk"
+.if !empty(APR_USE_DB4:M[yY][eE][sS])
+.  include "../../databases/db4/buildlink3.mk"
+.endif
+
 .include "../../devel/apr/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion-base/PLIST b/devel/subversion-base/PLIST
index 3316ab8f349..59f8b4f2bf2 100644
--- a/devel/subversion-base/PLIST
+++ b/devel/subversion-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2004/09/22 08:09:29 jlam Exp $
+@comment $NetBSD: PLIST,v 1.7 2004/09/30 14:39:33 epg Exp $
 bin/svn
 bin/svnadmin
 bin/svndumpfilter
@@ -43,6 +43,7 @@ lib/libsvn_client-1.la
 lib/libsvn_delta-1.la
 lib/libsvn_diff-1.la
 lib/libsvn_fs-1.la
+lib/libsvn_fs_fs-1.la
 lib/libsvn_ra-1.la
 lib/libsvn_ra_dav-1.la
 lib/libsvn_ra_local-1.la
@@ -64,6 +65,13 @@ share/examples/subversion/hook-scripts/commit-email.pl
 share/examples/subversion/hook-scripts/propchange-email.pl
 share/examples/subversion/hook-scripts/svnperms.conf.example
 share/examples/subversion/hook-scripts/svnperms.py
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/subversion.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/subversion.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/subversion.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/subversion.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/subversion.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/subversion.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/subversion.mo
 @dirrm share/examples/subversion/hook-scripts
 @dirrm share/examples/subversion/cgi
 @dirrm share/examples/subversion/backup
diff --git a/devel/subversion-base/PLIST.bdb b/devel/subversion-base/PLIST.bdb
new file mode 100644
index 00000000000..25dbdd41aab
--- /dev/null
+++ b/devel/subversion-base/PLIST.bdb
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.bdb,v 1.1 2004/09/30 14:39:33 epg Exp $
+lib/libsvn_fs_base-1.la
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
index 5b469520328..3e7f37d4e2e 100644
--- a/devel/subversion/Makefile.version
+++ b/devel/subversion/Makefile.version
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile.version,v 1.23 2004/09/25 20:45:49 epg Exp $
+# $NetBSD: Makefile.version,v 1.24 2004/09/30 14:39:33 epg Exp $
 
 .if !defined(SVNVER)
-SVNVER=		1.0.8
+SVNVER=		1.1.0
 .endif
diff --git a/devel/subversion/buildlink3.mk b/devel/subversion/buildlink3.mk
index e89107a6800..9b99cbf8c06 100644
--- a/devel/subversion/buildlink3.mk
+++ b/devel/subversion/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2004/09/01 09:14:01 martin Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2004/09/30 14:39:33 epg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 SUBVERSION_BASE_BUILDLINK3_MK:=	${SUBVERSION_BASE_BUILDLINK3_MK}+
@@ -20,7 +20,11 @@ BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
 .endif	# SUBVERSION_BASE_BUILDLINK3_MK
 
-.include "../../databases/db4/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.if !empty(APR_USE_DB4:M[yY][eE][sS])
+.  include "../../databases/db4/buildlink3.mk"
+.endif
+
 .include "../../devel/apr/buildlink3.mk"
 .include "../../www/neon/buildlink3.mk"
 
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index c02f0907770..281a4e9f897 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.34 2004/09/25 20:45:50 epg Exp $
+$NetBSD: distinfo,v 1.35 2004/09/30 14:39:33 epg Exp $
 
-SHA1 (subversion-1.0.8.tar.gz) = eaedf92ee11a3712d5bcc77efefba476e5f798e0
-Size (subversion-1.0.8.tar.gz) = 7041030 bytes
+SHA1 (subversion-1.1.0.tar.gz) = b6c92a60898b612b61964e09da6025b27227b9af
+Size (subversion-1.1.0.tar.gz) = 8053391 bytes
+SHA1 (patch-aa) = 593ff1e235cc918e533f75f2d56fb575adcc7f6d
 SHA1 (patch-ac) = 7f0669a6f684583ff0ca4a443be356ae2fca06db
-SHA1 (patch-ae) = f46997aada11046dd935d740c6b071b98bba2150
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
new file mode 100644
index 00000000000..22e8b2d0623
--- /dev/null
+++ b/devel/subversion/patches/patch-aa
@@ -0,0 +1,27 @@
+$NetBSD: patch-aa,v 1.11 2004/09/30 14:39:33 epg Exp $
+
+--- build-outputs.mk.orig	2004-09-22 21:44:58.000000000 -0400
++++ build-outputs.mk
+@@ -585,11 +585,11 @@ install-swig-java-tests: 
+ 	$(MKDIR) $(DESTDIR)$(swig_java_testsdir)
+ 	$(INSTALL_EXTRA_SWIG_JAVA_TESTS)
+ 
+-install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la install-fsmod-lib
++install-swig-pl-lib: subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la
+ 	$(MKDIR) $(DESTDIR)$(swig_pl_libdir)
+ 	cd subversion/bindings/swig/perl/libsvn_swig_perl ; $(INSTALL_SWIG_PL_LIB) libsvn_swig_perl-1.la $(DESTDIR)$(swig_pl_libdir)/libsvn_swig_perl-1.la
+ 
+-install-swig-py: subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la install-lib install-ramod-lib install-fsmod-lib install-swig-py-lib
++install-swig-py: subversion/bindings/swig/python/_client.la subversion/bindings/swig/python/_core.la subversion/bindings/swig/python/_delta.la subversion/bindings/swig/python/_fs.la subversion/bindings/swig/python/_ra.la subversion/bindings/swig/python/_repos.la subversion/bindings/swig/python/_wc.la install-swig-py-lib
+ 	$(MKDIR) $(DESTDIR)$(swig_pydir)
+ 	cd subversion/bindings/swig/python ; $(INSTALL_SWIG_PY) _client.la $(DESTDIR)$(swig_pydir)/_client.la
+ 	cd subversion/bindings/swig/python ; $(INSTALL_SWIG_PY) _core.la $(DESTDIR)$(swig_pydir)/_core.la
+@@ -600,7 +600,7 @@ install-swig-py: subversion/bindings/swi
+ 	cd subversion/bindings/swig/python ; $(INSTALL_SWIG_PY) _wc.la $(DESTDIR)$(swig_pydir)/_wc.la
+ 	$(INSTALL_EXTRA_SWIG_PY)
+ 
+-install-swig-py-lib: subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la install-fsmod-lib
++install-swig-py-lib: subversion/bindings/swig/python/libsvn_swig_py/libsvn_swig_py-1.la
+ 	$(MKDIR) $(DESTDIR)$(swig_py_libdir)
+ 	cd subversion/bindings/swig/python/libsvn_swig_py ; $(INSTALL_SWIG_PY_LIB) libsvn_swig_py-1.la $(DESTDIR)$(swig_py_libdir)/libsvn_swig_py-1.la
+ 
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
deleted file mode 100644
index 4a7395a2ccb..00000000000
--- a/devel/subversion/patches/patch-ae
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-ae,v 1.11 2004/04/20 23:13:04 epg Exp $
-
---- configure.orig	Mon Apr 19 11:08:37 2004
-+++ configure
-@@ -10590,8 +10590,9 @@ echo "$as_me: WARNING: swig bindings ver
-     if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes" -a "$svn_swig_bindings_enable_python" = "yes"; then
-       { echo "$as_me:$LINENO: \"Configuring python swig binding\"" >&5
- echo "$as_me: \"Configuring python swig binding\"" >&6;}
--      SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-py-lib"
--      SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-py-lib"
-+      # XXX pkgsrc: Don't build bindings by default.
-+      #SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-py-lib"
-+      #SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-py-lib"
- 
-       echo "$as_me:$LINENO: checking if swig needs -L for its libraries" >&5
- echo $ECHO_N "checking if swig needs -L for its libraries... $ECHO_C" >&6
-@@ -10672,7 +10673,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
-       ### TODO: enable when the target is implemented correctly
- #      SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-pl-lib"
- #      SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-pl-lib"
--      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts | sed s/-fno-strict-aliasing//`"
-       SWIG_PL_COMPILE="`$PERL -MConfig -e 'print $Config{cc}'` \$(SWIG_PL_INCLUDES)"
-       SWIG_PL_LINK="`$PERL -MConfig -e 'print $Config{ld}'` `$PERL -MConfig -e 'print $Config{lddlflags}'` `$PERL -MExtUtils::Embed -e ldopts`"
-     fi
-@@ -10798,8 +10799,9 @@ echo "$as_me: WARNING: swig bindings ver
-     if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes" -a "$svn_swig_bindings_enable_python" = "yes"; then
-       { echo "$as_me:$LINENO: \"Configuring python swig binding\"" >&5
- echo "$as_me: \"Configuring python swig binding\"" >&6;}
--      SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-py-lib"
--      SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-py-lib"
-+      # XXX pkgsrc: Don't build bindings by default.
-+      #SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-py-lib"
-+      #SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-py-lib"
- 
-       echo "$as_me:$LINENO: checking if swig needs -L for its libraries" >&5
- echo $ECHO_N "checking if swig needs -L for its libraries... $ECHO_C" >&6
-@@ -10880,7 +10882,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
-       ### TODO: enable when the target is implemented correctly
- #      SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-pl-lib"
- #      SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-pl-lib"
--      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts | sed s/-fno-strict-aliasing//`"
-       SWIG_PL_COMPILE="`$PERL -MConfig -e 'print $Config{cc}'` \$(SWIG_PL_INCLUDES)"
-       SWIG_PL_LINK="`$PERL -MConfig -e 'print $Config{ld}'` `$PERL -MConfig -e 'print $Config{lddlflags}'` `$PERL -MExtUtils::Embed -e ldopts`"
-     fi
-@@ -11009,8 +11011,9 @@ echo "$as_me: WARNING: swig bindings ver
-     if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes" -a "$svn_swig_bindings_enable_python" = "yes"; then
-       { echo "$as_me:$LINENO: \"Configuring python swig binding\"" >&5
- echo "$as_me: \"Configuring python swig binding\"" >&6;}
--      SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-py-lib"
--      SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-py-lib"
-+      # XXX pkgsrc: Don't build bindings by default.
-+      #SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-py-lib"
-+      #SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-py-lib"
- 
-       echo "$as_me:$LINENO: checking if swig needs -L for its libraries" >&5
- echo $ECHO_N "checking if swig needs -L for its libraries... $ECHO_C" >&6
-@@ -11091,7 +11094,7 @@ echo "${ECHO_T}$ac_cv_python_link" >&6
-       ### TODO: enable when the target is implemented correctly
- #      SWIG_BUILD_RULES="$SWIG_BUILD_RULES swig-pl-lib"
- #      SWIG_INSTALL_RULES="$SWIG_INSTALL_RULES install-swig-pl-lib"
--      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts`"
-+      SWIG_PL_INCLUDES="\$(SWIG_INCLUDES) `$PERL -MExtUtils::Embed -e ccopts | sed s/-fno-strict-aliasing//`"
-       SWIG_PL_COMPILE="`$PERL -MConfig -e 'print $Config{cc}'` \$(SWIG_PL_INCLUDES)"
-       SWIG_PL_LINK="`$PERL -MConfig -e 'print $Config{ld}'` `$PERL -MConfig -e 'print $Config{lddlflags}'` `$PERL -MExtUtils::Embed -e ldopts`"
-     fi