From e173f6c3ea86b9ad956712cde81488b3932fb586 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Fri, 21 Feb 2003 14:08:24 +0000
Subject: De-pkg-comment.

---
 www/abcache/Makefile                        | 1 +
 www/abcache/pkg-comment                     | 1 -
 www/adzapper/Makefile                       | 1 +
 www/adzapper/pkg-comment                    | 1 -
 www/aolserver/Makefile                      | 1 +
 www/aolserver/pkg-comment                   | 1 -
 www/apache-jserv/Makefile                   | 1 +
 www/apache-jserv/pkg-comment                | 1 -
 www/apache13-fp/Makefile                    | 1 +
 www/apache13-fp/pkg-comment                 | 1 -
 www/asp2php/Makefile                        | 1 +
 www/asp2php/pkg-comment                     | 1 -
 www/aswedit/Makefile                        | 1 +
 www/aswedit/pkg-comment                     | 1 -
 www/awstats-devel/Makefile                  | 1 +
 www/awstats-devel/pkg-comment               | 1 -
 www/awstats/Makefile                        | 1 +
 www/awstats/pkg-comment                     | 1 -
 www/bacon/Makefile                          | 1 +
 www/bacon/pkg-comment                       | 1 -
 www/bmsync/Makefile                         | 1 +
 www/bmsync/pkg-comment                      | 1 -
 www/boa/Makefile                            | 1 +
 www/boa/pkg-comment                         | 1 -
 www/bozohttpd/Makefile                      | 1 +
 www/bozohttpd/pkg-comment                   | 1 -
 www/caudium/Makefile                        | 1 +
 www/caudium/pkg-comment                     | 1 -
 www/caudium10/Makefile                      | 1 +
 www/caudium10/pkg-comment                   | 1 -
 www/cgi-lib/Makefile                        | 1 +
 www/cgi-lib/pkg-comment                     | 1 -
 www/cgiwrap/Makefile                        | 1 +
 www/cgiwrap/pkg-comment                     | 1 -
 www/chimera2/Makefile                       | 1 +
 www/chimera2/pkg-comment                    | 1 -
 www/chtml/Makefile                          | 1 +
 www/chtml/pkg-comment                       | 1 -
 www/dansguardian-devel/Makefile             | 1 +
 www/dansguardian-devel/pkg-comment          | 1 -
 www/dansguardian/Makefile                   | 1 +
 www/dansguardian/pkg-comment                | 1 -
 www/dhttpd/Makefile                         | 1 +
 www/dhttpd/pkg-comment                      | 1 -
 www/eddie/Makefile                          | 1 +
 www/eddie/pkg-comment                       | 1 -
 www/eldav.el/Makefile                       | 1 +
 www/eldav.el/pkg-comment                    | 1 -
 www/elinks/Makefile                         | 1 +
 www/elinks/pkg-comment                      | 1 -
 www/flashplugin-mozilla/Makefile            | 1 +
 www/flashplugin-mozilla/pkg-comment         | 1 -
 www/g-gcl/Makefile                          | 1 +
 www/g-gcl/pkg-comment                       | 1 -
 www/gallery/Makefile                        | 1 +
 www/gallery/pkg-comment                     | 1 -
 www/gallery2/Makefile                       | 1 +
 www/gallery2/pkg-comment                    | 1 -
 www/gallery3/Makefile                       | 1 +
 www/gallery3/pkg-comment                    | 1 -
 www/geeklog/Makefile                        | 1 +
 www/geeklog/pkg-comment                     | 1 -
 www/gnuinfo/Makefile                        | 1 +
 www/gnuinfo/pkg-comment                     | 1 -
 www/gnujsp/Makefile                         | 1 +
 www/gnujsp/pkg-comment                      | 1 -
 www/guile-www/Makefile                      | 1 +
 www/guile-www/pkg-comment                   | 1 -
 www/horde-base/Makefile                     | 1 +
 www/horde-base/pkg-comment                  | 1 -
 www/horde/Makefile                          | 1 +
 www/horde/pkg-comment                       | 1 -
 www/horde2/Makefile                         | 1 +
 www/horde2/pkg-comment                      | 1 -
 www/horde4-base/Makefile                    | 1 +
 www/horde4-base/pkg-comment                 | 1 -
 www/hotjava/Makefile                        | 1 +
 www/hotjava/pkg-comment                     | 1 -
 www/http-analyze/Makefile                   | 1 +
 www/http-analyze/pkg-comment                | 1 -
 www/http_load/Makefile                      | 1 +
 www/http_load/pkg-comment                   | 1 -
 www/httpgrabber/Makefile                    | 1 +
 www/httpgrabber/pkg-comment                 | 1 -
 www/indexme/Makefile                        | 1 +
 www/indexme/pkg-comment                     | 1 -
 www/jdresolve/Makefile                      | 1 +
 www/jdresolve/pkg-comment                   | 1 -
 www/jesred/Makefile                         | 1 +
 www/jesred/pkg-comment                      | 1 -
 www/jonah/Makefile                          | 1 +
 www/jonah/pkg-comment                       | 1 -
 www/larbin/Makefile                         | 1 +
 www/larbin/pkg-comment                      | 1 -
 www/linux-firefox/Makefile                  | 1 +
 www/linux-firefox/pkg-comment               | 1 -
 www/linux-mozillafirebird/Makefile          | 1 +
 www/linux-mozillafirebird/pkg-comment       | 1 -
 www/linux-phoenix/Makefile                  | 1 +
 www/linux-phoenix/pkg-comment               | 1 -
 www/logtools/Makefile                       | 1 +
 www/logtools/pkg-comment                    | 1 -
 www/micro_httpd/Makefile                    | 1 +
 www/micro_httpd/pkg-comment                 | 1 -
 www/mod_auth_pwcheck/Makefile               | 1 +
 www/mod_auth_pwcheck/pkg-comment            | 1 -
 www/mod_bunzip2/Makefile                    | 1 +
 www/mod_bunzip2/pkg-comment                 | 1 -
 www/mod_csacek/Makefile                     | 1 +
 www/mod_csacek/pkg-comment                  | 1 -
 www/mod_dav/Makefile                        | 1 +
 www/mod_dav/pkg-comment                     | 1 -
 www/mod_fastcgi/Makefile                    | 1 +
 www/mod_fastcgi/pkg-comment                 | 1 -
 www/mod_filter/Makefile                     | 1 +
 www/mod_filter/pkg-comment                  | 1 -
 www/mod_gzip/Makefile                       | 1 +
 www/mod_gzip/pkg-comment                    | 1 -
 www/mod_gzip2/Makefile                      | 1 +
 www/mod_gzip2/pkg-comment                   | 1 -
 www/mod_layout/Makefile                     | 1 +
 www/mod_layout/pkg-comment                  | 1 -
 www/mod_log_mysql/Makefile                  | 1 +
 www/mod_log_mysql/pkg-comment               | 1 -
 www/mod_log_sql/Makefile                    | 1 +
 www/mod_log_sql/pkg-comment                 | 1 -
 www/mod_perl2/Makefile                      | 1 +
 www/mod_perl2/pkg-comment                   | 1 -
 www/mod_roaming2/Makefile                   | 1 +
 www/mod_roaming2/pkg-comment                | 1 -
 www/mod_trigger/Makefile                    | 1 +
 www/mod_trigger/pkg-comment                 | 1 -
 www/mod_tsunami/Makefile                    | 1 +
 www/mod_tsunami/pkg-comment                 | 1 -
 www/mod_v2h/Makefile                        | 1 +
 www/mod_v2h/pkg-comment                     | 1 -
 www/mod_webapp-apache2/Makefile             | 1 +
 www/mod_webapp-apache2/pkg-comment          | 1 -
 www/nd/Makefile                             | 1 +
 www/nd/pkg-comment                          | 1 -
 www/neon/Makefile                           | 1 +
 www/neon/pkg-comment                        | 1 -
 www/neon26/Makefile                         | 1 +
 www/neon26/pkg-comment                      | 1 -
 www/neon28/Makefile                         | 1 +
 www/neon28/pkg-comment                      | 1 -
 www/neon29/Makefile                         | 1 +
 www/neon29/pkg-comment                      | 1 -
 www/notftp/Makefile                         | 1 +
 www/notftp/pkg-comment                      | 1 -
 www/npc/Makefile                            | 1 +
 www/npc/pkg-comment                         | 1 -
 www/p5-Apache-AntiSpam/Makefile             | 1 +
 www/p5-Apache-AntiSpam/pkg-comment          | 1 -
 www/p5-Apache-ConfigFile/Makefile           | 1 +
 www/p5-Apache-ConfigFile/pkg-comment        | 1 -
 www/p5-Apache-MP3/Makefile                  | 1 +
 www/p5-Apache-MP3/pkg-comment               | 1 -
 www/p5-Apache-NNTPGateway/Makefile          | 1 +
 www/p5-Apache-NNTPGateway/pkg-comment       | 1 -
 www/p5-Apache-PageKit/Makefile              | 1 +
 www/p5-Apache-PageKit/pkg-comment           | 1 -
 www/p5-Apache-Peek/Makefile                 | 1 +
 www/p5-Apache-Peek/pkg-comment              | 1 -
 www/p5-Apache-Session/Makefile              | 1 +
 www/p5-Apache-Session/pkg-comment           | 1 -
 www/p5-Apache-SubProcess/Makefile           | 1 +
 www/p5-Apache-SubProcess/pkg-comment        | 1 -
 www/p5-ApacheBench/Makefile                 | 1 +
 www/p5-ApacheBench/pkg-comment              | 1 -
 www/p5-AxKit-XSP-Cookie/Makefile            | 1 +
 www/p5-AxKit-XSP-Cookie/pkg-comment         | 1 -
 www/p5-AxKit-XSP-ESQL/Makefile              | 1 +
 www/p5-AxKit-XSP-ESQL/pkg-comment           | 1 -
 www/p5-AxKit-XSP-Exception/Makefile         | 1 +
 www/p5-AxKit-XSP-Exception/pkg-comment      | 1 -
 www/p5-AxKit-XSP-IfParam/Makefile           | 1 +
 www/p5-AxKit-XSP-IfParam/pkg-comment        | 1 -
 www/p5-AxKit-XSP-Param/Makefile             | 1 +
 www/p5-AxKit-XSP-Param/pkg-comment          | 1 -
 www/p5-AxKit-XSP-PerForm/Makefile           | 1 +
 www/p5-AxKit-XSP-PerForm/pkg-comment        | 1 -
 www/p5-AxKit-XSP-Sendmail/Makefile          | 1 +
 www/p5-AxKit-XSP-Sendmail/pkg-comment       | 1 -
 www/p5-AxKit-XSP-Util/Makefile              | 1 +
 www/p5-AxKit-XSP-Util/pkg-comment           | 1 -
 www/p5-AxKit-XSP-WebUtils/Makefile          | 1 +
 www/p5-AxKit-XSP-WebUtils/pkg-comment       | 1 -
 www/p5-AxKit/Makefile                       | 1 +
 www/p5-AxKit/pkg-comment                    | 1 -
 www/p5-Bundle-Slash/Makefile                | 1 +
 www/p5-Bundle-Slash/pkg-comment             | 1 -
 www/p5-CGI-Session/Makefile                 | 1 +
 www/p5-CGI-Session/pkg-comment              | 1 -
 www/p5-CGI-SpeedyCGI/Makefile               | 1 +
 www/p5-CGI-SpeedyCGI/pkg-comment            | 1 -
 www/p5-FAQ-OMatic/Makefile                  | 1 +
 www/p5-FAQ-OMatic/pkg-comment               | 1 -
 www/p5-HTML-CalendarMonthSimple/Makefile    | 1 +
 www/p5-HTML-CalendarMonthSimple/pkg-comment | 1 -
 www/p5-HTML-Embperl/Makefile                | 1 +
 www/p5-HTML-Embperl/pkg-comment             | 1 -
 www/p5-HTML-FillInForm/Makefile             | 1 +
 www/p5-HTML-FillInForm/pkg-comment          | 1 -
 www/p5-HTML-FromText/Makefile               | 1 +
 www/p5-HTML-FromText/pkg-comment            | 1 -
 www/p5-HTML-Mason/Makefile                  | 1 +
 www/p5-HTML-Mason/pkg-comment               | 1 -
 www/p5-HTML-StickyQuery/Makefile            | 1 +
 www/p5-HTML-StickyQuery/pkg-comment         | 1 -
 www/p5-HTML-Stream/Makefile                 | 1 +
 www/p5-HTML-Stream/pkg-comment              | 1 -
 www/p5-HTML-TableExtract/Makefile           | 1 +
 www/p5-HTML-TableExtract/pkg-comment        | 1 -
 www/p5-WWW-Babelfish/Makefile               | 1 +
 www/p5-WWW-Babelfish/pkg-comment            | 1 -
 www/p5-WWW-IMDb/Makefile                    | 1 +
 www/p5-WWW-IMDb/pkg-comment                 | 1 -
 www/p5-WWW-Link/Makefile                    | 1 +
 www/p5-WWW-Link/pkg-comment                 | 1 -
 www/p5-WWW-Search-AltaVista/Makefile        | 1 +
 www/p5-WWW-Search-AltaVista/pkg-comment     | 1 -
 www/p5-WWW-Search-Google/Makefile           | 1 +
 www/p5-WWW-Search-Google/pkg-comment        | 1 -
 www/p5-WWW-Search/Makefile                  | 1 +
 www/p5-WWW-Search/pkg-comment               | 1 -
 www/php-dyn/Makefile                        | 1 +
 www/php-dyn/pkg-comment                     | 1 -
 www/php-screw/Makefile                      | 1 +
 www/php-screw/pkg-comment                   | 1 -
 www/php-templates/Makefile                  | 1 +
 www/php-templates/pkg-comment               | 1 -
 www/phpSysInfo/Makefile                     | 1 +
 www/phpSysInfo/pkg-comment                  | 1 -
 www/phpsysinfo-dev/Makefile                 | 1 +
 www/phpsysinfo-dev/pkg-comment              | 1 -
 www/phpsysinfo/Makefile                     | 1 +
 www/phpsysinfo/pkg-comment                  | 1 -
 www/plugger/Makefile                        | 1 +
 www/plugger/pkg-comment                     | 1 -
 www/postnuke/Makefile                       | 1 +
 www/postnuke/pkg-comment                    | 1 -
 www/privoxy+ipv6/Makefile                   | 1 +
 www/privoxy+ipv6/pkg-comment                | 1 -
 www/privoxy/Makefile                        | 1 +
 www/privoxy/pkg-comment                     | 1 -
 www/py-albatross/Makefile                   | 1 +
 www/py-albatross/pkg-comment                | 1 -
 www/py-fcgi/Makefile                        | 1 +
 www/py-fcgi/pkg-comment                     | 1 -
 www/pyweblib/Makefile                       | 1 +
 www/pyweblib/pkg-comment                    | 1 -
 www/reportmagic/Makefile                    | 1 +
 www/reportmagic/pkg-comment                 | 1 -
 www/roxen/Makefile                          | 1 +
 www/roxen/pkg-comment                       | 1 -
 www/ruboard/Makefile                        | 1 +
 www/ruboard/pkg-comment                     | 1 -
 www/scout/Makefile                          | 1 +
 www/scout/pkg-comment                       | 1 -
 www/sidplug/Makefile                        | 1 +
 www/sidplug/pkg-comment                     | 1 -
 www/slash/Makefile                          | 1 +
 www/slash/pkg-comment                       | 1 -
 www/smb2www/Makefile                        | 1 +
 www/smb2www/pkg-comment                     | 1 -
 www/squidguard/Makefile                     | 1 +
 www/squidguard/pkg-comment                  | 1 -
 www/squidpurge/Makefile                     | 1 +
 www/squidpurge/pkg-comment                  | 1 -
 www/ssserver/Makefile                       | 1 +
 www/ssserver/pkg-comment                    | 1 -
 www/swish-e/Makefile                        | 1 +
 www/swish-e/pkg-comment                     | 1 -
 www/tidy/Makefile                           | 1 +
 www/tidy/pkg-comment                        | 1 -
 www/tinyproxy/Makefile                      | 1 +
 www/tinyproxy/pkg-comment                   | 1 -
 www/twhttpd/Makefile                        | 1 +
 www/twhttpd/pkg-comment                     | 1 -
 www/ump/Makefile                            | 1 +
 www/ump/pkg-comment                         | 1 -
 www/waccess/Makefile                        | 1 +
 www/waccess/pkg-comment                     | 1 -
 www/web2ldap/Makefile                       | 1 +
 www/web2ldap/pkg-comment                    | 1 -
 www/web500gw/Makefile                       | 1 +
 www/web500gw/pkg-comment                    | 1 -
 www/webcheck/Makefile                       | 1 +
 www/webcheck/pkg-comment                    | 1 -
 www/webredirect/Makefile                    | 1 +
 www/webredirect/pkg-comment                 | 1 -
 www/webresolve/Makefile                     | 1 +
 www/webresolve/pkg-comment                  | 1 -
 www/webstone-ssl/Makefile                   | 1 +
 www/webstone-ssl/pkg-comment                | 1 -
 www/webstone/Makefile                       | 1 +
 www/webstone/pkg-comment                    | 1 -
 www/wml/Makefile                            | 1 +
 www/wml/pkg-comment                         | 1 -
 www/wmnetselect/Makefile                    | 1 +
 www/wmnetselect/pkg-comment                 | 1 -
 www/www6to4/Makefile                        | 1 +
 www/www6to4/pkg-comment                     | 1 -
 www/wyvern/Makefile                         | 1 +
 www/wyvern/pkg-comment                      | 1 -
 www/xitami/Makefile                         | 1 +
 www/xitami/pkg-comment                      | 1 -
 www/xswallow/Makefile                       | 1 +
 www/xswallow/pkg-comment                    | 1 -
 x11-clocks/emiclock/Makefile                | 1 +
 x11-clocks/emiclock/pkg-comment             | 1 -
 x11-clocks/glclock/Makefile                 | 1 +
 x11-clocks/glclock/pkg-comment              | 1 -
 x11-clocks/mouseclock/Makefile              | 1 +
 x11-clocks/mouseclock/pkg-comment           | 1 -
 x11-clocks/tclock/Makefile                  | 1 +
 x11-clocks/tclock/pkg-comment               | 1 -
 x11-clocks/wmclock/Makefile                 | 1 +
 x11-clocks/wmclock/pkg-comment              | 1 -
 x11-clocks/wmtime/Makefile                  | 1 +
 x11-clocks/wmtime/pkg-comment               | 1 -
 x11-clocks/xalarm/Makefile                  | 1 +
 x11-clocks/xalarm/pkg-comment               | 1 -
 x11-clocks/xmms-alarm/Makefile              | 1 +
 x11-clocks/xmms-alarm/pkg-comment           | 1 -
 x11-clocks/xtimer/Makefile                  | 1 +
 x11-clocks/xtimer/pkg-comment               | 1 -
 x11-clocks/zclock/Makefile                  | 1 +
 x11-clocks/zclock/pkg-comment               | 1 -
 x11-fm/apotheke/Makefile                    | 1 +
 x11-fm/apotheke/pkg-comment                 | 1 -
 x11-fm/asfiles/Makefile                     | 1 +
 x11-fm/asfiles/pkg-comment                  | 1 -
 x11-fm/file_menu_applet/Makefile            | 1 +
 x11-fm/file_menu_applet/pkg-comment         | 1 -
 x11-fm/gnome-commander/Makefile             | 1 +
 x11-fm/gnome-commander/pkg-comment          | 1 -
 x11-fm/gnome-commander2/Makefile            | 1 +
 x11-fm/gnome-commander2/pkg-comment         | 1 -
 x11-fm/jafm/Makefile                        | 1 +
 x11-fm/jafm/pkg-comment                     | 1 -
 x11-fm/offix-files/Makefile                 | 1 +
 x11-fm/offix-files/pkg-comment              | 1 -
 x11-fm/tkdesk/Makefile                      | 1 +
 x11-fm/tkdesk/pkg-comment                   | 1 -
 x11-fm/vide/Makefile                        | 1 +
 x11-fm/vide/pkg-comment                     | 1 -
 x11-fm/worker/Makefile                      | 1 +
 x11-fm/worker/pkg-comment                   | 1 -
 x11-fm/x-files/Makefile                     | 1 +
 x11-fm/x-files/pkg-comment                  | 1 -
 x11-fonts/artwiz-fonts/Makefile             | 1 +
 x11-fonts/artwiz-fonts/pkg-comment          | 1 -
 x11-fonts/bdfresize/Makefile                | 1 +
 x11-fonts/bdfresize/pkg-comment             | 1 -
 x11-fonts/gfe/Makefile                      | 1 +
 x11-fonts/gfe/pkg-comment                   | 1 -
 x11-fonts/mkbold/Makefile                   | 1 +
 x11-fonts/mkbold/pkg-comment                | 1 -
 x11-fonts/mkfontalias/Makefile              | 1 +
 x11-fonts/mkfontalias/pkg-comment           | 1 -
 x11-fonts/mkitalic/Makefile                 | 1 +
 x11-fonts/mkitalic/pkg-comment              | 1 -
 x11-fonts/mozilla-fonts/Makefile            | 1 +
 x11-fonts/mozilla-fonts/pkg-comment         | 1 -
 x11-fonts/p5-Font-TTF/Makefile              | 1 +
 x11-fonts/p5-Font-TTF/pkg-comment           | 1 -
 x11-fonts/terminus-font/Makefile            | 1 +
 x11-fonts/terminus-font/pkg-comment         | 1 -
 x11-fonts/tkfont/Makefile                   | 1 +
 x11-fonts/tkfont/pkg-comment                | 1 -
 x11-fonts/webfonts/Makefile                 | 1 +
 x11-fonts/webfonts/pkg-comment              | 1 -
 x11/accessx/Makefile                        | 1 +
 x11/accessx/pkg-comment                     | 1 -
 x11/bgrot/Makefile                          | 1 +
 x11/bgrot/pkg-comment                       | 1 -
 x11/bricons/Makefile                        | 1 +
 x11/bricons/pkg-comment                     | 1 -
 x11/deskmenu/Makefile                       | 1 +
 x11/deskmenu/pkg-comment                    | 1 -
 x11/electricsheep/Makefile                  | 1 +
 x11/electricsheep/pkg-comment               | 1 -
 x11/fspanel/Makefile                        | 1 +
 x11/fspanel/pkg-comment                     | 1 -
 x11/gmessage/Makefile                       | 1 +
 x11/gmessage/pkg-comment                    | 1 -
 x11/gnoclip/Makefile                        | 1 +
 x11/gnoclip/pkg-comment                     | 1 -
 x11/gxset/Makefile                          | 1 +
 x11/gxset/pkg-comment                       | 1 -
 x11/keylaunch/Makefile                      | 1 +
 x11/keylaunch/pkg-comment                   | 1 -
 x11/libdnd/Makefile                         | 1 +
 x11/libdnd/pkg-comment                      | 1 -
 x11/lupe/Makefile                           | 1 +
 x11/lupe/pkg-comment                        | 1 -
 x11/multi-gnome-terminal/Makefile           | 1 +
 x11/multi-gnome-terminal/pkg-comment        | 1 -
 x11/offix-clipboard/Makefile                | 1 +
 x11/offix-clipboard/pkg-comment             | 1 -
 x11/offix-execute/Makefile                  | 1 +
 x11/offix-execute/pkg-comment               | 1 -
 x11/settitle/Makefile                       | 1 +
 x11/settitle/pkg-comment                    | 1 -
 x11/temperature.app/Makefile                | 1 +
 x11/temperature.app/pkg-comment             | 1 -
 x11/wmappl/Makefile                         | 1 +
 x11/wmappl/pkg-comment                      | 1 -
 x11/wmfstatus/Makefile                      | 1 +
 x11/wmfstatus/pkg-comment                   | 1 -
 x11/wmmenu/Makefile                         | 1 +
 x11/wmmenu/pkg-comment                      | 1 -
 x11/wmoldmenu2new/Makefile                  | 1 +
 x11/wmoldmenu2new/pkg-comment               | 1 -
 x11/wterm/Makefile                          | 1 +
 x11/wterm/pkg-comment                       | 1 -
 x11/x3270/Makefile                          | 1 +
 x11/x3270/pkg-comment                       | 1 -
 x11/xaniroc/Makefile                        | 1 +
 x11/xaniroc/pkg-comment                     | 1 -
 x11/xautolock/Makefile                      | 1 +
 x11/xautolock/pkg-comment                   | 1 -
 x11/xballoon/Makefile                       | 1 +
 x11/xballoon/pkg-comment                    | 1 -
 x11/xcmd/Makefile                           | 1 +
 x11/xcmd/pkg-comment                        | 1 -
 x11/xfishtank/Makefile                      | 1 +
 x11/xfishtank/pkg-comment                   | 1 -
 x11/xkbset/Makefile                         | 1 +
 x11/xkbset/pkg-comment                      | 1 -
 x11/xkeywrap/Makefile                       | 1 +
 x11/xkeywrap/pkg-comment                    | 1 -
 x11/xmangekyou/Makefile                     | 1 +
 x11/xmangekyou/pkg-comment                  | 1 -
 x11/xmon/Makefile                           | 1 +
 x11/xmon/pkg-comment                        | 1 -
 x11/xmotd/Makefile                          | 1 +
 x11/xmotd/pkg-comment                       | 1 -
 x11/xmove/Makefile                          | 1 +
 x11/xmove/pkg-comment                       | 1 -
 x11/xmsg/Makefile                           | 1 +
 x11/xmsg/pkg-comment                        | 1 -
 x11/xmx/Makefile                            | 1 +
 x11/xmx/pkg-comment                         | 1 -
 x11/xrootconsole/Makefile                   | 1 +
 x11/xrootconsole/pkg-comment                | 1 -
 x11/xstarroll/Makefile                      | 1 +
 x11/xstarroll/pkg-comment                   | 1 -
 x11/xtacy/Makefile                          | 1 +
 x11/xtacy/pkg-comment                       | 1 -
 x11/xtermset/Makefile                       | 1 +
 x11/xtermset/pkg-comment                    | 1 -
 454 files changed, 227 insertions(+), 227 deletions(-)
 delete mode 100644 www/abcache/pkg-comment
 delete mode 100644 www/adzapper/pkg-comment
 delete mode 100644 www/aolserver/pkg-comment
 delete mode 100644 www/apache-jserv/pkg-comment
 delete mode 100644 www/apache13-fp/pkg-comment
 delete mode 100644 www/asp2php/pkg-comment
 delete mode 100644 www/aswedit/pkg-comment
 delete mode 100644 www/awstats-devel/pkg-comment
 delete mode 100644 www/awstats/pkg-comment
 delete mode 100644 www/bacon/pkg-comment
 delete mode 100644 www/bmsync/pkg-comment
 delete mode 100644 www/boa/pkg-comment
 delete mode 100644 www/bozohttpd/pkg-comment
 delete mode 100644 www/caudium/pkg-comment
 delete mode 100644 www/caudium10/pkg-comment
 delete mode 100644 www/cgi-lib/pkg-comment
 delete mode 100644 www/cgiwrap/pkg-comment
 delete mode 100644 www/chimera2/pkg-comment
 delete mode 100644 www/chtml/pkg-comment
 delete mode 100644 www/dansguardian-devel/pkg-comment
 delete mode 100644 www/dansguardian/pkg-comment
 delete mode 100644 www/dhttpd/pkg-comment
 delete mode 100644 www/eddie/pkg-comment
 delete mode 100644 www/eldav.el/pkg-comment
 delete mode 100644 www/elinks/pkg-comment
 delete mode 100644 www/flashplugin-mozilla/pkg-comment
 delete mode 100644 www/g-gcl/pkg-comment
 delete mode 100644 www/gallery/pkg-comment
 delete mode 100644 www/gallery2/pkg-comment
 delete mode 100644 www/gallery3/pkg-comment
 delete mode 100644 www/geeklog/pkg-comment
 delete mode 100644 www/gnuinfo/pkg-comment
 delete mode 100644 www/gnujsp/pkg-comment
 delete mode 100644 www/guile-www/pkg-comment
 delete mode 100644 www/horde-base/pkg-comment
 delete mode 100644 www/horde/pkg-comment
 delete mode 100644 www/horde2/pkg-comment
 delete mode 100644 www/horde4-base/pkg-comment
 delete mode 100644 www/hotjava/pkg-comment
 delete mode 100644 www/http-analyze/pkg-comment
 delete mode 100644 www/http_load/pkg-comment
 delete mode 100644 www/httpgrabber/pkg-comment
 delete mode 100644 www/indexme/pkg-comment
 delete mode 100644 www/jdresolve/pkg-comment
 delete mode 100644 www/jesred/pkg-comment
 delete mode 100644 www/jonah/pkg-comment
 delete mode 100644 www/larbin/pkg-comment
 delete mode 100644 www/linux-firefox/pkg-comment
 delete mode 100644 www/linux-mozillafirebird/pkg-comment
 delete mode 100644 www/linux-phoenix/pkg-comment
 delete mode 100644 www/logtools/pkg-comment
 delete mode 100644 www/micro_httpd/pkg-comment
 delete mode 100644 www/mod_auth_pwcheck/pkg-comment
 delete mode 100644 www/mod_bunzip2/pkg-comment
 delete mode 100644 www/mod_csacek/pkg-comment
 delete mode 100644 www/mod_dav/pkg-comment
 delete mode 100644 www/mod_fastcgi/pkg-comment
 delete mode 100644 www/mod_filter/pkg-comment
 delete mode 100644 www/mod_gzip/pkg-comment
 delete mode 100644 www/mod_gzip2/pkg-comment
 delete mode 100644 www/mod_layout/pkg-comment
 delete mode 100644 www/mod_log_mysql/pkg-comment
 delete mode 100644 www/mod_log_sql/pkg-comment
 delete mode 100644 www/mod_perl2/pkg-comment
 delete mode 100644 www/mod_roaming2/pkg-comment
 delete mode 100644 www/mod_trigger/pkg-comment
 delete mode 100644 www/mod_tsunami/pkg-comment
 delete mode 100644 www/mod_v2h/pkg-comment
 delete mode 100644 www/mod_webapp-apache2/pkg-comment
 delete mode 100644 www/nd/pkg-comment
 delete mode 100644 www/neon/pkg-comment
 delete mode 100644 www/neon26/pkg-comment
 delete mode 100644 www/neon28/pkg-comment
 delete mode 100644 www/neon29/pkg-comment
 delete mode 100644 www/notftp/pkg-comment
 delete mode 100644 www/npc/pkg-comment
 delete mode 100644 www/p5-Apache-AntiSpam/pkg-comment
 delete mode 100644 www/p5-Apache-ConfigFile/pkg-comment
 delete mode 100644 www/p5-Apache-MP3/pkg-comment
 delete mode 100644 www/p5-Apache-NNTPGateway/pkg-comment
 delete mode 100644 www/p5-Apache-PageKit/pkg-comment
 delete mode 100644 www/p5-Apache-Peek/pkg-comment
 delete mode 100644 www/p5-Apache-Session/pkg-comment
 delete mode 100644 www/p5-Apache-SubProcess/pkg-comment
 delete mode 100644 www/p5-ApacheBench/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-Cookie/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-ESQL/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-Exception/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-IfParam/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-Param/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-PerForm/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-Sendmail/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-Util/pkg-comment
 delete mode 100644 www/p5-AxKit-XSP-WebUtils/pkg-comment
 delete mode 100644 www/p5-AxKit/pkg-comment
 delete mode 100644 www/p5-Bundle-Slash/pkg-comment
 delete mode 100644 www/p5-CGI-Session/pkg-comment
 delete mode 100644 www/p5-CGI-SpeedyCGI/pkg-comment
 delete mode 100644 www/p5-FAQ-OMatic/pkg-comment
 delete mode 100644 www/p5-HTML-CalendarMonthSimple/pkg-comment
 delete mode 100644 www/p5-HTML-Embperl/pkg-comment
 delete mode 100644 www/p5-HTML-FillInForm/pkg-comment
 delete mode 100644 www/p5-HTML-FromText/pkg-comment
 delete mode 100644 www/p5-HTML-Mason/pkg-comment
 delete mode 100644 www/p5-HTML-StickyQuery/pkg-comment
 delete mode 100644 www/p5-HTML-Stream/pkg-comment
 delete mode 100644 www/p5-HTML-TableExtract/pkg-comment
 delete mode 100644 www/p5-WWW-Babelfish/pkg-comment
 delete mode 100644 www/p5-WWW-IMDb/pkg-comment
 delete mode 100644 www/p5-WWW-Link/pkg-comment
 delete mode 100644 www/p5-WWW-Search-AltaVista/pkg-comment
 delete mode 100644 www/p5-WWW-Search-Google/pkg-comment
 delete mode 100644 www/p5-WWW-Search/pkg-comment
 delete mode 100644 www/php-dyn/pkg-comment
 delete mode 100644 www/php-screw/pkg-comment
 delete mode 100644 www/php-templates/pkg-comment
 delete mode 100644 www/phpSysInfo/pkg-comment
 delete mode 100644 www/phpsysinfo-dev/pkg-comment
 delete mode 100644 www/phpsysinfo/pkg-comment
 delete mode 100644 www/plugger/pkg-comment
 delete mode 100644 www/postnuke/pkg-comment
 delete mode 100644 www/privoxy+ipv6/pkg-comment
 delete mode 100644 www/privoxy/pkg-comment
 delete mode 100644 www/py-albatross/pkg-comment
 delete mode 100644 www/py-fcgi/pkg-comment
 delete mode 100644 www/pyweblib/pkg-comment
 delete mode 100644 www/reportmagic/pkg-comment
 delete mode 100644 www/roxen/pkg-comment
 delete mode 100644 www/ruboard/pkg-comment
 delete mode 100644 www/scout/pkg-comment
 delete mode 100644 www/sidplug/pkg-comment
 delete mode 100644 www/slash/pkg-comment
 delete mode 100644 www/smb2www/pkg-comment
 delete mode 100644 www/squidguard/pkg-comment
 delete mode 100644 www/squidpurge/pkg-comment
 delete mode 100644 www/ssserver/pkg-comment
 delete mode 100644 www/swish-e/pkg-comment
 delete mode 100644 www/tidy/pkg-comment
 delete mode 100644 www/tinyproxy/pkg-comment
 delete mode 100644 www/twhttpd/pkg-comment
 delete mode 100644 www/ump/pkg-comment
 delete mode 100644 www/waccess/pkg-comment
 delete mode 100644 www/web2ldap/pkg-comment
 delete mode 100644 www/web500gw/pkg-comment
 delete mode 100644 www/webcheck/pkg-comment
 delete mode 100644 www/webredirect/pkg-comment
 delete mode 100644 www/webresolve/pkg-comment
 delete mode 100644 www/webstone-ssl/pkg-comment
 delete mode 100644 www/webstone/pkg-comment
 delete mode 100644 www/wml/pkg-comment
 delete mode 100644 www/wmnetselect/pkg-comment
 delete mode 100644 www/www6to4/pkg-comment
 delete mode 100644 www/wyvern/pkg-comment
 delete mode 100644 www/xitami/pkg-comment
 delete mode 100644 www/xswallow/pkg-comment
 delete mode 100644 x11-clocks/emiclock/pkg-comment
 delete mode 100644 x11-clocks/glclock/pkg-comment
 delete mode 100644 x11-clocks/mouseclock/pkg-comment
 delete mode 100644 x11-clocks/tclock/pkg-comment
 delete mode 100644 x11-clocks/wmclock/pkg-comment
 delete mode 100644 x11-clocks/wmtime/pkg-comment
 delete mode 100644 x11-clocks/xalarm/pkg-comment
 delete mode 100644 x11-clocks/xmms-alarm/pkg-comment
 delete mode 100644 x11-clocks/xtimer/pkg-comment
 delete mode 100644 x11-clocks/zclock/pkg-comment
 delete mode 100644 x11-fm/apotheke/pkg-comment
 delete mode 100644 x11-fm/asfiles/pkg-comment
 delete mode 100644 x11-fm/file_menu_applet/pkg-comment
 delete mode 100644 x11-fm/gnome-commander/pkg-comment
 delete mode 100644 x11-fm/gnome-commander2/pkg-comment
 delete mode 100644 x11-fm/jafm/pkg-comment
 delete mode 100644 x11-fm/offix-files/pkg-comment
 delete mode 100644 x11-fm/tkdesk/pkg-comment
 delete mode 100644 x11-fm/vide/pkg-comment
 delete mode 100644 x11-fm/worker/pkg-comment
 delete mode 100644 x11-fm/x-files/pkg-comment
 delete mode 100644 x11-fonts/artwiz-fonts/pkg-comment
 delete mode 100644 x11-fonts/bdfresize/pkg-comment
 delete mode 100644 x11-fonts/gfe/pkg-comment
 delete mode 100644 x11-fonts/mkbold/pkg-comment
 delete mode 100644 x11-fonts/mkfontalias/pkg-comment
 delete mode 100644 x11-fonts/mkitalic/pkg-comment
 delete mode 100644 x11-fonts/mozilla-fonts/pkg-comment
 delete mode 100644 x11-fonts/p5-Font-TTF/pkg-comment
 delete mode 100644 x11-fonts/terminus-font/pkg-comment
 delete mode 100644 x11-fonts/tkfont/pkg-comment
 delete mode 100644 x11-fonts/webfonts/pkg-comment
 delete mode 100644 x11/accessx/pkg-comment
 delete mode 100644 x11/bgrot/pkg-comment
 delete mode 100644 x11/bricons/pkg-comment
 delete mode 100644 x11/deskmenu/pkg-comment
 delete mode 100644 x11/electricsheep/pkg-comment
 delete mode 100644 x11/fspanel/pkg-comment
 delete mode 100644 x11/gmessage/pkg-comment
 delete mode 100644 x11/gnoclip/pkg-comment
 delete mode 100644 x11/gxset/pkg-comment
 delete mode 100644 x11/keylaunch/pkg-comment
 delete mode 100644 x11/libdnd/pkg-comment
 delete mode 100644 x11/lupe/pkg-comment
 delete mode 100644 x11/multi-gnome-terminal/pkg-comment
 delete mode 100644 x11/offix-clipboard/pkg-comment
 delete mode 100644 x11/offix-execute/pkg-comment
 delete mode 100644 x11/settitle/pkg-comment
 delete mode 100644 x11/temperature.app/pkg-comment
 delete mode 100644 x11/wmappl/pkg-comment
 delete mode 100644 x11/wmfstatus/pkg-comment
 delete mode 100644 x11/wmmenu/pkg-comment
 delete mode 100644 x11/wmoldmenu2new/pkg-comment
 delete mode 100644 x11/wterm/pkg-comment
 delete mode 100644 x11/x3270/pkg-comment
 delete mode 100644 x11/xaniroc/pkg-comment
 delete mode 100644 x11/xautolock/pkg-comment
 delete mode 100644 x11/xballoon/pkg-comment
 delete mode 100644 x11/xcmd/pkg-comment
 delete mode 100644 x11/xfishtank/pkg-comment
 delete mode 100644 x11/xkbset/pkg-comment
 delete mode 100644 x11/xkeywrap/pkg-comment
 delete mode 100644 x11/xmangekyou/pkg-comment
 delete mode 100644 x11/xmon/pkg-comment
 delete mode 100644 x11/xmotd/pkg-comment
 delete mode 100644 x11/xmove/pkg-comment
 delete mode 100644 x11/xmsg/pkg-comment
 delete mode 100644 x11/xmx/pkg-comment
 delete mode 100644 x11/xrootconsole/pkg-comment
 delete mode 100644 x11/xstarroll/pkg-comment
 delete mode 100644 x11/xtacy/pkg-comment
 delete mode 100644 x11/xtermset/pkg-comment

diff --git a/www/abcache/Makefile b/www/abcache/Makefile
index 80fd225e20c3..075f66abcb48 100644
--- a/www/abcache/Makefile
+++ b/www/abcache/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://afterburner.bware.it/download/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	A tool to cache applications written in PHP
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf \
diff --git a/www/abcache/pkg-comment b/www/abcache/pkg-comment
deleted file mode 100644
index 921a8696f55b..000000000000
--- a/www/abcache/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to cache applications written in PHP
diff --git a/www/adzapper/Makefile b/www/adzapper/Makefile
index 1cf4e2f29a54..5d6033a4bdcd 100644
--- a/www/adzapper/Makefile
+++ b/www/adzapper/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://adzapper.sourceforge.net/
 
 MAINTAINER=	jdunn@aquezada.com
+COMMENT=	A filtering proxy that can block ads from being displayed
 
 USE_PYTHON=	yes
 
diff --git a/www/adzapper/pkg-comment b/www/adzapper/pkg-comment
deleted file mode 100644
index cd6f138df4e5..000000000000
--- a/www/adzapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A filtering proxy that can block ads from being displayed
diff --git a/www/aolserver/Makefile b/www/aolserver/Makefile
index 8abd24f304b4..92d2fc9f0a80 100644
--- a/www/aolserver/Makefile
+++ b/www/aolserver/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	aolserver
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	mab@red-bean.com
+COMMENT=	A multithreaded web server with embedded TCL interpreter
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/www/aolserver/pkg-comment b/www/aolserver/pkg-comment
deleted file mode 100644
index cf93ceec6b33..000000000000
--- a/www/aolserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multithreaded web server with embedded TCL interpreter
diff --git a/www/apache-jserv/Makefile b/www/apache-jserv/Makefile
index a4eead0e32c7..ffb94c7427b3 100644
--- a/www/apache-jserv/Makefile
+++ b/www/apache-jserv/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://java.apache.org/jserv/dist/
 DISTNAME=	ApacheJServ-${PORTVERSION}
 
 MAINTAINER=	greg@greg.rim.or.jp
+COMMENT=	Loadable servlet module for apache
 
 USE_JAVA=	1.1+
 NEED_JAVAC=	yes
diff --git a/www/apache-jserv/pkg-comment b/www/apache-jserv/pkg-comment
deleted file mode 100644
index 52a90b7a59ed..000000000000
--- a/www/apache-jserv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Loadable servlet module for apache
diff --git a/www/apache13-fp/Makefile b/www/apache13-fp/Makefile
index ce195cf1b633..24cb406b287c 100644
--- a/www/apache13-fp/Makefile
+++ b/www/apache13-fp/Makefile
@@ -31,6 +31,7 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 DISTFILES=	${APACHE} powerlogo.gif:powerlogo fplogo.gif:fplogo
 
 MAINTAINER=	hetzels@westbend.net
+COMMENT=	The Apache webserver with MS Frontpage Module
 
 #PATCH_SITES=	http://www.apache.org/dist/patches/apply_to_${PORTVERSION}/
 #PATCHFILES=
diff --git a/www/apache13-fp/pkg-comment b/www/apache13-fp/pkg-comment
deleted file mode 100644
index 695fb9034c6a..000000000000
--- a/www/apache13-fp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Apache webserver with MS Frontpage Module
diff --git a/www/asp2php/Makefile b/www/asp2php/Makefile
index a299b0ad80d6..d388cca7282a 100644
--- a/www/asp2php/Makefile
+++ b/www/asp2php/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://65.108.58.129/asp2php/ \
 		http://dl.droso.net/ports/
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Converts ASP scripts to PHP
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/a//}/src
 
diff --git a/www/asp2php/pkg-comment b/www/asp2php/pkg-comment
deleted file mode 100644
index 2e7f0772e908..000000000000
--- a/www/asp2php/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts ASP scripts to PHP
diff --git a/www/aswedit/Makefile b/www/aswedit/Makefile
index 42a78d1c3039..c6e6baa1a40e 100644
--- a/www/aswedit/Makefile
+++ b/www/aswedit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.advasoft.com/asWedit/ \
 DISTNAME=	asWedit-4.0-i386.linux
 
 MAINTAINER=	brett@peloton.runet.edu
+COMMENT=	An easy to use HTML and text editor
 
 RESTRICTED=	"Commercial software"
 NO_BUILD=	yes
diff --git a/www/aswedit/pkg-comment b/www/aswedit/pkg-comment
deleted file mode 100644
index 07dd5bf2b59e..000000000000
--- a/www/aswedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy to use HTML and text editor
diff --git a/www/awstats-devel/Makefile b/www/awstats-devel/Makefile
index c993d6fa44ab..ee455f053321 100644
--- a/www/awstats-devel/Makefile
+++ b/www/awstats-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	firewolf@lightningfire.net
+COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
diff --git a/www/awstats-devel/pkg-comment b/www/awstats-devel/pkg-comment
deleted file mode 100644
index 6c6c24f4a7ea..000000000000
--- a/www/awstats-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free real-time logfile analyzer to get advanced web statistics
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index c993d6fa44ab..ee455f053321 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	firewolf@lightningfire.net
+COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
 NO_BUILD=	yes
 USE_PERL5_RUN=	yes
diff --git a/www/awstats/pkg-comment b/www/awstats/pkg-comment
deleted file mode 100644
index 6c6c24f4a7ea..000000000000
--- a/www/awstats/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free real-time logfile analyzer to get advanced web statistics
diff --git a/www/bacon/Makefile b/www/bacon/Makefile
index 001408c280b9..4e17fe410e53 100644
--- a/www/bacon/Makefile
+++ b/www/bacon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://galileo.spaceports.com/~jharris/distfiles/ \
 		ftp://samurai.ruin.org/pub/All/
 
 MAINTAINER=	jmrobins@samurai.ruin.org
+COMMENT=	Quick, easy-to-read, web statistics program
 
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/www/bacon/pkg-comment b/www/bacon/pkg-comment
deleted file mode 100644
index c99e4afbaf91..000000000000
--- a/www/bacon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quick, easy-to-read, web statistics program
diff --git a/www/bmsync/Makefile b/www/bmsync/Makefile
index 568ccbf1c54c..8540a9c385e0 100644
--- a/www/bmsync/Makefile
+++ b/www/bmsync/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://web.cs.cmu.edu/~dpelleg/sw/
 
 MAINTAINER=	daniel+bmsync@pelleg.org
+COMMENT=	A bookmark converter and synchronizer for NN, KDE and MSIE
 
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}
diff --git a/www/bmsync/pkg-comment b/www/bmsync/pkg-comment
deleted file mode 100644
index 16583c70ebab..000000000000
--- a/www/bmsync/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bookmark converter and synchronizer for NN, KDE and MSIE
diff --git a/www/boa/Makefile b/www/boa/Makefile
index 088e9290d436..6c649d63bc96 100644
--- a/www/boa/Makefile
+++ b/www/boa/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.boa.org/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	High performance single-tasking web server
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/www/boa/pkg-comment b/www/boa/pkg-comment
deleted file mode 100644
index 24a57e1be142..000000000000
--- a/www/boa/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High performance single-tasking web server
diff --git a/www/bozohttpd/Makefile b/www/bozohttpd/Makefile
index e24b724a7cbf..a4d9c3ef0f7b 100644
--- a/www/bozohttpd/Makefile
+++ b/www/bozohttpd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.eterna.com.au/bozohttpd/
 
 MAINTAINER=	Janos.Mohacsi@bsd.hu
+COMMENT=	The bozotic HTTP server
 
 USE_BZIP2=	YES
 
diff --git a/www/bozohttpd/pkg-comment b/www/bozohttpd/pkg-comment
deleted file mode 100644
index 85e95cc7d1ce..000000000000
--- a/www/bozohttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The bozotic HTTP server
diff --git a/www/caudium/Makefile b/www/caudium/Makefile
index 25522078fb86..86801304e369 100644
--- a/www/caudium/Makefile
+++ b/www/caudium/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.oav.net/caudium/source/	\
 DISTNAME=	caudium-${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
+COMMENT=	A free webserver which is based on the Roxen Challenger 1.3 code base
 
 BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike70/
 LIB_DEPENDS=	sablot.69:${PORTSDIR}/textproc/sablotron/
diff --git a/www/caudium/pkg-comment b/www/caudium/pkg-comment
deleted file mode 100644
index 4d1623f40470..000000000000
--- a/www/caudium/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free webserver which is based on the Roxen Challenger 1.3 code base
diff --git a/www/caudium10/Makefile b/www/caudium10/Makefile
index 25522078fb86..86801304e369 100644
--- a/www/caudium10/Makefile
+++ b/www/caudium10/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.oav.net/caudium/source/	\
 DISTNAME=	caudium-${PORTVERSION}
 
 MAINTAINER=	kiwi@oav.net
+COMMENT=	A free webserver which is based on the Roxen Challenger 1.3 code base
 
 BUILD_DEPENDS=	pike:${PORTSDIR}/lang/pike70/
 LIB_DEPENDS=	sablot.69:${PORTSDIR}/textproc/sablotron/
diff --git a/www/caudium10/pkg-comment b/www/caudium10/pkg-comment
deleted file mode 100644
index 4d1623f40470..000000000000
--- a/www/caudium10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free webserver which is based on the Roxen Challenger 1.3 code base
diff --git a/www/cgi-lib/Makefile b/www/cgi-lib/Makefile
index 66731fc4b063..6fa78b6a370f 100644
--- a/www/cgi-lib/Makefile
+++ b/www/cgi-lib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	alex
 
 MAINTAINER=	gonza@techline.ru
+COMMENT=	ANSI C Library for CGI Programming
 
 MAKEFILE=	makefile
 
diff --git a/www/cgi-lib/pkg-comment b/www/cgi-lib/pkg-comment
deleted file mode 100644
index 50c6a859c030..000000000000
--- a/www/cgi-lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ANSI C Library for CGI Programming
diff --git a/www/cgiwrap/Makefile b/www/cgiwrap/Makefile
index f16432e85f78..2ef0c4e5c286 100644
--- a/www/cgiwrap/Makefile
+++ b/www/cgiwrap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jre@vineyard.net
+COMMENT=	Securely execute ~user CGI scripts
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-httpd-user=${HTTPDUSER} \
diff --git a/www/cgiwrap/pkg-comment b/www/cgiwrap/pkg-comment
deleted file mode 100644
index 551e3aed84fd..000000000000
--- a/www/cgiwrap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Securely execute ~user CGI scripts
diff --git a/www/chimera2/Makefile b/www/chimera2/Makefile
index a8a7ffa24e7e..16da09eae4d6 100644
--- a/www/chimera2/Makefile
+++ b/www/chimera2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera-alpha/ \
 		ftp://ftp.uni-koeln.de/net/inet/WWW/
 
 MAINTAINER=	bgingery@gtcs.com
+COMMENT=	X/Athena World-Wide Web client - Wilbur (HTML3.2) compliant
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
diff --git a/www/chimera2/pkg-comment b/www/chimera2/pkg-comment
deleted file mode 100644
index a1715551aaf0..000000000000
--- a/www/chimera2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X/Athena World-Wide Web client - Wilbur (HTML3.2) compliant
diff --git a/www/chtml/Makefile b/www/chtml/Makefile
index b673d6e27ffb..6ebf6554eb06 100644
--- a/www/chtml/Makefile
+++ b/www/chtml/Makefile
@@ -13,6 +13,7 @@ DISTNAME=       chtml
 EXTRACT_SUFX=   .tgz
 
 MAINTAINER=     david+ports@bushong.net
+COMMENT=	Chunked HTML templating engine
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/csiod:${PORTSDIR}/lang/siod
 
diff --git a/www/chtml/pkg-comment b/www/chtml/pkg-comment
deleted file mode 100644
index c208a104dbad..000000000000
--- a/www/chtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Chunked HTML templating engine
diff --git a/www/dansguardian-devel/Makefile b/www/dansguardian-devel/Makefile
index 41c4420a8748..520aa65ce086 100644
--- a/www/dansguardian-devel/Makefile
+++ b/www/dansguardian-devel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
 
 MAINTAINER=	fcash@bigfoot.com
+COMMENT=	A fast, simple web content filter for Squid proxy servers
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
 		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
diff --git a/www/dansguardian-devel/pkg-comment b/www/dansguardian-devel/pkg-comment
deleted file mode 100644
index 20dd2dfe4b92..000000000000
--- a/www/dansguardian-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast, simple web content filter for Squid proxy servers
diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
index c5595fed9489..054b40fb8d70 100644
--- a/www/dansguardian/Makefile
+++ b/www/dansguardian/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	# empty, see below
 DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
 
 MAINTAINER=	fcash@bigfoot.com
+COMMENT=	A fast, simple web content filter for Squid proxy servers
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24:install \
 		${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13:install
diff --git a/www/dansguardian/pkg-comment b/www/dansguardian/pkg-comment
deleted file mode 100644
index 20dd2dfe4b92..000000000000
--- a/www/dansguardian/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast, simple web content filter for Squid proxy servers
diff --git a/www/dhttpd/Makefile b/www/dhttpd/Makefile
index 1c7c54a3bef3..f34cd55cbf46 100644
--- a/www/dhttpd/Makefile
+++ b/www/dhttpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://uts.cc.utexas.edu/~foxx/dhttpd/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	gslin@ccca.nctu.edu.tw
+COMMENT=	Minimal secure webserver. Fast and efficient, no cgi-bin support
 
 USE_REINPLACE=	yes
 
diff --git a/www/dhttpd/pkg-comment b/www/dhttpd/pkg-comment
deleted file mode 100644
index 97226dbd531e..000000000000
--- a/www/dhttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Minimal secure webserver. Fast and efficient, no cgi-bin support
diff --git a/www/eddie/Makefile b/www/eddie/Makefile
index 1aaab1894fb0..c5e5c4f23c35 100644
--- a/www/eddie/Makefile
+++ b/www/eddie/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.aims.com.au/chris/
 DISTNAME=	eddie-1.5.1-20020619
 
 MAINTAINER=	chris@aims.com.au
+COMMENT=	Tool for building fault-tolerant redundant WWW servers
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 
diff --git a/www/eddie/pkg-comment b/www/eddie/pkg-comment
deleted file mode 100644
index c9844704a1b9..000000000000
--- a/www/eddie/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool for building fault-tolerant redundant WWW servers
diff --git a/www/eldav.el/Makefile b/www/eldav.el/Makefile
index f0d30ca3b45a..1789c967a312 100644
--- a/www/eldav.el/Makefile
+++ b/www/eldav.el/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.gz
 DIST_SUBDIR=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	stolz@i2.informatik.rwth-aachen.de
+COMMENT=	An interface to WebDAV servers for Emacs
 
 RUN_DEPENDS=	nd:${PORTSDIR}/www/nd
 
diff --git a/www/eldav.el/pkg-comment b/www/eldav.el/pkg-comment
deleted file mode 100644
index 2f387f86a892..000000000000
--- a/www/eldav.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interface to WebDAV servers for Emacs
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 907751f8781c..c9c9db90852f 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -13,6 +13,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jharris@widomaker.com
+COMMENT=	Elinks - links text WWW browser with enhancements
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/www/elinks/pkg-comment b/www/elinks/pkg-comment
deleted file mode 100644
index ffc54e36bfe4..000000000000
--- a/www/elinks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Elinks - links text WWW browser with enhancements
diff --git a/www/flashplugin-mozilla/Makefile b/www/flashplugin-mozilla/Makefile
index 996b093f7c3c..b3b2fcbce66c 100644
--- a/www/flashplugin-mozilla/Makefile
+++ b/www/flashplugin-mozilla/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	flash-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	llwang@infor.org
+COMMENT=	A GPL standalone Flash (TM) plugin for Mozilla web browser
 
 LIB_DEPENDS=	flash.0:${PORTSDIR}/graphics/libflash
 RUN_DEPENDS?=	mozilla:${PORTSDIR}/www/mozilla
diff --git a/www/flashplugin-mozilla/pkg-comment b/www/flashplugin-mozilla/pkg-comment
deleted file mode 100644
index 59b8fae866d1..000000000000
--- a/www/flashplugin-mozilla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GPL standalone Flash (TM) plugin for Mozilla web browser
diff --git a/www/g-gcl/Makefile b/www/g-gcl/Makefile
index 53f2c25bf749..543c5ed16207 100644
--- a/www/g-gcl/Makefile
+++ b/www/g-gcl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.whizkidtech.net/cgi/gcl/ \
 		http://www.whizkidtech.net/gcl/
 
 MAINTAINER=	adam@whizkidtech.net
+COMMENT=	Sample counter scripts for Graphic Counter Language
 
 RUN_DEPENDS=	gracula:${PORTSDIR}/graphics/gracula
 
diff --git a/www/g-gcl/pkg-comment b/www/g-gcl/pkg-comment
deleted file mode 100644
index c3b066be5213..000000000000
--- a/www/g-gcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sample counter scripts for Graphic Counter Language
diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index e7acd19f5dc2..6a5cdd8ce90a 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jamie@hermans.ca
+COMMENT=	Gallery is a slick web based photo album written using PHP
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
diff --git a/www/gallery/pkg-comment b/www/gallery/pkg-comment
deleted file mode 100644
index 08f3557c759c..000000000000
--- a/www/gallery/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gallery is a slick web based photo album written using PHP
diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index e7acd19f5dc2..6a5cdd8ce90a 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jamie@hermans.ca
+COMMENT=	Gallery is a slick web based photo album written using PHP
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
diff --git a/www/gallery2/pkg-comment b/www/gallery2/pkg-comment
deleted file mode 100644
index 08f3557c759c..000000000000
--- a/www/gallery2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gallery is a slick web based photo album written using PHP
diff --git a/www/gallery3/Makefile b/www/gallery3/Makefile
index e7acd19f5dc2..6a5cdd8ce90a 100644
--- a/www/gallery3/Makefile
+++ b/www/gallery3/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	jamie@hermans.ca
+COMMENT=	Gallery is a slick web based photo album written using PHP
 
 RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
diff --git a/www/gallery3/pkg-comment b/www/gallery3/pkg-comment
deleted file mode 100644
index 08f3557c759c..000000000000
--- a/www/gallery3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gallery is a slick web based photo album written using PHP
diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile
index 50e51166cfd3..df3f9d735a0b 100644
--- a/www/geeklog/Makefile
+++ b/www/geeklog/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=geeklog
 
 MAINTAINER=	bob@fly.homeunix.org
+COMMENT=	GeekLog is a web content magagement system
 
 RUN_DEPENDS=    ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mysql323-server
 RUN_DEPENDS+=   ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
diff --git a/www/geeklog/pkg-comment b/www/geeklog/pkg-comment
deleted file mode 100644
index eb97374322e5..000000000000
--- a/www/geeklog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GeekLog is a web content magagement system
diff --git a/www/gnuinfo/Makefile b/www/gnuinfo/Makefile
index 30af8c429677..958eabb2e0c2 100644
--- a/www/gnuinfo/Makefile
+++ b/www/gnuinfo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.wohnheim.uni-ulm.de/allerlei/
 
 MAINTAINER=	nox@jelal.kn-bremen.de
+COMMENT=	CGI program to convert GNU .info files into html
 
 NO_WRKSUBDIR=	yes
 
diff --git a/www/gnuinfo/pkg-comment b/www/gnuinfo/pkg-comment
deleted file mode 100644
index 9a881d9414ba..000000000000
--- a/www/gnuinfo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CGI program to convert GNU .info files into html
diff --git a/www/gnujsp/Makefile b/www/gnujsp/Makefile
index 8caa299048be..595441c70aba 100644
--- a/www/gnujsp/Makefile
+++ b/www/gnujsp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www java
 MASTER_SITES=	http://www.klomp.org/gnujsp/downloads/
 
 MAINTAINER=	girgen@partitur.se
+COMMENT=	GNU implementation of Sun's Java Server Pages
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/mod_jserv.so:${PORTSDIR}/www/apache-jserv
 
diff --git a/www/gnujsp/pkg-comment b/www/gnujsp/pkg-comment
deleted file mode 100644
index fe55f6960069..000000000000
--- a/www/gnujsp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU implementation of Sun's Java Server Pages
diff --git a/www/guile-www/Makefile b/www/guile-www/Makefile
index 61da67bb4579..90c66fd73388 100644
--- a/www/guile-www/Makefile
+++ b/www/guile-www/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	guile
 
 MAINTAINER=	fuyuki@hadaly.org
+COMMENT=	Guile modules for WWW interaction
 
 RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile
 
diff --git a/www/guile-www/pkg-comment b/www/guile-www/pkg-comment
deleted file mode 100644
index c7dfcfc5f60c..000000000000
--- a/www/guile-www/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Guile modules for WWW interaction
diff --git a/www/horde-base/Makefile b/www/horde-base/Makefile
index c2ee3ac174b5..41f6be2f1635 100644
--- a/www/horde-base/Makefile
+++ b/www/horde-base/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	A common code-base used by Horde applications, written in PHP3
 
 #-----------------------------------------------------------------------
 # You may define these options:
diff --git a/www/horde-base/pkg-comment b/www/horde-base/pkg-comment
deleted file mode 100644
index 9d28558ea160..000000000000
--- a/www/horde-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A common code-base used by Horde applications, written in PHP3
diff --git a/www/horde/Makefile b/www/horde/Makefile
index c2ee3ac174b5..41f6be2f1635 100644
--- a/www/horde/Makefile
+++ b/www/horde/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	A common code-base used by Horde applications, written in PHP3
 
 #-----------------------------------------------------------------------
 # You may define these options:
diff --git a/www/horde/pkg-comment b/www/horde/pkg-comment
deleted file mode 100644
index 9d28558ea160..000000000000
--- a/www/horde/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A common code-base used by Horde applications, written in PHP3
diff --git a/www/horde2/Makefile b/www/horde2/Makefile
index f4e309a40541..5c401d3382e1 100644
--- a/www/horde2/Makefile
+++ b/www/horde2/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES=	ftp://ftp.horde.org/pub/horde/				\
 		ftp://ftp.pt.horde.org/pub/horde-ftp/horde/
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	A common code-base used by Horde applications, written in PHP
 
 #-----------------------------------------------------------------------
 # You may define these options:
diff --git a/www/horde2/pkg-comment b/www/horde2/pkg-comment
deleted file mode 100644
index 20a1d723f4fc..000000000000
--- a/www/horde2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A common code-base used by Horde applications, written in PHP
diff --git a/www/horde4-base/Makefile b/www/horde4-base/Makefile
index c2ee3ac174b5..41f6be2f1635 100644
--- a/www/horde4-base/Makefile
+++ b/www/horde4-base/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.horde.org/pub/horde/tarballs/
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	A common code-base used by Horde applications, written in PHP3
 
 #-----------------------------------------------------------------------
 # You may define these options:
diff --git a/www/horde4-base/pkg-comment b/www/horde4-base/pkg-comment
deleted file mode 100644
index 9d28558ea160..000000000000
--- a/www/horde4-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A common code-base used by Horde applications, written in PHP3
diff --git a/www/hotjava/Makefile b/www/hotjava/Makefile
index 8cd2d8b7c939..b7ed67bed932 100644
--- a/www/hotjava/Makefile
+++ b/www/hotjava/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	hjb3_0-linux.sfx
 EXTRACT_SUFX=
 
 MAINTAINER=	noway@nohow.demon.co.uk
+COMMENT=	Sun's Hotjava web browser
 
 RUN_DEPENDS=	${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
 
diff --git a/www/hotjava/pkg-comment b/www/hotjava/pkg-comment
deleted file mode 100644
index 10c60157b52d..000000000000
--- a/www/hotjava/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sun's Hotjava web browser
diff --git a/www/http-analyze/Makefile b/www/http-analyze/Makefile
index 3614c6717613..5c449c8393bc 100644
--- a/www/http-analyze/Makefile
+++ b/www/http-analyze/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	todd@thisisa.com
+COMMENT=	A fast Log-Analyzer for web servers
 
 BUILD_DEPENDS=	gif2png:${PORTSDIR}/graphics/gif2png
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
diff --git a/www/http-analyze/pkg-comment b/www/http-analyze/pkg-comment
deleted file mode 100644
index 111cd4a9a32e..000000000000
--- a/www/http-analyze/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast Log-Analyzer for web servers
diff --git a/www/http_load/Makefile b/www/http_load/Makefile
index 5a582d89b3f7..0f7f52025346 100644
--- a/www/http_load/Makefile
+++ b/www/http_load/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.acme.com/software/http_load/
 DISTNAME=	${PORTNAME}-05apr2001
 
 MAINTAINER=	ask@valueclick.com
+COMMENT=	Multiprocessing http performance test client
 
 WRKSRC=		${WRKDIR}/http_load
 MAKEFILE=	${FILESDIR}/Makefile.bsd
diff --git a/www/http_load/pkg-comment b/www/http_load/pkg-comment
deleted file mode 100644
index ebd292b113ea..000000000000
--- a/www/http_load/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiprocessing http performance test client
diff --git a/www/httpgrabber/Makefile b/www/httpgrabber/Makefile
index f520bd9631cb..c0bdda1417e3 100644
--- a/www/httpgrabber/Makefile
+++ b/www/httpgrabber/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.mavetju.org/download/
 
 MAINTAINER=	edwin@mavetju.org
+COMMENT=	HTTP network traffic grabber and extractor
 
 LIB_DEPENDS=	ngrep.1:${PORTSDIR}/net/ngrep-lib
 
diff --git a/www/httpgrabber/pkg-comment b/www/httpgrabber/pkg-comment
deleted file mode 100644
index 2d224549b90e..000000000000
--- a/www/httpgrabber/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTTP network traffic grabber and extractor
diff --git a/www/indexme/Makefile b/www/indexme/Makefile
index 8bfd78f9d94f..2fa96f72c44e 100644
--- a/www/indexme/Makefile
+++ b/www/indexme/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://users.uk.freebsd.org/pub/lord_cj/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	calle.madestrand@norrgarden.se
+COMMENT=	Links files into a HTML index for viewing and easy overview
 
 USE_PERL5=	yes
 
diff --git a/www/indexme/pkg-comment b/www/indexme/pkg-comment
deleted file mode 100644
index 60bd70e92089..000000000000
--- a/www/indexme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Links files into a HTML index for viewing and easy overview
diff --git a/www/jdresolve/Makefile b/www/jdresolve/Makefile
index 265ca49a678a..8f99e74f704b 100644
--- a/www/jdresolve/Makefile
+++ b/www/jdresolve/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.jdrowell.com/projects/jdresolve/
 
 MAINTAINER=	christophe@labouisse.org
+COMMENT=	A IP addresse to hostname program for httpd log files
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/jdresolve/pkg-comment b/www/jdresolve/pkg-comment
deleted file mode 100644
index 6fccde37c736..000000000000
--- a/www/jdresolve/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A IP addresse to hostname program for httpd log files
diff --git a/www/jesred/Makefile b/www/jesred/Makefile
index a30135e21ccc..f9548c2ab911 100644
--- a/www/jesred/Makefile
+++ b/www/jesred/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.linofee.org/~elkner/webtools/src/ \
 DISTNAME=	jesred-1.2pl1
 
 MAINTAINER=	dsh@vlink.ru
+COMMENT=	A redirector for Squid
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/jesred ${PREFIX}/libexec
diff --git a/www/jesred/pkg-comment b/www/jesred/pkg-comment
deleted file mode 100644
index 2e85d205cc8c..000000000000
--- a/www/jesred/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A redirector for Squid
diff --git a/www/jonah/Makefile b/www/jonah/Makefile
index 658c8ae6b56d..eacede0b6bab 100644
--- a/www/jonah/Makefile
+++ b/www/jonah/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://pompo.net/horde/jonah/
 
 MAINTAINER=	thierry@pompo.net
+COMMENT=	Jonah is a portal and content collection system
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/www/jonah/pkg-comment b/www/jonah/pkg-comment
deleted file mode 100644
index 23ceefb041b2..000000000000
--- a/www/jonah/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jonah is a portal and content collection system
diff --git a/www/larbin/Makefile b/www/larbin/Makefile
index f5b38d5e46fd..466d275d8ce5 100644
--- a/www/larbin/Makefile
+++ b/www/larbin/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.sourceforge.net/pub/sourceforge/larbin/
 
 MAINTAINER=	hiten@uk.FreeBSD.org
+COMMENT=	A powerful HTTP crawler with an easy interface
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash2
 
diff --git a/www/larbin/pkg-comment b/www/larbin/pkg-comment
deleted file mode 100644
index af502f5fe36c..000000000000
--- a/www/larbin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A powerful HTTP crawler with an easy interface
diff --git a/www/linux-firefox/Makefile b/www/linux-firefox/Makefile
index 2f72f221ed9f..648cd0a784bb 100644
--- a/www/linux-firefox/Makefile
+++ b/www/linux-firefox/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	phoenix-${PORTVERSION}-i686-pc-linux-gnu
 
 MAINTAINER=	voisine@bytemobile.com
+COMMENT=	Web browser branched from Mozilla
 
 RUN_DEPENDS=	\
 	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/www/linux-firefox/pkg-comment b/www/linux-firefox/pkg-comment
deleted file mode 100644
index be2a3ddf19df..000000000000
--- a/www/linux-firefox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Web browser branched from Mozilla
diff --git a/www/linux-mozillafirebird/Makefile b/www/linux-mozillafirebird/Makefile
index 2f72f221ed9f..648cd0a784bb 100644
--- a/www/linux-mozillafirebird/Makefile
+++ b/www/linux-mozillafirebird/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	phoenix-${PORTVERSION}-i686-pc-linux-gnu
 
 MAINTAINER=	voisine@bytemobile.com
+COMMENT=	Web browser branched from Mozilla
 
 RUN_DEPENDS=	\
 	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/www/linux-mozillafirebird/pkg-comment b/www/linux-mozillafirebird/pkg-comment
deleted file mode 100644
index be2a3ddf19df..000000000000
--- a/www/linux-mozillafirebird/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Web browser branched from Mozilla
diff --git a/www/linux-phoenix/Makefile b/www/linux-phoenix/Makefile
index 2f72f221ed9f..648cd0a784bb 100644
--- a/www/linux-phoenix/Makefile
+++ b/www/linux-phoenix/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX=	linux-
 DISTNAME=	phoenix-${PORTVERSION}-i686-pc-linux-gnu
 
 MAINTAINER=	voisine@bytemobile.com
+COMMENT=	Web browser branched from Mozilla
 
 RUN_DEPENDS=	\
 	${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk
diff --git a/www/linux-phoenix/pkg-comment b/www/linux-phoenix/pkg-comment
deleted file mode 100644
index be2a3ddf19df..000000000000
--- a/www/linux-phoenix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Web browser branched from Mozilla
diff --git a/www/logtools/Makefile b/www/logtools/Makefile
index 803d62842a1c..15a1d1f6fd04 100644
--- a/www/logtools/Makefile
+++ b/www/logtools/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.coker.com.au/logtools/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	xaa+ports@timewasters.nl
+COMMENT=	Useful tools to deal with CLF files (Common Log File format)
 
 GNU_CONFIGURE=	yes
 MAN1=		clfmerge.1 logprn.1 funnel.1 clfsplit.1 clfdomainsplit.1
diff --git a/www/logtools/pkg-comment b/www/logtools/pkg-comment
deleted file mode 100644
index 5b07413c9c96..000000000000
--- a/www/logtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Useful tools to deal with CLF files (Common Log File format)
diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile
index e68a4cc4b952..75b2610653bc 100644
--- a/www/micro_httpd/Makefile
+++ b/www/micro_httpd/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.acme.com/software/micro_httpd/ \
 DISTNAME=	${PORTNAME}_15dec00
 
 MAINTAINER=	user@unknown.nu
+COMMENT=	An extremely small web server
 
 USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/www/micro_httpd/pkg-comment b/www/micro_httpd/pkg-comment
deleted file mode 100644
index d1c0cc7aeef9..000000000000
--- a/www/micro_httpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extremely small web server
diff --git a/www/mod_auth_pwcheck/Makefile b/www/mod_auth_pwcheck/Makefile
index 7ba6037a4b6f..047102c7d014 100644
--- a/www/mod_auth_pwcheck/Makefile
+++ b/www/mod_auth_pwcheck/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.chelcom.ru/~anton/projects/files/
 
 MAINTAINER=	anton@urc.ac.ru
+COMMENT=	Apache module for user authentication via Cyrus pwcheck daemon
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT}
 RUN_DEPENDS=	${LOCALBASE}/sbin/${AP_TARGET}:${PORTSDIR}/${AP_CATEGORY}/${AP_PORT} \
diff --git a/www/mod_auth_pwcheck/pkg-comment b/www/mod_auth_pwcheck/pkg-comment
deleted file mode 100644
index ee3879fd5da1..000000000000
--- a/www/mod_auth_pwcheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for user authentication via Cyrus pwcheck daemon
diff --git a/www/mod_bunzip2/Makefile b/www/mod_bunzip2/Makefile
index 73ac54d7345f..18c3da83efa7 100644
--- a/www/mod_bunzip2/Makefile
+++ b/www/mod_bunzip2/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=		http://www.oldach.net/
 DISTNAME=		${PORTNAME}
 
 MAINTAINER=		mod_bunzip2@oldach.net
+COMMENT=	Apache module for server-side decompression of bzip2 files
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
diff --git a/www/mod_bunzip2/pkg-comment b/www/mod_bunzip2/pkg-comment
deleted file mode 100644
index 3a94ea34b911..000000000000
--- a/www/mod_bunzip2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for server-side decompression of bzip2 files
diff --git a/www/mod_csacek/Makefile b/www/mod_csacek/Makefile
index 16ebc9b50446..0bbc9ae4405f 100644
--- a/www/mod_csacek/Makefile
+++ b/www/mod_csacek/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.csacek.cz/distrib/
 DISTNAME=	${PORTNAME:S/mod_//g}-${PORTVERSION}
 
 MAINTAINER=	ms@vol.cz
+COMMENT=	Charset recoding module for Apache
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/mod_csacek/pkg-comment b/www/mod_csacek/pkg-comment
deleted file mode 100644
index 8c8efcac9bce..000000000000
--- a/www/mod_csacek/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Charset recoding module for Apache
diff --git a/www/mod_dav/Makefile b/www/mod_dav/Makefile
index e633c85c2bf5..c2b69d002dbf 100644
--- a/www/mod_dav/Makefile
+++ b/www/mod_dav/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.webdav.org/mod_dav/
 DISTNAME=	mod_dav-${PORTVERSION}-${APACHE_VERSION}
 
 MAINTAINER=	patrick@mindstep.com
+COMMENT=	An Apache module that provides DAV capabilities
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/mod_dav/pkg-comment b/www/mod_dav/pkg-comment
deleted file mode 100644
index 5786928bec88..000000000000
--- a/www/mod_dav/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides DAV capabilities
diff --git a/www/mod_fastcgi/Makefile b/www/mod_fastcgi/Makefile
index 44b6bfef1c98..9ed30d29ecff 100644
--- a/www/mod_fastcgi/Makefile
+++ b/www/mod_fastcgi/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.holywar.net/pub/FreeBSD/ \
 		http://www.fastcgi.com/dist/
 
 MAINTAINER=	hollywar@mail.holywar.net
+COMMENT=	A fast-cgi module for Apache
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE_PORT}
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE_PORT}
diff --git a/www/mod_fastcgi/pkg-comment b/www/mod_fastcgi/pkg-comment
deleted file mode 100644
index ea7b3fcfde0c..000000000000
--- a/www/mod_fastcgi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast-cgi module for Apache
diff --git a/www/mod_filter/Makefile b/www/mod_filter/Makefile
index dbcb0e4dba9e..ae96e2345a2e 100644
--- a/www/mod_filter/Makefile
+++ b/www/mod_filter/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=		www
 MASTER_SITES=		http://software.tangent.org/download/
 
 MAINTAINER=		svenasse@polaris.ca
+COMMENT=	Filter output from other modules inside of Apache
 
 BUILD_DEPENDS=		${APXS}:${PORTSDIR}/www/apache13
 RUN_DEPENDS=		${BUILD_DEPENDS}
diff --git a/www/mod_filter/pkg-comment b/www/mod_filter/pkg-comment
deleted file mode 100644
index b1d48a9066ca..000000000000
--- a/www/mod_filter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Filter output from other modules inside of Apache
diff --git a/www/mod_gzip/Makefile b/www/mod_gzip/Makefile
index 560daae81395..ba8df823d11e 100644
--- a/www/mod_gzip/Makefile
+++ b/www/mod_gzip/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	mod-gzip
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	An Internet Content Acceleration module for Apache
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
diff --git a/www/mod_gzip/pkg-comment b/www/mod_gzip/pkg-comment
deleted file mode 100644
index d776397665e1..000000000000
--- a/www/mod_gzip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Internet Content Acceleration module for Apache
diff --git a/www/mod_gzip2/Makefile b/www/mod_gzip2/Makefile
index 560daae81395..ba8df823d11e 100644
--- a/www/mod_gzip2/Makefile
+++ b/www/mod_gzip2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	mod-gzip
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	An Internet Content Acceleration module for Apache
 
 BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
 RUN_DEPENDS=	${APXS}:${APACHE_PORT}
diff --git a/www/mod_gzip2/pkg-comment b/www/mod_gzip2/pkg-comment
deleted file mode 100644
index d776397665e1..000000000000
--- a/www/mod_gzip2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Internet Content Acceleration module for Apache
diff --git a/www/mod_layout/Makefile b/www/mod_layout/Makefile
index e1c94be4cdcc..2e66b9b81f62 100644
--- a/www/mod_layout/Makefile
+++ b/www/mod_layout/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://software.tangent.org/download/
 
 MAINTAINER=	sheepkiller@cultdeadsheep.org
+COMMENT=	Apache module to wrap served pages with a header and/or footer
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/mod_layout/pkg-comment b/www/mod_layout/pkg-comment
deleted file mode 100644
index 96e186896fc2..000000000000
--- a/www/mod_layout/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to wrap served pages with a header and/or footer
diff --git a/www/mod_log_mysql/Makefile b/www/mod_log_mysql/Makefile
index 228e043b4914..ff57953a82f5 100644
--- a/www/mod_log_mysql/Makefile
+++ b/www/mod_log_mysql/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	http://www.grubbybaby.com/mod_log_sql/
 DISTFILES=	mod_log_sql-${PORTVERSION}
 
 MAINTAINER=	lev@serebryakov.spb.ru
+COMMENT=	Allows Apache to log to a MySQL database
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/www/mod_log_mysql/pkg-comment b/www/mod_log_mysql/pkg-comment
deleted file mode 100644
index c9b381ec2a0e..000000000000
--- a/www/mod_log_mysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows Apache to log to a MySQL database
diff --git a/www/mod_log_sql/Makefile b/www/mod_log_sql/Makefile
index 228e043b4914..ff57953a82f5 100644
--- a/www/mod_log_sql/Makefile
+++ b/www/mod_log_sql/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	http://www.grubbybaby.com/mod_log_sql/
 DISTFILES=	mod_log_sql-${PORTVERSION}
 
 MAINTAINER=	lev@serebryakov.spb.ru
+COMMENT=	Allows Apache to log to a MySQL database
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${PORTSDIR}/${AP_PORT}
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/www/mod_log_sql/pkg-comment b/www/mod_log_sql/pkg-comment
deleted file mode 100644
index c9b381ec2a0e..000000000000
--- a/www/mod_log_sql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows Apache to log to a MySQL database
diff --git a/www/mod_perl2/Makefile b/www/mod_perl2/Makefile
index ec875392f64a..66fb22baf604 100644
--- a/www/mod_perl2/Makefile
+++ b/www/mod_perl2/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX=	2
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/r/_/}
 
 MAINTAINER=	larse@isi.edu
+COMMENT=	Embeds a Perl interpreter in the Apache2 server
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE2_PORT}
 RUN_DEPENDS=	${LOCALBASE}/sbin/apxs:${APACHE2_PORT}
diff --git a/www/mod_perl2/pkg-comment b/www/mod_perl2/pkg-comment
deleted file mode 100644
index dc906bfed2ed..000000000000
--- a/www/mod_perl2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Embeds a Perl interpreter in the Apache2 server
diff --git a/www/mod_roaming2/Makefile b/www/mod_roaming2/Makefile
index 347f6cac47bf..56bba8352c5b 100644
--- a/www/mod_roaming2/Makefile
+++ b/www/mod_roaming2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.klomp.org/mod_roaming/
 DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 
 MAINTAINER=	vivek@kciLink.com
+COMMENT=	An Apache module that works as a Netscape Roaming Access server
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache2
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache2
diff --git a/www/mod_roaming2/pkg-comment b/www/mod_roaming2/pkg-comment
deleted file mode 100644
index 17d3be0c71c7..000000000000
--- a/www/mod_roaming2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that works as a Netscape Roaming Access server
diff --git a/www/mod_trigger/Makefile b/www/mod_trigger/Makefile
index 0c705ad4e606..588b2237e896 100644
--- a/www/mod_trigger/Makefile
+++ b/www/mod_trigger/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://software.tangent.org/download/ \
 		ftp://ftp.tangent.org/pub/apache/
 
 MAINTAINER=	svenasse@polaris.ca
+COMMENT=	Apache module to launch triggers if certain actions occur
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/mod_trigger/pkg-comment b/www/mod_trigger/pkg-comment
deleted file mode 100644
index 88b155b1bb24..000000000000
--- a/www/mod_trigger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to launch triggers if certain actions occur
diff --git a/www/mod_tsunami/Makefile b/www/mod_tsunami/Makefile
index 067899d72b96..c715884d08c8 100644
--- a/www/mod_tsunami/Makefile
+++ b/www/mod_tsunami/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mod-tsunami
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	Apache module which dynamically limits a site's slot usage
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_tsunami/pkg-comment b/www/mod_tsunami/pkg-comment
deleted file mode 100644
index b8eb04710ae3..000000000000
--- a/www/mod_tsunami/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module which dynamically limits a site's slot usage
diff --git a/www/mod_v2h/Makefile b/www/mod_v2h/Makefile
index 72c1787fb159..d3d70eeed751 100644
--- a/www/mod_v2h/Makefile
+++ b/www/mod_v2h/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.fractal.net/files/
 DISTNAME=	mod_v2h
 
 MAINTAINER=     hikari@hikari.org.uk
+COMMENT=	A mass virtual hosting module for Apache with support
 
 BUILD_DEPENDS=  ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache2 \
 		${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
diff --git a/www/mod_v2h/pkg-comment b/www/mod_v2h/pkg-comment
deleted file mode 100644
index be433223acd0..000000000000
--- a/www/mod_v2h/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mass virtual hosting module for Apache with support
diff --git a/www/mod_webapp-apache2/Makefile b/www/mod_webapp-apache2/Makefile
index 2eca0cf246b2..789926557efc 100644
--- a/www/mod_webapp-apache2/Makefile
+++ b/www/mod_webapp-apache2/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	jakarta-tomcat-connectors-${CONNECTORS_RELEASE}-src
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gerweck@yahoo.com
+COMMENT=	Apache module mounts Tomcat web applications
 
 BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/www/apache2:extract \
 		${AUTOCONF}:${PORTSDIR}/devel/autoconf \
diff --git a/www/mod_webapp-apache2/pkg-comment b/www/mod_webapp-apache2/pkg-comment
deleted file mode 100644
index 7df639b4ecb1..000000000000
--- a/www/mod_webapp-apache2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module mounts Tomcat web applications
diff --git a/www/nd/Makefile b/www/nd/Makefile
index 1576a9df5678..1a03cc259f6d 100644
--- a/www/nd/Makefile
+++ b/www/nd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.gohome.org/teranisi/
 
 MAINTAINER=	stolz+nd@i2.informatik.rwth-aachen.de
+COMMENT=	A simple command line interface for WebDAV (RFC2518) server
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
diff --git a/www/nd/pkg-comment b/www/nd/pkg-comment
deleted file mode 100644
index 39f80054f920..000000000000
--- a/www/nd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple command line interface for WebDAV (RFC2518) server
diff --git a/www/neon/Makefile b/www/neon/Makefile
index 4e997b9040b9..8b109efa7c6e 100644
--- a/www/neon/Makefile
+++ b/www/neon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	rodrigc@attbi.com
+COMMENT=	An HTTP and WebDAV client library for Unix systems, with a C interface
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
diff --git a/www/neon/pkg-comment b/www/neon/pkg-comment
deleted file mode 100644
index df173d85c7b3..000000000000
--- a/www/neon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HTTP and WebDAV client library for Unix systems, with a C interface
diff --git a/www/neon26/Makefile b/www/neon26/Makefile
index 4e997b9040b9..8b109efa7c6e 100644
--- a/www/neon26/Makefile
+++ b/www/neon26/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	rodrigc@attbi.com
+COMMENT=	An HTTP and WebDAV client library for Unix systems, with a C interface
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
diff --git a/www/neon26/pkg-comment b/www/neon26/pkg-comment
deleted file mode 100644
index df173d85c7b3..000000000000
--- a/www/neon26/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HTTP and WebDAV client library for Unix systems, with a C interface
diff --git a/www/neon28/Makefile b/www/neon28/Makefile
index 4e997b9040b9..8b109efa7c6e 100644
--- a/www/neon28/Makefile
+++ b/www/neon28/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	rodrigc@attbi.com
+COMMENT=	An HTTP and WebDAV client library for Unix systems, with a C interface
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
diff --git a/www/neon28/pkg-comment b/www/neon28/pkg-comment
deleted file mode 100644
index df173d85c7b3..000000000000
--- a/www/neon28/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HTTP and WebDAV client library for Unix systems, with a C interface
diff --git a/www/neon29/Makefile b/www/neon29/Makefile
index 4e997b9040b9..8b109efa7c6e 100644
--- a/www/neon29/Makefile
+++ b/www/neon29/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.webdav.org/neon/
 
 MAINTAINER=	rodrigc@attbi.com
+COMMENT=	An HTTP and WebDAV client library for Unix systems, with a C interface
 
 LIB_DEPENDS=	expat.4:${PORTSDIR}/textproc/expat2
 
diff --git a/www/neon29/pkg-comment b/www/neon29/pkg-comment
deleted file mode 100644
index df173d85c7b3..000000000000
--- a/www/neon29/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HTTP and WebDAV client library for Unix systems, with a C interface
diff --git a/www/notftp/Makefile b/www/notftp/Makefile
index 178629fb280c..87a6723f2322 100644
--- a/www/notftp/Makefile
+++ b/www/notftp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://wonko.com/notftp/files/
 
 MAINTAINER=	ryan@wonko.com
+COMMENT=	An easy to use Web to FTP gateway written in PHP
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
diff --git a/www/notftp/pkg-comment b/www/notftp/pkg-comment
deleted file mode 100644
index c83579337e91..000000000000
--- a/www/notftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy to use Web to FTP gateway written in PHP
diff --git a/www/npc/Makefile b/www/npc/Makefile
index 1e744a9ca94a..8c0018def5e3 100644
--- a/www/npc/Makefile
+++ b/www/npc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www2.biglobe.ne.jp/%7Enir/soft/
 
 MAINTAINER=	yasuf@big.or.jp
+COMMENT=	An animated web counter
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAKE_ARGS=	INDEX_DIR="${INDEX_DIR}"
diff --git a/www/npc/pkg-comment b/www/npc/pkg-comment
deleted file mode 100644
index 087dd6ebd65e..000000000000
--- a/www/npc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An animated web counter
diff --git a/www/p5-Apache-AntiSpam/Makefile b/www/p5-Apache-AntiSpam/Makefile
index e0506eec40b5..0b4ce07590c4 100644
--- a/www/p5-Apache-AntiSpam/Makefile
+++ b/www/p5-Apache-AntiSpam/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	AntiSpam filter for web pages
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser \
diff --git a/www/p5-Apache-AntiSpam/pkg-comment b/www/p5-Apache-AntiSpam/pkg-comment
deleted file mode 100644
index bc7d74717207..000000000000
--- a/www/p5-Apache-AntiSpam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-AntiSpam filter for web pages
diff --git a/www/p5-Apache-ConfigFile/Makefile b/www/p5-Apache-ConfigFile/Makefile
index 3b90e4b7d556..0f0bb469c2bd 100644
--- a/www/p5-Apache-ConfigFile/Makefile
+++ b/www/p5-Apache-ConfigFile/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	../by-authors/id/N/NW/NWIGER
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Apache::ConfigFile - Parse Apache style httpd.conf configuration files
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-Apache-ConfigFile/pkg-comment b/www/p5-Apache-ConfigFile/pkg-comment
deleted file mode 100644
index ef37d82d7738..000000000000
--- a/www/p5-Apache-ConfigFile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache::ConfigFile - Parse Apache style httpd.conf configuration files
diff --git a/www/p5-Apache-MP3/Makefile b/www/p5-Apache-MP3/Makefile
index 78c1d4000903..ca19232cde0b 100644
--- a/www/p5-Apache-MP3/Makefile
+++ b/www/p5-Apache-MP3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	MP3 browsing and streaming under mod_perl and Apache
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/Audio/Wav.pm:${PORTSDIR}/audio/p5-Audio-Wav \
diff --git a/www/p5-Apache-MP3/pkg-comment b/www/p5-Apache-MP3/pkg-comment
deleted file mode 100644
index 719173a7f4f1..000000000000
--- a/www/p5-Apache-MP3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MP3 browsing and streaming under mod_perl and Apache
diff --git a/www/p5-Apache-NNTPGateway/Makefile b/www/p5-Apache-NNTPGateway/Makefile
index cd434062272b..a4e01ace6c2a 100644
--- a/www/p5-Apache-NNTPGateway/Makefile
+++ b/www/p5-Apache-NNTPGateway/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	skv@protey.ru
+COMMENT=	A NNTP interface for mod_perl enabled Apache web server
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/www/p5-Apache-NNTPGateway/pkg-comment b/www/p5-Apache-NNTPGateway/pkg-comment
deleted file mode 100644
index 63504cce915e..000000000000
--- a/www/p5-Apache-NNTPGateway/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A NNTP interface for mod_perl enabled Apache web server
diff --git a/www/p5-Apache-PageKit/Makefile b/www/p5-Apache-PageKit/Makefile
index d6847cf18a14..22d7b0c6c599 100644
--- a/www/p5-Apache-PageKit/Makefile
+++ b/www/p5-Apache-PageKit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svenasse@polaris.ca
+COMMENT=	MVCC web framework using mod_perl, XML and HTML::Template
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
 		${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
diff --git a/www/p5-Apache-PageKit/pkg-comment b/www/p5-Apache-PageKit/pkg-comment
deleted file mode 100644
index 9be625cafdd1..000000000000
--- a/www/p5-Apache-PageKit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MVCC web framework using mod_perl, XML and HTML::Template
diff --git a/www/p5-Apache-Peek/Makefile b/www/p5-Apache-Peek/Makefile
index c590028b20bf..fdc9395ad2c8 100644
--- a/www/p5-Apache-Peek/Makefile
+++ b/www/p5-Apache-Peek/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	leo@florida.sarang.net
+COMMENT=	A perl5 data debugging tool for the XS programmer
 
 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}/B/Graph.pm:${PORTSDIR}/devel/p5-B-Graph
diff --git a/www/p5-Apache-Peek/pkg-comment b/www/p5-Apache-Peek/pkg-comment
deleted file mode 100644
index 30123917d49d..000000000000
--- a/www/p5-Apache-Peek/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 data debugging tool for the XS programmer
diff --git a/www/p5-Apache-Session/Makefile b/www/p5-Apache-Session/Makefile
index a1dfae7fc8a0..a2ceb08216ec 100644
--- a/www/p5-Apache-Session/Makefile
+++ b/www/p5-Apache-Session/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	frank@exit.com
+COMMENT=	A persistence framework for session data
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-Apache-Session/pkg-comment b/www/p5-Apache-Session/pkg-comment
deleted file mode 100644
index 8dec124a8118..000000000000
--- a/www/p5-Apache-Session/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A persistence framework for session data
diff --git a/www/p5-Apache-SubProcess/Makefile b/www/p5-Apache-SubProcess/Makefile
index b7c64e88fb0a..8f865ad2b6b3 100644
--- a/www/p5-Apache-SubProcess/Makefile
+++ b/www/p5-Apache-SubProcess/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	larse@isi.edu
+COMMENT=	Forking and executing subprocesses from mod_perl
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
 
diff --git a/www/p5-Apache-SubProcess/pkg-comment b/www/p5-Apache-SubProcess/pkg-comment
deleted file mode 100644
index 8be790026d6d..000000000000
--- a/www/p5-Apache-SubProcess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Forking and executing subprocesses from mod_perl
diff --git a/www/p5-ApacheBench/Makefile b/www/p5-ApacheBench/Makefile
index db406c3a22cf..ebe569f90c94 100644
--- a/www/p5-ApacheBench/Makefile
+++ b/www/p5-ApacheBench/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTTPD
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	Perl module for HTTP benchmarking
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-ApacheBench/pkg-comment b/www/p5-ApacheBench/pkg-comment
deleted file mode 100644
index 89af6d2ef32b..000000000000
--- a/www/p5-ApacheBench/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for HTTP benchmarking
diff --git a/www/p5-AxKit-XSP-Cookie/Makefile b/www/p5-AxKit-XSP-Cookie/Makefile
index 9725ea317eb7..cf845212ee43 100644
--- a/www/p5-AxKit-XSP-Cookie/Makefile
+++ b/www/p5-AxKit-XSP-Cookie/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	An XSP library for setting and getting HTTP cookies
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-AxKit-XSP-Cookie/pkg-comment b/www/p5-AxKit-XSP-Cookie/pkg-comment
deleted file mode 100644
index 8b4890c33231..000000000000
--- a/www/p5-AxKit-XSP-Cookie/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An XSP library for setting and getting HTTP cookies
diff --git a/www/p5-AxKit-XSP-ESQL/Makefile b/www/p5-AxKit-XSP-ESQL/Makefile
index 7a6dc8af483c..c0835047847b 100644
--- a/www/p5-AxKit-XSP-ESQL/Makefile
+++ b/www/p5-AxKit-XSP-ESQL/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	An Extended SQL taglib for AxKit eXtensible Server Pages
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
 		${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
diff --git a/www/p5-AxKit-XSP-ESQL/pkg-comment b/www/p5-AxKit-XSP-ESQL/pkg-comment
deleted file mode 100644
index 314c344f427e..000000000000
--- a/www/p5-AxKit-XSP-ESQL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Extended SQL taglib for AxKit eXtensible Server Pages
diff --git a/www/p5-AxKit-XSP-Exception/Makefile b/www/p5-AxKit-XSP-Exception/Makefile
index 9fe0b7e3414a..663c56b39bdf 100644
--- a/www/p5-AxKit-XSP-Exception/Makefile
+++ b/www/p5-AxKit-XSP-Exception/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	Exceptions taglib for eXtensible Server Pages plugin for AxKit
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-AxKit-XSP-Exception/pkg-comment b/www/p5-AxKit-XSP-Exception/pkg-comment
deleted file mode 100644
index 4fe281a2d5ee..000000000000
--- a/www/p5-AxKit-XSP-Exception/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Exceptions taglib for eXtensible Server Pages plugin for AxKit
diff --git a/www/p5-AxKit-XSP-IfParam/Makefile b/www/p5-AxKit-XSP-IfParam/Makefile
index 2e14021ec946..6540dbdf02ab 100644
--- a/www/p5-AxKit-XSP-IfParam/Makefile
+++ b/www/p5-AxKit-XSP-IfParam/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	Equivalent of XSP Param taglib, but conditional plugin for AxKit
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-AxKit-XSP-IfParam/pkg-comment b/www/p5-AxKit-XSP-IfParam/pkg-comment
deleted file mode 100644
index 751ad182e409..000000000000
--- a/www/p5-AxKit-XSP-IfParam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Equivalent of XSP Param taglib, but conditional plugin for AxKit
diff --git a/www/p5-AxKit-XSP-Param/Makefile b/www/p5-AxKit-XSP-Param/Makefile
index 0d0313a0fca4..ea00acfc50f8 100644
--- a/www/p5-AxKit-XSP-Param/Makefile
+++ b/www/p5-AxKit-XSP-Param/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	A namespace wrapper for accessing HTTP request paramaters
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-AxKit-XSP-Param/pkg-comment b/www/p5-AxKit-XSP-Param/pkg-comment
deleted file mode 100644
index 795bb938fd78..000000000000
--- a/www/p5-AxKit-XSP-Param/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A namespace wrapper for accessing HTTP request paramaters
diff --git a/www/p5-AxKit-XSP-PerForm/Makefile b/www/p5-AxKit-XSP-PerForm/Makefile
index 42ef3b4b1749..a1861bef3eae 100644
--- a/www/p5-AxKit-XSP-PerForm/Makefile
+++ b/www/p5-AxKit-XSP-PerForm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	XSP Taglib for making complex forms easy
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
 		${SITE_PERL}/AxKit/XSP/WebUtils.pm:${PORTSDIR}/www/p5-AxKit-XSP-WebUtils
diff --git a/www/p5-AxKit-XSP-PerForm/pkg-comment b/www/p5-AxKit-XSP-PerForm/pkg-comment
deleted file mode 100644
index 282700995bd8..000000000000
--- a/www/p5-AxKit-XSP-PerForm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSP Taglib for making complex forms easy
diff --git a/www/p5-AxKit-XSP-Sendmail/Makefile b/www/p5-AxKit-XSP-Sendmail/Makefile
index d7e18de66efd..2b7c42f627a1 100644
--- a/www/p5-AxKit-XSP-Sendmail/Makefile
+++ b/www/p5-AxKit-XSP-Sendmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	Simple SMTP mailer tag library for AxKit eXtesible Server Pages.
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
 		${SITE_PERL}/Mail/Sendmail.pm:${PORTSDIR}/mail/p5-Mail-Sendmail \
diff --git a/www/p5-AxKit-XSP-Sendmail/pkg-comment b/www/p5-AxKit-XSP-Sendmail/pkg-comment
deleted file mode 100644
index f4d1c35e5aca..000000000000
--- a/www/p5-AxKit-XSP-Sendmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple SMTP mailer tag library for AxKit eXtesible Server Pages.
diff --git a/www/p5-AxKit-XSP-Util/Makefile b/www/p5-AxKit-XSP-Util/Makefile
index 0d6ffb70ffb8..695000ece144 100644
--- a/www/p5-AxKit-XSP-Util/Makefile
+++ b/www/p5-AxKit-XSP-Util/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.cpan.org/authors/id/M/MS/MSERGEANT/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	XSP util: taglib plugin for AxKit
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit \
 		${SITE_PERL}/${PERL_ARCH}/HTTP/GHTTP.pm:${PORTSDIR}/www/p5-HTTP-GHTTP \
diff --git a/www/p5-AxKit-XSP-Util/pkg-comment b/www/p5-AxKit-XSP-Util/pkg-comment
deleted file mode 100644
index f753579d1768..000000000000
--- a/www/p5-AxKit-XSP-Util/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSP util: taglib plugin for AxKit
diff --git a/www/p5-AxKit-XSP-WebUtils/Makefile b/www/p5-AxKit-XSP-WebUtils/Makefile
index 74babc0d479a..775e0c4bb91c 100644
--- a/www/p5-AxKit-XSP-WebUtils/Makefile
+++ b/www/p5-AxKit-XSP-WebUtils/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/3./3_/}
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	Plugin for AxKit that provide utilities for building XSP web apps
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/AxKit.pm:${PORTSDIR}/www/p5-AxKit
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-AxKit-XSP-WebUtils/pkg-comment b/www/p5-AxKit-XSP-WebUtils/pkg-comment
deleted file mode 100644
index 7419294ece93..000000000000
--- a/www/p5-AxKit-XSP-WebUtils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Plugin for AxKit that provide utilities for building XSP web apps
diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
index d8ecb4b74095..46103f75948a 100644
--- a/www/p5-AxKit/Makefile
+++ b/www/p5-AxKit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.axkit.org/download/
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	XML Delivery Toolkit for Apache/Perl
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 BUILD_DEPENDS=	\
diff --git a/www/p5-AxKit/pkg-comment b/www/p5-AxKit/pkg-comment
deleted file mode 100644
index f5c5b31b5c44..000000000000
--- a/www/p5-AxKit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML Delivery Toolkit for Apache/Perl
diff --git a/www/p5-Bundle-Slash/Makefile b/www/p5-Bundle-Slash/Makefile
index 6577743663fc..0e01b08cf503 100644
--- a/www/p5-Bundle-Slash/Makefile
+++ b/www/p5-Bundle-Slash/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Bundle
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	autrijus@autrijus.org
+COMMENT=	A bundle to install all modules used for Slash
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
diff --git a/www/p5-Bundle-Slash/pkg-comment b/www/p5-Bundle-Slash/pkg-comment
deleted file mode 100644
index 9bb96e340c3e..000000000000
--- a/www/p5-Bundle-Slash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bundle to install all modules used for Slash
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index 3bbfa85d83ef..691096e39bde 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl extension for persistent session management
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-CGI-Session/pkg-comment b/www/p5-CGI-Session/pkg-comment
deleted file mode 100644
index 601428c415d7..000000000000
--- a/www/p5-CGI-Session/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for persistent session management
diff --git a/www/p5-CGI-SpeedyCGI/Makefile b/www/p5-CGI-SpeedyCGI/Makefile
index e333267c1d0a..df931d18c9e0 100644
--- a/www/p5-CGI-SpeedyCGI/Makefile
+++ b/www/p5-CGI-SpeedyCGI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	CGI
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	lars@thegler.dk
+COMMENT=	Speed up perl CGI scripts by running them persistently
 
 #SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
diff --git a/www/p5-CGI-SpeedyCGI/pkg-comment b/www/p5-CGI-SpeedyCGI/pkg-comment
deleted file mode 100644
index 2b6b7b1b3543..000000000000
--- a/www/p5-CGI-SpeedyCGI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Speed up perl CGI scripts by running them persistently
diff --git a/www/p5-FAQ-OMatic/Makefile b/www/p5-FAQ-OMatic/Makefile
index 6ed890e39ac9..6f5334b11f2d 100644
--- a/www/p5-FAQ-OMatic/Makefile
+++ b/www/p5-FAQ-OMatic/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	FAQ
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svenasse@polaris.ca
+COMMENT=	Perl API to manipulate FAQ-O-Matics
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-FAQ-OMatic/pkg-comment b/www/p5-FAQ-OMatic/pkg-comment
deleted file mode 100644
index 40914a22d2b9..000000000000
--- a/www/p5-FAQ-OMatic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl API to manipulate FAQ-O-Matics
diff --git a/www/p5-HTML-CalendarMonthSimple/Makefile b/www/p5-HTML-CalendarMonthSimple/Makefile
index c6b9876ed0b3..aa5b1e55489b 100644
--- a/www/p5-HTML-CalendarMonthSimple/Makefile
+++ b/www/p5-HTML-CalendarMonthSimple/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	HTML::CalendarMonthSimple - Perl Module for Generating HTML Calendars
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-HTML-CalendarMonthSimple/pkg-comment b/www/p5-HTML-CalendarMonthSimple/pkg-comment
deleted file mode 100644
index 03348a7102a6..000000000000
--- a/www/p5-HTML-CalendarMonthSimple/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML::CalendarMonthSimple - Perl Module for Generating HTML Calendars
diff --git a/www/p5-HTML-Embperl/Makefile b/www/p5-HTML-Embperl/Makefile
index a8bbab797a30..730d43e31fdf 100644
--- a/www/p5-HTML-Embperl/Makefile
+++ b/www/p5-HTML-Embperl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	kapr@crosswinds.net
+COMMENT=	A module to allow embedded perl in HTML documents
 
 .if !defined(WITHOUT_APACHE)
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
diff --git a/www/p5-HTML-Embperl/pkg-comment b/www/p5-HTML-Embperl/pkg-comment
deleted file mode 100644
index 10333dc98845..000000000000
--- a/www/p5-HTML-Embperl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module to allow embedded perl in HTML documents
diff --git a/www/p5-HTML-FillInForm/Makefile b/www/p5-HTML-FillInForm/Makefile
index 9bff871b7ee3..ee3f0c83d43e 100644
--- a/www/p5-HTML-FillInForm/Makefile
+++ b/www/p5-HTML-FillInForm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl5 module for auto-filling HTML form fields from previous values
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-HTML-FillInForm/pkg-comment b/www/p5-HTML-FillInForm/pkg-comment
deleted file mode 100644
index f1897e367e5f..000000000000
--- a/www/p5-HTML-FillInForm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for auto-filling HTML form fields from previous values
diff --git a/www/p5-HTML-FromText/Makefile b/www/p5-HTML-FromText/Makefile
index f84931dcf6bd..5d31d1949ad6 100644
--- a/www/p5-HTML-FromText/Makefile
+++ b/www/p5-HTML-FromText/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		svenasse@polaris.ca
+COMMENT=	Mark up text as HTML
 
 PERL_CONFIGURE=		yes
 
diff --git a/www/p5-HTML-FromText/pkg-comment b/www/p5-HTML-FromText/pkg-comment
deleted file mode 100644
index aaace9a59e2e..000000000000
--- a/www/p5-HTML-FromText/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mark up text as HTML
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index ad32400af114..badc21b22fde 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	dsh@vlink.ru
+COMMENT=	High-performance, dynamic web site authoring system
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Apache/Request.pm:${PORTSDIR}/www/p5-libapreq \
 		${SITE_PERL}/${PERL_ARCH}/Params/Validate.pm:${PORTSDIR}/devel/p5-Params-Validate \
diff --git a/www/p5-HTML-Mason/pkg-comment b/www/p5-HTML-Mason/pkg-comment
deleted file mode 100644
index 379375573e10..000000000000
--- a/www/p5-HTML-Mason/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-performance, dynamic web site authoring system
diff --git a/www/p5-HTML-StickyQuery/Makefile b/www/p5-HTML-StickyQuery/Makefile
index 8c81bdcb5a6f..66777564257c 100644
--- a/www/p5-HTML-StickyQuery/Makefile
+++ b/www/p5-HTML-StickyQuery/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=		p5-
 
 MAINTAINER=		svenasse@polaris.ca
+COMMENT=	Add sticky QUERY_STRING to a tag href attributes
 
 BUILD_DEPENDS=		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 			${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI
diff --git a/www/p5-HTML-StickyQuery/pkg-comment b/www/p5-HTML-StickyQuery/pkg-comment
deleted file mode 100644
index cd4035e8a3da..000000000000
--- a/www/p5-HTML-StickyQuery/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Add sticky QUERY_STRING to a tag href attributes
diff --git a/www/p5-HTML-Stream/Makefile b/www/p5-HTML-Stream/Makefile
index b195e72235e6..d1f4176a41ec 100644
--- a/www/p5-HTML-Stream/Makefile
+++ b/www/p5-HTML-Stream/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl5 HTML output stream class, and some markup utilities
 
 PERL_CONFIGURE=	YES
 
diff --git a/www/p5-HTML-Stream/pkg-comment b/www/p5-HTML-Stream/pkg-comment
deleted file mode 100644
index bfe9f268bcbd..000000000000
--- a/www/p5-HTML-Stream/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 HTML output stream class, and some markup utilities
diff --git a/www/p5-HTML-TableExtract/Makefile b/www/p5-HTML-TableExtract/Makefile
index f6555e84881e..36cb97ded9ea 100644
--- a/www/p5-HTML-TableExtract/Makefile
+++ b/www/p5-HTML-TableExtract/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Extract text contained in tables within an HTML document
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-HTML-TableExtract/pkg-comment b/www/p5-HTML-TableExtract/pkg-comment
deleted file mode 100644
index 519eca8dabc2..000000000000
--- a/www/p5-HTML-TableExtract/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extract text contained in tables within an HTML document
diff --git a/www/p5-WWW-Babelfish/Makefile b/www/p5-WWW-Babelfish/Makefile
index 74edc7dfddb4..9e85705f43f1 100644
--- a/www/p5-WWW-Babelfish/Makefile
+++ b/www/p5-WWW-Babelfish/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl interface to obtain translations from the babelfish server
 
 BUILD_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String
diff --git a/www/p5-WWW-Babelfish/pkg-comment b/www/p5-WWW-Babelfish/pkg-comment
deleted file mode 100644
index d8342434e07f..000000000000
--- a/www/p5-WWW-Babelfish/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to obtain translations from the babelfish server
diff --git a/www/p5-WWW-IMDb/Makefile b/www/p5-WWW-IMDb/Makefile
index 69918fe2a2e0..57fcf8642004 100644
--- a/www/p5-WWW-IMDb/Makefile
+++ b/www/p5-WWW-IMDb/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX=	p5-WWW-
 DISTNAME=	IMDb-current
 
 MAINTAINER=	mich@freebsdcluster.org
+COMMENT=	Perl interface to query the Internet Movie Database(IMDb)
 
 RUN_DEPENDS=	${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
 		${SITE_PERL}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
diff --git a/www/p5-WWW-IMDb/pkg-comment b/www/p5-WWW-IMDb/pkg-comment
deleted file mode 100644
index 681792cb72f5..000000000000
--- a/www/p5-WWW-IMDb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to query the Internet Movie Database(IMDb)
diff --git a/www/p5-WWW-Link/Makefile b/www/p5-WWW-Link/Makefile
index 470f00186770..2667904dc44d 100644
--- a/www/p5-WWW-Link/Makefile
+++ b/www/p5-WWW-Link/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	../by-authors/id/M/MI/MIKEDLR
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	svenasse@polaris.ca
+COMMENT=	Maintain information about the state of links
 
 PERL_CONFIGURE=	yes
 
diff --git a/www/p5-WWW-Link/pkg-comment b/www/p5-WWW-Link/pkg-comment
deleted file mode 100644
index 1ad60a3340b0..000000000000
--- a/www/p5-WWW-Link/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Maintain information about the state of links
diff --git a/www/p5-WWW-Search-AltaVista/Makefile b/www/p5-WWW-Search-AltaVista/Makefile
index 2dfc28a84894..4bd511fc2ee6 100644
--- a/www/p5-WWW-Search-AltaVista/Makefile
+++ b/www/p5-WWW-Search-AltaVista/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	WWW/MTHURN
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl WWW::Search class for searching AltaVista
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/WWW/Search.pm:${PORTSDIR}/www/p5-WWW-Search
 RUN_DEPENDS=	${BUILD_DEPENDS}
diff --git a/www/p5-WWW-Search-AltaVista/pkg-comment b/www/p5-WWW-Search-AltaVista/pkg-comment
deleted file mode 100644
index b09d8f998921..000000000000
--- a/www/p5-WWW-Search-AltaVista/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl WWW::Search class for searching AltaVista
diff --git a/www/p5-WWW-Search-Google/Makefile b/www/p5-WWW-Search-Google/Makefile
index b6fcfd6b1a51..a371dc264b63 100644
--- a/www/p5-WWW-Search-Google/Makefile
+++ b/www/p5-WWW-Search-Google/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl WWW::Search class for searching Google
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/WWW/Search.pm:${PORTSDIR}/www/p5-WWW-Search \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite \
diff --git a/www/p5-WWW-Search-Google/pkg-comment b/www/p5-WWW-Search-Google/pkg-comment
deleted file mode 100644
index 2e8106cb5466..000000000000
--- a/www/p5-WWW-Search-Google/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl WWW::Search class for searching Google
diff --git a/www/p5-WWW-Search/Makefile b/www/p5-WWW-Search/Makefile
index bfdb9ec1c4cc..86f6494a7643 100644
--- a/www/p5-WWW-Search/Makefile
+++ b/www/p5-WWW-Search/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	WWW
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	A perl5 module for WWW searches
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree \
diff --git a/www/p5-WWW-Search/pkg-comment b/www/p5-WWW-Search/pkg-comment
deleted file mode 100644
index 8494b216ce35..000000000000
--- a/www/p5-WWW-Search/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module for WWW searches
diff --git a/www/php-dyn/Makefile b/www/php-dyn/Makefile
index bb8cbc2367ed..40ea24a86808 100644
--- a/www/php-dyn/Makefile
+++ b/www/php-dyn/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	php_dyn-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	A PHP Extension to help debugging a PHP script
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf \
diff --git a/www/php-dyn/pkg-comment b/www/php-dyn/pkg-comment
deleted file mode 100644
index 150f79535f20..000000000000
--- a/www/php-dyn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PHP Extension to help debugging a PHP script
diff --git a/www/php-screw/Makefile b/www/php-screw/Makefile
index 64481ebb74af..d37148628a05 100644
--- a/www/php-screw/Makefile
+++ b/www/php-screw/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	php_screw-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	A PHP script encryption tool
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf \
diff --git a/www/php-screw/pkg-comment b/www/php-screw/pkg-comment
deleted file mode 100644
index 6548c79db25d..000000000000
--- a/www/php-screw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PHP script encryption tool
diff --git a/www/php-templates/Makefile b/www/php-templates/Makefile
index aa862cb6ff31..c0528a41939e 100644
--- a/www/php-templates/Makefile
+++ b/www/php-templates/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	php_templates-${PORTVERSION}
 
 MAINTAINER=	sysadmin@alexdupre.com
+COMMENT=	A template framework for PHP
 
 BUILD_DEPENDS=	aclocal:${PORTSDIR}/devel/automake \
 		autoconf:${PORTSDIR}/devel/autoconf \
diff --git a/www/php-templates/pkg-comment b/www/php-templates/pkg-comment
deleted file mode 100644
index d84b35c1702c..000000000000
--- a/www/php-templates/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A template framework for PHP
diff --git a/www/phpSysInfo/Makefile b/www/phpSysInfo/Makefile
index ca22380fc3d9..642334633711 100644
--- a/www/phpSysInfo/Makefile
+++ b/www/phpSysInfo/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpsysinfo
 
 MAINTAINER=	so14k@so14k.com
+COMMENT=	A php script that displays info about the host being accessed
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
diff --git a/www/phpSysInfo/pkg-comment b/www/phpSysInfo/pkg-comment
deleted file mode 100644
index f5963b8859c5..000000000000
--- a/www/phpSysInfo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A php script that displays info about the host being accessed
diff --git a/www/phpsysinfo-dev/Makefile b/www/phpsysinfo-dev/Makefile
index ca22380fc3d9..642334633711 100644
--- a/www/phpsysinfo-dev/Makefile
+++ b/www/phpsysinfo-dev/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpsysinfo
 
 MAINTAINER=	so14k@so14k.com
+COMMENT=	A php script that displays info about the host being accessed
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
diff --git a/www/phpsysinfo-dev/pkg-comment b/www/phpsysinfo-dev/pkg-comment
deleted file mode 100644
index f5963b8859c5..000000000000
--- a/www/phpsysinfo-dev/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A php script that displays info about the host being accessed
diff --git a/www/phpsysinfo/Makefile b/www/phpsysinfo/Makefile
index ca22380fc3d9..642334633711 100644
--- a/www/phpsysinfo/Makefile
+++ b/www/phpsysinfo/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	phpsysinfo
 
 MAINTAINER=	so14k@so14k.com
+COMMENT=	A php script that displays info about the host being accessed
 
 RUN_DEPENDS=	${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
 
diff --git a/www/phpsysinfo/pkg-comment b/www/phpsysinfo/pkg-comment
deleted file mode 100644
index f5963b8859c5..000000000000
--- a/www/phpsysinfo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A php script that displays info about the host being accessed
diff --git a/www/plugger/Makefile b/www/plugger/Makefile
index 97b3520247ce..794ac0c4b08c 100644
--- a/www/plugger/Makefile
+++ b/www/plugger/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	sdk/plugin/unix
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} unix-sdk-3.0b5.tar.Z
 
 MAINTAINER=	coop9211@uidaho.edu
+COMMENT=	A multimedia front-end plugin for Mozilla or Opera
 
 RUN_DEPENDS=	${X11BASE}/bin/xanim:${PORTSDIR}/graphics/xanim \
 		${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++ \
diff --git a/www/plugger/pkg-comment b/www/plugger/pkg-comment
deleted file mode 100644
index e6c0736101f7..000000000000
--- a/www/plugger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multimedia front-end plugin for Mozilla or Opera
diff --git a/www/postnuke/Makefile b/www/postnuke/Makefile
index a3d84d2e8efc..ddadf6cde44e 100644
--- a/www/postnuke/Makefile
+++ b/www/postnuke/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	post-nuke
 DISTNAME=	Rogue_714
 
 MAINTAINER=	rapzzard@rapzzard.pe.kr
+COMMENT=	An automated website package to distribute and manage content
 
 LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=    ${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
diff --git a/www/postnuke/pkg-comment b/www/postnuke/pkg-comment
deleted file mode 100644
index 7a9af92c432b..000000000000
--- a/www/postnuke/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automated website package to distribute and manage content
diff --git a/www/privoxy+ipv6/Makefile b/www/privoxy+ipv6/Makefile
index 14268020d7d3..f27630f1128b 100644
--- a/www/privoxy+ipv6/Makefile
+++ b/www/privoxy+ipv6/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	ijbswa
 DISTNAME=	privoxy-3.0.0-stable-src
 
 MAINTAINER=	john@essenz.com
+COMMENT=	Privoxy is a web proxy with advanced filtering capabilities
 
 WRKSRC=		${WRKDIR}/privoxy-3.0.0-stable
 
diff --git a/www/privoxy+ipv6/pkg-comment b/www/privoxy+ipv6/pkg-comment
deleted file mode 100644
index 8a0a41d4d6be..000000000000
--- a/www/privoxy+ipv6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Privoxy is a web proxy with advanced filtering capabilities
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 14268020d7d3..f27630f1128b 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	ijbswa
 DISTNAME=	privoxy-3.0.0-stable-src
 
 MAINTAINER=	john@essenz.com
+COMMENT=	Privoxy is a web proxy with advanced filtering capabilities
 
 WRKSRC=		${WRKDIR}/privoxy-3.0.0-stable
 
diff --git a/www/privoxy/pkg-comment b/www/privoxy/pkg-comment
deleted file mode 100644
index 8a0a41d4d6be..000000000000
--- a/www/privoxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Privoxy is a web proxy with advanced filtering capabilities
diff --git a/www/py-albatross/Makefile b/www/py-albatross/Makefile
index ec8533600e54..dd85c5480411 100644
--- a/www/py-albatross/Makefile
+++ b/www/py-albatross/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=	http://object-craft.com.au/projects/albatross/download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	gnb@itga.com.au
+COMMENT=	Python toolkit for developing highly stateful web applications
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/www/py-albatross/pkg-comment b/www/py-albatross/pkg-comment
deleted file mode 100644
index f61982316caf..000000000000
--- a/www/py-albatross/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python toolkit for developing highly stateful web applications
diff --git a/www/py-fcgi/Makefile b/www/py-fcgi/Makefile
index 1e1b8c25d7b4..2ffc1129405d 100644
--- a/www/py-fcgi/Makefile
+++ b/www/py-fcgi/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.py
 EXTRACT_ONLY=	#
 
 MAINTAINER=	hollywar@mail.holywar.net
+COMMENT=	Python FastCGI interface library
 
 USE_PYTHON=	yes
 NO_WRKSUBDIR=	yes
diff --git a/www/py-fcgi/pkg-comment b/www/py-fcgi/pkg-comment
deleted file mode 100644
index 10b274f28da9..000000000000
--- a/www/py-fcgi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python FastCGI interface library
diff --git a/www/pyweblib/Makefile b/www/pyweblib/Makefile
index 294c1ef1651a..79401ca5dfb0 100644
--- a/www/pyweblib/Makefile
+++ b/www/pyweblib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.stroeder.com/pylib/PyWebLib/download/ \
 		http://www.tricknology.org/ports/
 
 MAINTAINER=	oddbjorn@tricknology.org
+COMMENT=	Yet another web programming framework for Python
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
diff --git a/www/pyweblib/pkg-comment b/www/pyweblib/pkg-comment
deleted file mode 100644
index 3fe3bc2d0f3e..000000000000
--- a/www/pyweblib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another web programming framework for Python
diff --git a/www/reportmagic/Makefile b/www/reportmagic/Makefile
index a8c26618fc60..2c8a129a09bc 100644
--- a/www/reportmagic/Makefile
+++ b/www/reportmagic/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.reportmagic.com/	\
 DISTNAME=	rmagic-${PORTVERSION}
 
 MAINTAINER=	jeremy@external.org
+COMMENT=	A web site statistics post-processor for Analog
 
 RUN_DEPENDS=	analog:${PORTSDIR}/www/analog \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GD/Graph3d.pm:${PORTSDIR}/graphics/p5-GD-Graph3d \
diff --git a/www/reportmagic/pkg-comment b/www/reportmagic/pkg-comment
deleted file mode 100644
index f9e2bc404c29..000000000000
--- a/www/reportmagic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web site statistics post-processor for Analog
diff --git a/www/roxen/Makefile b/www/roxen/Makefile
index 808300c8158f..712746628bca 100644
--- a/www/roxen/Makefile
+++ b/www/roxen/Makefile
@@ -13,6 +13,7 @@ FETCH_CMD=	/usr/bin/fetch
 DISTNAME=	roxen-dist-2.1.231
 WRKSRC=		${WRKDIR}/roxen-${PORTVERSION}-src
 MAINTAINER=	k@123.org
+COMMENT=	The Roxen WebServer 2.1
 HAS_CONFIGURE=	yes
 PKGMESSAGE=     ${WRKSRC}/MESSAGE
 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/roxen.sh.sample
diff --git a/www/roxen/pkg-comment b/www/roxen/pkg-comment
deleted file mode 100644
index 2e3a0f5169a8..000000000000
--- a/www/roxen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Roxen WebServer 2.1
diff --git a/www/ruboard/Makefile b/www/ruboard/Makefile
index 8584e1029b52..346bfb20a82f 100644
--- a/www/ruboard/Makefile
+++ b/www/ruboard/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	www russian
 MASTER_SITES=	ftp://ftp.amsoft.ru/software/ruboard/
 
 MAINTAINER=	am@amsoft.ru
+COMMENT=	A web based discussion board
 
 USE_PERL5_BUILD=yes
 USE_PERL5_RUN	=yes
diff --git a/www/ruboard/pkg-comment b/www/ruboard/pkg-comment
deleted file mode 100644
index 4a779aae510a..000000000000
--- a/www/ruboard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web based discussion board
diff --git a/www/scout/Makefile b/www/scout/Makefile
index 222b9ed5dc48..5afb217dd023 100644
--- a/www/scout/Makefile
+++ b/www/scout/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://sid.joedog.org/pub/scout/ \
 	http://www.cus.org.uk/~dom/distfiles/scout/
 
 MAINTAINER=	d.marks@student.umist.ac.uk
+COMMENT=	A utility to harvest URLs from a given start point
 
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS+=	--disable-shared --enable-static
diff --git a/www/scout/pkg-comment b/www/scout/pkg-comment
deleted file mode 100644
index 1950f87895f9..000000000000
--- a/www/scout/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility to harvest URLs from a given start point
diff --git a/www/sidplug/Makefile b/www/sidplug/Makefile
index 0717674e5904..fa60b0a47990 100644
--- a/www/sidplug/Makefile
+++ b/www/sidplug/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	coop9211@uidaho.edu
+COMMENT=	A Commodore 64 psid audio plugin for Mozilla or Opera
 
 RUN_DEPENDS=	xsidplay:${PORTSDIR}/audio/xsidplay
 
diff --git a/www/sidplug/pkg-comment b/www/sidplug/pkg-comment
deleted file mode 100644
index 2fa599f0b448..000000000000
--- a/www/sidplug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Commodore 64 psid audio plugin for Mozilla or Opera
diff --git a/www/slash/Makefile b/www/slash/Makefile
index 449063de1c71..59b61972484f 100644
--- a/www/slash/Makefile
+++ b/www/slash/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	slashcode
 
 MAINTAINER=	autrijus@autrijus.org
+COMMENT=	Slash-Like Automatic Storytelling Homepage system
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/safe_mysqld:${PORTSDIR}/databases/mysql323-server \
 		${SITE_PERL}/Bundle/Slash.pm:${PORTSDIR}/www/p5-Bundle-Slash
diff --git a/www/slash/pkg-comment b/www/slash/pkg-comment
deleted file mode 100644
index 68e995337476..000000000000
--- a/www/slash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Slash-Like Automatic Storytelling Homepage system
diff --git a/www/smb2www/Makefile b/www/smb2www/Makefile
index c5b30e03dae4..bccec7fa4fd3 100644
--- a/www/smb2www/Makefile
+++ b/www/smb2www/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES=	http://us1.samba.org/samba/smb2www/ \
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/0.0.//g}
 
 MAINTAINER=	roman@xpert.com
+COMMENT=	Windows Network client that is accessible through a web browser
 
 RUN_DEPENDS=	httpd:${PORTSDIR}/www/apache13 \
 		smbclient:${PORTSDIR}/net/samba \
diff --git a/www/smb2www/pkg-comment b/www/smb2www/pkg-comment
deleted file mode 100644
index 68224a565e28..000000000000
--- a/www/smb2www/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Windows Network client that is accessible through a web browser
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index 18902f084b62..6b15fe04ef31 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://ftp.ost.eltele.no/pub/www/proxy/squidGuard/ \
 		http://web01.ux.tyfon.net/ports/distfiles/
 
 MAINTAINER=	ports@tyfon.net
+COMMENT=	A fast redirector for squid
 
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24
diff --git a/www/squidguard/pkg-comment b/www/squidguard/pkg-comment
deleted file mode 100644
index e2b14f79ec4c..000000000000
--- a/www/squidguard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast redirector for squid
diff --git a/www/squidpurge/Makefile b/www/squidpurge/Makefile
index d39ee737ab8e..4eda6fc6b555 100644
--- a/www/squidpurge/Makefile
+++ b/www/squidpurge/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	purge
 EXTRACT_SUFX=	-20000921-src.tar.gz
 
 MAINTAINER=	dean@odyssey.apana.org.au
+COMMENT=	Powerful object purging utility for the Squid web proxy cache
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24
 
diff --git a/www/squidpurge/pkg-comment b/www/squidpurge/pkg-comment
deleted file mode 100644
index a54d561b0b83..000000000000
--- a/www/squidpurge/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Powerful object purging utility for the Squid web proxy cache
diff --git a/www/ssserver/Makefile b/www/ssserver/Makefile
index f42f8edbe028..371212e7983d 100644
--- a/www/ssserver/Makefile
+++ b/www/ssserver/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.kryltech.com/download/FreeBSD.x86.3/
 
 MAINTAINER=	support@kryltech.com
+COMMENT=	Adds the search capability to a Web site
 
 ONLY_FOR_ARCHS=	i386
 NO_BUILD=	yes
diff --git a/www/ssserver/pkg-comment b/www/ssserver/pkg-comment
deleted file mode 100644
index 771d360a2d96..000000000000
--- a/www/ssserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Adds the search capability to a Web site
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index b4be5e480b22..036c56b57e37 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www textproc
 MASTER_SITES=	http://swish-e.org/Download/
 
 MAINTAINER=	doconnor@gsoft.com.au
+COMMENT=	Simple web indexing for humans - enhanced
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
diff --git a/www/swish-e/pkg-comment b/www/swish-e/pkg-comment
deleted file mode 100644
index e1484650b1e3..000000000000
--- a/www/swish-e/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple web indexing for humans - enhanced
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index e9cb95213833..442d2a7d1f6b 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	tidy4aug00
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	saken@hotel.rmta.org
+COMMENT=	Fixes and tidies up HTML files
 
 MAN1=		tidy.1
 
diff --git a/www/tidy/pkg-comment b/www/tidy/pkg-comment
deleted file mode 100644
index ca421aa9423d..000000000000
--- a/www/tidy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fixes and tidies up HTML files
diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index 30730670ff7c..39f0f7d0f85e 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	mitsuru@riken.go.jp
+COMMENT=	A small, efficient HTTP proxy server
 
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
diff --git a/www/tinyproxy/pkg-comment b/www/tinyproxy/pkg-comment
deleted file mode 100644
index 41057fe3f373..000000000000
--- a/www/tinyproxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small, efficient HTTP proxy server
diff --git a/www/twhttpd/Makefile b/www/twhttpd/Makefile
index bf83ff974d2b..36a0c3cd132b 100644
--- a/www/twhttpd/Makefile
+++ b/www/twhttpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.geocities.com/samngms/twhttpd/download/
 DISTNAME=	twhttpd-${PORTVERSION}
 
 MAINTAINER=	opr@bsdaemon.be
+COMMENT=	Secure HTTP Proxy
 
 GNU_CONFIGURE=  yes
 USE_GMAKE=	yes
diff --git a/www/twhttpd/pkg-comment b/www/twhttpd/pkg-comment
deleted file mode 100644
index 635dbe9311dc..000000000000
--- a/www/twhttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Secure HTTP Proxy
diff --git a/www/ump/Makefile b/www/ump/Makefile
index 360d40e3d2d1..063f8ae0e0b9 100644
--- a/www/ump/Makefile
+++ b/www/ump/Makefile
@@ -20,6 +20,7 @@ PATCH_SITES=	http://www.goice.co.jp/member/mo/timidity/dist/
 PATCHFILES=	ump-patch-1.gz ump-patch-2.gz ump-patch-3.gz ump-patch-4.gz
 
 MAINTAINER=	llwang@infor.org
+COMMENT=	Unix MIDI Plugin based on TiMidity++
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 RUN_DEPENDS=	${LOCALBASE}/bin/timidity:${PORTSDIR}/audio/timidity++	\
diff --git a/www/ump/pkg-comment b/www/ump/pkg-comment
deleted file mode 100644
index d2c89ede0578..000000000000
--- a/www/ump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unix MIDI Plugin based on TiMidity++
diff --git a/www/waccess/Makefile b/www/waccess/Makefile
index 42348320cf09..3b9e04c38368 100644
--- a/www/waccess/Makefile
+++ b/www/waccess/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www textproc
 MASTER_SITES=	http://www.tundraware.com/Software/waccess/
 
 MAINTAINER=	tundra@tundraware.com
+COMMENT=	Quick-N-Dirty Web Access Log Analyzer
 
 USE_PYTHON=	yes
 USE_REINPLACE=	yes
diff --git a/www/waccess/pkg-comment b/www/waccess/pkg-comment
deleted file mode 100644
index 5c5a7a6a5fbe..000000000000
--- a/www/waccess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quick-N-Dirty Web Access Log Analyzer
diff --git a/www/web2ldap/Makefile b/www/web2ldap/Makefile
index 98fe464a26c7..f187a6b074ed 100644
--- a/www/web2ldap/Makefile
+++ b/www/web2ldap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.web2ldap.de/download/ \
 		http://www.tricknology.org/ports/
 
 MAINTAINER=	oddbjorn@tricknology.org
+COMMENT=	Python-based WWW gateway to LDAP servers
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_ldap.so:${PORTSDIR}/net/py-ldap2
 
diff --git a/www/web2ldap/pkg-comment b/www/web2ldap/pkg-comment
deleted file mode 100644
index c553a8603dca..000000000000
--- a/www/web2ldap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python-based WWW gateway to LDAP servers
diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile
index 0791cf8b589f..36c4323efc69 100644
--- a/www/web500gw/Makefile
+++ b/www/web500gw/Makefile
@@ -17,6 +17,7 @@ PATCH_SITES=	http://www.tu-chemnitz.de/~fri/web500gw/
 PATCHFILES=	modtmpl.patch
 
 MAINTAINER=	Karl.Dietz@frankfurt.netsurf.de
+COMMENT=	HTTP gateway to LDAP-based directories
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libldap.a:${PORTSDIR}/net/openldap
 
diff --git a/www/web500gw/pkg-comment b/www/web500gw/pkg-comment
deleted file mode 100644
index f4cf454c8672..000000000000
--- a/www/web500gw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTTP gateway to LDAP-based directories
diff --git a/www/webcheck/Makefile b/www/webcheck/Makefile
index d97901ba7ff7..4849b94e04fb 100644
--- a/www/webcheck/Makefile
+++ b/www/webcheck/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.mired.org/webcheck/
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	mwm@mired.org
+COMMENT=	View structure of a web site, get a list of problems like broken links
 
 USE_PYTHON=	YES
 USE_BZIP2=	YES
diff --git a/www/webcheck/pkg-comment b/www/webcheck/pkg-comment
deleted file mode 100644
index fbfb6c0d9912..000000000000
--- a/www/webcheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View structure of a web site, get a list of problems like broken links
diff --git a/www/webredirect/Makefile b/www/webredirect/Makefile
index c9c009c76bda..aa1fdd34c6ba 100644
--- a/www/webredirect/Makefile
+++ b/www/webredirect/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	ftp://ftp.stacken.kth.se/pub/projects/webredirect/
 
 MAINTAINER=	rasmus@kaj.se
+COMMENT=	Small web server serving "301 Moved Permanently" only
 
 ALL_TARGET=	depend all
 
diff --git a/www/webredirect/pkg-comment b/www/webredirect/pkg-comment
deleted file mode 100644
index 63b02efa837f..000000000000
--- a/www/webredirect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small web server serving "301 Moved Permanently" only
diff --git a/www/webresolve/Makefile b/www/webresolve/Makefile
index fa3ee8d633cf..40c8c8978e75 100644
--- a/www/webresolve/Makefile
+++ b/www/webresolve/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://siag.nu/pub/webresolve/ \
 		ftp://siag.nu/pub/webresolve/
 
 MAINTAINER=	joseph@randomnetworks.com
+COMMENT=	Webresolve resolves IP addresses to host names in web log files
 
 ALL_TARGET=	webresolve
 
diff --git a/www/webresolve/pkg-comment b/www/webresolve/pkg-comment
deleted file mode 100644
index 0996146bd9b5..000000000000
--- a/www/webresolve/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Webresolve resolves IP addresses to host names in web log files
diff --git a/www/webstone-ssl/Makefile b/www/webstone-ssl/Makefile
index 88209bff9d93..ee553c9b317a 100644
--- a/www/webstone-ssl/Makefile
+++ b/www/webstone-ssl/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	WebStone-SSL-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	k_nishizawa@anet.ne.jp
+COMMENT=	World wide web server benchmarking with SSL support
 
 USE_OPENSSL=	yes
 USE_AUTOCONF=	yes
diff --git a/www/webstone-ssl/pkg-comment b/www/webstone-ssl/pkg-comment
deleted file mode 100644
index 582b652140d8..000000000000
--- a/www/webstone-ssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-World wide web server benchmarking with SSL support
diff --git a/www/webstone/Makefile b/www/webstone/Makefile
index f7d0497a33c7..848df45448d3 100644
--- a/www/webstone/Makefile
+++ b/www/webstone/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	ws25_src
 EXTRACT_SUFX=	.tgz 
 
 MAINTAINER=	k_nishizawa@anet.ne.jp
+COMMENT=	World wide web server benchmarking
 
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/WebStone2.5/src
diff --git a/www/webstone/pkg-comment b/www/webstone/pkg-comment
deleted file mode 100644
index 40713e76d09a..000000000000
--- a/www/webstone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-World wide web server benchmarking
diff --git a/www/wml/Makefile b/www/wml/Makefile
index 639956120057..344eba82a2a1 100644
--- a/www/wml/Makefile
+++ b/www/wml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://thewml.org/distrib/ \
 		ftp://thewml.org/distrib/
 
 MAINTAINER=	rse@engelschall.com
+COMMENT=	Website META Language, webdesign toolkit for HTML generation
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/wml/pkg-comment b/www/wml/pkg-comment
deleted file mode 100644
index 4f2e2bbfb64f..000000000000
--- a/www/wml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Website META Language, webdesign toolkit for HTML generation
diff --git a/www/wmnetselect/Makefile b/www/wmnetselect/Makefile
index 4f2e3dc4eabd..b58878f442ca 100644
--- a/www/wmnetselect/Makefile
+++ b/www/wmnetselect/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www windowmaker
 MASTER_SITES=	http://home.att.net/~apathos/code/
 
 MAINTAINER=	nugget@slacker.com
+COMMENT=	WindowMaker Netscape launcher to display urls from X selection
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/www/wmnetselect/pkg-comment b/www/wmnetselect/pkg-comment
deleted file mode 100644
index 0ccbe8966d04..000000000000
--- a/www/wmnetselect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WindowMaker Netscape launcher to display urls from X selection
diff --git a/www/www6to4/Makefile b/www/www6to4/Makefile
index f8f5b7006606..fa11d7c18a3e 100644
--- a/www/www6to4/Makefile
+++ b/www/www6to4/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.pasta.cs.uit.no/pub/Vermicelli/
 
 MAINTAINER=	Janos.Mohacsi@dante.org.uk
+COMMENT=	Lightweight http proxy to help IPv4 only browsers
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/www6to4 ${PREFIX}/sbin
diff --git a/www/www6to4/pkg-comment b/www/www6to4/pkg-comment
deleted file mode 100644
index 4feaf01785ac..000000000000
--- a/www/www6to4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight http proxy to help IPv4 only browsers
diff --git a/www/wyvern/Makefile b/www/wyvern/Makefile
index d0a67a1411ee..408c4176eae2 100644
--- a/www/wyvern/Makefile
+++ b/www/wyvern/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	www ipv6
 MASTER_SITES=	http://www.MysticWALL.COM/software/src/
 
 MAINTAINER=	kouichi@MysticWALL.COM
+COMMENT=	Simple/powerful/lightweight/secure/embed-able HTTP server
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
diff --git a/www/wyvern/pkg-comment b/www/wyvern/pkg-comment
deleted file mode 100644
index f82703811a82..000000000000
--- a/www/wyvern/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple/powerful/lightweight/secure/embed-able HTTP server
diff --git a/www/xitami/Makefile b/www/xitami/Makefile
index f421f6d53a14..a0cb8e9090f7 100644
--- a/www/xitami/Makefile
+++ b/www/xitami/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	suni24d7
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bdluevel@heitec.net
+COMMENT=	A fast, portable multithreaded web server
 
 NO_WRKSUBDIR=	yes
 
diff --git a/www/xitami/pkg-comment b/www/xitami/pkg-comment
deleted file mode 100644
index 28b76e63c7b4..000000000000
--- a/www/xitami/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast, portable multithreaded web server
diff --git a/www/xswallow/Makefile b/www/xswallow/Makefile
index b0ca7b1b10c8..3944156d71a3 100644
--- a/www/xswallow/Makefile
+++ b/www/xswallow/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.csn.ul.ie/~caolan/publink/X/
 DISTNAME=	XswallowSource-${PORTVERSION}
 
 MAINTAINER=	conrads@home.com
+COMMENT=	A general-purpose, user-configurable plugin for Netscape
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/xswallow/xswallow
diff --git a/www/xswallow/pkg-comment b/www/xswallow/pkg-comment
deleted file mode 100644
index ccf84921e04d..000000000000
--- a/www/xswallow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A general-purpose, user-configurable plugin for Netscape
diff --git a/x11-clocks/emiclock/Makefile b/x11-clocks/emiclock/Makefile
index 0f868376d872..d64918a78e19 100644
--- a/x11-clocks/emiclock/Makefile
+++ b/x11-clocks/emiclock/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-clocks
 MASTER_SITES=	ftp://ftp.noge.com/pub/EmiClock/X11/
 
 MAINTAINER=	koba@noge.com
+COMMENT=	Hyper-animated face analog clock for X11
 
 .if ${MACHINE_ARCH} != "i386"
 PLIST=		${PKGDIR}/pkg-plist.nosound
diff --git a/x11-clocks/emiclock/pkg-comment b/x11-clocks/emiclock/pkg-comment
deleted file mode 100644
index 6f0dec990cf3..000000000000
--- a/x11-clocks/emiclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hyper-animated face analog clock for X11
diff --git a/x11-clocks/glclock/Makefile b/x11-clocks/glclock/Makefile
index ee4f22588dc1..92e2f0bd7c2f 100644
--- a/x11-clocks/glclock/Makefile
+++ b/x11-clocks/glclock/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.daionet.gr.jp/~masa/archives/ \
 		http://www.demonews.com/hosted/masa/archives/
 
 MAINTAINER=	aa8vb@ipass.net
+COMMENT=	OpenGL Spinning pocketwatch demo and benchmark utility
 
 USE_X_PREFIX=	yes
 USE_MESA=	yes
diff --git a/x11-clocks/glclock/pkg-comment b/x11-clocks/glclock/pkg-comment
deleted file mode 100644
index e6c171ec4097..000000000000
--- a/x11-clocks/glclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenGL Spinning pocketwatch demo and benchmark utility
diff --git a/x11-clocks/mouseclock/Makefile b/x11-clocks/mouseclock/Makefile
index d08a5f1e8567..f1d6573f36bc 100644
--- a/x11-clocks/mouseclock/Makefile
+++ b/x11-clocks/mouseclock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/clocks
 
 MAINTAINER=	kazu@jp.freebsd.org
+COMMENT=	Display the current time using the X root cursor
 
 USE_GMAKE=	yes
 USE_IMAKE=	yes
diff --git a/x11-clocks/mouseclock/pkg-comment b/x11-clocks/mouseclock/pkg-comment
deleted file mode 100644
index 76668eea86d0..000000000000
--- a/x11-clocks/mouseclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display the current time using the X root cursor
diff --git a/x11-clocks/tclock/Makefile b/x11-clocks/tclock/Makefile
index 3d65656a2095..88c550e0781f 100644
--- a/x11-clocks/tclock/Makefile
+++ b/x11-clocks/tclock/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://ftp.uni-potsdam.de/pub/X11/tools/clocks/		\
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
+COMMENT=	Transparent analog clock for x11
 
 NO_WRKSUBDIR=	yes
 USE_IMAKE=	yes
diff --git a/x11-clocks/tclock/pkg-comment b/x11-clocks/tclock/pkg-comment
deleted file mode 100644
index 4cc265a95e38..000000000000
--- a/x11-clocks/tclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transparent analog clock for x11
diff --git a/x11-clocks/wmclock/Makefile b/x11-clocks/wmclock/Makefile
index ae15e6dff5dd..1d14cb616c9d 100644
--- a/x11-clocks/wmclock/Makefile
+++ b/x11-clocks/wmclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	http://www.ntrnet.net/~jmknoble/WindowMaker/wmclock/
 
 MAINTAINER=	pelle@fukt.bth.se
+COMMENT=	A dockable clock applet for Windowmaker
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/x11-clocks/wmclock/pkg-comment b/x11-clocks/wmclock/pkg-comment
deleted file mode 100644
index 345735ca8614..000000000000
--- a/x11-clocks/wmclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable clock applet for Windowmaker
diff --git a/x11-clocks/wmtime/Makefile b/x11-clocks/wmtime/Makefile
index 5369db53a6e9..a0017a0fc831 100644
--- a/x11-clocks/wmtime/Makefile
+++ b/x11-clocks/wmtime/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-clocks windowmaker
 MASTER_SITES=	ftp://ftp.enteract.com/users/rneswold/
 
 MAINTAINER=	rneswold@enteract.com
+COMMENT=	Time/Date applet for WindowMaker
 
 WRKSRC=		${WRKDIR}/wmtime.app/wmtime
 USE_IMAKE=	yes
diff --git a/x11-clocks/wmtime/pkg-comment b/x11-clocks/wmtime/pkg-comment
deleted file mode 100644
index 4fd1a2b999ca..000000000000
--- a/x11-clocks/wmtime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Time/Date applet for WindowMaker
diff --git a/x11-clocks/xalarm/Makefile b/x11-clocks/xalarm/Makefile
index 6d89f2f9021c..2c984efd80b0 100644
--- a/x11-clocks/xalarm/Makefile
+++ b/x11-clocks/xalarm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	utilities
 
 MAINTAINER=	desmo@bandwidth.org
+COMMENT=	An X based alarm clock
 
 USE_IMAKE=	yes
 IS_INTERACTIVE=	yes
diff --git a/x11-clocks/xalarm/pkg-comment b/x11-clocks/xalarm/pkg-comment
deleted file mode 100644
index 80ca65465800..000000000000
--- a/x11-clocks/xalarm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X based alarm clock
diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index abf3ff41237d..da7316aeeefa 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.snika.uklinux.net/xmms-alarm/ \
 		http://unixpages.org/distfiles/
 
 MAINTAINER=	chris@unixpages.org
+COMMENT=	Alarm timer plugin for the X Multimedia System
 
 BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
diff --git a/x11-clocks/xmms-alarm/pkg-comment b/x11-clocks/xmms-alarm/pkg-comment
deleted file mode 100644
index d0523f97e6b4..000000000000
--- a/x11-clocks/xmms-alarm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Alarm timer plugin for the X Multimedia System
diff --git a/x11-clocks/xtimer/Makefile b/x11-clocks/xtimer/Makefile
index 725ec9f4bd59..d34b4253aaa7 100644
--- a/x11-clocks/xtimer/Makefile
+++ b/x11-clocks/xtimer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://hp.vector.co.jp/authors/VA004959/xtimer/
 DISTNAME=	${PORTNAME}-8089
 
 MAINTAINER=	candy@kgc.co.jp
+COMMENT=	A simple digital timer for X11
 
 USE_IMAKE=	yes
 MAN1=		xtimer.1
diff --git a/x11-clocks/xtimer/pkg-comment b/x11-clocks/xtimer/pkg-comment
deleted file mode 100644
index aa72723af16d..000000000000
--- a/x11-clocks/xtimer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple digital timer for X11
diff --git a/x11-clocks/zclock/Makefile b/x11-clocks/zclock/Makefile
index 54394bd8f879..99b7ebfbfee2 100644
--- a/x11-clocks/zclock/Makefile
+++ b/x11-clocks/zclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-clocks gnome
 MASTER_SITES=	http://zack.vpop.net/download/
 
 MAINTAINER=	zgh@malfunktion.net
+COMMENT=	A simple but powerful clock applet for GNOME
 
 .if !defined(NOPORTDOCS)
 # I am going to install the dependencies for building the Zclock html
diff --git a/x11-clocks/zclock/pkg-comment b/x11-clocks/zclock/pkg-comment
deleted file mode 100644
index 332cd20934e8..000000000000
--- a/x11-clocks/zclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple but powerful clock applet for GNOME
diff --git a/x11-fm/apotheke/Makefile b/x11-fm/apotheke/Makefile
index 7ec92cc6ea79..9a93ab7f1814 100644
--- a/x11-fm/apotheke/Makefile
+++ b/x11-fm/apotheke/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.berlios.de/pub/apotheke/
 
 MAINTAINER=	martin.klaffenboeck@gmx.at
+COMMENT=	A CVS view for Nautilus
 
 LIB_DEPENDS=	nautilus.2:${PORTSDIR}/x11-fm/nautilus2
 RUN_DEPENDS=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
diff --git a/x11-fm/apotheke/pkg-comment b/x11-fm/apotheke/pkg-comment
deleted file mode 100644
index 988ed222b56f..000000000000
--- a/x11-fm/apotheke/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A CVS view for Nautilus
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index c1aec59f5bb0..e5c7765a6c13 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	apps/ASFiles
 DISTNAME=	ASFiles-${PORTVERSION}
 
 MAINTAINER=	lukin@okbmei.msk.su
+COMMENT=	X11 file manager. Dockable in WindowMaker
 
 LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
diff --git a/x11-fm/asfiles/pkg-comment b/x11-fm/asfiles/pkg-comment
deleted file mode 100644
index bd87d53322a8..000000000000
--- a/x11-fm/asfiles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 file manager. Dockable in WindowMaker
diff --git a/x11-fm/file_menu_applet/Makefile b/x11-fm/file_menu_applet/Makefile
index eae7abd903d5..0aeba79c2a2b 100644
--- a/x11-fm/file_menu_applet/Makefile
+++ b/x11-fm/file_menu_applet/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-fm gnome
 MASTER_SITES=	http://www.zoned.net:8000/~xkahn/file_menu_applet/
 
 MAINTAINER=	klammer@webonaut.com
+COMMENT=	A small GNOME panel application which creates a file manager
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
diff --git a/x11-fm/file_menu_applet/pkg-comment b/x11-fm/file_menu_applet/pkg-comment
deleted file mode 100644
index 49acd9ae9767..000000000000
--- a/x11-fm/file_menu_applet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small GNOME panel application which creates a file manager
diff --git a/x11-fm/gnome-commander/Makefile b/x11-fm/gnome-commander/Makefile
index f7980308a708..a78ff977d68e 100644
--- a/x11-fm/gnome-commander/Makefile
+++ b/x11-fm/gnome-commander/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://freesoftware.fsf.org/download/gcmd/gcmd.pkg/0.9.7/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	edybsd@yahoo.com.ar
+COMMENT=	File manager for Gnome
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 .if defined(WITH_FAM)
diff --git a/x11-fm/gnome-commander/pkg-comment b/x11-fm/gnome-commander/pkg-comment
deleted file mode 100644
index 1c57aee3eb05..000000000000
--- a/x11-fm/gnome-commander/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File manager for Gnome
diff --git a/x11-fm/gnome-commander2/Makefile b/x11-fm/gnome-commander2/Makefile
index f7980308a708..a78ff977d68e 100644
--- a/x11-fm/gnome-commander2/Makefile
+++ b/x11-fm/gnome-commander2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://freesoftware.fsf.org/download/gcmd/gcmd.pkg/0.9.7/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2
 
 MAINTAINER=	edybsd@yahoo.com.ar
+COMMENT=	File manager for Gnome
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 .if defined(WITH_FAM)
diff --git a/x11-fm/gnome-commander2/pkg-comment b/x11-fm/gnome-commander2/pkg-comment
deleted file mode 100644
index 1c57aee3eb05..000000000000
--- a/x11-fm/gnome-commander2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File manager for Gnome
diff --git a/x11-fm/jafm/Makefile b/x11-fm/jafm/Makefile
index 080a29630024..a3f321f4eaef 100644
--- a/x11-fm/jafm/Makefile
+++ b/x11-fm/jafm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www-personal.usyd.edu.au/~rlittlew/jafm/ \
 MASTER_SITE_SUBDIR=	X11/desktop
 
 MAINTAINER=	brett@peloton.runet.edu
+COMMENT=	Yet another file manager!
 
 BROKEN=		"Does not build"
 
diff --git a/x11-fm/jafm/pkg-comment b/x11-fm/jafm/pkg-comment
deleted file mode 100644
index d5f31a110b80..000000000000
--- a/x11-fm/jafm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another file manager!
diff --git a/x11-fm/offix-files/Makefile b/x11-fm/offix-files/Makefile
index 8a2f2e1e3da6..6463753da52b 100644
--- a/x11-fm/offix-files/Makefile
+++ b/x11-fm/offix-files/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	desktop_managers/OffiX
 DISTNAME=	Files-${PORTVERSION}
 
 MAINTAINER=	ruslan@shevchenko.kiev.ua
+COMMENT=	File bar from OffiX
 
 RUN_DEPENDS=	execute:${PORTSDIR}/x11/offix-execute \
 		editor:${PORTSDIR}/editors/offix-editor
diff --git a/x11-fm/offix-files/pkg-comment b/x11-fm/offix-files/pkg-comment
deleted file mode 100644
index 4247c5a797df..000000000000
--- a/x11-fm/offix-files/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File bar from OffiX
diff --git a/x11-fm/tkdesk/Makefile b/x11-fm/tkdesk/Makefile
index 0ee9f3d1e2ea..e413c2279b60 100644
--- a/x11-fm/tkdesk/Makefile
+++ b/x11-fm/tkdesk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://tkdesk.sourceforge.net/dist/ \
 MASTER_SITE_SUBDIR= X11/desktop
 
 MAINTAINER=	spadger@best.com
+COMMENT=	A graphical, highly configurable and powerful file manager
 
 LIB_DEPENDS=	itcl32:${PORTSDIR}/lang/itcl \
 		BLT24.2:${PORTSDIR}/x11-toolkits/blt
diff --git a/x11-fm/tkdesk/pkg-comment b/x11-fm/tkdesk/pkg-comment
deleted file mode 100644
index 5137b25073d3..000000000000
--- a/x11-fm/tkdesk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical, highly configurable and powerful file manager
diff --git a/x11-fm/vide/Makefile b/x11-fm/vide/Makefile
index 95968d9379c8..37568463eb88 100644
--- a/x11-fm/vide/Makefile
+++ b/x11-fm/vide/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-fm
 MASTER_SITES=	http://vide.sourceforge.net/
 
 MAINTAINER=	careilly@thecia.ie
+COMMENT=	Simple Gtk+ based filemanager with vi keybindings
 
 RUN_DEPENDS=    vim:${PORTSDIR}/editors/vim5
 
diff --git a/x11-fm/vide/pkg-comment b/x11-fm/vide/pkg-comment
deleted file mode 100644
index bb0824d758b9..000000000000
--- a/x11-fm/vide/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple Gtk+ based filemanager with vi keybindings
diff --git a/x11-fm/worker/Makefile b/x11-fm/worker/Makefile
index 59e93e8b2060..099d6b583ea1 100644
--- a/x11-fm/worker/Makefile
+++ b/x11-fm/worker/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.boomerangsworld.de/worker/downloads/ \
 		http://www.informatik.uni-halle.de/~hoffmanr/worker/downloads/
 
 MAINTAINER=	simond@irrelevant.org
+COMMENT=	X11 File Manager based on Directory Opus
 
 GNU_CONFIGURE=	yes
 USE_XLIB=	yes
diff --git a/x11-fm/worker/pkg-comment b/x11-fm/worker/pkg-comment
deleted file mode 100644
index 38b6e59fc4bf..000000000000
--- a/x11-fm/worker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 File Manager based on Directory Opus
diff --git a/x11-fm/x-files/Makefile b/x11-fm/x-files/Makefile
index 4e82dffd6719..c6c1fdc3a86c 100644
--- a/x11-fm/x-files/Makefile
+++ b/x11-fm/x-files/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.hut.fi/~mkivinie/X-Files/data/
 DISTNAME=	X-Files-${PORTVERSION}
 
 MAINTAINER=	dmaddox099@yahoo.com
+COMMENT=	A nice Tk-based filemanager
 
 BUILD_DEPENDS=	tclsh8.3:${PORTSDIR}/lang/tcl83
 RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
diff --git a/x11-fm/x-files/pkg-comment b/x11-fm/x-files/pkg-comment
deleted file mode 100644
index 570f43e82675..000000000000
--- a/x11-fm/x-files/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nice Tk-based filemanager
diff --git a/x11-fonts/artwiz-fonts/Makefile b/x11-fonts/artwiz-fonts/Makefile
index c8e6bcd369b5..f0ce81621a4f 100644
--- a/x11-fonts/artwiz-fonts/Makefile
+++ b/x11-fonts/artwiz-fonts/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.xs4all.nl/~hanb/software/fluxbox/ \
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	d.marks@student.umist.ac.uk
+COMMENT=	A set of free fonts for X11 desktops
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
diff --git a/x11-fonts/artwiz-fonts/pkg-comment b/x11-fonts/artwiz-fonts/pkg-comment
deleted file mode 100644
index 233459b87f55..000000000000
--- a/x11-fonts/artwiz-fonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of free fonts for X11 desktops
diff --git a/x11-fonts/bdfresize/Makefile b/x11-fonts/bdfresize/Makefile
index 1db7bd9a3e8a..d6a5b621d766 100644
--- a/x11-fonts/bdfresize/Makefile
+++ b/x11-fonts/bdfresize/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11-fonts
 MASTER_SITES=	http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/
 
 MAINTAINER=	mistral@imasy.or.jp
+COMMENT=	A tool for resizing BDF format font
 
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fonts/bdfresize/pkg-comment b/x11-fonts/bdfresize/pkg-comment
deleted file mode 100644
index aef85ffcc909..000000000000
--- a/x11-fonts/bdfresize/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for resizing BDF format font
diff --git a/x11-fonts/gfe/Makefile b/x11-fonts/gfe/Makefile
index 1930aa1c58b1..8c51c846f54f 100644
--- a/x11-fonts/gfe/Makefile
+++ b/x11-fonts/gfe/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	X11/fonts
 
 MAINTAINER=	bms@spc.org
+COMMENT=	GTK+-based .bdf font editor for X
 
 GNU_CONFIGURE=	yes
 USE_GNOMENG=	yes
diff --git a/x11-fonts/gfe/pkg-comment b/x11-fonts/gfe/pkg-comment
deleted file mode 100644
index a63d3a4ddd8c..000000000000
--- a/x11-fonts/gfe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+-based .bdf font editor for X
diff --git a/x11-fonts/mkbold/Makefile b/x11-fonts/mkbold/Makefile
index 4dfb9e1c9f78..a8bcfd807f5f 100644
--- a/x11-fonts/mkbold/Makefile
+++ b/x11-fonts/mkbold/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	koma2@jiro.c.u-tokyo.ac.jp
+COMMENT=	Perl script to make BDF font bold
 
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fonts/mkbold/pkg-comment b/x11-fonts/mkbold/pkg-comment
deleted file mode 100644
index 7253cdd364f6..000000000000
--- a/x11-fonts/mkbold/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script to make BDF font bold
diff --git a/x11-fonts/mkfontalias/Makefile b/x11-fonts/mkfontalias/Makefile
index 7bed7a474c4c..be02e76c5eaf 100644
--- a/x11-fonts/mkfontalias/Makefile
+++ b/x11-fonts/mkfontalias/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	mkfontalias.py
 EXTRACT_SUFX=
 
 MAINTAINER=	stijn@win.tue.nl
+COMMENT=	Python script to make fonts.alias files for X
 
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fonts/mkfontalias/pkg-comment b/x11-fonts/mkfontalias/pkg-comment
deleted file mode 100644
index 31a7ad176662..000000000000
--- a/x11-fonts/mkfontalias/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python script to make fonts.alias files for X
diff --git a/x11-fonts/mkitalic/Makefile b/x11-fonts/mkitalic/Makefile
index ba692a0b531c..5eef91d801be 100644
--- a/x11-fonts/mkitalic/Makefile
+++ b/x11-fonts/mkitalic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 EXTRACT_SUFX=	.bz2
 
 MAINTAINER=	koma2@jiro.c.u-tokyo.ac.jp
+COMMENT=	Perl script to make BDF font italic
 
 USE_PERL5=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-fonts/mkitalic/pkg-comment b/x11-fonts/mkitalic/pkg-comment
deleted file mode 100644
index fc784944d74a..000000000000
--- a/x11-fonts/mkitalic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script to make BDF font italic
diff --git a/x11-fonts/mozilla-fonts/Makefile b/x11-fonts/mozilla-fonts/Makefile
index e059d07db9d9..1e0de4a5f452 100644
--- a/x11-fonts/mozilla-fonts/Makefile
+++ b/x11-fonts/mozilla-fonts/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	x11-fonts www
 MASTER_SITES=	http://www.myrddin.demon.co.uk/dist/
 
 MAINTAINER=	dom@happygiraffe.net
+COMMENT=	Web fonts for Netscape/Mozilla
 
 USE_X_PREFIX=	true
 
diff --git a/x11-fonts/mozilla-fonts/pkg-comment b/x11-fonts/mozilla-fonts/pkg-comment
deleted file mode 100644
index 4f64d3051395..000000000000
--- a/x11-fonts/mozilla-fonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Web fonts for Netscape/Mozilla
diff --git a/x11-fonts/p5-Font-TTF/Makefile b/x11-fonts/p5-Font-TTF/Makefile
index 7b3cbc26024a..53d22263e936 100644
--- a/x11-fonts/p5-Font-TTF/Makefile
+++ b/x11-fonts/p5-Font-TTF/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	Font
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	erwin@lansing.dk
+COMMENT=	Perl module for TrueType font hacking
 
 PERL_CONFIGURE=	yes
 
diff --git a/x11-fonts/p5-Font-TTF/pkg-comment b/x11-fonts/p5-Font-TTF/pkg-comment
deleted file mode 100644
index f2617285160c..000000000000
--- a/x11-fonts/p5-Font-TTF/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for TrueType font hacking
diff --git a/x11-fonts/terminus-font/Makefile b/x11-fonts/terminus-font/Makefile
index a49e44b88928..5c51df1d60c4 100644
--- a/x11-fonts/terminus-font/Makefile
+++ b/x11-fonts/terminus-font/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	x11-fonts
 MASTER_SITES=	http://www.is-vn.bg/hamster/
 
 MAINTAINER=	gugod@gugod.org
+COMMENT=	Terminus Font - a clean fixed width font
 
 BUILD_DEPENDS=	mkitalic:${PORTSDIR}/x11-fonts/mkitalic
 
diff --git a/x11-fonts/terminus-font/pkg-comment b/x11-fonts/terminus-font/pkg-comment
deleted file mode 100644
index bf44796139f1..000000000000
--- a/x11-fonts/terminus-font/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Terminus Font - a clean fixed width font
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index c94c9a162217..59b4f51ab810 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	petef
 
 MAINTAINER=	brett@peloton.runet.edu
+COMMENT=	A Tk based replacement for xfontsel
 
 RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
diff --git a/x11-fonts/tkfont/pkg-comment b/x11-fonts/tkfont/pkg-comment
deleted file mode 100644
index dbf063d5d87b..000000000000
--- a/x11-fonts/tkfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tk based replacement for xfontsel
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile
index 1d2019840c8c..b9c38c0fbaf0 100644
--- a/x11-fonts/webfonts/Makefile
+++ b/x11-fonts/webfonts/Makefile
@@ -25,6 +25,7 @@ DISTFILES=	andale32.exe trebuc32.exe georgi32.exe verdan32.exe \
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	kkonstan@duth.gr
+COMMENT=	TrueType core fonts for the Web
 
 BUILD_DEPENDS=	ttmkfdir:${PORTSDIR}/x11-fonts/ttmkfdir \
 		cabextract:${PORTSDIR}/archivers/cabextract
diff --git a/x11-fonts/webfonts/pkg-comment b/x11-fonts/webfonts/pkg-comment
deleted file mode 100644
index 95324d8237fb..000000000000
--- a/x11-fonts/webfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TrueType core fonts for the Web
diff --git a/x11/accessx/Makefile b/x11/accessx/Makefile
index 4f48d50a0851..3db6bd16c0b5 100644
--- a/x11/accessx/Makefile
+++ b/x11/accessx/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.rehab.uiuc.edu/accessx/software/
 DISTNAME=	accessx${PORTVERSION:S/.//g}
 
 MAINTAINER=	stephen@math.missouri.edu
+COMMENT=	Customise accessibility features for X
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
diff --git a/x11/accessx/pkg-comment b/x11/accessx/pkg-comment
deleted file mode 100644
index a7b463b29006..000000000000
--- a/x11/accessx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Customise accessibility features for X
diff --git a/x11/bgrot/Makefile b/x11/bgrot/Makefile
index 2d70a98607c9..8b80eec63f1c 100644
--- a/x11/bgrot/Makefile
+++ b/x11/bgrot/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.over-yonder.net/~fullermd/projects/bgrot/ \
 		http://www.linc-it.com/~matt.fuller/mirrors/bgrot/
 
 MAINTAINER=	fullermd@over-yonder.net
+COMMENT=	A program to handle your X background to prevent boredom
 
 RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv
 
diff --git a/x11/bgrot/pkg-comment b/x11/bgrot/pkg-comment
deleted file mode 100644
index 13578f96df0d..000000000000
--- a/x11/bgrot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to handle your X background to prevent boredom
diff --git a/x11/bricons/Makefile b/x11/bricons/Makefile
index 5d67d3b0c9df..18dd8fb33f79 100644
--- a/x11/bricons/Makefile
+++ b/x11/bricons/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	-athena-3.0.tar.Z
 
 MAINTAINER=	shanee@augusta.de
+COMMENT=	Quick start up utility for applications on an X display
 
 USE_IMAKE=	yes
 USE_XPM=	yes
diff --git a/x11/bricons/pkg-comment b/x11/bricons/pkg-comment
deleted file mode 100644
index c6c73a27556f..000000000000
--- a/x11/bricons/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quick start up utility for applications on an X display
diff --git a/x11/deskmenu/Makefile b/x11/deskmenu/Makefile
index d9df08e73c06..af87e48aaf2f 100644
--- a/x11/deskmenu/Makefile
+++ b/x11/deskmenu/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://matt.peterson.org/FreeBSD/ports/ \
 		http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
 
 MAINTAINER=	matt@peterson.org
+COMMENT=	X11 application launcher
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11/deskmenu/pkg-comment b/x11/deskmenu/pkg-comment
deleted file mode 100644
index b7bfde793ae2..000000000000
--- a/x11/deskmenu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 application launcher
diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile
index 69ac33c5f0b2..6398a0f3b513 100644
--- a/x11/electricsheep/Makefile
+++ b/x11/electricsheep/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www-2.cs.cmu.edu/~spot/cache/
 
 MAINTAINER=	dyeske@yahoo.com
+COMMENT=	A nice distributed screensaver
 
 RUN_DEPENDS=	xloadimage:${PORTSDIR}/x11/xloadimage \
 		xsetbg:${PORTSDIR}/graphics/xli \
diff --git a/x11/electricsheep/pkg-comment b/x11/electricsheep/pkg-comment
deleted file mode 100644
index e50d8687efde..000000000000
--- a/x11/electricsheep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nice distributed screensaver
diff --git a/x11/fspanel/Makefile b/x11/fspanel/Makefile
index fd9a3db87e02..383ef410a8dd 100644
--- a/x11/fspanel/Makefile
+++ b/x11/fspanel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.chatjunkies.org/fspanel/
 DISTNAME=	fspanel-0.8beta1
 
 MAINTAINER=	anarcat@anarcat.dyndns.org
+COMMENT=	Tiny panel listing opened windows for gnome-compliant WM
 
 LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/Xft
 
diff --git a/x11/fspanel/pkg-comment b/x11/fspanel/pkg-comment
deleted file mode 100644
index f00d0b2fe7de..000000000000
--- a/x11/fspanel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tiny panel listing opened windows for gnome-compliant WM
diff --git a/x11/gmessage/Makefile b/x11/gmessage/Makefile
index 66f5c6c49440..1d7150962de4 100644
--- a/x11/gmessage/Makefile
+++ b/x11/gmessage/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.brettnacher.org/users/dominik/FreeBSD/
 
 MAINTAINER=	domi@saargate.de
+COMMENT=	Gtk+ clone of xmessage. displays a given text in a X11 window
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11/gmessage/pkg-comment b/x11/gmessage/pkg-comment
deleted file mode 100644
index 66e1cf2e6ffc..000000000000
--- a/x11/gmessage/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ clone of xmessage. displays a given text in a X11 window
diff --git a/x11/gnoclip/Makefile b/x11/gnoclip/Makefile
index 2ea3225f2121..ce438b6c4b60 100644
--- a/x11/gnoclip/Makefile
+++ b/x11/gnoclip/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.unikol.com.pl/~adolf/
 
 MAINTAINER=	edybsd@yahoo.com.ar
+COMMENT=	A simple workspace switcher for gnome environment
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11/gnoclip/pkg-comment b/x11/gnoclip/pkg-comment
deleted file mode 100644
index 1fe840c89eab..000000000000
--- a/x11/gnoclip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple workspace switcher for gnome environment
diff --git a/x11/gxset/Makefile b/x11/gxset/Makefile
index c4abff8adb2c..bf790d310399 100644
--- a/x11/gxset/Makefile
+++ b/x11/gxset/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.seindal.dk/pub/rene/ \
 MASTER_SITE_SUBDIR=	petef
 
 MAINTAINER=	bms@spc.org
+COMMENT=	GTK frontend for xset(1)
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
diff --git a/x11/gxset/pkg-comment b/x11/gxset/pkg-comment
deleted file mode 100644
index ad13979e769e..000000000000
--- a/x11/gxset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK frontend for xset(1)
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 8818c26b8b9b..03e6e467aeb5 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.mired.org/downloads/
 
 MAINTAINER=	mwm@mired.org
+COMMENT=	An X utility for binding commands to a hot key
 
 WRKSRC=		${WRKDIR}/keylaunch
 USE_GMAKE=	yes
diff --git a/x11/keylaunch/pkg-comment b/x11/keylaunch/pkg-comment
deleted file mode 100644
index 21838258bc8e..000000000000
--- a/x11/keylaunch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X utility for binding commands to a hot key
diff --git a/x11/libdnd/Makefile b/x11/libdnd/Makefile
index 17852ebbb0ca..d4b4218d6680 100644
--- a/x11/libdnd/Makefile
+++ b/x11/libdnd/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	dnd.${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	lukin@okbmei.msk.su
+COMMENT=	Drag and drop library
 
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/libdnd/pkg-comment b/x11/libdnd/pkg-comment
deleted file mode 100644
index 8d329c40c50a..000000000000
--- a/x11/libdnd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Drag and drop library
diff --git a/x11/lupe/Makefile b/x11/lupe/Makefile
index eada102a361f..fd84ecd262e2 100644
--- a/x11/lupe/Makefile
+++ b/x11/lupe/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/
 DISTNAME=	lupe008	
 
 MAINTAINER=	kazu@jp.freebsd.org
+COMMENT=	Real-time magnifying glass for X11
 
 WRKSRC=		${WRKDIR}/lupe
 USE_IMAKE=	yes
diff --git a/x11/lupe/pkg-comment b/x11/lupe/pkg-comment
deleted file mode 100644
index eed3cba6b25d..000000000000
--- a/x11/lupe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Real-time magnifying glass for X11
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 5c8ea245ab10..5e12ce249493 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 MASTER_SITE_SUBDIR=	multignometerm
 
 MAINTAINER=	fdubuy@free.fr
+COMMENT=	Gnome tabbed terminal emulator
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
diff --git a/x11/multi-gnome-terminal/pkg-comment b/x11/multi-gnome-terminal/pkg-comment
deleted file mode 100644
index d878c4a65004..000000000000
--- a/x11/multi-gnome-terminal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome tabbed terminal emulator
diff --git a/x11/offix-clipboard/Makefile b/x11/offix-clipboard/Makefile
index 0b523864de9c..5f7a1d75a500 100644
--- a/x11/offix-clipboard/Makefile
+++ b/x11/offix-clipboard/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	desktop_managers/OffiX
 DISTNAME=	Clipboard-${PORTVERSION}
 
 MAINTAINER=	ruslan@shevchenko.kiev.ua
+COMMENT=	X clipboard with support of DND protocol
 
 LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
diff --git a/x11/offix-clipboard/pkg-comment b/x11/offix-clipboard/pkg-comment
deleted file mode 100644
index 8ddfdf51be99..000000000000
--- a/x11/offix-clipboard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X clipboard with support of DND protocol
diff --git a/x11/offix-execute/Makefile b/x11/offix-execute/Makefile
index c9e7b4a708f2..b37c4128e9b0 100644
--- a/x11/offix-execute/Makefile
+++ b/x11/offix-execute/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	desktop_managers/OffiX
 DISTNAME=	Execute-${PORTVERSION}
 
 MAINTAINER=	ruslan@shevchenko.kiev.ua
+COMMENT=	Files executor from OffiX
 
 LIB_DEPENDS=	Dnd.1:${PORTSDIR}/x11/libdnd
 
diff --git a/x11/offix-execute/pkg-comment b/x11/offix-execute/pkg-comment
deleted file mode 100644
index 8ad30b25fe72..000000000000
--- a/x11/offix-execute/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Files executor from OffiX
diff --git a/x11/settitle/Makefile b/x11/settitle/Makefile
index aa111ac0e694..c1ba6a843f53 100644
--- a/x11/settitle/Makefile
+++ b/x11/settitle/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.ugh.net.au/pub/unix/settitle/ \
 		http://ftp.megamirror.com/pub/ugh/unix/settitle/
 
 MAINTAINER=	andrew@ugh.net.au
+COMMENT=	A program for setting the title of terminal emulator windows
 
 WRKSRC=		${WRKDIR}/settitle
 
diff --git a/x11/settitle/pkg-comment b/x11/settitle/pkg-comment
deleted file mode 100644
index 5390d1f6bf2f..000000000000
--- a/x11/settitle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program for setting the title of terminal emulator windows
diff --git a/x11/temperature.app/Makefile b/x11/temperature.app/Makefile
index bb0b50775d61..38ba05329dfe 100644
--- a/x11/temperature.app/Makefile
+++ b/x11/temperature.app/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.fukt.bth.se/~per/temperature/
 DISTNAME=	Temperature.app-${PORTVERSION}
 
 MAINTAINER=	pelle@fukt.bth.se
+COMMENT=	A dockable WindowMaker applet which displays the local temperature
 
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 
diff --git a/x11/temperature.app/pkg-comment b/x11/temperature.app/pkg-comment
deleted file mode 100644
index 06568cc88360..000000000000
--- a/x11/temperature.app/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable WindowMaker applet which displays the local temperature
diff --git a/x11/wmappl/Makefile b/x11/wmappl/Makefile
index 49176be0d52a..155ccf3a03ba 100644
--- a/x11/wmappl/Makefile
+++ b/x11/wmappl/Makefile
@@ -15,6 +15,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 .endif
 
 MAINTAINER=	od@iclub.nsu.ru
+COMMENT=	An application launcher dockapp similar to wmbutton
 
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
diff --git a/x11/wmappl/pkg-comment b/x11/wmappl/pkg-comment
deleted file mode 100644
index 905410fc76a1..000000000000
--- a/x11/wmappl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An application launcher dockapp similar to wmbutton
diff --git a/x11/wmfstatus/Makefile b/x11/wmfstatus/Makefile
index a08070e59ba6..78962ba6aad3 100644
--- a/x11/wmfstatus/Makefile
+++ b/x11/wmfstatus/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=     x11
 MASTER_SITES=   http://www.finik.net/files/
 
 MAINTAINER=     bms@spc.org
+COMMENT=	General purpose LCD display for the WindowMaker dock
 
 WRKSRC=         ${WRKDIR}/${DISTNAME}/${PORTNAME}
 USE_X_PREFIX=	yes
diff --git a/x11/wmfstatus/pkg-comment b/x11/wmfstatus/pkg-comment
deleted file mode 100644
index 6d5b9593cc0a..000000000000
--- a/x11/wmfstatus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-General purpose LCD display for the WindowMaker dock
diff --git a/x11/wmmenu/Makefile b/x11/wmmenu/Makefile
index ff50f5babb84..7c655eef1754 100644
--- a/x11/wmmenu/Makefile
+++ b/x11/wmmenu/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11 gnome
 MASTER_SITES=	http://www.fcoutant.freesurf.fr/download/
 
 MAINTAINER=	karlj000@unbc.ca
+COMMENT=	A popup menu of icons that launch programs for the WindowMaker dock
 
 LIB_DEPENDS=	dockapp.1:${PORTSDIR}/x11-wm/libdockapp:install
 
diff --git a/x11/wmmenu/pkg-comment b/x11/wmmenu/pkg-comment
deleted file mode 100644
index 6296e582a393..000000000000
--- a/x11/wmmenu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A popup menu of icons that launch programs for the WindowMaker dock
diff --git a/x11/wmoldmenu2new/Makefile b/x11/wmoldmenu2new/Makefile
index c9cc2f255b05..dd827c8d51fe 100644
--- a/x11/wmoldmenu2new/Makefile
+++ b/x11/wmoldmenu2new/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	wm-oldmenu2new
 EXTRACT_SUFX=	.gz
 
 MAINTAINER=	bms@spc.org
+COMMENT=	Script to convert WindowMaker RootMenu menus to new PropList format
 
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
diff --git a/x11/wmoldmenu2new/pkg-comment b/x11/wmoldmenu2new/pkg-comment
deleted file mode 100644
index b920905204ac..000000000000
--- a/x11/wmoldmenu2new/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Script to convert WindowMaker RootMenu menus to new PropList format
diff --git a/x11/wterm/Makefile b/x11/wterm/Makefile
index 9876af89b395..282cb45a45fc 100644
--- a/x11/wterm/Makefile
+++ b/x11/wterm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES= 	http://largo.windowmaker.org/files/
 
 MAINTAINER=	adam-ports@blacktabby.org
+COMMENT=	A color vt102 terminal emulator with transparency support
 
 BUILD_DEPENDS=	${X11BASE}/lib/libWINGs.a:${PORTSDIR}/x11-wm/windowmaker
 
diff --git a/x11/wterm/pkg-comment b/x11/wterm/pkg-comment
deleted file mode 100644
index 51dd2923467d..000000000000
--- a/x11/wterm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A color vt102 terminal emulator with transparency support
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index dbb2fc37c73d..244c262d42c9 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	volf@oasis.IAEhv.nl
+COMMENT=	3270 Terminal emulator
 
 USE_IMAKE=	yes
 
diff --git a/x11/x3270/pkg-comment b/x11/x3270/pkg-comment
deleted file mode 100644
index a5b0f31e3680..000000000000
--- a/x11/x3270/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3270 Terminal emulator
diff --git a/x11/xaniroc/Makefile b/x11/xaniroc/Makefile
index 4e0c61c517eb..65ad510f5ac3 100644
--- a/x11/xaniroc/Makefile
+++ b/x11/xaniroc/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.src.tar.Z
 
 MAINTAINER=	sec@42.org
+COMMENT=	Animate your root-cursor
 
 USE_IMAKE=	yes
 MAN1=		xaniroc.1
diff --git a/x11/xaniroc/pkg-comment b/x11/xaniroc/pkg-comment
deleted file mode 100644
index 4ab2cb72570c..000000000000
--- a/x11/xaniroc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Animate your root-cursor
diff --git a/x11/xautolock/Makefile b/x11/xautolock/Makefile
index 7fde0b2e443d..c9612d51729e 100644
--- a/x11/xautolock/Makefile
+++ b/x11/xautolock/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}-pl15
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	eblood@cs.unr.edu
+COMMENT=	Used to activate xlock after a user defined time of inactivity
 
 USE_IMAKE=	yes
 MAN1=		xautolock.1
diff --git a/x11/xautolock/pkg-comment b/x11/xautolock/pkg-comment
deleted file mode 100644
index d6bd377265ac..000000000000
--- a/x11/xautolock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Used to activate xlock after a user defined time of inactivity
diff --git a/x11/xballoon/Makefile b/x11/xballoon/Makefile
index 886f87389a63..63c9d6d2e9b9 100644
--- a/x11/xballoon/Makefile
+++ b/x11/xballoon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://wwwmiya.ee.kagu.tus.ac.jp/~sakai/
 
 MAINTAINER=	sakai@miya.ee.kagu.tus.ac.jp
+COMMENT=	Balloons move on root window
 
 ALL_TARGET=	xballoon
 
diff --git a/x11/xballoon/pkg-comment b/x11/xballoon/pkg-comment
deleted file mode 100644
index 1fd496be318b..000000000000
--- a/x11/xballoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Balloons move on root window
diff --git a/x11/xcmd/Makefile b/x11/xcmd/Makefile
index 590afdb61396..f84178c65089 100644
--- a/x11/xcmd/Makefile
+++ b/x11/xcmd/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 MASTER_SITE_SUBDIR=	X11/xutils
 
 MAINTAINER=	ob@breuninger.org
+COMMENT=	Xcmd is a front-end for starting programs under X11
 
 USE_IMAKE=	yes
 
diff --git a/x11/xcmd/pkg-comment b/x11/xcmd/pkg-comment
deleted file mode 100644
index 62d4bbaafd95..000000000000
--- a/x11/xcmd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xcmd is a front-end for starting programs under X11
diff --git a/x11/xfishtank/Makefile b/x11/xfishtank/Makefile
index 17c6c0e021fe..cd3c3972e2cd 100644
--- a/x11/xfishtank/Makefile
+++ b/x11/xfishtank/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.uni-koeln.de/windows/xcontrib/
 
 MAINTAINER=	jacs@gnome.co.uk
+COMMENT=	Make fish swim in the background of your screen
 
 USE_IMAKE=	yes
 WRKSRC=		${WRKDIR}/xfishtank2.0
diff --git a/x11/xfishtank/pkg-comment b/x11/xfishtank/pkg-comment
deleted file mode 100644
index 7fba5770c82b..000000000000
--- a/x11/xfishtank/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Make fish swim in the background of your screen
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 9f5700038cf3..e91067120c3c 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=		x11
 MASTER_SITES=		http://www.math.missouri.edu/~stephen/software/xkbset/
 
 MAINTAINER=		stephen@math.missouri.edu
+COMMENT=	Manage various XKB features of X Window
 
 MAN1=			xkbset.1
 USE_X_PREFIX=		yes
diff --git a/x11/xkbset/pkg-comment b/x11/xkbset/pkg-comment
deleted file mode 100644
index cc22615a58d5..000000000000
--- a/x11/xkbset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Manage various XKB features of X Window
diff --git a/x11/xkeywrap/Makefile b/x11/xkeywrap/Makefile
index 737c5544e9b6..71eebe8ee946 100644
--- a/x11/xkeywrap/Makefile
+++ b/x11/xkeywrap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.seki.ee.kagu.tus.ac.jp/~sakai/myfreesoft/ \
 		http://www.people.or.jp/~hsakai/myfreesoft/
 
 MAINTAINER=	sakai@seki.ee.kagu.tus.ac.jp
+COMMENT=	Record, repeat, and play key sequence from keyboard
 
 USE_X_PREFIX=	yes
 MAN1=		xkeywrap.1
diff --git a/x11/xkeywrap/pkg-comment b/x11/xkeywrap/pkg-comment
deleted file mode 100644
index 04192e18157c..000000000000
--- a/x11/xkeywrap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Record, repeat, and play key sequence from keyboard
diff --git a/x11/xmangekyou/Makefile b/x11/xmangekyou/Makefile
index 187bd8c10373..cc7778914faa 100644
--- a/x11/xmangekyou/Makefile
+++ b/x11/xmangekyou/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.seki.ee.kagu.tus.ac.jp/~sakai/myfreesoft/
 
 MAINTAINER=	sakai@seki.ee.kagu.tus.ac.jp
+COMMENT=	A kaleidoscope on X
 
 ALL_TARGET=	xmangekyou
 
diff --git a/x11/xmangekyou/pkg-comment b/x11/xmangekyou/pkg-comment
deleted file mode 100644
index 11445d189a90..000000000000
--- a/x11/xmangekyou/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A kaleidoscope on X
diff --git a/x11/xmon/Makefile b/x11/xmon/Makefile
index 446bf18bcc26..2dbdc14b8107 100644
--- a/x11/xmon/Makefile
+++ b/x11/xmon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.ibiblio.org/pub/X11/contrib/devel_tools/
 DISTNAME=	xmon.${PORTVERSION}
 
 MAINTAINER=	bms@spc.org
+COMMENT=	Raw X11 protocol analyser
 
 WRKSRC=		${WRKDIR}/xmon.${PORTVERSION}
 USE_IMAKE=	yes
diff --git a/x11/xmon/pkg-comment b/x11/xmon/pkg-comment
deleted file mode 100644
index 29e7c1612b91..000000000000
--- a/x11/xmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Raw X11 protocol analyser
diff --git a/x11/xmotd/Makefile b/x11/xmotd/Makefile
index aa896fd2c994..8c9fec4946f4 100644
--- a/x11/xmotd/Makefile
+++ b/x11/xmotd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.ee.ryerson.ca/~elf/pub/
 
 MAINTAINER=	mwest@uct.ac.za
+COMMENT=	A message-of-the-day browser for X11 and dumb-terminals
 
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/x11/xmotd/pkg-comment b/x11/xmotd/pkg-comment
deleted file mode 100644
index 55c1d0e91dc0..000000000000
--- a/x11/xmotd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A message-of-the-day browser for X11 and dumb-terminals
diff --git a/x11/xmove/Makefile b/x11/xmove/Makefile
index 029d3f356fe7..e827e6068efa 100644
--- a/x11/xmove/Makefile
+++ b/x11/xmove/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.cs.columbia.edu/pub/xmove/
 DISTNAME=	${PORTNAME}.${PORTVERSION:S/b/beta/}
 
 MAINTAINER=	sec@42.org
+COMMENT=	Pseudoserver to support mobile X11 clients
 
 WRKSRC=		${WRKDIR}/xmove
 
diff --git a/x11/xmove/pkg-comment b/x11/xmove/pkg-comment
deleted file mode 100644
index 7b4f8579098e..000000000000
--- a/x11/xmove/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pseudoserver to support mobile X11 clients
diff --git a/x11/xmsg/Makefile b/x11/xmsg/Makefile
index 476296dd8876..ca3e3122a534 100644
--- a/x11/xmsg/Makefile
+++ b/x11/xmsg/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://www.generalconcepts.com/resources/software/
 
 MAINTAINER=	jsellens@generalconcepts.com
+COMMENT=	The X11R4 version of xmessage updated for X11R5 and renamed
 
 MAN1=		xmsg.1
 MANCOMPRESSED=	yes
diff --git a/x11/xmsg/pkg-comment b/x11/xmsg/pkg-comment
deleted file mode 100644
index 08f2b985c007..000000000000
--- a/x11/xmsg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The X11R4 version of xmessage updated for X11R5 and renamed
diff --git a/x11/xmx/Makefile b/x11/xmx/Makefile
index 65063aa65878..9a22eef76baf 100644
--- a/x11/xmx/Makefile
+++ b/x11/xmx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://ftp.cs.brown.edu/pub/xmx/
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ob@breuninger.org
+COMMENT=	An X protocol multiplexor
 
 USE_X_PREFIX=	yes
 
diff --git a/x11/xmx/pkg-comment b/x11/xmx/pkg-comment
deleted file mode 100644
index c017bed355f1..000000000000
--- a/x11/xmx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X protocol multiplexor
diff --git a/x11/xrootconsole/Makefile b/x11/xrootconsole/Makefile
index 72adb7d2f6c7..fed658bfa6eb 100644
--- a/x11/xrootconsole/Makefile
+++ b/x11/xrootconsole/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://de-fac.to/bob/xrootconsole/ \
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	incabulos@mac.com
+COMMENT=	Writes any log live onto the background
 
 USE_REINPLACE=	yes
 USE_XLIB=	yes
diff --git a/x11/xrootconsole/pkg-comment b/x11/xrootconsole/pkg-comment
deleted file mode 100644
index c9649e06bcc3..000000000000
--- a/x11/xrootconsole/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Writes any log live onto the background
diff --git a/x11/xstarroll/Makefile b/x11/xstarroll/Makefile
index b1e7321ea715..9be544ba9991 100644
--- a/x11/xstarroll/Makefile
+++ b/x11/xstarroll/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://wwwmiya.ee.kagu.tus.ac.jp/~sakai/
 
 MAINTAINER=	sakai@miya.ee.kagu.tus.ac.jp
+COMMENT=	Letters fly to far, far, far away
 
 ALL_TARGET=	xstarroll
 
diff --git a/x11/xstarroll/pkg-comment b/x11/xstarroll/pkg-comment
deleted file mode 100644
index 49eaef4d53b2..000000000000
--- a/x11/xstarroll/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Letters fly to far, far, far away
diff --git a/x11/xtacy/Makefile b/x11/xtacy/Makefile
index fedebb640bef..11dd15ed8bdc 100644
--- a/x11/xtacy/Makefile
+++ b/x11/xtacy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	apps/graphics/hacks/X
 DISTNAME=	${PORTNAME}114
 
 MAINTAINER=	matt@bdd.net
+COMMENT=	An X11 trippy color-cycling toy
 
 USE_IMAKE=	yes
 MAN1=		xtacy.1
diff --git a/x11/xtacy/pkg-comment b/x11/xtacy/pkg-comment
deleted file mode 100644
index 591740277315..000000000000
--- a/x11/xtacy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 trippy color-cycling toy
diff --git a/x11/xtermset/Makefile b/x11/xtermset/Makefile
index f28ad932c416..631d2e9bfbd3 100644
--- a/x11/xtermset/Makefile
+++ b/x11/xtermset/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	clts
 
 MAINTAINER=	dr@astorit.com
+COMMENT=	Dynamically change some settings of an xterm
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/x11/xtermset/pkg-comment b/x11/xtermset/pkg-comment
deleted file mode 100644
index 0a062b0f436f..000000000000
--- a/x11/xtermset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dynamically change some settings of an xterm
-- 
cgit v1.2.3