7 files changed, 357 insertions, 458 deletions

diff --git a/devel/Makefile b/devel/Makefile
index 5ad5d7a818b2..86b174b98d1c 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2359,6 +2359,7 @@
     SUBDIR += subclipse
     SUBDIR += subcommander
     SUBDIR += subversion
+    SUBDIR += subversion-freebsd
     SUBDIR += subversion-perl
     SUBDIR += subversion-python
     SUBDIR += subversion-ruby
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 17f2ad6e6e01..b9f5d98af36f 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -1,26 +1,31 @@
-# New ports collection makefile for:	subversion
-# Date created:				10 September 2001
-# Whom:					rooneg@electricjellyfish.net
+# New ports collection makefile for:	subversion-freebsd
+# Date created:				29 May 2008
+# Whom:					dougb@FreeBSD.org
 #
 # $FreeBSD$
 
 PORTNAME=	subversion
-PORTVERSION=	1.4.6
-PORTREVISION?=	1
+PORTVERSION=	1.5.0.rc7
 CATEGORIES=	devel
-MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
-		http://svnbook.red-bean.com/en/${PORTVERSION:R}/:book
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:main
+MASTER_SITES=	http://subversion.tigris.org/downloads/
+PKGNAMESUFFIX=	-freebsd
+DISTNAME=	${PORTNAME}-1.5.0-rc7
 DIST_SUBDIR=	subversion
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	lev@freebsd.org
-COMMENT=	Version control system
+COMMENT=	Version control system with FreeBSD Project repo customizations
 
-CONFLICTS?=	subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+NO_PACKAGE=	No binary packages of release candidates
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
+# Patches required for use with the FreeBSD Project repository only
+PATCH_SITES=		${MASTER_SITE_LOCAL}
+PATCH_SITE_SUBDIR=	peter
+PATCHFILES+=		svn_hacks_1.0.diff
+
+CONFLICTS?=	subversion-[0-9]* subversion-perl-[0-9]* subversion-python-[0-9]* subversion-ruby-[0-9]*
+
 USE_LDCONFIG=	yes
 
 USE_BZIP2=	yes
@@ -37,18 +42,18 @@ MAN8=		svnserve.8
 
 TXT_DOCS=	BUGS CHANGES COMMITTERS COPYING HACKING INSTALL README
 
-OPTIONS=	PERL		"Perl bindings" off \
+OPTIONS=	SERF	"High-performance lib for access over http" off \
+		NEON	"Older, stable http access (precludes serf)" off \
+		ASVN		"Build and install Archive SVN (asvn)" off \
+		PERL		"Perl bindings" off \
 		PYTHON		"Python bindings" off \
 		RUBY		"Ruby bindings" off \
 		JAVA		"Java (JavaHL) bindings" off \
+		BDB		"db4 repository backend" off \
 		MOD_DAV_SVN	"mod_dav_svn module for Apache 2.X" off \
 		APACHE2_APR	"Use APR from Apache 2.X" off \
-		NEON		"WebDAV/Delta-V repository access module" on \
-		BDB		"db4 repository backend" on \
-		ASVN		"Build and install Archive SVN (asvn)" off \
-		MAINTAINER_DEBUG	"Build debug version" off \
 		SVNSERVE_WRAPPER	"Enable svnserve wrapper" off \
-		BOOK		"Install the Subversion Book" off
+		MAINTAINER_DEBUG	"Build debug version" off
 
 .include <bsd.port.pre.mk>
 
@@ -81,13 +86,14 @@ CONFIGURE_ARGS+=--enable-maintainer-mode \
 CFLAGS+=	-g
 .endif
 
-.if !defined(WITHOUT_NEON)
-LIB_DEPENDS+=	neon.26:${PORTSDIR}/www/neon26
+.if defined(WITH_NEON)
+LIB_DEPENDS+=		neon.26:${PORTSDIR}/www/neon26
 CONFIGURE_ARGS+=	--with-neon=${LOCALBASE}
-PLIST_SUB+=		WITHOUT_NEON=""
-.else
-CONFIGURE_ARGS+=	--without-neon
-PLIST_SUB+=		WITHOUT_NEON="@comment "
+PLIST_SUB+=		NEON="" SERF="@comment "
+.elif defined(WITH_SERF)
+LIB_DEPENDS+=		serf-0.0:${PORTSDIR}/www/serf
+CONFIGURE_ARGS+=	--with-serf=${LOCALBASE} --without-neon
+PLIST_SUB+=		NEON="@comment " SERF=""
 .endif
 
 .if defined(WITHOUT_BDB)
@@ -151,7 +157,7 @@ BROKEN="Java bindings are supported only on FreeBSD 5.3 or newer"
 .endif
 
 .if !defined(SWIG_BINDINGS)
-CONFIGURE_ARGS+=	--without-swig --disable-swig-bindings
+CONFIGURE_ARGS+=	--without-swig
 .endif
 
 .if defined(WITH_MOD_DAV_SVN)
@@ -227,110 +233,6 @@ SCRIPTS=
 
 SCRIPTS_DATA=
 
-pre-everything::
-	@${ECHO_MSG} ""
-.if defined(WITHOUT_NEON)
-	@${ECHO_MSG} "WebDAV/Delta-V repository access module disabled."
-.else
-	@${ECHO_MSG} "WebDAV/Delta-V repository access module enabled."
-	@${ECHO_MSG} "To disable it define WITHOUT_NEON"
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITHOUT_BDB)
-	@${ECHO_MSG} "db4 repository backend disabled."
-.else
-	@${ECHO_MSG} "db4 repository backend enabled."
-	@${ECHO_MSG} "To disable it define WITHOUT_BDB"
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_MAINTAINER_DEBUG)
-	@${ECHO_MSG} "Build debug version."
-.else
-	@${ECHO_MSG} "You can enable debug build by defining WITH_MAINTAINER_DEBUG."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_PERL)
-	@${ECHO_MSG} "Build with perl bindings."
-	@${ECHO_MSG} "Be sure, that apr library and perl both uses OR not uses threads in same time."
-.else
-	@${ECHO_MSG} "You can enable perl bindings by defining WITH_PERL"
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_PYTHON)
-	@${ECHO_MSG} "Build with Python bindings."
-.else
-	@${ECHO_MSG} "You can enable Python bindings by defining WITH_PYTHON."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_RUBY)
-	@${ECHO_MSG} "Build with Ruby bindings."
-.else
-	@${ECHO_MSG} "You can enable Ruby bindings by defining WITH_RUBY."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_JAVA)
-	@${ECHO_MSG} "Build with Java (JavaHL) bindings."
-.else
-	@${ECHO_MSG} "You can enable Java bindings by defining WITH_JAVA."
-	@${ECHO_MSG} "You should have apr built with threads for Java support!"
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_MOD_DAV_SVN)
-	@${ECHO_MSG} "mod_dav_svn module for Apache 2.X enabled."
-.else
-	@${ECHO_MSG} "You can enable the mod_dav_svn module for Apache 2.X"
-	@${ECHO_MSG} "by defining WITH_MOD_DAV_SVN.  This option implies"
-	@${ECHO_MSG} "the WITH_APACHE2_APR option."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_APACHE2_APR)
-	@${ECHO_MSG} "Using APR from ${APACHE_PORT}.  If you have the devel/apr"
-	@${ECHO_MSG} "port/package installed, you may need to remove it."
-.else
-	@${ECHO_MSG} "You can link subversion against the APR built with"
-	@${ECHO_MSG} "the ${APACHE_PORT} port, rather than the devel/apr port,"
-	@${ECHO_MSG} "by defining WITH_APACHE2_APR."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_SVNSERVE_WRAPPER)
-	@${ECHO_MSG} "svnserve wrapper enabled."
-.else
-	@${ECHO_MSG} "You can install the svnserve wrapper (sets umask 002)"
-	@${ECHO_MSG} "by defining WITH_SVNSERVE_WRAPPER."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_REPOSITORY_CREATION)
-	@${ECHO_MSG} "I will create (or use, if it exists) \"${SVNGROUP}\" group."
-	@${ECHO_MSG} "Make sure that all committers are its members."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Repository will be created at '${SVNREPOS}' with group '${SVNGROUP}'."
-	@${ECHO_MSG} "Type of repository will be '${SVNFSTYPE}'."
-	@${ECHO_MSG} "You could change these settings by defining SVNREPOS, SVNGROUP and SVNFSTYPE."
-.else
-	@${ECHO_MSG} "You can have the repository created for you by defining"
-	@${ECHO_MSG} "WITH_REPOSITORY_CREATION."
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Make sure that:"
-	@${ECHO_MSG} "* all your svn users are members of a common group"
-	@${ECHO_MSG} "* this group is the group id of the db/ and locks/"
-	@${ECHO_MSG} "  subdirectories of your repository"
-	@${ECHO_MSG} "* the above subdirectories are writable by this group"
-.endif
-	@${ECHO_MSG} ""
-.if !defined(NOPORTDOCS) && defined(WITH_BOOK)
-	@${ECHO_MSG} "Subversion Book will be installed."
-.else
-	@${ECHO_MSG} "You can install the Subversion Book by defining WITH_BOOK."
-.endif
-	@${ECHO_MSG} ""
-.if defined(WITH_ASVN)
-	@${ECHO_MSG} "asvn will be installed"
-.else
-	@${ECHO_MSG} "You can install asvn from contrib by defining WITH_ASVN"
-.endif
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Many useful scripts will be installed into ${DATADIR}}"
-
 post-extract:
 	@${RM} -rf ${WRKSRC}/neon
 	@${RM} -rf ${WRKSRC}/apr
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 4d4cbe489ebe..73a447e9e116 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1,9 +1,6 @@
-MD5 (subversion/subversion-1.4.6.tar.bz2) = 9c7cf517362c1c9332b610339e5cce6b
-SHA256 (subversion/subversion-1.4.6.tar.bz2) = 6c480c3493b25c4b73fa62d5fef2f8dd40dde1eb1294c53d3495d864230fc124
-SIZE (subversion/subversion-1.4.6.tar.bz2) = 4680316
-MD5 (subversion/svn-book-html.tar.bz2) = eda5fa7d7e3aff9473adf063385d3527
-SHA256 (subversion/svn-book-html.tar.bz2) = a73110c724ee7fca4ab0e6090f0a47fdd3a03cfdfbecab799aca90c80824d9e0
-SIZE (subversion/svn-book-html.tar.bz2) = 366277
-MD5 (subversion/svn-book.pdf) = b4f04dfc6cae59212c255322e4fa27a4
-SHA256 (subversion/svn-book.pdf) = d3fffd8191d62faf2a571cfe96bdadc772ff90bd5e32364f888f9b2d7fd81b5d
-SIZE (subversion/svn-book.pdf) = 1462807
+MD5 (subversion/subversion-1.5.0-rc7.tar.bz2) = 3145186e3c1a60fbb4dc360da490b841
+SHA256 (subversion/subversion-1.5.0-rc7.tar.bz2) = 19b9f91872b6aa6735604c93a99436f2c6463c49254413881a9535f20221d115
+SIZE (subversion/subversion-1.5.0-rc7.tar.bz2) = 4853816
+MD5 (subversion/svn_hacks_1.0.diff) = 1c6e9558f5be80fbc67550da42edb49e
+SHA256 (subversion/svn_hacks_1.0.diff) = 942c1cc375583f730faa96e4637d3e63f0220c1b53ff6d8e35737a9402697a19
+SIZE (subversion/svn_hacks_1.0.diff) = 17814
diff --git a/devel/subversion-freebsd/files/patch-contrib--client-side--asvn b/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
index c8be147d7d77..c1fac00064db 100644
--- a/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
+++ b/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
@@ -1,267 +1,227 @@
---- contrib/client-side/asvn.orig	Tue Jun 15 06:02:44 2004
-+++ contrib/client-side/asvn	Mon Sep 11 17:07:04 2006
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/usr/local/bin/bash 
- #-------------------------------------------------------------------------
- #    Author:		Ross Mark (rossm@controllingedge.com.au)
- #    Date:		Tue Mar 11 10:02:57 EST 2003
-@@ -46,7 +46,7 @@
- TMPFILE2=/tmp/asvn.tmp2.$$
- PCWD=`/bin/pwd`
- SKIPSVN='\( -name .svn -prune -false \)'
--PRINTDETAILS="-printf \"file='%p' mode=%m user=%u(%U) group=%g(%G)\n\""
-+PRINTDETAILS="-printf \"file='%p' mode=%m user=(%U) group=(%G)\n\""
- 
- trap cleanup 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
- 
-@@ -58,7 +58,8 @@
- function basedirname()
- {
-     refname="$1"
--    dir="`dirname $2`"
-+    shift
-+    dir="`dirname \"$*\"`"
-     ref=`expr "$dir" : "$refname/\(.*\)"`
-     if [ -z "$ref" ]
-     then
-@@ -105,10 +106,10 @@
- 
- function recorddirinfo
- {
--    eval "find $PCWD $SKIPSVN -o \( -type d ! -name .svn  -print \)" |while read dirlist
-+    eval "gfind \"$PCWD\" $SKIPSVN -o \( -type d ! -name .svn  -print \)" |while read dirlist
-     do
--	updatedirsymlinks $1 $dirlist
--	updatedirdevices $1 $dirlist
-+	updatedirsymlinks $1 "$dirlist"
-+	updatedirdevices $1 "$dirlist"
-     done
- }
- 
-@@ -126,15 +127,15 @@
-     #
-     # Obtain the list of devices in this directory
-     #
--    find "$dir" \( \( -type b -o -type c -o -type p \) -print \)  -o  -type d ! -name "`basename $dir`" -prune | while read file
-+    gfind "$dir" \( \( -type b -o -type c -o -type p \) -print \)  -o  -type d ! -name "`basename \"$dir\"`" -prune | while read file
-     do
--	echo -n `find $file -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"`
--	[ -b $file ] && echo -n ' type=b'
--	[ -c $file ] && echo -n ' type=c'
--	[ -p $file ] && echo ' type=p'
--	if [ -b $file -o -c $file ] 
-+	echo -n `gfind "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"`
-+	[ -b "$file" ] && echo -n ' type=b'
-+	[ -c "$file" ] && echo -n ' type=c'
-+	[ -p "$file" ] && echo ' type=p'
-+	if [ -b "$file" -o -c "$file" ] 
- 	then
--	    ls -l $file |
-+	    ls -l "$file" |
- 		sed -e 's/^[-lcpbrdwxXstugoTS]* *[0-9] [^ ]* *[^ ]* *\([0-9]*\), *\([0-9]*\) .*/ major=\1 minor=\2/'
- 	fi
- 	# In this case file is the full path.
-@@ -145,7 +146,7 @@
-     #
-     # Obtain the currently defined devices
-     #
--    $SVN propget $DEV_PROP $dir >$TMPFILE1
-+    $SVN propget $DEV_PROP "$dir" >$TMPFILE1
- 
-     #
-     # If the two list are the same then there is nothing to do.
-@@ -161,7 +162,7 @@
- 	if [ "$CHECKIN" = "true" ]
- 	then
- 	    # Add the current devices to the property
--	    $SVN propset $DEV_PROP $dir -F $TMPFILE
-+	    $SVN propset $DEV_PROP "$dir" -F $TMPFILE
- 	else
- 	    # Delete all the unwanted devices ie not in TMPFILE1
- 	    cat $TMPFILE |while read line
-@@ -169,8 +170,8 @@
- 		file=`expr "$line" : "file='\(.*\)' mode"`
- 		if ! grep -q "file='$file'" $TMPFILE1
- 		then
--		    rm $file
--		    deleteignorefile $file
-+		    rm "$file"
-+		    deleteignorefile "$file"
- 		fi
- 	    done
- 	fi
-@@ -178,7 +179,7 @@
- 	# There are no devices in this directory
- 	if [ "$CHECKIN" = "true" ]
- 	then
--	    $SVN propdel $DEV_PROP $dir
-+	    $SVN propdel $DEV_PROP "$dir"
- 	fi
-     fi
- 
-@@ -194,10 +195,10 @@
- 	    grep -q "$info" $TMPFILE && continue # This line still matches
- 	    file=`expr "$info" : "file='\(.*\)' "`
- 	    mode=`expr "$info" : ".*' mode=\([0-9]*\) "`
--	    user=`expr "$info" : ".* user=\([^(]*\)("`
--	    uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
--	    group=`expr "$info" : ".* group=\([^(]*\)("`
--	    gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
-+#	    user=`expr "$info" : ".* user=\([^(]*\)("`
-+	    uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"`
-+#	    group=`expr "$info" : ".* group=\([^(]*\)("`
-+	    gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"`
- 	    type=`expr "$info" : ".* type=\(.\)"`
- 	    major=`expr "$info" : ".* major=\([0-9]*\)"`
- 	    minor=`expr "$info" : ".* minor=\([0-9]*\)"`
-@@ -205,10 +206,11 @@
- 	    # This file is either missing or wrong
- 	    # Delete the old and create it anew.
- 	    #
--	    rm -f $dir/$file
--	    mknod --mode=$mode $dir/$file $type $major $minor
--	    chown $user:$group $dir/$file
--	    addignorefile $dir/$file
-+	    rm -f "$dir/$file"
-+	    mknod --mode=$mode "$dir/$file" $type $major $minor
-+#	    chown $user:$group $dir/$file
-+	    chown $uid:$gid "$dir/$file"
-+	    addignorefile "$dir/$file"
- 	done
-     fi
- }
-@@ -228,7 +230,7 @@
-     #
-     # Obtain the list of symlinks in this directory
-     #
--    find "$dir" \( -type l -printf "file='%f' dest='%l'\n" \)  -o  -type d ! -name "`basename $dir`" -prune |
-+    gfind "$dir" \( -type l -printf "file='%f' dest='%l'\n" \)  -o  -type d ! -name "`basename \"$dir\"`" -prune |
- 	sort >$TMPFILE
-     
-     #
-@@ -243,7 +245,7 @@
-     #
-     # Obtain the currently defined symlinks
-     #
--    $SVN propget $SYM_PROP $dir >$TMPFILE1
-+    $SVN propget $SYM_PROP "$dir" >$TMPFILE1
- 
-     #
-     # If the two list are the same then there is nothing to do.
-@@ -259,7 +261,7 @@
- 	if [ "$CHECKIN" = "true" ]
- 	then
- 	    # Add the current symlinks to the property
--	    $SVN propset $SYM_PROP $dir -F $TMPFILE
-+	    $SVN propset $SYM_PROP "$dir" -F $TMPFILE
- 	else
- 	    # Delete all the unwanted symlinks
- 	    cat $TMPFILE |while read line
-@@ -268,8 +270,8 @@
- 		efile="`echo $file |sed -e 's!\([\[\(\$]\)!\\\\\1!g'`"
- 		if ! grep -q "file='$efile'" $TMPFILE1
- 		then
--		    rm $dir/$file
--		    deleteignorefile $dir/$file
-+		    rm "$dir/$file"
-+		    deleteignorefile "$dir/$file"
- 		fi
- 	    done
- 	fi
-@@ -277,7 +279,7 @@
- 	# There are no symlinks in this directory
- 	if [ "$CHECKIN" = "true" ]
- 	then
--	    $SVN propdel $SYM_PROP $dir
-+	    $SVN propdel $SYM_PROP "$dir"
- 	fi
-     fi
- 
-@@ -294,10 +296,10 @@
- 
- 	    if [ -L $dir/$file  ]
- 	    then
--		[ "`find $dir/$file -printf '%l'`" = "$dest" ] && continue
-+		[ "`gfind \"$dir/$file\" -printf '%l'`" = "$dest" ] && continue
- 	    fi 
--	    rm -f $dir/$file
--	    ln -s $dest $dir/$file
-+	    rm -f "$dir/$file"
-+	    ln -s $dest "$dir/$file"
- 	done
-     fi
- }
-@@ -313,37 +315,39 @@
- 
-     # Find all the directories and files
-     cp /dev/null $TMPFILE
--    eval "find $PCWD $SKIPSVN -o \( \( -type d ! -name .svn  \) -o -type f \) $PRINTDETAILS" | while read info
-+    eval "gfind \"$PCWD\" $SKIPSVN -o \( \( -type d ! -name .svn  \) -o -type f \) $PRINTDETAILS" | while read info
-     do
- 	device=`expr "$info" : "file='\(.*\)' mode"`
- 	info=`expr "$info" : "file='.*' \(mode.*\)"`
-+#	echo DEBUG: device vale $device
- 	if [ "$PCWD" = "$device" ]
- 	then
- 	    dir="."
- 	    file=""
- 	else
--	    dir="`basedirname $PCWD $device`"
--	    file="`basename $device`"
-+	    dir="`basedirname \"$PCWD\" $device`"
-+	    file=`basename "$device"`
- 	fi
- 	# see if the properties have changed.
--	if [ "`$SVN propget $FILE_PROP $dir/$file`" != "$info" ]
-+	if [ "`$SVN propget $FILE_PROP \"$dir/$file\"`" != "$info" ]
- 	then
- 	    if [ "$CHECKIN" = "true" ]
- 	    then
--		$SVN propset $FILE_PROP  "$info" $dir/$file
-+		$SVN propset $FILE_PROP  "$info" "$dir/$file"
- 	    else
- 		info=`$SVN propget $FILE_PROP "$dir/$file"`
- 		mode=`expr "$info" : "mode=\([0-9]*\) "`
--		user=`expr "$info" : ".* user=\([^(]*\)("`
--		uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
--		group=`expr "$info" : ".* group=\([^(]*\)("`
--		gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
--		if  [ "$user" = "" -o "$group" = ""  -o "$mode" = "" ]
-+#		user=`expr "$info" : ".* user=\([^(]*\)("`
-+		uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\)"`
-+#		group=`expr "$info" : ".* group=\([^(]*\)("`
-+		gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\)"`
-+		if  [ "$uid" = "" -o "$gid" = ""  -o "$mode" = "" ]
- 		then
- 		    echo "property $FILE_PROP not set for $dir/$file"
- 		else
--		    chown $user:$group  $dir/$file
--		    chmod $mode $dir/$file
-+#	    		chown $user:$group $dir/$file
-+		    chown $uid:$gid  "$dir/$file"
-+		    chmod $mode "$dir/$file"
- 		fi
- 	    fi
- 	fi
-@@ -364,8 +368,9 @@
-     if [ "$CHDIR" = "true" ]
-     then
- 	shift $(($# -1))
--	cd $1
--    PCWD="$PCWD/$1"
-+        WD=`echo $1 | sed "s/\/$//" | awk -F "/" '{print $(NF)}' `
-+        cd $WD
-+        PCWD="$PCWD/$WD"
-     fi
-     recorddirinfo 
-     recordpermissions 
-@@ -382,7 +387,7 @@
- 
- [ "$ACTION" =  "pre" ] && pre_checkin $@
- 
--$SVN $@
-+$SVN "$@"
- 
- [ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@
- 
+*** contrib/client-side/asvn.orig	Sun Jan 27 16:24:25 2008
+--- contrib/client-side/asvn	Thu May 29 11:52:55 2008
+***************
+*** 1,4 ****
+! #!/bin/bash
+  #-------------------------------------------------------------------------
+  #    Author:		Ross Mark (rossm@controllingedge.com.au)
+  #    Date:		Tue Mar 11 10:02:57 EST 2003
+--- 1,4 ----
+! #!/usr/local/bin/bash 
+  #-------------------------------------------------------------------------
+  #    Author:		Ross Mark (rossm@controllingedge.com.au)
+  #    Date:		Tue Mar 11 10:02:57 EST 2003
+***************
+*** 52,58 ****
+  TMPFILE2=/tmp/asvn.tmp2.$$
+  PCWD=`/bin/pwd`
+  SKIPSVN='\( -name .svn -prune -false \)'
+! PRINTDETAILS="-printf \"file='%p' mode=%m user=%u(%U) group=%g(%G)\n\""
+  
+  trap cleanup 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+  
+--- 52,58 ----
+  TMPFILE2=/tmp/asvn.tmp2.$$
+  PCWD=`/bin/pwd`
+  SKIPSVN='\( -name .svn -prune -false \)'
+! PRINTDETAILS="-printf \"file='%p' mode=%m user=(%U) group=(%G)\n\""
+  
+  trap cleanup 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
+  
+***************
+*** 64,70 ****
+  function basedirname()
+  {
+      refname="$1"
+!     dir="`dirname \"$2\"`"
+      ref="`expr \"$dir\" : \"$refname/\(.*\)\"`"
+      if [ -z "$ref" ]
+      then
+--- 64,71 ----
+  function basedirname()
+  {
+      refname="$1"
+!     shift
+!     dir="`dirname \"$*\"`"
+      ref="`expr \"$dir\" : \"$refname/\(.*\)\"`"
+      if [ -z "$ref" ]
+      then
+***************
+*** 111,117 ****
+  
+  function recorddirinfo
+  {
+!     eval "find $PCWD $SKIPSVN -o \( -type d ! -name .svn  -print \)" |while read dirlist
+      do
+          updatedirsymlinks $1 "$dirlist"
+          updatedirdevices $1 "$dirlist"
+--- 112,118 ----
+  
+  function recorddirinfo
+  {
+!     eval "gfind \"$PCWD\" $SKIPSVN -o \( -type d ! -name .svn  -print \)" |while read dirlist
+      do
+          updatedirsymlinks $1 "$dirlist"
+          updatedirdevices $1 "$dirlist"
+***************
+*** 132,140 ****
+      #
+      # Obtain the list of devices in this directory
+      #
+!     find "$dir" \( \( -type b -o -type c -o -type p \) -print \)  -o  -type d ! -name "`basename \"$dir\"`" -prune | while read file
+      do
+!         echo -n `find "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"`
+          [ -b "$file" ] && echo -n ' type=b'
+          [ -c "$file" ] && echo -n ' type=c'
+          [ -p "$file" ] && echo ' type=p'
+--- 133,141 ----
+      #
+      # Obtain the list of devices in this directory
+      #
+!     gfind "$dir" \( \( -type b -o -type c -o -type p \) -print \)  -o  -type d ! -name "`basename \"$dir\"`" -prune | while read file
+      do
+!         echo -n `gfind "$file" -printf "file='%f' mode=%m user=%u(%U) group=%g(%G)"`
+          [ -b "$file" ] && echo -n ' type=b'
+          [ -c "$file" ] && echo -n ' type=c'
+          [ -p "$file" ] && echo ' type=p'
+***************
+*** 200,208 ****
+              grep -q "$info" $TMPFILE && continue # This line still matches
+              file="`expr \"$info\" : \"file='\(.*\)' \"`"
+              mode=`expr "$info" : ".*' mode=\([0-9]*\) "`
+!             user=`expr "$info" : ".* user=\([^(]*\)("`
+              uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
+!             group=`expr "$info" : ".* group=\([^(]*\)("`
+              gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
+              type=`expr "$info" : ".* type=\(.\)"`
+              major=`expr "$info" : ".* major=\([0-9]*\)"`
+--- 201,209 ----
+              grep -q "$info" $TMPFILE && continue # This line still matches
+              file="`expr \"$info\" : \"file='\(.*\)' \"`"
+              mode=`expr "$info" : ".*' mode=\([0-9]*\) "`
+! #           user=`expr "$info" : ".* user=\([^(]*\)("`
+              uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
+! #           group=`expr "$info" : ".* group=\([^(]*\)("`
+              gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
+              type=`expr "$info" : ".* type=\(.\)"`
+              major=`expr "$info" : ".* major=\([0-9]*\)"`
+***************
+*** 213,219 ****
+              #
+              rm -f "$dir/$file"
+              mknod --mode=$mode "$dir/$file" $type $major $minor
+!             chown $user:$group "$dir/$file"
+              addignorefile "$dir/$file"
+          done
+      fi
+--- 214,221 ----
+              #
+              rm -f "$dir/$file"
+              mknod --mode=$mode "$dir/$file" $type $major $minor
+! #            chown $user:$group "$dir/$file"
+!             chown $uid:$gid "$dir/$file"
+              addignorefile "$dir/$file"
+          done
+      fi
+***************
+*** 234,240 ****
+      #
+      # Obtain the list of symlinks in this directory
+      #
+!     find "$dir" \( -type l -printf "file='%f' dest='%l'\n" \)  -o  -type d ! -name "`basename \"$dir\"`" -prune |
+          sort >$TMPFILE
+      
+      #
+--- 236,242 ----
+      #
+      # Obtain the list of symlinks in this directory
+      #
+!     gfind "$dir" \( -type l -printf "file='%f' dest='%l'\n" \)  -o  -type d ! -name "`basename \"$dir\"`" -prune |
+          sort >$TMPFILE
+      
+      #
+***************
+*** 300,306 ****
+  
+              if [ -L "$dir/$file" ]
+              then
+!                 [ "`find \"$dir/$file\" -printf '%l'`" = "$dest" ] && continue
+              fi 
+              rm -f "$dir/$file"
+              ln -s "$dest" "$dir/$file"
+--- 302,308 ----
+  
+              if [ -L "$dir/$file" ]
+              then
+!                 [ "`gfind \"$dir/$file\" -printf '%l'`" = "$dest" ] && continue
+              fi 
+              rm -f "$dir/$file"
+              ln -s "$dest" "$dir/$file"
+***************
+*** 320,326 ****
+      # Find all the directories and files
+      cp /dev/null $TMPFILE
+  
+!     eval "find $PCWD $SKIPSVN -o \( \( -type d ! -name .svn  \) -o -type f \) $PRINTDETAILS" | while read info
+      do
+          device=`expr "$info" : "file='\(.*\)' mode"`
+          info=`expr "$info" : "file='.*' \(mode.*\)"`
+--- 322,328 ----
+      # Find all the directories and files
+      cp /dev/null $TMPFILE
+  
+!     eval "gfind \"$PCWD\" $SKIPSVN -o \( \( -type d ! -name .svn  \) -o -type f \) $PRINTDETAILS" | while read info
+      do
+          device=`expr "$info" : "file='\(.*\)' mode"`
+          info=`expr "$info" : "file='.*' \(mode.*\)"`
+***************
+*** 343,357 ****
+              else
+                  info=`$SVN propget $FILE_PROP "$dir/$file"`
+                  mode=`expr "$info" : "mode=\([0-9]*\) "`
+!                 user=`expr "$info" : ".* user=\([^(]*\)("`
+                  uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
+!                 group=`expr "$info" : ".* group=\([^(]*\)("`
+                  gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
+                  if  [ "$user" = "" -o "$group" = ""  -o "$mode" = "" ]
+                  then
+                      echo "property $FILE_PROP not set for $dir/$file"
+                  else
+!                     chown $user:$group  "$dir/$file"
+                      chmod $mode "$dir/$file"
+                  fi
+              fi
+--- 345,360 ----
+              else
+                  info=`$SVN propget $FILE_PROP "$dir/$file"`
+                  mode=`expr "$info" : "mode=\([0-9]*\) "`
+! #               user=`expr "$info" : ".* user=\([^(]*\)("`
+                  uid=`expr "$info" : ".* user=[^(]*(\([0-9]*\) "`
+! #               group=`expr "$info" : ".* group=\([^(]*\)("`
+                  gid=`expr "$info" : ".* group=[^(]*(\([0-9]*\) "`
+                  if  [ "$user" = "" -o "$group" = ""  -o "$mode" = "" ]
+                  then
+                      echo "property $FILE_PROP not set for $dir/$file"
+                  else
+! #                   chown $user:$group  "$dir/$file"
+!                     chown $uid:$gid  "$dir/$file"
+                      chmod $mode "$dir/$file"
+                  fi
+              fi
+***************
+*** 391,397 ****
+  
+  [ "$ACTION" =  "pre" ] && pre_checkin $@
+  
+! $SVN $@
+  
+  [ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@
+  
+--- 394,400 ----
+  
+  [ "$ACTION" =  "pre" ] && pre_checkin $@
+  
+! $SVN "$@"
+  
+  [ $? = 0 -a "$ACTION" = "post" ] && post_checkout $@
+  
diff --git a/devel/subversion-freebsd/files/svnserve.in b/devel/subversion-freebsd/files/svnserve.in
index 809bf08c440e..a203c64c3923 100644
--- a/devel/subversion-freebsd/files/svnserve.in
+++ b/devel/subversion-freebsd/files/svnserve.in
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
+# Derived from the following by Doug Barton:
 # svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
-# $Id$
+#
+# $FreeBSD$
 
 # PROVIDE: svnserve
-# REQUIRE: DAEMON
-# BEFORE: LOGIN
+# REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following line to /etc/rc.conf to enable SVNServe:
@@ -19,16 +20,17 @@
 
 . "%%RC_SUBR%%"
 
-# Set some defaults
-svnserve_enable=${svnserve_enable:-"NO"}
-svnserve_flags=${svnserve_flags:-"-d --listen-port=3690"}
-svnserve_data=${svnserve_data:-"%%PREFIX%%/repositories"}
-svnserve_user=${svnserve_user:-"svn"}
-svnserve_group=${svnserve_group:-"svn"}
-
 name=svnserve
 rcvar=`set_rcvar`
 load_rc_config $name
+
+# Set some defaults
+: svnserve_enable=${svnserve_enable="NO"}
+: svnserve_flags=${svnserve_flags="-d --listen-port=3690"}
+: svnserve_data=${svnserve_data="%%PREFIX%%/repositories"}
+: svnserve_user=${svnserve_user="svn"}
+: svnserve_group=${svnserve_group="svn"}
+
 command=%%PREFIX%%/bin/svnserve%%SVNSERVE_BIN_EXT%%
 command_args="-r ${svnserve_data}"
 
diff --git a/devel/subversion-freebsd/pkg-descr b/devel/subversion-freebsd/pkg-descr
index b0743f27a8c3..085b9793b282 100644
--- a/devel/subversion-freebsd/pkg-descr
+++ b/devel/subversion-freebsd/pkg-descr
@@ -1,4 +1,8 @@
 Subversion is a version control system designed to be as similar to cvs(1) 
 as possible, while fixing many outstanding problems with cvs(1).
 
+This version adds patches that at this time are specific to the needs of
+the FreeBSD Project src repository.  If you do not need to access that
+repository you will want to use devel/subversion.
+
 WWW: http://subversion.tigris.org/
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index fc91664407c5..2e6ca8de24a0 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -8,12 +8,14 @@ bin/svnsync
 %%ASVN%%bin/asvn
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
 bin/svnversion
+include/subversion-1/mod_authz_svn.h
 include/subversion-1/mod_dav_svn.h
 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_cmdline.h
+include/subversion-1/svn_compat.h
 include/subversion-1/svn_config.h
 include/subversion-1/svn_ctype.h
 include/subversion-1/svn_dav.h
@@ -24,8 +26,10 @@ 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_iter.h
 include/subversion-1/svn_io.h
 include/subversion-1/svn_md5.h
+include/subversion-1/svn_mergeinfo.h
 include/subversion-1/svn_nls.h
 include/subversion-1/svn_opt.h
 include/subversion-1/svn_path.h
@@ -62,6 +66,10 @@ lib/libsvn_fs-1.a
 lib/libsvn_fs-1.la
 lib/libsvn_fs-1.so
 lib/libsvn_fs-1.so.0
+lib/libsvn_fs_util-1.so.0
+lib/libsvn_fs_util-1.so
+lib/libsvn_fs_util-1.la
+lib/libsvn_fs_util-1.a
 %%WITHOUT_BDB%%lib/libsvn_fs_base-1.a
 %%WITHOUT_BDB%%lib/libsvn_fs_base-1.la
 %%WITHOUT_BDB%%lib/libsvn_fs_base-1.so
@@ -74,10 +82,14 @@ lib/libsvn_ra-1.a
 lib/libsvn_ra-1.la
 lib/libsvn_ra-1.so
 lib/libsvn_ra-1.so.0
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.a
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.la
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so
-%%WITHOUT_NEON%%lib/libsvn_ra_dav-1.so.0
+%%NEON%%lib/libsvn_ra_neon-1.a
+%%NEON%%lib/libsvn_ra_neon-1.la
+%%NEON%%lib/libsvn_ra_neon-1.so
+%%NEON%%lib/libsvn_ra_neon-1.so.0
+%%SERF%%lib/libsvn_ra_serf-1.so.0
+%%SERF%%lib/libsvn_ra_serf-1.so
+%%SERF%%lib/libsvn_ra_serf-1.la
+%%SERF%%lib/libsvn_ra_serf-1.a
 lib/libsvn_ra_local-1.a
 lib/libsvn_ra_local-1.la
 lib/libsvn_ra_local-1.so
@@ -144,16 +156,40 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/bdb/svn-bdb-view.py
 %%DATADIR%%/bdb/svnfs.py
 %%DATADIR%%/bdb/whatis-rep.py
+%%DATADIR%%/buildbot/slaves/README
+%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/mount-ramdrive.c
+%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnbuild.sh
+%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svncheck.sh
+%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnclean.sh
+%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/svnlog.sh
+%%DATADIR%%/buildbot/slaves/i686-debian-sarge1/unmount-ramdrive.c
+%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnbuild.sh
+%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svncheck.sh
+%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnclean.sh
+%%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32/svnlog.sh
+%%DATADIR%%/buildbot/slaves/win32-xp VS2005/config.bat
+%%DATADIR%%/buildbot/slaves/win32-xp VS2005/do_all.bat
+%%DATADIR%%/buildbot/slaves/win32-xp VS2005/svnbuild.bat
+%%DATADIR%%/buildbot/slaves/win32-xp VS2005/svncheck.bat
+%%DATADIR%%/buildbot/slaves/win32-xp VS2005/svnclean.bat
+%%DATADIR%%/buildbot/slaves/win32-xp VS2005/svnlog.bat
+%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/config.bat.tmpl
+%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnbuild.bat
+%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svncheck.bat
+%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnclean.bat
+%%DATADIR%%/buildbot/slaves/xp-vc60-ia32/svnlog.bat
 %%DATADIR%%/client-side/bash_completion
 %%DATADIR%%/client-side/bash_completion_test
-%%DATADIR%%/client-side/server-vsn.py
+%%DATADIR%%/client-side/change-svn-wc-format.py
+%%DATADIR%%/client-side/server-version.py
 %%DATADIR%%/client-side/showchange.pl
 %%DATADIR%%/client-side/svn-graph.pl
+%%DATADIR%%/client-side/wcfind
 %%DATADIR%%/dev/check-license.py
-%%DATADIR%%/dev/datecheck.py
 %%DATADIR%%/dev/contribulyze.py
+%%DATADIR%%/dev/datecheck.py
 %%DATADIR%%/dev/gcov.patch
-%%DATADIR%%/dev/getsigs.pl
+%%DATADIR%%/dev/gen-javahl-errors.py
 %%DATADIR%%/dev/gnuify-changelog.pl
 %%DATADIR%%/dev/graph-dav-servers.py
 %%DATADIR%%/dev/iz/defect.dem
@@ -164,13 +200,14 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/dev/lock-check.py
 %%DATADIR%%/dev/mlpatch.py
 %%DATADIR%%/dev/normalize-dump.py
+%%DATADIR%%/dev/po-merge.py
 %%DATADIR%%/dev/prebuild-cleanup.sh
 %%DATADIR%%/dev/random-commits.py
-%%DATADIR%%/dev/po-merge.py
 %%DATADIR%%/dev/scramble-tree.py
 %%DATADIR%%/dev/stress.pl
 %%DATADIR%%/dev/svn-dev.el
 %%DATADIR%%/dev/svn-dev.vim
+%%DATADIR%%/dev/svn-entries.el
 %%DATADIR%%/dev/svn-merge-revs.py
 %%DATADIR%%/dev/trails.py
 %%DATADIR%%/dev/verify-history.py
@@ -179,9 +216,19 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/diff/diff.c
 %%DATADIR%%/diff/diff3.c
 %%DATADIR%%/diff/diff4.c
+%%DATADIR%%/dist/construct-rolling-environment.sh
+%%DATADIR%%/dist/dist.sh
+%%DATADIR%%/dist/download-release.sh
+%%DATADIR%%/dist/extract-for-examination.sh
+%%DATADIR%%/dist/getsigs.pl
+%%DATADIR%%/dist/roll.sh
+%%DATADIR%%/dist/sample-rc-warning-index.html
+%%DATADIR%%/dist/test.sh
+%%DATADIR%%/dist/write-announcement.py
 %%DATADIR%%/examples/blame.py
 %%DATADIR%%/examples/check-modified.py
 %%DATADIR%%/examples/dumpprops.py
+%%DATADIR%%/examples/get-location-segments.py
 %%DATADIR%%/examples/getfile.py
 %%DATADIR%%/examples/getlocks_test.c
 %%DATADIR%%/examples/geturl.py
@@ -197,6 +244,7 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/examples/svnshell.py
 %%DATADIR%%/examples/svnshell.rb
 %%DATADIR%%/examples/testwrite.c
+%%DATADIR%%/hook-scripts/README
 %%DATADIR%%/hook-scripts/commit-access-control.cfg.example
 %%DATADIR%%/hook-scripts/commit-access-control.pl
 %%DATADIR%%/hook-scripts/commit-email.pl
@@ -208,43 +256,19 @@ lib/libsvn_wc-1.so.0
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.output
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-t1.sh
 %%DATADIR%%/hook-scripts/mailer/tests/mailer-tweak.py
-%%DATADIR%%/hook-scripts/README
+%%DATADIR%%/hook-scripts/mailer/tests/mailer.conf
+%%DATADIR%%/hook-scripts/svn2feed.py
 %%DATADIR%%/hook-scripts/svnperms.conf.example
 %%DATADIR%%/hook-scripts/svnperms.py
 %%DATADIR%%/hook-scripts/verify-po.py
+%%DATADIR%%/po/l10n-report.py
 %%DATADIR%%/po/po-update.sh
-%%DATADIR%%/po/svn-po-status-report.sh
-%%DATADIR%%/po/svn-po-status-run.sh
+%%DATADIR%%/server-side/fsfs-reshard.py
 %%DATADIR%%/server-side/svn-backup-dumps.py
+%%DATADIR%%/server-side/svn-populate-node-origins-index.c
+%%DATADIR%%/server-side/svn_dav_log_parse.py
 %%DATADIR%%/server-side/svnauthz-validate.c
-%%DATADIR%%/test-scripts/svntest/README
-%%DATADIR%%/test-scripts/svntest/dav_svn.passwd
-%%DATADIR%%/test-scripts/svntest/encode-base64.py
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/config.apr-0.9
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/config.apr-0.9.x
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/config.apr-util-0.9
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/config.httpd-2.0
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/config.shared
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/dav_svn.passwd
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/httpd-2.0.conf
-%%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared/mod_dav_svn.conf
-%%DATADIR%%/test-scripts/svntest/examples/solaris-7-static/config.apr-0.9
-%%DATADIR%%/test-scripts/svntest/examples/solaris-7-static/config.apr-util-0.9
-%%DATADIR%%/test-scripts/svntest/examples/solaris-7-static/config.httpd-2.0
-%%DATADIR%%/test-scripts/svntest/examples/solaris-7-static/config.solaris.static
-%%DATADIR%%/test-scripts/svntest/examples/solaris-7-static/dav_svn.passwd
-%%DATADIR%%/test-scripts/svntest/mod_dav_svn.conf
-%%DATADIR%%/test-scripts/svntest/svntest-bindings.sh
-%%DATADIR%%/test-scripts/svntest/svntest-bindings-generic.sh
-%%DATADIR%%/test-scripts/svntest/svntest-check-configuration.sh
-%%DATADIR%%/test-scripts/svntest/svntest-config.sh
-%%DATADIR%%/test-scripts/svntest/svntest-rebuild-generic.sh
-%%DATADIR%%/test-scripts/svntest/svntest-rebuild.sh
-%%DATADIR%%/test-scripts/svntest/svntest-run.sh
-%%DATADIR%%/test-scripts/svntest/svntest-sendmail.sh
-%%DATADIR%%/test-scripts/svntest/svntest-sendmail-generic.sh
-%%DATADIR%%/test-scripts/svntest/svntest-update.sh
-%%DATADIR%%/test-scripts/svntest/svntest.sh
+%%DATADIR%%/server-side/test_svn_dav_log_parse.py
 %%DATADIR%%/xslt/svnindex.css
 %%DATADIR%%/xslt/svnindex.xsl
 %%MOD_DAV_SVN%%%%APACHEMODDIR%%/mod_dav_svn.so
@@ -309,6 +333,9 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.a
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_delta.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_diff.a
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_diff.la
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_diff.so
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.a
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.la
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/_fs.so
@@ -327,6 +354,8 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/core.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/delta.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/diff.py
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/diff.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/fs.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/libsvn/ra.py
@@ -343,6 +372,8 @@ lib/libsvn_wc-1.so.0
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/core.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/delta.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/diff.pyc
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/diff.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/fs.pyc
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/svn/ra.py
@@ -396,20 +427,22 @@ lib/libsvn_wc-1.so.0
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/backup
 @dirrm %%DATADIR%%/bdb
+@dirrm %%DATADIR%%/buildbot/slaves/i686-debian-sarge1
+@dirrm %%DATADIR%%/buildbot/slaves/osx10.4-gcc4.0.1-ia32
+@dirrm %%DATADIR%%/buildbot/slaves/win32-xp VS2005
+@dirrm %%DATADIR%%/buildbot/slaves/xp-vc60-ia32
+@dirrm %%DATADIR%%/buildbot/slaves
+@dirrm %%DATADIR%%/buildbot
 @dirrm %%DATADIR%%/client-side
 @dirrm %%DATADIR%%/dev/iz
 @dirrm %%DATADIR%%/dev
 @dirrm %%DATADIR%%/diff
+@dirrm %%DATADIR%%/dist
 @dirrm %%DATADIR%%/examples
 @dirrm %%DATADIR%%/hook-scripts/mailer/tests
 @dirrm %%DATADIR%%/hook-scripts/mailer
 @dirrm %%DATADIR%%/hook-scripts
 @dirrm %%DATADIR%%/po
 @dirrm %%DATADIR%%/server-side
-@dirrm %%DATADIR%%/test-scripts/svntest/examples/debian-gnulinux-shared
-@dirrm %%DATADIR%%/test-scripts/svntest/examples/solaris-7-static
-@dirrm %%DATADIR%%/test-scripts/svntest/examples
-@dirrm %%DATADIR%%/test-scripts/svntest
-@dirrm %%DATADIR%%/test-scripts
 @dirrm %%DATADIR%%/xslt
 @dirrm %%DATADIR%%