6 files changed, 278 insertions, 54 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index d4294e3184e1..81459f01b9fb 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,35 +5,50 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1302
+PORTVERSION=	r1467
 CATEGORIES=	devel
-MASTER_SITES=	http://www.tigris.org/files/15/48/
+MASTER_SITES=	http://www.tigris.org/files/15/38/
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
-		neon.18:${PORTSDIR}/www/neon
+		neon.19:${PORTSDIR}/www/neon \
+		expat:${PORTSDIR}/textproc/expat \
+		apr:${PORTSDIR}/devel/apr-devel
 
 RUN_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
 		gpatch:${PORTSDIR}/devel/patch
 
 BUILD_DEPENDS=	gdiff:${PORTSDIR}/textproc/diffutils \
 		gpatch:${PORTSDIR}/devel/patch \
+		python:${PORTSDIR}/lang/python
 
 MAN1=		svn.1
 
-WRKSRC=	${WRKDIR}/subversion-r1302
+WRKSRC=	${WRKDIR}/subversion-r1467
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS= --disable-shared --with-ssl --with-neon=${LOCALBASE}
+CONFIGURE_ARGS= --with-ssl \
+		--with-neon=${LOCALBASE} \
+		--with-apr=${LOCALBASE} \
+		--with-apr-util=${LOCALBASE}
 
 post-extract:
+	# work around libdb4's name.
 	@${PERL} -pi -e 's/ldb/ldb4/g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's/external-install//g' ${WRKSRC}/Makefile.in
+
+	# axe the neon, apr, and apr-util subdirs to keep svn's build process
+	# from using them, since we're providing our own.
 	@${RM} -r ${WRKSRC}/neon
+	@${RM} -r ${WRKSRC}/apr
+	@${RM} -r ${WRKSRC}/apr-util
 
 post-configure:
+	# regenerate build-outputs.mk so we can use our installed expat,
+	# rather than the expat-lite in svn's tree
+	(cd ${WRKSRC} && ./gen-make.py -s build.conf)
+
+	# make sure we don't install the swig stuff, even if it was found
 	@${PERL} -pi -e 's/install-swig-py-lib//g' ${WRKSRC}/Makefile
 	@${PERL} -pi -e 's/swig-py-lib//g' ${WRKSRC}/Makefile
-	@${PERL} -pi -e 's/cd expat-lite ;/#/g' ${WRKSRC}/build-outputs.mk
 
 .include <bsd.port.mk>
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index cfb47c876d5f..4c6c11dabbb6 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1302.tar.gz) = 2d91b570b52ad5f217bb8b7e49decb76
+MD5 (subversion-r1467.tar.gz) = dd945c0150062cc4d1965df0b23cb22d
diff --git a/devel/subversion-devel/files/patch-build.conf b/devel/subversion-devel/files/patch-build.conf
new file mode 100644
index 000000000000..698b6ab25717
--- /dev/null
+++ b/devel/subversion-devel/files/patch-build.conf
@@ -0,0 +1,226 @@
+--- build.conf.orig	Fri Mar  8 17:19:05 2002
++++ build.conf	Fri Mar  8 18:42:28 2002
+@@ -63,7 +63,7 @@
+ type = exe
+ path = subversion/clients/cmdline
+ libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
+-	$(SVN_APR_LIBS) libexpat
++	$(SVN_APR_LIBS) -lexpat
+ manpages = subversion/clients/cmdline/man/svn.1
+ infopages = doc/user/manual/svn-manual.info
+  doc/user/svn_for_cvs_users/svn_for_cvs_users.info 
+@@ -77,14 +77,14 @@
+ type = exe
+ path = subversion/svnadmin
+ install = fs-bin
+-libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ 
+ # The subversion repository inspection tool
+ [svnlook]
+ type = exe
+ path = subversion/svnlook
+ install = fs-bin
+-libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_repos libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ 
+ # Library needed by all subversion clients
+ [libsvn_client]
+@@ -141,7 +141,7 @@
+ type = lib
+ install = base-lib
+ path = subversion/libsvn_subr
+-libs =  $(SVN_APR_LIBS) libexpat
++libs =  $(SVN_APR_LIBS) -lexpat
+ 
+ # Working copy management lib
+ [libsvn_wc]
+@@ -161,12 +161,12 @@
+ install = apache-mod
+ 
+ # Simple XML-parsing lib
+-[libexpat]
+-type = lib
+-install = base-lib
+-path = expat-lite
++#[libexpat]
++#type = lib
++#install = base-lib
++#path = expat-lite
+ # there are some .c files included by others, so *.c isn't appropriate
+-sources = hashtable.c xmlparse.c xmlrole.c xmltok.c
++#sources = hashtable.c xmlparse.c xmlrole.c xmltok.c
+ 
+ # ----------------------------------------------------------------------------
+ #
+@@ -210,7 +210,7 @@
+ sources = fs-test.c
+ install = fs-test
+ libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
+-	$(SVN_APR_LIBS) libexpat
++	$(SVN_APR_LIBS) -lexpat
+ # run-fs-tests.sh will run this for us
+ testing = skip
+ 
+@@ -220,7 +220,7 @@
+ path = subversion/tests/libsvn_fs
+ sources = skel-test.c
+ install = fs-test
+-libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # run-fs-tests.sh will run this for us
+ testing = skip
+ 
+@@ -230,7 +230,7 @@
+ path = subversion/tests/libsvn_fs
+ sources = key-test.c
+ install = fs-test
+-libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_fs libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # run-fs-tests.sh will run this for us
+ testing = skip
+ 
+@@ -241,7 +241,7 @@
+ sources = strings-reps-test.c
+ install = fs-test
+ libs = libsvn_test libsvn_test_fs libsvn_fs libsvn_delta libsvn_subr
+-       $(SVN_APR_LIBS) libexpat
++       $(SVN_APR_LIBS) -lexpat
+ # run-fs-tests.sh will run this for us
+ testing = skip
+ 
+@@ -251,7 +251,7 @@
+ path = subversion/tests/libsvn_repos
+ sources = md5args.c
+ install = test
+-libs = libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # run-repos-tests.sh will run this for us
+ testing = skip
+ 
+@@ -262,7 +262,7 @@
+ sources = repos-test.c dir-delta-editor.c
+ install = fs-test
+ libs = libsvn_test libsvn_test_fs libsvn_repos libsvn_fs libsvn_delta
+-	libsvn_subr $(SVN_APR_LIBS) libexpat
++	libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # run-repos-tests.sh will run this for us
+ testing = skip
+ 
+@@ -272,7 +272,7 @@
+ path = subversion/tests/libsvn_subr
+ sources = hashdump-test.c
+ install = test
+-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ 
+ # test svn_stringbuf_t utilities
+ [stringtest]
+@@ -280,7 +280,7 @@
+ path = subversion/tests/libsvn_subr
+ sources = stringtest.c
+ install = test
+-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ 
+ # test path library
+ [path-test]
+@@ -296,7 +296,7 @@
+ path = subversion/tests/libsvn_wc
+ sources = translate-test.c
+ install = test
+-libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_delta libsvn_wc libsvn_subr $(SVN_APR_LIBS) -lexpat
+ 
+ # use random data to test delta processing
+ [random-test]
+@@ -304,7 +304,7 @@
+ path = subversion/tests/libsvn_delta
+ sources = random-test.c
+ install = test
+-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ 
+ 
+ ### Tests that are simply broken (fix?)  ----------
+@@ -315,7 +315,7 @@
+ path = subversion/tests/libsvn_delta
+ sources = delta-combine-test.c
+ install = test
+-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # disabled for now -- the delta combiner isn't written, and we
+ # don't really have any idea if the interface would be compatible 
+ # with this test, anyway.
+@@ -328,7 +328,7 @@
+ sources = ra-local-test.c
+ install = fs-test
+ libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr
+-	$(SVN_APR_LIBS) libexpat
++	$(SVN_APR_LIBS) -lexpat
+ # disabled for now, BROKEN.
+ testing = skip
+ 
+@@ -341,7 +341,7 @@
+ path = subversion/tests/libsvn_subr
+ sources = target-test.c
+ install = test
+-libs = libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # target-test.sh will run this for us
+ testing = skip
+ 
+@@ -351,7 +351,7 @@
+ path = subversion/tests/libsvn_delta
+ sources = xml-output-test.c
+ install = test
+-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # this is really redundant with our XML svn-test*.sh tests.
+ testing = skip
+ 
+@@ -361,7 +361,7 @@
+ path = subversion/tests/libsvn_wc
+ sources = checkout-test.c
+ install = test
+-libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # this is really redundant with our XML svn-test*.sh tests.
+ testing = skip
+ 
+@@ -371,7 +371,7 @@
+ path = subversion/tests/libsvn_wc
+ sources = commit-test.c
+ install = test
+-libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_wc libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ # this is really redundant with our XML svn-test*.sh tests.
+ testing = skip
+ 
+@@ -384,7 +384,7 @@
+ path = subversion/tests/libsvn_delta
+ sources = deltaparse-test.c
+ install = test
+-libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_test libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ testing = skip
+ 
+ 
+@@ -397,7 +397,7 @@
+ path = subversion/tests/libsvn_delta
+ sources = svndiff-test.c
+ install = test
+-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ testing = skip
+ 
+ # compare two files, print txdelta windows
+@@ -406,7 +406,7 @@
+ path = subversion/tests/libsvn_delta
+ sources = vdelta-test.c
+ install = test
+-libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) libexpat
++libs = libsvn_delta libsvn_subr $(SVN_APR_LIBS) -lexpat
+ testing = skip
+ 
+ 
diff --git a/devel/subversion-devel/files/patch-configure b/devel/subversion-devel/files/patch-configure
new file mode 100644
index 000000000000..0f6351eb7b47
--- /dev/null
+++ b/devel/subversion-devel/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Sun Mar 10 18:06:50 2002
++++ configure	Sun Mar 10 18:07:48 2002
+@@ -7084,7 +7084,7 @@
+                 SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
+         NEON_LIBS=`$neon_config --libs | sed -e 's/-lneon//g'`
+         CFLAGS="$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"
+-                NEON_LIBS="$NEON_LIBS "`$neon_config --prefix `"/lib/libneon.la"
++                NEON_LIBS="$NEON_LIBS -lneon"
+         ;;
+       *)
+         echo "You have neon version $NEON_VERSION,"
diff --git a/devel/subversion-devel/files/patch-subversion::libsvn_ra_dav::session.c b/devel/subversion-devel/files/patch-subversion::libsvn_ra_dav::session.c
deleted file mode 100644
index 446c02a538f4..000000000000
--- a/devel/subversion-devel/files/patch-subversion::libsvn_ra_dav::session.c
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-===================================================================
---- ./subversion/libsvn_ra_dav/.svn/text-base/session.c	Wed Oct 17 11:34:54 2001
-+++ ./subversion/libsvn_ra_dav/session.c	Wed Oct 17 15:30:15 2001
-@@ -103,6 +103,7 @@
-   ne_session *sess, *sess2;
-   struct uri uri = { 0 };
-   svn_ra_session_t *ras;
-+  char *proxy;
- 
-   /* Sanity check the URI */
-   if (uri_parse(repository, &uri, NULL) 
-@@ -121,6 +122,26 @@
-   /* Create two neon session objects, and set their properties... */
-   sess = ne_session_create();
-   sess2 = ne_session_create();
-+
-+  /* Proxy setup must be done early */
-+  proxy = getenv("http_proxy");
-+  if (proxy != NULL)
-+    {
-+      struct uri proxy_uri = { 0 };
-+      struct uri proxy_uri_default = { port: 80 };
-+      if (uri_parse(proxy, &proxy_uri, &proxy_uri_default)
-+          || uri.host == NULL)
-+        {
-+          return svn_error_create(SVN_ERR_RA_ILLEGAL_URL, 0, NULL, pool,
-+                                  "illegal URL for proxy");
-+        }
-+      if (ne_session_proxy(sess, proxy_uri.host, proxy_uri.port)
-+         || ne_session_proxy(sess2, proxy_uri.host, proxy_uri.port))
-+        {
-+          return svn_error_createf(SVN_ERR_RA_HOSTNAME_LOOKUP, 0, NULL, pool,
-+                                  "Hostname not found: %s", proxy_uri.host);
-+        }
-+    }
- 
- #if 0
-   /* #### enable this block for debugging output on stderr. */
-
----------------------------------------------------------------------
-To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
-For additional commands, e-mail: dev-help@subversion.tigris.org
-
-
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index 0712f2633c4a..176090442f6f 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -32,19 +32,37 @@ info/svn-manual.info
 info/svn_for_cvs_users.info
 lib/libsvn_client.a
 lib/libsvn_client.la
+lib/libsvn_client.so
+lib/libsvn_client.so.0
 lib/libsvn_delta.a
 lib/libsvn_delta.la
+lib/libsvn_delta.so
+lib/libsvn_delta.so.0
 lib/libsvn_fs.a
 lib/libsvn_fs.la
+lib/libsvn_fs.so
+lib/libsvn_fs.so.0
 lib/libsvn_ra.a
 lib/libsvn_ra.la
+lib/libsvn_ra.so
+lib/libsvn_ra.so.0
 lib/libsvn_ra_dav.a
 lib/libsvn_ra_dav.la
+lib/libsvn_ra_dav.so
+lib/libsvn_ra_dav.so.0
 lib/libsvn_ra_local.a
 lib/libsvn_ra_local.la
+lib/libsvn_ra_local.so
+lib/libsvn_ra_local.so.0
 lib/libsvn_repos.a
 lib/libsvn_repos.la
+lib/libsvn_repos.so
+lib/libsvn_repos.so.0
 lib/libsvn_subr.a
 lib/libsvn_subr.la
+lib/libsvn_subr.so
+lib/libsvn_subr.so.0
 lib/libsvn_wc.a
 lib/libsvn_wc.la
+lib/libsvn_wc.so
+lib/libsvn_wc.so.0