Turn this into a meta-package for Subversion 0.23.0. Also, it

contains the infrastructure (Makefile.common, buildlink2.mk, distinfo,
and patches).

12 files changed, 245 insertions, 150 deletions

diff --git a/devel/subversion/DESCR b/devel/subversion/DESCR
index 6d26e82f1d0..d3a6663e3d8 100644
--- a/devel/subversion/DESCR
+++ b/devel/subversion/DESCR
@@ -1,3 +1,6 @@
 The goal of the Subversion project is to build a version control system that
 is a compelling replacement for CVS in the open source community. The software
 is released under an Apache/BSD-style open source license.
+
+This is a meta-package.  It installs no files, but it depends on all
+the Subversion components.
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 5e7e4c41190..f4381161fd7 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -1,41 +1,25 @@
-# $NetBSD: Makefile,v 1.10 2003/05/02 11:54:42 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.11 2003/05/25 09:31:28 epg Exp $
 
-DISTNAME=	subversion-0.20.1
-PKGREVISION=	1
-CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/files/documents/15/3440/
+PKGNAME=	subversion-${SVNVER}
+COMMENT=	Version control system, meta-package
 
-MAINTAINER=	joelw@unix.se
-HOMEPAGE=	http://subversion.tigris.org
-COMMENT=	Version control system, meant to replace CVS
+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.
 
-BUILDLINK_DEPENDS.apache=	apache>=2.0.44
-# we need apr shared libs at runtime
-BUILDLINK_DEPMETHOD.apache=	full
+.include "Makefile.common"
 
-USE_BUILDLINK2=	YES
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
+EXTRACT_ONLY=	# empty
+NO_CHECKSUM=	YES
+NO_CONFIGURE=	YES
+NO_BUILD=	YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+# The NO_PATCH macro is gone so we have to do this to prevent the
+# patches from being applied:
+do-patch:
 
-CONFIGURE_ARGS=		--with-ssl
-CONFIGURE_ARGS+=	--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include/db4:${LOCALBASE}
-CONFIGURE_ARGS+=	--with-neon=${BUILDLINK_PREFIX.neon}
+do-install:
 
-PLIST_SUBST=	INSTALL_INFO=${INSTALL_INFO}
-INFO_FILES=	svn-design.info
-
-post-extract:
-	@${RM} -r ${WRKSRC}/neon
-	@${RM} -r ${WRKSRC}/apr
-	@${RM} -r ${WRKSRC}/apr-util
-
-.include "../../databases/db4/buildlink2.mk"
-.include "../../textproc/expat/buildlink2.mk"
-.include "../../www/apache2/buildlink2.mk"
-.include "../../www/neon/buildlink2.mk"
-
-.include "../../mk/texinfo.mk"
+.include "../../devel/subversion-python/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/subversion/Makefile.common b/devel/subversion/Makefile.common
new file mode 100644
index 00000000000..1b125f7e2ed
--- /dev/null
+++ b/devel/subversion/Makefile.common
@@ -0,0 +1,27 @@
+# $NetBSD: Makefile.common,v 1.1 2003/05/25 09:31:28 epg Exp $
+
+DISTNAME=		subversion-${SVNVER}
+CATEGORIES=		devel
+
+MAINTAINER=		epg@pretzelnet.org
+HOMEPAGE=		http://subversion.tigris.org/
+
+.include "../../devel/subversion/Makefile.version"
+
+SVNEXAMPLES=		${PREFIX}/share/examples/subversion
+SVNDOC=			${PREFIX}/share/doc/subversion
+
+DISTINFO_FILE=		${.CURDIR}/../../devel/subversion/distinfo
+COMMON_FILESDIR=	${.CURDIR}/../../devel/subversion/files
+PATCHDIR=		${.CURDIR}/../../devel/subversion/patches
+
+GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+CONFIGURE_ARGS+=	--with-apr=${BUILDLINK_PREFIX.apr}
+CONFIGURE_ARGS+=	--with-apr-util=${BUILDLINK_PREFIX.apr}
+CONFIGURE_ARGS+=	--with-berkeley-db=${BUILDLINK_PREFIX.db4}/include/db4:${LOCALBASE}
+CONFIGURE_ARGS+=	--with-neon=${BUILDLINK_PREFIX.neon}
+CONFIGURE_ARGS+=	--with-ssl
diff --git a/devel/subversion/Makefile.version b/devel/subversion/Makefile.version
new file mode 100644
index 00000000000..c670bba9c61
--- /dev/null
+++ b/devel/subversion/Makefile.version
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.version,v 1.1 2003/05/25 09:31:28 epg Exp $
+
+.if !defined(SVNVER)
+SVNVER=		0.23.0
+# This macro is in this file because the URL changes with every release.
+MASTER_SITES=	http://subversion.tigris.org/files/documents/15/4218/
+.endif
diff --git a/devel/subversion/PLIST b/devel/subversion/PLIST
index 00427676792..ff38dec6bac 100644
--- a/devel/subversion/PLIST
+++ b/devel/subversion/PLIST
@@ -1,103 +1 @@
-@comment $NetBSD: PLIST,v 1.4 2003/01/30 17:48:54 drochner Exp $
-bin/svn
-bin/svn-config
-bin/svnadmin
-bin/svnlook
-bin/svnserve
-bin/svnversion
-include/subversion-1/svn-revision.txt
-include/subversion-1/svn_auth.h
-include/subversion-1/svn_base64.h
-include/subversion-1/svn_client.h
-include/subversion-1/svn_config.h
-include/subversion-1/svn_dav.h
-include/subversion-1/svn_delta.h
-include/subversion-1/svn_diff.h
-include/subversion-1/svn_error.h
-include/subversion-1/svn_error_codes.h
-include/subversion-1/svn_fs.h
-include/subversion-1/svn_hash.h
-include/subversion-1/svn_io.h
-include/subversion-1/svn_md5.h
-include/subversion-1/svn_opt.h
-include/subversion-1/svn_path.h
-include/subversion-1/svn_pools.h
-include/subversion-1/svn_props.h
-include/subversion-1/svn_quoprint.h
-include/subversion-1/svn_ra.h
-include/subversion-1/svn_ra_svn.h
-include/subversion-1/svn_repos.h
-include/subversion-1/svn_sorts.h
-include/subversion-1/svn_string.h
-include/subversion-1/svn_subst.h
-include/subversion-1/svn_test.h
-include/subversion-1/svn_time.h
-include/subversion-1/svn_types.h
-include/subversion-1/svn_utf.h
-include/subversion-1/svn_version.h
-include/subversion-1/svn_wc.h
-include/subversion-1/svn_xml.h
-@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/svn-design.info
-info/svn-design.info
-info/svn-design.info-1
-info/svn-design.info-2
-info/svn-design.info-3
-@exec ${INSTALL_INFO} --info-dir=%D/info %D/info/svn-design.info
-lib/libsvn_auth-1.a
-lib/libsvn_auth-1.la
-lib/libsvn_auth-1.so
-lib/libsvn_auth-1.so.0
-lib/libsvn_auth-1.so.0.0
-lib/libsvn_client-1.a
-lib/libsvn_client-1.la
-lib/libsvn_client-1.so
-lib/libsvn_client-1.so.0
-lib/libsvn_client-1.so.0.0
-lib/libsvn_delta-1.a
-lib/libsvn_delta-1.la
-lib/libsvn_delta-1.so
-lib/libsvn_delta-1.so.0
-lib/libsvn_delta-1.so.0.0
-lib/libsvn_fs-1.a
-lib/libsvn_fs-1.la
-lib/libsvn_fs-1.so
-lib/libsvn_fs-1.so.0
-lib/libsvn_fs-1.so.0.0
-lib/libsvn_ra-1.a
-lib/libsvn_ra-1.la
-lib/libsvn_ra-1.so
-lib/libsvn_ra-1.so.0
-lib/libsvn_ra-1.so.0.0
-lib/libsvn_ra_dav-1.a
-lib/libsvn_ra_dav-1.la
-lib/libsvn_ra_dav-1.so
-lib/libsvn_ra_dav-1.so.0
-lib/libsvn_ra_dav-1.so.0.0
-lib/libsvn_ra_local-1.a
-lib/libsvn_ra_local-1.la
-lib/libsvn_ra_local-1.so
-lib/libsvn_ra_local-1.so.0
-lib/libsvn_ra_local-1.so.0.0
-lib/libsvn_ra_svn-1.a
-lib/libsvn_ra_svn-1.la
-lib/libsvn_ra_svn-1.so
-lib/libsvn_ra_svn-1.so.0
-lib/libsvn_ra_svn-1.so.0.0
-lib/libsvn_repos-1.a
-lib/libsvn_repos-1.la
-lib/libsvn_repos-1.so
-lib/libsvn_repos-1.so.0
-lib/libsvn_repos-1.so.0.0
-lib/libsvn_subr-1.a
-lib/libsvn_subr-1.la
-lib/libsvn_subr-1.so
-lib/libsvn_subr-1.so.0
-lib/libsvn_subr-1.so.0.0
-lib/libsvn_wc-1.a
-lib/libsvn_wc-1.la
-lib/libsvn_wc-1.so
-lib/libsvn_wc-1.so.0
-lib/libsvn_wc-1.so.0.0
-man/man1/svn.1
-man/man1/svnadmin.1
-@dirrm include/subversion-1
+@comment $NetBSD: PLIST,v 1.5 2003/05/25 09:31:29 epg Exp $
diff --git a/devel/subversion/buildlink2.mk b/devel/subversion/buildlink2.mk
index 6ed4b4287e5..b58deaafcc2 100644
--- a/devel/subversion/buildlink2.mk
+++ b/devel/subversion/buildlink2.mk
@@ -1,14 +1,13 @@
-# $NetBSD: buildlink2.mk,v 1.3 2003/05/02 11:54:42 wiz Exp $
-#
+# $NetBSD: buildlink2.mk,v 1.4 2003/05/25 09:31:29 epg Exp $
 
 .if !defined(SUBVERSION_BUILDLINK2_MK)
-SUBVERSION_BUILDLINK2_MK=          #defined
+SUBVERSION_BUILDLINK2_MK=		#defined
 
 BUILDLINK_PACKAGES+=			subversion-base
-BUILDLINK_DEPENDS.subversion-base?=	subversion>=0.20.1nb1
-BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion
+BUILDLINK_DEPENDS.subversion-base?=	subversion-base>=${SVNVER}
+BUILDLINK_PKGSRCDIR.subversion-base?=	../../devel/subversion-base
 
-EVAL_PREFIX+=	BUILDLINK_PREFIX.subversion-base=subversion
+EVAL_PREFIX+=			BUILDLINK_PREFIX.subversion-base=subversion-base
 BUILDLINK_PREFIX.subversion-base_DEFAULT=	${LOCALBASE}
 
 BUILDLINK_FILES.subversion-base+=	bin/svn-config
@@ -16,12 +15,13 @@ BUILDLINK_FILES.subversion-base+=	include/subversion-1/*
 BUILDLINK_FILES.subversion-base+=	lib/libsvn*
 
 .include "../../databases/db4/buildlink2.mk"
-.include "../../textproc/expat/buildlink2.mk"
-.include "../../www/apache2/buildlink2.mk"
+.include "../../devel/apr/buildlink2.mk"
 .include "../../www/neon/buildlink2.mk"
 
-BUILDLINK_TARGETS+=             subversion-base-buildlink
+.include "../../devel/subversion/Makefile.version"
 
-subversion-base-buildlink:	_BUILDLINK_USE
+BUILDLINK_TARGETS+=		subversion-base-buildlink
 
-.endif  # SUBVERSION_BUILDLINK2_MK
+subversion-base-buildlink: _BUILDLINK_USE
+
+.endif	# SUBVERSION_BUILDLINK2_MK
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index b2c7d4ee917..6842700e230 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,4 +1,9 @@
-$NetBSD: distinfo,v 1.5 2003/04/15 16:23:22 salo Exp $
+$NetBSD: distinfo,v 1.6 2003/05/25 09:31:29 epg Exp $
 
-SHA1 (subversion-0.20.1.tar.gz) = d180593fe5f23a5daff82c65957ff16571eb14d8
-Size (subversion-0.20.1.tar.gz) = 7645003 bytes
+SHA1 (subversion-0.23.0.tar.gz) = c19fc76f49734556d053b4fa53f4bbe06004c12f
+Size (subversion-0.23.0.tar.gz) = 7700961 bytes
+SHA1 (patch-aa) = 9d35603f24c1dfab3c8dd3019778196ea519f228
+SHA1 (patch-ab) = 706c596c8319722a43eecb2281c6574538a71670
+SHA1 (patch-ac) = ae609ba0d3f7c9ff2c1419af335d0a363404a9be
+SHA1 (patch-ad) = b152158db469cd5c7e5e4b5b10c341983725fa39
+SHA1 (patch-ae) = e60fdf9d8a978dfb12fdfe627c988e87a59e7dff
diff --git a/devel/subversion/patches/patch-aa b/devel/subversion/patches/patch-aa
new file mode 100644
index 00000000000..ac56a6f7c12
--- /dev/null
+++ b/devel/subversion/patches/patch-aa
@@ -0,0 +1,85 @@
+$NetBSD: patch-aa,v 1.3 2003/05/25 09:31:29 epg Exp $
+
+--- build-outputs.mk.orig	Tue Apr 15 20:16:02 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)
+ 	cd subversion/bindings/swig && $(LINK) -o libsvn_swig_java-1.la $(libsvn_swig_java_OBJECTS) $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(LIBS)
+ 
+-libsvn_swig_py_DEPS = subversion/bindings/swig/swigutil_py.lo subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_delta/libsvn_delta-1.la 
++libsvn_swig_py_DEPS = subversion/bindings/swig/swigutil_py.lo
+ libsvn_swig_py_OBJECTS = swigutil_py.lo
+ subversion/bindings/swig/libsvn_swig_py-1.la: $(libsvn_swig_py_DEPS)
+-	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
+@@ -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)
+ 
+-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
+@@ -214,40 +214,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)
+ 
+-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 
+ 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) -lsvn_client-1 -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
+ 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) -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 
+ 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) -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 
+ 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) -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 
+ 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) -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
+ 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) -lsvn_wc-1 -lswigpy ../../../../subversion/bindings/swig/libsvn_swig_py-1.la $(LIBS)
+ 
+ svn_DEPS = subversion/clients/cmdline/add-cmd.o subversion/clients/cmdline/cat-cmd.o subversion/clients/cmdline/checkout-cmd.o subversion/clients/cmdline/cleanup-cmd.o subversion/clients/cmdline/commit-cmd.o subversion/clients/cmdline/copy-cmd.o subversion/clients/cmdline/delete-cmd.o subversion/clients/cmdline/diff-cmd.o subversion/clients/cmdline/export-cmd.o subversion/clients/cmdline/feedback.o subversion/clients/cmdline/help-cmd.o subversion/clients/cmdline/import-cmd.o subversion/clients/cmdline/info-cmd.o subversion/clients/cmdline/log-cmd.o subversion/clients/cmdline/ls-cmd.o subversion/clients/cmdline/main.o subversion/clients/cmdline/merge-cmd.o subversion/clients/cmdline/mkdir-cmd.o subversion/clients/cmdline/move-cmd.o subversion/clients/cmdline/prompt.o subversion/clients/cmdline/propdel-cmd.o subversion/clients/cmdline/propedit-cmd.o subversion/clients/cmdline/propget-cmd.o subversion/clients/cmdline/proplist-cmd.o subversion/clients/cmdline/props.o subversion/clients/cmdline/propset-cmd.o subversion/clients/cmdline/resolve-cmd.o subversion/clients/cmdline/revert-cmd.o subversion/clients/cmdline/status-cmd.o subversion/clients/cmdline/status.o subversion/clients/cmdline/switch-cmd.o subversion/clients/cmdline/update-cmd.o subversion/clients/cmdline/util.o subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_subr/libsvn_subr-1.la 
+ svn_OBJECTS = add-cmd.o cat-cmd.o checkout-cmd.o cleanup-cmd.o commit-cmd.o copy-cmd.o delete-cmd.o diff-cmd.o export-cmd.o feedback.o help-cmd.o import-cmd.o info-cmd.o log-cmd.o ls-cmd.o main.o merge-cmd.o mkdir-cmd.o move-cmd.o prompt.o propdel-cmd.o propedit-cmd.o propget-cmd.o proplist-cmd.o props.o propset-cmd.o resolve-cmd.o revert-cmd.o status-cmd.o status.o switch-cmd.o update-cmd.o util.o
diff --git a/devel/subversion/patches/patch-ab b/devel/subversion/patches/patch-ab
new file mode 100644
index 00000000000..daa3da57e2b
--- /dev/null
+++ b/devel/subversion/patches/patch-ab
@@ -0,0 +1,17 @@
+$NetBSD: patch-ab,v 1.3 2003/05/25 09:31:29 epg Exp $
+
+--- tools/backup/hot-backup.py.in.orig	Wed Mar 12 21:09:33 2003
++++ tools/backup/hot-backup.py.in
+@@ -31,10 +31,10 @@ import sys, os, shutil, string, re
+ svnlook = "@SVN_BINDIR@/svnlook"
+ 
+ # Path to db_archive program
+-db_archive = "/usr/local/BerkeleyDB.4.0/bin/db_archive"
++db_archive = "/usr/pkg/bin/db4_archive"
+ 
+ # Path to db_recover progrem
+-db_recover = "/usr/local/BerkeleyDB.4.0/bin/db_recover"
++db_recover = "/usr/pkg/bin/db4_recover"
+ 
+ # Number of backups to keep around (0 for "keep them all")
+ num_backups = 64
diff --git a/devel/subversion/patches/patch-ac b/devel/subversion/patches/patch-ac
new file mode 100644
index 00000000000..8b4a85fb66b
--- /dev/null
+++ b/devel/subversion/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.3 2003/05/25 09:31:29 epg Exp $
+
+--- tools/cgi/tweak-log.cgi.orig	Wed Jan 22 02:15:35 2003
++++ tools/cgi/tweak-log.cgi
+@@ -29,8 +29,8 @@ use CGI qw(:standard);
+ ###############################################################################
+ # Configuration Section
+ 
+-my $gSvnlookCmd = '/usr/local/bin/svnlook';
+-my $gSvnadminCmd = '/usr/local/bin/svnadmin';
++my $gSvnlookCmd = '/usr/pkg/bin/svnlook';
++my $gSvnadminCmd = '/usr/pkg/bin/svnadmin';
+ my $gReposPath = '/usr/www/repositories/svn';
+ my $gActionURL = './tweak-log.cgi';
+ my $gTempfilePrefix = '/tmp/tweak-cgi';
diff --git a/devel/subversion/patches/patch-ad b/devel/subversion/patches/patch-ad
new file mode 100644
index 00000000000..e477b361e83
--- /dev/null
+++ b/devel/subversion/patches/patch-ad
@@ -0,0 +1,14 @@
+$NetBSD: patch-ad,v 1.3 2003/05/25 09:31:30 epg Exp $
+
+--- Makefile.in.orig	Wed Apr 16 00:51:46 2003
++++ Makefile.in
+@@ -70,7 +70,8 @@ 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/svn
+ swig_javadir = @libdir@/svn-java
+ 
+ ### should search for these...
diff --git a/devel/subversion/patches/patch-ae b/devel/subversion/patches/patch-ae
new file mode 100644
index 00000000000..13d9d1f913d
--- /dev/null
+++ b/devel/subversion/patches/patch-ae
@@ -0,0 +1,40 @@
+$NetBSD: patch-ae,v 1.1 2003/05/25 09:31:30 epg Exp $
+
+--- configure.orig	Sat May 17 19:28:50 2003
++++ configure
+@@ -10287,8 +10287,9 @@ echo "$as_me: WARNING: swig bindings req
+     esac
+     if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
+       ### TODO: When it's ready, add the swig-java-lib rule here.
+-      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 for swig library directory" >&5
+ echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
+@@ -10454,8 +10455,9 @@ echo "$as_me: WARNING: swig bindings req
+     esac
+     if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
+       ### TODO: When it's ready, add the swig-java-lib rule here.
+-      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 for swig library directory" >&5
+ echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6
+@@ -10624,8 +10626,9 @@ echo "$as_me: WARNING: swig bindings req
+     esac
+     if test "$PYTHON" != "none" -a "$SWIG_SUITABLE" = "yes"; then
+       ### TODO: When it's ready, add the swig-java-lib rule here.
+-      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 for swig library directory" >&5
+ echo $ECHO_N "checking for swig library directory... $ECHO_C" >&6