Upgrade:

* net/coda6_server and net/coda6_client from 6.0.7 to 6.1.1 and thus
  un-DEPRECATE them
* devel/rvm from 1.10 to 1.13
* devel/lwp from 1.12 to 2.3
* devel/rpc2 from 1.28 to 2.2

These four are tightly related so I upgrade them in one.. well.. changeset

7 files changed, 40 insertions, 105 deletions

diff --git a/net/coda6_server/files/patch-coda-src_scripts_Makefile.in b/net/coda6_server/files/patch-coda-src_scripts_Makefile.in
new file mode 100644
index 000000000000..5584c0f82a8e
--- /dev/null
+++ b/net/coda6_server/files/patch-coda-src_scripts_Makefile.in
@@ -0,0 +1,24 @@
+
+coda-setup-ports is useless with a recent /etc/services and it is the only
+file installed by both server and client thus remove it to avoid conflicting
+plists
+
+--- coda-src/scripts/Makefile.in.orig	Wed Apr 27 03:12:50 2005
++++ coda-src/scripts/Makefile.in	Thu Oct  5 19:36:14 2006
+@@ -25,14 +25,14 @@
+ # Need to conditionalize this
+ include $(TOPDIR)/Makeconf
+ 
+-VENUS-SCRIPTS = vutil volmunge venus-setup coda-setup-ports \
++VENUS-SCRIPTS = vutil volmunge venus-setup \
+     coda-client-logrotate
+ 
+ VOL-SCRIPTS	= createvol_rep purgevol_rep bldvldb.sh
+ VICE-SCRIPTS	= startserver codastart coda-server-logrotate
+ REINIT-SCRIPTS	= partial-reinit.sh
+ UPGRADE-SCRIPTS	= #pwdtopdbtool.py
+-VICE-SETUP      = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes coda-setup-ports
++VICE-SETUP      = vice-setup vice-setup-rvm vice-setup-scm vice-setup-srvdir vice-setup-user vice-killvolumes
+ 
+ BACKUP-SCRIPTS	= backup.sh tape.pl
+ 
diff --git a/net/coda6_server/files/patch-coda-src_venus_fso1.cc b/net/coda6_server/files/patch-coda-src_venus_fso1.cc
new file mode 100644
index 000000000000..e7be0d222e86
--- /dev/null
+++ b/net/coda6_server/files/patch-coda-src_venus_fso1.cc
@@ -0,0 +1,11 @@
+--- coda-src/venus/fso1.cc.orig	Thu Oct  5 16:11:23 2006
++++ coda-src/venus/fso1.cc	Thu Oct  5 16:18:40 2006
+@@ -2895,7 +2895,7 @@
+     char confstr[4];
+     
+ 	close(pfd[1]);
+-    if(setpgrp() < 0) { perror("setpgrp"); exit(EXIT_FAILURE); }
++    if(setpgid(0, 0) < 0) { perror("setpgid"); exit(EXIT_FAILURE); }
+     
+     sprintf(confstr, "%d", conflict_type);
+ 
diff --git a/net/coda6_server/files/patch-coda.h b/net/coda6_server/files/patch-coda.h
deleted file mode 100644
index 5865405dde2d..000000000000
--- a/net/coda6_server/files/patch-coda.h
+++ /dev/null
@@ -1,22 +0,0 @@
-On Thu, Sep 18, 2003 at 07:50:18PM -0700, Kris Kennaway wrote:
-
-> http://bento.freebsd.org/errorlogs/i386-4-full/coda-server-6.0.2_1.log
-> 
-> Can you please investigate?
-
-Drop this file into ports/coda6_server/files/patch-aa (or disconnect it from
-the build - coda 6 is not very useful on freebsd 4).
-
---- lib-src/kernel-includes/coda.h.orig	Fri Sep 19 18:34:03 2003
-+++ lib-src/kernel-includes/coda.h	Fri Sep 19 18:34:19 2003
-@@ -125,8 +125,8 @@
- #define __BIT_TYPES_DEFINED__
- #endif
- 
--/* FreeBSD 5.0 */
--#if __FreeBSD__ >= 5
-+/* FreeBSD 3.0 and above */
-+#if __FreeBSD__ >= 3
- #define __BIT_TYPES_DEFINED__
- #endif
- 
diff --git a/net/coda6_server/files/patch-configure b/net/coda6_server/files/patch-configure
deleted file mode 100644
index 8d494fe471e9..000000000000
--- a/net/coda6_server/files/patch-configure
+++ /dev/null
@@ -1,25 +0,0 @@
---- configure.orig	Wed Oct 20 20:43:56 2004
-+++ configure	Tue Nov 16 23:58:20 2004
-@@ -3059,13 +3059,6 @@
- 	initsuffix='../etc'
- 	;;
- 
--    */coda* )
--	# If '/coda*' is already in the prefix, we don't need to add
--        # a coda subdirectory to the sysconfdir.
--	sysconfdir=${prefix}/etc
--	initsuffix='etc'
--	;;
--
-     * )
- 	# Otherwise append '/coda' so that we don't throw our configuration
- 	# files all over the place.
-@@ -3074,7 +3067,7 @@
- 	else
- 		sysconfdir=${ac_default_prefix}/etc/coda
- 	fi
--	initsuffix='etc'
-+	initsuffix='etc/rc.d'
- 	;;
- esac
- echo "$as_me:$LINENO: result: ${sysconfdir}" >&5
diff --git a/net/coda6_server/files/patch-hostname b/net/coda6_server/files/patch-hostname
deleted file mode 100644
index 924cdf96916f..000000000000
--- a/net/coda6_server/files/patch-hostname
+++ /dev/null
@@ -1,33 +0,0 @@
---- coda-src/scripts/vice-setup.in.orig	Tue Oct  5 18:36:16 2004
-+++ coda-src/scripts/vice-setup.in	Wed Nov 17 00:40:31 2004
-@@ -318,7 +318,7 @@
- #
- # ${vicedir}/hostname 
- # 
--hn=`hostname -f`
-+hn=`hostname`
- echo $hn > ${vicedir}/hostname
- 
- #
---- coda-src/scripts/vice-setup-scm.orig	Tue Oct  5 18:36:16 2004
-+++ coda-src/scripts/vice-setup-scm	Wed Nov 17 00:40:12 2004
-@@ -53,7 +53,7 @@
- # making hostname
- #
- 
--hn=`hostname -f`
-+hn=`hostname`
- cd ${vicedir}/db
- 
- if [ $numservers -eq 1 ]; then
---- coda-src/scripts/vice-setup-srvdir.orig	Sat Sep  4 08:03:32 2004
-+++ coda-src/scripts/vice-setup-srvdir	Wed Nov 17 11:00:10 2004
-@@ -32,7 +32,7 @@
- numservers=1
- . "`codaconfedit server.conf`"
- 
--hn=`hostname -f`
-+hn=`hostname`
- 
- n=1
- while [ $n -le $numservers ]; do
diff --git a/net/coda6_server/files/patch-pioctl.h b/net/coda6_server/files/patch-pioctl.h
index d2ca61184263..2bdeff78574a 100644
--- a/net/coda6_server/files/patch-pioctl.h
+++ b/net/coda6_server/files/patch-pioctl.h
@@ -1,11 +1,11 @@
---- coda-src/kerndep/pioctl.h.orig	Thu Aug 26 17:23:04 2004
-+++ coda-src/kerndep/pioctl.h	Tue Nov 16 22:04:33 2004
-@@ -104,7 +104,7 @@
+--- coda-src/kerndep/pioctl.h.orig	Thu Oct  5 11:54:04 2006
++++ coda-src/kerndep/pioctl.h	Thu Oct  5 11:54:20 2006
+@@ -81,7 +81,7 @@
  /* unpacking macros */
  #ifndef _IOC_NR
  
--#if defined(__CYGWIN32__) || defined(__NetBSD__)
-+#if defined(__CYGWIN32__) || defined(__NetBSD__) || defined(__FreeBSD__)
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) || defined(__FreeBSD__)
  #define _IOC_TYPEMASK	0xff
  #define _IOC_TYPESHIFT	8
  #define _IOC_NRMASK	0xff
diff --git a/net/coda6_server/files/patch-srv.cc b/net/coda6_server/files/patch-srv.cc
deleted file mode 100644
index b070dc255870..000000000000
--- a/net/coda6_server/files/patch-srv.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- coda-src/vice/srv.cc.orig	Fri Sep  3 16:22:14 2004
-+++ coda-src/vice/srv.cc	Tue Nov 16 22:19:04 2004
-@@ -1204,6 +1204,7 @@
- void SwapLog()
- {
-     struct timeval tp;
-+    time_t start;
- 
-     /* Need to chdir() again, since salvage may have put me elsewhere */
-     if(chdir(vice_file("srv"))) {
-@@ -1216,7 +1217,8 @@
-     
-     /* Print out time/date, since date info has "scrolled off" */
-     TM_GetTimeOfDay(&tp, 0);
--    SLog(0, "Coda Vice, version " PACKAGE_VERSION "\tlog started at %s", ctime(&tp.tv_sec));
-+    start=tp.tv_sec;
-+    SLog(0, "Coda Vice, version " PACKAGE_VERSION "\tlog started at %s", ctime(&start));
- }
- 
- static void FileMsg()