--- tindex.orig	2012-07-16 20:36:09.198091000 +0000
+++ tindex	2012-07-16 20:38:32.848298000 +0000
@@ -6,7 +6,7 @@
 # that 'make fetchindex' sees it.
 #
 # When INDEX is broken, assemble the list of committers who touched files
-# on the most recent 'cvs update', and put those committers "on the hook".
+# on the most recent 'svn update', and put those committers "on the hook".
 # These committers all stay on the hook until INDEX is buildable again.
 #
 # MAINTAINER= erwin@FreeBSD.org
@@ -47,18 +47,8 @@
 blame() {
   # Find out who is responsible for current version of file $1
 
-  # Fastest way to extract is from the CVS "FreeBSD" tag
-  ident=$(ident $1 2>/dev/null | grep '$FreeBSD')
-  who=$(echo $ident | awk '{print $6}')
-
-  if [ -z "$ident" ]; then
-    # No FreeBSD tag, fall back to slower method of parsing cvs logs.
-    rev=$(cvs status $1 2>/dev/null | grep 'Working revision:' | awk '{print $3}')
-    if [ "$rev" != "No" ]; then    # "No" means not under CVS control
-      ident=$(cvs -Rq log -r$rev $1 | grep "^date:" | head -1 | sed 's,;,,g')
-      who=$(echo $ident | awk '{print $5}')
-    fi
-  fi
+  # Fastest way to extract is from svn info
+  who=$(svn info $1 2>/dev/null | grep '^Last Changed Author' | awk '{print $4}')
 
   echo $who
 }
@@ -91,7 +81,7 @@
 
     # Find out which committers are on the hook
 
-    commits=$(grep ^U ${PORTSDIR}/cvs.log | grep -v INDEX | awk '{print $2}')
+    commits=$(grep ^U ${PORTSDIR}/svn.log | grep -v INDEX | awk '{print $2}')
     for i in ${commits}; do
 	blame $i >> ${PORTSDIR}/hook
     done
@@ -102,8 +92,8 @@
     tr -s '\n' ' ' < ${PORTSDIR}/hook
     echo
     echo 
-    echo "Most recent CVS update was:";
-    grep -v '/work$' cvs.log | grep -v '^\?'
+    echo "Most recent SVN update was:";
+    grep -v '/work$' svn.log | grep -v '^\?'
   ) | mail -s "INDEX build failed for ${BRANCH}" ${REPORT_ADDRESS}
   exit 1
 }
@@ -139,28 +129,28 @@
 
 # First update the source trees to get current OSVERSION
 cd ${SRCDIR7}/sys/sys
-cvs -Rq update -PdA -r RELENG_7 param.h
+svn up param.h
 OSVERSION7=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR7}/sys/sys/param.h)
 
 cd ${SRCDIR8}/sys/sys
-cvs -Rq update -PdA -r RELENG_8 param.h
+svn up param.h
 OSVERSION8=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR8}/sys/sys/param.h)
 
 cd ${SRCDIR9}/sys/sys
-cvs -Rq update -PdA -r RELENG_9 param.h
+svn up param.h
 OSVERSION9=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR9}/sys/sys/param.h)
 
 cd ${SRCDIR10}/sys/sys
-cvs -Rq update -PdA param.h
+svn up param.h
 OSVERSION10=$(awk '/^#define[[:blank:]]__FreeBSD_version/ {print $3}' < ${SRCDIR10}/sys/sys/param.h)
 
 
 cd ${PORTSDIR}
 rm -f INDEX-7 INDEX-7.bz2 INDEX-8 INDEX-8.bz2 INDEX-9 INDEX-9.bz2 INDEX-10 INDEX-10.bz2
-(cvs -Rq update -PdA 2>1 ) > cvs.log
-if grep -q ^C cvs.log ; then
-  (echo "cvs update failed with conflicts:";
-    grep ^C cvs.log) | mail -s "Ports cvsup failed" ${ERROR_ADDRESS}
+(svn up 2>1 ) > svn.log
+if grep -q ^C svn.log ; then
+  (echo "svn update failed with conflicts:";
+    grep ^C svn.log) | mail -s "Ports svn up failed" ${ERROR_ADDRESS}
     exit 1
 fi