Attend to some comments by Alan Barret and Thorsten Frueauf.

Also, run pkglint.  And then contend with the ci conflict
that ensued since agc did a lot of these changes too.

18 files changed, 41 insertions, 40 deletions

diff --git a/net/coda5_client/Makefile b/net/coda5_client/Makefile
index 20e58502e11..d7626554f63 100644
--- a/net/coda5_client/Makefile
+++ b/net/coda5_client/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1998/10/02 13:57:28 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/10/02 14:38:58 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-client-4.6.5
+PKGNAME=	coda-client-4.6.5.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	coda@cs.cmu.edu
+MAINTAINER=	rvb@cs.cmu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	gdbm-*:../../databases/gdbm
+DEPENDS+=	readline-*:../../devel/readline
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	client-install
diff --git a/net/coda5_client/patches/patch-aa b/net/coda5_client/patches/patch-aa
index d5a2901d8c8..688c171c813 100644
--- a/net/coda5_client/patches/patch-aa
+++ b/net/coda5_client/patches/patch-aa
@@ -1,5 +1,6 @@
-$NetBSD: patch-aa,v 1.3 1998/10/02 13:54:31 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:58 rvb Exp $
 
+diff -ru ../coda-4.6.5/configure ./configure
 --- ../coda-4.6.5/configure     Wed Sep  2 14:07:47 1998
 +++ ./configure Thu Sep  3 14:37:32 1998
 @@ -1362,8 +1362,14 @@
diff --git a/net/coda5_client/patches/patch-ab b/net/coda5_client/patches/patch-ab
index ded792bfd4d..0973f96e7ef 100644
--- a/net/coda5_client/patches/patch-ab
+++ b/net/coda5_client/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/10/02 13:54:31 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:58 rvb Exp $
 
 --- coda-b4_6_4/coda-src/venus/worker.cc	Tue Jun 16 06:46:19 1998
 +++ ./coda-src/venus/worker.cc	Sat Sep 12 11:24:37 1998
diff --git a/net/coda5_client/pkg/DESCR b/net/coda5_client/pkg/DESCR
index 7d9eb482809..44668209467 100644
--- a/net/coda5_client/pkg/DESCR
+++ b/net/coda5_client/pkg/DESCR
@@ -3,6 +3,6 @@ operation, good security model, server replication and persistent client
 side caching. 
 
 This package builds the entire source tree but only installs(/packages) the
-client side programs
+client side programs.
 
 For more info, contact <coda@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.
diff --git a/net/coda5_server/Makefile b/net/coda5_server/Makefile
index 8ba6a8eae4c..b9e2b4155e9 100644
--- a/net/coda5_server/Makefile
+++ b/net/coda5_server/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1998/10/02 13:41:05 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/10/02 14:38:59 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-server-4.6.5
+PKGNAME=	coda-server-4.6.5.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	coda@cs.cmu.edu
+MAINTAINER=	rvb@cs.cmu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	gdbm-*:../../databases/gdbm
+DEPENDS+=	readline-*:../../devel/readline
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	server-install
diff --git a/net/coda5_server/patches/patch-aa b/net/coda5_server/patches/patch-aa
index 2869727b164..9f785160df0 100644
--- a/net/coda5_server/patches/patch-aa
+++ b/net/coda5_server/patches/patch-aa
@@ -1,7 +1,6 @@
-$NetBSD: patch-aa,v 1.3 1998/10/02 13:33:40 agc Exp $
-
-Miscellaneous diffs.
+$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:59 rvb Exp $
 
+diff -ru ../coda-4.6.5/configure ./configure
 --- ../coda-4.6.5/configure     Wed Sep  2 14:07:47 1998
 +++ ./configure Thu Sep  3 14:37:32 1998
 @@ -1362,8 +1362,14 @@
diff --git a/net/coda5_server/patches/patch-ab b/net/coda5_server/patches/patch-ab
index 0ac2ce66859..6946f850f68 100644
--- a/net/coda5_server/patches/patch-ab
+++ b/net/coda5_server/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/10/02 13:44:39 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:59 rvb Exp $
 
 --- coda-b4_6_4/coda-src/venus/worker.cc	Tue Jun 16 06:46:19 1998
 +++ ./coda-src/venus/worker.cc	Sat Sep 12 11:24:37 1998
diff --git a/net/coda5_server/pkg/DESCR b/net/coda5_server/pkg/DESCR
index 86cd6e304b4..81bf42fa4b0 100644
--- a/net/coda5_server/pkg/DESCR
+++ b/net/coda5_server/pkg/DESCR
@@ -3,6 +3,6 @@ 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
+server side programs.
 
 For more info, contact <coda@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.
diff --git a/net/coda_client/Makefile b/net/coda_client/Makefile
index 20e58502e11..d7626554f63 100644
--- a/net/coda_client/Makefile
+++ b/net/coda_client/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1998/10/02 13:57:28 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/10/02 14:38:58 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-client-4.6.5
+PKGNAME=	coda-client-4.6.5.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	coda@cs.cmu.edu
+MAINTAINER=	rvb@cs.cmu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	gdbm-*:../../databases/gdbm
+DEPENDS+=	readline-*:../../devel/readline
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	client-install
diff --git a/net/coda_client/patches/patch-aa b/net/coda_client/patches/patch-aa
index d5a2901d8c8..688c171c813 100644
--- a/net/coda_client/patches/patch-aa
+++ b/net/coda_client/patches/patch-aa
@@ -1,5 +1,6 @@
-$NetBSD: patch-aa,v 1.3 1998/10/02 13:54:31 agc Exp $
+$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:58 rvb Exp $
 
+diff -ru ../coda-4.6.5/configure ./configure
 --- ../coda-4.6.5/configure     Wed Sep  2 14:07:47 1998
 +++ ./configure Thu Sep  3 14:37:32 1998
 @@ -1362,8 +1362,14 @@
diff --git a/net/coda_client/patches/patch-ab b/net/coda_client/patches/patch-ab
index ded792bfd4d..0973f96e7ef 100644
--- a/net/coda_client/patches/patch-ab
+++ b/net/coda_client/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/10/02 13:54:31 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:58 rvb Exp $
 
 --- coda-b4_6_4/coda-src/venus/worker.cc	Tue Jun 16 06:46:19 1998
 +++ ./coda-src/venus/worker.cc	Sat Sep 12 11:24:37 1998
diff --git a/net/coda_client/pkg/DESCR b/net/coda_client/pkg/DESCR
index 7d9eb482809..44668209467 100644
--- a/net/coda_client/pkg/DESCR
+++ b/net/coda_client/pkg/DESCR
@@ -3,6 +3,6 @@ operation, good security model, server replication and persistent client
 side caching. 
 
 This package builds the entire source tree but only installs(/packages) the
-client side programs
+client side programs.
 
 For more info, contact <coda@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.
diff --git a/net/coda_doc/Makefile b/net/coda_doc/Makefile
index 0ba76cc63de..bd57354ecdd 100644
--- a/net/coda_doc/Makefile
+++ b/net/coda_doc/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.2 1998/10/02 14:15:33 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/10/02 14:38:59 rvb Exp $
 #
 
 DISTNAME=	coda-doc-4.6.5-3
+PKGNAME=	coda-doc-4.6.5.3
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/doc/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	coda@cs.cmu.edu
+MAINTAINER=	rvb@cs.cmu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
 #NO_DEPENDS=
diff --git a/net/coda_doc/pkg/DESCR b/net/coda_doc/pkg/DESCR
index 0b0db360c7a..029385bf277 100644
--- a/net/coda_doc/pkg/DESCR
+++ b/net/coda_doc/pkg/DESCR
@@ -2,7 +2,7 @@ Coda is a distributed file system.  Among its features are disconnected
 operation, good security model, server replication and persistent client
 side caching. 
 
-This package builds nothing but only installs(/packages) prebuilt documentation.
+This package builds nothing but only installs(/packages) prebuilt
+documentation.
 
 For more info, contact <rvb@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.
-
diff --git a/net/coda_server/Makefile b/net/coda_server/Makefile
index 8ba6a8eae4c..b9e2b4155e9 100644
--- a/net/coda_server/Makefile
+++ b/net/coda_server/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.2 1998/10/02 13:41:05 agc Exp $
+# $NetBSD: Makefile,v 1.3 1998/10/02 14:38:59 rvb Exp $
 #
 
 DISTNAME=	coda-4.6.5
-PKGNAME=	coda-server-4.6.5
+PKGNAME=	coda-server-4.6.5.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	coda@cs.cmu.edu
+MAINTAINER=	rvb@cs.cmu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 
-DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
-DEPENDS+=	readline-2.2:../../devel/readline
+DEPENDS+=	gdbm-*:../../databases/gdbm
+DEPENDS+=	readline-*:../../devel/readline
 
 ALL_TARGET=	coda
 INSTALL_TARGET=	server-install
diff --git a/net/coda_server/patches/patch-aa b/net/coda_server/patches/patch-aa
index 2869727b164..9f785160df0 100644
--- a/net/coda_server/patches/patch-aa
+++ b/net/coda_server/patches/patch-aa
@@ -1,7 +1,6 @@
-$NetBSD: patch-aa,v 1.3 1998/10/02 13:33:40 agc Exp $
-
-Miscellaneous diffs.
+$NetBSD: patch-aa,v 1.4 1998/10/02 14:38:59 rvb Exp $
 
+diff -ru ../coda-4.6.5/configure ./configure
 --- ../coda-4.6.5/configure     Wed Sep  2 14:07:47 1998
 +++ ./configure Thu Sep  3 14:37:32 1998
 @@ -1362,8 +1362,14 @@
diff --git a/net/coda_server/patches/patch-ab b/net/coda_server/patches/patch-ab
index 0ac2ce66859..6946f850f68 100644
--- a/net/coda_server/patches/patch-ab
+++ b/net/coda_server/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 1998/10/02 13:44:39 agc Exp $
+$NetBSD: patch-ab,v 1.3 1998/10/02 14:38:59 rvb Exp $
 
 --- coda-b4_6_4/coda-src/venus/worker.cc	Tue Jun 16 06:46:19 1998
 +++ ./coda-src/venus/worker.cc	Sat Sep 12 11:24:37 1998
diff --git a/net/coda_server/pkg/DESCR b/net/coda_server/pkg/DESCR
index 86cd6e304b4..81bf42fa4b0 100644
--- a/net/coda_server/pkg/DESCR
+++ b/net/coda_server/pkg/DESCR
@@ -3,6 +3,6 @@ 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
+server side programs.
 
 For more info, contact <coda@cs.cmu.edu> or visit http://www.coda.cs.cmu.edu.