4 files changed, 49 insertions, 50 deletions

diff --git a/net/coda6_client/Makefile b/net/coda6_client/Makefile
index e3cdfabc2001..c3ac4f78b348 100644
--- a/net/coda6_client/Makefile
+++ b/net/coda6_client/Makefile
@@ -1,7 +1,7 @@
 # Created by: Tim Robbins <tim@robbins.dropbear.id.au>
 # $FreeBSD$
 
-PORTREVISION=	2
+PORTREVISION=	3
 
 COMMENT=	Client programs for a replicated high-performance network file system
 
@@ -10,5 +10,4 @@ PKGDIR=		${.CURDIR}
 
 CODA_SUITE=	client
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/net/coda6_client/pkg-plist b/net/coda6_client/pkg-plist
index 240e5a56b090..268d9bf9985f 100644
--- a/net/coda6_client/pkg-plist
+++ b/net/coda6_client/pkg-plist
@@ -19,6 +19,22 @@ bin/xaskuser
 bin/xfrepair
 etc/coda/realms
 etc/coda/venus.conf.ex
+man/man1/au.1.gz
+man/man1/cfs.1.gz
+man/man1/clog.1.gz
+man/man1/cmon.1.gz
+man/man1/coda_replay.1.gz
+man/man1/cpasswd.1.gz
+man/man1/ctokens.1.gz
+man/man1/cunlog.1.gz
+man/man1/hoard.1.gz
+man/man1/mkcodabf.1.gz
+man/man1/repair.1.gz
+man/man1/spy.1.gz
+man/man8/venus-setup.8.gz
+man/man8/venus.8.gz
+man/man8/volmunge.8.gz
+man/man8/vutil.8.gz
 sbin/asrlauncher
 sbin/codaconfedit
 sbin/venus
diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 007a16229a18..ceae6cefabab 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	coda
 PORTVERSION=	6.9.4
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \
 		ftp://ftp.planetmirror.com/pub/coda/src/ \
@@ -18,61 +18,20 @@ LIB_DEPENDS=	liblwp.so:${PORTSDIR}/devel/lwp \
 		librpc2.so:${PORTSDIR}/devel/rpc2 \
 		librvmlwp.so:${PORTSDIR}/devel/rvm
 
-USES=		pkgconfig gmake
+USES=		pkgconfig gmake shebangfix perl5
+USE_PERL5=	run
+SHEBANG_FILES=	coda-src/scripts/tape.pl \
+		coda-src/scripts/volinfo.pl \
+		coda-src/scripts/volsizes.pl \
+		coda-src/scripts/volmunge
 GNU_CONFIGURE=	yes
-
 CONFIGURE_ARGS+=	--enable-${CODA_SUITE}
-
 CODA_SUITE?=	server
 
 .if ${CODA_SUITE} == server
 CONFLICTS=	openafs-[0-9]*
-
-MAN5=	backuplogs.5 \
-	dumpfile.5 \
-	dumplist.5 \
-	maxgroupid.5 \
-	passwd.coda.5 \
-	servers.5 \
-	vicetab.5 \
-	volumelist.5 \
-	vrdb.5
-MAN8=	auth2.8 \
-	backup.8 \
-	bldvldb.sh.8 \
-	codasrv.8 \
-	createvol_rep.8 \
-	initpw.8 \
-	merge.8 \
-	norton.8 \
-	pdbtool.8 \
-	purgevol_rep.8 \
-	readdump.8 \
-	startserver.8 \
-	updateclnt.8 \
-	updatesrv.8 \
-	vice-setup.8 \
-	volutil.8
-.else
-MAN1=	au.1 \
-	cfs.1 \
-	clog.1 \
-	cmon.1 \
-	coda_replay.1 \
-	cpasswd.1 \
-	ctokens.1 \
-	cunlog.1 \
-	hoard.1 \
-	mkcodabf.1 \
-	repair.1 \
-	spy.1
-MAN8=	venus-setup.8 \
-	venus.8 \
-	volmunge.8 \
-	vutil.8
 .endif
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${CODA_SUITE} == client
diff --git a/net/coda6_server/pkg-plist b/net/coda6_server/pkg-plist
index 521b5a2921fb..f7dbcf32b21f 100644
--- a/net/coda6_server/pkg-plist
+++ b/net/coda6_server/pkg-plist
@@ -5,6 +5,31 @@ bin/rvmsizer
 bin/smon2
 etc/coda/server.conf.ex
 @dirrmtry etc/coda
+man/man5/backuplogs.5.gz
+man/man5/dumpfile.5.gz
+man/man5/dumplist.5.gz
+man/man5/maxgroupid.5.gz
+man/man5/passwd.coda.5.gz
+man/man5/servers.5.gz
+man/man5/vicetab.5.gz
+man/man5/volumelist.5.gz
+man/man5/vrdb.5.gz
+man/man8/auth2.8.gz
+man/man8/backup.8.gz
+man/man8/bldvldb.sh.8.gz
+man/man8/codasrv.8.gz
+man/man8/createvol_rep.8.gz
+man/man8/initpw.8.gz
+man/man8/merge.8.gz
+man/man8/norton.8.gz
+man/man8/pdbtool.8.gz
+man/man8/purgevol_rep.8.gz
+man/man8/readdump.8.gz
+man/man8/startserver.8.gz
+man/man8/updateclnt.8.gz
+man/man8/updatesrv.8.gz
+man/man8/vice-setup.8.gz
+man/man8/volutil.8.gz
 sbin/auth2
 sbin/backup
 sbin/backup.sh