From d9611f93758b42bc9f2e2794b3d0039ec6038c4e Mon Sep 17 00:00:00 2001
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Wed, 6 Nov 2002 22:47:41 +0000
Subject: Use PORTCOMMENT in the Makefile, and whack the pkg-comment.

Approved by:	pat
---
 www/Mosaic/Makefile                         | 2 ++
 www/Mosaic/pkg-comment                      | 1 -
 www/apache-contrib/Makefile                 | 2 ++
 www/apache-contrib/pkg-comment              | 1 -
 www/apache13-modssl/Makefile                | 2 ++
 www/apache13-modssl/pkg-comment             | 1 -
 www/apache13-ssl/Makefile                   | 2 ++
 www/apache13-ssl/pkg-comment                | 1 -
 www/arena/Makefile                          | 2 ++
 www/arena/pkg-comment                       | 1 -
 www/ashe/Makefile                           | 2 ++
 www/ashe/pkg-comment                        | 1 -
 www/bkmrkconv/Makefile                      | 2 ++
 www/bkmrkconv/pkg-comment                   | 1 -
 www/cadaver/Makefile                        | 2 ++
 www/cadaver/pkg-comment                     | 1 -
 www/cgic/Makefile                           | 2 ++
 www/cgic/pkg-comment                        | 1 -
 www/cgicc/Makefile                          | 2 ++
 www/cgicc/pkg-comment                       | 1 -
 www/chimera/Makefile                        | 2 ++
 www/chimera/pkg-comment                     | 1 -
 www/cocoon/Makefile                         | 2 ++
 www/cocoon/pkg-comment                      | 1 -
 www/comline/Makefile                        | 2 ++
 www/comline/pkg-comment                     | 1 -
 www/decss/Makefile                          | 2 ++
 www/decss/pkg-comment                       | 1 -
 www/fhttpd/Makefile                         | 2 ++
 www/fhttpd/pkg-comment                      | 1 -
 www/flashplugin/Makefile                    | 2 ++
 www/flashplugin/pkg-comment                 | 1 -
 www/fxhtml/Makefile                         | 2 ++
 www/fxhtml/pkg-comment                      | 1 -
 www/gn/Makefile                             | 2 ++
 www/gn/pkg-comment                          | 1 -
 www/grail/Makefile                          | 2 ++
 www/grail/pkg-comment                       | 1 -
 www/harvest/Makefile                        | 2 ++
 www/harvest/pkg-comment                     | 1 -
 www/htmlobject/Makefile                     | 2 ++
 www/htmlobject/pkg-comment                  | 1 -
 www/httperf/Makefile                        | 2 ++
 www/httperf/pkg-comment                     | 1 -
 www/junkbuster/Makefile                     | 2 ++
 www/junkbuster/pkg-comment                  | 1 -
 www/libwww/Makefile                         | 2 ++
 www/libwww/pkg-comment                      | 1 -
 www/linux-lesstif-ns/Makefile               | 2 ++
 www/linux-lesstif-ns/pkg-comment            | 1 -
 www/lynx-ssl/Makefile                       | 2 ++
 www/lynx-ssl/pkg-comment                    | 1 -
 www/lynx/Makefile                           | 2 ++
 www/lynx/pkg-comment                        | 1 -
 www/mapedit/Makefile                        | 2 ++
 www/mapedit/pkg-comment                     | 1 -
 www/mod_access_identd/Makefile              | 2 ++
 www/mod_access_identd/pkg-comment           | 1 -
 www/mod_access_referer/Makefile             | 2 ++
 www/mod_access_referer/pkg-comment          | 1 -
 www/mod_auth_any/Makefile                   | 2 ++
 www/mod_auth_any/pkg-comment                | 1 -
 www/mod_auth_pgsql/Makefile                 | 2 ++
 www/mod_auth_pgsql/pkg-comment              | 1 -
 www/mod_bf/Makefile                         | 2 ++
 www/mod_bf/pkg-comment                      | 1 -
 www/mod_blowchunks/Makefile                 | 2 ++
 www/mod_blowchunks/pkg-comment              | 1 -
 www/mod_cgi_debug/Makefile                  | 2 ++
 www/mod_cgi_debug/pkg-comment               | 1 -
 www/mod_color/Makefile                      | 2 ++
 www/mod_color/pkg-comment                   | 1 -
 www/mod_hosts_access/Makefile               | 2 ++
 www/mod_hosts_access/pkg-comment            | 1 -
 www/mod_index_rss/Makefile                  | 2 ++
 www/mod_index_rss/pkg-comment               | 1 -
 www/mod_mp3/Makefile                        | 2 ++
 www/mod_mp3/pkg-comment                     | 1 -
 www/mod_put/Makefile                        | 2 ++
 www/mod_put/pkg-comment                     | 1 -
 www/mod_python/Makefile                     | 2 ++
 www/mod_python/pkg-comment                  | 1 -
 www/mod_python3/Makefile                    | 2 ++
 www/mod_python3/pkg-comment                 | 1 -
 www/mod_roaming/Makefile                    | 2 ++
 www/mod_roaming/pkg-comment                 | 1 -
 www/mod_sed/Makefile                        | 2 ++
 www/mod_sed/pkg-comment                     | 1 -
 www/mod_sequester/Makefile                  | 2 ++
 www/mod_sequester/pkg-comment               | 1 -
 www/mod_snake/Makefile                      | 2 ++
 www/mod_snake/pkg-comment                   | 1 -
 www/mod_ticket/Makefile                     | 2 ++
 www/mod_ticket/pkg-comment                  | 1 -
 www/oops/Makefile                           | 2 ++
 www/oops/pkg-comment                        | 1 -
 www/p5-Apache-AddHostPath/Makefile          | 2 ++
 www/p5-Apache-AddHostPath/pkg-comment       | 1 -
 www/p5-Apache-Archive/Makefile              | 2 ++
 www/p5-Apache-Archive/pkg-comment           | 1 -
 www/p5-Apache-AuthCookie/Makefile           | 2 ++
 www/p5-Apache-AuthCookie/pkg-comment        | 1 -
 www/p5-Apache-AuthTicket/Makefile           | 2 ++
 www/p5-Apache-AuthTicket/pkg-comment        | 1 -
 www/p5-Apache-AuthenCache/Makefile          | 2 ++
 www/p5-Apache-AuthenCache/pkg-comment       | 1 -
 www/p5-Apache-AuthenURL/Makefile            | 2 ++
 www/p5-Apache-AuthenURL/pkg-comment         | 1 -
 www/p5-Apache-AutoIndex/Makefile            | 2 ++
 www/p5-Apache-AutoIndex/pkg-comment         | 1 -
 www/p5-Apache-Filter/Makefile               | 2 ++
 www/p5-Apache-Filter/pkg-comment            | 1 -
 www/p5-Apache-Icon/Makefile                 | 2 ++
 www/p5-Apache-Icon/pkg-comment              | 1 -
 www/p5-Apache-Language/Makefile             | 2 ++
 www/p5-Apache-Language/pkg-comment          | 1 -
 www/p5-Apache-SSI/Makefile                  | 2 ++
 www/p5-Apache-SSI/pkg-comment               | 1 -
 www/p5-Apache-Session-SharedMem/Makefile    | 2 ++
 www/p5-Apache-Session-SharedMem/pkg-comment | 1 -
 www/p5-CGI-ArgChecker/Makefile              | 2 ++
 www/p5-CGI-ArgChecker/pkg-comment           | 1 -
 www/p5-CGI-FastTemplate/Makefile            | 2 ++
 www/p5-CGI-FastTemplate/pkg-comment         | 1 -
 www/p5-CGI-Minimal/Makefile                 | 2 ++
 www/p5-CGI-Minimal/pkg-comment              | 1 -
 www/p5-CGI-modules/Makefile                 | 2 ++
 www/p5-CGI-modules/pkg-comment              | 1 -
 www/p5-CGI_Lite/Makefile                    | 2 ++
 www/p5-CGI_Lite/pkg-comment                 | 1 -
 www/p5-HTML-Clean/Makefile                  | 2 ++
 www/p5-HTML-Clean/pkg-comment               | 1 -
 www/p5-HTML-Navigation/Makefile             | 2 ++
 www/p5-HTML-Navigation/pkg-comment          | 1 -
 www/p5-HTML-Pager/Makefile                  | 2 ++
 www/p5-HTML-Pager/pkg-comment               | 1 -
 www/p5-HTML-QuickCheck/Makefile             | 2 ++
 www/p5-HTML-QuickCheck/pkg-comment          | 1 -
 www/p5-HTML-SimpleParse/Makefile            | 2 ++
 www/p5-HTML-SimpleParse/pkg-comment         | 1 -
 www/p5-HTML-Tagset/Makefile                 | 2 ++
 www/p5-HTML-Tagset/pkg-comment              | 1 -
 www/p5-HTML/Makefile                        | 2 ++
 www/p5-HTML/pkg-comment                     | 1 -
 www/p5-HTTPD-Tools/Makefile                 | 2 ++
 www/p5-HTTPD-Tools/pkg-comment              | 1 -
 www/p5-HTTPD-User-Manage/Makefile           | 2 ++
 www/p5-HTTPD-User-Manage/pkg-comment        | 1 -
 www/p5-WWW-Robot/Makefile                   | 2 ++
 www/p5-WWW-Robot/pkg-comment                | 1 -
 www/p5-libservlet/Makefile                  | 2 ++
 www/p5-libservlet/pkg-comment               | 1 -
 www/peacock/Makefile                        | 2 ++
 www/peacock/pkg-comment                     | 1 -
 www/phpnuke/Makefile                        | 2 ++
 www/phpnuke/pkg-comment                     | 1 -
 www/py-HTMLgen/Makefile                     | 2 ++
 www/py-HTMLgen/pkg-comment                  | 1 -
 www/retawq/Makefile                         | 2 ++
 www/retawq/pkg-comment                      | 1 -
 www/sqmgrlog/Makefile                       | 2 ++
 www/sqmgrlog/pkg-comment                    | 1 -
 www/surfraw/Makefile                        | 2 ++
 www/surfraw/pkg-comment                     | 1 -
 www/swish++/Makefile                        | 2 ++
 www/swish++/pkg-comment                     | 1 -
 www/thumbnail_index/Makefile                | 2 ++
 www/thumbnail_index/pkg-comment             | 1 -
 www/w3c-httpd/Makefile                      | 2 ++
 www/w3c-httpd/pkg-comment                   | 1 -
 www/webcopy/Makefile                        | 2 ++
 www/webcopy/pkg-comment                     | 1 -
 www/webglimpse/Makefile                     | 2 ++
 www/webglimpse/pkg-comment                  | 1 -
 www/wn/Makefile                             | 2 ++
 www/wn/pkg-comment                          | 1 -
 www/wwwcount/Makefile                       | 2 ++
 www/wwwcount/pkg-comment                    | 1 -
 www/xist/Makefile                           | 2 ++
 www/xist/pkg-comment                        | 1 -
 www/xpath2rss/Makefile                      | 2 ++
 www/xpath2rss/pkg-comment                   | 1 -
 182 files changed, 182 insertions(+), 91 deletions(-)
 delete mode 100644 www/Mosaic/pkg-comment
 delete mode 100644 www/apache-contrib/pkg-comment
 delete mode 100644 www/apache13-modssl/pkg-comment
 delete mode 100644 www/apache13-ssl/pkg-comment
 delete mode 100644 www/arena/pkg-comment
 delete mode 100644 www/ashe/pkg-comment
 delete mode 100644 www/bkmrkconv/pkg-comment
 delete mode 100644 www/cadaver/pkg-comment
 delete mode 100644 www/cgic/pkg-comment
 delete mode 100644 www/cgicc/pkg-comment
 delete mode 100644 www/chimera/pkg-comment
 delete mode 100644 www/cocoon/pkg-comment
 delete mode 100644 www/comline/pkg-comment
 delete mode 100644 www/decss/pkg-comment
 delete mode 100644 www/fhttpd/pkg-comment
 delete mode 100644 www/flashplugin/pkg-comment
 delete mode 100644 www/fxhtml/pkg-comment
 delete mode 100644 www/gn/pkg-comment
 delete mode 100644 www/grail/pkg-comment
 delete mode 100644 www/harvest/pkg-comment
 delete mode 100644 www/htmlobject/pkg-comment
 delete mode 100644 www/httperf/pkg-comment
 delete mode 100644 www/junkbuster/pkg-comment
 delete mode 100644 www/libwww/pkg-comment
 delete mode 100644 www/linux-lesstif-ns/pkg-comment
 delete mode 100644 www/lynx-ssl/pkg-comment
 delete mode 100644 www/lynx/pkg-comment
 delete mode 100644 www/mapedit/pkg-comment
 delete mode 100644 www/mod_access_identd/pkg-comment
 delete mode 100644 www/mod_access_referer/pkg-comment
 delete mode 100644 www/mod_auth_any/pkg-comment
 delete mode 100644 www/mod_auth_pgsql/pkg-comment
 delete mode 100644 www/mod_bf/pkg-comment
 delete mode 100644 www/mod_blowchunks/pkg-comment
 delete mode 100644 www/mod_cgi_debug/pkg-comment
 delete mode 100644 www/mod_color/pkg-comment
 delete mode 100644 www/mod_hosts_access/pkg-comment
 delete mode 100644 www/mod_index_rss/pkg-comment
 delete mode 100644 www/mod_mp3/pkg-comment
 delete mode 100644 www/mod_put/pkg-comment
 delete mode 100644 www/mod_python/pkg-comment
 delete mode 100644 www/mod_python3/pkg-comment
 delete mode 100644 www/mod_roaming/pkg-comment
 delete mode 100644 www/mod_sed/pkg-comment
 delete mode 100644 www/mod_sequester/pkg-comment
 delete mode 100644 www/mod_snake/pkg-comment
 delete mode 100644 www/mod_ticket/pkg-comment
 delete mode 100644 www/oops/pkg-comment
 delete mode 100644 www/p5-Apache-AddHostPath/pkg-comment
 delete mode 100644 www/p5-Apache-Archive/pkg-comment
 delete mode 100644 www/p5-Apache-AuthCookie/pkg-comment
 delete mode 100644 www/p5-Apache-AuthTicket/pkg-comment
 delete mode 100644 www/p5-Apache-AuthenCache/pkg-comment
 delete mode 100644 www/p5-Apache-AuthenURL/pkg-comment
 delete mode 100644 www/p5-Apache-AutoIndex/pkg-comment
 delete mode 100644 www/p5-Apache-Filter/pkg-comment
 delete mode 100644 www/p5-Apache-Icon/pkg-comment
 delete mode 100644 www/p5-Apache-Language/pkg-comment
 delete mode 100644 www/p5-Apache-SSI/pkg-comment
 delete mode 100644 www/p5-Apache-Session-SharedMem/pkg-comment
 delete mode 100644 www/p5-CGI-ArgChecker/pkg-comment
 delete mode 100644 www/p5-CGI-FastTemplate/pkg-comment
 delete mode 100644 www/p5-CGI-Minimal/pkg-comment
 delete mode 100644 www/p5-CGI-modules/pkg-comment
 delete mode 100644 www/p5-CGI_Lite/pkg-comment
 delete mode 100644 www/p5-HTML-Clean/pkg-comment
 delete mode 100644 www/p5-HTML-Navigation/pkg-comment
 delete mode 100644 www/p5-HTML-Pager/pkg-comment
 delete mode 100644 www/p5-HTML-QuickCheck/pkg-comment
 delete mode 100644 www/p5-HTML-SimpleParse/pkg-comment
 delete mode 100644 www/p5-HTML-Tagset/pkg-comment
 delete mode 100644 www/p5-HTML/pkg-comment
 delete mode 100644 www/p5-HTTPD-Tools/pkg-comment
 delete mode 100644 www/p5-HTTPD-User-Manage/pkg-comment
 delete mode 100644 www/p5-WWW-Robot/pkg-comment
 delete mode 100644 www/p5-libservlet/pkg-comment
 delete mode 100644 www/peacock/pkg-comment
 delete mode 100644 www/phpnuke/pkg-comment
 delete mode 100644 www/py-HTMLgen/pkg-comment
 delete mode 100644 www/retawq/pkg-comment
 delete mode 100644 www/sqmgrlog/pkg-comment
 delete mode 100644 www/surfraw/pkg-comment
 delete mode 100644 www/swish++/pkg-comment
 delete mode 100644 www/thumbnail_index/pkg-comment
 delete mode 100644 www/w3c-httpd/pkg-comment
 delete mode 100644 www/webcopy/pkg-comment
 delete mode 100644 www/webglimpse/pkg-comment
 delete mode 100644 www/wn/pkg-comment
 delete mode 100644 www/wwwcount/pkg-comment
 delete mode 100644 www/xist/pkg-comment
 delete mode 100644 www/xpath2rss/pkg-comment

(limited to 'www')

diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index a8edb2dcfb9f..e287f77f9fe9 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	Mosaic-src-2.7b5
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A World Wide Web browser
+
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
 
diff --git a/www/Mosaic/pkg-comment b/www/Mosaic/pkg-comment
deleted file mode 100644
index 4d0f8df84108..000000000000
--- a/www/Mosaic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A World Wide Web browser
diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index d721b912787f..6f6bd06c6769 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -18,6 +18,8 @@ MASTER_SITE_SUBDIR=	httpd/contrib/modules/1.3
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Third-party modules contributed to the Apache HTTP server project
+
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 
diff --git a/www/apache-contrib/pkg-comment b/www/apache-contrib/pkg-comment
deleted file mode 100644
index 60aac8107000..000000000000
--- a/www/apache-contrib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Third-party modules contributed to the Apache HTTP server project
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index b862ada210fe..0cb4b00d4a8c 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -31,6 +31,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	The Apache 1.3 webserver with SSL/TLS functionality
+
 LIB_DEPENDS=	mm.12:${PORTSDIR}/devel/mm
 
 MASTER_SITES_MODSSL=	http://www.modssl.org/source/ \
diff --git a/www/apache13-modssl/pkg-comment b/www/apache13-modssl/pkg-comment
deleted file mode 100644
index 51ef1c066e85..000000000000
--- a/www/apache13-modssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Apache 1.3 webserver with SSL/TLS functionality
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index fe8851c58f35..02356d89d8c5 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -41,6 +41,8 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	Apache-SSL: Apache secure webserver integrating OpenSSL
+
 APACHE_VERSION=		1.3.27
 APACHE_SSL_VERSION=	1.48
 
diff --git a/www/apache13-ssl/pkg-comment b/www/apache13-ssl/pkg-comment
deleted file mode 100644
index 1d0fd29fd5db..000000000000
--- a/www/apache13-ssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache-SSL: Apache secure webserver integrating OpenSSL
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 433d0f4ced8a..c6ecf54ed272 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	arena-CJK-beta3a
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Experimental HTML 3 browser, supports math and style sheets
+
 LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg
 LIB_DEPENDS+=	png.5:${PORTSDIR}/graphics/png
 
diff --git a/www/arena/pkg-comment b/www/arena/pkg-comment
deleted file mode 100644
index 436b8b8f3659..000000000000
--- a/www/arena/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Experimental HTML 3 browser, supports math and style sheets
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 6da7f19be1ae..9b0cb844fb7b 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -14,6 +14,8 @@ DISTFILES=	xhtml-1.3.tar.Z cci.tar.Z libhtmlw.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A simple HTML editor
+
 NO_WRKSUBDIR=	yes
 CONFIGURE_WRKSRC=	${WRKDIR}/src
 INSTALL_WRKSRC=		${WRKDIR}/src
diff --git a/www/ashe/pkg-comment b/www/ashe/pkg-comment
deleted file mode 100644
index 58287cf51c73..000000000000
--- a/www/ashe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple HTML editor
diff --git a/www/bkmrkconv/Makefile b/www/bkmrkconv/Makefile
index 2fc996512cab..b737f0802774 100644
--- a/www/bkmrkconv/Makefile
+++ b/www/bkmrkconv/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://www.bleb.org/software/bkmrkconv/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Netscape bookmarks.html converter
+
 USE_PERL5=	yes
 NO_BUILD=	yes
 
diff --git a/www/bkmrkconv/pkg-comment b/www/bkmrkconv/pkg-comment
deleted file mode 100644
index 3a617c3fdfe5..000000000000
--- a/www/bkmrkconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape bookmarks.html converter
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index e35dd04efa3c..cdf37ee7e886 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.webdav.org/cadaver/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Commandline client for DAV
+
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
 		expat.4:${PORTSDIR}/textproc/expat2
 
diff --git a/www/cadaver/pkg-comment b/www/cadaver/pkg-comment
deleted file mode 100644
index 87e3ee1905cf..000000000000
--- a/www/cadaver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Commandline client for DAV
diff --git a/www/cgic/Makefile b/www/cgic/Makefile
index a30c239d4f25..5cb61e2914c2 100644
--- a/www/cgic/Makefile
+++ b/www/cgic/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	ANSI C library for CGI programming
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	${FILESDIR}/Makefile.lib
 INSTALLS_SHLIB=	yes
diff --git a/www/cgic/pkg-comment b/www/cgic/pkg-comment
deleted file mode 100644
index b771e166a4b6..000000000000
--- a/www/cgic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ANSI C library for CGI programming
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index fc46f0a41ab3..3bd38e005629 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -15,6 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A C++ class library for writing CGI applications
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/www/cgicc/pkg-comment b/www/cgicc/pkg-comment
deleted file mode 100644
index e729fefd49a2..000000000000
--- a/www/cgicc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ class library for writing CGI applications
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 9a98faf830e1..5a156b7af556 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	X/Athena World-Wide Web client
+
 NO_LATEST_LINK=	yes
 USE_IMAKE=	yes
 
diff --git a/www/chimera/pkg-comment b/www/chimera/pkg-comment
deleted file mode 100644
index 6e188068e4d5..000000000000
--- a/www/chimera/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X/Athena World-Wide Web client
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 8df5072f2d7f..91ff6b7dad4a 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -17,6 +17,8 @@ DISTNAME=	Cocoon-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	100% pure Java publishing framework servlet
+
 USE_JAVA=	1.1+
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/www/cocoon/pkg-comment b/www/cocoon/pkg-comment
deleted file mode 100644
index 2f88fbe3086c..000000000000
--- a/www/cocoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-100% pure Java publishing framework servlet
diff --git a/www/comline/Makefile b/www/comline/Makefile
index e81dbf9c1e11..7af506029a6d 100644
--- a/www/comline/Makefile
+++ b/www/comline/Makefile
@@ -18,6 +18,8 @@ DISTFILES=	w3c-libwww-4.0D.tar.gz \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	W3C Command Line WWW Tool
+
 USE_REINPLACE=	yes
 
 WRKSRC=		${WRKDIR}/WWW
diff --git a/www/comline/pkg-comment b/www/comline/pkg-comment
deleted file mode 100644
index 74ee33d0cdbc..000000000000
--- a/www/comline/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-W3C Command Line WWW Tool
diff --git a/www/decss/Makefile b/www/decss/Makefile
index a938336c466b..a9a9cce0c917 100644
--- a/www/decss/Makefile
+++ b/www/decss/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Strip cascading style sheets from webpages
+
 WRKSRC=		${WRKDIR}/source
 
 NO_BUILD=	YES
diff --git a/www/decss/pkg-comment b/www/decss/pkg-comment
deleted file mode 100644
index d0ad3f39feac..000000000000
--- a/www/decss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Strip cascading style sheets from webpages
diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile
index e4d24752cddf..2b6c43ca67c4 100644
--- a/www/fhttpd/Makefile
+++ b/www/fhttpd/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.fhttpd.org/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	C++-based FTP/HTTP server that supports modules
+
 USE_REINPLACE=	yes
 
 LOGFILE=	share/fhttpd/fhttpd.log
diff --git a/www/fhttpd/pkg-comment b/www/fhttpd/pkg-comment
deleted file mode 100644
index be78b5dce7c5..000000000000
--- a/www/fhttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++-based FTP/HTTP server that supports modules
diff --git a/www/flashplugin/Makefile b/www/flashplugin/Makefile
index d6da74f62ac7..5f07cf8bacbf 100644
--- a/www/flashplugin/Makefile
+++ b/www/flashplugin/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An implementation of Macromedia Flash plugin for Netscape
+
 ONLY_FOR_ARCHS=	i386
 
 .include <bsd.port.pre.mk>
diff --git a/www/flashplugin/pkg-comment b/www/flashplugin/pkg-comment
deleted file mode 100644
index d0bf545c3cc5..000000000000
--- a/www/flashplugin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of Macromedia Flash plugin for Netscape
diff --git a/www/fxhtml/Makefile b/www/fxhtml/Makefile
index e6f6de542406..03ee1835b0f2 100644
--- a/www/fxhtml/Makefile
+++ b/www/fxhtml/Makefile
@@ -13,6 +13,8 @@ DISTNAME=	${PORTNAME}-freebsd-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Server side extension to HTML eliminating the need for CGI scripts
+
 pre-install:
 	${MKDIR} ${PREFIX}/www/cgi-bin ${PREFIX}/www/data
 
diff --git a/www/fxhtml/pkg-comment b/www/fxhtml/pkg-comment
deleted file mode 100644
index 7d2858fa5cda..000000000000
--- a/www/fxhtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Server side extension to HTML eliminating the need for CGI scripts
diff --git a/www/gn/Makefile b/www/gn/Makefile
index bd64b5033475..b7beee70982f 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	trevor
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Gopher and http server
+
 BUILD_DEPENDS=	${WAISDIR}/bin/waisindex:${PORTSDIR}/net/wais
 
 IS_INTERACTIVE=	yes
diff --git a/www/gn/pkg-comment b/www/gn/pkg-comment
deleted file mode 100644
index 8de3d4c9f784..000000000000
--- a/www/gn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gopher and http server
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 2b2e5391e40a..59d87c9772f1 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -15,6 +15,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	An extensible Internet browser written entirely in Python
+
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 IGNORE=		"Doesn't seem to work with Python 2.x"
diff --git a/www/grail/pkg-comment b/www/grail/pkg-comment
deleted file mode 100644
index c7fea6b6fda6..000000000000
--- a/www/grail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible Internet browser written entirely in Python
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 8861d70d970f..9c82fbf30516 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -17,6 +17,8 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Collect information from all over the Internet
+
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
diff --git a/www/harvest/pkg-comment b/www/harvest/pkg-comment
deleted file mode 100644
index e25c750775f9..000000000000
--- a/www/harvest/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collect information from all over the Internet
diff --git a/www/htmlobject/Makefile b/www/htmlobject/Makefile
index 6a69f7548972..5793b33635df 100644
--- a/www/htmlobject/Makefile
+++ b/www/htmlobject/Makefile
@@ -15,6 +15,8 @@ DISTNAME=	html_object-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	HTML Document Object
+
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/htmlobject/pkg-comment b/www/htmlobject/pkg-comment
deleted file mode 100644
index ba399d2f3e92..000000000000
--- a/www/htmlobject/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML Document Object
diff --git a/www/httperf/Makefile b/www/httperf/Makefile
index 5d2e4c71c1d3..0f183f2dab10 100644
--- a/www/httperf/Makefile
+++ b/www/httperf/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	ftp://ftp.hpl.hp.com/pub/httperf/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A tool for measuring webserver performance
+
 USE_GMAKE=	yes
 MAN1=		httperf.1
 
diff --git a/www/httperf/pkg-comment b/www/httperf/pkg-comment
deleted file mode 100644
index 6adc47fad0e8..000000000000
--- a/www/httperf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for measuring webserver performance
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 292e0b7d422e..e73f637636fa 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -21,6 +21,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An HTTP proxy server that eliminates ads
+
 USE_REINPLACE=	yes
 
 ALL_TARGET=	# yes, an empty target.
diff --git a/www/junkbuster/pkg-comment b/www/junkbuster/pkg-comment
deleted file mode 100644
index 356bd17673bb..000000000000
--- a/www/junkbuster/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HTTP proxy server that eliminates ads
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index a71cf53269a1..9cc02199323e 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	The W3C Reference Library
+
 USE_LIBTOOL=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--enable-shared --enable-static --with-zlib
diff --git a/www/libwww/pkg-comment b/www/libwww/pkg-comment
deleted file mode 100644
index 9f0372dda6ed..000000000000
--- a/www/libwww/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The W3C Reference Library
diff --git a/www/linux-lesstif-ns/Makefile b/www/linux-lesstif-ns/Makefile
index 2b41cf1732d6..78c976161a55 100644
--- a/www/linux-lesstif-ns/Makefile
+++ b/www/linux-lesstif-ns/Makefile
@@ -24,6 +24,8 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Clone of the Motif library mostly for linux-netscape4
+
 BUILD_DEPENDS=	${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools-7
 
 USE_BZIP2=	yes
diff --git a/www/linux-lesstif-ns/pkg-comment b/www/linux-lesstif-ns/pkg-comment
deleted file mode 100644
index da9938c3cd82..000000000000
--- a/www/linux-lesstif-ns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of the Motif library mostly for linux-netscape4
diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile
index 04becda67a3c..8053b16f910d 100644
--- a/www/lynx-ssl/Makefile
+++ b/www/lynx-ssl/Makefile
@@ -5,6 +5,8 @@
 # $FreeBSD$
 #
 
+PORTCOMMENT=	A non-graphical, text-based https-enabled World-Wide Web client
+
 PKGNAMESUFFIX =	-ssl
 
 MASTERDIR=	${.CURDIR}/../lynx
diff --git a/www/lynx-ssl/pkg-comment b/www/lynx-ssl/pkg-comment
deleted file mode 100644
index 264a8ff933d0..000000000000
--- a/www/lynx-ssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A non-graphical, text-based https-enabled World-Wide Web client
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index d032d02084c1..7d7093257791 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -19,6 +19,8 @@ PATCHFILES=	lynx2.8.4rel.1a.patch \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A non-graphical, text-based World-Wide Web client
+
 USE_BZIP2=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}2-8-4
 GNU_CONFIGURE=	yes
diff --git a/www/lynx/pkg-comment b/www/lynx/pkg-comment
deleted file mode 100644
index 25d3368d9d21..000000000000
--- a/www/lynx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A non-graphical, text-based World-Wide Web client
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index 500cd1a21a53..fef272763d48 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A WWW authoring tool to create clickable maps
+
 RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
 
 JDK_VERSION=	1.1.8
diff --git a/www/mapedit/pkg-comment b/www/mapedit/pkg-comment
deleted file mode 100644
index 6a3eaa4030e7..000000000000
--- a/www/mapedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WWW authoring tool to create clickable maps
diff --git a/www/mod_access_identd/Makefile b/www/mod_access_identd/Makefile
index 8a8d90a78b45..dd446752df30 100644
--- a/www/mod_access_identd/Makefile
+++ b/www/mod_access_identd/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://MeepZor.Com/packages/mod_access_identd/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module to supply access control based on ident reply
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_access_identd/pkg-comment b/www/mod_access_identd/pkg-comment
deleted file mode 100644
index 28a603e995a7..000000000000
--- a/www/mod_access_identd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to supply access control based on ident reply
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index 4def9ccd7890..1e4de0ef6b89 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	accessreferer
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	An Apache module that provides access control based on Referer HTTP header
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_access_referer/pkg-comment b/www/mod_access_referer/pkg-comment
deleted file mode 100644
index 128077549fa6..000000000000
--- a/www/mod_access_referer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides access control based on Referer HTTP header
diff --git a/www/mod_auth_any/Makefile b/www/mod_auth_any/Makefile
index e1483c44343d..42883c7ed599 100644
--- a/www/mod_auth_any/Makefile
+++ b/www/mod_auth_any/Makefile
@@ -13,6 +13,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module to use any command line program to authenticate a user
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_auth_any/pkg-comment b/www/mod_auth_any/pkg-comment
deleted file mode 100644
index b69de0da3772..000000000000
--- a/www/mod_auth_any/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to use any command line program to authenticate a user
diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index 1fbde23fdcd4..cf41b9e6c33f 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -11,6 +11,8 @@ MASTER_SITES=	http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	Allows users to use PostgreSQL databases for user authentication
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT}
 LIB_DEPENDS=	pq.2:${PORTSDIR}/databases/postgresql7
diff --git a/www/mod_auth_pgsql/pkg-comment b/www/mod_auth_pgsql/pkg-comment
deleted file mode 100644
index b75baa2d4cda..000000000000
--- a/www/mod_auth_pgsql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows users to use PostgreSQL databases for user authentication
diff --git a/www/mod_bf/Makefile b/www/mod_bf/Makefile
index c7152c7412b5..ba243655c845 100644
--- a/www/mod_bf/Makefile
+++ b/www/mod_bf/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	modbf
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A brainf*ck module for Apache
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_bf/pkg-comment b/www/mod_bf/pkg-comment
deleted file mode 100644
index c37afdbec35e..000000000000
--- a/www/mod_bf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A brainf*ck module for Apache
diff --git a/www/mod_blowchunks/Makefile b/www/mod_blowchunks/Makefile
index aba5233d5c11..e5cf8d8b6c0c 100644
--- a/www/mod_blowchunks/Makefile
+++ b/www/mod_blowchunks/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.c
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module for rejecting and logging chunked requests
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_blowchunks/pkg-comment b/www/mod_blowchunks/pkg-comment
deleted file mode 100644
index a2c99280f409..000000000000
--- a/www/mod_blowchunks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for rejecting and logging chunked requests
diff --git a/www/mod_cgi_debug/Makefile b/www/mod_cgi_debug/Makefile
index c5eb5eb3bff5..c4f113485c36 100644
--- a/www/mod_cgi_debug/Makefile
+++ b/www/mod_cgi_debug/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://software.tangent.org/download/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module to make debugging server-side scripts easier
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_cgi_debug/pkg-comment b/www/mod_cgi_debug/pkg-comment
deleted file mode 100644
index 93fa51fd53d2..000000000000
--- a/www/mod_cgi_debug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to make debugging server-side scripts easier
diff --git a/www/mod_color/Makefile b/www/mod_color/Makefile
index 20a468c40a1a..c788387aecf1 100644
--- a/www/mod_color/Makefile
+++ b/www/mod_color/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.l
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module that provides syntax coloring for various languages
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_color/pkg-comment b/www/mod_color/pkg-comment
deleted file mode 100644
index b3ff1e90fef9..000000000000
--- a/www/mod_color/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that provides syntax coloring for various languages
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index 34afa18731f6..360ed169e2f5 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.klomp.org/mod_hosts_access/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module that makes Apache respect hosts.allow and hosts.deny
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_hosts_access/pkg-comment b/www/mod_hosts_access/pkg-comment
deleted file mode 100644
index 4f215c017fde..000000000000
--- a/www/mod_hosts_access/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that makes Apache respect hosts.allow and hosts.deny
diff --git a/www/mod_index_rss/Makefile b/www/mod_index_rss/Makefile
index 453f76a5822c..301a57f21f00 100644
--- a/www/mod_index_rss/Makefile
+++ b/www/mod_index_rss/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	http://software.tangent.org/download/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module to provides RSS output for directories
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_index_rss/pkg-comment b/www/mod_index_rss/pkg-comment
deleted file mode 100644
index e7454534d204..000000000000
--- a/www/mod_index_rss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to provides RSS output for directories
diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index e9a0d58dad0c..068a55b98f34 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	http://software.tangent.org/download/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module to allow MP3 streaming
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_mp3/pkg-comment b/www/mod_mp3/pkg-comment
deleted file mode 100644
index 1819207c4b8f..000000000000
--- a/www/mod_mp3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to allow MP3 streaming
diff --git a/www/mod_put/Makefile b/www/mod_put/Makefile
index 10d1c447572b..3d547f37af9c 100644
--- a/www/mod_put/Makefile
+++ b/www/mod_put/Makefile
@@ -13,6 +13,8 @@ DISTFILES=	mod_put.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An Apache module that provides PUT and DELETE methods
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_put/pkg-comment b/www/mod_put/pkg-comment
deleted file mode 100644
index 94fcb4f2018d..000000000000
--- a/www/mod_put/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides PUT and DELETE methods
diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile
index dd217311cd59..97979987393e 100644
--- a/www/mod_python/Makefile
+++ b/www/mod_python/Makefile
@@ -15,6 +15,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module for integrating Python
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_python/pkg-comment b/www/mod_python/pkg-comment
deleted file mode 100644
index 29297814bfad..000000000000
--- a/www/mod_python/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for integrating Python
diff --git a/www/mod_python3/Makefile b/www/mod_python3/Makefile
index dd217311cd59..97979987393e 100644
--- a/www/mod_python3/Makefile
+++ b/www/mod_python3/Makefile
@@ -15,6 +15,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module for integrating Python
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_python3/pkg-comment b/www/mod_python3/pkg-comment
deleted file mode 100644
index 29297814bfad..000000000000
--- a/www/mod_python3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for integrating Python
diff --git a/www/mod_roaming/Makefile b/www/mod_roaming/Makefile
index aa7eebec1c6c..4cdb1663b1ed 100644
--- a/www/mod_roaming/Makefile
+++ b/www/mod_roaming/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.klomp.org/mod_roaming/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An Apache module that works as a Netscape Roaming Access server
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_roaming/pkg-comment b/www/mod_roaming/pkg-comment
deleted file mode 100644
index 17d3be0c71c7..000000000000
--- a/www/mod_roaming/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that works as a Netscape Roaming Access server
diff --git a/www/mod_sed/Makefile b/www/mod_sed/Makefile
index 8ebe06c3c2aa..cb9040b83b50 100644
--- a/www/mod_sed/Makefile
+++ b/www/mod_sed/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.myrddin.demon.co.uk/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An apache module that embeds a copy of the sed(1) command
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_sed/pkg-comment b/www/mod_sed/pkg-comment
deleted file mode 100644
index d79c9fbe8bca..000000000000
--- a/www/mod_sed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An apache module that embeds a copy of the sed(1) command
diff --git a/www/mod_sequester/Makefile b/www/mod_sequester/Makefile
index e8ac1e621555..5d438b4c53b3 100644
--- a/www/mod_sequester/Makefile
+++ b/www/mod_sequester/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://MeepZor.Com/packages/mod_sequester/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module that controls access to the website using secure info
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_sequester/pkg-comment b/www/mod_sequester/pkg-comment
deleted file mode 100644
index 2386ee5ff31a..000000000000
--- a/www/mod_sequester/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that controls access to the website using secure info
diff --git a/www/mod_snake/Makefile b/www/mod_snake/Makefile
index 302025271525..191d652787e2 100644
--- a/www/mod_snake/Makefile
+++ b/www/mod_snake/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	modsnake
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A library to easily create flexible Apache modules
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT} \
 		${PYTHON_CMD}:${PYTHON_PORTSDIR}
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/mod_snake/pkg-comment b/www/mod_snake/pkg-comment
deleted file mode 100644
index ab057c404565..000000000000
--- a/www/mod_snake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library to easily create flexible Apache modules
diff --git a/www/mod_ticket/Makefile b/www/mod_ticket/Makefile
index 1e1c3ee64562..9e7bb12063ea 100644
--- a/www/mod_ticket/Makefile
+++ b/www/mod_ticket/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.c
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache module for a digitally signed ticket in URL
+
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
 
diff --git a/www/mod_ticket/pkg-comment b/www/mod_ticket/pkg-comment
deleted file mode 100644
index d2b109b32e0b..000000000000
--- a/www/mod_ticket/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for a digitally signed ticket in URL
diff --git a/www/oops/Makefile b/www/oops/Makefile
index b143bf27d375..029cb1ef6d58 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -17,6 +17,8 @@ PATCH_DIST_STRIP=	-d ${WRKDIR}/${DISTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A caching web proxy server
+
 OOPSVERSION=	1.5.22
 OOPSDATE=	20020519
 
diff --git a/www/oops/pkg-comment b/www/oops/pkg-comment
deleted file mode 100644
index d9e9cb595614..000000000000
--- a/www/oops/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A caching web proxy server
diff --git a/www/p5-Apache-AddHostPath/Makefile b/www/p5-Apache-AddHostPath/Makefile
index 57540e9032ab..88f9d46e2599 100644
--- a/www/p5-Apache-AddHostPath/Makefile
+++ b/www/p5-Apache-AddHostPath/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl interface for transforming a requested URI based on host/port
+
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-Apache-AddHostPath/pkg-comment b/www/p5-Apache-AddHostPath/pkg-comment
deleted file mode 100644
index 231aec3ea03e..000000000000
--- a/www/p5-Apache-AddHostPath/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface for transforming a requested URI based on host/port
diff --git a/www/p5-Apache-Archive/Makefile b/www/p5-Apache-Archive/Makefile
index 83595324afe2..bb2cb938e402 100644
--- a/www/p5-Apache-Archive/Makefile
+++ b/www/p5-Apache-Archive/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module that creates a menu to allow perusal of tarball contents
+
 BUILD_DEPENDS=	${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Apache-Archive/pkg-comment b/www/p5-Apache-Archive/pkg-comment
deleted file mode 100644
index da405b484269..000000000000
--- a/www/p5-Apache-Archive/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that creates a menu to allow perusal of tarball contents
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 7941162c4ca9..80de0d3a112d 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A perl module to provide custom forms for reauthentication
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/${APACHE_PORT}
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Apache-AuthCookie/pkg-comment b/www/p5-Apache-AuthCookie/pkg-comment
deleted file mode 100644
index cc43c2ea56d6..000000000000
--- a/www/p5-Apache-AuthCookie/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module to provide custom forms for reauthentication
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index aeecbdaf0bb5..4a923e87ffbc 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl modules that implement a cookie-based authentication system
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/AuthCookie.pm:${PORTSDIR}/www/p5-Apache-AuthCookie \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
diff --git a/www/p5-Apache-AuthTicket/pkg-comment b/www/p5-Apache-AuthTicket/pkg-comment
deleted file mode 100644
index 97309e74d496..000000000000
--- a/www/p5-Apache-AuthTicket/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules that implement a cookie-based authentication system
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 9ada4e0055d6..1b03293a209b 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module that implements authentication caching
+
 BUILD_DEPENDS=	${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Apache-AuthenCache/pkg-comment b/www/p5-Apache-AuthenCache/pkg-comment
deleted file mode 100644
index 8dfd8bf37531..000000000000
--- a/www/p5-Apache-AuthenCache/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that implements authentication caching
diff --git a/www/p5-Apache-AuthenURL/Makefile b/www/p5-Apache-AuthenURL/Makefile
index af9d855b7ea3..80591578da82 100644
--- a/www/p5-Apache-AuthenURL/Makefile
+++ b/www/p5-Apache-AuthenURL/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache/mod_perl module to handle auth against external URLs
+
 BUILD_DEPENDS=	${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/Apache/AuthenCache.pm:${PORTSDIR}/www/p5-Apache-AuthenCache
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Apache-AuthenURL/pkg-comment b/www/p5-Apache-AuthenURL/pkg-comment
deleted file mode 100644
index 807c086a90b1..000000000000
--- a/www/p5-Apache-AuthenURL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache/mod_perl module to handle auth against external URLs
diff --git a/www/p5-Apache-AutoIndex/Makefile b/www/p5-Apache-AutoIndex/Makefile
index 13bbd91557b9..d3f5a75a69eb 100644
--- a/www/p5-Apache-AutoIndex/Makefile
+++ b/www/p5-Apache-AutoIndex/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A perl module that can completely replace mod_dir and mod_autoindex
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Language.pm:${PORTSDIR}/www/p5-Apache-Language \
diff --git a/www/p5-Apache-AutoIndex/pkg-comment b/www/p5-Apache-AutoIndex/pkg-comment
deleted file mode 100644
index a9e994c369c7..000000000000
--- a/www/p5-Apache-AutoIndex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module that can completely replace mod_dir and mod_autoindex
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 18559e60c4ae..9ed4aa03b4c4 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	Perl module to alter the output of previous handlers
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Apache-Filter/pkg-comment b/www/p5-Apache-Filter/pkg-comment
deleted file mode 100644
index 4f0a4bd18e89..000000000000
--- a/www/p5-Apache-Filter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to alter the output of previous handlers
diff --git a/www/p5-Apache-Icon/Makefile b/www/p5-Apache-Icon/Makefile
index aac0e49ab917..e77c3f84c250 100644
--- a/www/p5-Apache-Icon/Makefile
+++ b/www/p5-Apache-Icon/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A perl module that provides an interface for looking up icon images
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-Apache-Icon/pkg-comment b/www/p5-Apache-Icon/pkg-comment
deleted file mode 100644
index bc80ab768b81..000000000000
--- a/www/p5-Apache-Icon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module that provides an interface for looking up icon images
diff --git a/www/p5-Apache-Language/Makefile b/www/p5-Apache-Language/Makefile
index 29994dab70fd..922e7821a8ac 100644
--- a/www/p5-Apache-Language/Makefile
+++ b/www/p5-Apache-Language/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A perl module that provides language-aware object hashes
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
 
diff --git a/www/p5-Apache-Language/pkg-comment b/www/p5-Apache-Language/pkg-comment
deleted file mode 100644
index 8f229e809829..000000000000
--- a/www/p5-Apache-Language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module that provides language-aware object hashes
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index f6e72f7e7ae9..b0da7cb3cfb9 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache::SSI - Implement Server Side Includes in Perl
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-Apache-SSI/pkg-comment b/www/p5-Apache-SSI/pkg-comment
deleted file mode 100644
index c6eafaaa1dfd..000000000000
--- a/www/p5-Apache-SSI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache::SSI - Implement Server Side Includes in Perl
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index 8378044cea06..92ae85d48618 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -15,6 +15,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Apache::Session extension that store session in shared memory
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IPC/Cache.pm:${PORTSDIR}/devel/p5-IPC-Cache \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Apache-Session-SharedMem/pkg-comment b/www/p5-Apache-Session-SharedMem/pkg-comment
deleted file mode 100644
index 1ac87611063a..000000000000
--- a/www/p5-Apache-Session-SharedMem/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache::Session extension that store session in shared memory
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index dc0837526040..943da8d5e814 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module implementing a cgi interface to String::Checker
+
 BUILD_DEPENDS=	${SITE_PERL}/String/Checker.pm:${PORTSDIR}/devel/p5-String-Checker
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-CGI-ArgChecker/pkg-comment b/www/p5-CGI-ArgChecker/pkg-comment
deleted file mode 100644
index 57a05f2510a0..000000000000
--- a/www/p5-CGI-ArgChecker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module implementing a cgi interface to String::Checker
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 1e074de629f5..cb11de060eee 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module for manage templates and parses templates
+
 PERL_CONFIGURE=	yes
 
 MAN3=		CGI::FastTemplate.3
diff --git a/www/p5-CGI-FastTemplate/pkg-comment b/www/p5-CGI-FastTemplate/pkg-comment
deleted file mode 100644
index 7d9926e84bcd..000000000000
--- a/www/p5-CGI-FastTemplate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for manage templates and parses templates
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index dabc50732b37..41c7c20b4fbe 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Extremely lightweight CGI processing package
+
 PERL_CONFIGURE=	yes
 
 MAN3=		CGI::Minimal.3
diff --git a/www/p5-CGI-Minimal/pkg-comment b/www/p5-CGI-Minimal/pkg-comment
deleted file mode 100644
index 1adb33af887d..000000000000
--- a/www/p5-CGI-Minimal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extremely lightweight CGI processing package
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 8e1e2ffb9b53..484ccd0a19e1 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Modules for perl5, for use in writing CGI scripts
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-CGI-modules/pkg-comment b/www/p5-CGI-modules/pkg-comment
deleted file mode 100644
index 47578df5dc15..000000000000
--- a/www/p5-CGI-modules/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules for perl5, for use in writing CGI scripts
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 07ade357aca0..15da042e8343 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl5 module to process and decode WWW form information
+
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-CGI_Lite/pkg-comment b/www/p5-CGI_Lite/pkg-comment
deleted file mode 100644
index 018e5c5de6e5..000000000000
--- a/www/p5-CGI_Lite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to process and decode WWW form information
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index 6f00721429a3..f020718f7bce 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	Cleans up HTML code for web browsers, not humans
+
 PERL_CONFIGURE=	yes
 
 MAN1=		htmlclean.1
diff --git a/www/p5-HTML-Clean/pkg-comment b/www/p5-HTML-Clean/pkg-comment
deleted file mode 100644
index bb0ede031add..000000000000
--- a/www/p5-HTML-Clean/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cleans up HTML code for web browsers, not humans
diff --git a/www/p5-HTML-Navigation/Makefile b/www/p5-HTML-Navigation/Makefile
index 1dfeac67b8fc..85e677305c68 100644
--- a/www/p5-HTML-Navigation/Makefile
+++ b/www/p5-HTML-Navigation/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module for creating generic HTML navigation bars
+
 BUILD_DEPENDS=	${SITE_PERL}/CGI/Base.pm:${PORTSDIR}/www/p5-CGI-modules \
 		${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-HTML-Navigation/pkg-comment b/www/p5-HTML-Navigation/pkg-comment
deleted file mode 100644
index 64fcaa100c99..000000000000
--- a/www/p5-HTML-Navigation/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for creating generic HTML navigation bars
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index d4a7ccbf6fa8..b5ecd86a4845 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl module for handling CGI HTML paging of arbitrary data
+
 BUILD_DEPENDS=	${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-HTML-Pager/pkg-comment b/www/p5-HTML-Pager/pkg-comment
deleted file mode 100644
index 18f95980900d..000000000000
--- a/www/p5-HTML-Pager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for handling CGI HTML paging of arbitrary data
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index 7f5410fc6f59..c3051f6a21e2 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A simple and fast HTML syntax checking package for perl 4 and perl 5
+
 PERL_CONFIGURE=	yes
 
 MAN3=		HTML::QuickCheck.3
diff --git a/www/p5-HTML-QuickCheck/pkg-comment b/www/p5-HTML-QuickCheck/pkg-comment
deleted file mode 100644
index c991a732d6bd..000000000000
--- a/www/p5-HTML-QuickCheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple and fast HTML syntax checking package for perl 4 and perl 5
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index 4ebb34a29f6e..53ab172cbc1c 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	HTML::SimpleParse - a bare-bones HTML parser
+
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/www/p5-HTML-SimpleParse/pkg-comment b/www/p5-HTML-SimpleParse/pkg-comment
deleted file mode 100644
index 31c2e12944e1..000000000000
--- a/www/p5-HTML-SimpleParse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML::SimpleParse - a bare-bones HTML parser
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 50baaee5d071..0768f5700ccc 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.ORG
 
+PORTCOMMENT=	Some useful data table in parsing HTML
+
 PERL_CONFIGURE=	yes
 
 MAN3=		HTML::Tagset.3
diff --git a/www/p5-HTML-Tagset/pkg-comment b/www/p5-HTML-Tagset/pkg-comment
deleted file mode 100644
index 716b5f303407..000000000000
--- a/www/p5-HTML-Tagset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Some useful data table in parsing HTML
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index ea3050f28d23..f3bc1d4ef6db 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl5 module for writing HTML documents
+
 USE_PERL5=	yes
 
 NO_WRKSUBDIR=	yes
diff --git a/www/p5-HTML/pkg-comment b/www/p5-HTML/pkg-comment
deleted file mode 100644
index a8508552fc3a..000000000000
--- a/www/p5-HTML/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for writing HTML documents
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index bf2cc8a9e9e0..82d29cfa3827 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl5 module for a HTTP server authentication class
+
 PERL_CONFIGURE=	yes
 
 MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
diff --git a/www/p5-HTTPD-Tools/pkg-comment b/www/p5-HTTPD-Tools/pkg-comment
deleted file mode 100644
index e676cafa07f6..000000000000
--- a/www/p5-HTTPD-Tools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for a HTTP server authentication class
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index bf2cc8a9e9e0..82d29cfa3827 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl5 module for a HTTP server authentication class
+
 PERL_CONFIGURE=	yes
 
 MAN3=		HTTPD::Authen.3 HTTPD::UserAdmin.3 HTTPD::GroupAdmin.3
diff --git a/www/p5-HTTPD-User-Manage/pkg-comment b/www/p5-HTTPD-User-Manage/pkg-comment
deleted file mode 100644
index e676cafa07f6..000000000000
--- a/www/p5-HTTPD-User-Manage/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for a HTTP server authentication class
diff --git a/www/p5-WWW-Robot/Makefile b/www/p5-WWW-Robot/Makefile
index d368028860b0..79b271e123e9 100644
--- a/www/p5-WWW-Robot/Makefile
+++ b/www/p5-WWW-Robot/Makefile
@@ -14,6 +14,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Perl interface to a generic web traversal engine
+
 BUILD_DEPENDS=	${SITE_PERL}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
diff --git a/www/p5-WWW-Robot/pkg-comment b/www/p5-WWW-Robot/pkg-comment
deleted file mode 100644
index 63523d2c9e41..000000000000
--- a/www/p5-WWW-Robot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to a generic web traversal engine
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index 03d5002b077f..0edfe6ea8487 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -15,6 +15,8 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Servlet API for Perl
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
diff --git a/www/p5-libservlet/pkg-comment b/www/p5-libservlet/pkg-comment
deleted file mode 100644
index de82606a3040..000000000000
--- a/www/p5-libservlet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Servlet API for Perl
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 6fe8162d7b45..e0ef574c73f6 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A GUI-based HTML Editor for GTK+/GNOME
+
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/www/peacock/pkg-comment b/www/peacock/pkg-comment
deleted file mode 100644
index 580f3da71f42..000000000000
--- a/www/peacock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI-based HTML Editor for GTK+/GNOME
diff --git a/www/phpnuke/Makefile b/www/phpnuke/Makefile
index 98b3d6fba3f2..383ca3cc6822 100644
--- a/www/phpnuke/Makefile
+++ b/www/phpnuke/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	PHP-Nuke-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An automated website package to distribute and manage content
+
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 .if defined(WITH_PHP3)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
diff --git a/www/phpnuke/pkg-comment b/www/phpnuke/pkg-comment
deleted file mode 100644
index 7a9af92c432b..000000000000
--- a/www/phpnuke/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automated website package to distribute and manage content
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 6ccce245705e..81554ff3b2d2 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -13,6 +13,8 @@ DISTNAME=		HTMLgen
 
 MAINTAINER=		ports@FreeBSD.org
 
+PORTCOMMENT=		A Python library for the generation of HTML documents
+
 USE_PYTHON=		yes
 
 WRKSRC=			${WRKDIR}/HTMLgen
diff --git a/www/py-HTMLgen/pkg-comment b/www/py-HTMLgen/pkg-comment
deleted file mode 100644
index f61cdd47ffb9..000000000000
--- a/www/py-HTMLgen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python library for the generation of HTML documents
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index be739c69271e..53c43dbf84b7 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -15,6 +15,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An interactive, multi-threaded web browser for text terminals
+
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
diff --git a/www/retawq/pkg-comment b/www/retawq/pkg-comment
deleted file mode 100644
index f8790b123f1a..000000000000
--- a/www/retawq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interactive, multi-threaded web browser for text terminals
diff --git a/www/sqmgrlog/Makefile b/www/sqmgrlog/Makefile
index 1b33dc60b54b..97da23cd8c1a 100644
--- a/www/sqmgrlog/Makefile
+++ b/www/sqmgrlog/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://web.onda.com.br/orso/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Squid log analyzer and HTML report generator
+
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-prefix=${PREFIX} --with-gcc
diff --git a/www/sqmgrlog/pkg-comment b/www/sqmgrlog/pkg-comment
deleted file mode 100644
index 20a60e1f7ace..000000000000
--- a/www/sqmgrlog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Squid log analyzer and HTML report generator
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 97a49c3eb886..e4a03c6739e3 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Command line interface to popular WWW search engines
+
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/www/surfraw/pkg-comment b/www/surfraw/pkg-comment
deleted file mode 100644
index 70ad1f4df472..000000000000
--- a/www/surfraw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command line interface to popular WWW search engines
diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 53a16e7339d3..e95f86e1818e 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://homepage.mac.com/pauljlucas/software/
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Simple Web Indexing System for Humans: C++ version
+
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
 USE_PERL5=	yes
diff --git a/www/swish++/pkg-comment b/www/swish++/pkg-comment
deleted file mode 100644
index a14855f4e1d1..000000000000
--- a/www/swish++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple Web Indexing System for Humans: C++ version
diff --git a/www/thumbnail_index/Makefile b/www/thumbnail_index/Makefile
index 6914cd47299d..3369404cb496 100644
--- a/www/thumbnail_index/Makefile
+++ b/www/thumbnail_index/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}_10aug1998
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	Make an HTML index file for a bunch of images
+
 RUN_DEPENDS=	djpeg:${PORTSDIR}/graphics/jpeg \
 		pnmscale:${PORTSDIR}/graphics/netpbm
 
diff --git a/www/thumbnail_index/pkg-comment b/www/thumbnail_index/pkg-comment
deleted file mode 100644
index 7fdfa15ace23..000000000000
--- a/www/thumbnail_index/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Make an HTML index file for a bunch of images
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 48cfa98c4156..1c4932da591d 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	ftp://ftp.w3.org/pub/httpd/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	WWW server from the W3 Consortium (W3C)
+
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/net/wais:build
 
 NO_WRKSUBDIR=	yes
diff --git a/www/w3c-httpd/pkg-comment b/www/w3c-httpd/pkg-comment
deleted file mode 100644
index 5d0cb7375c1e..000000000000
--- a/www/w3c-httpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW server from the W3 Consortium (W3C)
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index 5cf536deea08..e5072ac1959f 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	steve
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A Web Mirroring Program
+
 NO_PACKAGE=	"This program cannot be distributed if modified in any way"
 NO_CDROM=	"Don't sell for profit without written permission"
 ALL_TARGET=
diff --git a/www/webcopy/pkg-comment b/www/webcopy/pkg-comment
deleted file mode 100644
index f75209c13fba..000000000000
--- a/www/webcopy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Web Mirroring Program
diff --git a/www/webglimpse/Makefile b/www/webglimpse/Makefile
index 9769470252cd..ac7be51d25d3 100644
--- a/www/webglimpse/Makefile
+++ b/www/webglimpse/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PKGNAME}.src
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	WWW interface to Glimpse search engine
+
 RUN_DEPENDS+=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13
 RUN_DEPENDS+=	glimpse:${PORTSDIR}/textproc/glimpse
 
diff --git a/www/webglimpse/pkg-comment b/www/webglimpse/pkg-comment
deleted file mode 100644
index 5bb033fe4eba..000000000000
--- a/www/webglimpse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW interface to Glimpse search engine
diff --git a/www/wn/Makefile b/www/wn/Makefile
index 105aaee723a8..a1762d04b1e7 100644
--- a/www/wn/Makefile
+++ b/www/wn/Makefile
@@ -13,6 +13,8 @@ MASTER_SITE_SUBDIR=	trevor
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	A great http server
+
 FORBIDDEN=	"Remotely exploitable buffer overflow."
 
 IS_INTERACTIVE=
diff --git a/www/wn/pkg-comment b/www/wn/pkg-comment
deleted file mode 100644
index 1230fb19efc7..000000000000
--- a/www/wn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A great http server
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index a4973c9d6406..04e1c44fbced 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@freebsd.org
 
+PORTCOMMENT=	Access counter, clock and date for WWW pages
+
 GNU_CONFIGURE=	yes
 IS_INTERACTIVE=	yes
 USE_GMAKE=	yes
diff --git a/www/wwwcount/pkg-comment b/www/wwwcount/pkg-comment
deleted file mode 100644
index 401523383b49..000000000000
--- a/www/wwwcount/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Access counter, clock and date for WWW pages
diff --git a/www/xist/Makefile b/www/xist/Makefile
index 9e90a689007c..6ebe750eea98 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	XIST-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	An XML-based extensible HTML generator
+
 RUN_DEPENDS=	${PYXML} \
 		${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \
 		${PYTHON_SITELIBDIR}/mx/Tidy/mxTidy/mxTidy.so:${PORTSDIR}/devel/py-mx-experimental
diff --git a/www/xist/pkg-comment b/www/xist/pkg-comment
deleted file mode 100644
index eed404fee716..000000000000
--- a/www/xist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An XML-based extensible HTML generator
diff --git a/www/xpath2rss/Makefile b/www/xpath2rss/Makefile
index d1c4fd3c2564..6abd54ba13e1 100644
--- a/www/xpath2rss/Makefile
+++ b/www/xpath2rss/Makefile
@@ -14,6 +14,8 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+PORTCOMMENT=	HTML to RSS converter
+
 RUN_DEPENDS=	${PYXML}
 
 USE_PYTHON=	yes
diff --git a/www/xpath2rss/pkg-comment b/www/xpath2rss/pkg-comment
deleted file mode 100644
index 9251ecb66142..000000000000
--- a/www/xpath2rss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML to RSS converter
-- 
cgit debian/1.2.3+git2.25.1-1-2-gaceb0