From ff262f638a13040460731bee868fa48b194c3ac1 Mon Sep 17 00:00:00 2001
From: agc <agc>
Date: Sat, 17 Feb 2001 09:06:56 +0000
Subject: [PATCH] Move the COMMENT from being in its own file to a definition
 in the package Makefile.

---
 lang/RScheme/Makefile            | 3 ++-
 lang/RScheme/pkg/COMMENT         | 1 -
 lang/STk/Makefile                | 3 ++-
 lang/STk/pkg/COMMENT             | 1 -
 lang/awka/Makefile               | 3 ++-
 lang/awka/pkg/COMMENT            | 1 -
 lang/baci/Makefile               | 3 ++-
 lang/baci/pkg/COMMENT            | 1 -
 lang/brandybasic/Makefile        | 3 ++-
 lang/brandybasic/pkg/COMMENT     | 1 -
 lang/bwbasic/Makefile            | 3 ++-
 lang/bwbasic/pkg/COMMENT         | 1 -
 lang/caml-light/Makefile         | 3 ++-
 lang/caml-light/pkg/COMMENT      | 1 -
 lang/camlp4/Makefile             | 3 ++-
 lang/camlp4/pkg/COMMENT          | 1 -
 lang/cim/Makefile                | 3 ++-
 lang/cim/pkg/COMMENT             | 1 -
 lang/cint/Makefile               | 3 ++-
 lang/cint/pkg/COMMENT            | 1 -
 lang/clisp/Makefile              | 3 ++-
 lang/clisp/pkg/COMMENT           | 1 -
 lang/drscheme/Makefile           | 3 ++-
 lang/drscheme/pkg/COMMENT        | 1 -
 lang/egcs/Makefile               | 3 ++-
 lang/egcs/pkg/COMMENT            | 1 -
 lang/elisp-manual/Makefile       | 3 ++-
 lang/elisp-manual/pkg/COMMENT    | 1 -
 lang/elk/Makefile                | 3 ++-
 lang/elk/pkg/COMMENT             | 1 -
 lang/f2c/Makefile                | 3 ++-
 lang/f2c/pkg/COMMENT             | 1 -
 lang/fort77/Makefile             | 3 ++-
 lang/fort77/pkg/COMMENT          | 1 -
 lang/gawk/Makefile               | 3 ++-
 lang/gawk/pkg/COMMENT            | 1 -
 lang/gb/Makefile                 | 3 ++-
 lang/gb/pkg/COMMENT              | 1 -
 lang/gcc/Makefile                | 3 ++-
 lang/gcc/pkg/COMMENT             | 1 -
 lang/gforth/Makefile             | 3 ++-
 lang/gforth/pkg/COMMENT          | 1 -
 lang/ghc/Makefile                | 3 ++-
 lang/ghc/pkg/COMMENT             | 1 -
 lang/gprolog/Makefile            | 3 ++-
 lang/gprolog/pkg/COMMENT         | 1 -
 lang/guavac/Makefile             | 3 ++-
 lang/guavac/pkg/COMMENT          | 1 -
 lang/guile/Makefile              | 3 ++-
 lang/guile/pkg/COMMENT           | 1 -
 lang/hugs/Makefile               | 3 ++-
 lang/hugs/pkg/COMMENT            | 1 -
 lang/icon/Makefile               | 3 ++-
 lang/icon/pkg/COMMENT            | 1 -
 lang/intercal/Makefile           | 3 ++-
 lang/intercal/pkg/COMMENT        | 1 -
 lang/japhar/Makefile             | 3 ++-
 lang/japhar/pkg/COMMENT          | 1 -
 lang/java-lang-spec/Makefile     | 3 ++-
 lang/java-lang-spec/pkg/COMMENT  | 1 -
 lang/java-vm-spec/Makefile       | 3 ++-
 lang/java-vm-spec/pkg/COMMENT    | 1 -
 lang/jbuilder-jit/Makefile       | 3 ++-
 lang/jbuilder-jit/pkg/COMMENT    | 1 -
 lang/jdk/Makefile                | 3 ++-
 lang/jdk/pkg/COMMENT             | 1 -
 lang/jikes/Makefile              | 3 ++-
 lang/jikes/pkg/COMMENT           | 1 -
 lang/kaffe/Makefile              | 3 ++-
 lang/kaffe/pkg/COMMENT           | 1 -
 lang/kali/Makefile               | 3 ++-
 lang/kali/pkg/COMMENT            | 1 -
 lang/libperl-current/Makefile    | 3 ++-
 lang/libperl-current/pkg/COMMENT | 1 -
 lang/libperl/Makefile            | 3 ++-
 lang/libperl/pkg/COMMENT         | 1 -
 lang/librep/Makefile             | 3 ++-
 lang/librep/pkg/COMMENT          | 1 -
 lang/mawk/Makefile               | 3 ++-
 lang/mawk/pkg/COMMENT            | 1 -
 lang/minischeme/Makefile         | 3 ++-
 lang/minischeme/pkg/COMMENT      | 1 -
 lang/moscow_ml/Makefile          | 3 ++-
 lang/moscow_ml/pkg/COMMENT       | 1 -
 lang/mzscheme/Makefile           | 3 ++-
 lang/mzscheme/pkg/COMMENT        | 1 -
 lang/nawk/Makefile               | 3 ++-
 lang/nawk/pkg/COMMENT            | 1 -
 lang/nhc98/Makefile              | 3 ++-
 lang/nhc98/pkg/COMMENT           | 1 -
 lang/ocaml/Makefile              | 3 ++-
 lang/ocaml/pkg/COMMENT           | 1 -
 lang/p2c/Makefile                | 3 ++-
 lang/p2c/pkg/COMMENT             | 1 -
 lang/perl5-base/Makefile         | 3 ++-
 lang/perl5-base/pkg/COMMENT      | 1 -
 lang/perl5/Makefile              | 3 ++-
 lang/perl5/pkg/COMMENT           | 1 -
 lang/pforth/Makefile             | 3 ++-
 lang/pforth/pkg/COMMENT          | 1 -
 lang/py-extclass/Makefile        | 3 ++-
 lang/py-extclass/pkg/COMMENT     | 1 -
 lang/py-html-docs/Makefile       | 3 ++-
 lang/py-html-docs/pkg/COMMENT    | 1 -
 lang/python/Makefile             | 3 ++-
 lang/python/pkg/COMMENT          | 1 -
 lang/ruby/Makefile               | 3 ++-
 lang/ruby/pkg/COMMENT            | 1 -
 lang/scheme48/Makefile           | 3 ++-
 lang/scheme48/pkg/COMMENT        | 1 -
 lang/siod/Makefile               | 3 ++-
 lang/siod/pkg/COMMENT            | 1 -
 lang/smalleiffel/Makefile        | 3 ++-
 lang/smalleiffel/pkg/COMMENT     | 1 -
 lang/smalltalk/Makefile          | 3 ++-
 lang/smalltalk/pkg/COMMENT       | 1 -
 lang/sml-nj/Makefile             | 3 ++-
 lang/sml-nj/pkg/COMMENT          | 1 -
 lang/snobol/Makefile             | 3 ++-
 lang/snobol/pkg/COMMENT          | 1 -
 lang/squeak/Makefile             | 3 ++-
 lang/squeak/pkg/COMMENT          | 1 -
 lang/stalin/Makefile             | 3 ++-
 lang/stalin/pkg/COMMENT          | 1 -
 lang/sun-jdk13/Makefile          | 3 ++-
 lang/sun-jdk13/pkg/COMMENT       | 1 -
 lang/sun-jre13/Makefile          | 3 ++-
 lang/sun-jre13/pkg/COMMENT       | 1 -
 lang/tcl-expect/Makefile         | 3 ++-
 lang/tcl-expect/pkg/COMMENT      | 1 -
 lang/tcl-tclX/Makefile           | 3 ++-
 lang/tcl-tclX/pkg/COMMENT        | 1 -
 lang/tcl/Makefile                | 3 ++-
 lang/tcl/pkg/COMMENT             | 1 -
 lang/tk-expect/Makefile          | 3 ++-
 lang/tk-expect/pkg/COMMENT       | 1 -
 lang/tk-tclX/Makefile            | 3 ++-
 lang/tk-tclX/pkg/COMMENT         | 1 -
 lang/ucblogo/Makefile            | 3 ++-
 lang/ucblogo/pkg/COMMENT         | 1 -
 lang/umb-scheme/Makefile         | 3 ++-
 lang/umb-scheme/pkg/COMMENT      | 1 -
 lang/vscm/Makefile               | 3 ++-
 lang/vscm/pkg/COMMENT            | 1 -
 lang/vslisp/Makefile             | 3 ++-
 lang/vslisp/pkg/COMMENT          | 1 -
 146 files changed, 146 insertions(+), 146 deletions(-)
 delete mode 100644 lang/RScheme/pkg/COMMENT
 delete mode 100644 lang/STk/pkg/COMMENT
 delete mode 100644 lang/awka/pkg/COMMENT
 delete mode 100644 lang/baci/pkg/COMMENT
 delete mode 100644 lang/brandybasic/pkg/COMMENT
 delete mode 100644 lang/bwbasic/pkg/COMMENT
 delete mode 100644 lang/caml-light/pkg/COMMENT
 delete mode 100644 lang/camlp4/pkg/COMMENT
 delete mode 100644 lang/cim/pkg/COMMENT
 delete mode 100644 lang/cint/pkg/COMMENT
 delete mode 100644 lang/clisp/pkg/COMMENT
 delete mode 100644 lang/drscheme/pkg/COMMENT
 delete mode 100644 lang/egcs/pkg/COMMENT
 delete mode 100644 lang/elisp-manual/pkg/COMMENT
 delete mode 100644 lang/elk/pkg/COMMENT
 delete mode 100644 lang/f2c/pkg/COMMENT
 delete mode 100644 lang/fort77/pkg/COMMENT
 delete mode 100644 lang/gawk/pkg/COMMENT
 delete mode 100644 lang/gb/pkg/COMMENT
 delete mode 100644 lang/gcc/pkg/COMMENT
 delete mode 100644 lang/gforth/pkg/COMMENT
 delete mode 100644 lang/ghc/pkg/COMMENT
 delete mode 100644 lang/gprolog/pkg/COMMENT
 delete mode 100644 lang/guavac/pkg/COMMENT
 delete mode 100644 lang/guile/pkg/COMMENT
 delete mode 100644 lang/hugs/pkg/COMMENT
 delete mode 100644 lang/icon/pkg/COMMENT
 delete mode 100644 lang/intercal/pkg/COMMENT
 delete mode 100644 lang/japhar/pkg/COMMENT
 delete mode 100644 lang/java-lang-spec/pkg/COMMENT
 delete mode 100644 lang/java-vm-spec/pkg/COMMENT
 delete mode 100644 lang/jbuilder-jit/pkg/COMMENT
 delete mode 100644 lang/jdk/pkg/COMMENT
 delete mode 100644 lang/jikes/pkg/COMMENT
 delete mode 100644 lang/kaffe/pkg/COMMENT
 delete mode 100644 lang/kali/pkg/COMMENT
 delete mode 100644 lang/libperl-current/pkg/COMMENT
 delete mode 100644 lang/libperl/pkg/COMMENT
 delete mode 100644 lang/librep/pkg/COMMENT
 delete mode 100644 lang/mawk/pkg/COMMENT
 delete mode 100644 lang/minischeme/pkg/COMMENT
 delete mode 100644 lang/moscow_ml/pkg/COMMENT
 delete mode 100644 lang/mzscheme/pkg/COMMENT
 delete mode 100644 lang/nawk/pkg/COMMENT
 delete mode 100644 lang/nhc98/pkg/COMMENT
 delete mode 100644 lang/ocaml/pkg/COMMENT
 delete mode 100644 lang/p2c/pkg/COMMENT
 delete mode 100644 lang/perl5-base/pkg/COMMENT
 delete mode 100644 lang/perl5/pkg/COMMENT
 delete mode 100644 lang/pforth/pkg/COMMENT
 delete mode 100644 lang/py-extclass/pkg/COMMENT
 delete mode 100644 lang/py-html-docs/pkg/COMMENT
 delete mode 100644 lang/python/pkg/COMMENT
 delete mode 100644 lang/ruby/pkg/COMMENT
 delete mode 100644 lang/scheme48/pkg/COMMENT
 delete mode 100644 lang/siod/pkg/COMMENT
 delete mode 100644 lang/smalleiffel/pkg/COMMENT
 delete mode 100644 lang/smalltalk/pkg/COMMENT
 delete mode 100644 lang/sml-nj/pkg/COMMENT
 delete mode 100644 lang/snobol/pkg/COMMENT
 delete mode 100644 lang/squeak/pkg/COMMENT
 delete mode 100644 lang/stalin/pkg/COMMENT
 delete mode 100644 lang/sun-jdk13/pkg/COMMENT
 delete mode 100644 lang/sun-jre13/pkg/COMMENT
 delete mode 100644 lang/tcl-expect/pkg/COMMENT
 delete mode 100644 lang/tcl-tclX/pkg/COMMENT
 delete mode 100644 lang/tcl/pkg/COMMENT
 delete mode 100644 lang/tk-expect/pkg/COMMENT
 delete mode 100644 lang/tk-tclX/pkg/COMMENT
 delete mode 100644 lang/ucblogo/pkg/COMMENT
 delete mode 100644 lang/umb-scheme/pkg/COMMENT
 delete mode 100644 lang/vscm/pkg/COMMENT
 delete mode 100644 lang/vslisp/pkg/COMMENT

diff --git a/lang/RScheme/Makefile b/lang/RScheme/Makefile
index b568127072e3d..22adb210eae5c 100644
--- a/lang/RScheme/Makefile
+++ b/lang/RScheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/30 04:56:21 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:06:56 agc Exp $
 
 DISTNAME=		rs-0.7.3.1
 PKGNAME=		RScheme-0.7.3.1
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.rscheme.org/pub/rscheme/
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.rscheme.org
+COMMENT=		Scheme implementation
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
 HAS_CONFIGURE=		YES
diff --git a/lang/RScheme/pkg/COMMENT b/lang/RScheme/pkg/COMMENT
deleted file mode 100644
index 0ba5d775b5718..0000000000000
--- a/lang/RScheme/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Scheme implementation
diff --git a/lang/STk/Makefile b/lang/STk/Makefile
index 16cf1b325c931..04dfc43774f0c 100644
--- a/lang/STk/Makefile
+++ b/lang/STk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/10/18 04:26:53 garbled Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/17 09:06:57 agc Exp $
 #
 
 DISTNAME=       STk-3.99.2
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://kaolin.unice.fr/pub/STk/
 
 MAINTAINER=	perry@netbsd.org
 HOMEPAGE=	http://kaolin.unice.fr/STk/
+COMMENT=	Scheme interpreter with full access to the Tk graphical package
 
 OSVERSION_SPECIFIC=	yes
 GNU_CONFIGURE=	yes
diff --git a/lang/STk/pkg/COMMENT b/lang/STk/pkg/COMMENT
deleted file mode 100644
index 4e4484c219c0b..0000000000000
--- a/lang/STk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Scheme interpreter with full access to the Tk graphical package
diff --git a/lang/awka/Makefile b/lang/awka/Makefile
index d834f65cf139d..ae5b026fada52 100644
--- a/lang/awka/Makefile
+++ b/lang/awka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/08/17 07:34:44 rh Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:06:58 agc Exp $
 #
 
 DISTNAME=	awka-0.7.0
@@ -7,6 +7,7 @@ MASTER_SITES=	http://members.linuxstart.com/~awka/
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://members.linuxstart.com/~awka/
+COMMENT=	AWK to ANSI C compiler
 
 GNU_CONFIGURE=	YES
 
diff --git a/lang/awka/pkg/COMMENT b/lang/awka/pkg/COMMENT
deleted file mode 100644
index 19ee52962d3a6..0000000000000
--- a/lang/awka/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-AWK to ANSI C compiler
diff --git a/lang/baci/Makefile b/lang/baci/Makefile
index 703c05b60707a..37d020e0099e0 100644
--- a/lang/baci/Makefile
+++ b/lang/baci/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/10/21 22:42:46 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:06:58 agc Exp $
 #
 
 DISTNAME=	bacisrc
@@ -10,6 +10,7 @@ DISTFILES=	bacisrc.tar.gz \
 
 MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=	http://www.mines.edu/fs_home/tcamp/baci/
+COMMENT=	Ben-Ari Concurrent Interpreter
 
 DEPENDS+=	bison-*:../../devel/bison
 
diff --git a/lang/baci/pkg/COMMENT b/lang/baci/pkg/COMMENT
deleted file mode 100644
index a422117d53d84..0000000000000
--- a/lang/baci/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Ben-Ari Concurrent Interpreter
diff --git a/lang/brandybasic/Makefile b/lang/brandybasic/Makefile
index fddb18a827f13..098bdec8ef3b8 100644
--- a/lang/brandybasic/Makefile
+++ b/lang/brandybasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/12/06 15:13:11 abs Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:06:59 agc Exp $
 #
 
 DISTNAME=       b105
@@ -9,6 +9,7 @@ EXTRACT_SUFX=   .tgz
 
 MAINTAINER=     abs
 HOMEPAGE=       http://www.argonet.co.uk/users/dave_daniels/
+COMMENT=	Brandy Basic V interpreter - Acorn ARM Computers BASIC dialect
 
 WRKSRC=		${WRKDIR}/brandy-105
 
diff --git a/lang/brandybasic/pkg/COMMENT b/lang/brandybasic/pkg/COMMENT
deleted file mode 100644
index a4a0199a0d87b..0000000000000
--- a/lang/brandybasic/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Brandy Basic V interpreter - Acorn ARM Computers BASIC dialect
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index b3c586c9614d7..8fa3363b9ca20 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/02/15 19:43:22 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:06:59 agc Exp $
 
 DISTNAME=	bwbasic-2.20
 CATEGORIES=	lang
@@ -7,6 +7,7 @@ DISTFILES=	bwbasic-2.20.tar.Z \
 		bwb-2.20-patch01.tar.Z.uu.txt bwb-2.20-patch02.tar.Z.uu.txt
 
 MAINTAINER=	jspath@bcpl.net
+COMMENT=	The Bywater Basic interpreter
 
 GNU_CONFIGURE=	yes
 EXTRACT_ONLY=	bwbasic-2.20.tar.Z
diff --git a/lang/bwbasic/pkg/COMMENT b/lang/bwbasic/pkg/COMMENT
deleted file mode 100644
index 2aeed10015ddc..0000000000000
--- a/lang/bwbasic/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Bywater Basic interpreter
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 96f9863928bbb..67cb117efd7b1 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/06/21 11:42:46 bouyer Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:00 agc Exp $
 #
 
 DISTNAME=		cl74unix
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://ftp.inria.fr/lang/caml-light/
 
 MAINTAINER=		bouyer@netbsd.org
 HOMEPAGE=		http://caml.inria.fr/distrib-caml-light-eng.html
+COMMENT=		Another implementation of Caml
 
 ALL_TARGET=		world
 
diff --git a/lang/caml-light/pkg/COMMENT b/lang/caml-light/pkg/COMMENT
deleted file mode 100644
index b26d615a1026b..0000000000000
--- a/lang/caml-light/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Another implementation of Caml
diff --git a/lang/camlp4/Makefile b/lang/camlp4/Makefile
index 840680d1e2962..33e724609e2d7 100644
--- a/lang/camlp4/Makefile
+++ b/lang/camlp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/22 17:16:48 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:01 agc Exp $
 #
 
 DISTNAME=	camlp4-3.00
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/cristal/camlp4/
 
 MAINTAINER=	wulf@netbsd.org
 HOMEPAGE=	http://caml.inria.fr/camlp4/
+COMMENT=	Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml
 
 DEPENDS+=	ocaml-3.*:../ocaml
 
diff --git a/lang/camlp4/pkg/COMMENT b/lang/camlp4/pkg/COMMENT
deleted file mode 100644
index 9759c05081f86..0000000000000
--- a/lang/camlp4/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Camlp4 is a Pre-Processor-Pretty-Printer for Objective Caml
diff --git a/lang/cim/Makefile b/lang/cim/Makefile
index 495f53ac2cec8..5b8029f00dcc8 100644
--- a/lang/cim/Makefile
+++ b/lang/cim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/02/16 05:44:04 jtb Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:01 agc Exp $
 
 DISTNAME=		cim-3.30
 CATEGORIES=		lang
@@ -6,6 +6,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=cim/}
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/cim/cim.html
+COMMENT=		Simula compiler based on the C programming language
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/autoreconf:../../devel/autoconf
 
diff --git a/lang/cim/pkg/COMMENT b/lang/cim/pkg/COMMENT
deleted file mode 100644
index a7251b47c1880..0000000000000
--- a/lang/cim/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Simula compiler based on the C programming language
diff --git a/lang/cint/Makefile b/lang/cint/Makefile
index 04e656c3b20f0..fbc3511928789 100644
--- a/lang/cint/Makefile
+++ b/lang/cint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/06/19 19:59:32 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:02 agc Exp $
 
 DISTNAME=		cint5.14
 PKGNAME=		cint-5.14.40
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://root.cern.ch/root/
 
 MAINTAINER=		drochner@netbsd.org
 HOMEPAGE=		http://root.cern.ch/root/Cint.html
+COMMENT=		C/C++ interpreter
 
 #same distribution file name for minor versions
 DIST_SUBDIR=		${PKGNAME}
diff --git a/lang/cint/pkg/COMMENT b/lang/cint/pkg/COMMENT
deleted file mode 100644
index 86cf6bef2b277..0000000000000
--- a/lang/cint/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-C/C++ interpreter
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 4748c2932bad7..e26b722878a06 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/08/18 22:46:37 hubertf Exp $
+# $NetBSD: Makefile,v 1.17 2001/02/17 09:07:02 agc Exp $
 
 DISTNAME=		clisp-2000-03-06
 PKGNAME=		clisp-20000306
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		mjl@netbsd.org
 HOMEPAGE=		http://clisp.cons.org/
+COMMENT=		CLISP, a Common Lisp implementation
 
 NOT_FOR_PLATFORM=	*-*-alpha	# severe LP64 problems
 
diff --git a/lang/clisp/pkg/COMMENT b/lang/clisp/pkg/COMMENT
deleted file mode 100644
index b4d8187c48666..0000000000000
--- a/lang/clisp/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-CLISP, a Common Lisp implementation
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index e2309c7add900..d8ca50fb71331 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/09/14 16:03:20 tron Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:03 agc Exp $
 #
 
 DISTNAME=		plt.src.x
@@ -8,6 +8,7 @@ MASTER_SITES=		http://www.cs.rice.edu/CS/PLT/packages/download/101/plt/
 
 MAINTAINER=		groo@netbsd.org
 HOMEPAGE=		http://www.cs.rice.edu/CS/PLT/packages/drscheme/
+COMMENT=		R4RS-compilant and nearly R5RS-compliant scheme tailored for teaching
 
 DEPENDS+=               mzscheme-101:../mzscheme
 
diff --git a/lang/drscheme/pkg/COMMENT b/lang/drscheme/pkg/COMMENT
deleted file mode 100644
index 825942b22db13..0000000000000
--- a/lang/drscheme/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-R4RS-compilant and nearly R5RS-compliant scheme tailored for teaching
diff --git a/lang/egcs/Makefile b/lang/egcs/Makefile
index 3054d646cf840..9aa13fb760925 100644
--- a/lang/egcs/Makefile
+++ b/lang/egcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/07/02 08:46:51 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:04 agc Exp $
 #
 
 DISTNAME=		egcs-1.1.2
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.2/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://egcs.cygnus.com/index.html
+COMMENT=		the experimental GNU compiler suite
 
 GNU_CONFIGURE=		yes
 
diff --git a/lang/egcs/pkg/COMMENT b/lang/egcs/pkg/COMMENT
deleted file mode 100644
index a4a9a49a3599d..0000000000000
--- a/lang/egcs/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-the experimental GNU compiler suite
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index d8c4f7acaa8ec..a8aa01cc45480 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/04/14 21:39:04 tron Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:04 agc Exp $
 
 DISTNAME=	elisp-manual-20-2.5
 CATEGORIES=	lang
@@ -6,6 +6,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=emacs/}
 
 MAINTAINER=	dbj@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/emacs/emacs.html
+COMMENT=	The Emacs Lisp Reference Manual for GNU Emacs Version 20.3
 
 GNU_CONFIGURE=	yes
 
diff --git a/lang/elisp-manual/pkg/COMMENT b/lang/elisp-manual/pkg/COMMENT
deleted file mode 100644
index ae66703b44ecd..0000000000000
--- a/lang/elisp-manual/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Emacs Lisp Reference Manual for GNU Emacs Version 20.3
diff --git a/lang/elk/Makefile b/lang/elk/Makefile
index c247a4b086388..c96c82a81baa9 100644
--- a/lang/elk/Makefile
+++ b/lang/elk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/10/05 15:08:54 agc Exp $
+# $NetBSD: Makefile,v 1.17 2001/02/17 09:07:05 agc Exp $
 # FreeBSD Id: Makefile,v 1.15 1997/09/01 12:28:30 tg Exp
 #
 
@@ -9,6 +9,7 @@ MASTER_SITES=		http://www-rn.informatik.uni-bremen.de/software/elk/dist/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www-rn.informatik.uni-bremen.de/software/elk/
+COMMENT=		Embeddable Scheme interpreter
 
 NOT_FOR_PLATFORM=	*-*-alpha *-*-mips*	#elf loading problems, LP64
 
diff --git a/lang/elk/pkg/COMMENT b/lang/elk/pkg/COMMENT
deleted file mode 100644
index a5ff9342192f4..0000000000000
--- a/lang/elk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Embeddable Scheme interpreter
diff --git a/lang/f2c/Makefile b/lang/f2c/Makefile
index 27fc1b06363e5..926eb2a3c6acc 100644
--- a/lang/f2c/Makefile
+++ b/lang/f2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/01/09 01:19:09 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/17 09:07:05 agc Exp $
 
 DISTNAME=	f2c-19991025
 PKGNAME=	f2c-19991025p1
@@ -8,6 +8,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 
 MAINTAINER=	dmcmahill@netbsd.org
 HOMEPAGE=	http://www.netlib.org/f2c/index.html
+COMMENT=	Fortran to C compiler (translates fortran to C)
 
 CONFLICTS=	egcs-current-19980608
 
diff --git a/lang/f2c/pkg/COMMENT b/lang/f2c/pkg/COMMENT
deleted file mode 100644
index 7750ba199b1f6..0000000000000
--- a/lang/f2c/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Fortran to C compiler (translates fortran to C)
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index b9046b62972b8..431a7c65c548f 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/08/21 21:01:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.7 2001/02/17 09:07:06 agc Exp $
 #
 
 DISTNAME=		fort77-1.14a
@@ -6,6 +6,7 @@ CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SUNSITE:=devel/lang/fortran/}
 
 MAINTAINER=		packages@netbsd.org
+COMMENT=		the driver for f2c, a fortran to C translator
 
 DEPENDS+=		f2c-*:../../lang/f2c
 
diff --git a/lang/fort77/pkg/COMMENT b/lang/fort77/pkg/COMMENT
deleted file mode 100644
index 37d70233a3b05..0000000000000
--- a/lang/fort77/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-the driver for f2c, a fortran to C translator
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index faf9a838aa754..844593518cf89 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 1999/12/13 09:25:10 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:06 agc Exp $
 # FreeBSD Id: Makefile,v 1.13 1999/01/27 07:41:14 fenner Exp $
 
 DISTNAME=	gawk-3.0.4
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=gawk/}
 
 MAINTAINER=	bouyer@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/gawk/gawk.html
+COMMENT=	GNU awk
 
 ONLY_FOR_PLATFORM=	SunOS-*-*	# in NetBSD base system
 
diff --git a/lang/gawk/pkg/COMMENT b/lang/gawk/pkg/COMMENT
deleted file mode 100644
index bd2dcb2552859..0000000000000
--- a/lang/gawk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU awk
diff --git a/lang/gb/Makefile b/lang/gb/Makefile
index 381a4be7ce865..36de19c734a52 100644
--- a/lang/gb/Makefile
+++ b/lang/gb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2000/12/30 18:41:20 rh Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:08 agc Exp $
 #
 
 DISTNAME=	gb-0.0.17
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNOME:=unstable/sources/gb/}
 
 MAINTAINER=	rh@netbsd.org
 HOMEPAGE=	http://www.gnome.org/gb/
+COMMENT=	Basic for Gnome
 
 DEPENDS+=	gnome-core>=1.2.0:../../x11/gnome-core
 
diff --git a/lang/gb/pkg/COMMENT b/lang/gb/pkg/COMMENT
deleted file mode 100644
index d9a898aeff7ba..0000000000000
--- a/lang/gb/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Basic for Gnome
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 8ec16c8f27352..6541321a1b01c 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/08 17:27:01 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/17 09:07:08 agc Exp $
 
 DISTNAME=		gcc-2.95.2
 CATEGORIES=		lang
@@ -6,6 +6,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=gcc/}
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.gnu.org/software/gcc/gcc.html
+COMMENT=		GNU Compiler Collection
 
 BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
 
diff --git a/lang/gcc/pkg/COMMENT b/lang/gcc/pkg/COMMENT
deleted file mode 100644
index 606f34848c6ed..0000000000000
--- a/lang/gcc/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU Compiler Collection
diff --git a/lang/gforth/Makefile b/lang/gforth/Makefile
index 6a39c3e2f31a5..2ce575a11691a 100644
--- a/lang/gforth/Makefile
+++ b/lang/gforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/11/13 23:58:11 hubertf Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 09:07:09 agc Exp $
 
 DISTNAME=		gforth-0.5.0
 CATEGORIES=		lang
@@ -6,6 +6,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=gforth/}
 
 MAINTAINER=		simonb@netbsd.org
 HOMEPAGE=		http://www.complang.tuwien.ac.at/forth/gforth/
+COMMENT=		Fast interpreter for the Forth language
 
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386 *-*-m68k
 
diff --git a/lang/gforth/pkg/COMMENT b/lang/gforth/pkg/COMMENT
deleted file mode 100644
index d893b88c39ad8..0000000000000
--- a/lang/gforth/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Fast interpreter for the Forth language
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 95e31d37726d8..668b22305950c 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/07/20 15:41:04 tron Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 09:07:09 agc Exp $
 # FreeBSD Id: ports/lang/ghc/Makefile,v 1.1.1.1 1999/11/10 17:25:28 nectar Exp
 
 DISTNAME=	ghc-4.04
@@ -8,6 +8,7 @@ DISTFILES=	ghc-4.04-src.tar.gz ghc-4.04-x86-hc.tar.gz
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.haskell.org/ghc/
+COMMENT=	Compiler for the functional language Haskell
 
 DEPENDS+=	readline>=4.0:../../devel/readline
 DEPENDS+=	gmp>=2.0.2:../../devel/gmp
diff --git a/lang/ghc/pkg/COMMENT b/lang/ghc/pkg/COMMENT
deleted file mode 100644
index 5465f1dcd39f9..0000000000000
--- a/lang/ghc/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Compiler for the functional language Haskell
diff --git a/lang/gprolog/Makefile b/lang/gprolog/Makefile
index 2f1e330c7ea27..61e3a71d3b10a 100644
--- a/lang/gprolog/Makefile
+++ b/lang/gprolog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/07/03 10:34:07 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:10 agc Exp $
 #
 
 DISTNAME=		gprolog-1.1.6
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.inria.fr/INRIA/Projects/contraintes/gnu-prolog/unstable
 
 MAINTAINER=		brook@nmsu.edu
 HOMEPAGE=		http://gnu-prolog.inria.fr/
+COMMENT=		GNU prolog compiler and interpreter
 
 ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc
 
diff --git a/lang/gprolog/pkg/COMMENT b/lang/gprolog/pkg/COMMENT
deleted file mode 100644
index ed9b627de2362..0000000000000
--- a/lang/gprolog/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU prolog compiler and interpreter
diff --git a/lang/guavac/Makefile b/lang/guavac/Makefile
index 645ea425c23fd..1c9618bc3b4ba 100644
--- a/lang/guavac/Makefile
+++ b/lang/guavac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2000/08/21 21:01:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.12 2001/02/17 09:07:11 agc Exp $
 #
 
 DISTNAME=	guavac-1.2
@@ -10,6 +10,7 @@ MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/ \
 
 MAINTAINER=	packages@netbsd.org
 # HOMEPAGE=	http://www.cs.berkeley.edu/~engberg/guavac/ no longer exists
+COMMENT=	Free compiler for the Java language
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/guavac/pkg/COMMENT b/lang/guavac/pkg/COMMENT
deleted file mode 100644
index e2fc0b55bce46..0000000000000
--- a/lang/guavac/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Free compiler for the Java language
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 5b39157bbab55..8b13ecacc27a0 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2000/11/22 21:19:13 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2001/02/17 09:07:11 agc Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/11/22 16:01:32 jseger Exp
 #
 
@@ -8,6 +8,7 @@ MASTER_SITES=		${MASTER_SITE_GNU:=guile/}
 
 MAINTAINER=		perry@piermont.com
 HOMEPAGE=		http://www.gnu.org/software/guile/guile.html
+COMMENT=		GNU's Ubiquitous Intelligent Language for Extension
 
 DEPENDS+=		readline>=4.1:../../devel/readline
 
diff --git a/lang/guile/pkg/COMMENT b/lang/guile/pkg/COMMENT
deleted file mode 100644
index 85e9b0f902ee9..0000000000000
--- a/lang/guile/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU's Ubiquitous Intelligent Language for Extension
diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile
index d521c0ea1414c..442c3b53d73c6 100644
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/07/05 22:10:05 nathanw Exp $
+# $NetBSD: Makefile,v 1.13 2001/02/17 09:07:12 agc Exp $
 
 DISTNAME=	hugs98-Feb2000
 PKGNAME=	hugs98-200002
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://www.cse.ogi.edu/pub/pacsoft/hugs/
 
 MAINTAINER=	nathanw@mit.edu
 HOMEPAGE=	http://www.haskell.org/hugs/
+COMMENT=	Nottingham and Yale Haskell interpreter and programming environment
 
 DEPENDS+=	readline-*:../../devel/readline
 
diff --git a/lang/hugs/pkg/COMMENT b/lang/hugs/pkg/COMMENT
deleted file mode 100644
index 055959004a5d0..0000000000000
--- a/lang/hugs/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Nottingham and Yale Haskell interpreter and programming environment
diff --git a/lang/icon/Makefile b/lang/icon/Makefile
index c981905df7c14..b7ec26de07305 100644
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/06/19 15:56:26 pooka Exp $
+# $NetBSD: Makefile,v 1.17 2001/02/17 09:07:13 agc Exp $
 # FreeBSD Id: Makefile,v 1.8 1997/02/12 08:39:15 tg Exp
 #
 
@@ -10,6 +10,7 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.cs.arizona.edu/icon/index.htm
+COMMENT=		The Icon programming language
 
 ONLY_FOR_PLATFORM=	NetBSD-*-alpha NetBSD-*-i386 NetBSD-*-sparc
 
diff --git a/lang/icon/pkg/COMMENT b/lang/icon/pkg/COMMENT
deleted file mode 100644
index e54b6e4b41a84..0000000000000
--- a/lang/icon/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Icon programming language
diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index 1318578739810..c641fa28b6a3e 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/22 16:53:16 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:13 agc Exp $
 #
 
 DISTNAME=	intercal-0.20
@@ -7,6 +7,7 @@ MASTER_SITES=	http://www.tuxedo.org/~esr/intercal/
 
 MAINTAINER=	dillo@giga.or.at
 HOMEPAGE=	http://www.tuxedo.org/~esr/intercal/
+COMMENT=	the ultimate language for obfuscation and job security
 
 MAKE_ENV+=	PREFIX="${PREFIX}" MKDIR="${MKDIR}"
 MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
diff --git a/lang/intercal/pkg/COMMENT b/lang/intercal/pkg/COMMENT
deleted file mode 100644
index 5ae3154ed496f..0000000000000
--- a/lang/intercal/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-the ultimate language for obfuscation and job security
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index 3d4a7fbae7a81..bc69078e8a0bc 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/14 22:17:51 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:14 agc Exp $
 #
 
 DISTNAME=		japhar-0.08
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.japhar.org/pub/hungry/japhar/source/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.japhar.org/
+COMMENT=		Java Virtual Machine, currently JDK 1.1.5-level
 
 ONLY_FOR_PLATFORM=	SunOS-*-*       # untested on NetBSD
 
diff --git a/lang/japhar/pkg/COMMENT b/lang/japhar/pkg/COMMENT
deleted file mode 100644
index 111e65bf8bc1e..0000000000000
--- a/lang/japhar/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Java Virtual Machine, currently JDK 1.1.5-level
diff --git a/lang/java-lang-spec/Makefile b/lang/java-lang-spec/Makefile
index d3ae84269ce09..f78e706c8bbba 100644
--- a/lang/java-lang-spec/Makefile
+++ b/lang/java-lang-spec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/10/15 02:59:34 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:14 agc Exp $
 
 DISTNAME=		langspec-2.0.html
 PKGNAME=		java-lang-spec-2.0
@@ -8,6 +8,7 @@ EXTRACT_SUFX=		.zip
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://java.sun.com/docs/books/jls/index.html
+COMMENT=		The Java(TM) Language Specification (HTML)
 
 NO_WRKSUBDIR=	 	# defined
 NO_CONFIGURE=		# defined
diff --git a/lang/java-lang-spec/pkg/COMMENT b/lang/java-lang-spec/pkg/COMMENT
deleted file mode 100644
index 53cab2f31ccd3..0000000000000
--- a/lang/java-lang-spec/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Java(TM) Language Specification (HTML)
diff --git a/lang/java-vm-spec/Makefile b/lang/java-vm-spec/Makefile
index 7e82cd56393cd..15367b45d3ec6 100644
--- a/lang/java-vm-spec/Makefile
+++ b/lang/java-vm-spec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/10/15 03:00:07 jlam Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:15 agc Exp $
 
 DISTNAME=		vmspec.2nded.html
 PKGNAME=		java-vm-spec-2.0
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.javasoft.com/docs/specs/
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://java.sun.com/docs/books/vmspec/index.html
+COMMENT=		The Java(TM) Virtual Machine Specification (HTML)
 
 WRKSRC=			${WRKDIR}/vmspec
 NO_CONFIGURE=		# defined
diff --git a/lang/java-vm-spec/pkg/COMMENT b/lang/java-vm-spec/pkg/COMMENT
deleted file mode 100644
index da3cb1073a583..0000000000000
--- a/lang/java-vm-spec/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Java(TM) Virtual Machine Specification (HTML)
diff --git a/lang/jbuilder-jit/Makefile b/lang/jbuilder-jit/Makefile
index cf3c7930c1842..c312a8a43afde 100644
--- a/lang/jbuilder-jit/Makefile
+++ b/lang/jbuilder-jit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/11/18 00:43:42 tv Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:15 agc Exp $
 #
 
 DISTNAME=	unix_jb35foundation
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftpc.inprise.com/pub/jbuilder/jb35foundation/unix/
 
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://www.inprise.com/jbuilder/linux/download/
+COMMENT=	Just-In-Time compiler for Linux Java Virtual Machine
 
 # works with both 1.2.2 and 1.3 JVMs
 DEPENDS=	sun-jre-*:../../lang/sun-jre13
diff --git a/lang/jbuilder-jit/pkg/COMMENT b/lang/jbuilder-jit/pkg/COMMENT
deleted file mode 100644
index 92baad731942a..0000000000000
--- a/lang/jbuilder-jit/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Just-In-Time compiler for Linux Java Virtual Machine
diff --git a/lang/jdk/Makefile b/lang/jdk/Makefile
index 3e1accdd7a5ef..0f61be3e7fdf6 100644
--- a/lang/jdk/Makefile
+++ b/lang/jdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2001/02/09 17:59:46 agc Exp $
+# $NetBSD: Makefile,v 1.25 2001/02/17 09:07:16 agc Exp $
 #
 
 VERSION=	1.1.8
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=     jwise@netbsd.org
 HOMEPAGE=       http://www.quick.com.au/java/
+COMMENT=	Sun's Java(tm) Development Kit
 
 CONFLICTS=	blackdown-j* sun-j*
 
diff --git a/lang/jdk/pkg/COMMENT b/lang/jdk/pkg/COMMENT
deleted file mode 100644
index 553bb16e1cd03..0000000000000
--- a/lang/jdk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Sun's Java(tm) Development Kit
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 183f4ef6fd3d7..99e3f60f5de05 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/10/16 20:38:20 tv Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:16 agc Exp $
 #
 
 DISTNAME=	jikes-1.12
@@ -7,6 +7,7 @@ MASTER_SITES=	http://oss.software.ibm.com/developerworks/opensource/jikes/projec
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www10.software.ibm.com/developerworks/opensource/jikes/
+COMMENT=	Java source to byte-code compiler
 
 ONLY_FOR_PLATFORM=	NetBSD-*-* SunOS-*-*
 
diff --git a/lang/jikes/pkg/COMMENT b/lang/jikes/pkg/COMMENT
deleted file mode 100644
index 4b91b05efc744..0000000000000
--- a/lang/jikes/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Java source to byte-code compiler
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 2ccd34d2cd724..8521222976c26 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2000/09/13 16:53:56 wennmach Exp $
+# $NetBSD: Makefile,v 1.29 2001/02/17 09:07:17 agc Exp $
 #
 
 DISTNAME=		kaffe-1.0.5
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://ftp.kaffe.org/pub/kaffe/
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.kaffe.org/
+COMMENT=		Virtual machine capable of running Java(tm) code
 
 DEPENDS+=		jpeg-6b:../../graphics/jpeg
 DEPENDS+=		png>=1.0.6:../../graphics/png
diff --git a/lang/kaffe/pkg/COMMENT b/lang/kaffe/pkg/COMMENT
deleted file mode 100644
index 68fc986519fbc..0000000000000
--- a/lang/kaffe/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Virtual machine capable of running Java(tm) code
diff --git a/lang/kali/Makefile b/lang/kali/Makefile
index 21ee5d95bce21..c6fb0f855a0b3 100644
--- a/lang/kali/Makefile
+++ b/lang/kali/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/02 11:31:26 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:17 agc Exp $
 
 DISTNAME=	kali-0.47
 CATEGORIES=	lang
@@ -6,6 +6,7 @@ MASTER_SITES=	ftp://ftp.nj.nec.com/pub/pls/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.neci.nj.nec.com/PLS/Kali.html
+COMMENT=	Distributed implementation of Scheme
 
 GNU_CONFIGURE=	yes
 ALL_TARGET=	# empty
diff --git a/lang/kali/pkg/COMMENT b/lang/kali/pkg/COMMENT
deleted file mode 100644
index 2f369e6ceaf8d..0000000000000
--- a/lang/kali/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Distributed implementation of Scheme
diff --git a/lang/libperl-current/Makefile b/lang/libperl-current/Makefile
index 253be13ee0580..cc3d9a7c9f5c0 100644
--- a/lang/libperl-current/Makefile
+++ b/lang/libperl-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/30 19:05:24 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:18 agc Exp $
 
 DISTNAME=		libperl-${PERL_VERSION}
 PERL_VERSION=		5.6.0
@@ -8,6 +8,7 @@ DISTFILES=		# empty
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
+COMMENT=		PERL core library as a shared object
 
 IGNORE=			"${PKGNAME} has been superseded by the libperl package"
 
diff --git a/lang/libperl-current/pkg/COMMENT b/lang/libperl-current/pkg/COMMENT
deleted file mode 100644
index a594d19d11a92..0000000000000
--- a/lang/libperl-current/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-PERL core library as a shared object
diff --git a/lang/libperl/Makefile b/lang/libperl/Makefile
index 6aa0724e2825c..9ed44a79dd775 100644
--- a/lang/libperl/Makefile
+++ b/lang/libperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2000/09/07 04:37:54 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2001/02/17 09:07:18 agc Exp $
 
 DISTNAME=		perl-${PERL_VERSION}
 PKGNAME=		libperl-${PERL_VERSION}nb1
@@ -9,6 +9,7 @@ MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/ \
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
+COMMENT=		PERL core library and DynaLoader as a shared object
 
 USE_PERL5=		# defined
 DEPENDS+=		perl>=${PERL_VERSION}:../../lang/perl5
diff --git a/lang/libperl/pkg/COMMENT b/lang/libperl/pkg/COMMENT
deleted file mode 100644
index 4d1a5a59037d8..0000000000000
--- a/lang/libperl/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-PERL core library and DynaLoader as a shared object
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index ffec0231106bd..614ee2eaef7e5 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/12/16 01:57:01 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 09:07:19 agc Exp $
 #
 
 DISTNAME=		librep-${REP_VERS}
@@ -8,6 +8,7 @@ MASTER_SITES=		ftp://librep.sourceforge.net/pub/librep/
 
 MAINTAINER=		danw@netbsd.org
 HOMEPAGE=		http://librep.sourceforge.net/
+COMMENT=		Emacs Lisp-like runtime library, interpreter, compiler and VM
 
 DEPENDS+=		gmp>=3.0:../../devel/gmp
 DEPENDS+=		gdbm>=1.8.0:../../databases/gdbm
diff --git a/lang/librep/pkg/COMMENT b/lang/librep/pkg/COMMENT
deleted file mode 100644
index c6952871c2149..0000000000000
--- a/lang/librep/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Emacs Lisp-like runtime library, interpreter, compiler and VM
diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index c3b341f489300..c44e92c0453d5 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2000/05/05 06:26:59 tron Exp $
+# $NetBSD: Makefile,v 1.8 2001/02/17 09:07:19 agc Exp $
 #
 
 DISTNAME=       mawk1.3.3
@@ -9,6 +9,7 @@ MASTER_SITES=   ftp://ftp.whidbey.net/pub/brennan/ \
 		ftp://ftp.fu-berlin.de/pub/unix/languages/mawk/
 
 MAINTAINER=	agc@netbsd.org
+COMMENT=	Mike Brennan's fast awk clone
 
 GNU_CONFIGURE=	yes
 
diff --git a/lang/mawk/pkg/COMMENT b/lang/mawk/pkg/COMMENT
deleted file mode 100644
index 96dffb910cb91..0000000000000
--- a/lang/mawk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Mike Brennan's fast awk clone
diff --git a/lang/minischeme/Makefile b/lang/minischeme/Makefile
index c75dd35265f90..e23ab691cdcc3 100644
--- a/lang/minischeme/Makefile
+++ b/lang/minischeme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/02 04:52:13 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:20 agc Exp $
 
 DISTNAME=	minischeme
 PKGNAME=	minischeme-0.85
@@ -6,6 +6,7 @@ CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	Very tiny scheme interpreter
 
 post-extract:
 	${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
diff --git a/lang/minischeme/pkg/COMMENT b/lang/minischeme/pkg/COMMENT
deleted file mode 100644
index 2c42accf9d31e..0000000000000
--- a/lang/minischeme/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Very tiny scheme interpreter
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index ca83d595f3015..6b9e3e6e62a80 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/09/05 09:33:16 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2001/02/17 09:07:20 agc Exp $
 
 DISTNAME=       mos20src
 PKGNAME=        moscow_ml-2.00
@@ -9,6 +9,7 @@ MASTER_SITES=	ftp://ftp.dina.kvl.dk/pub/mosml/ \
 
 MAINTAINER=	lamj@stat.cmu.edu
 HOMEPAGE=	http://www.dina.kvl.dk/~sestoft/mosml.html
+COMMENT=	Moscow ML, a version of Standard ML
 
 BUILD_DEPENDS+=	${PERL5}:../../lang/perl5-base
 
diff --git a/lang/moscow_ml/pkg/COMMENT b/lang/moscow_ml/pkg/COMMENT
deleted file mode 100644
index cfd64506018ea..0000000000000
--- a/lang/moscow_ml/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Moscow ML, a version of Standard ML
diff --git a/lang/mzscheme/Makefile b/lang/mzscheme/Makefile
index 1dde55c26cc63..73df20cf4c01b 100644
--- a/lang/mzscheme/Makefile
+++ b/lang/mzscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/01/10 22:09:15 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:21 agc Exp $
 
 DISTNAME=		mzscheme.src.unix
 PKGNAME=		mzscheme-101
@@ -7,6 +7,7 @@ MASTER_SITES=		http://www.cs.rice.edu/CS/PLT/packages/download/101/mzscheme/
 
 MAINTAINER=		pooka@netbsd.org
 HOMEPAGE=		http://www.cs.rice.edu/CS/PLT/packages/mzscheme/
+COMMENT=		R4RS-compilant and nearly R5RS-compliant scheme
 
 USE_GMAKE=		yes
 
diff --git a/lang/mzscheme/pkg/COMMENT b/lang/mzscheme/pkg/COMMENT
deleted file mode 100644
index 28243f280a6a7..0000000000000
--- a/lang/mzscheme/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-R4RS-compilant and nearly R5RS-compliant scheme
diff --git a/lang/nawk/Makefile b/lang/nawk/Makefile
index 85011d98f224b..701a439e3defe 100644
--- a/lang/nawk/Makefile
+++ b/lang/nawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/01/23 22:21:12 jdolecek Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:22 agc Exp $
 #
 
 DISTNAME=       awk
@@ -8,6 +8,7 @@ MASTER_SITES=   http://cm.bell-labs.com/who/bwk/
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://cm.bell-labs.com/who/bwk/
+COMMENT=	Brian Kernighan's pattern-directed scanning and processing language
 
 DIST_SUBDIR=	${PKGNAME}
 
diff --git a/lang/nawk/pkg/COMMENT b/lang/nawk/pkg/COMMENT
deleted file mode 100644
index 2ad42331f7588..0000000000000
--- a/lang/nawk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Brian Kernighan's pattern-directed scanning and processing language
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index 8b2b10954d074..cf47d020f7985 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/01/25 04:23:31 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:22 agc Exp $
 
 DISTNAME=		nhc98src-1.00
 PKGNAME=		nhc98-1.00
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.cs.york.ac.uk/pub/haskell/nhc98/
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.cs.york.ac.uk/fp/nhc98/
+COMMENT=		Portable Haskell 98 compiler
 
 NOT_FOR_PLATFORM=	*-*-alpha
 
diff --git a/lang/nhc98/pkg/COMMENT b/lang/nhc98/pkg/COMMENT
deleted file mode 100644
index 3c5db05353985..0000000000000
--- a/lang/nhc98/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Portable Haskell 98 compiler
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 17ccd50c36795..6c1a89907ae0f 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/31 14:46:31 jwise Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:23 agc Exp $
 #
 
 DISTNAME=		ocaml-3.00
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.inria.fr/lang/caml-light/
 
 MAINTAINER=		groo@netbsd.org
 HOMEPAGE=		http://caml.inria.fr/ocaml/
+COMMENT=		the latest implementation of the Caml dialect of ML
 
 DEPENDS+=		tk-8.3.2:../../x11/tk
 
diff --git a/lang/ocaml/pkg/COMMENT b/lang/ocaml/pkg/COMMENT
deleted file mode 100644
index cad001d4ad03a..0000000000000
--- a/lang/ocaml/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-the latest implementation of the Caml dialect of ML
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 6284131f72f0f..b4e68cc612dae 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/09/09 02:19:52 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:23 agc Exp $
 
 DISTNAME=	p2c-1.20
 WRKSRC=		${WRKDIR}/src
@@ -7,6 +7,7 @@ MASTER_SITES=	ftp://csvax.cs.caltech.edu/pub/
 EXTRACT_SUFX=   .tar.Z
 
 MAINTAINER=	jwise@netbsd.org
+COMMENT=	Pascal to C compiler (translates Pascal to C)
 
 MAKE_FLAGS+=	CFLAGS='-Dunix'
 
diff --git a/lang/p2c/pkg/COMMENT b/lang/p2c/pkg/COMMENT
deleted file mode 100644
index 6a1ace2f5246e..0000000000000
--- a/lang/p2c/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Pascal to C compiler (translates Pascal to C)
diff --git a/lang/perl5-base/Makefile b/lang/perl5-base/Makefile
index ac13fd7fd33b8..971b4f6acbeb2 100644
--- a/lang/perl5-base/Makefile
+++ b/lang/perl5-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/01/25 14:40:10 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:24 agc Exp $
 # FreeBSD Id: Makefile,v 1.20 1997/07/18 06:16:44 markm Exp
 #
 
@@ -11,6 +11,7 @@ MASTER_SITES=		ftp://ftp.digital.com/pub/plan/perl/CPAN/src/5.0/maint/ \
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
+COMMENT=		base installation of Perl
 
 CONFLICTS=		perl-5.00*
 
diff --git a/lang/perl5-base/pkg/COMMENT b/lang/perl5-base/pkg/COMMENT
deleted file mode 100644
index c4d4e532afae8..0000000000000
--- a/lang/perl5-base/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-base installation of Perl
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index dee63d6c5dff7..28937a8f8cf5e 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2000/09/05 09:20:44 jlam Exp $
+# $NetBSD: Makefile,v 1.32 2001/02/17 09:07:24 agc Exp $
 
 DISTNAME=		perl-5.6.0nb3
 CATEGORIES=		lang devel perl5
@@ -7,6 +7,7 @@ DISTFILES=		# empty
 
 MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://language.perl.com/index.html
+COMMENT=		Practical Extraction and Report Language
 
 DEPENDS+=		perl-base>=5.6.0:../../lang/perl5-base
 DEPENDS+=		p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
diff --git a/lang/perl5/pkg/COMMENT b/lang/perl5/pkg/COMMENT
deleted file mode 100644
index 8c9f31132ea5b..0000000000000
--- a/lang/perl5/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index 99d4f1716b51f..a2574ce2a5126 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/01/19 22:26:59 jtb Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:25 agc Exp $
 
 DISTNAME=		pfthunix19
 PKGNAME=		pforth-19
@@ -8,6 +8,7 @@ EXTRACT_SUFX=		.tar.Z
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.softsynth.com/pforth/
+COMMENT=		Portable ANS-like Forth
 
 WRKSRC=			${WRKDIR}/pforth
 USE_GMAKE=		YES
diff --git a/lang/pforth/pkg/COMMENT b/lang/pforth/pkg/COMMENT
deleted file mode 100644
index b64667eda8612..0000000000000
--- a/lang/pforth/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Portable ANS-like Forth
diff --git a/lang/py-extclass/Makefile b/lang/py-extclass/Makefile
index 0bc75b5bfdf44..a2fcccee4ffa0 100644
--- a/lang/py-extclass/Makefile
+++ b/lang/py-extclass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/10/22 20:01:53 tsarna Exp $
+# $NetBSD: Makefile,v 1.9 2001/02/17 09:07:26 agc Exp $
 #
 
 DISTNAME=	Zope-2.2.2-src
@@ -9,6 +9,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.digicool.com/releases/ExtensionClass
+COMMENT=	Python-extensible C "classes" and Acquisition for Python
 
 EXTRACT_ELEMENTS=       ${DISTNAME}/lib/Components/ExtensionClass
 
diff --git a/lang/py-extclass/pkg/COMMENT b/lang/py-extclass/pkg/COMMENT
deleted file mode 100644
index 936b66ac8441f..0000000000000
--- a/lang/py-extclass/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Python-extensible C "classes" and Acquisition for Python
diff --git a/lang/py-html-docs/Makefile b/lang/py-html-docs/Makefile
index 748e1b0bca69b..7ad9ada7759d5 100644
--- a/lang/py-html-docs/Makefile
+++ b/lang/py-html-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/12/12 16:25:33 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/17 09:07:26 agc Exp $
 #
 
 DISTNAME=	html-2.0
@@ -9,6 +9,7 @@ EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.python.org/doc/
+COMMENT=	HTML Documentation for Python
 
 DIST_SUBDIR=	python
 
diff --git a/lang/py-html-docs/pkg/COMMENT b/lang/py-html-docs/pkg/COMMENT
deleted file mode 100644
index 76103e594e008..0000000000000
--- a/lang/py-html-docs/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-HTML Documentation for Python
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 8251732640a14..2139ace9738ee 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2000/12/05 15:04:32 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2001/02/17 09:07:27 agc Exp $
 #
 
 DISTNAME=	BeOpen-Python-2.0
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftp.python.org/pub/python/2.0/
 
 MAINTAINER=	tsarna@netbsd.org
 HOMEPAGE=	http://www.python.org/
+COMMENT=	Interpreted, interactive, object-oriented programming language
 
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
diff --git a/lang/python/pkg/COMMENT b/lang/python/pkg/COMMENT
deleted file mode 100644
index fa9830528ee3d..0000000000000
--- a/lang/python/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Interpreted, interactive, object-oriented programming language
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index ba587586aa85e..8292048ecd05c 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2000/08/22 02:22:26 sakamoto Exp $
+# $NetBSD: Makefile,v 1.18 2001/02/17 09:07:27 agc Exp $
 #
 
 DISTNAME=	ruby-1.4.6
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \
 
 MAINTAINER=	sakamoto@netbsd.org
 HOMEPAGE=	http://www.ruby-lang.org/
+COMMENT=	the Object-Oriented Script Language
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/bison:../../devel/bison
 DEPENDS+=	gdbm>=1.7.3:../../databases/gdbm
diff --git a/lang/ruby/pkg/COMMENT b/lang/ruby/pkg/COMMENT
deleted file mode 100644
index 8284681d790a3..0000000000000
--- a/lang/ruby/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-the Object-Oriented Script Language
diff --git a/lang/scheme48/Makefile b/lang/scheme48/Makefile
index 8ff8cf3d8ca7c..fe5d242235ee4 100644
--- a/lang/scheme48/Makefile
+++ b/lang/scheme48/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2000/12/30 16:54:06 itojun Exp $
+# $NetBSD: Makefile,v 1.17 2001/02/17 09:07:28 agc Exp $
 # FreeBSD Id: Makefile,v 1.10 1997/08/27 19:31:37 jmacd Exp
 #
 
@@ -9,6 +9,7 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://www.neci.nj.nec.com/homepages/kelsey/
+COMMENT=		The Scheme Underground's implementation of R4RS
 
 NOT_FOR_PLATFORM=	*-*-alpha	# *severe* problems.  Bus error, alignment
 
diff --git a/lang/scheme48/pkg/COMMENT b/lang/scheme48/pkg/COMMENT
deleted file mode 100644
index 758e42de7ec34..0000000000000
--- a/lang/scheme48/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-The Scheme Underground's implementation of R4RS
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 29bcd228fc270..2200f175eca08 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 1999/08/06 10:39:30 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:28 agc Exp $
 
 DISTNAME=		siod
 PKGNAME=		siod-3.0
@@ -8,6 +8,7 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		ftp://ftp.std.com/pub/gjc/siod.html
+COMMENT=		Small-footprint implementation of the Scheme programming language
 
 ONLY_FOR_PLATFORM=	SunOS-*-*	# untested on NetBSD
 
diff --git a/lang/siod/pkg/COMMENT b/lang/siod/pkg/COMMENT
deleted file mode 100644
index d10ecd780128d..0000000000000
--- a/lang/siod/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Small-footprint implementation of the Scheme programming language
diff --git a/lang/smalleiffel/Makefile b/lang/smalleiffel/Makefile
index ea20457d145cd..0846ef221c8df 100644
--- a/lang/smalleiffel/Makefile
+++ b/lang/smalleiffel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/09/06 14:31:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/17 09:07:29 agc Exp $
 #
 
 DISTNAME=	se
@@ -13,6 +13,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jlam@netbsd.org
 HOMEPAGE=	http://smalleiffel.loria.fr/
+COMMENT=	GNU Eiffel compiler
 
 MAKE_ENV+=	SmallEiffel=${WRKSRC}/sys/system.se
 ALL_TARGET=	./bin/compile_to_c
diff --git a/lang/smalleiffel/pkg/COMMENT b/lang/smalleiffel/pkg/COMMENT
deleted file mode 100644
index 6edfdacb1b0f7..0000000000000
--- a/lang/smalleiffel/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-GNU Eiffel compiler
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index e680f998c9869..0e356cfd82f68 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/23 21:49:15 jtb Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:29 agc Exp $
 #
 
 DISTNAME=	smalltalk-1.8.5
@@ -7,6 +7,7 @@ MASTER_SITES=	${MASTER_SITE_GNU:=smalltalk/}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.gnu.org/software/smalltalk/smalltalk.html
+COMMENT=	the GNU implementation of the Smalltalk-80 language
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/lang/smalltalk/pkg/COMMENT b/lang/smalltalk/pkg/COMMENT
deleted file mode 100644
index d49870a8a2664..0000000000000
--- a/lang/smalltalk/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-the GNU implementation of the Smalltalk-80 language
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index cbfc73ebd624f..da03f0a76e786 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/02/05 19:47:46 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:30 agc Exp $
 # FreeBSD Id: ports/lang/sml-nj/Makefile,v 1.9 1999/08/25 06:35:27 obrien Exp
 
 DISTNAME=	${SML_VERSION}-bin.${BOX}-unix
@@ -16,6 +16,7 @@ DISTFILES=	${SML_VERSION}-bin.${BOX}-unix.tar.Z ${SML_VERSION}-cm.tar.Z ${SML_VE
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://cm.bell-labs.com/cm/cs/what/smlnj/index.html
+COMMENT=	Popular functional language from Bell Labs
 
 SML_VERSION=	110.9.1
 
diff --git a/lang/sml-nj/pkg/COMMENT b/lang/sml-nj/pkg/COMMENT
deleted file mode 100644
index 9e59885d03163..0000000000000
--- a/lang/sml-nj/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Popular functional language from Bell Labs
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index eaf5823c60609..19a151e71c129 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/06 18:27:36 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:30 agc Exp $
 #
 
 DISTNAME=	snobol-0.99.4
@@ -10,6 +10,7 @@ DISTFILES=	vanilla.zip ${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	refling@comet.lbl.gov
 HOMEPAGE=	http://people.ne.mediaone.net/philbudne/snobol.html
+COMMENT=	Macro implementation of SNOBOL4 in C
 
 BUILD_DEPENDS=	unzip:../../archivers/unzip
 
diff --git a/lang/snobol/pkg/COMMENT b/lang/snobol/pkg/COMMENT
deleted file mode 100644
index 033d99c1b3e24..0000000000000
--- a/lang/snobol/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Macro implementation of SNOBOL4 in C
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 23881f9b3f43e..1e3b83233fc23 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/02/07 05:16:39 fredb Exp $
+# $NetBSD: Makefile,v 1.10 2001/02/17 09:07:31 agc Exp $
 #
 
 DISTNAME=	Squeak2.7-src
@@ -9,6 +9,7 @@ DISTFILES=	Squeak2.7-src.tar.gz Squeak2.7.image.gz Squeak2.7.changes.gz SqueakV2
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.squeak.org/
+COMMENT=	Full Smalltalk 80 with portability to UN*X, Mac, and Windows
 
 BUILD_DEPENDS+=	${LOCALBASE}/bin/autoconf:../../devel/autoconf
 
diff --git a/lang/squeak/pkg/COMMENT b/lang/squeak/pkg/COMMENT
deleted file mode 100644
index 00168b23618f9..0000000000000
--- a/lang/squeak/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Full Smalltalk 80 with portability to UN*X, Mac, and Windows
diff --git a/lang/stalin/Makefile b/lang/stalin/Makefile
index 97c203ad2a5cc..7b2c185a5e771 100644
--- a/lang/stalin/Makefile
+++ b/lang/stalin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2001/01/21 03:11:54 jtb Exp $
+# $NetBSD: Makefile,v 1.5 2001/02/17 09:07:31 agc Exp $
 
 DISTNAME=		stalin
 PKGNAME=		stalin-0.8
@@ -8,6 +8,7 @@ EXTRACT_SUFX=		.tar.Z
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://www.neci.nj.nec.com/homepages/qobi/software.html
+COMMENT=		Aggressively optimizing Scheme compiler
 
 DEPENDS+=		boehm-gc-[0-9]*:../../devel/boehm-gc
 DEPENDS+=		Mesa-[0-9]*:../../graphics/Mesa
diff --git a/lang/stalin/pkg/COMMENT b/lang/stalin/pkg/COMMENT
deleted file mode 100644
index ecbeb62347ebd..0000000000000
--- a/lang/stalin/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Aggressively optimizing Scheme compiler
diff --git a/lang/sun-jdk13/Makefile b/lang/sun-jdk13/Makefile
index f8bc33bc425df..eda3b20895bfb 100644
--- a/lang/sun-jdk13/Makefile
+++ b/lang/sun-jdk13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/18 00:37:15 tv Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:33 agc Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.bin
 
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://java.sun.com/
+COMMENT=	Sun's Java(tm) Development Kit 1.3.0
 
 DEPENDS=	sun-jre-1.3.0:../../lang/sun-jre13
 
diff --git a/lang/sun-jdk13/pkg/COMMENT b/lang/sun-jdk13/pkg/COMMENT
deleted file mode 100644
index 6db48b8e8967e..0000000000000
--- a/lang/sun-jdk13/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Sun's Java(tm) Development Kit 1.3.0
diff --git a/lang/sun-jre13/Makefile b/lang/sun-jre13/Makefile
index e4b3e6886bb17..0980a6a9f7001 100644
--- a/lang/sun-jre13/Makefile
+++ b/lang/sun-jre13/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/18 00:36:55 tv Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:33 agc Exp $
 #
 
 # MASTER_SITES is very special, and must end in "=":
@@ -10,6 +10,7 @@ EXTRACT_SUFX=	.bin
 
 MAINTAINER=	tv@netbsd.org
 HOMEPAGE=	http://java.sun.com/
+COMMENT=	Sun's Java(tm) Runtime Environment 1.3.0
 
 DEPENDS=	suse_x11-*:../../emulators/suse_x11
 
diff --git a/lang/sun-jre13/pkg/COMMENT b/lang/sun-jre13/pkg/COMMENT
deleted file mode 100644
index 6dbdb13dc3914..0000000000000
--- a/lang/sun-jre13/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Sun's Java(tm) Runtime Environment 1.3.0
diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index 66e76efeaf94c..27eb7cf214bb5 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/01/24 18:44:58 he Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:34 agc Exp $
 #
 
 DISTNAME=	expect
@@ -8,6 +8,7 @@ MASTER_SITES=	http://expect.nist.gov/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://expect.nist.gov/
+COMMENT=	extensions to Tcl to support scripting of interactive programs
 
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 
diff --git a/lang/tcl-expect/pkg/COMMENT b/lang/tcl-expect/pkg/COMMENT
deleted file mode 100644
index 0a98458d54519..0000000000000
--- a/lang/tcl-expect/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-extensions to Tcl to support scripting of interactive programs
diff --git a/lang/tcl-tclX/Makefile b/lang/tcl-tclX/Makefile
index da59ea1dd28a9..3fc48dddece5c 100644
--- a/lang/tcl-tclX/Makefile
+++ b/lang/tcl-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/01/24 18:44:58 he Exp $
+# $NetBSD: Makefile,v 1.4 2001/02/17 09:07:35 agc Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/TclX/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.neosoft.com/TclX/
+COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
 
 DEPENDS+=	tcl>=8.3.2:../../lang/tcl
 
diff --git a/lang/tcl-tclX/pkg/COMMENT b/lang/tcl-tclX/pkg/COMMENT
deleted file mode 100644
index 013145e6eda28..0000000000000
--- a/lang/tcl-tclX/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Extended Tcl (TclX), a set of Tcl extensions for system programming
diff --git a/lang/tcl/Makefile b/lang/tcl/Makefile
index aaa81556724e8..b7b9de816e9dd 100644
--- a/lang/tcl/Makefile
+++ b/lang/tcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/01/24 18:42:33 he Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:34 agc Exp $
 #
 
 DISTNAME=		tcl8.3.2
@@ -11,6 +11,7 @@ MASTER_SITES=		ftp://ftp.scriptics.com/pub/tcl/tcl8_3/ \
 
 MAINTAINER=		jwise@netbsd.org
 HOMEPAGE=		http://www.tcltk.com/
+COMMENT=		Ousterhout's Tool Command Language, a scripting language
 
 CONFLICTS+=		tclman80-*
 
diff --git a/lang/tcl/pkg/COMMENT b/lang/tcl/pkg/COMMENT
deleted file mode 100644
index e8cd99593693f..0000000000000
--- a/lang/tcl/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Ousterhout's Tool Command Language, a scripting language
diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile
index e82a88d464d6b..f855c9a062479 100644
--- a/lang/tk-expect/Makefile
+++ b/lang/tk-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/10/04 13:19:59 rh Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:35 agc Exp $
 #
 
 DISTNAME=	expect
@@ -8,6 +8,7 @@ MASTER_SITES=	http://expect.nist.gov/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://expect.nist.gov/
+COMMENT=	tcl interpreter with both the expect and tk extensions built in
 
 DEPENDS+=	tk-8.3.2:../../x11/tk
 DEPENDS+=	tcl-expect-5.32.1:../../lang/tcl-expect
diff --git a/lang/tk-expect/pkg/COMMENT b/lang/tk-expect/pkg/COMMENT
deleted file mode 100644
index 302f270e6d62b..0000000000000
--- a/lang/tk-expect/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-tcl interpreter with both the expect and tk extensions built in
diff --git a/lang/tk-tclX/Makefile b/lang/tk-tclX/Makefile
index 686a1c710b17b..cdf088f407dd3 100644
--- a/lang/tk-tclX/Makefile
+++ b/lang/tk-tclX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/09/06 16:46:06 jwise Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:36 agc Exp $
 #
 
 DISTNAME=	tclX8.2.0
@@ -8,6 +8,7 @@ MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/TclX/
 
 MAINTAINER=	jwise@netbsd.org
 HOMEPAGE=	http://www.neosoft.com/TclX/
+COMMENT=	Extended Tcl (TclX), a set of Tcl extensions for system programming
 
 DEPENDS+=	tk-8.3.2:../../x11/tk
 DEPENDS+=	tcl-tclX-8.2.0:../../lang/tcl-tclX
diff --git a/lang/tk-tclX/pkg/COMMENT b/lang/tk-tclX/pkg/COMMENT
deleted file mode 100644
index 013145e6eda28..0000000000000
--- a/lang/tk-tclX/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Extended Tcl (TclX), a set of Tcl extensions for system programming
diff --git a/lang/ucblogo/Makefile b/lang/ucblogo/Makefile
index 7245cd87c895f..f60b702abf0d8 100644
--- a/lang/ucblogo/Makefile
+++ b/lang/ucblogo/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2000/01/10 00:17:57 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2001/02/17 09:07:36 agc Exp $
 
 DISTNAME=	ucblogo-4.6
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=ucblogo/}
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	Brian Harvey's logo language interpreter
 
 MAKEFILE=	makefile
 GNU_CONFIGURE=	yes
diff --git a/lang/ucblogo/pkg/COMMENT b/lang/ucblogo/pkg/COMMENT
deleted file mode 100644
index cff53b7557222..0000000000000
--- a/lang/ucblogo/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Brian Harvey's logo language interpreter
diff --git a/lang/umb-scheme/Makefile b/lang/umb-scheme/Makefile
index d0d8514e018ba..cfa1b090dd1ea 100644
--- a/lang/umb-scheme/Makefile
+++ b/lang/umb-scheme/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.1.1.1 2000/11/02 11:59:07 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2001/02/17 09:07:37 agc Exp $
 
 DISTNAME=	umb-scheme-2.12
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/scheme-repository/imp/umb/
 
 MAINTAINER=	packages@netbsd.org
+COMMENT=	UMB scheme interpreter
 
 WRKSRC=		${WRKDIR}/scheme-2.12
 ALL_TARGET=	default
diff --git a/lang/umb-scheme/pkg/COMMENT b/lang/umb-scheme/pkg/COMMENT
deleted file mode 100644
index 159abea786a6d..0000000000000
--- a/lang/umb-scheme/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-UMB scheme interpreter
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index b033b9cae1244..c2d583132faa2 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2000/11/17 13:59:50 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:38 agc Exp $
 
 DISTNAME=	vscmV0r4
 PKGNAME=	vscm-0.4
@@ -10,6 +10,7 @@ PATCH_SITES=	${MASTER_SITES}
 
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.cs.princeton.edu/~blume/vscm/
+COMMENT=	Portable scheme implementation
 
 USE_GMAKE=	yes
 
diff --git a/lang/vscm/pkg/COMMENT b/lang/vscm/pkg/COMMENT
deleted file mode 100644
index 68984447073f1..0000000000000
--- a/lang/vscm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Portable scheme implementation
diff --git a/lang/vslisp/Makefile b/lang/vslisp/Makefile
index 919c2fc2d7a9d..953a4803cf649 100644
--- a/lang/vslisp/Makefile
+++ b/lang/vslisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/01/24 21:07:29 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/02/17 09:07:38 agc Exp $
 
 DISTNAME=		vslisp-4.0-1
 PKGNAME=		vslisp-4.0.1
@@ -7,6 +7,7 @@ MASTER_SITES=		ftp://ftp.sourceforge.net/pub/sourceforge/vslisp/
 
 MAINTAINER=		jtb@netbsd.org
 HOMEPAGE=		http://vslisp.sourceforge.net
+COMMENT=		Embedded Lisp library and standalone interpreter
 
 WRKSRC=			${WRKDIR}/vslisp-4.0
 GNU_CONFIGURE=		YES
diff --git a/lang/vslisp/pkg/COMMENT b/lang/vslisp/pkg/COMMENT
deleted file mode 100644
index 85608e1773c40..0000000000000
--- a/lang/vslisp/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Embedded Lisp library and standalone interpreter