Update to version 6.9.1

PR:	114594

5 files changed, 12 insertions, 40 deletions

diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 0998bad7f0f3..d751a18e6957 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	coda
-PORTVERSION=	6.1.2
+PORTVERSION=	6.9.1
 CATEGORIES=	net
 # as of 5 Oct 2006 the archive is not present on ftp.wu-wien.ac.at
 # but maybe it'll appear there soon
@@ -57,8 +57,7 @@ MAN8=	auth2.8 \
 	updateclnt.8 \
 	updatesrv.8 \
 	vice-setup.8 \
-	volutil.8 \
-	vutil.8
+	volutil.8
 .else
 MAN1=	au.1 \
 	cfs.1 \
@@ -74,7 +73,8 @@ MAN1=	au.1 \
 	spy.1
 MAN8=	venus-setup.8 \
 	venus.8 \
-	volmunge.8
+	volmunge.8 \
+	vutil.8
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/net/coda6_server/distinfo b/net/coda6_server/distinfo
index f287ea4ec203..6a178a769182 100644
--- a/net/coda6_server/distinfo
+++ b/net/coda6_server/distinfo
@@ -1,3 +1,3 @@
-MD5 (coda-6.1.2.tar.gz) = d4c6f70e18de7e049376bb9d71499cbe
-SHA256 (coda-6.1.2.tar.gz) = 19c6a23ea6e7b4ca0501f49a9a742330e575e8a8afa86d9f45988bf4eb6f8c3f
-SIZE (coda-6.1.2.tar.gz) = 1571467
+MD5 (coda-6.9.1.tar.gz) = cafa37df22e7718ae8e67ff8583bd805
+SHA256 (coda-6.9.1.tar.gz) = f7a1dbce67f20e7c294087e33e9767a024f2a7d3fa6456d03004018073e118de
+SIZE (coda-6.9.1.tar.gz) = 1537910
diff --git a/net/coda6_server/files/patch-coda-src_scripts_Makefile.in b/net/coda6_server/files/patch-coda-src_scripts_Makefile.in
index 5584c0f82a8e..2392719a9ac7 100644
--- a/net/coda6_server/files/patch-coda-src_scripts_Makefile.in
+++ b/net/coda6_server/files/patch-coda-src_scripts_Makefile.in
@@ -1,17 +1,11 @@
-
-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 @@
+--- coda-src/scripts/Makefile.in.orig	2006-11-02 14:46:29.000000000 -0500
++++ coda-src/scripts/Makefile.in	2007-07-14 23:33:28.000000000 -0400
+@@ -25,13 +25,13 @@
  # 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
+-VENUS-SCRIPTS = volmunge venus-setup coda-setup-ports
++VENUS-SCRIPTS = volmunge venus-setup
  
  VOL-SCRIPTS	= createvol_rep purgevol_rep bldvldb.sh
  VICE-SCRIPTS	= startserver codastart coda-server-logrotate
diff --git a/net/coda6_server/files/patch-coda-src_venus_fso1.cc b/net/coda6_server/files/patch-coda-src_venus_fso1.cc
deleted file mode 100644
index e7be0d222e86..000000000000
--- a/net/coda6_server/files/patch-coda-src_venus_fso1.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-pioctl.h b/net/coda6_server/files/patch-pioctl.h
deleted file mode 100644
index 2bdeff78574a..000000000000
--- a/net/coda6_server/files/patch-pioctl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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(__NetBSD__)
-+#if defined(__NetBSD__) || defined(__FreeBSD__)
- #define _IOC_TYPEMASK	0xff
- #define _IOC_TYPESHIFT	8
- #define _IOC_NRMASK	0xff