Fix build on current and remove BROKEN tag

PR:		ports/48830
Submitted by:	tjr

8 files changed, 151 insertions, 4 deletions

diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index ff7d4561c317..4db0169aa613 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -33,8 +33,4 @@ CODA_VERSION?=	5.3.19
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500037
-BROKEN=		"Does not build"
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/net/coda5_server/files/patch-aa b/net/coda5_server/files/patch-aa
new file mode 100644
index 000000000000..d1d4f2fd4f24
--- /dev/null
+++ b/net/coda5_server/files/patch-aa
@@ -0,0 +1,36 @@
+--- coda-src/update/updatesrv.cc.orig	Sun Mar  2 17:55:46 2003
++++ coda-src/update/updatesrv.cc	Sun Mar  2 17:57:50 2003
+@@ -184,6 +184,7 @@
+     long portmapid;
+     struct stat statbuf;
+     char *miscdir;
++    time_t tim;
+ 
+     /* process the command line arguments */
+     for (i = 1; i < argc; i++) {
+@@ -305,7 +306,7 @@
+     }
+     gettimeofday(&tp, &tsp);
+     LogMsg(0, SrvDebugLevel, stdout, 
+-	   "Update Server started %s", ctime(&tp.tv_sec));
++	   "Update Server started %s", ctime(&(tim = tp.tv_sec)));
+ 
+     CODA_ASSERT(LWP_WaitProcess((char *)&parentPid) == LWP_SUCCESS);
+ 
+@@ -455,6 +456,7 @@
+     char    name[MAXPATHLEN];	/* area to hold the name */
+     struct stat buff;		/* buffer for stat */
+     int     len;
++    time_t  tim;
+ 
+     rc = 0;
+ 
+@@ -518,7 +520,7 @@
+     *CurrentUsecs = tp.tv_usec;
+     LogMsg(2, SrvDebugLevel, stdout, 
+ 	   "UpdateFetch returns %s newtime is %d at %s",
+-	   ViceErrorMsg((int)rc), *NewTime, ctime(&tp.tv_sec));
++	   ViceErrorMsg((int)rc), *NewTime, ctime(&(tim = tp.tv_sec)));
+     return(rc);
+ }
+ 
diff --git a/net/coda5_server/files/patch-ab b/net/coda5_server/files/patch-ab
new file mode 100644
index 000000000000..dcd22ec73159
--- /dev/null
+++ b/net/coda5_server/files/patch-ab
@@ -0,0 +1,39 @@
+--- coda-src/update/updateclnt.cc.orig	Sun Mar  2 17:58:32 2003
++++ coda-src/update/updateclnt.cc	Sun Mar  2 17:59:25 2003
+@@ -152,6 +152,7 @@
+     int     i, rc;
+     int     len;
+     char    errmsg[MAXPATHLEN];
++    time_t  tim;
+     
+     *host = '\0';
+ 
+@@ -226,7 +227,7 @@
+     gettimeofday(&tp, &tsp);
+     LogMsg(0, SrvDebugLevel, stdout, 
+ 	   "Update Client pid = %d started at %s", 
+-	   getpid(), ctime(&tp.tv_sec));
++	   getpid(), ctime(&(tim = tp.tv_sec)));
+ 
+     time.tv_sec = waitinterval;
+     time.tv_usec = 0;
+@@ -688,16 +689,17 @@
+ {
+     struct timeval tv;
+     struct timezone tz;
++    time_t tim;
+ 
+     if(rename("UpdateLog","UpdateLog.old")) {
+ 	LogMsg(0, SrvDebugLevel, stdout, "Rename for UpdateLog failed with a %s\n", ViceErrorMsg(errno));
+     }
+     else {
+ 	gettimeofday(&tv, &tz);
+-	LogMsg(0, SrvDebugLevel, stdout, "Moving UpdateLog to UpdateLog.old at %s", ctime(&tv.tv_sec));
++	LogMsg(0, SrvDebugLevel, stdout, "Moving UpdateLog to UpdateLog.old at %s", ctime(&(tim = tv.tv_sec)));
+ 	freopen("UpdateLog","a+",stdout);
+ 	freopen("UpdateLog","a+",stderr);
+-	LogMsg(0, SrvDebugLevel, stdout, "New UpdateLog started at %s", ctime(&tv.tv_sec));
++	LogMsg(0, SrvDebugLevel, stdout, "New UpdateLog started at %s", ctime(&(tim = tv.tv_sec)));
+     }
+ }
+ 
diff --git a/net/coda5_server/files/patch-ac b/net/coda5_server/files/patch-ac
new file mode 100644
index 000000000000..407ebbf4e31d
--- /dev/null
+++ b/net/coda5_server/files/patch-ac
@@ -0,0 +1,20 @@
+--- coda-src/venus/fso_cachefile.cc.orig	Sun Mar  2 17:32:28 2003
++++ coda-src/venus/fso_cachefile.cc	Sun Mar  2 17:33:30 2003
+@@ -132,7 +132,7 @@
+ /* Must be called from within a transaction!  Assume caller has done
+    RVMLIB_REC_OBJECT() */
+ 
+-void CacheFile::Create(int newlength = 0)
++void CacheFile::Create(int newlength)
+ {
+     LOG(10, ("CacheFile::Create: %s, %d\n", name, newlength));
+ 
+@@ -183,7 +183,7 @@
+     return 0;
+ }
+ 
+-int CacheFile::Copy(char *destname, ino_t *ino, int recovering = 0)
++int CacheFile::Copy(char *destname, ino_t *ino, int recovering)
+ {
+     LOG(10, ("CacheFile::Copy: from %s, %d, %d/%d, to %s\n",
+ 	     name, inode, validdata, length, destname));
diff --git a/net/coda5_server/files/patch-ad b/net/coda5_server/files/patch-ad
new file mode 100644
index 000000000000..ae5ff3e43f18
--- /dev/null
+++ b/net/coda5_server/files/patch-ad
@@ -0,0 +1,13 @@
+--- coda-src/venus/vproc.cc.orig	Sun Mar  2 17:42:30 2003
++++ coda-src/venus/vproc.cc	Sun Mar  2 17:43:34 2003
+@@ -784,8 +784,10 @@
+ #if !defined(NetBSD1_3) && !defined(__NetBSD_Version__)
+     sp->st_lspare = 0;
+ #endif
++#if __FreeBSD_version < 5
+     sp->st_qspare[0] = 0;
+     sp->st_qspare[1] = 0;
++#endif
+ #endif /* __BSD44__ */
+ }
+ 
diff --git a/net/coda5_server/files/patch-ae b/net/coda5_server/files/patch-ae
new file mode 100644
index 000000000000..b3b75be8390b
--- /dev/null
+++ b/net/coda5_server/files/patch-ae
@@ -0,0 +1,16 @@
+--- coda-src/vice/srv.cc.orig	Sun Mar  2 17:49:12 2003
++++ coda-src/vice/srv.cc	Sun Mar  2 17:54:40 2003
+@@ -1270,8 +1270,13 @@
+     char buf[100], buf2[100]; /* can't believe there will be more logs! */
+     struct dirent **namelist = NULL;
+ 
++#if __FreeBSD__ >= 5
++    count = scandir(".", &namelist, (int (*)(dirent *)) xselect,
++		    (int (*)(const void *, const void *)) compar);
++#else
+     count = scandir(".", &namelist, (int (*)(const dirent *)) xselect,
+ 		    (int (*)(const void *, const void *)) compar);
++#endif
+     /* It is safe now to blindly rename */
+     for (i = 0; i < count; i++) {
+ 	sprintf(buf, "SrvLog-%d", count-i);
diff --git a/net/coda5_server/files/patch-af b/net/coda5_server/files/patch-af
new file mode 100644
index 000000000000..fb27bf564134
--- /dev/null
+++ b/net/coda5_server/files/patch-af
@@ -0,0 +1,14 @@
+--- tools/our-install.orig	Sun Mar  2 17:18:33 2003
++++ tools/our-install	Sun Mar  2 17:21:13 2003
+@@ -11,8 +11,10 @@
+ PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/ucb
+ export PATH
+ 
+-if [ $SYS = NetBSD -o $SYS = FreeBSD -o $SYS = OpenBSD ] ; then
++if [ $SYS = NetBSD -o $SYS = OpenBSD ] ; then
+ OWNGRP=root.wheel
++elif [ $SYS = FreeBSD ] ; then
++OWNGRP=root:wheel
+ else
+ OWNGRP=root:root
+ fi
diff --git a/net/coda5_server/files/patch-ag b/net/coda5_server/files/patch-ag
new file mode 100644
index 000000000000..f082292ff061
--- /dev/null
+++ b/net/coda5_server/files/patch-ag
@@ -0,0 +1,13 @@
+--- lib-src/kernel-includes/coda.h.orig	Sun Mar  2 18:11:14 2003
++++ lib-src/kernel-includes/coda.h	Sun Mar  2 18:11:58 2003
+@@ -125,6 +125,10 @@
+ #define __BIT_TYPES_DEFINED__
+ #endif
+ 
++#if __FreeBSD__ >= 5
++#define	__BIT_TYPES_DEFINED__
++#endif
++
+ #ifndef __BIT_TYPES_DEFINED__
+ #define __BIT_TYPES_DEFINED__
+ typedef signed char	      int8_t;