aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--benchmarks/httperf/Makefile1
-rw-r--r--benchmarks/httperf/pkg-comment1
-rw-r--r--french/aspell/Makefile1
-rw-r--r--french/aspell/pkg-comment1
-rw-r--r--german/aspell/Makefile1
-rw-r--r--german/aspell/pkg-comment1
-rw-r--r--polish/aspell/Makefile1
-rw-r--r--polish/aspell/pkg-comment1
-rw-r--r--portuguese/aspell-pt_PT/Makefile1
-rw-r--r--portuguese/aspell-pt_PT/pkg-comment1
-rw-r--r--portuguese/aspell/Makefile1
-rw-r--r--portuguese/aspell/pkg-comment1
-rw-r--r--russian/aspell/Makefile1
-rw-r--r--russian/aspell/pkg-comment1
-rw-r--r--textproc/aft/Makefile1
-rw-r--r--textproc/aft/pkg-comment1
-rw-r--r--textproc/agrep/Makefile1
-rw-r--r--textproc/agrep/pkg-comment1
-rw-r--r--textproc/align/Makefile1
-rw-r--r--textproc/align/pkg-comment1
-rw-r--r--textproc/aspell/Makefile2
-rw-r--r--textproc/aspell/pkg-comment1
-rw-r--r--textproc/br-aspell/Makefile1
-rw-r--r--textproc/br-aspell/pkg-comment1
-rw-r--r--textproc/ca-aspell/Makefile1
-rw-r--r--textproc/ca-aspell/pkg-comment1
-rw-r--r--textproc/chpp/Makefile1
-rw-r--r--textproc/chpp/pkg-comment1
-rw-r--r--textproc/cocoon/Makefile1
-rw-r--r--textproc/cocoon/pkg-comment1
-rw-r--r--textproc/cs-aspell/Makefile1
-rw-r--r--textproc/cs-aspell/pkg-comment1
-rw-r--r--textproc/cwtext/Makefile1
-rw-r--r--textproc/cwtext/pkg-comment1
-rw-r--r--textproc/cy-aspell/Makefile1
-rw-r--r--textproc/cy-aspell/pkg-comment1
-rw-r--r--textproc/da-aspell/Makefile1
-rw-r--r--textproc/da-aspell/pkg-comment1
-rw-r--r--textproc/domc/Makefile1
-rw-r--r--textproc/domc/pkg-comment1
-rw-r--r--textproc/dtdinst/Makefile1
-rw-r--r--textproc/dtdinst/pkg-comment1
-rw-r--r--textproc/el-aspell/Makefile1
-rw-r--r--textproc/el-aspell/pkg-comment1
-rw-r--r--textproc/eo-aspell/Makefile1
-rw-r--r--textproc/eo-aspell/pkg-comment1
-rw-r--r--textproc/es-aspell/Makefile1
-rw-r--r--textproc/es-aspell/pkg-comment1
-rw-r--r--textproc/filepp/Makefile1
-rw-r--r--textproc/filepp/pkg-comment1
-rw-r--r--textproc/fo-aspell/Makefile1
-rw-r--r--textproc/fo-aspell/pkg-comment1
-rw-r--r--textproc/glark/Makefile1
-rw-r--r--textproc/glark/pkg-comment1
-rw-r--r--textproc/gmetadom/Makefile1
-rw-r--r--textproc/gmetadom/pkg-comment1
-rw-r--r--textproc/gtk-doc/Makefile1
-rw-r--r--textproc/gtk-doc/pkg-comment1
-rw-r--r--textproc/gtkdiff/Makefile1
-rw-r--r--textproc/gtkdiff/pkg-comment1
-rw-r--r--textproc/gutenmark/Makefile1
-rw-r--r--textproc/gutenmark/pkg-comment1
-rw-r--r--textproc/gxmlviewer/Makefile1
-rw-r--r--textproc/gxmlviewer/pkg-comment1
-rw-r--r--textproc/html2fo/Makefile1
-rw-r--r--textproc/html2fo/pkg-comment1
-rw-r--r--textproc/htmltolatex/Makefile1
-rw-r--r--textproc/htmltolatex/pkg-comment1
-rw-r--r--textproc/info_to_html/Makefile1
-rw-r--r--textproc/info_to_html/pkg-comment1
-rw-r--r--textproc/ipdf/Makefile1
-rw-r--r--textproc/ipdf/pkg-comment1
-rw-r--r--textproc/it-aspell/Makefile1
-rw-r--r--textproc/it-aspell/pkg-comment1
-rw-r--r--textproc/jing/Makefile1
-rw-r--r--textproc/jing/pkg-comment1
-rw-r--r--textproc/jrefentry/Makefile1
-rw-r--r--textproc/jrefentry/pkg-comment1
-rw-r--r--textproc/latex2html/Makefile1
-rw-r--r--textproc/latex2html/pkg-comment1
-rw-r--r--textproc/libtre/Makefile1
-rw-r--r--textproc/libtre/pkg-comment1
-rw-r--r--textproc/libxml++/Makefile1
-rw-r--r--textproc/libxml++/pkg-comment1
-rw-r--r--textproc/libxml++26/Makefile1
-rw-r--r--textproc/libxml++26/pkg-comment1
-rw-r--r--textproc/libxode/Makefile1
-rw-r--r--textproc/libxode/pkg-comment1
-rw-r--r--textproc/ltxml/Makefile1
-rw-r--r--textproc/ltxml/pkg-comment1
-rw-r--r--textproc/mifluz/Makefile1
-rw-r--r--textproc/mifluz/pkg-comment1
-rw-r--r--textproc/minidom/Makefile1
-rw-r--r--textproc/minidom/pkg-comment1
-rw-r--r--textproc/nl-aspell/Makefile1
-rw-r--r--textproc/nl-aspell/pkg-comment1
-rw-r--r--textproc/nn-aspell/Makefile1
-rw-r--r--textproc/nn-aspell/pkg-comment1
-rw-r--r--textproc/no-aspell/Makefile1
-rw-r--r--textproc/no-aspell/pkg-comment1
-rw-r--r--textproc/p5-Text-Template/Makefile1
-rw-r--r--textproc/p5-Text-Template/pkg-comment1
-rw-r--r--textproc/p5-XML-Catalog/Makefile1
-rw-r--r--textproc/p5-XML-Catalog/pkg-comment1
-rw-r--r--textproc/p5-XML-RSS/Makefile1
-rw-r--r--textproc/p5-XML-RSS/pkg-comment1
-rw-r--r--textproc/p5-XML-SimpleObject/Makefile1
-rw-r--r--textproc/p5-XML-SimpleObject/pkg-comment1
-rw-r--r--textproc/p5-XML-TreeBuilder/Makefile1
-rw-r--r--textproc/p5-XML-TreeBuilder/pkg-comment1
-rw-r--r--textproc/p5-XML-Writer/Makefile1
-rw-r--r--textproc/p5-XML-Writer/pkg-comment1
-rw-r--r--textproc/p5-XML-XSLT/Makefile1
-rw-r--r--textproc/p5-XML-XSLT/pkg-comment1
-rw-r--r--textproc/pardiff/Makefile1
-rw-r--r--textproc/pardiff/pkg-comment1
-rw-r--r--textproc/pl-aspell/Makefile1
-rw-r--r--textproc/pl-aspell/pkg-comment1
-rw-r--r--textproc/py-HyperText/Makefile1
-rw-r--r--textproc/py-HyperText/pkg-comment1
-rw-r--r--textproc/py-asv/Makefile1
-rw-r--r--textproc/py-asv/pkg-comment1
-rw-r--r--textproc/py-docutils/Makefile1
-rw-r--r--textproc/py-docutils/pkg-comment1
-rw-r--r--textproc/py-expat/Makefile1
-rw-r--r--textproc/py-expat/pkg-comment1
-rw-r--r--textproc/py-jaxml/Makefile1
-rw-r--r--textproc/py-jaxml/pkg-comment1
-rw-r--r--textproc/py-ltxml/Makefile1
-rw-r--r--textproc/py-ltxml/pkg-comment1
-rw-r--r--textproc/py-rdflib/Makefile1
-rw-r--r--textproc/py-rdflib/pkg-comment1
-rw-r--r--textproc/py-xmltools/Makefile1
-rw-r--r--textproc/py-xmltools/pkg-comment1
-rw-r--r--textproc/pybook/Makefile1
-rw-r--r--textproc/pybook/pkg-comment1
-rw-r--r--textproc/raptor/Makefile1
-rw-r--r--textproc/raptor/pkg-comment1
-rw-r--r--textproc/raptor2/Makefile1
-rw-r--r--textproc/raptor2/pkg-comment1
-rw-r--r--textproc/rasqal/Makefile1
-rw-r--r--textproc/rasqal/pkg-comment1
-rw-r--r--textproc/redland/Makefile1
-rw-r--r--textproc/redland/pkg-comment1
-rw-r--r--textproc/ro-aspell/Makefile1
-rw-r--r--textproc/ro-aspell/pkg-comment1
-rw-r--r--textproc/roap/Makefile1
-rw-r--r--textproc/roap/pkg-comment1
-rw-r--r--textproc/rot/Makefile1
-rw-r--r--textproc/rot/pkg-comment1
-rw-r--r--textproc/rtf2htm/Makefile1
-rw-r--r--textproc/rtf2htm/pkg-comment1
-rw-r--r--textproc/sk-aspell/Makefile1
-rw-r--r--textproc/sk-aspell/pkg-comment1
-rw-r--r--textproc/sv-aspell/Makefile1
-rw-r--r--textproc/sv-aspell/pkg-comment1
-rw-r--r--textproc/tex2im/Makefile1
-rw-r--r--textproc/tex2im/pkg-comment1
-rw-r--r--textproc/texi2db/Makefile1
-rw-r--r--textproc/texi2db/pkg-comment1
-rw-r--r--textproc/tth/Makefile1
-rw-r--r--textproc/tth/pkg-comment1
-rw-r--r--textproc/txt2man/Makefile1
-rw-r--r--textproc/txt2man/pkg-comment1
-rw-r--r--textproc/unrtf/Makefile1
-rw-r--r--textproc/unrtf/pkg-comment1
-rw-r--r--textproc/xerces-c/Makefile1
-rw-r--r--textproc/xerces-c/pkg-comment1
-rw-r--r--textproc/xml4j/Makefile1
-rw-r--r--textproc/xml4j/pkg-comment1
-rw-r--r--textproc/xmlpp/Makefile1
-rw-r--r--textproc/xmlpp/pkg-comment1
-rw-r--r--textproc/xmlppm/Makefile1
-rw-r--r--textproc/xmlppm/pkg-comment1
-rw-r--r--textproc/xmlwrapp/Makefile1
-rw-r--r--textproc/xmlwrapp/pkg-comment1
-rw-r--r--textproc/xslint/Makefile1
-rw-r--r--textproc/xslint/pkg-comment1
-rw-r--r--ukrainian/aspell/Makefile1
-rw-r--r--ukrainian/aspell/pkg-comment1
-rw-r--r--www/Mosaic/Makefile1
-rw-r--r--www/Mosaic/pkg-comment1
-rw-r--r--www/apache-contrib/Makefile1
-rw-r--r--www/apache-contrib/pkg-comment1
-rw-r--r--www/apache13-modssl/Makefile1
-rw-r--r--www/apache13-modssl/pkg-comment1
-rw-r--r--www/apache13-ssl/Makefile1
-rw-r--r--www/apache13-ssl/pkg-comment1
-rw-r--r--www/arena/Makefile1
-rw-r--r--www/arena/pkg-comment1
-rw-r--r--www/ashe/Makefile1
-rw-r--r--www/ashe/pkg-comment1
-rw-r--r--www/auth_ldap/Makefile1
-rw-r--r--www/auth_ldap/pkg-comment1
-rw-r--r--www/bkmrkconv/Makefile1
-rw-r--r--www/bkmrkconv/pkg-comment1
-rw-r--r--www/cadaver/Makefile1
-rw-r--r--www/cadaver/pkg-comment1
-rw-r--r--www/cgic/Makefile1
-rw-r--r--www/cgic/pkg-comment1
-rw-r--r--www/cgicc/Makefile1
-rw-r--r--www/cgicc/pkg-comment1
-rw-r--r--www/cgichk/Makefile1
-rw-r--r--www/cgichk/pkg-comment1
-rw-r--r--www/chimera/Makefile1
-rw-r--r--www/chimera/pkg-comment1
-rw-r--r--www/cocoon/Makefile1
-rw-r--r--www/cocoon/pkg-comment1
-rw-r--r--www/decss/Makefile1
-rw-r--r--www/decss/pkg-comment1
-rw-r--r--www/dillo-i18n/Makefile1
-rw-r--r--www/dillo-i18n/pkg-comment1
-rw-r--r--www/dillo/Makefile1
-rw-r--r--www/dillo/pkg-comment1
-rw-r--r--www/dillo2/Makefile1
-rw-r--r--www/dillo2/pkg-comment1
-rw-r--r--www/fhttpd/Makefile1
-rw-r--r--www/fhttpd/pkg-comment1
-rw-r--r--www/flashplugin/Makefile1
-rw-r--r--www/flashplugin/pkg-comment1
-rw-r--r--www/fxhtml/Makefile1
-rw-r--r--www/fxhtml/pkg-comment1
-rw-r--r--www/gn/Makefile1
-rw-r--r--www/gn/pkg-comment1
-rw-r--r--www/grail/Makefile1
-rw-r--r--www/grail/pkg-comment1
-rw-r--r--www/harvest/Makefile1
-rw-r--r--www/harvest/pkg-comment1
-rw-r--r--www/htmlobject/Makefile1
-rw-r--r--www/htmlobject/pkg-comment1
-rw-r--r--www/httperf/Makefile1
-rw-r--r--www/httperf/pkg-comment1
-rw-r--r--www/interchange/Makefile1
-rw-r--r--www/interchange/pkg-comment1
-rw-r--r--www/jetty/Makefile1
-rw-r--r--www/jetty/pkg-comment1
-rw-r--r--www/junkbuster/Makefile1
-rw-r--r--www/junkbuster/pkg-comment1
-rw-r--r--www/kannel/Makefile1
-rw-r--r--www/kannel/pkg-comment1
-rw-r--r--www/libwww/Makefile1
-rw-r--r--www/libwww/pkg-comment1
-rw-r--r--www/linux-lesstif-ns/Makefile1
-rw-r--r--www/linux-lesstif-ns/pkg-comment1
-rw-r--r--www/lynx/Makefile1
-rw-r--r--www/lynx/pkg-comment1
-rw-r--r--www/mapedit/Makefile1
-rw-r--r--www/mapedit/pkg-comment1
-rw-r--r--www/mgstat/Makefile1
-rw-r--r--www/mgstat/pkg-comment1
-rw-r--r--www/mod_access_identd/Makefile1
-rw-r--r--www/mod_access_identd/pkg-comment1
-rw-r--r--www/mod_access_referer/Makefile1
-rw-r--r--www/mod_access_referer/pkg-comment1
-rw-r--r--www/mod_auth_any/Makefile1
-rw-r--r--www/mod_auth_any/pkg-comment1
-rw-r--r--www/mod_bf/Makefile1
-rw-r--r--www/mod_bf/pkg-comment1
-rw-r--r--www/mod_blowchunks/Makefile1
-rw-r--r--www/mod_blowchunks/pkg-comment1
-rw-r--r--www/mod_cgi_debug/Makefile1
-rw-r--r--www/mod_cgi_debug/pkg-comment1
-rw-r--r--www/mod_color/Makefile1
-rw-r--r--www/mod_color/pkg-comment1
-rw-r--r--www/mod_hosts_access/Makefile1
-rw-r--r--www/mod_hosts_access/pkg-comment1
-rw-r--r--www/mod_index_rss/Makefile1
-rw-r--r--www/mod_index_rss/pkg-comment1
-rw-r--r--www/mod_mp3/Makefile1
-rw-r--r--www/mod_mp3/pkg-comment1
-rw-r--r--www/mod_mylo/Makefile1
-rw-r--r--www/mod_mylo/pkg-comment1
-rw-r--r--www/mod_mysqluserdir/Makefile1
-rw-r--r--www/mod_mysqluserdir/pkg-comment1
-rw-r--r--www/mod_put/Makefile1
-rw-r--r--www/mod_put/pkg-comment1
-rw-r--r--www/mod_python/Makefile1
-rw-r--r--www/mod_python/pkg-comment1
-rw-r--r--www/mod_roaming/Makefile1
-rw-r--r--www/mod_roaming/pkg-comment1
-rw-r--r--www/mod_sed/Makefile1
-rw-r--r--www/mod_sed/pkg-comment1
-rw-r--r--www/mod_sequester/Makefile1
-rw-r--r--www/mod_sequester/pkg-comment1
-rw-r--r--www/mod_snake/Makefile1
-rw-r--r--www/mod_snake/pkg-comment1
-rw-r--r--www/mod_ticket/Makefile1
-rw-r--r--www/mod_ticket/pkg-comment1
-rw-r--r--www/netrik/Makefile1
-rw-r--r--www/netrik/pkg-comment1
-rw-r--r--www/oops/Makefile1
-rw-r--r--www/oops/pkg-comment1
-rw-r--r--www/p5-Apache-AddHostPath/Makefile1
-rw-r--r--www/p5-Apache-AddHostPath/pkg-comment1
-rw-r--r--www/p5-Apache-Archive/Makefile1
-rw-r--r--www/p5-Apache-Archive/pkg-comment1
-rw-r--r--www/p5-Apache-AuthCookie/Makefile1
-rw-r--r--www/p5-Apache-AuthCookie/pkg-comment1
-rw-r--r--www/p5-Apache-AuthTicket/Makefile1
-rw-r--r--www/p5-Apache-AuthTicket/pkg-comment1
-rw-r--r--www/p5-Apache-AuthenCache/Makefile1
-rw-r--r--www/p5-Apache-AuthenCache/pkg-comment1
-rw-r--r--www/p5-Apache-AuthenURL/Makefile1
-rw-r--r--www/p5-Apache-AuthenURL/pkg-comment1
-rw-r--r--www/p5-Apache-AutoIndex/Makefile1
-rw-r--r--www/p5-Apache-AutoIndex/pkg-comment1
-rw-r--r--www/p5-Apache-Filter/Makefile1
-rw-r--r--www/p5-Apache-Filter/pkg-comment1
-rw-r--r--www/p5-Apache-Icon/Makefile1
-rw-r--r--www/p5-Apache-Icon/pkg-comment1
-rw-r--r--www/p5-Apache-Language/Makefile1
-rw-r--r--www/p5-Apache-Language/pkg-comment1
-rw-r--r--www/p5-Apache-SSI/Makefile1
-rw-r--r--www/p5-Apache-SSI/pkg-comment1
-rw-r--r--www/p5-Apache-Session-SharedMem/Makefile1
-rw-r--r--www/p5-Apache-Session-SharedMem/pkg-comment1
-rw-r--r--www/p5-CGI-ArgChecker/Makefile1
-rw-r--r--www/p5-CGI-ArgChecker/pkg-comment1
-rw-r--r--www/p5-CGI-FastTemplate/Makefile1
-rw-r--r--www/p5-CGI-FastTemplate/pkg-comment1
-rw-r--r--www/p5-CGI-Minimal/Makefile1
-rw-r--r--www/p5-CGI-Minimal/pkg-comment1
-rw-r--r--www/p5-CGI-modules/Makefile1
-rw-r--r--www/p5-CGI-modules/pkg-comment1
-rw-r--r--www/p5-CGI_Lite/Makefile1
-rw-r--r--www/p5-CGI_Lite/pkg-comment1
-rw-r--r--www/p5-HTML-Clean/Makefile1
-rw-r--r--www/p5-HTML-Clean/pkg-comment1
-rw-r--r--www/p5-HTML-Navigation/Makefile1
-rw-r--r--www/p5-HTML-Navigation/pkg-comment1
-rw-r--r--www/p5-HTML-Pager/Makefile1
-rw-r--r--www/p5-HTML-Pager/pkg-comment1
-rw-r--r--www/p5-HTML-QuickCheck/Makefile1
-rw-r--r--www/p5-HTML-QuickCheck/pkg-comment1
-rw-r--r--www/p5-HTML-SimpleParse/Makefile1
-rw-r--r--www/p5-HTML-SimpleParse/pkg-comment1
-rw-r--r--www/p5-HTML-Tagset/Makefile1
-rw-r--r--www/p5-HTML-Tagset/pkg-comment1
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/Makefile1
-rw-r--r--www/p5-HTML-Widgets-SelectLayers/pkg-comment1
-rw-r--r--www/p5-HTML/Makefile1
-rw-r--r--www/p5-HTML/pkg-comment1
-rw-r--r--www/p5-HTTPD-Tools/Makefile1
-rw-r--r--www/p5-HTTPD-Tools/pkg-comment1
-rw-r--r--www/p5-HTTPD-User-Manage/Makefile1
-rw-r--r--www/p5-HTTPD-User-Manage/pkg-comment1
-rw-r--r--www/p5-libservlet/Makefile1
-rw-r--r--www/p5-libservlet/pkg-comment1
-rw-r--r--www/peacock/Makefile1
-rw-r--r--www/peacock/pkg-comment1
-rw-r--r--www/phpnuke/Makefile1
-rw-r--r--www/phpnuke/pkg-comment1
-rw-r--r--www/plone/Makefile1
-rw-r--r--www/plone/pkg-comment1
-rw-r--r--www/plone3/Makefile1
-rw-r--r--www/plone3/pkg-comment1
-rw-r--r--www/py-HTMLgen/Makefile1
-rw-r--r--www/py-HTMLgen/pkg-comment1
-rw-r--r--www/retawq/Makefile1
-rw-r--r--www/retawq/pkg-comment1
-rw-r--r--www/skipstone/Makefile1
-rw-r--r--www/skipstone/pkg-comment1
-rw-r--r--www/smarty/Makefile1
-rw-r--r--www/smarty/pkg-comment1
-rw-r--r--www/sqmgrlog/Makefile1
-rw-r--r--www/sqmgrlog/pkg-comment1
-rw-r--r--www/surfraw/Makefile1
-rw-r--r--www/surfraw/pkg-comment1
-rw-r--r--www/swish++/Makefile1
-rw-r--r--www/swish++/pkg-comment1
-rw-r--r--www/thumbnail_index/Makefile1
-rw-r--r--www/thumbnail_index/pkg-comment1
-rw-r--r--www/w3c-httpd/Makefile1
-rw-r--r--www/w3c-httpd/pkg-comment1
-rw-r--r--www/webcopy/Makefile1
-rw-r--r--www/webcopy/pkg-comment1
-rw-r--r--www/webglimpse/Makefile1
-rw-r--r--www/webglimpse/pkg-comment1
-rw-r--r--www/wn/Makefile1
-rw-r--r--www/wn/pkg-comment1
-rw-r--r--www/wwwcount/Makefile1
-rw-r--r--www/wwwcount/pkg-comment1
-rw-r--r--www/xist/Makefile1
-rw-r--r--www/xist/pkg-comment1
-rw-r--r--www/xpath2rss/Makefile1
-rw-r--r--www/xpath2rss/pkg-comment1
-rw-r--r--x11-clocks/abclock/Makefile1
-rw-r--r--x11-clocks/abclock/pkg-comment1
-rw-r--r--x11-clocks/bbdate/Makefile1
-rw-r--r--x11-clocks/bbdate/pkg-comment1
-rw-r--r--x11-clocks/bclock/Makefile1
-rw-r--r--x11-clocks/bclock/pkg-comment1
-rw-r--r--x11-clocks/dclock/Makefile1
-rw-r--r--x11-clocks/dclock/pkg-comment1
-rw-r--r--x11-clocks/rclock/Makefile1
-rw-r--r--x11-clocks/rclock/pkg-comment1
-rw-r--r--x11-clocks/t3d/Makefile1
-rw-r--r--x11-clocks/t3d/pkg-comment1
-rw-r--r--x11-fm/dfm/Makefile1
-rw-r--r--x11-fm/dfm/pkg-comment1
-rw-r--r--x11-fm/endeavour/Makefile1
-rw-r--r--x11-fm/endeavour/pkg-comment1
-rw-r--r--x11-fm/ezfm/Makefile1
-rw-r--r--x11-fm/ezfm/pkg-comment1
-rw-r--r--x11-fm/fsv/Makefile1
-rw-r--r--x11-fm/fsv/pkg-comment1
-rw-r--r--x11-fm/mtoolsfm/Makefile1
-rw-r--r--x11-fm/mtoolsfm/pkg-comment1
-rw-r--r--x11-fm/xfm/Makefile1
-rw-r--r--x11-fm/xfm/pkg-comment1
-rw-r--r--x11-fonts/Xg/Makefile1
-rw-r--r--x11-fonts/Xg/pkg-comment1
-rw-r--r--x11-fonts/p5-type1inst/Makefile1
-rw-r--r--x11-fonts/p5-type1inst/pkg-comment1
-rw-r--r--x11-fonts/ttmkfdir/Makefile1
-rw-r--r--x11-fonts/ttmkfdir/pkg-comment1
-rw-r--r--x11-fonts/xfed/Makefile1
-rw-r--r--x11-fonts/xfed/pkg-comment1
-rw-r--r--x11-fonts/xmbdfed/Makefile1
-rw-r--r--x11-fonts/xmbdfed/pkg-comment1
-rw-r--r--x11-themes/colorstep/Makefile1
-rw-r--r--x11-themes/colorstep/pkg-comment1
-rw-r--r--x11-themes/engradient/Makefile1
-rw-r--r--x11-themes/engradient/pkg-comment1
-rw-r--r--x11-themes/gtk-Mac2-theme/Makefile1
-rw-r--r--x11-themes/gtk-Mac2-theme/pkg-comment1
-rw-r--r--x11-themes/gtk-flat-theme/Makefile1
-rw-r--r--x11-themes/gtk-flat-theme/pkg-comment1
-rw-r--r--x11-themes/gtk-flat-theme2/Makefile1
-rw-r--r--x11-themes/gtk-flat-theme2/pkg-comment1
-rw-r--r--x11-themes/gtkbe/Makefile1
-rw-r--r--x11-themes/gtkbe/pkg-comment1
-rw-r--r--x11-themes/gtkstep/Makefile1
-rw-r--r--x11-themes/gtkstep/pkg-comment1
-rw-r--r--x11-themes/icegradient/Makefile1
-rw-r--r--x11-themes/icegradient/pkg-comment1
-rw-r--r--x11-themes/notif2/Makefile1
-rw-r--r--x11-themes/notif2/pkg-comment1
-rw-r--r--x11-themes/whistlerk/Makefile1
-rw-r--r--x11-themes/whistlerk/pkg-comment1
-rw-r--r--x11-themes/xenophilia/Makefile1
-rw-r--r--x11-themes/xenophilia/pkg-comment1
-rw-r--r--x11-themes/xenostep/Makefile1
-rw-r--r--x11-themes/xenostep/pkg-comment1
-rw-r--r--x11-toolkits/Xaw3d/Makefile1
-rw-r--r--x11-toolkits/Xaw3d/pkg-comment1
-rw-r--r--x11-toolkits/bwidget/Makefile1
-rw-r--r--x11-toolkits/bwidget/pkg-comment1
-rw-r--r--x11-toolkits/colorstep/Makefile1
-rw-r--r--x11-toolkits/colorstep/pkg-comment1
-rw-r--r--x11-toolkits/engradient/Makefile1
-rw-r--r--x11-toolkits/engradient/pkg-comment1
-rw-r--r--x11-toolkits/gevas/Makefile1
-rw-r--r--x11-toolkits/gevas/pkg-comment1
-rw-r--r--x11-toolkits/gtk-Mac2-theme/Makefile1
-rw-r--r--x11-toolkits/gtk-Mac2-theme/pkg-comment1
-rw-r--r--x11-toolkits/gtk-flat-theme/Makefile1
-rw-r--r--x11-toolkits/gtk-flat-theme/pkg-comment1
-rw-r--r--x11-toolkits/gtk-flat-theme2/Makefile1
-rw-r--r--x11-toolkits/gtk-flat-theme2/pkg-comment1
-rw-r--r--x11-toolkits/gtkbe/Makefile1
-rw-r--r--x11-toolkits/gtkbe/pkg-comment1
-rw-r--r--x11-toolkits/gtkdatabox/Makefile1
-rw-r--r--x11-toolkits/gtkdatabox/pkg-comment1
-rw-r--r--x11-toolkits/gtkdatabox2/Makefile1
-rw-r--r--x11-toolkits/gtkdatabox2/pkg-comment1
-rw-r--r--x11-toolkits/gtkglarea--/Makefile1
-rw-r--r--x11-toolkits/gtkglarea--/pkg-comment1
-rw-r--r--x11-toolkits/gtkmathview/Makefile1
-rw-r--r--x11-toolkits/gtkmathview/pkg-comment1
-rw-r--r--x11-toolkits/gtkstep/Makefile1
-rw-r--r--x11-toolkits/gtkstep/pkg-comment1
-rw-r--r--x11-toolkits/icegradient/Makefile1
-rw-r--r--x11-toolkits/icegradient/pkg-comment1
-rw-r--r--x11-toolkits/itk/Makefile1
-rw-r--r--x11-toolkits/itk/pkg-comment1
-rw-r--r--x11-toolkits/iwidgets/Makefile1
-rw-r--r--x11-toolkits/iwidgets/pkg-comment1
-rw-r--r--x11-toolkits/mesgui/Makefile1
-rw-r--r--x11-toolkits/mesgui/pkg-comment1
-rw-r--r--x11-toolkits/movingmotif/Makefile1
-rw-r--r--x11-toolkits/movingmotif/pkg-comment1
-rw-r--r--x11-toolkits/notif2/Makefile1
-rw-r--r--x11-toolkits/notif2/pkg-comment1
-rw-r--r--x11-toolkits/p5-Tcl-Tk/Makefile1
-rw-r--r--x11-toolkits/p5-Tcl-Tk/pkg-comment1
-rw-r--r--x11-toolkits/p5-TclTk/Makefile1
-rw-r--r--x11-toolkits/p5-TclTk/pkg-comment1
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/Makefile1
-rw-r--r--x11-toolkits/p5-Tk-Autoscroll/pkg-comment1
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/Makefile1
-rw-r--r--x11-toolkits/p5-Tk-ColourChooser/pkg-comment1
-rw-r--r--x11-toolkits/p5-Tk-Enscript/Makefile1
-rw-r--r--x11-toolkits/p5-Tk-Enscript/pkg-comment1
-rw-r--r--x11-toolkits/p5-Tk/Makefile1
-rw-r--r--x11-toolkits/p5-Tk/pkg-comment1
-rw-r--r--x11-toolkits/paragui-devel/Makefile1
-rw-r--r--x11-toolkits/paragui-devel/pkg-comment1
-rw-r--r--x11-toolkits/paragui/Makefile1
-rw-r--r--x11-toolkits/paragui/pkg-comment1
-rw-r--r--x11-toolkits/plib/Makefile1
-rw-r--r--x11-toolkits/plib/pkg-comment1
-rw-r--r--x11-toolkits/py-anygui/Makefile1
-rw-r--r--x11-toolkits/py-anygui/pkg-comment1
-rw-r--r--x11-toolkits/sdl_gui/Makefile1
-rw-r--r--x11-toolkits/sdl_gui/pkg-comment1
-rw-r--r--x11-toolkits/slingshot/Makefile1
-rw-r--r--x11-toolkits/slingshot/pkg-comment1
-rw-r--r--x11-toolkits/tk80/Makefile1
-rw-r--r--x11-toolkits/tk80/pkg-comment1
-rw-r--r--x11-toolkits/tkstep80/Makefile1
-rw-r--r--x11-toolkits/tkstep80/pkg-comment1
-rw-r--r--x11-toolkits/viewklass/Makefile1
-rw-r--r--x11-toolkits/viewklass/pkg-comment1
-rw-r--r--x11-toolkits/whistlerk/Makefile1
-rw-r--r--x11-toolkits/whistlerk/pkg-comment1
-rw-r--r--x11-toolkits/xenophilia/Makefile1
-rw-r--r--x11-toolkits/xenophilia/pkg-comment1
-rw-r--r--x11-toolkits/xenostep/Makefile1
-rw-r--r--x11-toolkits/xenostep/pkg-comment1
-rw-r--r--x11-toolkits/xg/Makefile1
-rw-r--r--x11-toolkits/xg/pkg-comment1
-rw-r--r--x11-toolkits/xview-clients/Makefile1
-rw-r--r--x11-toolkits/xview-clients/pkg-comment1
-rw-r--r--x11-toolkits/xview/Makefile1
-rw-r--r--x11-toolkits/xview/pkg-comment1
-rw-r--r--x11-wm/9menu/Makefile1
-rw-r--r--x11-wm/9menu/pkg-comment1
-rw-r--r--x11-wm/9wm/Makefile1
-rw-r--r--x11-wm/9wm/pkg-comment1
-rw-r--r--x11-wm/aewm++/Makefile1
-rw-r--r--x11-wm/aewm++/pkg-comment1
-rw-r--r--x11-wm/afterstep-i18n/Makefile1
-rw-r--r--x11-wm/afterstep-i18n/pkg-comment1
-rw-r--r--x11-wm/afterstep/Makefile1
-rw-r--r--x11-wm/afterstep/pkg-comment1
-rw-r--r--x11-wm/ahwm/Makefile1
-rw-r--r--x11-wm/ahwm/pkg-comment1
-rw-r--r--x11-wm/amiwm/Makefile1
-rw-r--r--x11-wm/amiwm/pkg-comment1
-rw-r--r--x11-wm/ctwm/Makefile1
-rw-r--r--x11-wm/ctwm/pkg-comment1
-rw-r--r--x11-wm/e16utils/Makefile1
-rw-r--r--x11-wm/e16utils/pkg-comment1
-rw-r--r--x11-wm/epplets/Makefile1
-rw-r--r--x11-wm/epplets/pkg-comment1
-rw-r--r--x11-wm/gwm/Makefile1
-rw-r--r--x11-wm/gwm/pkg-comment1
-rw-r--r--x11-wm/icepref/Makefile1
-rw-r--r--x11-wm/icepref/pkg-comment1
-rw-r--r--x11-wm/libepplet/Makefile1
-rw-r--r--x11-wm/libepplet/pkg-comment1
-rw-r--r--x11-wm/lwm/Makefile1
-rw-r--r--x11-wm/lwm/pkg-comment1
-rw-r--r--x11-wm/novawm/Makefile1
-rw-r--r--x11-wm/novawm/pkg-comment1
-rw-r--r--x11-wm/piewm/Makefile1
-rw-r--r--x11-wm/piewm/pkg-comment1
-rw-r--r--x11-wm/toolbox/Makefile1
-rw-r--r--x11-wm/toolbox/pkg-comment1
-rw-r--r--x11-wm/ude/Makefile1
-rw-r--r--x11-wm/ude/pkg-comment1
-rw-r--r--x11-wm/wmanager/Makefile1
-rw-r--r--x11-wm/wmanager/pkg-comment1
-rw-r--r--x11-wm/xfce/Makefile1
-rw-r--r--x11-wm/xfce/pkg-comment1
-rw-r--r--x11-wm/xfce4/Makefile1
-rw-r--r--x11-wm/xfce4/pkg-comment1
-rw-r--r--x11/9menu/Makefile1
-rw-r--r--x11/9menu/pkg-comment1
-rw-r--r--x11/9term/Makefile1
-rw-r--r--x11/9term/pkg-comment1
-rw-r--r--x11/XFree86-aoutlibs/Makefile1
-rw-r--r--x11/XFree86-aoutlibs/pkg-comment1
-rw-r--r--x11/blast/Makefile1
-rw-r--r--x11/blast/pkg-comment1
-rw-r--r--x11/dxpc/Makefile1
-rw-r--r--x11/dxpc/pkg-comment1
-rw-r--r--x11/ecore/Makefile1
-rw-r--r--x11/ecore/pkg-comment1
-rw-r--r--x11/fbsd-icons/Makefile1
-rw-r--r--x11/fbsd-icons/pkg-comment1
-rw-r--r--x11/gbackground/Makefile1
-rw-r--r--x11/gbackground/pkg-comment1
-rw-r--r--x11/gdkxft/Makefile1
-rw-r--r--x11/gdkxft/pkg-comment1
-rw-r--r--x11/imwheel/Makefile1
-rw-r--r--x11/imwheel/pkg-comment1
-rw-r--r--x11/libsx/Makefile1
-rw-r--r--x11/libsx/pkg-comment1
-rw-r--r--x11/mgapdesk/Makefile1
-rw-r--r--x11/mgapdesk/pkg-comment1
-rw-r--r--x11/nvidia-driver/Makefile1
-rw-r--r--x11/nvidia-driver/pkg-comment1
-rw-r--r--x11/p5-X11-Protocol/Makefile1
-rw-r--r--x11/p5-X11-Protocol/pkg-comment1
-rw-r--r--x11/peeper/Makefile1
-rw-r--r--x11/peeper/pkg-comment1
-rw-r--r--x11/powershell/Makefile1
-rw-r--r--x11/powershell/pkg-comment1
-rw-r--r--x11/props/Makefile1
-rw-r--r--x11/props/pkg-comment1
-rw-r--r--x11/sxpc/Makefile1
-rw-r--r--x11/sxpc/pkg-comment1
-rw-r--r--x11/tkgoodstuff/Makefile1
-rw-r--r--x11/tkgoodstuff/pkg-comment1
-rw-r--r--x11/twin/Makefile1
-rw-r--r--x11/twin/pkg-comment1
-rw-r--r--x11/tycoon/Makefile1
-rw-r--r--x11/tycoon/pkg-comment1
-rw-r--r--x11/wmmatrix/Makefile1
-rw-r--r--x11/wmmatrix/pkg-comment1
-rw-r--r--x11/wscan/Makefile1
-rw-r--r--x11/wscan/pkg-comment1
-rw-r--r--x11/xautomation/Makefile1
-rw-r--r--x11/xautomation/pkg-comment1
-rw-r--r--x11/xbanner/Makefile1
-rw-r--r--x11/xbanner/pkg-comment1
-rw-r--r--x11/xbindkeys/Makefile1
-rw-r--r--x11/xbindkeys/pkg-comment1
-rw-r--r--x11/xbindkeys_config/Makefile1
-rw-r--r--x11/xbindkeys_config/pkg-comment1
-rw-r--r--x11/xcb/Makefile1
-rw-r--r--x11/xcb/pkg-comment1
-rw-r--r--x11/xclip/Makefile1
-rw-r--r--x11/xclip/pkg-comment1
-rw-r--r--x11/xcolors/Makefile1
-rw-r--r--x11/xcolors/pkg-comment1
-rw-r--r--x11/xcolorsel/Makefile1
-rw-r--r--x11/xcolorsel/pkg-comment1
-rw-r--r--x11/xdialog/Makefile1
-rw-r--r--x11/xdialog/pkg-comment1
-rw-r--r--x11/xnee/Makefile1
-rw-r--r--x11/xnee/pkg-comment1
-rw-r--r--x11/xsel/Makefile1
-rw-r--r--x11/xsel/pkg-comment1
-rw-r--r--x11/xskyroot/Makefile1
-rw-r--r--x11/xskyroot/pkg-comment1
-rw-r--r--x11/xstroke/Makefile1
-rw-r--r--x11/xstroke/pkg-comment1
-rw-r--r--x11/xtattr/Makefile1
-rw-r--r--x11/xtattr/pkg-comment1
-rw-r--r--x11/xtoolwait/Makefile1
-rw-r--r--x11/xtoolwait/pkg-comment1
-rw-r--r--x11/xvattr/Makefile1
-rw-r--r--x11/xvattr/pkg-comment1
-rw-r--r--x11/xwatchwin/Makefile1
-rw-r--r--x11/xwatchwin/pkg-comment1
648 files changed, 324 insertions, 325 deletions
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index 97ed230db5bc..be90a412b785 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= ftp://ftp.hpl.hp.com/pub/httperf/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tool for measuring webserver performance
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/benchmarks/httperf/pkg-comment b/benchmarks/httperf/pkg-comment
deleted file mode 100644
index 6adc47fad0e8..000000000000
--- a/benchmarks/httperf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for measuring webserver performance
diff --git a/french/aspell/Makefile b/french/aspell/Makefile
index 1883ea980d8c..ad6d038e6a79 100644
--- a/french/aspell/Makefile
+++ b/french/aspell/Makefile
@@ -9,6 +9,7 @@ PORTNAME= aspell
CATEGORIES= french
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with French dictionaries
MASTERDIR= ${.CURDIR}/../../textproc/aspell
diff --git a/french/aspell/pkg-comment b/french/aspell/pkg-comment
deleted file mode 100644
index f2b568c92b8e..000000000000
--- a/french/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with French dictionaries
diff --git a/german/aspell/Makefile b/german/aspell/Makefile
index 95edab04d293..ec2ad4cb8e76 100644
--- a/german/aspell/Makefile
+++ b/german/aspell/Makefile
@@ -9,6 +9,7 @@ PORTNAME= aspell
CATEGORIES= german
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with German dictionary
MASTERDIR= ${.CURDIR}/../../textproc/aspell
diff --git a/german/aspell/pkg-comment b/german/aspell/pkg-comment
deleted file mode 100644
index 4b9d7bbb0488..000000000000
--- a/german/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with German dictionary
diff --git a/polish/aspell/Makefile b/polish/aspell/Makefile
index 089a5a985310..5eba12f26191 100644
--- a/polish/aspell/Makefile
+++ b/polish/aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pl-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Polish dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/polish/aspell/pkg-comment b/polish/aspell/pkg-comment
deleted file mode 100644
index 1d37dae1e58a..000000000000
--- a/polish/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Polish dictionary
diff --git a/portuguese/aspell-pt_PT/Makefile b/portuguese/aspell-pt_PT/Makefile
index 738cb30823ee..7bf49222e123 100644
--- a/portuguese/aspell-pt_PT/Makefile
+++ b/portuguese/aspell-pt_PT/Makefile
@@ -9,6 +9,7 @@ PORTNAME= aspell
CATEGORIES= portuguese
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Portuguese dictionary
MASTERDIR= ${.CURDIR}/../../textproc/aspell
diff --git a/portuguese/aspell-pt_PT/pkg-comment b/portuguese/aspell-pt_PT/pkg-comment
deleted file mode 100644
index 62af98c0cc33..000000000000
--- a/portuguese/aspell-pt_PT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Portuguese dictionary
diff --git a/portuguese/aspell/Makefile b/portuguese/aspell/Makefile
index 738cb30823ee..7bf49222e123 100644
--- a/portuguese/aspell/Makefile
+++ b/portuguese/aspell/Makefile
@@ -9,6 +9,7 @@ PORTNAME= aspell
CATEGORIES= portuguese
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Portuguese dictionary
MASTERDIR= ${.CURDIR}/../../textproc/aspell
diff --git a/portuguese/aspell/pkg-comment b/portuguese/aspell/pkg-comment
deleted file mode 100644
index 62af98c0cc33..000000000000
--- a/portuguese/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Portuguese dictionary
diff --git a/russian/aspell/Makefile b/russian/aspell/Makefile
index 29ccd02edf3d..755b2d601b8a 100644
--- a/russian/aspell/Makefile
+++ b/russian/aspell/Makefile
@@ -9,6 +9,7 @@ PORTNAME= aspell
CATEGORIES= russian
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Russian dictionary
MASTERDIR= ${.CURDIR}/../../textproc/aspell
diff --git a/russian/aspell/pkg-comment b/russian/aspell/pkg-comment
deleted file mode 100644
index 48f09105c3db..000000000000
--- a/russian/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Russian dictionary
diff --git a/textproc/aft/Makefile b/textproc/aft/Makefile
index 7541a08bbdf2..36a46fb7b514 100644
--- a/textproc/aft/Makefile
+++ b/textproc/aft/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.maplefish.com/todd/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A document preparation system using an Almost Free Text input format
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/textproc/aft/pkg-comment b/textproc/aft/pkg-comment
deleted file mode 100644
index 8ce721cd6074..000000000000
--- a/textproc/aft/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A document preparation system using an Almost Free Text input format
diff --git a/textproc/agrep/Makefile b/textproc/agrep/Makefile
index 22c42deeff4b..f2cd27fea520 100644
--- a/textproc/agrep/Makefile
+++ b/textproc/agrep/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX= .tar.Z
#DISTFILES= ${DISTNAME}.${EXTRACT_SUFX} agrep.ps.1.Z agrep.ps.2.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Approximate grep (fast approximate pattern-matching tool)
ALL_TARGET=
MAKE_ARGS= CFLAGS="${CFLAGS}"
diff --git a/textproc/agrep/pkg-comment b/textproc/agrep/pkg-comment
deleted file mode 100644
index aa7e61ecfbbd..000000000000
--- a/textproc/agrep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Approximate grep (fast approximate pattern-matching tool)
diff --git a/textproc/align/Makefile b/textproc/align/Makefile
index 6ab0cf1cf6a1..dd512620ad56 100644
--- a/textproc/align/Makefile
+++ b/textproc/align/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.cs.indiana.edu/~kinzler/align/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Text column alignment filter
USE_PERL5= yes
diff --git a/textproc/align/pkg-comment b/textproc/align/pkg-comment
deleted file mode 100644
index b592fd7f6374..000000000000
--- a/textproc/align/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text column alignment filter
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 90b30918d59f..2bde839ce9bb 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -16,6 +16,7 @@ DISTFILES= aspell-0.50.3.tar.gz # needed for slave ports / options
EXTRACT_ONLY= aspell-0.50.3.tar.gz
MAINTAINER?= thierry@pompo.net
+COMMENT?= Spelling checker with better suggestion logic than ispell
.if !exists(/usr/bin/bzip2)
BUILD_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2
@@ -34,7 +35,6 @@ INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/aspell-${PORTVERSION} # needed for slave ports / options
DOCSDIR= ${PREFIX}/share/doc/aspell
DATADIR= ${PREFIX}/share/aspell
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
CONF_DICT_ENV= ASPELL="${PREFIX}/bin/aspell" \
diff --git a/textproc/aspell/pkg-comment b/textproc/aspell/pkg-comment
deleted file mode 100644
index a899df6a5960..000000000000
--- a/textproc/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Spelling checker with better suggestion logic than ispell
diff --git a/textproc/br-aspell/Makefile b/textproc/br-aspell/Makefile
index cce92dc3fdc2..01047c5225c4 100644
--- a/textproc/br-aspell/Makefile
+++ b/textproc/br-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= br-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Breton dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/br-aspell/pkg-comment b/textproc/br-aspell/pkg-comment
deleted file mode 100644
index 9f807c434f76..000000000000
--- a/textproc/br-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Breton dictionary
diff --git a/textproc/ca-aspell/Makefile b/textproc/ca-aspell/Makefile
index 90f67b522e72..99f9b5ea2243 100644
--- a/textproc/ca-aspell/Makefile
+++ b/textproc/ca-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ca-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Catalan dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/ca-aspell/pkg-comment b/textproc/ca-aspell/pkg-comment
deleted file mode 100644
index 673ec0a50004..000000000000
--- a/textproc/ca-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Catalan dictionary
diff --git a/textproc/chpp/Makefile b/textproc/chpp/Makefile
index ab02c3c6833d..87d3256050ef 100644
--- a/textproc/chpp/Makefile
+++ b/textproc/chpp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.complang.tuwien.ac.at/~schani/chpp/files/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Non-intrusive full-featured text preprocessor
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --libdir=${PREFIX}/share
diff --git a/textproc/chpp/pkg-comment b/textproc/chpp/pkg-comment
deleted file mode 100644
index b0cbf5b6e81d..000000000000
--- a/textproc/chpp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Non-intrusive full-featured text preprocessor
diff --git a/textproc/cocoon/Makefile b/textproc/cocoon/Makefile
index 5e02e84562c2..698430f6ccab 100644
--- a/textproc/cocoon/Makefile
+++ b/textproc/cocoon/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= cocoon/cocoon1
DISTNAME= Cocoon-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= 100% pure Java publishing framework servlet
USE_JAVA= 1.1+
MAKE_ENV= JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH}
diff --git a/textproc/cocoon/pkg-comment b/textproc/cocoon/pkg-comment
deleted file mode 100644
index 2f88fbe3086c..000000000000
--- a/textproc/cocoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-100% pure Java publishing framework servlet
diff --git a/textproc/cs-aspell/Makefile b/textproc/cs-aspell/Makefile
index 07c61d255e73..0bd66d67b3af 100644
--- a/textproc/cs-aspell/Makefile
+++ b/textproc/cs-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= cs-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Czech dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/cs-aspell/pkg-comment b/textproc/cs-aspell/pkg-comment
deleted file mode 100644
index c33e67e01d64..000000000000
--- a/textproc/cs-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Czech dictionary
diff --git a/textproc/cwtext/Makefile b/textproc/cwtext/Makefile
index eb5ada6b419b..2c0e9f8ec013 100644
--- a/textproc/cwtext/Makefile
+++ b/textproc/cwtext/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Morse Code Generator
USE_PYTHON= yes
USE_REINPLACE= yes
diff --git a/textproc/cwtext/pkg-comment b/textproc/cwtext/pkg-comment
deleted file mode 100644
index 6af1a1fc801f..000000000000
--- a/textproc/cwtext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Morse Code Generator
diff --git a/textproc/cy-aspell/Makefile b/textproc/cy-aspell/Makefile
index 117ce99c5d14..7eea4d45eccf 100644
--- a/textproc/cy-aspell/Makefile
+++ b/textproc/cy-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= cy-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Welsh dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/cy-aspell/pkg-comment b/textproc/cy-aspell/pkg-comment
deleted file mode 100644
index af9d9fb9632e..000000000000
--- a/textproc/cy-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Welsh dictionary
diff --git a/textproc/da-aspell/Makefile b/textproc/da-aspell/Makefile
index bdd16ab5d601..55b29d8a5672 100644
--- a/textproc/da-aspell/Makefile
+++ b/textproc/da-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= da-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Danish dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/da-aspell/pkg-comment b/textproc/da-aspell/pkg-comment
deleted file mode 100644
index 5bc650934e0b..000000000000
--- a/textproc/da-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Danish dictionary
diff --git a/textproc/domc/Makefile b/textproc/domc/Makefile
index f4c2bdf3cb72..d0d01edbd00c 100644
--- a/textproc/domc/Makefile
+++ b/textproc/domc/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://users.erols.com/mballen/domc/src/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A light weight implementation of the DOM in ANSI C
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
mba:${PORTSDIR}/devel/libmba
diff --git a/textproc/domc/pkg-comment b/textproc/domc/pkg-comment
deleted file mode 100644
index e09ab8b91584..000000000000
--- a/textproc/domc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A light weight implementation of the DOM in ANSI C
diff --git a/textproc/dtdinst/Makefile b/textproc/dtdinst/Makefile
index ac3897ba4293..b1cabb7e4d24 100644
--- a/textproc/dtdinst/Makefile
+++ b/textproc/dtdinst/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
EXTRACT_ONLY=
MAINTAINER= ports@FreeBSD.org
+COMMENT= Converts DTDs to XML instance, in a specific or RELAX NG format
USE_JAVA= 1.1+
NO_BUILD= yes
diff --git a/textproc/dtdinst/pkg-comment b/textproc/dtdinst/pkg-comment
deleted file mode 100644
index 92dfcdaa7689..000000000000
--- a/textproc/dtdinst/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts DTDs to XML instance, in a specific or RELAX NG format
diff --git a/textproc/el-aspell/Makefile b/textproc/el-aspell/Makefile
index de1edb6a5e6c..2e629c40f978 100644
--- a/textproc/el-aspell/Makefile
+++ b/textproc/el-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= el-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Greek dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/el-aspell/pkg-comment b/textproc/el-aspell/pkg-comment
deleted file mode 100644
index f3ca803fc5de..000000000000
--- a/textproc/el-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Greek dictionary
diff --git a/textproc/eo-aspell/Makefile b/textproc/eo-aspell/Makefile
index b42a9eb7fdfb..004478ee9b63 100644
--- a/textproc/eo-aspell/Makefile
+++ b/textproc/eo-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= eo-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Esperanto dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/eo-aspell/pkg-comment b/textproc/eo-aspell/pkg-comment
deleted file mode 100644
index 4a6bad4b228b..000000000000
--- a/textproc/eo-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Esperanto dictionary
diff --git a/textproc/es-aspell/Makefile b/textproc/es-aspell/Makefile
index 4551c93fd2b8..6c442c401dde 100644
--- a/textproc/es-aspell/Makefile
+++ b/textproc/es-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= es-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Spanish dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/es-aspell/pkg-comment b/textproc/es-aspell/pkg-comment
deleted file mode 100644
index 33273b2a9193..000000000000
--- a/textproc/es-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Spanish dictionary
diff --git a/textproc/filepp/Makefile b/textproc/filepp/Makefile
index 16ed0e7c0cc3..bd13b3822cea 100644
--- a/textproc/filepp/Makefile
+++ b/textproc/filepp/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.cabaret.demon.co.uk/filepp/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A generic file preprocessor
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/textproc/filepp/pkg-comment b/textproc/filepp/pkg-comment
deleted file mode 100644
index f65eda7ff671..000000000000
--- a/textproc/filepp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic file preprocessor
diff --git a/textproc/fo-aspell/Makefile b/textproc/fo-aspell/Makefile
index 293c20a4fca2..9825f1d13dc8 100644
--- a/textproc/fo-aspell/Makefile
+++ b/textproc/fo-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= fo-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Faroese dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/fo-aspell/pkg-comment b/textproc/fo-aspell/pkg-comment
deleted file mode 100644
index 6d35a974b444..000000000000
--- a/textproc/fo-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Faroese dictionary
diff --git a/textproc/glark/Makefile b/textproc/glark/Makefile
index 992557234c8d..4510bb5dee47 100644
--- a/textproc/glark/Makefile
+++ b/textproc/glark/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Search text files for complex regular expressions
USE_RUBY= yes
NO_BUILD= yes
diff --git a/textproc/glark/pkg-comment b/textproc/glark/pkg-comment
deleted file mode 100644
index 12c63351cfed..000000000000
--- a/textproc/glark/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search text files for complex regular expressions
diff --git a/textproc/gmetadom/Makefile b/textproc/gmetadom/Makefile
index dd3c22e7667e..ecb4a896f3b4 100644
--- a/textproc/gmetadom/Makefile
+++ b/textproc/gmetadom/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-0.0.3
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Collection of DOM Implementations
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
ocamlfind:${PORTSDIR}/devel/ocaml-findlib
diff --git a/textproc/gmetadom/pkg-comment b/textproc/gmetadom/pkg-comment
deleted file mode 100644
index 2ca52ac08152..000000000000
--- a/textproc/gmetadom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Collection of DOM Implementations
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index e41d9b6bb2d6..114fb97ff825 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.gtk.org/pub/gtk/v1.1/docs/rdp/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Code documentation system, originally for GTK+
BUILD_DEPENDS= ${LOCALBASE}/share/sgml/docbook/dsssl/modular/html/docbook.dsl:${PORTSDIR}/textproc/dsssl-docbook-modular
RUN_DEPENDS= jade:${PORTSDIR}/textproc/jade
diff --git a/textproc/gtk-doc/pkg-comment b/textproc/gtk-doc/pkg-comment
deleted file mode 100644
index f007d286748b..000000000000
--- a/textproc/gtk-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Code documentation system, originally for GTK+
diff --git a/textproc/gtkdiff/Makefile b/textproc/gtkdiff/Makefile
index 906da2cb7663..87ec2d55cd1b 100644
--- a/textproc/gtkdiff/Makefile
+++ b/textproc/gtkdiff/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc gnome
MASTER_SITES= http://home.catv.ne.jp/pp/ginoue/software/gtkdiff/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A frontend program for diff(1) written for GNOME
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/textproc/gtkdiff/pkg-comment b/textproc/gtkdiff/pkg-comment
deleted file mode 100644
index fb6b1afcfa9c..000000000000
--- a/textproc/gtkdiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A frontend program for diff(1) written for GNOME
diff --git a/textproc/gutenmark/Makefile b/textproc/gutenmark/Makefile
index 9136a7772ea6..260498d3eaac 100644
--- a/textproc/gutenmark/Makefile
+++ b/textproc/gutenmark/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.sandroid.org/GutenMark/SoftwareSnapshots/
DISTNAME= GutenMark_source_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Attractively formatting Project Gutenberg texts
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/GutenMark-source
diff --git a/textproc/gutenmark/pkg-comment b/textproc/gutenmark/pkg-comment
deleted file mode 100644
index 1127f7f1cb5a..000000000000
--- a/textproc/gutenmark/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Attractively formatting Project Gutenberg texts
diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile
index 52f0f0a1378b..42a1b6ea942d 100644
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An xmlviewer with a netscape plugin, and now a bonobo control as well
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/textproc/gxmlviewer/pkg-comment b/textproc/gxmlviewer/pkg-comment
deleted file mode 100644
index 67e09c255995..000000000000
--- a/textproc/gxmlviewer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xmlviewer with a netscape plugin, and now a bonobo control as well
diff --git a/textproc/html2fo/Makefile b/textproc/html2fo/Makefile
index baff5d7115cd..af512abbeb38 100644
--- a/textproc/html2fo/Makefile
+++ b/textproc/html2fo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= HTML to xsl:fo converter
USE_REINPLACE= yes
diff --git a/textproc/html2fo/pkg-comment b/textproc/html2fo/pkg-comment
deleted file mode 100644
index 2c81bffae2c8..000000000000
--- a/textproc/html2fo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML to xsl:fo converter
diff --git a/textproc/htmltolatex/Makefile b/textproc/htmltolatex/Makefile
index d3111109b0e7..6e44fc8d0f43 100644
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://crydee.sai.msu.ru/zeus/unix/WWW/tools/converters/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= HTML to LaTeX to PDF Converter
LIB_DEPENDS= Magick:${PORTSDIR}/graphics/ImageMagick
diff --git a/textproc/htmltolatex/pkg-comment b/textproc/htmltolatex/pkg-comment
deleted file mode 100644
index a9125ca2c00c..000000000000
--- a/textproc/htmltolatex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML to LaTeX to PDF Converter
diff --git a/textproc/info_to_html/Makefile b/textproc/info_to_html/Makefile
index 72144677b3a1..6d37e04b7ed6 100644
--- a/textproc/info_to_html/Makefile
+++ b/textproc/info_to_html/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc perl5
MASTER_SITES= http://www.mons.net/software/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Translate GNU info files into HTML pages
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
diff --git a/textproc/info_to_html/pkg-comment b/textproc/info_to_html/pkg-comment
deleted file mode 100644
index e7ca4d3fff6d..000000000000
--- a/textproc/info_to_html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translate GNU info files into HTML pages
diff --git a/textproc/ipdf/Makefile b/textproc/ipdf/Makefile
index 4cfcc8f17987..1a3d129405e3 100644
--- a/textproc/ipdf/Makefile
+++ b/textproc/ipdf/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://hoopajoo.net/static/projects/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Creates indexed pdf documents from text files
LIB_DEPENDS= pdf:${PORTSDIR}/print/pdflib \
png:${PORTSDIR}/graphics/png \
diff --git a/textproc/ipdf/pkg-comment b/textproc/ipdf/pkg-comment
deleted file mode 100644
index 07890d18c346..000000000000
--- a/textproc/ipdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Creates indexed pdf documents from text files
diff --git a/textproc/it-aspell/Makefile b/textproc/it-aspell/Makefile
index 51220e77b402..02529acf1587 100644
--- a/textproc/it-aspell/Makefile
+++ b/textproc/it-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= it-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Italian dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/it-aspell/pkg-comment b/textproc/it-aspell/pkg-comment
deleted file mode 100644
index 6dd2dabe53e1..000000000000
--- a/textproc/it-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Italian dictionary
diff --git a/textproc/jing/Makefile b/textproc/jing/Makefile
index 6adedf39dbe8..d70af5399373 100644
--- a/textproc/jing/Makefile
+++ b/textproc/jing/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-bin
DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A RELAX NG validator in Java
RUN_DEPENDS= ${JAVAJARDIR}/crimson.jar:${PORTSDIR}/textproc/crimson
diff --git a/textproc/jing/pkg-comment b/textproc/jing/pkg-comment
deleted file mode 100644
index 20bad05ccd10..000000000000
--- a/textproc/jing/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A RELAX NG validator in Java
diff --git a/textproc/jrefentry/Makefile b/textproc/jrefentry/Makefile
index f1f2a8cd0ffb..0f4005451e3d 100644
--- a/textproc/jrefentry/Makefile
+++ b/textproc/jrefentry/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= docbook
MAINTAINER= ports@FreeBSD.org
+COMMENT= DocBook XML JRefEntry DTD
RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/catalog:${PORTSDIR}/textproc/docbook-xml
diff --git a/textproc/jrefentry/pkg-comment b/textproc/jrefentry/pkg-comment
deleted file mode 100644
index 59776240b7fc..000000000000
--- a/textproc/jrefentry/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DocBook XML JRefEntry DTD
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index 430802d4614c..955db40ae13e 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= support/${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Convert LaTeX documents to HTML
.include <bsd.port.pre.mk>
diff --git a/textproc/latex2html/pkg-comment b/textproc/latex2html/pkg-comment
deleted file mode 100644
index 8f87d63dacac..000000000000
--- a/textproc/latex2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert LaTeX documents to HTML
diff --git a/textproc/libtre/Makefile b/textproc/libtre/Makefile
index 200e21951d72..237bec34b6df 100644
--- a/textproc/libtre/Makefile
+++ b/textproc/libtre/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://kouli.iki.fi/~vlaurika/tre/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A lightweight fully POSIX compliant regexp matching library
USE_BZIP2= yes
USE_LIBTOOL= yes
diff --git a/textproc/libtre/pkg-comment b/textproc/libtre/pkg-comment
deleted file mode 100644
index 0c9f87bcd0e9..000000000000
--- a/textproc/libtre/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight fully POSIX compliant regexp matching library
diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile
index c682becefa77..723213d2f185 100644
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/+/plus/g}
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML API for C++
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/textproc/libxml++/pkg-comment b/textproc/libxml++/pkg-comment
deleted file mode 100644
index d1cd9c9f1f2b..000000000000
--- a/textproc/libxml++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML API for C++
diff --git a/textproc/libxml++26/Makefile b/textproc/libxml++26/Makefile
index c682becefa77..723213d2f185 100644
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:S/+/plus/g}
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML API for C++
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/textproc/libxml++26/pkg-comment b/textproc/libxml++26/pkg-comment
deleted file mode 100644
index d1cd9c9f1f2b..000000000000
--- a/textproc/libxml++26/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML API for C++
diff --git a/textproc/libxode/Makefile b/textproc/libxode/Makefile
index 36fdc44c9c52..8896b45ad82c 100644
--- a/textproc/libxode/Makefile
+++ b/textproc/libxode/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An XML library which wraps expat
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/textproc/libxode/pkg-comment b/textproc/libxode/pkg-comment
deleted file mode 100644
index 7d2c51c82898..000000000000
--- a/textproc/libxode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An XML library which wraps expat
diff --git a/textproc/ltxml/Makefile b/textproc/ltxml/Makefile
index e03587145b8c..af5cfbfa2d62 100644
--- a/textproc/ltxml/Makefile
+++ b/textproc/ltxml/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cogsci.ed.ac.uk/pub/LTXML/
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML Toolkit
CONFIGURE_WRKSRC= ${WRKSRC}/XML
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
diff --git a/textproc/ltxml/pkg-comment b/textproc/ltxml/pkg-comment
deleted file mode 100644
index 8e1817271227..000000000000
--- a/textproc/ltxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML Toolkit
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index afb6d51b9cd5..1e202dcbda23 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= C++ library to build and query a full text inverted index
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/textproc/mifluz/pkg-comment b/textproc/mifluz/pkg-comment
deleted file mode 100644
index 224e5f93cdbd..000000000000
--- a/textproc/mifluz/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ library to build and query a full text inverted index
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index 97dc1c64ab79..f8f5351109a0 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= textproc
MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A minimal implementation of the Document Object Model
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2 \
iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/textproc/minidom/pkg-comment b/textproc/minidom/pkg-comment
deleted file mode 100644
index a121e4e9ed4f..000000000000
--- a/textproc/minidom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A minimal implementation of the Document Object Model
diff --git a/textproc/nl-aspell/Makefile b/textproc/nl-aspell/Makefile
index d803a6eef8c1..5e97a1aa336b 100644
--- a/textproc/nl-aspell/Makefile
+++ b/textproc/nl-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= nl-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Dutch dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/nl-aspell/pkg-comment b/textproc/nl-aspell/pkg-comment
deleted file mode 100644
index 4d41a77eacad..000000000000
--- a/textproc/nl-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Dutch dictionary
diff --git a/textproc/nn-aspell/Makefile b/textproc/nn-aspell/Makefile
index 9d2da569f2e7..ba77c31fd092 100644
--- a/textproc/nn-aspell/Makefile
+++ b/textproc/nn-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= no-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Norwegian dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/nn-aspell/pkg-comment b/textproc/nn-aspell/pkg-comment
deleted file mode 100644
index 8268a290f0b7..000000000000
--- a/textproc/nn-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Norwegian dictionary
diff --git a/textproc/no-aspell/Makefile b/textproc/no-aspell/Makefile
index 9d2da569f2e7..ba77c31fd092 100644
--- a/textproc/no-aspell/Makefile
+++ b/textproc/no-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= no-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Norwegian dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/no-aspell/pkg-comment b/textproc/no-aspell/pkg-comment
deleted file mode 100644
index 8268a290f0b7..000000000000
--- a/textproc/no-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Norwegian dictionary
diff --git a/textproc/p5-Text-Template/Makefile b/textproc/p5-Text-Template/Makefile
index f00638fcb4cc..19dbfb9fe413 100644
--- a/textproc/p5-Text-Template/Makefile
+++ b/textproc/p5-Text-Template/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Expand template text with embedded Perl
PERL_CONFIGURE= YES
diff --git a/textproc/p5-Text-Template/pkg-comment b/textproc/p5-Text-Template/pkg-comment
deleted file mode 100644
index 7f5775ff8a62..000000000000
--- a/textproc/p5-Text-Template/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Expand template text with embedded Perl
diff --git a/textproc/p5-XML-Catalog/Makefile b/textproc/p5-XML-Catalog/Makefile
index 55d6059ed696..e53c374142dd 100644
--- a/textproc/p5-XML-Catalog/Makefile
+++ b/textproc/p5-XML-Catalog/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Resolve public identifiers and remap system identifiers
BUILD_DEPENDS= ${SITE_PERL}/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
${SITE_PERL}/${PERL_VER}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/textproc/p5-XML-Catalog/pkg-comment b/textproc/p5-XML-Catalog/pkg-comment
deleted file mode 100644
index 11e3352dd516..000000000000
--- a/textproc/p5-XML-Catalog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Resolve public identifiers and remap system identifiers
diff --git a/textproc/p5-XML-RSS/Makefile b/textproc/p5-XML-RSS/Makefile
index 88df63e919b5..838fea47814d 100644
--- a/textproc/p5-XML-RSS/Makefile
+++ b/textproc/p5-XML-RSS/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl extension to manage RDF Site Summary (RSS) files
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/textproc/p5-XML-RSS/pkg-comment b/textproc/p5-XML-RSS/pkg-comment
deleted file mode 100644
index fd404ae4b32d..000000000000
--- a/textproc/p5-XML-RSS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension to manage RDF Site Summary (RSS) files
diff --git a/textproc/p5-XML-SimpleObject/Makefile b/textproc/p5-XML-SimpleObject/Makefile
index 6f6812cd5f4b..1b33997c8acb 100644
--- a/textproc/p5-XML-SimpleObject/Makefile
+++ b/textproc/p5-XML-SimpleObject/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= API for accessing the structure of an XML document
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/textproc/p5-XML-SimpleObject/pkg-comment b/textproc/p5-XML-SimpleObject/pkg-comment
deleted file mode 100644
index 57d5cd2295f0..000000000000
--- a/textproc/p5-XML-SimpleObject/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-API for accessing the structure of an XML document
diff --git a/textproc/p5-XML-TreeBuilder/Makefile b/textproc/p5-XML-TreeBuilder/Makefile
index 6cc81863de70..312f96cc3f1d 100644
--- a/textproc/p5-XML-TreeBuilder/Makefile
+++ b/textproc/p5-XML-TreeBuilder/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module to make XML document trees
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tree.pm:${PORTSDIR}/www/p5-HTML-Tree \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/textproc/p5-XML-TreeBuilder/pkg-comment b/textproc/p5-XML-TreeBuilder/pkg-comment
deleted file mode 100644
index fad67d61e287..000000000000
--- a/textproc/p5-XML-TreeBuilder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to make XML document trees
diff --git a/textproc/p5-XML-Writer/Makefile b/textproc/p5-XML-Writer/Makefile
index 14bc06233f59..f50c5cf0a8fe 100644
--- a/textproc/p5-XML-Writer/Makefile
+++ b/textproc/p5-XML-Writer/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple Perl module for writing XML documents
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-XML-Writer/pkg-comment b/textproc/p5-XML-Writer/pkg-comment
deleted file mode 100644
index 19f04e81052a..000000000000
--- a/textproc/p5-XML-Writer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple Perl module for writing XML documents
diff --git a/textproc/p5-XML-XSLT/Makefile b/textproc/p5-XML-XSLT/Makefile
index 14d207c5805a..9beb437453d5 100644
--- a/textproc/p5-XML-XSLT/Makefile
+++ b/textproc/p5-XML-XSLT/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML::XSLT - A perl module for processing XSLT
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/Simple.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/textproc/p5-XML-XSLT/pkg-comment b/textproc/p5-XML-XSLT/pkg-comment
deleted file mode 100644
index d4fc667fb113..000000000000
--- a/textproc/p5-XML-XSLT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML::XSLT - A perl module for processing XSLT
diff --git a/textproc/pardiff/Makefile b/textproc/pardiff/Makefile
index afc84db8d6f3..497d3ae28264 100644
--- a/textproc/pardiff/Makefile
+++ b/textproc/pardiff/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pardiff
MAINTAINER= ports@FreeBSD.org
+COMMENT= Parallelizing diff Filter, converts diff output to paralleled format
GNU_CONFIGURE= yes
diff --git a/textproc/pardiff/pkg-comment b/textproc/pardiff/pkg-comment
deleted file mode 100644
index af3423b3d37e..000000000000
--- a/textproc/pardiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Parallelizing diff Filter, converts diff output to paralleled format
diff --git a/textproc/pl-aspell/Makefile b/textproc/pl-aspell/Makefile
index 089a5a985310..5eba12f26191 100644
--- a/textproc/pl-aspell/Makefile
+++ b/textproc/pl-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pl-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Polish dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/pl-aspell/pkg-comment b/textproc/pl-aspell/pkg-comment
deleted file mode 100644
index 1d37dae1e58a..000000000000
--- a/textproc/pl-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Polish dictionary
diff --git a/textproc/py-HyperText/Makefile b/textproc/py-HyperText/Makefile
index 9930fd9e3dac..00b79dea4a04 100644
--- a/textproc/py-HyperText/Makefile
+++ b/textproc/py-HyperText/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://dustman.net/andy/python/HyperText/1.0.1/
PKGNAMEPREFIX= py-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Lightweight HTML/XHTML generator for Python
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/HyperText
diff --git a/textproc/py-HyperText/pkg-comment b/textproc/py-HyperText/pkg-comment
deleted file mode 100644
index 8f10952f28b1..000000000000
--- a/textproc/py-HyperText/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight HTML/XHTML generator for Python
diff --git a/textproc/py-asv/Makefile b/textproc/py-asv/Makefile
index 0de74db32593..efcd73b3932b 100644
--- a/textproc/py-asv/Makefile
+++ b/textproc/py-asv/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://tratt.net/laurie/python/asv/releases/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An extensible Python module to parse simple text file formats like CSV
USE_PYTHON= yes
diff --git a/textproc/py-asv/pkg-comment b/textproc/py-asv/pkg-comment
deleted file mode 100644
index bbbf1274745d..000000000000
--- a/textproc/py-asv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible Python module to parse simple text file formats like CSV
diff --git a/textproc/py-docutils/Makefile b/textproc/py-docutils/Makefile
index bf08163ab93c..bfea3b63b8fd 100644
--- a/textproc/py-docutils/Makefile
+++ b/textproc/py-docutils/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Python Documentation Utilities
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-docutils/pkg-comment b/textproc/py-docutils/pkg-comment
deleted file mode 100644
index 5f39e90c58c4..000000000000
--- a/textproc/py-docutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python Documentation Utilities
diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile
index dc2c8e174072..7a01dd337747 100644
--- a/textproc/py-expat/Makefile
+++ b/textproc/py-expat/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Python interface to the Expat XML parser
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/textproc/py-expat/pkg-comment b/textproc/py-expat/pkg-comment
deleted file mode 100644
index ba64282e6f0b..000000000000
--- a/textproc/py-expat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python interface to the Expat XML parser
diff --git a/textproc/py-jaxml/Makefile b/textproc/py-jaxml/Makefile
index d92a3d95d614..7d99a0e9a95b 100644
--- a/textproc/py-jaxml/Makefile
+++ b/textproc/py-jaxml/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.librelogiciel.com/software/jaxml/tarballs/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Python module to generate XML easily
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-jaxml/pkg-comment b/textproc/py-jaxml/pkg-comment
deleted file mode 100644
index 74bf4d3835ad..000000000000
--- a/textproc/py-jaxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python module to generate XML easily
diff --git a/textproc/py-ltxml/Makefile b/textproc/py-ltxml/Makefile
index 17b705d2a2f4..8b4e2b1c8ffa 100644
--- a/textproc/py-ltxml/Makefile
+++ b/textproc/py-ltxml/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyLTXML-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Python bindings to the LT XML toolkit
BUILD_DEPENDS= ${LOCALBASE}/include/ltxml12/lt-safe.h:${PORTSDIR}/textproc/ltxml
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/py-ltxml/pkg-comment b/textproc/py-ltxml/pkg-comment
deleted file mode 100644
index bc0da4f4273f..000000000000
--- a/textproc/py-ltxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings to the LT XML toolkit
diff --git a/textproc/py-rdflib/Makefile b/textproc/py-rdflib/Makefile
index a6b235623f73..7b0830eecc96 100644
--- a/textproc/py-rdflib/Makefile
+++ b/textproc/py-rdflib/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Python library for RDF manipulation
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-rdflib/pkg-comment b/textproc/py-rdflib/pkg-comment
deleted file mode 100644
index c89f847fd330..000000000000
--- a/textproc/py-rdflib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python library for RDF manipulation
diff --git a/textproc/py-xmltools/Makefile b/textproc/py-xmltools/Makefile
index eb557086ec8a..1a0252abd76c 100644
--- a/textproc/py-xmltools/Makefile
+++ b/textproc/py-xmltools/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.logilab.org/pub/xmltools/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= High level xml tools for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-xmltools/pkg-comment b/textproc/py-xmltools/pkg-comment
deleted file mode 100644
index 594928e557d7..000000000000
--- a/textproc/py-xmltools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High level xml tools for Python
diff --git a/textproc/pybook/Makefile b/textproc/pybook/Makefile
index 38050d85d5e0..2d732d13dcdb 100644
--- a/textproc/pybook/Makefile
+++ b/textproc/pybook/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc python
MASTER_SITES= http://silmarill.org/files/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Project Gutenberg e-texts reader
USE_REINPLACE= yes
USE_PYTHON= yes
diff --git a/textproc/pybook/pkg-comment b/textproc/pybook/pkg-comment
deleted file mode 100644
index 2c4d6882d997..000000000000
--- a/textproc/pybook/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Project Gutenberg e-texts reader
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 5f4d62966b06..c52e486a4e55 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= librdf
MAINTAINER= ports@FreeBSD.org
+COMMENT= RDF Parser Toolkit for Redland
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
xmlparse.1:${PORTSDIR}/www/libwww
diff --git a/textproc/raptor/pkg-comment b/textproc/raptor/pkg-comment
deleted file mode 100644
index f5e5651f4714..000000000000
--- a/textproc/raptor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RDF Parser Toolkit for Redland
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 5f4d62966b06..c52e486a4e55 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= librdf
MAINTAINER= ports@FreeBSD.org
+COMMENT= RDF Parser Toolkit for Redland
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
xmlparse.1:${PORTSDIR}/www/libwww
diff --git a/textproc/raptor2/pkg-comment b/textproc/raptor2/pkg-comment
deleted file mode 100644
index f5e5651f4714..000000000000
--- a/textproc/raptor2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RDF Parser Toolkit for Redland
diff --git a/textproc/rasqal/Makefile b/textproc/rasqal/Makefile
index ed55ab49c672..5c2ff722590d 100644
--- a/textproc/rasqal/Makefile
+++ b/textproc/rasqal/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= librdf
MAINTAINER= ports@FreeBSD.org
+COMMENT= A high-level interface for RDF
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \
gdbm.3:${PORTSDIR}/databases/gdbm \
diff --git a/textproc/rasqal/pkg-comment b/textproc/rasqal/pkg-comment
deleted file mode 100644
index 5a5b6757e5f5..000000000000
--- a/textproc/rasqal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A high-level interface for RDF
diff --git a/textproc/redland/Makefile b/textproc/redland/Makefile
index ed55ab49c672..5c2ff722590d 100644
--- a/textproc/redland/Makefile
+++ b/textproc/redland/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= librdf
MAINTAINER= ports@FreeBSD.org
+COMMENT= A high-level interface for RDF
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \
gdbm.3:${PORTSDIR}/databases/gdbm \
diff --git a/textproc/redland/pkg-comment b/textproc/redland/pkg-comment
deleted file mode 100644
index 5a5b6757e5f5..000000000000
--- a/textproc/redland/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A high-level interface for RDF
diff --git a/textproc/ro-aspell/Makefile b/textproc/ro-aspell/Makefile
index 07c8e01cbfc7..68aa0c733add 100644
--- a/textproc/ro-aspell/Makefile
+++ b/textproc/ro-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= ro-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Romanian dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/ro-aspell/pkg-comment b/textproc/ro-aspell/pkg-comment
deleted file mode 100644
index ace0e46719c1..000000000000
--- a/textproc/ro-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Romanian dictionary
diff --git a/textproc/roap/Makefile b/textproc/roap/Makefile
index 608cfd777064..00feda771e3d 100644
--- a/textproc/roap/Makefile
+++ b/textproc/roap/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Region Oriented Ascii Processor
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/roap/pkg-comment b/textproc/roap/pkg-comment
deleted file mode 100644
index 83bf81dccccb..000000000000
--- a/textproc/roap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Region Oriented Ascii Processor
diff --git a/textproc/rot/Makefile b/textproc/rot/Makefile
index dea30e7398b6..6cf8b48092e6 100644
--- a/textproc/rot/Makefile
+++ b/textproc/rot/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Rotates a file so that lines become columns and vice versa
ALL_TARGET= ${PORTNAME}
diff --git a/textproc/rot/pkg-comment b/textproc/rot/pkg-comment
deleted file mode 100644
index 51349f4d826c..000000000000
--- a/textproc/rot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rotates a file so that lines become columns and vice versa
diff --git a/textproc/rtf2htm/Makefile b/textproc/rtf2htm/Makefile
index f8415aecaaf1..8cf6235e0c15 100644
--- a/textproc/rtf2htm/Makefile
+++ b/textproc/rtf2htm/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.geocities.com/tuorfa/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A command-line converter from RTF (Rich Text) to HTML
USE_REINPLACE= yes
diff --git a/textproc/rtf2htm/pkg-comment b/textproc/rtf2htm/pkg-comment
deleted file mode 100644
index eba92180a14e..000000000000
--- a/textproc/rtf2htm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line converter from RTF (Rich Text) to HTML
diff --git a/textproc/sk-aspell/Makefile b/textproc/sk-aspell/Makefile
index df034466699e..14bb0606d2dc 100644
--- a/textproc/sk-aspell/Makefile
+++ b/textproc/sk-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sk-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Slovak dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/sk-aspell/pkg-comment b/textproc/sk-aspell/pkg-comment
deleted file mode 100644
index 4bf8a526b70b..000000000000
--- a/textproc/sk-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Slovak dictionary
diff --git a/textproc/sv-aspell/Makefile b/textproc/sv-aspell/Makefile
index 3201bf78a5e0..7ef7e24a45df 100644
--- a/textproc/sv-aspell/Makefile
+++ b/textproc/sv-aspell/Makefile
@@ -8,6 +8,7 @@
PORTNAME= sv-aspell
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Swedish dictionary
MASTERDIR= ${.CURDIR}/../aspell
diff --git a/textproc/sv-aspell/pkg-comment b/textproc/sv-aspell/pkg-comment
deleted file mode 100644
index 7ea9e6242912..000000000000
--- a/textproc/sv-aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Swedish dictionary
diff --git a/textproc/tex2im/Makefile b/textproc/tex2im/Makefile
index e2d65efa37b9..9bedf871d9e2 100644
--- a/textproc/tex2im/Makefile
+++ b/textproc/tex2im/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.nought.de/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Converts LaTeX formulas into high resolution pixmap graphics
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \
latex:${PORTSDIR}/print/teTeX \
diff --git a/textproc/tex2im/pkg-comment b/textproc/tex2im/pkg-comment
deleted file mode 100644
index ab4d1754ead6..000000000000
--- a/textproc/tex2im/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts LaTeX formulas into high resolution pixmap graphics
diff --git a/textproc/texi2db/Makefile b/textproc/texi2db/Makefile
index 598a302d88ac..bb922d01be0c 100644
--- a/textproc/texi2db/Makefile
+++ b/textproc/texi2db/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.tldp.org/downloads/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Converts a Texinfo file into DocBook XML
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Entities.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/texi2db/pkg-comment b/textproc/texi2db/pkg-comment
deleted file mode 100644
index cd17268e28f7..000000000000
--- a/textproc/texi2db/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts a Texinfo file into DocBook XML
diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index e554786ea863..51ae6b4f86d5 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -15,6 +15,7 @@ DISTNAME= tth_C
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A TeX to HTML translator
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu \
latex:${PORTSDIR}/print/teTeX \
diff --git a/textproc/tth/pkg-comment b/textproc/tth/pkg-comment
deleted file mode 100644
index 34b1f87dd936..000000000000
--- a/textproc/tth/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A TeX to HTML translator
diff --git a/textproc/txt2man/Makefile b/textproc/txt2man/Makefile
index 22c45b09dc42..164d2b002c9f 100644
--- a/textproc/txt2man/Makefile
+++ b/textproc/txt2man/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://mvertes.free.fr/download/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Converts flat ASCII text to man page format
BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/txt2man/pkg-comment b/textproc/txt2man/pkg-comment
deleted file mode 100644
index b232919793ed..000000000000
--- a/textproc/txt2man/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts flat ASCII text to man page format
diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 3af0c02379c1..3895894f2e8b 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A converter from RTF to several formats, including HTML and LaTeX
WRKSRC= ${WRKDIR}/unrtf
diff --git a/textproc/unrtf/pkg-comment b/textproc/unrtf/pkg-comment
deleted file mode 100644
index bf4b5ded061a..000000000000
--- a/textproc/unrtf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A converter from RTF to several formats, including HTML and LaTeX
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 942b513234cf..57f81c268036 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= xerces-c/stable/archives/Xerces-C_${PORTVERSION:S/./_/g}
DISTNAME= xerces-c-src${PORTVERSION:S/./_/g}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Xerces-C++ is a validating XML parser written in a subset of C++
INSTALLS_SHLIB= yes
LDCONFIG_DIRS= ${PREFIX}/lib
diff --git a/textproc/xerces-c/pkg-comment b/textproc/xerces-c/pkg-comment
deleted file mode 100644
index 5afc13a08d1f..000000000000
--- a/textproc/xerces-c/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xerces-C++ is a validating XML parser written in a subset of C++
diff --git a/textproc/xml4j/Makefile b/textproc/xml4j/Makefile
index 56c3fd5a2932..d0718b3d2e98 100644
--- a/textproc/xml4j/Makefile
+++ b/textproc/xml4j/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://apps.alphaworks.ibm.com/technologies/xml4j/
DISTNAME= XML4J-J-bin.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML for Java parser
WRKSRC= ${WRKDIR}/XML4J-3_1_1
NO_BUILD= YES
diff --git a/textproc/xml4j/pkg-comment b/textproc/xml4j/pkg-comment
deleted file mode 100644
index ba3129c1b9d8..000000000000
--- a/textproc/xml4j/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML for Java parser
diff --git a/textproc/xmlpp/Makefile b/textproc/xmlpp/Makefile
index cb79b5d0ce3c..c944903c24c2 100644
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.root.at/download/gpl/
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML Parser and Validator
USE_REINPLACE= yes
FETCH_CMD= /usr/bin/fetch
diff --git a/textproc/xmlpp/pkg-comment b/textproc/xmlpp/pkg-comment
deleted file mode 100644
index a817d0573d31..000000000000
--- a/textproc/xmlpp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML Parser and Validator
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index 3471714aca18..28794790a52d 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= ports@FreeBSD.org
+COMMENT= XML-Conscious PPM Compression
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/textproc/xmlppm/pkg-comment b/textproc/xmlppm/pkg-comment
deleted file mode 100644
index 2651dd2cfb11..000000000000
--- a/textproc/xmlppm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML-Conscious PPM Compression
diff --git a/textproc/xmlwrapp/Makefile b/textproc/xmlwrapp/Makefile
index dc180e44fd48..53ede1933769 100644
--- a/textproc/xmlwrapp/Makefile
+++ b/textproc/xmlwrapp/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc
MASTER_SITES= http://pmade.org/pjones/software/xmlwrapp/download/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A modern style C++ library for working with XML data
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/textproc/xmlwrapp/pkg-comment b/textproc/xmlwrapp/pkg-comment
deleted file mode 100644
index d9721d86d8d8..000000000000
--- a/textproc/xmlwrapp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A modern style C++ library for working with XML data
diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile
index 8b4ab25b99d9..354d34249cb3 100644
--- a/textproc/xslint/Makefile
+++ b/textproc/xslint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://nwalsh.com/xsl/xslint/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= XSL(T) stylesheet checker
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM
diff --git a/textproc/xslint/pkg-comment b/textproc/xslint/pkg-comment
deleted file mode 100644
index 26f9ad0e458f..000000000000
--- a/textproc/xslint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSL(T) stylesheet checker
diff --git a/ukrainian/aspell/Makefile b/ukrainian/aspell/Makefile
index 9598e9ff6a36..6431d5aaca51 100644
--- a/ukrainian/aspell/Makefile
+++ b/ukrainian/aspell/Makefile
@@ -9,6 +9,7 @@ PORTNAME= aspell
CATEGORIES= ukrainian
MAINTAINER= ports@FreeBSD.org
+COMMENT= Aspell with Ukrainian dictionaries
MASTERDIR= ${.CURDIR}/../../textproc/aspell
diff --git a/ukrainian/aspell/pkg-comment b/ukrainian/aspell/pkg-comment
deleted file mode 100644
index 7ae74c60f336..000000000000
--- a/ukrainian/aspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aspell with Ukrainian dictionaries
diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index a8edb2dcfb9f..f355c121b1ba 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/Web/Mosaic/Unix/source/
DISTNAME= Mosaic-src-2.7b5
MAINTAINER= ports@FreeBSD.org
+COMMENT= A World Wide Web browser
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
diff --git a/www/Mosaic/pkg-comment b/www/Mosaic/pkg-comment
deleted file mode 100644
index 4d0f8df84108..000000000000
--- a/www/Mosaic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A World Wide Web browser
diff --git a/www/apache-contrib/Makefile b/www/apache-contrib/Makefile
index 8ee2eed27f8e..eb6115ff0c58 100644
--- a/www/apache-contrib/Makefile
+++ b/www/apache-contrib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_APACHE_HTTPD}
MASTER_SITE_SUBDIR= contrib/modules/1.3
MAINTAINER= ports@FreeBSD.org
+COMMENT= Third-party modules contributed to the Apache HTTP server project
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/apache-contrib/pkg-comment b/www/apache-contrib/pkg-comment
deleted file mode 100644
index 60aac8107000..000000000000
--- a/www/apache-contrib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Third-party modules contributed to the Apache HTTP server project
diff --git a/www/apache13-modssl/Makefile b/www/apache13-modssl/Makefile
index 9032664e9f11..6dd9abdfbc81 100644
--- a/www/apache13-modssl/Makefile
+++ b/www/apache13-modssl/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mod_ssl-${VERSION_MODSSL}-${VERSION_APACHE}${EXTRACT_SUFX}:modssl
MAINTAINER= ports@FreeBSD.org
+COMMENT= The Apache 1.3 webserver with SSL/TLS functionality
LIB_DEPENDS= mm.12:${PORTSDIR}/devel/mm
diff --git a/www/apache13-modssl/pkg-comment b/www/apache13-modssl/pkg-comment
deleted file mode 100644
index 51ef1c066e85..000000000000
--- a/www/apache13-modssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Apache 1.3 webserver with SSL/TLS functionality
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index a07cdcdacb83..ac3dd3688377 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -35,6 +35,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= ports@freebsd.org
+COMMENT= Apache-SSL: Apache secure webserver integrating OpenSSL
APACHE_VERSION= 1.3.27
APACHE_SSL_VERSION= 1.48
diff --git a/www/apache13-ssl/pkg-comment b/www/apache13-ssl/pkg-comment
deleted file mode 100644
index 1d0fd29fd5db..000000000000
--- a/www/apache13-ssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache-SSL: Apache secure webserver integrating OpenSSL
diff --git a/www/arena/Makefile b/www/arena/Makefile
index 433d0f4ced8a..802f9caef659 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.w3.org/pub/Arena/beta-3/
DISTNAME= arena-CJK-beta3a
MAINTAINER= ports@FreeBSD.org
+COMMENT= Experimental HTML 3 browser, supports math and style sheets
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
diff --git a/www/arena/pkg-comment b/www/arena/pkg-comment
deleted file mode 100644
index 436b8b8f3659..000000000000
--- a/www/arena/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Experimental HTML 3 browser, supports math and style sheets
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 6da7f19be1ae..c8e2731cae7c 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= src libcci libhtmlw-2.7
DISTFILES= xhtml-1.3.tar.Z cci.tar.Z libhtmlw.tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple HTML editor
NO_WRKSUBDIR= yes
CONFIGURE_WRKSRC= ${WRKDIR}/src
diff --git a/www/ashe/pkg-comment b/www/ashe/pkg-comment
deleted file mode 100644
index 58287cf51c73..000000000000
--- a/www/ashe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple HTML editor
diff --git a/www/auth_ldap/Makefile b/www/auth_ldap/Makefile
index 87d31bdec3d7..0717c5a89a41 100644
--- a/www/auth_ldap/Makefile
+++ b/www/auth_ldap/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.rudedog.org/auth_ldap/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module to authenticate against an LDAP directory
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
LIB_DEPENDS= lber.2:${PORTSDIR}/net/openldap2
diff --git a/www/auth_ldap/pkg-comment b/www/auth_ldap/pkg-comment
deleted file mode 100644
index 5125090f91f5..000000000000
--- a/www/auth_ldap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to authenticate against an LDAP directory
diff --git a/www/bkmrkconv/Makefile b/www/bkmrkconv/Makefile
index 2fc996512cab..e29cdb8b0b59 100644
--- a/www/bkmrkconv/Makefile
+++ b/www/bkmrkconv/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://www.bleb.org/software/bkmrkconv/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Netscape bookmarks.html converter
USE_PERL5= yes
NO_BUILD= yes
diff --git a/www/bkmrkconv/pkg-comment b/www/bkmrkconv/pkg-comment
deleted file mode 100644
index 3a617c3fdfe5..000000000000
--- a/www/bkmrkconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape bookmarks.html converter
diff --git a/www/cadaver/Makefile b/www/cadaver/Makefile
index 6905c4c6f3c6..3d45bdd9ddbd 100644
--- a/www/cadaver/Makefile
+++ b/www/cadaver/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.webdav.org/cadaver/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Commandline client for DAV
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
neon.23:${PORTSDIR}/www/neon
diff --git a/www/cadaver/pkg-comment b/www/cadaver/pkg-comment
deleted file mode 100644
index 87e3ee1905cf..000000000000
--- a/www/cadaver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Commandline client for DAV
diff --git a/www/cgic/Makefile b/www/cgic/Makefile
index b40074dddd3f..c2bd4317196a 100644
--- a/www/cgic/Makefile
+++ b/www/cgic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.boutell.com/cgic/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
+COMMENT= ANSI C library for CGI programming
MAKE_ENV= SHLIB_MAJOR="${SHLIB_MAJOR}"
MAKEFILE= ${FILESDIR}/Makefile.lib
diff --git a/www/cgic/pkg-comment b/www/cgic/pkg-comment
deleted file mode 100644
index b771e166a4b6..000000000000
--- a/www/cgic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ANSI C library for CGI programming
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 75ea0516989d..68b361984429 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A C++ class library for writing CGI applications
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/www/cgicc/pkg-comment b/www/cgicc/pkg-comment
deleted file mode 100644
index e729fefd49a2..000000000000
--- a/www/cgicc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ class library for writing CGI applications
diff --git a/www/cgichk/Makefile b/www/cgichk/Makefile
index ead1bb01ea93..d4844363f961 100644
--- a/www/cgichk/Makefile
+++ b/www/cgichk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A web site vulnerability scanner
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= cgichk
diff --git a/www/cgichk/pkg-comment b/www/cgichk/pkg-comment
deleted file mode 100644
index b4c326a3d16e..000000000000
--- a/www/cgichk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web site vulnerability scanner
diff --git a/www/chimera/Makefile b/www/chimera/Makefile
index 9f360bf0b63d..d1e3e76ace2e 100644
--- a/www/chimera/Makefile
+++ b/www/chimera/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.rocklinux.org/people/ripclaw/projects/software/chimera/devel/
MAINTAINER= ports@FreeBSD.org
+COMMENT= X/Athena World-Wide Web client
NO_LATEST_LINK= yes
USE_IMAKE= yes
diff --git a/www/chimera/pkg-comment b/www/chimera/pkg-comment
deleted file mode 100644
index 6e188068e4d5..000000000000
--- a/www/chimera/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X/Athena World-Wide Web client
diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile
index 5e02e84562c2..698430f6ccab 100644
--- a/www/cocoon/Makefile
+++ b/www/cocoon/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= cocoon/cocoon1
DISTNAME= Cocoon-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= 100% pure Java publishing framework servlet
USE_JAVA= 1.1+
MAKE_ENV= JAVA_HOME=${JAVA_HOME} CLASSPATH=${CLASSPATH}
diff --git a/www/cocoon/pkg-comment b/www/cocoon/pkg-comment
deleted file mode 100644
index 2f88fbe3086c..000000000000
--- a/www/cocoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-100% pure Java publishing framework servlet
diff --git a/www/decss/Makefile b/www/decss/Makefile
index a938336c466b..c083a5af676e 100644
--- a/www/decss/Makefile
+++ b/www/decss/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.pigdog.org/decss/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Strip cascading style sheets from webpages
WRKSRC= ${WRKDIR}/source
diff --git a/www/decss/pkg-comment b/www/decss/pkg-comment
deleted file mode 100644
index d0ad3f39feac..000000000000
--- a/www/decss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Strip cascading style sheets from webpages
diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile
index 96c68301cc9d..603d2bee7b7d 100644
--- a/www/dillo-i18n/Makefile
+++ b/www/dillo-i18n/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://dillo.auriga.wearlab.de/download/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A fast, small graphical Web browser built upon GTK+
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/dillo-i18n/pkg-comment b/www/dillo-i18n/pkg-comment
deleted file mode 100644
index 86c4046af250..000000000000
--- a/www/dillo-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast, small graphical Web browser built upon GTK+
diff --git a/www/dillo/Makefile b/www/dillo/Makefile
index 96c68301cc9d..603d2bee7b7d 100644
--- a/www/dillo/Makefile
+++ b/www/dillo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://dillo.auriga.wearlab.de/download/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A fast, small graphical Web browser built upon GTK+
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/dillo/pkg-comment b/www/dillo/pkg-comment
deleted file mode 100644
index 86c4046af250..000000000000
--- a/www/dillo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast, small graphical Web browser built upon GTK+
diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile
index 96c68301cc9d..603d2bee7b7d 100644
--- a/www/dillo2/Makefile
+++ b/www/dillo2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://dillo.auriga.wearlab.de/download/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A fast, small graphical Web browser built upon GTK+
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/dillo2/pkg-comment b/www/dillo2/pkg-comment
deleted file mode 100644
index 86c4046af250..000000000000
--- a/www/dillo2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast, small graphical Web browser built upon GTK+
diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile
index e4d24752cddf..fc56163b2c0d 100644
--- a/www/fhttpd/Makefile
+++ b/www/fhttpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.fhttpd.org/ \
ftp://ftp.fhttpd.org/fhttpd/
MAINTAINER= ports@FreeBSD.org
+COMMENT= C++-based FTP/HTTP server that supports modules
USE_REINPLACE= yes
diff --git a/www/fhttpd/pkg-comment b/www/fhttpd/pkg-comment
deleted file mode 100644
index be78b5dce7c5..000000000000
--- a/www/fhttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++-based FTP/HTTP server that supports modules
diff --git a/www/flashplugin/Makefile b/www/flashplugin/Makefile
index 4af9b3fd2a5b..77d8b12ec859 100644
--- a/www/flashplugin/Makefile
+++ b/www/flashplugin/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.geocities.com/TimesSquare/Labyrinth/5084/flash/Linux/ \
http://perso.club-internet.fr/odebon/flash/Linux/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An implementation of Macromedia Flash plugin for Netscape
ONLY_FOR_ARCHS= i386
diff --git a/www/flashplugin/pkg-comment b/www/flashplugin/pkg-comment
deleted file mode 100644
index d0bf545c3cc5..000000000000
--- a/www/flashplugin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of Macromedia Flash plugin for Netscape
diff --git a/www/fxhtml/Makefile b/www/fxhtml/Makefile
index e6f6de542406..238f2dad5e67 100644
--- a/www/fxhtml/Makefile
+++ b/www/fxhtml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.flevel.co.uk/pub/fxhtml/
DISTNAME= ${PORTNAME}-freebsd-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Server side extension to HTML eliminating the need for CGI scripts
pre-install:
${MKDIR} ${PREFIX}/www/cgi-bin ${PREFIX}/www/data
diff --git a/www/fxhtml/pkg-comment b/www/fxhtml/pkg-comment
deleted file mode 100644
index 7d2858fa5cda..000000000000
--- a/www/fxhtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Server side extension to HTML eliminating the need for CGI scripts
diff --git a/www/gn/Makefile b/www/gn/Makefile
index bd64b5033475..e45802191ee3 100644
--- a/www/gn/Makefile
+++ b/www/gn/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} #ftp://ftp.acns.nwu.edu/pub/gn/
MASTER_SITE_SUBDIR= trevor
MAINTAINER= ports@FreeBSD.org
+COMMENT= Gopher and http server
BUILD_DEPENDS= ${WAISDIR}/bin/waisindex:${PORTSDIR}/net/wais
diff --git a/www/gn/pkg-comment b/www/gn/pkg-comment
deleted file mode 100644
index 8de3d4c9f784..000000000000
--- a/www/gn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gopher and http server
diff --git a/www/grail/Makefile b/www/grail/Makefile
index 2b2e5391e40a..62dfeddd7720 100644
--- a/www/grail/Makefile
+++ b/www/grail/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=grail
EXTRACT_SUFX= .tgz
MAINTAINER= ports@freebsd.org
+COMMENT= An extensible Internet browser written entirely in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/www/grail/pkg-comment b/www/grail/pkg-comment
deleted file mode 100644
index c7fea6b6fda6..000000000000
--- a/www/grail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible Internet browser written entirely in Python
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index e003b1916c3d..2066f703509f 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Collect information from all over the Internet
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/www/harvest/pkg-comment b/www/harvest/pkg-comment
deleted file mode 100644
index e25c750775f9..000000000000
--- a/www/harvest/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collect information from all over the Internet
diff --git a/www/htmlobject/Makefile b/www/htmlobject/Makefile
index 6a69f7548972..0154ee7b90ac 100644
--- a/www/htmlobject/Makefile
+++ b/www/htmlobject/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= html_object-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= HTML Document Object
PERL_CONFIGURE= yes
diff --git a/www/htmlobject/pkg-comment b/www/htmlobject/pkg-comment
deleted file mode 100644
index ba399d2f3e92..000000000000
--- a/www/htmlobject/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML Document Object
diff --git a/www/httperf/Makefile b/www/httperf/Makefile
index 97ed230db5bc..be90a412b785 100644
--- a/www/httperf/Makefile
+++ b/www/httperf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= ftp://ftp.hpl.hp.com/pub/httperf/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tool for measuring webserver performance
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/www/httperf/pkg-comment b/www/httperf/pkg-comment
deleted file mode 100644
index 6adc47fad0e8..000000000000
--- a/www/httperf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for measuring webserver performance
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index 609f87435a73..9d37a1144802 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://ftp.icdevgroup.org/interchange/4.8/tar/
MAINTAINER= ports@FreeBSD.org
+COMMENT= RedHat's database-enabled e-commerce server
BUILD_DEPENDS= ${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement
diff --git a/www/interchange/pkg-comment b/www/interchange/pkg-comment
deleted file mode 100644
index 192c23bd7630..000000000000
--- a/www/interchange/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RedHat's database-enabled e-commerce server
diff --git a/www/jetty/Makefile b/www/jetty/Makefile
index 50ea24c7d8f6..ee95f73871d1 100644
--- a/www/jetty/Makefile
+++ b/www/jetty/Makefile
@@ -15,6 +15,7 @@ DISTNAME= Jetty-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Extensible Java HTTP Server
USE_JAVA= 1.3+
diff --git a/www/jetty/pkg-comment b/www/jetty/pkg-comment
deleted file mode 100644
index 53e3b6d1e2f3..000000000000
--- a/www/jetty/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extensible Java HTTP Server
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 292e0b7d422e..b5e55d925074 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -20,6 +20,7 @@ DISTNAME= ijb-zlib-10
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= An HTTP proxy server that eliminates ads
USE_REINPLACE= yes
diff --git a/www/junkbuster/pkg-comment b/www/junkbuster/pkg-comment
deleted file mode 100644
index 356bd17673bb..000000000000
--- a/www/junkbuster/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HTTP proxy server that eliminates ads
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index b495ccd5ef37..cb36f1d1b6ea 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITE_SUBDIR= ${PORTVERSION}
DISTNAME= gateway-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= WAP / SMS Gateway
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/www/kannel/pkg-comment b/www/kannel/pkg-comment
deleted file mode 100644
index 6f5e94bb0237..000000000000
--- a/www/kannel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WAP / SMS Gateway
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 118e1a8e4cac..39663c4685ea 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -13,6 +13,7 @@ DISTNAME= w3c-${PKGNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= The W3C Reference Library
USE_LIBTOOL= yes
USE_GMAKE= yes
diff --git a/www/libwww/pkg-comment b/www/libwww/pkg-comment
deleted file mode 100644
index 9f0372dda6ed..000000000000
--- a/www/libwww/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The W3C Reference Library
diff --git a/www/linux-lesstif-ns/Makefile b/www/linux-lesstif-ns/Makefile
index 2b41cf1732d6..39b0078de645 100644
--- a/www/linux-lesstif-ns/Makefile
+++ b/www/linux-lesstif-ns/Makefile
@@ -23,6 +23,7 @@ PATCHFILES= ${DISTNAME}-i18n.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
+COMMENT= Clone of the Motif library mostly for linux-netscape4
BUILD_DEPENDS= ${LINUXBASE}/usr/bin/cc:${PORTSDIR}/devel/linux_devtools-7
diff --git a/www/linux-lesstif-ns/pkg-comment b/www/linux-lesstif-ns/pkg-comment
deleted file mode 100644
index da9938c3cd82..000000000000
--- a/www/linux-lesstif-ns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of the Motif library mostly for linux-netscape4
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index d032d02084c1..0f7e769727b6 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -18,6 +18,7 @@ PATCHFILES= lynx2.8.4rel.1a.patch \
lynx2.8.4rel.1c.patch
MAINTAINER= ports@FreeBSD.org
+COMMENT= A non-graphical, text-based World-Wide Web client
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${PORTNAME}2-8-4
diff --git a/www/lynx/pkg-comment b/www/lynx/pkg-comment
deleted file mode 100644
index 25d3368d9d21..000000000000
--- a/www/lynx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A non-graphical, text-based World-Wide Web client
diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile
index 500cd1a21a53..c64b86d9633f 100644
--- a/www/mapedit/Makefile
+++ b/www/mapedit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.boutell.com/ftp-materials/boutell/mapedit/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A WWW authoring tool to create clickable maps
RUN_DEPENDS= ${LOCALBASE}/jdk${JDK_VERSION}/bin/java:${PORTSDIR}/java/jdk11
diff --git a/www/mapedit/pkg-comment b/www/mapedit/pkg-comment
deleted file mode 100644
index 6a3eaa4030e7..000000000000
--- a/www/mapedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WWW authoring tool to create clickable maps
diff --git a/www/mgstat/Makefile b/www/mgstat/Makefile
index ffe96ac2e8a9..a679e4bf1070 100644
--- a/www/mgstat/Makefile
+++ b/www/mgstat/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Produce graphs from mod_gzip log files
LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
diff --git a/www/mgstat/pkg-comment b/www/mgstat/pkg-comment
deleted file mode 100644
index e82793e8bd7e..000000000000
--- a/www/mgstat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Produce graphs from mod_gzip log files
diff --git a/www/mod_access_identd/Makefile b/www/mod_access_identd/Makefile
index 8a8d90a78b45..8258053d58ff 100644
--- a/www/mod_access_identd/Makefile
+++ b/www/mod_access_identd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://MeepZor.Com/packages/mod_access_identd/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module to supply access control based on ident reply
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_access_identd/pkg-comment b/www/mod_access_identd/pkg-comment
deleted file mode 100644
index 28a603e995a7..000000000000
--- a/www/mod_access_identd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to supply access control based on ident reply
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index 4def9ccd7890..83576f4e91f4 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= accessreferer
MAINTAINER= ports@freebsd.org
+COMMENT= An Apache module that provides access control based on Referer HTTP header
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_access_referer/pkg-comment b/www/mod_access_referer/pkg-comment
deleted file mode 100644
index 128077549fa6..000000000000
--- a/www/mod_access_referer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides access control based on Referer HTTP header
diff --git a/www/mod_auth_any/Makefile b/www/mod_auth_any/Makefile
index e1483c44343d..9616135cb8f3 100644
--- a/www/mod_auth_any/Makefile
+++ b/www/mod_auth_any/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.itlab.musc.edu/pub/toolbox/mod_auth_any/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module to use any command line program to authenticate a user
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_auth_any/pkg-comment b/www/mod_auth_any/pkg-comment
deleted file mode 100644
index b69de0da3772..000000000000
--- a/www/mod_auth_any/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to use any command line program to authenticate a user
diff --git a/www/mod_bf/Makefile b/www/mod_bf/Makefile
index c7152c7412b5..eb044b2eb4f4 100644
--- a/www/mod_bf/Makefile
+++ b/www/mod_bf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= modbf
MAINTAINER= ports@FreeBSD.org
+COMMENT= A brainf*ck module for Apache
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_bf/pkg-comment b/www/mod_bf/pkg-comment
deleted file mode 100644
index c37afdbec35e..000000000000
--- a/www/mod_bf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A brainf*ck module for Apache
diff --git a/www/mod_blowchunks/Makefile b/www/mod_blowchunks/Makefile
index aba5233d5c11..d184e37bd680 100644
--- a/www/mod_blowchunks/Makefile
+++ b/www/mod_blowchunks/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
EXTRACT_SUFX= .c
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module for rejecting and logging chunked requests
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_blowchunks/pkg-comment b/www/mod_blowchunks/pkg-comment
deleted file mode 100644
index a2c99280f409..000000000000
--- a/www/mod_blowchunks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for rejecting and logging chunked requests
diff --git a/www/mod_cgi_debug/Makefile b/www/mod_cgi_debug/Makefile
index c5eb5eb3bff5..154bf05d1ed3 100644
--- a/www/mod_cgi_debug/Makefile
+++ b/www/mod_cgi_debug/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://software.tangent.org/download/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module to make debugging server-side scripts easier
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_cgi_debug/pkg-comment b/www/mod_cgi_debug/pkg-comment
deleted file mode 100644
index 93fa51fd53d2..000000000000
--- a/www/mod_cgi_debug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to make debugging server-side scripts easier
diff --git a/www/mod_color/Makefile b/www/mod_color/Makefile
index 20a468c40a1a..35ceee467b93 100644
--- a/www/mod_color/Makefile
+++ b/www/mod_color/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .l
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module that provides syntax coloring for various languages
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_color/pkg-comment b/www/mod_color/pkg-comment
deleted file mode 100644
index b3ff1e90fef9..000000000000
--- a/www/mod_color/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that provides syntax coloring for various languages
diff --git a/www/mod_hosts_access/Makefile b/www/mod_hosts_access/Makefile
index 34afa18731f6..1a57cf2ed0f2 100644
--- a/www/mod_hosts_access/Makefile
+++ b/www/mod_hosts_access/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.klomp.org/mod_hosts_access/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_hosts_access/pkg-comment b/www/mod_hosts_access/pkg-comment
deleted file mode 100644
index 4f215c017fde..000000000000
--- a/www/mod_hosts_access/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that makes Apache respect hosts.allow and hosts.deny
diff --git a/www/mod_index_rss/Makefile b/www/mod_index_rss/Makefile
index 453f76a5822c..fc8c7f0ca1f0 100644
--- a/www/mod_index_rss/Makefile
+++ b/www/mod_index_rss/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://software.tangent.org/download/ \
ftp://ftp.tangent.org/pub/apache/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module to provides RSS output for directories
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_index_rss/pkg-comment b/www/mod_index_rss/pkg-comment
deleted file mode 100644
index e7454534d204..000000000000
--- a/www/mod_index_rss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to provides RSS output for directories
diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index e9a0d58dad0c..ca22a2b5e30b 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://software.tangent.org/download/ \
http://atreides.freenix.no/~anders/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module to allow MP3 streaming
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_mp3/pkg-comment b/www/mod_mp3/pkg-comment
deleted file mode 100644
index 1819207c4b8f..000000000000
--- a/www/mod_mp3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module to allow MP3 streaming
diff --git a/www/mod_mylo/Makefile b/www/mod_mylo/Makefile
index c34628349b6b..821964c0b237 100644
--- a/www/mod_mylo/Makefile
+++ b/www/mod_mylo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.pvv.org/~oyving/code/mod_mylo/ \
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= An Apache module to make Apache log to MySQL
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_mylo/pkg-comment b/www/mod_mylo/pkg-comment
deleted file mode 100644
index 05b36f0d2457..000000000000
--- a/www/mod_mylo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module to make Apache log to MySQL
diff --git a/www/mod_mysqluserdir/Makefile b/www/mod_mysqluserdir/Makefile
index 6705787b29b0..f8ba9c5a7520 100644
--- a/www/mod_mysqluserdir/Makefile
+++ b/www/mod_mysqluserdir/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://sys.estpak.ee/pub/ \
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An Apache module to make Apache get userdirs from MySQL
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_mysqluserdir/pkg-comment b/www/mod_mysqluserdir/pkg-comment
deleted file mode 100644
index 2b69ffc5fef0..000000000000
--- a/www/mod_mysqluserdir/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module to make Apache get userdirs from MySQL
diff --git a/www/mod_put/Makefile b/www/mod_put/Makefile
index 10d1c447572b..538e45f05303 100644
--- a/www/mod_put/Makefile
+++ b/www/mod_put/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://hpwww.ec-lyon.fr/~vincent/apache/
DISTFILES= mod_put.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= An Apache module that provides PUT and DELETE methods
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_put/pkg-comment b/www/mod_put/pkg-comment
deleted file mode 100644
index 94fcb4f2018d..000000000000
--- a/www/mod_put/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides PUT and DELETE methods
diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile
index dd217311cd59..265b292c5732 100644
--- a/www/mod_python/Makefile
+++ b/www/mod_python/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= python
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module for integrating Python
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_python/pkg-comment b/www/mod_python/pkg-comment
deleted file mode 100644
index 29297814bfad..000000000000
--- a/www/mod_python/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for integrating Python
diff --git a/www/mod_roaming/Makefile b/www/mod_roaming/Makefile
index aa7eebec1c6c..397fd9e499b8 100644
--- a/www/mod_roaming/Makefile
+++ b/www/mod_roaming/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.klomp.org/mod_roaming/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An Apache module that works as a Netscape Roaming Access server
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_roaming/pkg-comment b/www/mod_roaming/pkg-comment
deleted file mode 100644
index 17d3be0c71c7..000000000000
--- a/www/mod_roaming/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that works as a Netscape Roaming Access server
diff --git a/www/mod_sed/Makefile b/www/mod_sed/Makefile
index 8ebe06c3c2aa..2f4053ca94bd 100644
--- a/www/mod_sed/Makefile
+++ b/www/mod_sed/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.myrddin.demon.co.uk/dist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An apache module that embeds a copy of the sed(1) command
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_sed/pkg-comment b/www/mod_sed/pkg-comment
deleted file mode 100644
index d79c9fbe8bca..000000000000
--- a/www/mod_sed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An apache module that embeds a copy of the sed(1) command
diff --git a/www/mod_sequester/Makefile b/www/mod_sequester/Makefile
index e8ac1e621555..9b965ded9e06 100644
--- a/www/mod_sequester/Makefile
+++ b/www/mod_sequester/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://MeepZor.Com/packages/mod_sequester/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module that controls access to the website using secure info
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_sequester/pkg-comment b/www/mod_sequester/pkg-comment
deleted file mode 100644
index 2386ee5ff31a..000000000000
--- a/www/mod_sequester/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that controls access to the website using secure info
diff --git a/www/mod_snake/Makefile b/www/mod_snake/Makefile
index 302025271525..5dcb51874982 100644
--- a/www/mod_snake/Makefile
+++ b/www/mod_snake/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= modsnake
MAINTAINER= ports@FreeBSD.org
+COMMENT= A library to easily create flexible Apache modules
BUILD_DEPENDS= ${APXS}:${APACHE_PORT} \
${PYTHON_CMD}:${PYTHON_PORTSDIR}
diff --git a/www/mod_snake/pkg-comment b/www/mod_snake/pkg-comment
deleted file mode 100644
index ab057c404565..000000000000
--- a/www/mod_snake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library to easily create flexible Apache modules
diff --git a/www/mod_ticket/Makefile b/www/mod_ticket/Makefile
index 1e1c3ee64562..49e4188beb4c 100644
--- a/www/mod_ticket/Makefile
+++ b/www/mod_ticket/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .c
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache module for a digitally signed ticket in URL
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_ticket/pkg-comment b/www/mod_ticket/pkg-comment
deleted file mode 100644
index d2b109b32e0b..000000000000
--- a/www/mod_ticket/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for a digitally signed ticket in URL
diff --git a/www/netrik/Makefile b/www/netrik/Makefile
index 90eba10d2282..c52a4fa22aa2 100644
--- a/www/netrik/Makefile
+++ b/www/netrik/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A text web browser, very ambitious, in active development
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/www/netrik/pkg-comment b/www/netrik/pkg-comment
deleted file mode 100644
index 8d80891a4610..000000000000
--- a/www/netrik/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text web browser, very ambitious, in active development
diff --git a/www/oops/Makefile b/www/oops/Makefile
index 7182f852a7e9..7fe7ddca878d 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -16,6 +16,7 @@ PATCHFILES= ${PORTNAME}-${OOPSVERSION}-${OOPSDATE}.patch
PATCH_DIST_STRIP= -d ${WRKDIR}/${DISTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A caching web proxy server
BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk
diff --git a/www/oops/pkg-comment b/www/oops/pkg-comment
deleted file mode 100644
index d9e9cb595614..000000000000
--- a/www/oops/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A caching web proxy server
diff --git a/www/p5-Apache-AddHostPath/Makefile b/www/p5-Apache-AddHostPath/Makefile
index 57540e9032ab..880dfb16fc32 100644
--- a/www/p5-Apache-AddHostPath/Makefile
+++ b/www/p5-Apache-AddHostPath/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl interface for transforming a requested URI based on host/port
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-AddHostPath/pkg-comment b/www/p5-Apache-AddHostPath/pkg-comment
deleted file mode 100644
index 231aec3ea03e..000000000000
--- a/www/p5-Apache-AddHostPath/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface for transforming a requested URI based on host/port
diff --git a/www/p5-Apache-Archive/Makefile b/www/p5-Apache-Archive/Makefile
index 83595324afe2..a56070ece6da 100644
--- a/www/p5-Apache-Archive/Makefile
+++ b/www/p5-Apache-Archive/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module that creates a menu to allow perusal of tarball contents
BUILD_DEPENDS= ${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-Apache-Archive/pkg-comment b/www/p5-Apache-Archive/pkg-comment
deleted file mode 100644
index da405b484269..000000000000
--- a/www/p5-Apache-Archive/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that creates a menu to allow perusal of tarball contents
diff --git a/www/p5-Apache-AuthCookie/Makefile b/www/p5-Apache-AuthCookie/Makefile
index 930a631a34a9..8b77fc9e096b 100644
--- a/www/p5-Apache-AuthCookie/Makefile
+++ b/www/p5-Apache-AuthCookie/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A perl module to provide custom forms for reauthentication
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
${LOCALBASE}/sbin/apxs:${APACHE_PORT}
diff --git a/www/p5-Apache-AuthCookie/pkg-comment b/www/p5-Apache-AuthCookie/pkg-comment
deleted file mode 100644
index cc43c2ea56d6..000000000000
--- a/www/p5-Apache-AuthCookie/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module to provide custom forms for reauthentication
diff --git a/www/p5-Apache-AuthTicket/Makefile b/www/p5-Apache-AuthTicket/Makefile
index aeecbdaf0bb5..9d9dc9b0fcc8 100644
--- a/www/p5-Apache-AuthTicket/Makefile
+++ b/www/p5-Apache-AuthTicket/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl modules that implement a cookie-based authentication system
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/AuthCookie.pm:${PORTSDIR}/www/p5-Apache-AuthCookie \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
diff --git a/www/p5-Apache-AuthTicket/pkg-comment b/www/p5-Apache-AuthTicket/pkg-comment
deleted file mode 100644
index 97309e74d496..000000000000
--- a/www/p5-Apache-AuthTicket/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules that implement a cookie-based authentication system
diff --git a/www/p5-Apache-AuthenCache/Makefile b/www/p5-Apache-AuthenCache/Makefile
index 53ba7880ea00..5e035bcfabe8 100644
--- a/www/p5-Apache-AuthenCache/Makefile
+++ b/www/p5-Apache-AuthenCache/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module that implements authentication caching
BUILD_DEPENDS= ${SITE_PERL}/Tie/IxHash.pm:${PORTSDIR}/devel/p5-Tie-IxHash \
${SITE_PERL}/IPC/Cache.pm:${PORTSDIR}/devel/p5-IPC-Cache \
diff --git a/www/p5-Apache-AuthenCache/pkg-comment b/www/p5-Apache-AuthenCache/pkg-comment
deleted file mode 100644
index 8dfd8bf37531..000000000000
--- a/www/p5-Apache-AuthenCache/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that implements authentication caching
diff --git a/www/p5-Apache-AuthenURL/Makefile b/www/p5-Apache-AuthenURL/Makefile
index af9d855b7ea3..ff606f1129de 100644
--- a/www/p5-Apache-AuthenURL/Makefile
+++ b/www/p5-Apache-AuthenURL/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache/mod_perl module to handle auth against external URLs
BUILD_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Apache/AuthenCache.pm:${PORTSDIR}/www/p5-Apache-AuthenCache
diff --git a/www/p5-Apache-AuthenURL/pkg-comment b/www/p5-Apache-AuthenURL/pkg-comment
deleted file mode 100644
index 807c086a90b1..000000000000
--- a/www/p5-Apache-AuthenURL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache/mod_perl module to handle auth against external URLs
diff --git a/www/p5-Apache-AutoIndex/Makefile b/www/p5-Apache-AutoIndex/Makefile
index 13bbd91557b9..d4a309948355 100644
--- a/www/p5-Apache-AutoIndex/Makefile
+++ b/www/p5-Apache-AutoIndex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A perl module that can completely replace mod_dir and mod_autoindex
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/Icon.pm:${PORTSDIR}/www/p5-Apache-Icon \
diff --git a/www/p5-Apache-AutoIndex/pkg-comment b/www/p5-Apache-AutoIndex/pkg-comment
deleted file mode 100644
index a9e994c369c7..000000000000
--- a/www/p5-Apache-AutoIndex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module that can completely replace mod_dir and mod_autoindex
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index 2e56b3cb92ef..e8bc9a6bd2ee 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@freebsd.org
+COMMENT= Perl module to alter the output of previous handlers
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
diff --git a/www/p5-Apache-Filter/pkg-comment b/www/p5-Apache-Filter/pkg-comment
deleted file mode 100644
index 4f0a4bd18e89..000000000000
--- a/www/p5-Apache-Filter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to alter the output of previous handlers
diff --git a/www/p5-Apache-Icon/Makefile b/www/p5-Apache-Icon/Makefile
index aac0e49ab917..0705c226b62e 100644
--- a/www/p5-Apache-Icon/Makefile
+++ b/www/p5-Apache-Icon/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A perl module that provides an interface for looking up icon images
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
diff --git a/www/p5-Apache-Icon/pkg-comment b/www/p5-Apache-Icon/pkg-comment
deleted file mode 100644
index bc80ab768b81..000000000000
--- a/www/p5-Apache-Icon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module that provides an interface for looking up icon images
diff --git a/www/p5-Apache-Language/Makefile b/www/p5-Apache-Language/Makefile
index 29994dab70fd..9fdd24d65b60 100644
--- a/www/p5-Apache-Language/Makefile
+++ b/www/p5-Apache-Language/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A perl module that provides language-aware object hashes
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/I18N/LangTags.pm:${PORTSDIR}/misc/p5-I18N-LangTags
diff --git a/www/p5-Apache-Language/pkg-comment b/www/p5-Apache-Language/pkg-comment
deleted file mode 100644
index 8f229e809829..000000000000
--- a/www/p5-Apache-Language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module that provides language-aware object hashes
diff --git a/www/p5-Apache-SSI/Makefile b/www/p5-Apache-SSI/Makefile
index f6e72f7e7ae9..7190d724837a 100644
--- a/www/p5-Apache-SSI/Makefile
+++ b/www/p5-Apache-SSI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache::SSI - Implement Server Side Includes in Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/SimpleParse.pm:${PORTSDIR}/www/p5-HTML-SimpleParse
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-Apache-SSI/pkg-comment b/www/p5-Apache-SSI/pkg-comment
deleted file mode 100644
index c6eafaaa1dfd..000000000000
--- a/www/p5-Apache-SSI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache::SSI - Implement Server Side Includes in Perl
diff --git a/www/p5-Apache-Session-SharedMem/Makefile b/www/p5-Apache-Session-SharedMem/Makefile
index 8378044cea06..21d6b57375fc 100644
--- a/www/p5-Apache-Session-SharedMem/Makefile
+++ b/www/p5-Apache-Session-SharedMem/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Apache::Session extension that store session in shared memory
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IPC/Cache.pm:${PORTSDIR}/devel/p5-IPC-Cache \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/Session.pm:${PORTSDIR}/www/p5-Apache-Session
diff --git a/www/p5-Apache-Session-SharedMem/pkg-comment b/www/p5-Apache-Session-SharedMem/pkg-comment
deleted file mode 100644
index 1ac87611063a..000000000000
--- a/www/p5-Apache-Session-SharedMem/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache::Session extension that store session in shared memory
diff --git a/www/p5-CGI-ArgChecker/Makefile b/www/p5-CGI-ArgChecker/Makefile
index dc0837526040..ecd000f3f363 100644
--- a/www/p5-CGI-ArgChecker/Makefile
+++ b/www/p5-CGI-ArgChecker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module implementing a cgi interface to String::Checker
BUILD_DEPENDS= ${SITE_PERL}/String/Checker.pm:${PORTSDIR}/devel/p5-String-Checker
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-CGI-ArgChecker/pkg-comment b/www/p5-CGI-ArgChecker/pkg-comment
deleted file mode 100644
index 57a05f2510a0..000000000000
--- a/www/p5-CGI-ArgChecker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module implementing a cgi interface to String::Checker
diff --git a/www/p5-CGI-FastTemplate/Makefile b/www/p5-CGI-FastTemplate/Makefile
index 1e074de629f5..1ce8c00c8604 100644
--- a/www/p5-CGI-FastTemplate/Makefile
+++ b/www/p5-CGI-FastTemplate/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module for manage templates and parses templates
PERL_CONFIGURE= yes
diff --git a/www/p5-CGI-FastTemplate/pkg-comment b/www/p5-CGI-FastTemplate/pkg-comment
deleted file mode 100644
index 7d9926e84bcd..000000000000
--- a/www/p5-CGI-FastTemplate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for manage templates and parses templates
diff --git a/www/p5-CGI-Minimal/Makefile b/www/p5-CGI-Minimal/Makefile
index 61b39385f06e..1fc72ede3f8d 100644
--- a/www/p5-CGI-Minimal/Makefile
+++ b/www/p5-CGI-Minimal/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Extremely lightweight CGI processing package
PERL_CONFIGURE= yes
diff --git a/www/p5-CGI-Minimal/pkg-comment b/www/p5-CGI-Minimal/pkg-comment
deleted file mode 100644
index 1adb33af887d..000000000000
--- a/www/p5-CGI-Minimal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extremely lightweight CGI processing package
diff --git a/www/p5-CGI-modules/Makefile b/www/p5-CGI-modules/Makefile
index 8e1e2ffb9b53..716418419654 100644
--- a/www/p5-CGI-modules/Makefile
+++ b/www/p5-CGI-modules/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Modules for perl5, for use in writing CGI scripts
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/p5-CGI-modules/pkg-comment b/www/p5-CGI-modules/pkg-comment
deleted file mode 100644
index 47578df5dc15..000000000000
--- a/www/p5-CGI-modules/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules for perl5, for use in writing CGI scripts
diff --git a/www/p5-CGI_Lite/Makefile b/www/p5-CGI_Lite/Makefile
index 07ade357aca0..ffe8cee67898 100644
--- a/www/p5-CGI_Lite/Makefile
+++ b/www/p5-CGI_Lite/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl5 module to process and decode WWW form information
PERL_CONFIGURE= yes
diff --git a/www/p5-CGI_Lite/pkg-comment b/www/p5-CGI_Lite/pkg-comment
deleted file mode 100644
index 018e5c5de6e5..000000000000
--- a/www/p5-CGI_Lite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to process and decode WWW form information
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index 6f00721429a3..d0e76172a4d5 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@freebsd.org
+COMMENT= Cleans up HTML code for web browsers, not humans
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Clean/pkg-comment b/www/p5-HTML-Clean/pkg-comment
deleted file mode 100644
index bb0ede031add..000000000000
--- a/www/p5-HTML-Clean/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cleans up HTML code for web browsers, not humans
diff --git a/www/p5-HTML-Navigation/Makefile b/www/p5-HTML-Navigation/Makefile
index 1dfeac67b8fc..96748c168622 100644
--- a/www/p5-HTML-Navigation/Makefile
+++ b/www/p5-HTML-Navigation/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module for creating generic HTML navigation bars
BUILD_DEPENDS= ${SITE_PERL}/CGI/Base.pm:${PORTSDIR}/www/p5-CGI-modules \
${SITE_PERL}/URI/Escape.pm:${PORTSDIR}/net/p5-URI
diff --git a/www/p5-HTML-Navigation/pkg-comment b/www/p5-HTML-Navigation/pkg-comment
deleted file mode 100644
index 64fcaa100c99..000000000000
--- a/www/p5-HTML-Navigation/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for creating generic HTML navigation bars
diff --git a/www/p5-HTML-Pager/Makefile b/www/p5-HTML-Pager/Makefile
index d4a7ccbf6fa8..2915e28ec65e 100644
--- a/www/p5-HTML-Pager/Makefile
+++ b/www/p5-HTML-Pager/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module for handling CGI HTML paging of arbitrary data
BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-HTML-Pager/pkg-comment b/www/p5-HTML-Pager/pkg-comment
deleted file mode 100644
index 18f95980900d..000000000000
--- a/www/p5-HTML-Pager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for handling CGI HTML paging of arbitrary data
diff --git a/www/p5-HTML-QuickCheck/Makefile b/www/p5-HTML-QuickCheck/Makefile
index 7f5410fc6f59..f5d30ae3c080 100644
--- a/www/p5-HTML-QuickCheck/Makefile
+++ b/www/p5-HTML-QuickCheck/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple and fast HTML syntax checking package for perl 4 and perl 5
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-QuickCheck/pkg-comment b/www/p5-HTML-QuickCheck/pkg-comment
deleted file mode 100644
index c991a732d6bd..000000000000
--- a/www/p5-HTML-QuickCheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple and fast HTML syntax checking package for perl 4 and perl 5
diff --git a/www/p5-HTML-SimpleParse/Makefile b/www/p5-HTML-SimpleParse/Makefile
index 32d6e281dbff..543beeac932b 100644
--- a/www/p5-HTML-SimpleParse/Makefile
+++ b/www/p5-HTML-SimpleParse/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= HTML::SimpleParse - a bare-bones HTML parser
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-SimpleParse/pkg-comment b/www/p5-HTML-SimpleParse/pkg-comment
deleted file mode 100644
index 31c2e12944e1..000000000000
--- a/www/p5-HTML-SimpleParse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML::SimpleParse - a bare-bones HTML parser
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 50baaee5d071..0dedc6dc8112 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.ORG
+COMMENT= Some useful data table in parsing HTML
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Tagset/pkg-comment b/www/p5-HTML-Tagset/pkg-comment
deleted file mode 100644
index 716b5f303407..000000000000
--- a/www/p5-HTML-Tagset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Some useful data table in parsing HTML
diff --git a/www/p5-HTML-Widgets-SelectLayers/Makefile b/www/p5-HTML-Widgets-SelectLayers/Makefile
index 95bcf7984465..0bea2cd267cb 100644
--- a/www/p5-HTML-Widgets-SelectLayers/Makefile
+++ b/www/p5-HTML-Widgets-SelectLayers/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Implements an HTML widget with multiple layers
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Widgets-SelectLayers/pkg-comment b/www/p5-HTML-Widgets-SelectLayers/pkg-comment
deleted file mode 100644
index 2390aca9d9d2..000000000000
--- a/www/p5-HTML-Widgets-SelectLayers/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Implements an HTML widget with multiple layers
diff --git a/www/p5-HTML/Makefile b/www/p5-HTML/Makefile
index ea3050f28d23..839b985e2c04 100644
--- a/www/p5-HTML/Makefile
+++ b/www/p5-HTML/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl5 module for writing HTML documents
USE_PERL5= yes
diff --git a/www/p5-HTML/pkg-comment b/www/p5-HTML/pkg-comment
deleted file mode 100644
index a8508552fc3a..000000000000
--- a/www/p5-HTML/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for writing HTML documents
diff --git a/www/p5-HTTPD-Tools/Makefile b/www/p5-HTTPD-Tools/Makefile
index bf2cc8a9e9e0..046df57f1aa4 100644
--- a/www/p5-HTTPD-Tools/Makefile
+++ b/www/p5-HTTPD-Tools/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTTPD
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl5 module for a HTTP server authentication class
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTPD-Tools/pkg-comment b/www/p5-HTTPD-Tools/pkg-comment
deleted file mode 100644
index e676cafa07f6..000000000000
--- a/www/p5-HTTPD-Tools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for a HTTP server authentication class
diff --git a/www/p5-HTTPD-User-Manage/Makefile b/www/p5-HTTPD-User-Manage/Makefile
index bf2cc8a9e9e0..046df57f1aa4 100644
--- a/www/p5-HTTPD-User-Manage/Makefile
+++ b/www/p5-HTTPD-User-Manage/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTTPD
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl5 module for a HTTP server authentication class
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTPD-User-Manage/pkg-comment b/www/p5-HTTPD-User-Manage/pkg-comment
deleted file mode 100644
index e676cafa07f6..000000000000
--- a/www/p5-HTTPD-User-Manage/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for a HTTP server authentication class
diff --git a/www/p5-libservlet/Makefile b/www/p5-libservlet/Makefile
index 03d5002b077f..5c2a61de1415 100644
--- a/www/p5-libservlet/Makefile
+++ b/www/p5-libservlet/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Servlet API for Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Exception/Class.pm:${PORTSDIR}/devel/p5-Exception-Class
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-libservlet/pkg-comment b/www/p5-libservlet/pkg-comment
deleted file mode 100644
index de82606a3040..000000000000
--- a/www/p5-libservlet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Servlet API for Perl
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 6fe8162d7b45..a010c68b6462 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GUI-based HTML Editor for GTK+/GNOME
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/www/peacock/pkg-comment b/www/peacock/pkg-comment
deleted file mode 100644
index 580f3da71f42..000000000000
--- a/www/peacock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI-based HTML Editor for GTK+/GNOME
diff --git a/www/phpnuke/Makefile b/www/phpnuke/Makefile
index 98b3d6fba3f2..2ee418824cf1 100644
--- a/www/phpnuke/Makefile
+++ b/www/phpnuke/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= PHP-Nuke-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An automated website package to distribute and manage content
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
.if defined(WITH_PHP3)
diff --git a/www/phpnuke/pkg-comment b/www/phpnuke/pkg-comment
deleted file mode 100644
index 7a9af92c432b..000000000000
--- a/www/phpnuke/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automated website package to distribute and manage content
diff --git a/www/plone/Makefile b/www/plone/Makefile
index d940c1d4e65c..5b08ad895e2f 100644
--- a/www/plone/Makefile
+++ b/www/plone/Makefile
@@ -14,6 +14,7 @@ DISTNAME= CMFPlone1.0RC1
DIST_SUBDIR= zope
MAINTAINER= ports@freebsd.org
+COMMENT= A user friendly implementation of the CMF written on top of ZOPE
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope \
${LOCALBASE}/${SZOPEBASEDIR}/lib/python/Products/CMFDefault/__init__.py:${PORTSDIR}/www/zope-cmf
diff --git a/www/plone/pkg-comment b/www/plone/pkg-comment
deleted file mode 100644
index 3a15a65d682c..000000000000
--- a/www/plone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user friendly implementation of the CMF written on top of ZOPE
diff --git a/www/plone3/Makefile b/www/plone3/Makefile
index d940c1d4e65c..5b08ad895e2f 100644
--- a/www/plone3/Makefile
+++ b/www/plone3/Makefile
@@ -14,6 +14,7 @@ DISTNAME= CMFPlone1.0RC1
DIST_SUBDIR= zope
MAINTAINER= ports@freebsd.org
+COMMENT= A user friendly implementation of the CMF written on top of ZOPE
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope \
${LOCALBASE}/${SZOPEBASEDIR}/lib/python/Products/CMFDefault/__init__.py:${PORTSDIR}/www/zope-cmf
diff --git a/www/plone3/pkg-comment b/www/plone3/pkg-comment
deleted file mode 100644
index 3a15a65d682c..000000000000
--- a/www/plone3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user friendly implementation of the CMF written on top of ZOPE
diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile
index 558e2d6370b7..00250c3d6280 100644
--- a/www/py-HTMLgen/Makefile
+++ b/www/py-HTMLgen/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://starship.python.net/crew/friedrich/
DISTNAME= HTMLgen
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Python library for the generation of HTML documents
USE_PYTHON= yes
diff --git a/www/py-HTMLgen/pkg-comment b/www/py-HTMLgen/pkg-comment
deleted file mode 100644
index f61cdd47ffb9..000000000000
--- a/www/py-HTMLgen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python library for the generation of HTML documents
diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index c554747cf539..badd185a9a18 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An interactive, multi-threaded web browser for text terminals
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/www/retawq/pkg-comment b/www/retawq/pkg-comment
deleted file mode 100644
index f8790b123f1a..000000000000
--- a/www/retawq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interactive, multi-threaded web browser for text terminals
diff --git a/www/skipstone/Makefile b/www/skipstone/Makefile
index af7f71b9fbed..40c6ff0acea4 100644
--- a/www/skipstone/Makefile
+++ b/www/skipstone/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://www.muhri.net/skipstone/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Web browser that uses the mozilla-embedded renderer
BUILD_DEPENDS= ${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
${X11BASE}/lib/mozilla-embedded/libgtkembedmoz.so:${PORTSDIR}/www/mozilla-embedded
diff --git a/www/skipstone/pkg-comment b/www/skipstone/pkg-comment
deleted file mode 100644
index 2d82de0cbfbc..000000000000
--- a/www/skipstone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Web browser that uses the mozilla-embedded renderer
diff --git a/www/smarty/Makefile b/www/smarty/Makefile
index 167cdfd68988..24ee34086c31 100644
--- a/www/smarty/Makefile
+++ b/www/smarty/Makefile
@@ -16,6 +16,7 @@ DISTFILES+= Smarty-${PORTVERSION}-docs${EXTRACT_SUFX}:manual
.endif
MAINTAINER= ports@FreeBSD.org
+COMMENT= The PHP compiling template engine
RUN_DEPENDS= php-config:${PORTSDIR}/www/mod_php4
diff --git a/www/smarty/pkg-comment b/www/smarty/pkg-comment
deleted file mode 100644
index 2d6120509808..000000000000
--- a/www/smarty/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The PHP compiling template engine
diff --git a/www/sqmgrlog/Makefile b/www/sqmgrlog/Makefile
index 1b33dc60b54b..b6e57ea76d07 100644
--- a/www/sqmgrlog/Makefile
+++ b/www/sqmgrlog/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://web.onda.com.br/orso/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Squid log analyzer and HTML report generator
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/www/sqmgrlog/pkg-comment b/www/sqmgrlog/pkg-comment
deleted file mode 100644
index 20a60e1f7ace..000000000000
--- a/www/sqmgrlog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Squid log analyzer and HTML report generator
diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile
index 97a49c3eb886..8ce0b4b3f667 100644
--- a/www/surfraw/Makefile
+++ b/www/surfraw/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/proff/ \
ftp://ftp.funet.fi/pub/NetBSD/misc/proff/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Command line interface to popular WWW search engines
GNU_CONFIGURE= yes
diff --git a/www/surfraw/pkg-comment b/www/surfraw/pkg-comment
deleted file mode 100644
index 70ad1f4df472..000000000000
--- a/www/surfraw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command line interface to popular WWW search engines
diff --git a/www/swish++/Makefile b/www/swish++/Makefile
index 6527dbae6638..08d6c61db3bb 100644
--- a/www/swish++/Makefile
+++ b/www/swish++/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www textproc
MASTER_SITES= http://homepage.mac.com/pauljlucas/software/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple Web Indexing System for Humans: C++ version
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/www/swish++/pkg-comment b/www/swish++/pkg-comment
deleted file mode 100644
index a14855f4e1d1..000000000000
--- a/www/swish++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple Web Indexing System for Humans: C++ version
diff --git a/www/thumbnail_index/Makefile b/www/thumbnail_index/Makefile
index 6914cd47299d..d9ef2d17b607 100644
--- a/www/thumbnail_index/Makefile
+++ b/www/thumbnail_index/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.acme.com/software/thumbnail_index/
DISTNAME= ${PORTNAME}_10aug1998
MAINTAINER= ports@FreeBSD.org
+COMMENT= Make an HTML index file for a bunch of images
RUN_DEPENDS= djpeg:${PORTSDIR}/graphics/jpeg \
pnmscale:${PORTSDIR}/graphics/netpbm
diff --git a/www/thumbnail_index/pkg-comment b/www/thumbnail_index/pkg-comment
deleted file mode 100644
index 7fdfa15ace23..000000000000
--- a/www/thumbnail_index/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Make an HTML index file for a bunch of images
diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile
index 48cfa98c4156..0c8fa82253d5 100644
--- a/www/w3c-httpd/Makefile
+++ b/www/w3c-httpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.w3.org/pub/httpd/ \
ftp://ftp-eu.w3.org/pub/httpd/
MAINTAINER= ports@FreeBSD.org
+COMMENT= WWW server from the W3 Consortium (W3C)
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/wais:build
diff --git a/www/w3c-httpd/pkg-comment b/www/w3c-httpd/pkg-comment
deleted file mode 100644
index 5d0cb7375c1e..000000000000
--- a/www/w3c-httpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW server from the W3 Consortium (W3C)
diff --git a/www/webcopy/Makefile b/www/webcopy/Makefile
index 5cf536deea08..e0d8ad186224 100644
--- a/www/webcopy/Makefile
+++ b/www/webcopy/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= steve
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Web Mirroring Program
NO_PACKAGE= "This program cannot be distributed if modified in any way"
NO_CDROM= "Don't sell for profit without written permission"
diff --git a/www/webcopy/pkg-comment b/www/webcopy/pkg-comment
deleted file mode 100644
index f75209c13fba..000000000000
--- a/www/webcopy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Web Mirroring Program
diff --git a/www/webglimpse/Makefile b/www/webglimpse/Makefile
index 9769470252cd..2ecd8dbe869f 100644
--- a/www/webglimpse/Makefile
+++ b/www/webglimpse/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.deva.net/pub/sources/ir/glimpse/
DISTNAME= ${PKGNAME}.src
MAINTAINER= ports@freebsd.org
+COMMENT= WWW interface to Glimpse search engine
RUN_DEPENDS+= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13
RUN_DEPENDS+= glimpse:${PORTSDIR}/textproc/glimpse
diff --git a/www/webglimpse/pkg-comment b/www/webglimpse/pkg-comment
deleted file mode 100644
index 5bb033fe4eba..000000000000
--- a/www/webglimpse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW interface to Glimpse search engine
diff --git a/www/wn/Makefile b/www/wn/Makefile
index 105aaee723a8..7121250c705c 100644
--- a/www/wn/Makefile
+++ b/www/wn/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} # ftp://ftp.acns.nwu.edu/pub/wn/
MASTER_SITE_SUBDIR= trevor
MAINTAINER= ports@FreeBSD.org
+COMMENT= A great http server
FORBIDDEN= "Remotely exploitable buffer overflow."
diff --git a/www/wn/pkg-comment b/www/wn/pkg-comment
deleted file mode 100644
index 1230fb19efc7..000000000000
--- a/www/wn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A great http server
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index a4973c9d6406..dd2f3d3d46ef 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.muquit.com/muquit/software/Count/src/wwwcount2.5/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@freebsd.org
+COMMENT= Access counter, clock and date for WWW pages
GNU_CONFIGURE= yes
IS_INTERACTIVE= yes
diff --git a/www/wwwcount/pkg-comment b/www/wwwcount/pkg-comment
deleted file mode 100644
index 401523383b49..000000000000
--- a/www/wwwcount/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Access counter, clock and date for WWW pages
diff --git a/www/xist/Makefile b/www/xist/Makefile
index 9e90a689007c..ff4e3ceab9f0 100644
--- a/www/xist/Makefile
+++ b/www/xist/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.livinglogic.de/pub/livinglogic/xist/
DISTNAME= XIST-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An XML-based extensible HTML generator
RUN_DEPENDS= ${PYXML} \
${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \
diff --git a/www/xist/pkg-comment b/www/xist/pkg-comment
deleted file mode 100644
index eed404fee716..000000000000
--- a/www/xist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An XML-based extensible HTML generator
diff --git a/www/xpath2rss/Makefile b/www/xpath2rss/Makefile
index d1c4fd3c2564..779e167d4898 100644
--- a/www/xpath2rss/Makefile
+++ b/www/xpath2rss/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.mnot.net/xpath2rss/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= HTML to RSS converter
RUN_DEPENDS= ${PYXML}
diff --git a/www/xpath2rss/pkg-comment b/www/xpath2rss/pkg-comment
deleted file mode 100644
index 9251ecb66142..000000000000
--- a/www/xpath2rss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML to RSS converter
diff --git a/x11-clocks/abclock/Makefile b/x11-clocks/abclock/Makefile
index 3ef9cbefa2c3..9e88158c0703 100644
--- a/x11-clocks/abclock/Makefile
+++ b/x11-clocks/abclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks
MASTER_SITES= http://odur.let.rug.nl/~kleiweg/abclock/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Clock for X that displays hours and minutes in an analog fashion
USE_X_PREFIX= yes
diff --git a/x11-clocks/abclock/pkg-comment b/x11-clocks/abclock/pkg-comment
deleted file mode 100644
index da0eec1bc567..000000000000
--- a/x11-clocks/abclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clock for X that displays hours and minutes in an analog fashion
diff --git a/x11-clocks/bbdate/Makefile b/x11-clocks/bbdate/Makefile
index b436ddab2c20..1b011d4f4f68 100644
--- a/x11-clocks/bbdate/Makefile
+++ b/x11-clocks/bbdate/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks
MASTER_SITES= http://bbtools.thelinuxcommunity.org/sources/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tool made for Blackbox that displays the date in a decorated window
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11-clocks/bbdate/pkg-comment b/x11-clocks/bbdate/pkg-comment
deleted file mode 100644
index 78b59047516a..000000000000
--- a/x11-clocks/bbdate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool made for Blackbox that displays the date in a decorated window
diff --git a/x11-clocks/bclock/Makefile b/x11-clocks/bclock/Makefile
index 2cc1e02b52dc..80b29cc7f193 100644
--- a/x11-clocks/bclock/Makefile
+++ b/x11-clocks/bclock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/clocks
MAINTAINER= ports@FreeBSD.org
+COMMENT= A round, analog X11 clock with bezier curve hands
USE_IMAKE= yes
MAN1= bclock.1
diff --git a/x11-clocks/bclock/pkg-comment b/x11-clocks/bclock/pkg-comment
deleted file mode 100644
index 2df8f750ddfc..000000000000
--- a/x11-clocks/bclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A round, analog X11 clock with bezier curve hands
diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile
index 975412f0f8dd..28659346b95c 100644
--- a/x11-clocks/dclock/Makefile
+++ b/x11-clocks/dclock/Makefile
@@ -17,6 +17,7 @@ PATCHFILES= Dclock-pl6.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
+COMMENT= A 7-segment digital clock with optional military time and alarm
IGNOREFILES= ${DISTFILES}
USE_IMAKE= yes
diff --git a/x11-clocks/dclock/pkg-comment b/x11-clocks/dclock/pkg-comment
deleted file mode 100644
index d3505a5e816a..000000000000
--- a/x11-clocks/dclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 7-segment digital clock with optional military time and alarm
diff --git a/x11-clocks/rclock/Makefile b/x11-clocks/rclock/Makefile
index 04fc7dd25c2d..63d37446e1ba 100644
--- a/x11-clocks/rclock/Makefile
+++ b/x11-clocks/rclock/Makefile
@@ -20,6 +20,7 @@ MASTER_SITE_SUBDIR= . old devel
DISTNAME= rxvt-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Analog clock for X w/appointment reminder and mail notification
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-clocks/rclock/pkg-comment b/x11-clocks/rclock/pkg-comment
deleted file mode 100644
index 69a36fe7299f..000000000000
--- a/x11-clocks/rclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Analog clock for X w/appointment reminder and mail notification
diff --git a/x11-clocks/t3d/Makefile b/x11-clocks/t3d/Makefile
index 6453b7547d28..d2abfd559269 100644
--- a/x11-clocks/t3d/Makefile
+++ b/x11-clocks/t3d/Makefile
@@ -13,6 +13,7 @@ DISTNAME= t3d
EXTRACT_SUFX= .shar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Clock using flying balls to display the time
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
diff --git a/x11-clocks/t3d/pkg-comment b/x11-clocks/t3d/pkg-comment
deleted file mode 100644
index 9e8dc70f63de..000000000000
--- a/x11-clocks/t3d/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clock using flying balls to display the time
diff --git a/x11-fm/dfm/Makefile b/x11-fm/dfm/Makefile
index ef139dc44aea..878fcdf49bc6 100644
--- a/x11-fm/dfm/Makefile
+++ b/x11-fm/dfm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-fm
MASTER_SITES= http://www.kaisersite.de/dfm/
MAINTAINER= ports@FreeBSD.org
+COMMENT= OS/2 - like Desktop-File-Manager for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11-fm/dfm/pkg-comment b/x11-fm/dfm/pkg-comment
deleted file mode 100644
index d2968d47d5eb..000000000000
--- a/x11-fm/dfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OS/2 - like Desktop-File-Manager for X Window System
diff --git a/x11-fm/endeavour/Makefile b/x11-fm/endeavour/Makefile
index 25b74139075f..a58fb4aec931 100644
--- a/x11-fm/endeavour/Makefile
+++ b/x11-fm/endeavour/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= arved
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A graphical file manager and image viewer aimed towards new users
USE_REINPLACE= yes
USE_BZIP2= yes
diff --git a/x11-fm/endeavour/pkg-comment b/x11-fm/endeavour/pkg-comment
deleted file mode 100644
index 1305a95faf74..000000000000
--- a/x11-fm/endeavour/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical file manager and image viewer aimed towards new users
diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile
index 1b48d9cce841..4edb7b98129d 100644
--- a/x11-fm/ezfm/Makefile
+++ b/x11-fm/ezfm/Makefile
@@ -13,6 +13,7 @@ DISTNAME= EZFM-0.4-src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= EZWGL-based file manager for X Window System
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
EZ.1:${PORTSDIR}/graphics/EZWGL
diff --git a/x11-fm/ezfm/pkg-comment b/x11-fm/ezfm/pkg-comment
deleted file mode 100644
index 8d69b778bccd..000000000000
--- a/x11-fm/ezfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-EZWGL-based file manager for X Window System
diff --git a/x11-fm/fsv/Makefile b/x11-fm/fsv/Makefile
index aa77390c861f..1322d54e6ac2 100644
--- a/x11-fm/fsv/Makefile
+++ b/x11-fm/fsv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= fsv
MAINTAINER= ports@FreeBSD.org
+COMMENT= 3D filesystem visualizer
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
diff --git a/x11-fm/fsv/pkg-comment b/x11-fm/fsv/pkg-comment
deleted file mode 100644
index 9e9fb017f9f4..000000000000
--- a/x11-fm/fsv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3D filesystem visualizer
diff --git a/x11-fm/mtoolsfm/Makefile b/x11-fm/mtoolsfm/Makefile
index 2952b655f5fc..5436c19c0729 100644
--- a/x11-fm/mtoolsfm/Makefile
+++ b/x11-fm/mtoolsfm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.core-coutainville.org/MToolsFM/archive/SOURCES/
DISTNAME= MToolsFM-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A graphical frontend to mtools
RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools
diff --git a/x11-fm/mtoolsfm/pkg-comment b/x11-fm/mtoolsfm/pkg-comment
deleted file mode 100644
index a07ba2316cd4..000000000000
--- a/x11-fm/mtoolsfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical frontend to mtools
diff --git a/x11-fm/xfm/Makefile b/x11-fm/xfm/Makefile
index a7cd21d8f317..087a72d78cf7 100644
--- a/x11-fm/xfm/Makefile
+++ b/x11-fm/xfm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-fm
MASTER_SITES= http://www.musikwissenschaft.uni-mainz.de/~ag/xfm/
MAINTAINER= ports@FreeBSD.org
+COMMENT= The X File Manager
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/x11-fm/xfm/pkg-comment b/x11-fm/xfm/pkg-comment
deleted file mode 100644
index 98687cb5b146..000000000000
--- a/x11-fm/xfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The X File Manager
diff --git a/x11-fonts/Xg/Makefile b/x11-fonts/Xg/Makefile
index b9e36d4041ab..e6a5cc58b649 100644
--- a/x11-fonts/Xg/Makefile
+++ b/x11-fonts/Xg/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.cs.usyd.edu.au/matty/unicode/
DISTNAME= libXg.utf.fonts
MAINTAINER= ports@FreeBSD.org
+COMMENT= UNICODE fonts for use with 9term and sam
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
diff --git a/x11-fonts/Xg/pkg-comment b/x11-fonts/Xg/pkg-comment
deleted file mode 100644
index 2916f79deb98..000000000000
--- a/x11-fonts/Xg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-UNICODE fonts for use with 9term and sam
diff --git a/x11-fonts/p5-type1inst/Makefile b/x11-fonts/p5-type1inst/Makefile
index 944a986b3da5..a2e64408e111 100644
--- a/x11-fonts/p5-type1inst/Makefile
+++ b/x11-fonts/p5-type1inst/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=X11/xutils
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A script that helps install Postscript fonts in X Window System
USE_PERL5= yes
USE_XLIB= yes
diff --git a/x11-fonts/p5-type1inst/pkg-comment b/x11-fonts/p5-type1inst/pkg-comment
deleted file mode 100644
index 900f170c702f..000000000000
--- a/x11-fonts/p5-type1inst/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A script that helps install Postscript fonts in X Window System
diff --git a/x11-fonts/ttmkfdir/Makefile b/x11-fonts/ttmkfdir/Makefile
index 02b19254c52d..e103c35bf7f9 100644
--- a/x11-fonts/ttmkfdir/Makefile
+++ b/x11-fonts/ttmkfdir/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.joerg-pommnitz.de/TrueType/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Create fonts.scale file for use with TrueType font server
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
diff --git a/x11-fonts/ttmkfdir/pkg-comment b/x11-fonts/ttmkfdir/pkg-comment
deleted file mode 100644
index 5a644bf5720e..000000000000
--- a/x11-fonts/ttmkfdir/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create fonts.scale file for use with TrueType font server
diff --git a/x11-fonts/xfed/Makefile b/x11-fonts/xfed/Makefile
index c76090e95f84..743d3a93e36d 100644
--- a/x11-fonts/xfed/Makefile
+++ b/x11-fonts/xfed/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ftp.yars.free.net/pub/software/unix/X11/fonts/edit/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A program that will let you edit X fonts (.bdf files)
IGNOREFILES= ${DISTFILES}
USE_IMAKE= yes
diff --git a/x11-fonts/xfed/pkg-comment b/x11-fonts/xfed/pkg-comment
deleted file mode 100644
index fd735fb2ea0d..000000000000
--- a/x11-fonts/xfed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program that will let you edit X fonts (.bdf files)
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index fb7c70b68181..71f5cf021905 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -16,6 +16,7 @@ PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ${PORTNAME}-${PORTVERSION:R}-patch1
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Motif tool for editing X11 bitmap fonts
USE_X_PREFIX= yes
USE_FREETYPE= yes
diff --git a/x11-fonts/xmbdfed/pkg-comment b/x11-fonts/xmbdfed/pkg-comment
deleted file mode 100644
index 435ea71d6809..000000000000
--- a/x11-fonts/xmbdfed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Motif tool for editing X11 bitmap fonts
diff --git a/x11-themes/colorstep/Makefile b/x11-themes/colorstep/Makefile
index fb2afd66c846..44ba18f886fb 100644
--- a/x11-themes/colorstep/Makefile
+++ b/x11-themes/colorstep/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= colorstep
DISTNAME= ${PORTNAME}-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A theme engine based on GtkStep and Step-pastel
WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
diff --git a/x11-themes/colorstep/pkg-comment b/x11-themes/colorstep/pkg-comment
deleted file mode 100644
index c1c06206ed0e..000000000000
--- a/x11-themes/colorstep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A theme engine based on GtkStep and Step-pastel
diff --git a/x11-themes/engradient/Makefile b/x11-themes/engradient/Makefile
index b059ca6d5927..bdd1380a4093 100644
--- a/x11-themes/engradient/Makefile
+++ b/x11-themes/engradient/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= engradient
DISTNAME= ${PORTNAME}-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ engine-gradient theme based off of the IceGradient theme
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/engradient/pkg-comment b/x11-themes/engradient/pkg-comment
deleted file mode 100644
index 70dba3a27d97..000000000000
--- a/x11-themes/engradient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ engine-gradient theme based off of the IceGradient theme
diff --git a/x11-themes/gtk-Mac2-theme/Makefile b/x11-themes/gtk-Mac2-theme/Makefile
index 1b40d526065c..83a5cd1f4d17 100644
--- a/x11-themes/gtk-Mac2-theme/Makefile
+++ b/x11-themes/gtk-Mac2-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= mac2
DISTNAME= mac2-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= GTK+ engine theme based on the look of MacOS
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11-themes/gtk-Mac2-theme/pkg-comment b/x11-themes/gtk-Mac2-theme/pkg-comment
deleted file mode 100644
index 02922291d665..000000000000
--- a/x11-themes/gtk-Mac2-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ engine theme based on the look of MacOS
diff --git a/x11-themes/gtk-flat-theme/Makefile b/x11-themes/gtk-flat-theme/Makefile
index 46054c28c259..47ef027cc524 100644
--- a/x11-themes/gtk-flat-theme/Makefile
+++ b/x11-themes/gtk-flat-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= flat
DISTNAME= flat-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ theme engine which gives GTK+ a flattened appearance
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/gtk-flat-theme/pkg-comment b/x11-themes/gtk-flat-theme/pkg-comment
deleted file mode 100644
index ebf7094e802e..000000000000
--- a/x11-themes/gtk-flat-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ theme engine which gives GTK+ a flattened appearance
diff --git a/x11-themes/gtk-flat-theme2/Makefile b/x11-themes/gtk-flat-theme2/Makefile
index 46054c28c259..47ef027cc524 100644
--- a/x11-themes/gtk-flat-theme2/Makefile
+++ b/x11-themes/gtk-flat-theme2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= flat
DISTNAME= flat-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ theme engine which gives GTK+ a flattened appearance
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/gtk-flat-theme2/pkg-comment b/x11-themes/gtk-flat-theme2/pkg-comment
deleted file mode 100644
index ebf7094e802e..000000000000
--- a/x11-themes/gtk-flat-theme2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ theme engine which gives GTK+ a flattened appearance
diff --git a/x11-themes/gtkbe/Makefile b/x11-themes/gtkbe/Makefile
index c11b2450b925..620355799451 100644
--- a/x11-themes/gtkbe/Makefile
+++ b/x11-themes/gtkbe/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gtkbe
DISTNAME= gtkbe-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= BeOS look-alike GTK+ theme engine
WRKSRC= ${WRKDIR}/GTKBeEngine
diff --git a/x11-themes/gtkbe/pkg-comment b/x11-themes/gtkbe/pkg-comment
deleted file mode 100644
index 679185718151..000000000000
--- a/x11-themes/gtkbe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BeOS look-alike GTK+ theme engine
diff --git a/x11-themes/gtkstep/Makefile b/x11-themes/gtkstep/Makefile
index 04c5fed347f5..b7a662af9fb1 100644
--- a/x11-themes/gtkstep/Makefile
+++ b/x11-themes/gtkstep/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://ulli.on.openave.net/gtkstep/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A theme module to make GTK+ look like the NeXTSTEP(tm) interface
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-themes/gtkstep/pkg-comment b/x11-themes/gtkstep/pkg-comment
deleted file mode 100644
index d9333666f0dd..000000000000
--- a/x11-themes/gtkstep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A theme module to make GTK+ look like the NeXTSTEP(tm) interface
diff --git a/x11-themes/icegradient/Makefile b/x11-themes/icegradient/Makefile
index 91c6e932a964..ed2f75fa2445 100644
--- a/x11-themes/icegradient/Makefile
+++ b/x11-themes/icegradient/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sobomax
DISTNAME= IceGradient-1.2.x-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ gradient theme engine based on ThinIce
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.5
diff --git a/x11-themes/icegradient/pkg-comment b/x11-themes/icegradient/pkg-comment
deleted file mode 100644
index 093fd86893b8..000000000000
--- a/x11-themes/icegradient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ gradient theme engine based on ThinIce
diff --git a/x11-themes/notif2/Makefile b/x11-themes/notif2/Makefile
index 5b0e35aaacbe..d0b436bbb9aa 100644
--- a/x11-themes/notif2/Makefile
+++ b/x11-themes/notif2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= notif210
DISTNAME= notif210-${GTKVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= The Notif2 GTK theme engine following the new Motif look and feel
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/notif2/pkg-comment b/x11-themes/notif2/pkg-comment
deleted file mode 100644
index 7f3a13c2b7ea..000000000000
--- a/x11-themes/notif2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Notif2 GTK theme engine following the new Motif look and feel
diff --git a/x11-themes/whistlerk/Makefile b/x11-themes/whistlerk/Makefile
index 4100007bb82f..0811f680b8cc 100644
--- a/x11-themes/whistlerk/Makefile
+++ b/x11-themes/whistlerk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= whistlerk
DISTNAME= whistlerk-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK theme engine inspired by the Windows Whistler
WRKSRC= ${WRKDIR}/gtk-theme-WhistlerK
diff --git a/x11-themes/whistlerk/pkg-comment b/x11-themes/whistlerk/pkg-comment
deleted file mode 100644
index 3389b00e08c3..000000000000
--- a/x11-themes/whistlerk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK theme engine inspired by the Windows Whistler
diff --git a/x11-themes/xenophilia/Makefile b/x11-themes/xenophilia/Makefile
index 9e4a74d5b3a3..9c47d79ec91a 100644
--- a/x11-themes/xenophilia/Makefile
+++ b/x11-themes/xenophilia/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= xenophilia
DISTNAME= xenophilia-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= Xenophilia theme module to make GTK+ look nicer
WRKSRC= ${WRKDIR}/Xenophilia-0.7
diff --git a/x11-themes/xenophilia/pkg-comment b/x11-themes/xenophilia/pkg-comment
deleted file mode 100644
index 0d7d4de20f9a..000000000000
--- a/x11-themes/xenophilia/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xenophilia theme module to make GTK+ look nicer
diff --git a/x11-themes/xenostep/Makefile b/x11-themes/xenostep/Makefile
index f61f89777825..3095e5557d8d 100644
--- a/x11-themes/xenostep/Makefile
+++ b/x11-themes/xenostep/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= xenostep
DISTNAME= ${PORTNAME}-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ theme engine based on the Xenophilia and Interface engines
WRKSRC= ${WRKDIR}/XenoStep
diff --git a/x11-themes/xenostep/pkg-comment b/x11-themes/xenostep/pkg-comment
deleted file mode 100644
index 69ccab35401d..000000000000
--- a/x11-themes/xenostep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ theme engine based on the Xenophilia and Interface engines
diff --git a/x11-toolkits/Xaw3d/Makefile b/x11-toolkits/Xaw3d/Makefile
index cadb4501ea15..45d1b4f34eb7 100644
--- a/x11-toolkits/Xaw3d/Makefile
+++ b/x11-toolkits/Xaw3d/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= widgets/Xaw3d/R6.3
MAINTAINER= ports@FreeBSD.org
+COMMENT= A 3-D Athena Widget set that looks like Motif
WRKSRC= ${WRKDIR}/xc/lib/Xaw3d
USE_IMAKE= yes
diff --git a/x11-toolkits/Xaw3d/pkg-comment b/x11-toolkits/Xaw3d/pkg-comment
deleted file mode 100644
index f69bf7b62a25..000000000000
--- a/x11-toolkits/Xaw3d/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3-D Athena Widget set that looks like Motif
diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile
index 3895101b6262..1b4e5c521098 100644
--- a/x11-toolkits/bwidget/Makefile
+++ b/x11-toolkits/bwidget/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= tcllib
DISTNAME= BWidget-${PORTVERSION}
MAINTAINER= ports@FreeBSD.ORG
+COMMENT= A high-level widget set for Tcl/Tk
NO_BUILD= yes
diff --git a/x11-toolkits/bwidget/pkg-comment b/x11-toolkits/bwidget/pkg-comment
deleted file mode 100644
index bf7ac57e2b62..000000000000
--- a/x11-toolkits/bwidget/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A high-level widget set for Tcl/Tk
diff --git a/x11-toolkits/colorstep/Makefile b/x11-toolkits/colorstep/Makefile
index fb2afd66c846..44ba18f886fb 100644
--- a/x11-toolkits/colorstep/Makefile
+++ b/x11-toolkits/colorstep/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= colorstep
DISTNAME= ${PORTNAME}-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A theme engine based on GtkStep and Step-pastel
WRKSRC= ${WRKDIR}/${PORTNAME}-0.6
diff --git a/x11-toolkits/colorstep/pkg-comment b/x11-toolkits/colorstep/pkg-comment
deleted file mode 100644
index c1c06206ed0e..000000000000
--- a/x11-toolkits/colorstep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A theme engine based on GtkStep and Step-pastel
diff --git a/x11-toolkits/engradient/Makefile b/x11-toolkits/engradient/Makefile
index b059ca6d5927..bdd1380a4093 100644
--- a/x11-toolkits/engradient/Makefile
+++ b/x11-toolkits/engradient/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= engradient
DISTNAME= ${PORTNAME}-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ engine-gradient theme based off of the IceGradient theme
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/engradient/pkg-comment b/x11-toolkits/engradient/pkg-comment
deleted file mode 100644
index 70dba3a27d97..000000000000
--- a/x11-toolkits/engradient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ engine-gradient theme based off of the IceGradient theme
diff --git a/x11-toolkits/gevas/Makefile b/x11-toolkits/gevas/Makefile
index 7b10d952a44e..800e87e2dcdc 100644
--- a/x11-toolkits/gevas/Makefile
+++ b/x11-toolkits/gevas/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
MAINTAINER= ports@FreeBSD.org
+COMMENT= GTK+ bindings for Evas canvas library
LIB_DEPENDS= evas.6:${PORTSDIR}/graphics/evas
diff --git a/x11-toolkits/gevas/pkg-comment b/x11-toolkits/gevas/pkg-comment
deleted file mode 100644
index 56ac8f03ab70..000000000000
--- a/x11-toolkits/gevas/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ bindings for Evas canvas library
diff --git a/x11-toolkits/gtk-Mac2-theme/Makefile b/x11-toolkits/gtk-Mac2-theme/Makefile
index 1b40d526065c..83a5cd1f4d17 100644
--- a/x11-toolkits/gtk-Mac2-theme/Makefile
+++ b/x11-toolkits/gtk-Mac2-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= mac2
DISTNAME= mac2-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= GTK+ engine theme based on the look of MacOS
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11-toolkits/gtk-Mac2-theme/pkg-comment b/x11-toolkits/gtk-Mac2-theme/pkg-comment
deleted file mode 100644
index 02922291d665..000000000000
--- a/x11-toolkits/gtk-Mac2-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ engine theme based on the look of MacOS
diff --git a/x11-toolkits/gtk-flat-theme/Makefile b/x11-toolkits/gtk-flat-theme/Makefile
index 46054c28c259..47ef027cc524 100644
--- a/x11-toolkits/gtk-flat-theme/Makefile
+++ b/x11-toolkits/gtk-flat-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= flat
DISTNAME= flat-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ theme engine which gives GTK+ a flattened appearance
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/gtk-flat-theme/pkg-comment b/x11-toolkits/gtk-flat-theme/pkg-comment
deleted file mode 100644
index ebf7094e802e..000000000000
--- a/x11-toolkits/gtk-flat-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ theme engine which gives GTK+ a flattened appearance
diff --git a/x11-toolkits/gtk-flat-theme2/Makefile b/x11-toolkits/gtk-flat-theme2/Makefile
index 46054c28c259..47ef027cc524 100644
--- a/x11-toolkits/gtk-flat-theme2/Makefile
+++ b/x11-toolkits/gtk-flat-theme2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= flat
DISTNAME= flat-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ theme engine which gives GTK+ a flattened appearance
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/gtk-flat-theme2/pkg-comment b/x11-toolkits/gtk-flat-theme2/pkg-comment
deleted file mode 100644
index ebf7094e802e..000000000000
--- a/x11-toolkits/gtk-flat-theme2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ theme engine which gives GTK+ a flattened appearance
diff --git a/x11-toolkits/gtkbe/Makefile b/x11-toolkits/gtkbe/Makefile
index c11b2450b925..620355799451 100644
--- a/x11-toolkits/gtkbe/Makefile
+++ b/x11-toolkits/gtkbe/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gtkbe
DISTNAME= gtkbe-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= BeOS look-alike GTK+ theme engine
WRKSRC= ${WRKDIR}/GTKBeEngine
diff --git a/x11-toolkits/gtkbe/pkg-comment b/x11-toolkits/gtkbe/pkg-comment
deleted file mode 100644
index 679185718151..000000000000
--- a/x11-toolkits/gtkbe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BeOS look-alike GTK+ theme engine
diff --git a/x11-toolkits/gtkdatabox/Makefile b/x11-toolkits/gtkdatabox/Makefile
index 69131d93b573..afea88b5c4b0 100644
--- a/x11-toolkits/gtkdatabox/Makefile
+++ b/x11-toolkits/gtkdatabox/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://www.eudoxos.de/gtk/download/gtkdatabox/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Display large amounts of numerical data fast and easy
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-toolkits/gtkdatabox/pkg-comment b/x11-toolkits/gtkdatabox/pkg-comment
deleted file mode 100644
index 9bbef6c5fad4..000000000000
--- a/x11-toolkits/gtkdatabox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display large amounts of numerical data fast and easy
diff --git a/x11-toolkits/gtkdatabox2/Makefile b/x11-toolkits/gtkdatabox2/Makefile
index 69131d93b573..afea88b5c4b0 100644
--- a/x11-toolkits/gtkdatabox2/Makefile
+++ b/x11-toolkits/gtkdatabox2/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://www.eudoxos.de/gtk/download/gtkdatabox/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Display large amounts of numerical data fast and easy
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-toolkits/gtkdatabox2/pkg-comment b/x11-toolkits/gtkdatabox2/pkg-comment
deleted file mode 100644
index 9bbef6c5fad4..000000000000
--- a/x11-toolkits/gtkdatabox2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display large amounts of numerical data fast and easy
diff --git a/x11-toolkits/gtkglarea--/Makefile b/x11-toolkits/gtkglarea--/Makefile
index e5f84039c5f4..8af3f56024bb 100644
--- a/x11-toolkits/gtkglarea--/Makefile
+++ b/x11-toolkits/gtkglarea--/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://www.ece.ucdavis.edu/~kenelson/gtk-glarea/dist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= GtkGLArea-- is a wrapper for the GtkGLArea widget
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
diff --git a/x11-toolkits/gtkglarea--/pkg-comment b/x11-toolkits/gtkglarea--/pkg-comment
deleted file mode 100644
index 03dcb5dbf908..000000000000
--- a/x11-toolkits/gtkglarea--/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GtkGLArea-- is a wrapper for the GtkGLArea widget
diff --git a/x11-toolkits/gtkmathview/Makefile b/x11-toolkits/gtkmathview/Makefile
index 4fbcb148b7d6..d5a39e5f55b5 100644
--- a/x11-toolkits/gtkmathview/Makefile
+++ b/x11-toolkits/gtkmathview/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://helm.cs.unibo.it/mml-widget/sources/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK Widget to Render MathML Documents
LIB_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \
gnugetopt:${PORTSDIR}/devel/libgnugetopt \
diff --git a/x11-toolkits/gtkmathview/pkg-comment b/x11-toolkits/gtkmathview/pkg-comment
deleted file mode 100644
index a97bdb5482f4..000000000000
--- a/x11-toolkits/gtkmathview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK Widget to Render MathML Documents
diff --git a/x11-toolkits/gtkstep/Makefile b/x11-toolkits/gtkstep/Makefile
index 04c5fed347f5..b7a662af9fb1 100644
--- a/x11-toolkits/gtkstep/Makefile
+++ b/x11-toolkits/gtkstep/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://ulli.on.openave.net/gtkstep/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A theme module to make GTK+ look like the NeXTSTEP(tm) interface
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/gtkstep/pkg-comment b/x11-toolkits/gtkstep/pkg-comment
deleted file mode 100644
index d9333666f0dd..000000000000
--- a/x11-toolkits/gtkstep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A theme module to make GTK+ look like the NeXTSTEP(tm) interface
diff --git a/x11-toolkits/icegradient/Makefile b/x11-toolkits/icegradient/Makefile
index 91c6e932a964..ed2f75fa2445 100644
--- a/x11-toolkits/icegradient/Makefile
+++ b/x11-toolkits/icegradient/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sobomax
DISTNAME= IceGradient-1.2.x-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ gradient theme engine based on ThinIce
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-0.0.5
diff --git a/x11-toolkits/icegradient/pkg-comment b/x11-toolkits/icegradient/pkg-comment
deleted file mode 100644
index 093fd86893b8..000000000000
--- a/x11-toolkits/icegradient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ gradient theme engine based on ThinIce
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index a248ac40037d..34b2608092cc 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=incrtcl
DISTNAME= itcl${PORTVERSION}
MAINTAINER= ports@freebsd.org
+COMMENT= [incr Tk] (A.K.A. "itk")
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl
diff --git a/x11-toolkits/itk/pkg-comment b/x11-toolkits/itk/pkg-comment
deleted file mode 100644
index 806f5ca969f9..000000000000
--- a/x11-toolkits/itk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-[incr Tk] (A.K.A. "itk")
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 045ece82dac1..56adecb05850 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=incrtcl
DISTNAME= itcl3.2
MAINTAINER= ports@freebsd.org
+COMMENT= [incr Widgets] (A.K.A. "iwidgets")
LIB_DEPENDS= itk32.1:${PORTSDIR}/x11-toolkits/itk
diff --git a/x11-toolkits/iwidgets/pkg-comment b/x11-toolkits/iwidgets/pkg-comment
deleted file mode 100644
index 5b4b1c30fad9..000000000000
--- a/x11-toolkits/iwidgets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-[incr Widgets] (A.K.A. "iwidgets")
diff --git a/x11-toolkits/mesgui/Makefile b/x11-toolkits/mesgui/Makefile
index a00767848b49..00eb05a91855 100644
--- a/x11-toolkits/mesgui/Makefile
+++ b/x11-toolkits/mesgui/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Make a simple GUI under OpenGL
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
freetype.9:${PORTSDIR}/print/freetype2
diff --git a/x11-toolkits/mesgui/pkg-comment b/x11-toolkits/mesgui/pkg-comment
deleted file mode 100644
index 8d34edb47752..000000000000
--- a/x11-toolkits/mesgui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Make a simple GUI under OpenGL
diff --git a/x11-toolkits/movingmotif/Makefile b/x11-toolkits/movingmotif/Makefile
index d364be8463aa..e41fabd58207 100644
--- a/x11-toolkits/movingmotif/Makefile
+++ b/x11-toolkits/movingmotif/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Display scientific data as dynamic plot
USE_MOTIF= yes
USE_LIBTOOL= yes
diff --git a/x11-toolkits/movingmotif/pkg-comment b/x11-toolkits/movingmotif/pkg-comment
deleted file mode 100644
index 63d8b9764b31..000000000000
--- a/x11-toolkits/movingmotif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display scientific data as dynamic plot
diff --git a/x11-toolkits/notif2/Makefile b/x11-toolkits/notif2/Makefile
index 5b0e35aaacbe..d0b436bbb9aa 100644
--- a/x11-toolkits/notif2/Makefile
+++ b/x11-toolkits/notif2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= notif210
DISTNAME= notif210-${GTKVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= The Notif2 GTK theme engine following the new Motif look and feel
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/notif2/pkg-comment b/x11-toolkits/notif2/pkg-comment
deleted file mode 100644
index 7f3a13c2b7ea..000000000000
--- a/x11-toolkits/notif2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Notif2 GTK theme engine following the new Motif look and feel
diff --git a/x11-toolkits/p5-Tcl-Tk/Makefile b/x11-toolkits/p5-Tcl-Tk/Makefile
index f78a3f3d2cb4..cc37be21a3cf 100644
--- a/x11-toolkits/p5-Tcl-Tk/Makefile
+++ b/x11-toolkits/p5-Tcl-Tk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tcl
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl5 module to access to Tk via the Tcl extension
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/x11-toolkits/p5-Tcl-Tk/pkg-comment b/x11-toolkits/p5-Tcl-Tk/pkg-comment
deleted file mode 100644
index ac40d750f065..000000000000
--- a/x11-toolkits/p5-Tcl-Tk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to access to Tk via the Tcl extension
diff --git a/x11-toolkits/p5-TclTk/Makefile b/x11-toolkits/p5-TclTk/Makefile
index f78a3f3d2cb4..cc37be21a3cf 100644
--- a/x11-toolkits/p5-TclTk/Makefile
+++ b/x11-toolkits/p5-TclTk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tcl
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl5 module to access to Tk via the Tcl extension
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tcl.pm:${PORTSDIR}/lang/p5-Tcl
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/x11-toolkits/p5-TclTk/pkg-comment b/x11-toolkits/p5-TclTk/pkg-comment
deleted file mode 100644
index ac40d750f065..000000000000
--- a/x11-toolkits/p5-TclTk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to access to Tk via the Tcl extension
diff --git a/x11-toolkits/p5-Tk-Autoscroll/Makefile b/x11-toolkits/p5-Tk-Autoscroll/Makefile
index 1f33bdf8fd77..133186dd55ef 100644
--- a/x11-toolkits/p5-Tk-Autoscroll/Makefile
+++ b/x11-toolkits/p5-Tk-Autoscroll/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tk
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Tk::Autoscroll - space invaders-like scrolling
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-Autoscroll/pkg-comment b/x11-toolkits/p5-Tk-Autoscroll/pkg-comment
deleted file mode 100644
index 471e0f5d1eb2..000000000000
--- a/x11-toolkits/p5-Tk-Autoscroll/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk::Autoscroll - space invaders-like scrolling
diff --git a/x11-toolkits/p5-Tk-ColourChooser/Makefile b/x11-toolkits/p5-Tk-ColourChooser/Makefile
index dad5cf609720..21199f486902 100644
--- a/x11-toolkits/p5-Tk-ColourChooser/Makefile
+++ b/x11-toolkits/p5-Tk-ColourChooser/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tk
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl/Tk module providing a Colour selection dialogue box
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-ColourChooser/pkg-comment b/x11-toolkits/p5-Tk-ColourChooser/pkg-comment
deleted file mode 100644
index f48754338e93..000000000000
--- a/x11-toolkits/p5-Tk-ColourChooser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl/Tk module providing a Colour selection dialogue box
diff --git a/x11-toolkits/p5-Tk-Enscript/Makefile b/x11-toolkits/p5-Tk-Enscript/Makefile
index ab46d3c8f305..c9a73b875eea 100644
--- a/x11-toolkits/p5-Tk-Enscript/Makefile
+++ b/x11-toolkits/p5-Tk-Enscript/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tk
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Tk::Enscript - a text-to-postscript converter using Tk::Canvas
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Tk-Enscript/pkg-comment b/x11-toolkits/p5-Tk-Enscript/pkg-comment
deleted file mode 100644
index df7eb5d426ae..000000000000
--- a/x11-toolkits/p5-Tk-Enscript/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk::Enscript - a text-to-postscript converter using Tk::Canvas
diff --git a/x11-toolkits/p5-Tk/Makefile b/x11-toolkits/p5-Tk/Makefile
index 49083f17b303..22d68b183297 100644
--- a/x11-toolkits/p5-Tk/Makefile
+++ b/x11-toolkits/p5-Tk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tk
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= A re-port of a perl5 interface to Tk8.0p2
USE_XLIB= yes
PERL_CONFIGURE= yes
diff --git a/x11-toolkits/p5-Tk/pkg-comment b/x11-toolkits/p5-Tk/pkg-comment
deleted file mode 100644
index 612250cdc755..000000000000
--- a/x11-toolkits/p5-Tk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A re-port of a perl5 interface to Tk8.0p2
diff --git a/x11-toolkits/paragui-devel/Makefile b/x11-toolkits/paragui-devel/Makefile
index 5b344fbf0c21..5fd4b1836718 100644
--- a/x11-toolkits/paragui-devel/Makefile
+++ b/x11-toolkits/paragui-devel/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.bms-austria.com/pub/paragui/release/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Cross-platform high-level application framework and GUI library
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/x11-toolkits/paragui-devel/pkg-comment b/x11-toolkits/paragui-devel/pkg-comment
deleted file mode 100644
index a6e65c9abbcf..000000000000
--- a/x11-toolkits/paragui-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross-platform high-level application framework and GUI library
diff --git a/x11-toolkits/paragui/Makefile b/x11-toolkits/paragui/Makefile
index 5b344fbf0c21..5fd4b1836718 100644
--- a/x11-toolkits/paragui/Makefile
+++ b/x11-toolkits/paragui/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= ftp://ftp.bms-austria.com/pub/paragui/release/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Cross-platform high-level application framework and GUI library
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/x11-toolkits/paragui/pkg-comment b/x11-toolkits/paragui/pkg-comment
deleted file mode 100644
index a6e65c9abbcf..000000000000
--- a/x11-toolkits/paragui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross-platform high-level application framework and GUI library
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 71d25f1a9cea..2a87c1df0c84 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://plib.sourceforge.net/dist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A portable library for joystick/sound/OpenGL GUI/3D math
USE_X_PREFIX= yes
USE_MESA= yes
diff --git a/x11-toolkits/plib/pkg-comment b/x11-toolkits/plib/pkg-comment
deleted file mode 100644
index a3b7185cd6e6..000000000000
--- a/x11-toolkits/plib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable library for joystick/sound/OpenGL GUI/3D math
diff --git a/x11-toolkits/py-anygui/Makefile b/x11-toolkits/py-anygui/Makefile
index 756b7f39a38b..8498cb5df0ee 100644
--- a/x11-toolkits/py-anygui/Makefile
+++ b/x11-toolkits/py-anygui/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Generic GUI-creation front-end for Python
BUILD_DEPENDS= ${PYDISTUTILS}
diff --git a/x11-toolkits/py-anygui/pkg-comment b/x11-toolkits/py-anygui/pkg-comment
deleted file mode 100644
index 1b2bcba881ff..000000000000
--- a/x11-toolkits/py-anygui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic GUI-creation front-end for Python
diff --git a/x11-toolkits/sdl_gui/Makefile b/x11-toolkits/sdl_gui/Makefile
index 12f1cc16e1d9..9e0dcf87684a 100644
--- a/x11-toolkits/sdl_gui/Makefile
+++ b/x11-toolkits/sdl_gui/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.newimage.com/~rhk/SDL_gui/
DISTNAME= SDL_gui-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Graphical User Interface library for SDL
LIB_DEPENDS= SDL-1.1:${PORTSDIR}/devel/sdl12 \
SDL_image:${PORTSDIR}/graphics/sdl_image \
diff --git a/x11-toolkits/sdl_gui/pkg-comment b/x11-toolkits/sdl_gui/pkg-comment
deleted file mode 100644
index 8c563d59c246..000000000000
--- a/x11-toolkits/sdl_gui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Graphical User Interface library for SDL
diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index 1a65ac550e23..247398956574 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -13,6 +13,7 @@ DISTNAME= SlingShot${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Supplemental Libraries to extend Xview
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/x11-toolkits/slingshot/pkg-comment b/x11-toolkits/slingshot/pkg-comment
deleted file mode 100644
index 3616813be137..000000000000
--- a/x11-toolkits/slingshot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Supplemental Libraries to extend Xview
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index b0e352d4c6d3..719fe029596e 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= tcl8_0
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= ports@Freebsd.ORG
+COMMENT= Graphical toolkit for TCL
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80
diff --git a/x11-toolkits/tk80/pkg-comment b/x11-toolkits/tk80/pkg-comment
deleted file mode 100644
index ff5ce674d034..000000000000
--- a/x11-toolkits/tk80/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical toolkit for TCL
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index 3a950240df0b..ee9f2ef23a8a 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -15,6 +15,7 @@ PATCH_SITES= ftp://touchwood.ee.uts.edu.au/pub/TkSTEP/
PATCHFILES= tk8.0.4-to-tkstep8.0.4-2.patch.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= The Tk toolkit with a NeXTSTEP look and more
LIB_DEPENDS= tcl80.1:${PORTSDIR}/lang/tcl80 \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-toolkits/tkstep80/pkg-comment b/x11-toolkits/tkstep80/pkg-comment
deleted file mode 100644
index 59f59a3e8249..000000000000
--- a/x11-toolkits/tkstep80/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Tk toolkit with a NeXTSTEP look and more
diff --git a/x11-toolkits/viewklass/Makefile b/x11-toolkits/viewklass/Makefile
index 0da35d2bab34..2e2914041c88 100644
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ViewKlass-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= C++ Framework for Motif
BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake
diff --git a/x11-toolkits/viewklass/pkg-comment b/x11-toolkits/viewklass/pkg-comment
deleted file mode 100644
index 67db82f02107..000000000000
--- a/x11-toolkits/viewklass/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ Framework for Motif
diff --git a/x11-toolkits/whistlerk/Makefile b/x11-toolkits/whistlerk/Makefile
index 4100007bb82f..0811f680b8cc 100644
--- a/x11-toolkits/whistlerk/Makefile
+++ b/x11-toolkits/whistlerk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= whistlerk
DISTNAME= whistlerk-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK theme engine inspired by the Windows Whistler
WRKSRC= ${WRKDIR}/gtk-theme-WhistlerK
diff --git a/x11-toolkits/whistlerk/pkg-comment b/x11-toolkits/whistlerk/pkg-comment
deleted file mode 100644
index 3389b00e08c3..000000000000
--- a/x11-toolkits/whistlerk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK theme engine inspired by the Windows Whistler
diff --git a/x11-toolkits/xenophilia/Makefile b/x11-toolkits/xenophilia/Makefile
index 9e4a74d5b3a3..9c47d79ec91a 100644
--- a/x11-toolkits/xenophilia/Makefile
+++ b/x11-toolkits/xenophilia/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= xenophilia
DISTNAME= xenophilia-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= Xenophilia theme module to make GTK+ look nicer
WRKSRC= ${WRKDIR}/Xenophilia-0.7
diff --git a/x11-toolkits/xenophilia/pkg-comment b/x11-toolkits/xenophilia/pkg-comment
deleted file mode 100644
index 0d7d4de20f9a..000000000000
--- a/x11-toolkits/xenophilia/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xenophilia theme module to make GTK+ look nicer
diff --git a/x11-toolkits/xenostep/Makefile b/x11-toolkits/xenostep/Makefile
index f61f89777825..3095e5557d8d 100644
--- a/x11-toolkits/xenostep/Makefile
+++ b/x11-toolkits/xenostep/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= xenostep
DISTNAME= ${PORTNAME}-1.2.x
MAINTAINER= ports@FreeBSD.org
+COMMENT= A GTK+ theme engine based on the Xenophilia and Interface engines
WRKSRC= ${WRKDIR}/XenoStep
diff --git a/x11-toolkits/xenostep/pkg-comment b/x11-toolkits/xenostep/pkg-comment
deleted file mode 100644
index 69ccab35401d..000000000000
--- a/x11-toolkits/xenostep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ theme engine based on the Xenophilia and Interface engines
diff --git a/x11-toolkits/xg/Makefile b/x11-toolkits/xg/Makefile
index d1952ab0f963..770ad7c66ac7 100644
--- a/x11-toolkits/xg/Makefile
+++ b/x11-toolkits/xg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://messners.com/code/ \
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Windows(tm) controls - like widget set for Motif(tm)
WRKSRC= ${WRKDIR}/Xg-${PORTVERSION}
USE_X_PREFIX= yes
diff --git a/x11-toolkits/xg/pkg-comment b/x11-toolkits/xg/pkg-comment
deleted file mode 100644
index be06ee776ec6..000000000000
--- a/x11-toolkits/xg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Windows(tm) controls - like widget set for Motif(tm)
diff --git a/x11-toolkits/xview-clients/Makefile b/x11-toolkits/xview-clients/Makefile
index fd31b16f71e4..f48e917ca37f 100644
--- a/x11-toolkits/xview-clients/Makefile
+++ b/x11-toolkits/xview-clients/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS .
DISTNAME= xview3.2p1-X11R6
MAINTAINER= ports@FreeBSD.org
+COMMENT= OpenLook applications and man pages
DEPENDS= ${PORTSDIR}/x11-toolkits/xview:install
diff --git a/x11-toolkits/xview-clients/pkg-comment b/x11-toolkits/xview-clients/pkg-comment
deleted file mode 100644
index 1ea0cb41a73c..000000000000
--- a/x11-toolkits/xview-clients/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenLook applications and man pages
diff --git a/x11-toolkits/xview/Makefile b/x11-toolkits/xview/Makefile
index ed64d05d04c7..38cecbcf8f9d 100644
--- a/x11-toolkits/xview/Makefile
+++ b/x11-toolkits/xview/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS libraries
DISTNAME= xview3.2p1-X11R6
MAINTAINER= ports@FreeBSD.org
+COMMENT= X Window-System-based Visual/Integrated Environment for Workstations
USE_IMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/xview/pkg-comment b/x11-toolkits/xview/pkg-comment
deleted file mode 100644
index 53e1b80949a5..000000000000
--- a/x11-toolkits/xview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X Window-System-based Visual/Integrated Environment for Workstations
diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
index 0658a8dca320..70e9b94437c6 100644
--- a/x11-wm/9menu/Makefile
+++ b/x11-wm/9menu/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.comintern.ru/pub/unix/X11/plan9/ \
EXTRACT_SUFX= .shar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple menu patterened after plan9
USE_XLIB= yes
NO_WRKSUBDIR= yes
diff --git a/x11-wm/9menu/pkg-comment b/x11-wm/9menu/pkg-comment
deleted file mode 100644
index bb43512b660f..000000000000
--- a/x11-wm/9menu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple menu patterened after plan9
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index f6dffe12f3b8..10ea28ce2435 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://sources.isc.org/X/window-managers/ \
ftp://ftp.mathcs.emory.edu/pub/arnold/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An 8 1/2-like Window Manager for X
USE_IMAKE= yes
MAN1= 9wm.1
diff --git a/x11-wm/9wm/pkg-comment b/x11-wm/9wm/pkg-comment
deleted file mode 100644
index 822917fb4111..000000000000
--- a/x11-wm/9wm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An 8 1/2-like Window Manager for X
diff --git a/x11-wm/aewm++/Makefile b/x11-wm/aewm++/Makefile
index d08375fe28af..46d3657c9a1b 100644
--- a/x11-wm/aewm++/Makefile
+++ b/x11-wm/aewm++/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= sapphire
MAINTAINER= ports@FreeBSD.org
+COMMENT= The C++ version of aewm
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/aewm++/pkg-comment b/x11-wm/aewm++/pkg-comment
deleted file mode 100644
index 482dcbebde2d..000000000000
--- a/x11-wm/aewm++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The C++ version of aewm
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index ed5c20b16672..156de704b0e8 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -26,6 +26,7 @@ EXTRACT_ONLY= ${DISTNAME}.tar.gz \
PATCH_DIST_STRIP= -p1
MAINTAINER= ports@FreeBSD.org
+COMMENT= The NeXTSTEP clone window manager with Fontset support
RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock
diff --git a/x11-wm/afterstep-i18n/pkg-comment b/x11-wm/afterstep-i18n/pkg-comment
deleted file mode 100644
index 429448bede01..000000000000
--- a/x11-wm/afterstep-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The NeXTSTEP clone window manager with Fontset support
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 386bf28bb7e1..4632fe9599cf 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= archives/${PORTVERSION}
DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Window manager originally based on the Bowman NeXTSTEP clone
RUN_DEPENDS= asclock:${PORTSDIR}/x11-clocks/asclock
diff --git a/x11-wm/afterstep/pkg-comment b/x11-wm/afterstep/pkg-comment
deleted file mode 100644
index c12ab04699fe..000000000000
--- a/x11-wm/afterstep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window manager originally based on the Bowman NeXTSTEP clone
diff --git a/x11-wm/ahwm/Makefile b/x11-wm/ahwm/Makefile
index 8cf487fa9cb1..25f691841667 100644
--- a/x11-wm/ahwm/Makefile
+++ b/x11-wm/ahwm/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://people.cs.uchicago.edu/~ahiorean/ahwm/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An X11 window manager
USE_X_PREFIX= yes
diff --git a/x11-wm/ahwm/pkg-comment b/x11-wm/ahwm/pkg-comment
deleted file mode 100644
index fca76ad45ddd..000000000000
--- a/x11-wm/ahwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 window manager
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 94b694dfa509..9c62b22e5d6c 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/
DISTNAME= ${PORTNAME}0.20pl48
MAINTAINER= ports@FreeBSD.org
+COMMENT= A window manager that makes your desktop look like an Amiga(TM)
GNU_CONFIGURE= yes
CONFIGURE_ENV= CFLAGS="${CFLAGS} -DHAVE_X11_EXTENSIONS_SHAPE_H"
diff --git a/x11-wm/amiwm/pkg-comment b/x11-wm/amiwm/pkg-comment
deleted file mode 100644
index 9e2d313c9754..000000000000
--- a/x11-wm/amiwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager that makes your desktop look like an Amiga(TM)
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index ffc94aac6cff..57c1f2c64da1 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://slpc1.epfl.ch/public/software/ctwm/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An extension to twm, with support for multiple virtual screens, etc
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-wm/ctwm/pkg-comment b/x11-wm/ctwm/pkg-comment
deleted file mode 100644
index 589277e445d2..000000000000
--- a/x11-wm/ctwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extension to twm, with support for multiple virtual screens, etc
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index 469e00ed28e9..a9d1e4813e9e 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.planetmirror.com/pub/enlightenment/e16utils/ \
DISTFILES= e16menuedit-0.1.tar.gz e16keyedit-0.2.tar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Standalone menu and keybinding editors for enlightment 0.16
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/x11-wm/e16utils/pkg-comment b/x11-wm/e16utils/pkg-comment
deleted file mode 100644
index b0673815fd4a..000000000000
--- a/x11-wm/e16utils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Standalone menu and keybinding editors for enlightment 0.16
diff --git a/x11-wm/epplets/Makefile b/x11-wm/epplets/Makefile
index 0cf23c703925..0eb06b912a84 100644
--- a/x11-wm/epplets/Makefile
+++ b/x11-wm/epplets/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://kde.planetmirror.com/pub/enlightenment/epplets/ \
DISTNAME= epplet-base-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A collection of Enlightenment dock applications
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \
epplet.1:${PORTSDIR}/x11-wm/libepplet
diff --git a/x11-wm/epplets/pkg-comment b/x11-wm/epplets/pkg-comment
deleted file mode 100644
index 195dd71ff02e..000000000000
--- a/x11-wm/epplets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of Enlightenment dock applications
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index 382a4d257f4d..3f2acdac6263 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://koala.ilog.fr/ftp/pub/gwm/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Generic Window Manager
USE_IMAKE= yes
USE_XPM= yes
diff --git a/x11-wm/gwm/pkg-comment b/x11-wm/gwm/pkg-comment
deleted file mode 100644
index 0bb87a4eb08f..000000000000
--- a/x11-wm/gwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic Window Manager
diff --git a/x11-wm/icepref/Makefile b/x11-wm/icepref/Makefile
index 00c6253251fd..9fa60947f8bb 100644
--- a/x11-wm/icepref/Makefile
+++ b/x11-wm/icepref/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp:ftp@ftp.mxlab.com/x/wm/
MAINTAINER= ports@FreeBSD.Org
+COMMENT= A small graphical configuration utility for the Ice Window Manager
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk
diff --git a/x11-wm/icepref/pkg-comment b/x11-wm/icepref/pkg-comment
deleted file mode 100644
index cccaf5ff5149..000000000000
--- a/x11-wm/icepref/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small graphical configuration utility for the Ice Window Manager
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index 2f31eb90f220..fff3e691cd9a 100644
--- a/x11-wm/libepplet/Makefile
+++ b/x11-wm/libepplet/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://kde.planetmirror.com/pub/enlightenment/epplets/ \
DISTNAME= epplet-base-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Library for building enlightenment dock applications
WRKSRC= ${WRKDIR}/Epplets-${PORTVERSION}
diff --git a/x11-wm/libepplet/pkg-comment b/x11-wm/libepplet/pkg-comment
deleted file mode 100644
index 01858ce6f1cb..000000000000
--- a/x11-wm/libepplet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for building enlightenment dock applications
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index ed50c8ddf828..c24f711be4cf 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.boognish.org.uk/enh/lwm/
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A lightweight window manager
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_IMAKE= yes
diff --git a/x11-wm/lwm/pkg-comment b/x11-wm/lwm/pkg-comment
deleted file mode 100644
index 1f87716c201a..000000000000
--- a/x11-wm/lwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight window manager
diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile
index daf508023355..7501c06d03e1 100644
--- a/x11-wm/novawm/Makefile
+++ b/x11-wm/novawm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= NovaWM-${PORTVERSION}_alpha
MAINTAINER= ports@FreeBSD.org
+COMMENT= A window manager for X, developed with speed, size, and style in mind
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/novawm/pkg-comment b/x11-wm/novawm/pkg-comment
deleted file mode 100644
index 880e95325a85..000000000000
--- a/x11-wm/novawm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager for X, developed with speed, size, and style in mind
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 043d54684ca5..e45d9d7842f0 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.crynwr.com/piewm/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tvtwm with pie (circular) menus
USE_IMAKE= yes
USE_XPM= yes
diff --git a/x11-wm/piewm/pkg-comment b/x11-wm/piewm/pkg-comment
deleted file mode 100644
index 1c1b37765f8d..000000000000
--- a/x11-wm/piewm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tvtwm with pie (circular) menus
diff --git a/x11-wm/toolbox/Makefile b/x11-wm/toolbox/Makefile
index c3f6d2e713b5..b5f1d25cbb20 100644
--- a/x11-wm/toolbox/Makefile
+++ b/x11-wm/toolbox/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www2.bc.edu/~kelleyry/toolbox/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A blackbox style configuration utility
USE_QT_VER= 2
USE_X_PREFIX= yes
diff --git a/x11-wm/toolbox/pkg-comment b/x11-wm/toolbox/pkg-comment
deleted file mode 100644
index fbf32056a324..000000000000
--- a/x11-wm/toolbox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A blackbox style configuration utility
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 10344f9828c2..085f248a9c3d 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= udeproject
MAINTAINER= ports@FreeBSD.org
+COMMENT= Small, fast, compact windowmanager
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/x11-wm/ude/pkg-comment b/x11-wm/ude/pkg-comment
deleted file mode 100644
index 7538a45695cf..000000000000
--- a/x11-wm/ude/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small, fast, compact windowmanager
diff --git a/x11-wm/wmanager/Makefile b/x11-wm/wmanager/Makefile
index 63fc19173f34..05f2382ef5db 100644
--- a/x11-wm/wmanager/Makefile
+++ b/x11-wm/wmanager/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://kassandra.techfak.uni-bielefeld.de/mtessmer/wmanager/
EXTRACT_SUFX= -src.tar.bz2
MAINTAINER= ports@FreeBSD.org
+COMMENT= X11 window manager selector
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/x11-wm/wmanager/pkg-comment b/x11-wm/wmanager/pkg-comment
deleted file mode 100644
index 1e0a5d68334a..000000000000
--- a/x11-wm/wmanager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 window manager selector
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index 387b2890bf67..f667d10434f7 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= CDE like desktop with GTK
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
diff --git a/x11-wm/xfce/pkg-comment b/x11-wm/xfce/pkg-comment
deleted file mode 100644
index 2902db4925d4..000000000000
--- a/x11-wm/xfce/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDE like desktop with GTK
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index 387b2890bf67..f667d10434f7 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= CDE like desktop with GTK
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
diff --git a/x11-wm/xfce4/pkg-comment b/x11-wm/xfce4/pkg-comment
deleted file mode 100644
index 2902db4925d4..000000000000
--- a/x11-wm/xfce4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDE like desktop with GTK
diff --git a/x11/9menu/Makefile b/x11/9menu/Makefile
index 0658a8dca320..70e9b94437c6 100644
--- a/x11/9menu/Makefile
+++ b/x11/9menu/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.comintern.ru/pub/unix/X11/plan9/ \
EXTRACT_SUFX= .shar.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A simple menu patterened after plan9
USE_XLIB= yes
NO_WRKSUBDIR= yes
diff --git a/x11/9menu/pkg-comment b/x11/9menu/pkg-comment
deleted file mode 100644
index bb43512b660f..000000000000
--- a/x11/9menu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple menu patterened after plan9
diff --git a/x11/9term/Makefile b/x11/9term/Makefile
index 24333ec46f2e..3feee89347c8 100644
--- a/x11/9term/Makefile
+++ b/x11/9term/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.cs.usyd.edu.au/matty/unicode/
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= An X11 program which emulates a plan9 window
# needs library and private header, but not during runtime
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/editors/sam:build
diff --git a/x11/9term/pkg-comment b/x11/9term/pkg-comment
deleted file mode 100644
index 675c7c13d70d..000000000000
--- a/x11/9term/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 program which emulates a plan9 window
diff --git a/x11/XFree86-aoutlibs/Makefile b/x11/XFree86-aoutlibs/Makefile
index 08e290cb9371..868a4e6362ee 100644
--- a/x11/XFree86-aoutlibs/Makefile
+++ b/x11/XFree86-aoutlibs/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= ports@FreeBSD.org
+COMMENT= XFree86 a.out compatibility libraries
ONLY_FOR_ARCHS= i386
diff --git a/x11/XFree86-aoutlibs/pkg-comment b/x11/XFree86-aoutlibs/pkg-comment
deleted file mode 100644
index 08e995ecde89..000000000000
--- a/x11/XFree86-aoutlibs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86 a.out compatibility libraries
diff --git a/x11/blast/Makefile b/x11/blast/Makefile
index 6b3801607ae9..4eaae8cefa17 100644
--- a/x11/blast/Makefile
+++ b/x11/blast/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://hpux.csc.liv.ac.uk/hpux/X11/Demos/blast-1.0/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}-ss-11.00
MAINTAINER= ports@FreeBSD.org
+COMMENT= Blast blows holes through windows
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_X_PREFIX= yes
diff --git a/x11/blast/pkg-comment b/x11/blast/pkg-comment
deleted file mode 100644
index f3834379d439..000000000000
--- a/x11/blast/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Blast blows holes through windows
diff --git a/x11/dxpc/Makefile b/x11/dxpc/Makefile
index 994fa278acc5..67f1b7a4e355 100644
--- a/x11/dxpc/Makefile
+++ b/x11/dxpc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11
MASTER_SITES= http://www.vigor.nu/dxpc/${PORTVERSION}/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Compressing X protocol proxy designed to support X11 over slow links
LIB_DEPENDS= lzo.1:${PORTSDIR}/archivers/lzo
diff --git a/x11/dxpc/pkg-comment b/x11/dxpc/pkg-comment
deleted file mode 100644
index 0f348a033fa9..000000000000
--- a/x11/dxpc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Compressing X protocol proxy designed to support X11 over slow links
diff --git a/x11/ecore/Makefile b/x11/ecore/Makefile
index fd885c571092..0d7fe42de142 100644
--- a/x11/ecore/Makefile
+++ b/x11/ecore/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= enlightenment
MAINTAINER= ports@FreeBSD.org
+COMMENT= A core event abstraction library
USE_X_PREFIX= yes
USE_LIBTOOL= yes
diff --git a/x11/ecore/pkg-comment b/x11/ecore/pkg-comment
deleted file mode 100644
index c77650892ae2..000000000000
--- a/x11/ecore/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A core event abstraction library
diff --git a/x11/fbsd-icons/Makefile b/x11/fbsd-icons/Makefile
index 31e97994b1fc..5293a509f062 100644
--- a/x11/fbsd-icons/Makefile
+++ b/x11/fbsd-icons/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Collection of icons related to the FreeBSD project
USE_X_PREFIX= yes
NO_BUILD= yes
diff --git a/x11/fbsd-icons/pkg-comment b/x11/fbsd-icons/pkg-comment
deleted file mode 100644
index cf7221ea6130..000000000000
--- a/x11/fbsd-icons/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of icons related to the FreeBSD project
diff --git a/x11/gbackground/Makefile b/x11/gbackground/Makefile
index 07bd26580c3c..686134542e4a 100644
--- a/x11/gbackground/Makefile
+++ b/x11/gbackground/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://gBackGround.sourceforge.net/
DISTNAME= gBackGround-1.0.0-beta2
MAINTAINER= ports@FreeBSD.org
+COMMENT= Gnome Panel applet to change the background on the desktop
USE_GNOME= gnomelibs libpanel
USE_GNOMENG= yes
diff --git a/x11/gbackground/pkg-comment b/x11/gbackground/pkg-comment
deleted file mode 100644
index 2b44d7181aa6..000000000000
--- a/x11/gbackground/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome Panel applet to change the background on the desktop
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 61bba98e3f30..010445e088d0 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@freebsd.org
+COMMENT= An anti-aliased font support for gtk+
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/x11/gdkxft/pkg-comment b/x11/gdkxft/pkg-comment
deleted file mode 100644
index 83686819c95e..000000000000
--- a/x11/gdkxft/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An anti-aliased font support for gtk+
diff --git a/x11/imwheel/Makefile b/x11/imwheel/Makefile
index 896de2f0d629..ab1be3ae7d31 100644
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11
MASTER_SITES= http://jonatkins.org/imwheel/files/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Utility to translate mouse wheel actions into X keyboard events
USE_REINPLACE= yes
USE_GMAKE= YES
diff --git a/x11/imwheel/pkg-comment b/x11/imwheel/pkg-comment
deleted file mode 100644
index 11c1b00789a8..000000000000
--- a/x11/imwheel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to translate mouse wheel actions into X keyboard events
diff --git a/x11/libsx/Makefile b/x11/libsx/Makefile
index cebbcf9a0727..47847bb10b84 100644
--- a/x11/libsx/Makefile
+++ b/x11/libsx/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Simple X11 library
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/x11/libsx/pkg-comment b/x11/libsx/pkg-comment
deleted file mode 100644
index f06f7978a3a5..000000000000
--- a/x11/libsx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple X11 library
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 78a05b94f860..ad4f1ea6b4e3 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-1_00-7beta_src
EXTRACT_SUFX= .tgz
MAINTAINER= ports@freebsd.org
+COMMENT= Matrox Powerdesk for *nix
BUILD_DEPENDS= XFree86:${PORTSDIR}/x11/XFree86-4
diff --git a/x11/mgapdesk/pkg-comment b/x11/mgapdesk/pkg-comment
deleted file mode 100644
index b36d3bf6bb74..000000000000
--- a/x11/mgapdesk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Matrox Powerdesk for *nix
diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
index 03069d106064..1c72acf31679 100644
--- a/x11/nvidia-driver/Makefile
+++ b/x11/nvidia-driver/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://download.nvidia.com/freebsd/1.0-3203/
DISTNAME= NVIDIA_FreeBSD-${PORTVERSION:S/0./0-/}
MAINTAINER= ports@freebsd.org
+COMMENT= NVidia graphics card binary drivers for hardware OpenGL rendering
USE_X_PREFIX= yes
NO_PACKAGE= should be recompiled for a particular FreeBSD kernel
diff --git a/x11/nvidia-driver/pkg-comment b/x11/nvidia-driver/pkg-comment
deleted file mode 100644
index ec9050af9904..000000000000
--- a/x11/nvidia-driver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NVidia graphics card binary drivers for hardware OpenGL rendering
diff --git a/x11/p5-X11-Protocol/Makefile b/x11/p5-X11-Protocol/Makefile
index 04150fef5484..321e291224be 100644
--- a/x11/p5-X11-Protocol/Makefile
+++ b/x11/p5-X11-Protocol/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= X11
PKGNAMEPREFIX= p5-
MAINTAINER= ports@FreeBSD.org
+COMMENT= Perl module that provides an interface roughly equivalent to Xlib
PERL_CONFIGURE= yes
diff --git a/x11/p5-X11-Protocol/pkg-comment b/x11/p5-X11-Protocol/pkg-comment
deleted file mode 100644
index f3bc2ad38c6b..000000000000
--- a/x11/p5-X11-Protocol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that provides an interface roughly equivalent to Xlib
diff --git a/x11/peeper/Makefile b/x11/peeper/Makefile
index 71b4c62218d0..688ecc8b8669 100644
--- a/x11/peeper/Makefile
+++ b/x11/peeper/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= x11
MASTER_SITES= http://peeper.sourceforge.net/
MAINTAINER= ports@FreeBSD.org
+COMMENT= View an area of the screen at a certain magnification
USE_GNOMENG= yes
USE_GNOME= imlib
diff --git a/x11/peeper/pkg-comment b/x11/peeper/pkg-comment
deleted file mode 100644
index 1c4e6f673934..000000000000
--- a/x11/peeper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View an area of the screen at a certain magnification
diff --git a/x11/powershell/Makefile b/x11/powershell/Makefile
index 52c475417ef9..fc38553a6f4e 100644
--- a/x11/powershell/Makefile
+++ b/x11/powershell/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= PowerShell is a terminal emulator for the X11 Window System
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/x11/powershell/pkg-comment b/x11/powershell/pkg-comment
deleted file mode 100644
index 68757ca4cb68..000000000000
--- a/x11/powershell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PowerShell is a terminal emulator for the X11 Window System
diff --git a/x11/props/Makefile b/x11/props/Makefile
index 7fe2a3861450..958022b91a87 100644
--- a/x11/props/Makefile
+++ b/x11/props/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= fenner
MAINTAINER= ports@FreeBSD.org
+COMMENT= The OpenLook props application
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/x11/props/pkg-comment b/x11/props/pkg-comment
deleted file mode 100644
index f75f0cc41033..000000000000
--- a/x11/props/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The OpenLook props application
diff --git a/x11/sxpc/Makefile b/x11/sxpc/Makefile
index f42cd0585d18..a2370a79f13c 100644
--- a/x11/sxpc/Makefile
+++ b/x11/sxpc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= utilities
EXTRACT_SUFX= .shar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= The Simple X Protocol Compressor
USE_IMAKE= yes
NO_WRKSUBDIR= yes
diff --git a/x11/sxpc/pkg-comment b/x11/sxpc/pkg-comment
deleted file mode 100644
index 347a67bd3a35..000000000000
--- a/x11/sxpc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Simple X Protocol Compressor
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index 120c3193fd17..3d4278300d8c 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -17,6 +17,7 @@ CATEGORIES= x11 tk80
DISTNAME= ${PORTNAME}${PORTVERSION}-final
MAINTAINER= ports@freebsd.org
+COMMENT= TkGoodstuff module for fvwm2 window manager - requires XPM and fvwm2
RUN_DEPENDS= fvwm2:${PORTSDIR}/x11-wm/fvwm2
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/x11/tkgoodstuff/pkg-comment b/x11/tkgoodstuff/pkg-comment
deleted file mode 100644
index b872e8775fb1..000000000000
--- a/x11/tkgoodstuff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TkGoodstuff module for fvwm2 window manager - requires XPM and fvwm2
diff --git a/x11/twin/Makefile b/x11/twin/Makefile
index 1192adb558b1..1be31d869f2e 100644
--- a/x11/twin/Makefile
+++ b/x11/twin/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= twin
MAINTAINER= ports@FreeBSD.org
+COMMENT= A Textmode WINdow environment
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/x11/twin/pkg-comment b/x11/twin/pkg-comment
deleted file mode 100644
index 5fdb5f3f1591..000000000000
--- a/x11/twin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Textmode WINdow environment
diff --git a/x11/tycoon/Makefile b/x11/tycoon/Makefile
index ae09dda9c673..6675b15f94fe 100644
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= X11/desktop
MAINTAINER= ports@FreeBSD.org
+COMMENT= A nifty set of desktop apps, including floating buttons
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
diff --git a/x11/tycoon/pkg-comment b/x11/tycoon/pkg-comment
deleted file mode 100644
index d6ba3780a358..000000000000
--- a/x11/tycoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nifty set of desktop apps, including floating buttons
diff --git a/x11/wmmatrix/Makefile b/x11/wmmatrix/Makefile
index d6058eff21d3..16b8f874cde1 100644
--- a/x11/wmmatrix/Makefile
+++ b/x11/wmmatrix/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
DISTNAME= wmMatrix-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= A DockApp that runs a version of the xmatrix screenhack
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11/wmmatrix/pkg-comment b/x11/wmmatrix/pkg-comment
deleted file mode 100644
index 94770a4ff541..000000000000
--- a/x11/wmmatrix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A DockApp that runs a version of the xmatrix screenhack
diff --git a/x11/wscan/Makefile b/x11/wscan/Makefile
index 3b533531fa5b..79d8ba69e622 100644
--- a/x11/wscan/Makefile
+++ b/x11/wscan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.cs.pdx.edu/pub/mobile/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= A 802.11 wireless visual signal strength meter
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/x11/wscan/pkg-comment b/x11/wscan/pkg-comment
deleted file mode 100644
index 2604a12120b8..000000000000
--- a/x11/wscan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 802.11 wireless visual signal strength meter
diff --git a/x11/xautomation/Makefile b/x11/xautomation/Makefile
index a488dd3e2bf5..4df583077522 100644
--- a/x11/xautomation/Makefile
+++ b/x11/xautomation/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= x11
MASTER_SITES= http://hoopajoo.net/static/projects/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Control X from the command line for scripts
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/x11/xautomation/pkg-comment b/x11/xautomation/pkg-comment
deleted file mode 100644
index daba23a0c74e..000000000000
--- a/x11/xautomation/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Control X from the command line for scripts
diff --git a/x11/xbanner/Makefile b/x11/xbanner/Makefile
index c2e7ff0e5998..0a84135d8255 100644
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= X11/xutils
DISTNAME= XBanner${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Make your XDM login screen look beautiful
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/x11/xbanner/pkg-comment b/x11/xbanner/pkg-comment
deleted file mode 100644
index dcb65840f181..000000000000
--- a/x11/xbanner/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Make your XDM login screen look beautiful
diff --git a/x11/xbindkeys/Makefile b/x11/xbindkeys/Makefile
index 970fd9449f12..0198ff18b19c 100644
--- a/x11/xbindkeys/Makefile
+++ b/x11/xbindkeys/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= x11
MASTER_SITES= http://hocwp.free.fr/xbindkeys/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Allows you to launch shell commands under X with your keyboard
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/x11/xbindkeys/pkg-comment b/x11/xbindkeys/pkg-comment
deleted file mode 100644
index f2fab13f8121..000000000000
--- a/x11/xbindkeys/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows you to launch shell commands under X with your keyboard
diff --git a/x11/xbindkeys_config/Makefile b/x11/xbindkeys_config/Makefile
index b3d9ac7fc292..791164f524e6 100644
--- a/x11/xbindkeys_config/Makefile
+++ b/x11/xbindkeys_config/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11
MASTER_SITES= http://www.netchampagne.com/xbindkeys_config/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An easy to use gtk program for configuring Xbindkeys
USE_GNOMENG= yes
USE_GNOME= gtk12
diff --git a/x11/xbindkeys_config/pkg-comment b/x11/xbindkeys_config/pkg-comment
deleted file mode 100644
index 5bf52d982d23..000000000000
--- a/x11/xbindkeys_config/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy to use gtk program for configuring Xbindkeys
diff --git a/x11/xcb/Makefile b/x11/xcb/Makefile
index 76eabb1e2580..8fc9127a8ee4 100644
--- a/x11/xcb/Makefile
+++ b/x11/xcb/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11
MASTER_SITES= http://www.goof.com/pcg/marc/data/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tool for managing x11 cut-buffers
USE_IMAKE= yes
MAN1= xcb.1
diff --git a/x11/xcb/pkg-comment b/x11/xcb/pkg-comment
deleted file mode 100644
index c84a15bee562..000000000000
--- a/x11/xcb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for managing x11 cut-buffers
diff --git a/x11/xclip/Makefile b/x11/xclip/Makefile
index 11caaae4f27f..f826748fb7b6 100644
--- a/x11/xclip/Makefile
+++ b/x11/xclip/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11
MASTER_SITES= http://people.debian.org/~kims/xclip/
MAINTAINER= ports@FreeBSD.org
+COMMENT= An interface to X selections ("the clipboard") from the command line
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/x11/xclip/pkg-comment b/x11/xclip/pkg-comment
deleted file mode 100644
index 943bad7cd5f3..000000000000
--- a/x11/xclip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interface to X selections ("the clipboard") from the command line
diff --git a/x11/xcolors/Makefile b/x11/xcolors/Makefile
index b4529cde005c..1baf85a2a065 100644
--- a/x11/xcolors/Makefile
+++ b/x11/xcolors/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= markp
DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= Display all (ok, most of) the colors in the universe
WRKSRC= ${WRKDIR}/xcolors
USE_IMAKE= yes
diff --git a/x11/xcolors/pkg-comment b/x11/xcolors/pkg-comment
deleted file mode 100644
index bc79ff1ee735..000000000000
--- a/x11/xcolors/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display all (ok, most of) the colors in the universe
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 0af680ea394f..82352b13c137 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= utilities
DISTNAME= ${PKGNAME}-src
MAINTAINER= ports@FreeBSD.org
+COMMENT= X utility to translate rgb values into X color names
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/x11/xcolorsel/pkg-comment b/x11/xcolorsel/pkg-comment
deleted file mode 100644
index 444b9781bc91..000000000000
--- a/x11/xcolorsel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X utility to translate rgb values into X color names
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index 7ecfb6cdfefe..72ced269859b 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.chez.com/godefroy/
DISTNAME= ${PORTNAME:S/x/X/}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.Org
+COMMENT= A drop in replacement for the "dialog" or "cdialog" programs
USE_BZIP2= yes
USE_GNOMENG= yes
diff --git a/x11/xdialog/pkg-comment b/x11/xdialog/pkg-comment
deleted file mode 100644
index 092876c97118..000000000000
--- a/x11/xdialog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A drop in replacement for the "dialog" or "cdialog" programs
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 02c4b30d09b5..f157108fcf9d 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
+COMMENT= X events recorder and player
BUILD_DEPENDS= texi2html:${PORTSDIR}/textproc/texi2html
diff --git a/x11/xnee/pkg-comment b/x11/xnee/pkg-comment
deleted file mode 100644
index fc72bf2870b1..000000000000
--- a/x11/xnee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X events recorder and player
diff --git a/x11/xsel/Makefile b/x11/xsel/Makefile
index 078afaa293bd..cf6b48589f02 100644
--- a/x11/xsel/Makefile
+++ b/x11/xsel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.niksula.cs.hut.fi/~vherva/xsel/
DISTFILES= xsel.c xsel.man
MAINTAINER= ports@FreeBSD.org
+COMMENT= Access X selection from command line
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/x11/xsel/pkg-comment b/x11/xsel/pkg-comment
deleted file mode 100644
index 312a366abf41..000000000000
--- a/x11/xsel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Access X selection from command line
diff --git a/x11/xskyroot/Makefile b/x11/xskyroot/Makefile
index 3e860472304f..2161221f81d3 100644
--- a/x11/xskyroot/Makefile
+++ b/x11/xskyroot/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.sra.co.jp/pub/news/fj.sources/V10/
DISTFILES= 1079.gz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Realtime sky drawer for X root window
EXTRACT_CMD= ${GZIP_CMD}
EXTRACT_BEFORE_ARGS= -dc
diff --git a/x11/xskyroot/pkg-comment b/x11/xskyroot/pkg-comment
deleted file mode 100644
index cd339e0d1558..000000000000
--- a/x11/xskyroot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Realtime sky drawer for X root window
diff --git a/x11/xstroke/Makefile b/x11/xstroke/Makefile
index 0b2bb72929a2..3351f4c34890 100644
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= x11
MASTER_SITES= ftp://ftp.handhelds.org/pub/projects/xstroke/release-${PORTVERSION:R}/
MAINTAINER= ports@FreeBSD.org
+COMMENT= Fullscreen gesture recognition
BROKEN= Needs updates for Xft and XFree86 4.3
diff --git a/x11/xstroke/pkg-comment b/x11/xstroke/pkg-comment
deleted file mode 100644
index 554ed8881f00..000000000000
--- a/x11/xstroke/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fullscreen gesture recognition
diff --git a/x11/xtattr/Makefile b/x11/xtattr/Makefile
index cb197f149413..30f134e88a0b 100644
--- a/x11/xtattr/Makefile
+++ b/x11/xtattr/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
MAINTAINER= ports@FreeBSD.org
+COMMENT= A tool for changing xterm attributes
MAKEFILE= ${FILESDIR}/Makefile.bsd
MAN1= xtattr.1
diff --git a/x11/xtattr/pkg-comment b/x11/xtattr/pkg-comment
deleted file mode 100644
index b202fe7f7b6e..000000000000
--- a/x11/xtattr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for changing xterm attributes
diff --git a/x11/xtoolwait/Makefile b/x11/xtoolwait/Makefile
index 85f214840372..bbeb05573d38 100644
--- a/x11/xtoolwait/Makefile
+++ b/x11/xtoolwait/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= utilities
MAINTAINER= ports@FreeBSD.org
+COMMENT= Tool startup utility for X11
USE_IMAKE= yes
MAN1= xtoolwait.1
diff --git a/x11/xtoolwait/pkg-comment b/x11/xtoolwait/pkg-comment
deleted file mode 100644
index 69685a4111e6..000000000000
--- a/x11/xtoolwait/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool startup utility for X11
diff --git a/x11/xvattr/Makefile b/x11/xvattr/Makefile
index 739b8beadfbe..b4f6f2e0a8f6 100644
--- a/x11/xvattr/Makefile
+++ b/x11/xvattr/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Getting and setting Xv attributes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/x11/xvattr/pkg-comment b/x11/xvattr/pkg-comment
deleted file mode 100644
index 0e01001b602b..000000000000
--- a/x11/xvattr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Getting and setting Xv attributes
diff --git a/x11/xwatchwin/Makefile b/x11/xwatchwin/Makefile
index b0cb505f926d..7230fd677853 100644
--- a/x11/xwatchwin/Makefile
+++ b/x11/xwatchwin/Makefile
@@ -14,6 +14,7 @@ DISTNAME= xwatchwin
EXTRACT_SUFX= .tar.Z
MAINTAINER= ports@FreeBSD.org
+COMMENT= Watch a window on another X server
MAN1= xwatchwin.1
diff --git a/x11/xwatchwin/pkg-comment b/x11/xwatchwin/pkg-comment
deleted file mode 100644
index 4e1c470bb06f..000000000000
--- a/x11/xwatchwin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Watch a window on another X server