Update to Subversion 0.12.0 (revision 1868).

Patch slightly modified to remove a leftover \ at the end of one line.

PR:		ports/37810
Submitted by:	Garrett Rooney <rooneg@electricjellyfish.net> (MAINTAINER)

4 files changed, 4 insertions, 239 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index efcc4da5fd81..e2d610d09861 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	r1682+
+PORTVERSION=	r1868
 CATEGORIES=	devel
 MASTER_SITES=	http://www.tigris.org/files/15/48/
 
@@ -13,11 +13,10 @@ MAINTAINER=	rooneg@electricjellyfish.net
 
 LIB_DEPENDS=	db4:${PORTSDIR}/databases/db4 \
 		neon.19:${PORTSDIR}/www/neon \
-		expat:${PORTSDIR}/textproc/expat \
+		expat.2:${PORTSDIR}/textproc/expat2 \
 		apr:${PORTSDIR}/devel/apr-devel
 RUN_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
-BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils \
-	 	python:${PORTSDIR}/lang/python
+BUILD_DEPENDS=	gdiff3:${PORTSDIR}/textproc/diffutils
 
 MAN1=		svn.1
 
@@ -39,10 +38,6 @@ post-extract:
 	@${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
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index e0c2423a791b..901b16a7b99d 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1 +1 @@
-MD5 (subversion-r1682+.tar.gz) = cc8c6748031f3315f3c0529541cd8e4f
+MD5 (subversion-r1868.tar.gz) = f4a2c531797a0af297bd89757e75645f
diff --git a/devel/subversion-devel/files/patch-build.conf b/devel/subversion-devel/files/patch-build.conf
deleted file mode 100644
index bb0dd55d6812..000000000000
--- a/devel/subversion-devel/files/patch-build.conf
+++ /dev/null
@@ -1,217 +0,0 @@
---- 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) $(SVN_APRUTIL_LIBS)
- 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) $(SVN_APRUTIL_LIBS)
- 
- # 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) $(SVN_APRUTIL_LIBS)
- 
- # 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) $(SVN_APRUTIL_LIBS)
- 
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS) 
- # 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) $(SVN_APRUTIL_LIBS) 
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- 
- # 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) $(SVN_APRUTIL_LIBS)
- 
- # 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) $(SVN_APRUTIL_LIBS)
- 
- # 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) $(SVN_APRUTIL_LIBS)
- 
- 
- ### 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- # 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) $(SVN_APRUTIL_LIBS)
- 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) $(SVN_APRUTIL_LIBS)
- 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) $(SVN_APRUTIL_LIBS)
- testing = skip
- 
- 
diff --git a/devel/subversion-devel/files/patch-build::buildcheck.sh b/devel/subversion-devel/files/patch-build::buildcheck.sh
deleted file mode 100644
index 2819634c51aa..000000000000
--- a/devel/subversion-devel/files/patch-build::buildcheck.sh
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/buildcheck.sh.orig	Fri Apr 26 17:39:27 2002
-+++ build/buildcheck.sh	Fri Apr 26 17:39:47 2002
-@@ -53,8 +53,8 @@
- #--------------------------------------------------------------------------
- # check for the correct version of Neon
- #
--NEON_WANTED_REGEX=0.19.[2-3]
--NEON_LATEST_WORKING_VER=0.19.3
-+NEON_WANTED_REGEX=0.19.[2-4]
-+NEON_LATEST_WORKING_VER=0.19.4
- NEON_URL="http://www.webdav.org/neon/neon-${NEON_LATEST_WORKING_VER}.tar.gz"
- if test -d ./neon; then
-   NEON_VERSION="`./ac-helpers/get-neon-ver.sh neon`"