5 files changed, 40 insertions, 15 deletions

diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 245ed6e477d3..56e334607f2d 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,24 +1,33 @@
 # New ports collection makefile for:	coda-server
 # Date created:				Mon Oct 18 12:01:28 EDT 1999
 # Whom:					???#
+#
 # $FreeBSD$
 #
 
-PORTNAME=	coda-server
-PORTVERSION=	5.3.2
+PORTNAME=	coda
+PORTVERSION=	${CODA_VERSION}
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
-DISTNAME=	coda-5.3.2
+PKGNAMESUFFIX=	-${CODA_SUITE}
+DISTNAME=	coda-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	rvb@cs.cmu.edu
 
-BUILD_DEPENDS=	${PREFIX}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
+		lwp.1:${PORTSDIR}/devel/lwp \
+		rpc2.2:${PORTSDIR}/devel/rpc2 \
+		rvm.1:${PORTSDIR}/devel/rvm
 
 ALL_TARGET=	coda
-INSTALL_TARGET=	server-install
+INSTALL_TARGET=	${CODA_SUITE}-install
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+CONFIGURE_ARGS?=	--sysconfdir=${PREFIX}/etc/rc.d
+
+CODA_SUITE?=	server
+CODA_VERSION?=	5.3.7
 
 .include <bsd.port.mk>
diff --git a/net/coda5_server/distinfo b/net/coda5_server/distinfo
index d8ca93935fc4..a3ac8f0ec700 100644
--- a/net/coda5_server/distinfo
+++ b/net/coda5_server/distinfo
@@ -1 +1 @@
-MD5 (coda-5.3.2.tgz) = ee7fc3b151792007bbe71ed5f6104436
+MD5 (coda-5.3.7.tgz) = 009564d134b26af04e95b93b6512cf63
diff --git a/net/coda5_server/files/patch-aa b/net/coda5_server/files/patch-aa
new file mode 100644
index 000000000000..f7f6ae16c956
--- /dev/null
+++ b/net/coda5_server/files/patch-aa
@@ -0,0 +1,16 @@
+Some bug inside gcc version 2.95.2 19991024 (release) because
+resolver.cc will not compile without -pedantic. Go figure.
+Adding -pedantic to CXXFLAGS just breaks the other src files.
+
+--- Makefile.in.ORIG	Thu Apr 13 14:36:15 2000
++++ coda-src/asr/Makefile.in	Thu Apr 13 14:37:56 2000
+@@ -44,6 +44,9 @@
+ 
+ YFLAGS= -d
+ 
++resolver.o: resolver.cc
++	$(CXX) $(CXXFLAGS) -pedantic -c $<
++
+ resolver_parser.c: resolver_parser.h
+ resolver_parser.h: resolver_parser.y
+ 	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.c && mv y.tab.h $*.h
diff --git a/net/coda5_server/pkg-descr b/net/coda5_server/pkg-descr
index 5182223fc37d..67606731d270 100644
--- a/net/coda5_server/pkg-descr
+++ b/net/coda5_server/pkg-descr
@@ -1,10 +1,11 @@
 Coda is a distributed file system.  Among its features are disconnected
-operation, good security model, server replication and persistent client
-side caching. 
+operation, good security model, server replication and persistent
+client side caching.
 
-This package builds the entire source tree but only installs(/packages) the
-server side programs.
+This package builds the entire source tree but only installs(/packages)
+the server side programs.
 
-For more info, contact <coda@cs.cmu.edu> or visit the website.
+For more info, contact information available below.
 
-WWW: http://www.coda.cs.cmu.edu
+EMAIL: coda@cs.cmu.edu
+WWW: http://www.coda.cs.cmu.edu/
diff --git a/net/coda5_server/pkg-plist b/net/coda5_server/pkg-plist
index 368a9710dd6a..a6750a21ef50 100644
--- a/net/coda5_server/pkg-plist
+++ b/net/coda5_server/pkg-plist
@@ -1,12 +1,13 @@
-bin/filcon
 bin/norton
 bin/norton-reinit
 bin/reinit
+sbin/au
 sbin/auth2
 sbin/backup
 sbin/backup.sh
 sbin/bldvldb.sh
 sbin/codasrv
+sbin/codastart
 sbin/createvol_rep
 sbin/initpw
 sbin/inoder
@@ -19,10 +20,8 @@ sbin/printvrdb
 sbin/purgevol
 sbin/purgevol_rep
 sbin/pwdtopdbtool.py
-sbin/rdsinit
 sbin/readdump
 sbin/rpc2portmap
-sbin/rvmutl
 sbin/startserver
 sbin/tape.pl
 sbin/updateclnt