(1) Fix building with latest apache 2.0

  (2) Add `asvn' support.
  (3) Add rc.d script for svnserve.

PR:		ports/96967 [1], ports/97457 [2], ports/91970 [3]

24 files changed, 1036 insertions, 16 deletions

diff --git a/devel/subversion-devel/Makefile b/devel/subversion-devel/Makefile
index 27cc5c334aac..eaecaa83604e 100644
--- a/devel/subversion-devel/Makefile
+++ b/devel/subversion-devel/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.3.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.1/:bookhtml \
@@ -26,6 +26,8 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
+USE_RC_SUBR=svnserve.sh
+
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
@@ -198,6 +200,12 @@ PORTDOCS+=	book
 DISTFILES+=	svn-book.html:bookhtml svn-book.pdf:bookpdf
 .endif
 
+.if defined(WITH_ASVN)
+PLIST_SUB+=	ASVN=""
+.else
+PLIST_SUB+=	ASVN="@comment "
+.endif
+
 SCRIPTS=
 
 SCRIPTS_DATA=
@@ -298,6 +306,12 @@ pre-everything::
 	@${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 ${PREFIX}/share/subversion"
 
 post-extract:
@@ -375,6 +389,9 @@ post-install:	${MKREPOS_TARGET}
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
+.if defined(WITH_ASVN)
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
+.endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
diff --git a/devel/subversion-devel/distinfo b/devel/subversion-devel/distinfo
index 19d45795afef..d5eb964237a9 100644
--- a/devel/subversion-devel/distinfo
+++ b/devel/subversion-devel/distinfo
@@ -1,6 +1,9 @@
 MD5 (subversion-1.3.1.tar.bz2) = 07b95963968ae345541ca99d0e7bf082
+SHA256 (subversion-1.3.1.tar.bz2) = 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
 SIZE (subversion-1.3.1.tar.bz2) = 6796453
 MD5 (svn-book.html) = 1800ef7abfa35df7f2e6f4776d74c37f
+SHA256 (svn-book.html) = dfa12f00574523e601c18a590cfbf0c76df10d090da0db9b7e41b152840e1403
 SIZE (svn-book.html) = 1055053
 MD5 (svn-book.pdf) = 2cb4a90f41904634db249cf006aea7d1
+SHA256 (svn-book.pdf) = 518512007f1feb5607afbb1f2adef90d6bde9090bc754a1dab341733a2a37a68
 SIZE (svn-book.pdf) = 1533253
diff --git a/devel/subversion-devel/files/patch-configure b/devel/subversion-devel/files/patch-configure
index e7eb781d38be..01adf4e8d169 100644
--- a/devel/subversion-devel/files/patch-configure
+++ b/devel/subversion-devel/files/patch-configure
@@ -1,6 +1,59 @@
---- configure.orig	Sat Nov  5 16:13:58 2005
-+++ configure	Sat Nov  5 16:14:12 2005
-@@ -19933,7 +19933,7 @@
+--- configure.orig	Sat Mar 25 05:00:55 2006
++++ configure	Thu May 25 12:50:00 2006
+@@ -2934,12 +2934,15 @@
+ 
+ 
+ APR_VER_REGEX="0\.9\.[5-9]"
++APR_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APR_VER_REGEX_TOO="1\."
+ APU_VER_REGEX="0\.9\.[5-9]"
++APU_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APU_VER_REGEX_TOO="1\."
+ 
+ 
+   APR_WANTED_REGEX="$APR_VER_REGEX"
++  APR_WANTED_REGEX_AP20="$APR_VER_REGEX_AP20"
+   APR_WANTED_REGEX_TOO="$APR_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime (APR) library configuration" >&5
+@@ -3215,6 +3218,7 @@
+ echo "${ECHO_T}$apr_version" >&6
+ 
+   if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APR_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr version found" >&5
+@@ -3287,6 +3291,7 @@
+ 
+ 
+   APRUTIL_WANTED_REGEX="$APU_VER_REGEX"
++  APRUTIL_WANTED_REGEX_AP20="$APU_VER_REGEX_AP20"
+   APRUTIL_WANTED_REGEX_TOO="$APU_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime Utility (APRUTIL) library configuration" >&5
+@@ -3559,6 +3564,7 @@
+ echo "${ECHO_T}$apu_version" >&6
+ 
+   if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APRUTIL_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr-util version found" >&5
+@@ -19784,10 +19790,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -19933,7 +19939,7 @@
          if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then
              svn_allowed_neon_on_system="yes"
              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
diff --git a/devel/subversion-devel/files/patch-contrib--client-side--asvn b/devel/subversion-devel/files/patch-contrib--client-side--asvn
new file mode 100644
index 000000000000..07f339d29ed5
--- /dev/null
+++ b/devel/subversion-devel/files/patch-contrib--client-side--asvn
@@ -0,0 +1,146 @@
+--- contrib/client-side/asvn.orig	Tue Jun 15 06:02:44 2004
++++ contrib/client-side/asvn	Thu May 18 16:05:43 2006
+@@ -36,6 +36,7 @@
+ #
+ #
+ #-------------------------------------------------------------------------
++EDITOR?=vi
+ SVN=/usr/local/bin/svn
+ ACTION=""
+ DEV_PROP="dir:devices"
+@@ -46,7 +47,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
+ 
+@@ -105,7 +106,7 @@
+ 
+ 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
+@@ -126,9 +127,9 @@
+     #
+     # 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)"`
++	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'
+@@ -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]*\)"`
+@@ -207,7 +208,8 @@
+ 	    #
+ 	    rm -f $dir/$file
+ 	    mknod --mode=$mode $dir/$file $type $major $minor
+-	    chown $user:$group $dir/$file
++#	    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
+     
+     #
+@@ -294,7 +296,7 @@
+ 
+ 	    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
+@@ -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`"
++	    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 
diff --git a/devel/subversion-devel/files/svnserve.sh.in b/devel/subversion-devel/files/svnserve.sh.in
new file mode 100644
index 000000000000..420fc4436092
--- /dev/null
+++ b/devel/subversion-devel/files/svnserve.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
+# $Id$
+
+# PROVIDE: svnserve
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+# Add the following line to /etc/rc.conf to enable SVNServe:
+#
+#  svnserve_enable="YES"
+#  # optional
+#  svnserve_flags="-d --listen-port=3690"
+#  svnserve_data="/usr/local/repositories"
+#  svnserve_user="svn"
+#  svnserve_group="svn"
+
+. "%%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
+command=%%PREFIX%%/bin/svnserve
+command_args="-r ${svnserve_data}"
+
+run_rc_command "$1"
diff --git a/devel/subversion-devel/pkg-plist b/devel/subversion-devel/pkg-plist
index aebed9a4b2fe..5f4cc0435425 100644
--- a/devel/subversion-devel/pkg-plist
+++ b/devel/subversion-devel/pkg-plist
@@ -4,6 +4,7 @@ bin/svnadmin
 bin/svndumpfilter
 bin/svnlook
 bin/svnserve
+%%ASVN%%bin/asvn
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
 bin/svnversion
 include/subversion-1/mod_dav_svn.h
diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile
index 27cc5c334aac..eaecaa83604e 100644
--- a/devel/subversion-freebsd/Makefile
+++ b/devel/subversion-freebsd/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.3.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.1/:bookhtml \
@@ -26,6 +26,8 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
+USE_RC_SUBR=svnserve.sh
+
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
@@ -198,6 +200,12 @@ PORTDOCS+=	book
 DISTFILES+=	svn-book.html:bookhtml svn-book.pdf:bookpdf
 .endif
 
+.if defined(WITH_ASVN)
+PLIST_SUB+=	ASVN=""
+.else
+PLIST_SUB+=	ASVN="@comment "
+.endif
+
 SCRIPTS=
 
 SCRIPTS_DATA=
@@ -298,6 +306,12 @@ pre-everything::
 	@${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 ${PREFIX}/share/subversion"
 
 post-extract:
@@ -375,6 +389,9 @@ post-install:	${MKREPOS_TARGET}
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
+.if defined(WITH_ASVN)
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
+.endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
diff --git a/devel/subversion-freebsd/distinfo b/devel/subversion-freebsd/distinfo
index 19d45795afef..d5eb964237a9 100644
--- a/devel/subversion-freebsd/distinfo
+++ b/devel/subversion-freebsd/distinfo
@@ -1,6 +1,9 @@
 MD5 (subversion-1.3.1.tar.bz2) = 07b95963968ae345541ca99d0e7bf082
+SHA256 (subversion-1.3.1.tar.bz2) = 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
 SIZE (subversion-1.3.1.tar.bz2) = 6796453
 MD5 (svn-book.html) = 1800ef7abfa35df7f2e6f4776d74c37f
+SHA256 (svn-book.html) = dfa12f00574523e601c18a590cfbf0c76df10d090da0db9b7e41b152840e1403
 SIZE (svn-book.html) = 1055053
 MD5 (svn-book.pdf) = 2cb4a90f41904634db249cf006aea7d1
+SHA256 (svn-book.pdf) = 518512007f1feb5607afbb1f2adef90d6bde9090bc754a1dab341733a2a37a68
 SIZE (svn-book.pdf) = 1533253
diff --git a/devel/subversion-freebsd/files/patch-configure b/devel/subversion-freebsd/files/patch-configure
index e7eb781d38be..01adf4e8d169 100644
--- a/devel/subversion-freebsd/files/patch-configure
+++ b/devel/subversion-freebsd/files/patch-configure
@@ -1,6 +1,59 @@
---- configure.orig	Sat Nov  5 16:13:58 2005
-+++ configure	Sat Nov  5 16:14:12 2005
-@@ -19933,7 +19933,7 @@
+--- configure.orig	Sat Mar 25 05:00:55 2006
++++ configure	Thu May 25 12:50:00 2006
+@@ -2934,12 +2934,15 @@
+ 
+ 
+ APR_VER_REGEX="0\.9\.[5-9]"
++APR_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APR_VER_REGEX_TOO="1\."
+ APU_VER_REGEX="0\.9\.[5-9]"
++APU_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APU_VER_REGEX_TOO="1\."
+ 
+ 
+   APR_WANTED_REGEX="$APR_VER_REGEX"
++  APR_WANTED_REGEX_AP20="$APR_VER_REGEX_AP20"
+   APR_WANTED_REGEX_TOO="$APR_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime (APR) library configuration" >&5
+@@ -3215,6 +3218,7 @@
+ echo "${ECHO_T}$apr_version" >&6
+ 
+   if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APR_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr version found" >&5
+@@ -3287,6 +3291,7 @@
+ 
+ 
+   APRUTIL_WANTED_REGEX="$APU_VER_REGEX"
++  APRUTIL_WANTED_REGEX_AP20="$APU_VER_REGEX_AP20"
+   APRUTIL_WANTED_REGEX_TOO="$APU_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime Utility (APRUTIL) library configuration" >&5
+@@ -3559,6 +3564,7 @@
+ echo "${ECHO_T}$apu_version" >&6
+ 
+   if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APRUTIL_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr-util version found" >&5
+@@ -19784,10 +19790,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -19933,7 +19939,7 @@
          if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then
              svn_allowed_neon_on_system="yes"
              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
diff --git a/devel/subversion-freebsd/files/patch-contrib--client-side--asvn b/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
new file mode 100644
index 000000000000..07f339d29ed5
--- /dev/null
+++ b/devel/subversion-freebsd/files/patch-contrib--client-side--asvn
@@ -0,0 +1,146 @@
+--- contrib/client-side/asvn.orig	Tue Jun 15 06:02:44 2004
++++ contrib/client-side/asvn	Thu May 18 16:05:43 2006
+@@ -36,6 +36,7 @@
+ #
+ #
+ #-------------------------------------------------------------------------
++EDITOR?=vi
+ SVN=/usr/local/bin/svn
+ ACTION=""
+ DEV_PROP="dir:devices"
+@@ -46,7 +47,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
+ 
+@@ -105,7 +106,7 @@
+ 
+ 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
+@@ -126,9 +127,9 @@
+     #
+     # 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)"`
++	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'
+@@ -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]*\)"`
+@@ -207,7 +208,8 @@
+ 	    #
+ 	    rm -f $dir/$file
+ 	    mknod --mode=$mode $dir/$file $type $major $minor
+-	    chown $user:$group $dir/$file
++#	    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
+     
+     #
+@@ -294,7 +296,7 @@
+ 
+ 	    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
+@@ -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`"
++	    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 
diff --git a/devel/subversion-freebsd/files/svnserve.sh.in b/devel/subversion-freebsd/files/svnserve.sh.in
new file mode 100644
index 000000000000..420fc4436092
--- /dev/null
+++ b/devel/subversion-freebsd/files/svnserve.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
+# $Id$
+
+# PROVIDE: svnserve
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+# Add the following line to /etc/rc.conf to enable SVNServe:
+#
+#  svnserve_enable="YES"
+#  # optional
+#  svnserve_flags="-d --listen-port=3690"
+#  svnserve_data="/usr/local/repositories"
+#  svnserve_user="svn"
+#  svnserve_group="svn"
+
+. "%%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
+command=%%PREFIX%%/bin/svnserve
+command_args="-r ${svnserve_data}"
+
+run_rc_command "$1"
diff --git a/devel/subversion-freebsd/pkg-plist b/devel/subversion-freebsd/pkg-plist
index aebed9a4b2fe..5f4cc0435425 100644
--- a/devel/subversion-freebsd/pkg-plist
+++ b/devel/subversion-freebsd/pkg-plist
@@ -4,6 +4,7 @@ bin/svnadmin
 bin/svndumpfilter
 bin/svnlook
 bin/svnserve
+%%ASVN%%bin/asvn
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
 bin/svnversion
 include/subversion-1/mod_dav_svn.h
diff --git a/devel/subversion/Makefile b/devel/subversion/Makefile
index 27cc5c334aac..eaecaa83604e 100644
--- a/devel/subversion/Makefile
+++ b/devel/subversion/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.3.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.1/:bookhtml \
@@ -26,6 +26,8 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
+USE_RC_SUBR=svnserve.sh
+
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
@@ -198,6 +200,12 @@ PORTDOCS+=	book
 DISTFILES+=	svn-book.html:bookhtml svn-book.pdf:bookpdf
 .endif
 
+.if defined(WITH_ASVN)
+PLIST_SUB+=	ASVN=""
+.else
+PLIST_SUB+=	ASVN="@comment "
+.endif
+
 SCRIPTS=
 
 SCRIPTS_DATA=
@@ -298,6 +306,12 @@ pre-everything::
 	@${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 ${PREFIX}/share/subversion"
 
 post-extract:
@@ -375,6 +389,9 @@ post-install:	${MKREPOS_TARGET}
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
+.if defined(WITH_ASVN)
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
+.endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
diff --git a/devel/subversion/distinfo b/devel/subversion/distinfo
index 19d45795afef..d5eb964237a9 100644
--- a/devel/subversion/distinfo
+++ b/devel/subversion/distinfo
@@ -1,6 +1,9 @@
 MD5 (subversion-1.3.1.tar.bz2) = 07b95963968ae345541ca99d0e7bf082
+SHA256 (subversion-1.3.1.tar.bz2) = 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
 SIZE (subversion-1.3.1.tar.bz2) = 6796453
 MD5 (svn-book.html) = 1800ef7abfa35df7f2e6f4776d74c37f
+SHA256 (svn-book.html) = dfa12f00574523e601c18a590cfbf0c76df10d090da0db9b7e41b152840e1403
 SIZE (svn-book.html) = 1055053
 MD5 (svn-book.pdf) = 2cb4a90f41904634db249cf006aea7d1
+SHA256 (svn-book.pdf) = 518512007f1feb5607afbb1f2adef90d6bde9090bc754a1dab341733a2a37a68
 SIZE (svn-book.pdf) = 1533253
diff --git a/devel/subversion/files/patch-configure b/devel/subversion/files/patch-configure
index e7eb781d38be..01adf4e8d169 100644
--- a/devel/subversion/files/patch-configure
+++ b/devel/subversion/files/patch-configure
@@ -1,6 +1,59 @@
---- configure.orig	Sat Nov  5 16:13:58 2005
-+++ configure	Sat Nov  5 16:14:12 2005
-@@ -19933,7 +19933,7 @@
+--- configure.orig	Sat Mar 25 05:00:55 2006
++++ configure	Thu May 25 12:50:00 2006
+@@ -2934,12 +2934,15 @@
+ 
+ 
+ APR_VER_REGEX="0\.9\.[5-9]"
++APR_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APR_VER_REGEX_TOO="1\."
+ APU_VER_REGEX="0\.9\.[5-9]"
++APU_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APU_VER_REGEX_TOO="1\."
+ 
+ 
+   APR_WANTED_REGEX="$APR_VER_REGEX"
++  APR_WANTED_REGEX_AP20="$APR_VER_REGEX_AP20"
+   APR_WANTED_REGEX_TOO="$APR_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime (APR) library configuration" >&5
+@@ -3215,6 +3218,7 @@
+ echo "${ECHO_T}$apr_version" >&6
+ 
+   if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APR_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr version found" >&5
+@@ -3287,6 +3291,7 @@
+ 
+ 
+   APRUTIL_WANTED_REGEX="$APU_VER_REGEX"
++  APRUTIL_WANTED_REGEX_AP20="$APU_VER_REGEX_AP20"
+   APRUTIL_WANTED_REGEX_TOO="$APU_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime Utility (APRUTIL) library configuration" >&5
+@@ -3559,6 +3564,7 @@
+ echo "${ECHO_T}$apu_version" >&6
+ 
+   if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APRUTIL_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr-util version found" >&5
+@@ -19784,10 +19790,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -19933,7 +19939,7 @@
          if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then
              svn_allowed_neon_on_system="yes"
              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
diff --git a/devel/subversion/files/patch-contrib--client-side--asvn b/devel/subversion/files/patch-contrib--client-side--asvn
new file mode 100644
index 000000000000..07f339d29ed5
--- /dev/null
+++ b/devel/subversion/files/patch-contrib--client-side--asvn
@@ -0,0 +1,146 @@
+--- contrib/client-side/asvn.orig	Tue Jun 15 06:02:44 2004
++++ contrib/client-side/asvn	Thu May 18 16:05:43 2006
+@@ -36,6 +36,7 @@
+ #
+ #
+ #-------------------------------------------------------------------------
++EDITOR?=vi
+ SVN=/usr/local/bin/svn
+ ACTION=""
+ DEV_PROP="dir:devices"
+@@ -46,7 +47,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
+ 
+@@ -105,7 +106,7 @@
+ 
+ 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
+@@ -126,9 +127,9 @@
+     #
+     # 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)"`
++	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'
+@@ -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]*\)"`
+@@ -207,7 +208,8 @@
+ 	    #
+ 	    rm -f $dir/$file
+ 	    mknod --mode=$mode $dir/$file $type $major $minor
+-	    chown $user:$group $dir/$file
++#	    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
+     
+     #
+@@ -294,7 +296,7 @@
+ 
+ 	    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
+@@ -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`"
++	    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 
diff --git a/devel/subversion/files/svnserve.sh.in b/devel/subversion/files/svnserve.sh.in
new file mode 100644
index 000000000000..420fc4436092
--- /dev/null
+++ b/devel/subversion/files/svnserve.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
+# $Id$
+
+# PROVIDE: svnserve
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+# Add the following line to /etc/rc.conf to enable SVNServe:
+#
+#  svnserve_enable="YES"
+#  # optional
+#  svnserve_flags="-d --listen-port=3690"
+#  svnserve_data="/usr/local/repositories"
+#  svnserve_user="svn"
+#  svnserve_group="svn"
+
+. "%%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
+command=%%PREFIX%%/bin/svnserve
+command_args="-r ${svnserve_data}"
+
+run_rc_command "$1"
diff --git a/devel/subversion/pkg-plist b/devel/subversion/pkg-plist
index aebed9a4b2fe..5f4cc0435425 100644
--- a/devel/subversion/pkg-plist
+++ b/devel/subversion/pkg-plist
@@ -4,6 +4,7 @@ bin/svnadmin
 bin/svndumpfilter
 bin/svnlook
 bin/svnserve
+%%ASVN%%bin/asvn
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
 bin/svnversion
 include/subversion-1/mod_dav_svn.h
diff --git a/devel/subversion16/Makefile b/devel/subversion16/Makefile
index 27cc5c334aac..eaecaa83604e 100644
--- a/devel/subversion16/Makefile
+++ b/devel/subversion16/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	subversion
 PORTVERSION=	1.3.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://subversion.tigris.org/downloads/:main \
 		http://svnbook.red-bean.com/en/1.1/:bookhtml \
@@ -26,6 +26,8 @@ USE_AUTOTOOLS=	libtool:15
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=		--with-ssl
 
+USE_RC_SUBR=svnserve.sh
+
 MAN1=		svn.1 svnadmin.1 svnlook.1 svndumpfilter.1 svnversion.1
 MAN5=		svnserve.conf.5
 MAN8=		svnserve.8
@@ -198,6 +200,12 @@ PORTDOCS+=	book
 DISTFILES+=	svn-book.html:bookhtml svn-book.pdf:bookpdf
 .endif
 
+.if defined(WITH_ASVN)
+PLIST_SUB+=	ASVN=""
+.else
+PLIST_SUB+=	ASVN="@comment "
+.endif
+
 SCRIPTS=
 
 SCRIPTS_DATA=
@@ -298,6 +306,12 @@ pre-everything::
 	@${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 ${PREFIX}/share/subversion"
 
 post-extract:
@@ -375,6 +389,9 @@ post-install:	${MKREPOS_TARGET}
 	${INSTALL_DATA} ${DISTDIR}/svn-book.pdf ${DOCSDIR}/book
 .endif
 .endif
+.if defined(WITH_ASVN)
+	${INSTALL_SCRIPT} ${WRKSRC}/contrib/client-side/asvn ${PREFIX}/bin
+.endif
 .if defined(WITH_PERL)
 	cd ${WRKSRC} ; \
 	${REINPLACE_CMD} '/SWIG_PL_DIR/s, install$$, all pure_install,g' ${WRKSRC}/Makefile ; \
diff --git a/devel/subversion16/distinfo b/devel/subversion16/distinfo
index 19d45795afef..d5eb964237a9 100644
--- a/devel/subversion16/distinfo
+++ b/devel/subversion16/distinfo
@@ -1,6 +1,9 @@
 MD5 (subversion-1.3.1.tar.bz2) = 07b95963968ae345541ca99d0e7bf082
+SHA256 (subversion-1.3.1.tar.bz2) = 4f10334d72266815ff427eb25e0e574efcc684dcf01e0229b7d02f63b068d39d
 SIZE (subversion-1.3.1.tar.bz2) = 6796453
 MD5 (svn-book.html) = 1800ef7abfa35df7f2e6f4776d74c37f
+SHA256 (svn-book.html) = dfa12f00574523e601c18a590cfbf0c76df10d090da0db9b7e41b152840e1403
 SIZE (svn-book.html) = 1055053
 MD5 (svn-book.pdf) = 2cb4a90f41904634db249cf006aea7d1
+SHA256 (svn-book.pdf) = 518512007f1feb5607afbb1f2adef90d6bde9090bc754a1dab341733a2a37a68
 SIZE (svn-book.pdf) = 1533253
diff --git a/devel/subversion16/files/patch-configure b/devel/subversion16/files/patch-configure
index e7eb781d38be..01adf4e8d169 100644
--- a/devel/subversion16/files/patch-configure
+++ b/devel/subversion16/files/patch-configure
@@ -1,6 +1,59 @@
---- configure.orig	Sat Nov  5 16:13:58 2005
-+++ configure	Sat Nov  5 16:14:12 2005
-@@ -19933,7 +19933,7 @@
+--- configure.orig	Sat Mar 25 05:00:55 2006
++++ configure	Thu May 25 12:50:00 2006
+@@ -2934,12 +2934,15 @@
+ 
+ 
+ APR_VER_REGEX="0\.9\.[5-9]"
++APR_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APR_VER_REGEX_TOO="1\."
+ APU_VER_REGEX="0\.9\.[5-9]"
++APU_VER_REGEX_AP20="0\.9\.1[2-9]"
+ APU_VER_REGEX_TOO="1\."
+ 
+ 
+   APR_WANTED_REGEX="$APR_VER_REGEX"
++  APR_WANTED_REGEX_AP20="$APR_VER_REGEX_AP20"
+   APR_WANTED_REGEX_TOO="$APR_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime (APR) library configuration" >&5
+@@ -3215,6 +3218,7 @@
+ echo "${ECHO_T}$apr_version" >&6
+ 
+   if test `expr $apr_version : $APR_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APR_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apr_version : $APR_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APR_WANTED_REGEX or $APR_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr version found" >&5
+@@ -3287,6 +3291,7 @@
+ 
+ 
+   APRUTIL_WANTED_REGEX="$APU_VER_REGEX"
++  APRUTIL_WANTED_REGEX_AP20="$APU_VER_REGEX_AP20"
+   APRUTIL_WANTED_REGEX_TOO="$APU_VER_REGEX_TOO"
+ 
+   { echo "$as_me:$LINENO: Apache Portable Runtime Utility (APRUTIL) library configuration" >&5
+@@ -3559,6 +3564,7 @@
+ echo "${ECHO_T}$apu_version" >&6
+ 
+   if test `expr $apu_version : $APRUTIL_WANTED_REGEX` -eq 0 \
++       -a `expr $apr_version : $APRUTIL_WANTED_REGEX_AP20` -eq 0 \
+        -a `expr $apu_version : $APRUTIL_WANTED_REGEX_TOO` -eq 0; then
+     echo "wanted regex is $APRUTIL_WANTED_REGEX or $APRUTIL_WANTED_REGEX_TOO"
+     { { echo "$as_me:$LINENO: error: invalid apr-util version found" >&5
+@@ -19784,10 +19790,10 @@
+ 
+ 
+ # This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
+ 
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++LIBTOOL='$(SHELL) /usr/local/bin/libtool'
+ 
+ # Prevent multiple expansion
+ 
+@@ -19933,7 +19939,7 @@
          if test "$NEON_VERSION" = "$svn_allowed_neon" -o $svn_allowed_neon = "any"; then
              svn_allowed_neon_on_system="yes"
              SVN_NEON_INCLUDES=`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`
diff --git a/devel/subversion16/files/patch-contrib--client-side--asvn b/devel/subversion16/files/patch-contrib--client-side--asvn
new file mode 100644
index 000000000000..07f339d29ed5
--- /dev/null
+++ b/devel/subversion16/files/patch-contrib--client-side--asvn
@@ -0,0 +1,146 @@
+--- contrib/client-side/asvn.orig	Tue Jun 15 06:02:44 2004
++++ contrib/client-side/asvn	Thu May 18 16:05:43 2006
+@@ -36,6 +36,7 @@
+ #
+ #
+ #-------------------------------------------------------------------------
++EDITOR?=vi
+ SVN=/usr/local/bin/svn
+ ACTION=""
+ DEV_PROP="dir:devices"
+@@ -46,7 +47,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
+ 
+@@ -105,7 +106,7 @@
+ 
+ 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
+@@ -126,9 +127,9 @@
+     #
+     # 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)"`
++	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'
+@@ -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]*\)"`
+@@ -207,7 +208,8 @@
+ 	    #
+ 	    rm -f $dir/$file
+ 	    mknod --mode=$mode $dir/$file $type $major $minor
+-	    chown $user:$group $dir/$file
++#	    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
+     
+     #
+@@ -294,7 +296,7 @@
+ 
+ 	    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
+@@ -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`"
++	    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 
diff --git a/devel/subversion16/files/svnserve.sh.in b/devel/subversion16/files/svnserve.sh.in
new file mode 100644
index 000000000000..420fc4436092
--- /dev/null
+++ b/devel/subversion16/files/svnserve.sh.in
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# svnserve.sh for rc.d usage (c) 2005 Thomas E. Spanjaard.
+# $Id$
+
+# PROVIDE: svnserve
+# REQUIRE: DAEMON
+# BEFORE: LOGIN
+# KEYWORD: FreeBSD shutdown
+#
+# Add the following line to /etc/rc.conf to enable SVNServe:
+#
+#  svnserve_enable="YES"
+#  # optional
+#  svnserve_flags="-d --listen-port=3690"
+#  svnserve_data="/usr/local/repositories"
+#  svnserve_user="svn"
+#  svnserve_group="svn"
+
+. "%%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
+command=%%PREFIX%%/bin/svnserve
+command_args="-r ${svnserve_data}"
+
+run_rc_command "$1"
diff --git a/devel/subversion16/pkg-plist b/devel/subversion16/pkg-plist
index aebed9a4b2fe..5f4cc0435425 100644
--- a/devel/subversion16/pkg-plist
+++ b/devel/subversion16/pkg-plist
@@ -4,6 +4,7 @@ bin/svnadmin
 bin/svndumpfilter
 bin/svnlook
 bin/svnserve
+%%ASVN%%bin/asvn
 %%SVNSERVE_WRAPPER%%bin/svnserve.bin
 bin/svnversion
 include/subversion-1/mod_dav_svn.h