20 files changed, 10 insertions, 10 deletions
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 0808da9fdb6d..9ffdd87f3520 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR=	obrien
 PATCHFILES=	bash205b-001 bash205b-002 bash205b-003 bash205b-004
 
 MAINTAINER=	obrien@FreeBSD.org
+COMMENT=	The GNU Bourne Again Shell
 
 .include <bsd.port.pre.mk>
 
diff --git a/shells/bash/pkg-comment b/shells/bash/pkg-comment
deleted file mode 100644
index 0f4244ddda46..000000000000
--- a/shells/bash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 0808da9fdb6d..9ffdd87f3520 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR=	obrien
 PATCHFILES=	bash205b-001 bash205b-002 bash205b-003 bash205b-004
 
 MAINTAINER=	obrien@FreeBSD.org
+COMMENT=	The GNU Bourne Again Shell
 
 .include <bsd.port.pre.mk>
 
diff --git a/shells/bash2/pkg-comment b/shells/bash2/pkg-comment
deleted file mode 100644
index 0f4244ddda46..000000000000
--- a/shells/bash2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index 0808da9fdb6d..9ffdd87f3520 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR=	obrien
 PATCHFILES=	bash205b-001 bash205b-002 bash205b-003 bash205b-004
 
 MAINTAINER=	obrien@FreeBSD.org
+COMMENT=	The GNU Bourne Again Shell
 
 .include <bsd.port.pre.mk>
 
diff --git a/shells/bash3/pkg-comment b/shells/bash3/pkg-comment
deleted file mode 100644
index 0f4244ddda46..000000000000
--- a/shells/bash3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile
index 5cf8e2398836..05b91b348b1d 100644
--- a/shells/mudsh/Makefile
+++ b/shells/mudsh/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=
 EXTRACT_ONLY=
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
+COMMENT=	An "intelligent" game-like shell
 
 NO_WRKSUBDIR=	yes
 
diff --git a/shells/mudsh/pkg-comment b/shells/mudsh/pkg-comment
deleted file mode 100644
index b8fbdb72afd0..000000000000
--- a/shells/mudsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An "intelligent" game-like shell
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 81ffac9ff10d..b1eded7bf981 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	shells
 MASTER_SITES=	http://omnibus.ruf.uni-freiburg.de/~gritter/archive/
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
+COMMENT=	An implementation of the UNIX 6th Edition shell.
 
 MAKEFILE=	makefile
 
diff --git a/shells/osh/pkg-comment b/shells/osh/pkg-comment
deleted file mode 100644
index 4183f972a01a..000000000000
--- a/shells/osh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the UNIX 6th Edition shell.
diff --git a/shells/pash/Makefile b/shells/pash/Makefile
index 81b1ed3decac..8d51cfb8ccee 100644
--- a/shells/pash/Makefile
+++ b/shells/pash/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.chez-pierre.com/pash/Archives/
 DISTNAME=	pash.sources
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
+COMMENT=	A full-screen shell (commander GUI) for *nix.
 
 NO_WRKSUBDIR=	yes
 
diff --git a/shells/pash/pkg-comment b/shells/pash/pkg-comment
deleted file mode 100644
index a576175c6c94..000000000000
--- a/shells/pash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full-screen shell (commander GUI) for *nix.
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 6951edce675e..374d8870ddfc 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -20,6 +20,7 @@ PATCHFILES=	${DISTNAME}-patches.1 ${DISTNAME}-patches.2
 PATCH_DIST_STRIP= -p2
 
 MAINTAINER=	tg@FreeBSD.org
+COMMENT=	The Public Domain Korn Shell
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LDSTATIC=-static
diff --git a/shells/pdksh/pkg-comment b/shells/pdksh/pkg-comment
deleted file mode 100644
index 81dea2e5eceb..000000000000
--- a/shells/pdksh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Public Domain Korn Shell
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index 748ed00d383f..79f61e85a95d 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.pcug.org.au/~dbell/programs/ \
 MASTER_SITE_SUBDIR=	patrick
 
 MAINTAINER=	patrick@freebsd.org
+COMMENT=	A Stand-Alone shell combining many common utilities
 
 MAN1=		sash.1
 
diff --git a/shells/sash/pkg-comment b/shells/sash/pkg-comment
deleted file mode 100644
index 532f16db8298..000000000000
--- a/shells/sash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Stand-Alone shell combining many common utilities
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index 026106cbc99a..3da577109096 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=   	http://www.exolution.de/wapsh/
 DISTNAME=		${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=		greid@FreeBSD.org
+COMMENT=	A system to allow remote shell logins via a WAP phone or web browser
 
 #RUN_DEPENDS=		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
 #			${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
diff --git a/shells/wapsh/pkg-comment b/shells/wapsh/pkg-comment
deleted file mode 100644
index 7f873392cb87..000000000000
--- a/shells/wapsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A system to allow remote shell logins via a WAP phone or web browser
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index cc7490c391fc..0df38aa85777 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/development
 DISTNAME=	${PORTNAME}-${ZSH_VER}-dev-${ZSH_DEV_REV}
 
 MAINTAINER=	shige@FreeBSD.org
+COMMENT=	The Z shell (development version)
 
 USE_AUTOCONF=   yes
 USE_REINPLACE=	yes
diff --git a/shells/zsh-devel/pkg-comment b/shells/zsh-devel/pkg-comment
deleted file mode 100644
index a1eadea141a1..000000000000
--- a/shells/zsh-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Z shell (development version)