aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAde Lovett <ade@FreeBSD.org>2003-03-07 06:14:21 +0000
committerAde Lovett <ade@FreeBSD.org>2003-03-07 06:14:21 +0000
commit7e52725f2a86aad46bd6b50d5581b6ef0afd0e19 (patch)
treefd4e3235fcfaf2558312feb3c9527f1592b91aff
parentbaa68c63d40ffc2c059c978764c3c89675445e55 (diff)
downloadports-7e52725f2a86aad46bd6b50d5581b6ef0afd0e19.tar.gz
ports-7e52725f2a86aad46bd6b50d5581b6ef0afd0e19.zip
Notes
-rw-r--r--accessibility/at-spi/Makefile1
-rw-r--r--accessibility/at-spi/pkg-comment1
-rw-r--r--accessibility/atk/Makefile1
-rw-r--r--accessibility/atk/pkg-comment1
-rw-r--r--accessibility/gail/Makefile1
-rw-r--r--accessibility/gail/pkg-comment1
-rw-r--r--arabic/kde3-i18n/Makefile1
-rw-r--r--arabic/kde3-i18n/pkg-comment1
-rw-r--r--arabic/kde4-l10n/Makefile1
-rw-r--r--arabic/kde4-l10n/pkg-comment1
-rw-r--r--archivers/arc/Makefile1
-rw-r--r--archivers/arc/pkg-comment1
-rw-r--r--archivers/ark/Makefile1
-rw-r--r--archivers/ark/pkg-comment1
-rw-r--r--archivers/cabextract/Makefile1
-rw-r--r--archivers/cabextract/pkg-comment1
-rw-r--r--archivers/deepforest/Makefile1
-rw-r--r--archivers/deepforest/pkg-comment1
-rw-r--r--archivers/file-roller/Makefile1
-rw-r--r--archivers/file-roller/pkg-comment1
-rw-r--r--archivers/fileroller/Makefile1
-rw-r--r--archivers/fileroller/pkg-comment1
-rw-r--r--archivers/ha/Makefile1
-rw-r--r--archivers/ha/pkg-comment1
-rw-r--r--archivers/hpack.non-usa.only/Makefile1
-rw-r--r--archivers/hpack.non-usa.only/pkg-comment1
-rw-r--r--archivers/lha/Makefile1
-rw-r--r--archivers/lha/pkg-comment1
-rw-r--r--archivers/libarc/Makefile1
-rw-r--r--archivers/libarc/pkg-comment1
-rw-r--r--archivers/libcabinet/Makefile1
-rw-r--r--archivers/libcabinet/pkg-comment1
-rw-r--r--archivers/nulib/Makefile1
-rw-r--r--archivers/nulib/pkg-comment1
-rw-r--r--archivers/p5-Compress-Zlib/Makefile1
-rw-r--r--archivers/p5-Compress-Zlib/pkg-comment1
-rw-r--r--archivers/rar/Makefile1
-rw-r--r--archivers/rar/pkg-comment1
-rw-r--r--archivers/rpm/Makefile1
-rw-r--r--archivers/rpm/pkg-comment1
-rw-r--r--archivers/sectar/Makefile1
-rw-r--r--archivers/sectar/pkg-comment1
-rw-r--r--archivers/ucl/Makefile1
-rw-r--r--archivers/ucl/pkg-comment1
-rw-r--r--archivers/unarj/Makefile1
-rw-r--r--archivers/unarj/pkg-comment1
-rw-r--r--archivers/unrar/Makefile1
-rw-r--r--archivers/unrar/pkg-comment1
-rw-r--r--archivers/unzip/Makefile1
-rw-r--r--archivers/unzip/pkg-comment1
-rw-r--r--archivers/xpk/Makefile1
-rw-r--r--archivers/xpk/pkg-comment1
-rw-r--r--archivers/zip/Makefile1
-rw-r--r--archivers/zip/pkg-comment1
-rw-r--r--archivers/zoo/Makefile1
-rw-r--r--archivers/zoo/pkg-comment1
-rw-r--r--astro/dgpsip/Makefile1
-rw-r--r--astro/dgpsip/pkg-comment1
-rw-r--r--astro/gkrellmearth/Makefile1
-rw-r--r--astro/gkrellmearth/pkg-comment1
-rw-r--r--astro/gkrellmoon/Makefile1
-rw-r--r--astro/gkrellmoon/pkg-comment1
-rw-r--r--astro/glunarclock/Makefile1
-rw-r--r--astro/glunarclock/pkg-comment1
-rw-r--r--astro/spacechart/Makefile1
-rw-r--r--astro/spacechart/pkg-comment1
-rw-r--r--astro/starplot/Makefile1
-rw-r--r--astro/starplot/pkg-comment1
-rw-r--r--astro/sunclock/Makefile1
-rw-r--r--astro/sunclock/pkg-comment1
-rw-r--r--astro/wmglobe/Makefile1
-rw-r--r--astro/wmglobe/pkg-comment1
-rw-r--r--astro/wmjupiter/Makefile1
-rw-r--r--astro/wmjupiter/pkg-comment1
-rw-r--r--astro/wmmoonclock/Makefile1
-rw-r--r--astro/wmmoonclock/pkg-comment1
-rw-r--r--astro/wmsolar/Makefile1
-rw-r--r--astro/wmsolar/pkg-comment1
-rw-r--r--astro/xglobe/Makefile1
-rw-r--r--astro/xglobe/pkg-comment1
-rw-r--r--astro/xplanet/Makefile1
-rw-r--r--astro/xplanet/pkg-comment1
-rw-r--r--audio/HVSC-Update/Makefile1
-rw-r--r--audio/HVSC-Update/pkg-comment1
-rw-r--r--audio/abcmidi/Makefile1
-rw-r--r--audio/abcmidi/pkg-comment1
-rw-r--r--audio/abcselect/Makefile1
-rw-r--r--audio/abcselect/pkg-comment1
-rw-r--r--audio/ac3dec/Makefile1
-rw-r--r--audio/ac3dec/pkg-comment1
-rw-r--r--audio/amp/Makefile1
-rw-r--r--audio/amp/pkg-comment1
-rw-r--r--audio/ample/Makefile1
-rw-r--r--audio/ample/pkg-comment1
-rw-r--r--audio/arts/Makefile1
-rw-r--r--audio/arts/pkg-comment1
-rw-r--r--audio/bladeenc/Makefile1
-rw-r--r--audio/bladeenc/pkg-comment1
-rw-r--r--audio/btc/Makefile1
-rw-r--r--audio/btc/pkg-comment1
-rw-r--r--audio/ermixer/Makefile1
-rw-r--r--audio/ermixer/pkg-comment1
-rw-r--r--audio/esound/Makefile1
-rw-r--r--audio/esound/pkg-comment1
-rw-r--r--audio/extace/Makefile1
-rw-r--r--audio/extace/pkg-comment1
-rw-r--r--audio/glame/Makefile1
-rw-r--r--audio/glame/pkg-comment1
-rw-r--r--audio/gnome-audio/Makefile1
-rw-r--r--audio/gnome-audio/pkg-comment1
-rw-r--r--audio/gnome-media/Makefile1
-rw-r--r--audio/gnome-media/pkg-comment1
-rw-r--r--audio/gnomeaudio/Makefile1
-rw-r--r--audio/gnomeaudio/pkg-comment1
-rw-r--r--audio/gnomeaudio2/Makefile1
-rw-r--r--audio/gnomeaudio2/pkg-comment1
-rw-r--r--audio/gnomemedia/Makefile1
-rw-r--r--audio/gnomemedia/pkg-comment1
-rw-r--r--audio/gnomemedia2/Makefile1
-rw-r--r--audio/gnomemedia2/pkg-comment1
-rw-r--r--audio/gogo/Makefile1
-rw-r--r--audio/gogo/pkg-comment1
-rw-r--r--audio/grip/Makefile1
-rw-r--r--audio/grip/pkg-comment1
-rw-r--r--audio/id3el/Makefile1
-rw-r--r--audio/id3el/pkg-comment1
-rw-r--r--audio/lame/Makefile1
-rw-r--r--audio/lame/pkg-comment1
-rw-r--r--audio/libaudiofile/Makefile1
-rw-r--r--audio/libaudiofile/pkg-comment1
-rw-r--r--audio/libworkman/Makefile1
-rw-r--r--audio/libworkman/pkg-comment1
-rw-r--r--audio/linux-vsound/Makefile1
-rw-r--r--audio/linux-vsound/pkg-comment1
-rw-r--r--audio/lplayer/Makefile1
-rw-r--r--audio/lplayer/pkg-comment1
-rw-r--r--audio/mp3blaster/Makefile1
-rw-r--r--audio/mp3blaster/pkg-comment1
-rw-r--r--audio/mp3chew/Makefile1
-rw-r--r--audio/mp3chew/pkg-comment1
-rw-r--r--audio/mp3ck/Makefile1
-rw-r--r--audio/mp3ck/pkg-comment1
-rw-r--r--audio/mp3info/Makefile1
-rw-r--r--audio/mp3info/pkg-comment1
-rw-r--r--audio/mpg123.el/Makefile1
-rw-r--r--audio/mpg123.el/pkg-comment1
-rw-r--r--audio/mpg123/Makefile1
-rw-r--r--audio/mpg123/pkg-comment1
-rw-r--r--audio/napster/Makefile1
-rw-r--r--audio/napster/pkg-comment1
-rw-r--r--audio/opennap/Makefile1
-rw-r--r--audio/opennap/pkg-comment1
-rw-r--r--audio/py-ao/Makefile1
-rw-r--r--audio/py-ao/pkg-comment1
-rw-r--r--audio/py-ogg/Makefile1
-rw-r--r--audio/py-ogg/pkg-comment1
-rw-r--r--audio/py-vorbis/Makefile1
-rw-r--r--audio/py-vorbis/pkg-comment1
-rw-r--r--audio/pysol-sound-server/Makefile1
-rw-r--r--audio/pysol-sound-server/pkg-comment1
-rw-r--r--audio/quelcom/Makefile1
-rw-r--r--audio/quelcom/pkg-comment1
-rw-r--r--audio/rat/Makefile1
-rw-r--r--audio/rat/pkg-comment1
-rw-r--r--audio/replay/Makefile1
-rw-r--r--audio/replay/pkg-comment1
-rw-r--r--audio/sbagen/Makefile1
-rw-r--r--audio/sbagen/pkg-comment1
-rw-r--r--audio/sdl_mixer/Makefile1
-rw-r--r--audio/sdl_mixer/pkg-comment1
-rw-r--r--audio/shntool/Makefile1
-rw-r--r--audio/shntool/pkg-comment1
-rw-r--r--audio/snowstar/Makefile1
-rw-r--r--audio/snowstar/pkg-comment1
-rw-r--r--audio/soribada/Makefile1
-rw-r--r--audio/soribada/pkg-comment1
-rw-r--r--audio/splay/Makefile1
-rw-r--r--audio/splay/pkg-comment1
-rw-r--r--audio/sweep/Makefile1
-rw-r--r--audio/sweep/pkg-comment1
-rw-r--r--audio/tempest_for_eliza/Makefile1
-rw-r--r--audio/tempest_for_eliza/pkg-comment1
-rw-r--r--audio/uade/Makefile1
-rw-r--r--audio/uade/pkg-comment1
-rw-r--r--audio/umix/Makefile1
-rw-r--r--audio/umix/pkg-comment1
-rw-r--r--audio/vat/Makefile1
-rw-r--r--audio/vat/pkg-comment1
-rw-r--r--audio/wmmp3/Makefile1
-rw-r--r--audio/wmmp3/pkg-comment1
-rw-r--r--audio/wmtune/Makefile1
-rw-r--r--audio/wmtune/pkg-comment1
-rw-r--r--audio/wsoundprefs/Makefile1
-rw-r--r--audio/wsoundprefs/pkg-comment1
-rw-r--r--audio/wsoundserver/Makefile1
-rw-r--r--audio/wsoundserver/pkg-comment1
-rw-r--r--audio/x11amp/Makefile1
-rw-r--r--audio/x11amp/pkg-comment1
-rw-r--r--audio/xcd/Makefile1
-rw-r--r--audio/xcd/pkg-comment1
-rw-r--r--audio/xhippo/Makefile1
-rw-r--r--audio/xhippo/pkg-comment1
-rw-r--r--audio/xmms-crossfade/Makefile1
-rw-r--r--audio/xmms-crossfade/pkg-comment1
-rw-r--r--audio/xmms-crystality/Makefile1
-rw-r--r--audio/xmms-crystality/pkg-comment1
-rw-r--r--audio/xmms-uade/Makefile1
-rw-r--r--audio/xmms-uade/pkg-comment1
-rw-r--r--audio/xmms-volnorm/Makefile1
-rw-r--r--audio/xmms-volnorm/pkg-comment1
-rw-r--r--audio/yamt/Makefile1
-rw-r--r--audio/yamt/pkg-comment1
-rw-r--r--benchmarks/bonnie/Makefile1
-rw-r--r--benchmarks/bonnie/pkg-comment1
-rw-r--r--benchmarks/bytebench/Makefile1
-rw-r--r--benchmarks/bytebench/pkg-comment1
-rw-r--r--benchmarks/dbs/Makefile1
-rw-r--r--benchmarks/dbs/pkg-comment1
-rw-r--r--benchmarks/iozone/Makefile1
-rw-r--r--benchmarks/iozone/pkg-comment1
-rw-r--r--benchmarks/iperf/Makefile1
-rw-r--r--benchmarks/iperf/pkg-comment1
-rw-r--r--benchmarks/lmbench/Makefile1
-rw-r--r--benchmarks/lmbench/pkg-comment1
-rw-r--r--benchmarks/netperf/Makefile1
-rw-r--r--benchmarks/netperf/pkg-comment1
-rw-r--r--benchmarks/netpipe/Makefile1
-rw-r--r--benchmarks/netpipe/pkg-comment1
-rw-r--r--benchmarks/nttcp/Makefile1
-rw-r--r--benchmarks/nttcp/pkg-comment1
-rw-r--r--benchmarks/polygraph/Makefile1
-rw-r--r--benchmarks/polygraph/pkg-comment1
-rw-r--r--benchmarks/polygraph31/Makefile1
-rw-r--r--benchmarks/polygraph31/pkg-comment1
-rw-r--r--benchmarks/pybench/Makefile1
-rw-r--r--benchmarks/pybench/pkg-comment1
-rw-r--r--benchmarks/rawio/Makefile1
-rw-r--r--benchmarks/rawio/pkg-comment1
-rw-r--r--benchmarks/ttcp/Makefile1
-rw-r--r--benchmarks/ttcp/pkg-comment1
-rw-r--r--benchmarks/ubench/Makefile1
-rw-r--r--benchmarks/ubench/pkg-comment1
-rw-r--r--benchmarks/unixbench/Makefile1
-rw-r--r--benchmarks/unixbench/pkg-comment1
-rw-r--r--biology/coalesce/Makefile1
-rw-r--r--biology/coalesce/pkg-comment1
-rw-r--r--biology/emboss/Makefile1
-rw-r--r--biology/emboss/pkg-comment1
-rw-r--r--biology/fasta/Makefile1
-rw-r--r--biology/fasta/pkg-comment1
-rw-r--r--biology/fasta3/Makefile1
-rw-r--r--biology/fasta3/pkg-comment1
-rw-r--r--biology/fluctuate/Makefile1
-rw-r--r--biology/fluctuate/pkg-comment1
-rw-r--r--biology/hmmer/Makefile1
-rw-r--r--biology/hmmer/pkg-comment1
-rw-r--r--biology/lamarc/Makefile1
-rw-r--r--biology/lamarc/pkg-comment1
-rw-r--r--biology/migrate/Makefile1
-rw-r--r--biology/migrate/pkg-comment1
-rw-r--r--biology/p5-bioperl-devel/Makefile1
-rw-r--r--biology/p5-bioperl-devel/pkg-comment1
-rw-r--r--biology/p5-bioperl/Makefile1
-rw-r--r--biology/p5-bioperl/pkg-comment1
-rw-r--r--biology/py-biopython/Makefile1
-rw-r--r--biology/py-biopython/pkg-comment1
-rw-r--r--biology/pymol/Makefile1
-rw-r--r--biology/pymol/pkg-comment1
-rw-r--r--biology/recombine/Makefile1
-rw-r--r--biology/recombine/pkg-comment1
-rw-r--r--biology/t_coffee/Makefile1
-rw-r--r--biology/t_coffee/pkg-comment1
-rw-r--r--cad/atlc/Makefile1
-rw-r--r--cad/atlc/pkg-comment1
-rw-r--r--cad/cascade/Makefile1
-rw-r--r--cad/cascade/pkg-comment1
-rw-r--r--cad/iverilog/Makefile1
-rw-r--r--cad/iverilog/pkg-comment1
-rw-r--r--cad/sceptre/Makefile1
-rw-r--r--cad/sceptre/pkg-comment1
-rw-r--r--cad/vipec/Makefile1
-rw-r--r--cad/vipec/pkg-comment1
-rw-r--r--comms/bpl+/Makefile1
-rw-r--r--comms/bpl+/pkg-comment1
-rw-r--r--comms/comserv/Makefile1
-rw-r--r--comms/comserv/pkg-comment1
-rw-r--r--comms/conserver/Makefile1
-rw-r--r--comms/conserver/pkg-comment1
-rw-r--r--comms/ecu/Makefile1
-rw-r--r--comms/ecu/pkg-comment1
-rw-r--r--comms/efax/Makefile1
-rw-r--r--comms/efax/pkg-comment1
-rw-r--r--comms/gnokii/Makefile1
-rw-r--r--comms/gnokii/pkg-comment1
-rw-r--r--comms/ixj/Makefile1
-rw-r--r--comms/ixj/pkg-comment1
-rw-r--r--comms/kpsk/Makefile1
-rw-r--r--comms/kpsk/pkg-comment1
-rw-r--r--comms/kremotecontrol/Makefile1
-rw-r--r--comms/kremotecontrol/pkg-comment1
-rw-r--r--comms/mgetty+sendfax/Makefile1
-rw-r--r--comms/mgetty+sendfax/pkg-comment1
-rw-r--r--comms/minicom/Makefile1
-rw-r--r--comms/minicom/pkg-comment1
-rw-r--r--comms/mlan/Makefile1
-rw-r--r--comms/mlan/pkg-comment1
-rw-r--r--comms/mlan3/Makefile1
-rw-r--r--comms/mlan3/pkg-comment1
-rw-r--r--comms/mserver/Makefile1
-rw-r--r--comms/mserver/pkg-comment1
-rw-r--r--comms/seyon/Makefile1
-rw-r--r--comms/seyon/pkg-comment1
-rw-r--r--comms/sms_client/Makefile1
-rw-r--r--comms/sms_client/pkg-comment1
-rw-r--r--comms/sredird/Makefile1
-rw-r--r--comms/sredird/pkg-comment1
-rw-r--r--comms/tkscanfax/Makefile1
-rw-r--r--comms/tkscanfax/pkg-comment1
-rw-r--r--comms/viewfax/Makefile1
-rw-r--r--comms/viewfax/pkg-comment1
-rw-r--r--comms/xcept/Makefile1
-rw-r--r--comms/xcept/pkg-comment1
-rw-r--r--comms/xlog/Makefile1
-rw-r--r--comms/xlog/pkg-comment1
-rw-r--r--comms/yaps/Makefile1
-rw-r--r--comms/yaps/pkg-comment1
-rw-r--r--comms/yawmppp/Makefile1
-rw-r--r--comms/yawmppp/pkg-comment1
-rw-r--r--converters/cn2jp/Makefile1
-rw-r--r--converters/cn2jp/pkg-comment1
-rw-r--r--converters/dumpasn1/Makefile1
-rw-r--r--converters/dumpasn1/pkg-comment1
-rw-r--r--converters/fconv/Makefile1
-rw-r--r--converters/fconv/pkg-comment1
-rw-r--r--converters/gbase/Makefile1
-rw-r--r--converters/gbase/pkg-comment1
-rw-r--r--converters/ish/Makefile1
-rw-r--r--converters/ish/pkg-comment1
-rw-r--r--converters/libiconv/Makefile1
-rw-r--r--converters/libiconv/pkg-comment1
-rw-r--r--converters/mmencode/Makefile1
-rw-r--r--converters/mmencode/pkg-comment1
-rw-r--r--converters/mpack/Makefile1
-rw-r--r--converters/mpack/pkg-comment1
-rw-r--r--converters/p5-Boulder/Makefile1
-rw-r--r--converters/p5-Boulder/pkg-comment1
-rw-r--r--converters/p5-Convert-ASN1/Makefile1
-rw-r--r--converters/p5-Convert-ASN1/pkg-comment1
-rw-r--r--converters/p5-Convert-BER/Makefile1
-rw-r--r--converters/p5-Convert-BER/pkg-comment1
-rw-r--r--converters/p5-Convert-PEM/Makefile1
-rw-r--r--converters/p5-Convert-PEM/pkg-comment1
-rw-r--r--converters/p5-Convert-Recode/Makefile1
-rw-r--r--converters/p5-Convert-Recode/pkg-comment1
-rw-r--r--converters/p5-Convert-UU/Makefile1
-rw-r--r--converters/p5-Convert-UU/pkg-comment1
-rw-r--r--converters/p5-Convert-UUlib/Makefile1
-rw-r--r--converters/p5-Convert-UUlib/pkg-comment1
-rw-r--r--converters/p5-Text-Iconv/Makefile1
-rw-r--r--converters/p5-Text-Iconv/pkg-comment1
-rw-r--r--converters/psiconv/Makefile1
-rw-r--r--converters/psiconv/pkg-comment1
-rw-r--r--converters/recode/Makefile1
-rw-r--r--converters/recode/pkg-comment1
-rw-r--r--converters/siconv/Makefile1
-rw-r--r--converters/siconv/pkg-comment1
-rw-r--r--converters/trans/Makefile1
-rw-r--r--converters/trans/pkg-comment1
-rw-r--r--converters/uudeview/Makefile1
-rw-r--r--converters/uudeview/pkg-comment1
-rw-r--r--converters/uulib/Makefile1
-rw-r--r--converters/uulib/pkg-comment1
-rw-r--r--converters/xdeview/Makefile1
-rw-r--r--converters/xdeview/pkg-comment1
-rw-r--r--databases/arcexplorer/Makefile1
-rw-r--r--databases/arcexplorer/pkg-comment1
-rw-r--r--databases/bbdb/Makefile1
-rw-r--r--databases/bbdb/pkg-comment1
-rw-r--r--databases/dbf2mysql/Makefile1
-rw-r--r--databases/dbf2mysql/pkg-comment1
-rw-r--r--databases/gmysql/Makefile1
-rw-r--r--databases/gmysql/pkg-comment1
-rw-r--r--databases/gnats/Makefile1
-rw-r--r--databases/gnats/pkg-comment1
-rw-r--r--databases/gnome-db/Makefile1
-rw-r--r--databases/gnome-db/pkg-comment1
-rw-r--r--databases/gnomedb/Makefile1
-rw-r--r--databases/gnomedb/pkg-comment1
-rw-r--r--databases/gqlplus/Makefile1
-rw-r--r--databases/gqlplus/pkg-comment1
-rw-r--r--databases/grass-i18n/Makefile1
-rw-r--r--databases/grass-i18n/pkg-comment1
-rw-r--r--databases/grass/Makefile1
-rw-r--r--databases/grass/pkg-comment1
-rw-r--r--databases/jdbc-oracle816/Makefile1
-rw-r--r--databases/jdbc-oracle816/pkg-comment1
-rw-r--r--databases/jdbc-oracle8i/Makefile1
-rw-r--r--databases/jdbc-oracle8i/pkg-comment1
-rw-r--r--databases/jdbc-oracle9i/Makefile1
-rw-r--r--databases/jdbc-oracle9i/pkg-comment1
-rw-r--r--databases/libdbi/Makefile1
-rw-r--r--databases/libdbi/pkg-comment1
-rw-r--r--databases/libgda/Makefile1
-rw-r--r--databases/libgda/pkg-comment1
-rw-r--r--databases/libgda2/Makefile1
-rw-r--r--databases/libgda2/pkg-comment1
-rw-r--r--databases/libgda3/Makefile1
-rw-r--r--databases/libgda3/pkg-comment1
-rw-r--r--databases/libgnomedb/Makefile1
-rw-r--r--databases/libgnomedb/pkg-comment1
-rw-r--r--databases/libodbc++/Makefile1
-rw-r--r--databases/libodbc++/pkg-comment1
-rw-r--r--databases/lsdb/Makefile1
-rw-r--r--databases/lsdb/pkg-comment1
-rw-r--r--databases/mergeant/Makefile1
-rw-r--r--databases/mergeant/pkg-comment1
-rw-r--r--databases/mysql-editor/Makefile1
-rw-r--r--databases/mysql-editor/pkg-comment1
-rw-r--r--databases/mysql2pgsql/Makefile1
-rw-r--r--databases/mysql2pgsql/pkg-comment1
-rw-r--r--databases/mysqltcl/Makefile1
-rw-r--r--databases/mysqltcl/pkg-comment1
-rw-r--r--databases/mytop/Makefile1
-rw-r--r--databases/mytop/pkg-comment1
-rw-r--r--databases/oracle7-client/Makefile1
-rw-r--r--databases/oracle7-client/pkg-comment1
-rw-r--r--databases/p5-ApacheDBILogConfig/Makefile1
-rw-r--r--databases/p5-ApacheDBILogConfig/pkg-comment1
-rw-r--r--databases/p5-ApacheDBILogger/Makefile1
-rw-r--r--databases/p5-ApacheDBILogger/pkg-comment1
-rw-r--r--databases/p5-AsciiDB-TagFile/Makefile1
-rw-r--r--databases/p5-AsciiDB-TagFile/pkg-comment1
-rw-r--r--databases/p5-Class-DBI/Makefile1
-rw-r--r--databases/p5-Class-DBI/pkg-comment1
-rw-r--r--databases/p5-DBD-InterBase/Makefile1
-rw-r--r--databases/p5-DBD-InterBase/pkg-comment1
-rw-r--r--databases/p5-DBD-Oracle/Makefile1
-rw-r--r--databases/p5-DBD-Oracle/pkg-comment1
-rw-r--r--databases/p5-DBD-Sybase/Makefile1
-rw-r--r--databases/p5-DBD-Sybase/pkg-comment1
-rw-r--r--databases/p5-DBI-137/Makefile1
-rw-r--r--databases/p5-DBI-137/pkg-comment1
-rw-r--r--databases/p5-DBI/Makefile1
-rw-r--r--databases/p5-DBI/pkg-comment1
-rw-r--r--databases/p5-DBIWrapper/Makefile1
-rw-r--r--databases/p5-DBIWrapper/pkg-comment1
-rw-r--r--databases/p5-DBIx-DataSource/Makefile1
-rw-r--r--databases/p5-DBIx-DataSource/pkg-comment1
-rw-r--r--databases/p5-DBIx-Recordset/Makefile1
-rw-r--r--databases/p5-DBIx-Recordset/pkg-comment1
-rw-r--r--databases/p5-DBIx-SearchBuilder/Makefile1
-rw-r--r--databases/p5-DBIx-SearchBuilder/pkg-comment1
-rw-r--r--databases/p5-DBZ_File/Makefile1
-rw-r--r--databases/p5-DBZ_File/pkg-comment1
-rw-r--r--databases/p5-GraphViz-DBI/Makefile1
-rw-r--r--databases/p5-GraphViz-DBI/pkg-comment1
-rw-r--r--databases/p5-Ima-DBI/Makefile1
-rw-r--r--databases/p5-Ima-DBI/pkg-comment1
-rw-r--r--databases/p5-Mysql/Makefile1
-rw-r--r--databases/p5-Mysql/pkg-comment1
-rw-r--r--databases/p5-POE-Component-DBIAgent/Makefile1
-rw-r--r--databases/p5-POE-Component-DBIAgent/pkg-comment1
-rw-r--r--databases/p5-POE-Component-RRDTool/Makefile1
-rw-r--r--databases/p5-POE-Component-RRDTool/pkg-comment1
-rw-r--r--databases/p5-Tangram/Makefile1
-rw-r--r--databases/p5-Tangram/pkg-comment1
-rw-r--r--databases/p5-Text-Query-SQL/Makefile1
-rw-r--r--databases/p5-Text-Query-SQL/pkg-comment1
-rw-r--r--databases/p5-postgresql-plperl/Makefile1
-rw-r--r--databases/p5-postgresql-plperl/pkg-comment1
-rw-r--r--databases/phpmyadmin/Makefile1
-rw-r--r--databases/phpmyadmin/pkg-comment1
-rw-r--r--databases/phpmyadmin211/Makefile1
-rw-r--r--databases/phpmyadmin211/pkg-comment1
-rw-r--r--databases/phppgadmin/Makefile1
-rw-r--r--databases/phppgadmin/pkg-comment1
-rw-r--r--databases/postgresql-devel/Makefile1
-rw-r--r--databases/postgresql-devel/pkg-comment1
-rw-r--r--databases/postgresql-docs/Makefile1
-rw-r--r--databases/postgresql-docs/pkg-comment1
-rw-r--r--databases/postgresql-jdbc/Makefile1
-rw-r--r--databases/postgresql-jdbc/pkg-comment1
-rw-r--r--databases/postgresql-pltcl/Makefile1
-rw-r--r--databases/postgresql-pltcl/pkg-comment1
-rw-r--r--databases/postgresql-tcltk/Makefile1
-rw-r--r--databases/postgresql-tcltk/pkg-comment1
-rw-r--r--databases/pxtools/Makefile1
-rw-r--r--databases/pxtools/pkg-comment1
-rw-r--r--databases/py-MySQLdb-devel/Makefile1
-rw-r--r--databases/py-MySQLdb-devel/pkg-comment1
-rw-r--r--databases/py-MySQLdb/Makefile1
-rw-r--r--databases/py-MySQLdb/pkg-comment1
-rw-r--r--databases/py-gdbm/Makefile1
-rw-r--r--databases/py-gdbm/pkg-comment1
-rw-r--r--databases/ruby-interbase/Makefile1
-rw-r--r--databases/ruby-interbase/pkg-comment1
-rw-r--r--databases/sybase-ocsd/Makefile1
-rw-r--r--databases/sybase-ocsd/pkg-comment1
-rw-r--r--databases/tcl-Mysql/Makefile1
-rw-r--r--databases/tcl-Mysql/pkg-comment1
-rw-r--r--databases/tora/Makefile1
-rw-r--r--databases/tora/pkg-comment1
-rw-r--r--databases/xmysql/Makefile1
-rw-r--r--databases/xmysql/pkg-comment1
-rw-r--r--databases/xmysqladmin/Makefile1
-rw-r--r--databases/xmysqladmin/pkg-comment1
-rw-r--r--databases/zodb/Makefile1
-rw-r--r--databases/zodb/pkg-comment1
-rw-r--r--databases/zpygresqlda/Makefile1
-rw-r--r--databases/zpygresqlda/pkg-comment1
-rw-r--r--deskutils/aspostit/Makefile1
-rw-r--r--deskutils/aspostit/pkg-comment1
-rw-r--r--deskutils/bigyear/Makefile1
-rw-r--r--deskutils/bigyear/pkg-comment1
-rw-r--r--deskutils/dailystrips/Makefile1
-rw-r--r--deskutils/dailystrips/pkg-comment1
-rw-r--r--deskutils/gaddr/Makefile1
-rw-r--r--deskutils/gaddr/pkg-comment1
-rw-r--r--deskutils/gemcal/Makefile1
-rw-r--r--deskutils/gemcal/pkg-comment1
-rw-r--r--deskutils/gnome-pim/Makefile1
-rw-r--r--deskutils/gnome-pim/pkg-comment1
-rw-r--r--deskutils/gnome-utils/Makefile1
-rw-r--r--deskutils/gnome-utils/pkg-comment1
-rw-r--r--deskutils/gnomepim/Makefile1
-rw-r--r--deskutils/gnomepim/pkg-comment1
-rw-r--r--deskutils/gnomeutils2/Makefile1
-rw-r--r--deskutils/gnomeutils2/pkg-comment1
-rw-r--r--deskutils/ical/Makefile1
-rw-r--r--deskutils/ical/pkg-comment1
-rw-r--r--deskutils/jlj/Makefile1
-rw-r--r--deskutils/jlj/pkg-comment1
-rw-r--r--deskutils/kcharselect/Makefile1
-rw-r--r--deskutils/kcharselect/pkg-comment1
-rw-r--r--deskutils/kdepim3/Makefile1
-rw-r--r--deskutils/kdepim3/pkg-comment1
-rw-r--r--deskutils/kdepim4/Makefile1
-rw-r--r--deskutils/kdepim4/pkg-comment1
-rw-r--r--deskutils/kdepim44/Makefile1
-rw-r--r--deskutils/kdepim44/pkg-comment1
-rw-r--r--deskutils/knowit/Makefile1
-rw-r--r--deskutils/knowit/pkg-comment1
-rw-r--r--deskutils/krss/Makefile1
-rw-r--r--deskutils/krss/pkg-comment1
-rw-r--r--deskutils/mhc/Makefile1
-rw-r--r--deskutils/mhc/pkg-comment1
-rw-r--r--deskutils/plan/Makefile1
-rw-r--r--deskutils/plan/pkg-comment1
-rw-r--r--deskutils/sliderule/Makefile1
-rw-r--r--deskutils/sliderule/pkg-comment1
-rw-r--r--deskutils/wmpinboard/Makefile1
-rw-r--r--deskutils/wmpinboard/pkg-comment1
-rw-r--r--deskutils/xmdiary/Makefile1
-rw-r--r--deskutils/xmdiary/pkg-comment1
-rw-r--r--deskutils/xpostit/Makefile1
-rw-r--r--deskutils/xpostit/pkg-comment1
-rw-r--r--deskutils/yank/Makefile1
-rw-r--r--deskutils/yank/pkg-comment1
-rw-r--r--devel/ORBit/Makefile1
-rw-r--r--devel/ORBit/pkg-comment1
-rw-r--r--devel/ORBit2/Makefile1
-rw-r--r--devel/ORBit2/pkg-comment1
-rw-r--r--devel/SN/Makefile1
-rw-r--r--devel/SN/pkg-comment1
-rw-r--r--devel/a2dev/Makefile1
-rw-r--r--devel/a2dev/pkg-comment1
-rw-r--r--devel/ac-archive/Makefile1
-rw-r--r--devel/ac-archive/pkg-comment1
-rw-r--r--devel/acpicatools/Makefile1
-rw-r--r--devel/acpicatools/pkg-comment1
-rw-r--r--devel/apache-ant/Makefile1
-rw-r--r--devel/apache-ant/pkg-comment1
-rw-r--r--devel/arch/Makefile1
-rw-r--r--devel/arch/pkg-comment1
-rw-r--r--devel/as80/Makefile1
-rw-r--r--devel/as80/pkg-comment1
-rw-r--r--devel/asmutils/Makefile1
-rw-r--r--devel/asmutils/pkg-comment1
-rw-r--r--devel/atk/Makefile1
-rw-r--r--devel/atk/pkg-comment1
-rw-r--r--devel/autoconf/Makefile1
-rw-r--r--devel/autoconf/pkg-comment1
-rw-r--r--devel/autoconf213/Makefile1
-rw-r--r--devel/autoconf213/pkg-comment1
-rw-r--r--devel/autoconf253/Makefile1
-rw-r--r--devel/autoconf253/pkg-comment1
-rw-r--r--devel/automake/Makefile1
-rw-r--r--devel/automake/pkg-comment1
-rw-r--r--devel/automake14/Makefile1
-rw-r--r--devel/automake14/pkg-comment1
-rw-r--r--devel/automake15/Makefile1
-rw-r--r--devel/automake15/pkg-comment1
-rw-r--r--devel/automake16/Makefile1
-rw-r--r--devel/automake16/pkg-comment1
-rw-r--r--devel/avr-binutils/Makefile1
-rw-r--r--devel/avr-binutils/pkg-comment1
-rw-r--r--devel/avr-gcc-3/Makefile1
-rw-r--r--devel/avr-gcc-3/pkg-comment1
-rw-r--r--devel/avr-gcc/Makefile1
-rw-r--r--devel/avr-gcc/pkg-comment1
-rw-r--r--devel/avr-gdb/Makefile1
-rw-r--r--devel/avr-gdb/pkg-comment1
-rw-r--r--devel/avr-libc/Makefile1
-rw-r--r--devel/avr-libc/pkg-comment1
-rw-r--r--devel/avrprog/Makefile1
-rw-r--r--devel/avrprog/pkg-comment1
-rw-r--r--devel/bcc/Makefile1
-rw-r--r--devel/bcc/pkg-comment1
-rw-r--r--devel/boaconstructor/Makefile1
-rw-r--r--devel/boaconstructor/pkg-comment1
-rw-r--r--devel/bonobo-activation/Makefile1
-rw-r--r--devel/bonobo-activation/pkg-comment1
-rw-r--r--devel/bonobo-conf/Makefile1
-rw-r--r--devel/bonobo-conf/pkg-comment1
-rw-r--r--devel/bonobo/Makefile1
-rw-r--r--devel/bonobo/pkg-comment1
-rw-r--r--devel/bug-buddy/Makefile1
-rw-r--r--devel/bug-buddy/pkg-comment1
-rw-r--r--devel/bugbuddy/Makefile1
-rw-r--r--devel/bugbuddy/pkg-comment1
-rw-r--r--devel/bugbuddy2/Makefile1
-rw-r--r--devel/bugbuddy2/pkg-comment1
-rw-r--r--devel/c2lib/Makefile1
-rw-r--r--devel/c2lib/pkg-comment1
-rw-r--r--devel/cbrowser/Makefile1
-rw-r--r--devel/cbrowser/pkg-comment1
-rw-r--r--devel/cc65/Makefile1
-rw-r--r--devel/cc65/pkg-comment1
-rw-r--r--devel/cdialog/Makefile1
-rw-r--r--devel/cdialog/pkg-comment1
-rw-r--r--devel/cdk/Makefile1
-rw-r--r--devel/cdk/pkg-comment1
-rw-r--r--devel/cdoc/Makefile1
-rw-r--r--devel/cdoc/pkg-comment1
-rw-r--r--devel/clanlib-devel/Makefile1
-rw-r--r--devel/clanlib-devel/pkg-comment1
-rw-r--r--devel/clanlib/Makefile1
-rw-r--r--devel/clanlib/pkg-comment1
-rw-r--r--devel/clig/Makefile1
-rw-r--r--devel/clig/pkg-comment1
-rw-r--r--devel/clo++/Makefile1
-rw-r--r--devel/clo++/pkg-comment1
-rw-r--r--devel/cons-test/Makefile1
-rw-r--r--devel/cons-test/pkg-comment1
-rw-r--r--devel/cscope/Makefile1
-rw-r--r--devel/cscope/pkg-comment1
-rw-r--r--devel/ctags/Makefile1
-rw-r--r--devel/ctags/pkg-comment1
-rw-r--r--devel/cvs+ipv6/Makefile1
-rw-r--r--devel/cvs+ipv6/pkg-comment1
-rw-r--r--devel/cvs-devel/Makefile1
-rw-r--r--devel/cvs-devel/pkg-comment1
-rw-r--r--devel/cvs2html/Makefile1
-rw-r--r--devel/cvs2html/pkg-comment1
-rw-r--r--devel/cvspadm/Makefile1
-rw-r--r--devel/cvspadm/pkg-comment1
-rw-r--r--devel/cvsstat/Makefile1
-rw-r--r--devel/cvsstat/pkg-comment1
-rw-r--r--devel/cvsweb/Makefile1
-rw-r--r--devel/cvsweb/pkg-comment1
-rw-r--r--devel/cvsweb3/Makefile1
-rw-r--r--devel/cvsweb3/pkg-comment1
-rw-r--r--devel/cvswrap/Makefile1
-rw-r--r--devel/cvswrap/pkg-comment1
-rw-r--r--devel/cweb/Makefile1
-rw-r--r--devel/cweb/pkg-comment1
-rw-r--r--devel/devtodo/Makefile1
-rw-r--r--devel/devtodo/pkg-comment1
-rw-r--r--devel/diffconvert/Makefile1
-rw-r--r--devel/diffconvert/pkg-comment1
-rw-r--r--devel/doxygen/Makefile1
-rw-r--r--devel/doxygen/pkg-comment1
-rw-r--r--devel/elib/Makefile1
-rw-r--r--devel/elib/pkg-comment1
-rw-r--r--devel/error/Makefile1
-rw-r--r--devel/error/pkg-comment1
-rw-r--r--devel/fam/Makefile1
-rw-r--r--devel/fam/pkg-comment1
-rw-r--r--devel/fhist/Makefile1
-rw-r--r--devel/fhist/pkg-comment1
-rw-r--r--devel/fnccheck/Makefile1
-rw-r--r--devel/fnccheck/pkg-comment1
-rw-r--r--devel/fnorb/Makefile1
-rw-r--r--devel/fnorb/pkg-comment1
-rw-r--r--devel/fortran-utils/Makefile1
-rw-r--r--devel/fortran-utils/pkg-comment1
-rw-r--r--devel/frink/Makefile1
-rw-r--r--devel/frink/pkg-comment1
-rw-r--r--devel/funnelweb/Makefile1
-rw-r--r--devel/funnelweb/pkg-comment1
-rw-r--r--devel/gaa/Makefile1
-rw-r--r--devel/gaa/pkg-comment1
-rw-r--r--devel/gconf/Makefile1
-rw-r--r--devel/gconf/pkg-comment1
-rw-r--r--devel/gconf2/Makefile1
-rw-r--r--devel/gconf2/pkg-comment1
-rw-r--r--devel/gdb52/Makefile1
-rw-r--r--devel/gdb52/pkg-comment1
-rw-r--r--devel/gdb53/Makefile1
-rw-r--r--devel/gdb53/pkg-comment1
-rw-r--r--devel/gdb6/Makefile1
-rw-r--r--devel/gdb6/pkg-comment1
-rw-r--r--devel/gdb66/Makefile1
-rw-r--r--devel/gdb66/pkg-comment1
-rw-r--r--devel/gengameng/Makefile1
-rw-r--r--devel/gengameng/pkg-comment1
-rw-r--r--devel/gide/Makefile1
-rw-r--r--devel/gide/pkg-comment1
-rw-r--r--devel/glade/Makefile1
-rw-r--r--devel/glade/pkg-comment1
-rw-r--r--devel/glade2/Makefile1
-rw-r--r--devel/glade2/pkg-comment1
-rw-r--r--devel/glib12/Makefile1
-rw-r--r--devel/glib12/pkg-comment1
-rw-r--r--devel/glib20/Makefile1
-rw-r--r--devel/glib20/pkg-comment1
-rw-r--r--devel/gnome-build/Makefile1
-rw-r--r--devel/gnome-build/pkg-comment1
-rw-r--r--devel/gnome-common/Makefile1
-rw-r--r--devel/gnome-common/pkg-comment1
-rw-r--r--devel/gnome-crash/Makefile1
-rw-r--r--devel/gnome-crash/pkg-comment1
-rw-r--r--devel/gnome-devel/Makefile1
-rw-r--r--devel/gnome-devel/pkg-comment1
-rw-r--r--devel/gnome-vfs/Makefile1
-rw-r--r--devel/gnome-vfs/pkg-comment1
-rw-r--r--devel/gnome2-devel/Makefile1
-rw-r--r--devel/gnome2-devel/pkg-comment1
-rw-r--r--devel/gnomebuild/Makefile1
-rw-r--r--devel/gnomebuild/pkg-comment1
-rw-r--r--devel/gnomecommon/Makefile1
-rw-r--r--devel/gnomecommon/pkg-comment1
-rw-r--r--devel/gnomecrash/Makefile1
-rw-r--r--devel/gnomecrash/pkg-comment1
-rw-r--r--devel/gnomedebug/Makefile1
-rw-r--r--devel/gnomedebug/pkg-comment1
-rw-r--r--devel/gnomevfs2/Makefile1
-rw-r--r--devel/gnomevfs2/pkg-comment1
-rw-r--r--devel/gnu-libtool/Makefile1
-rw-r--r--devel/gnu-libtool/pkg-comment1
-rw-r--r--devel/gob2/Makefile1
-rw-r--r--devel/gob2/pkg-comment1
-rw-r--r--devel/gtranslator/Makefile1
-rw-r--r--devel/gtranslator/pkg-comment1
-rw-r--r--devel/hp48cc/Makefile1
-rw-r--r--devel/hp48cc/pkg-comment1
-rw-r--r--devel/idlefork/Makefile1
-rw-r--r--devel/idlefork/pkg-comment1
-rw-r--r--devel/imake-4/Makefile1
-rw-r--r--devel/imake-4/pkg-comment1
-rw-r--r--devel/imake/Makefile1
-rw-r--r--devel/imake/pkg-comment1
-rw-r--r--devel/jakarta-ant/Makefile1
-rw-r--r--devel/jakarta-ant/pkg-comment1
-rw-r--r--devel/kaptain/Makefile1
-rw-r--r--devel/kaptain/pkg-comment1
-rw-r--r--devel/kdbg/Makefile1
-rw-r--r--devel/kdbg/pkg-comment1
-rw-r--r--devel/kdesdk3/Makefile1
-rw-r--r--devel/kdesdk3/pkg-comment1
-rw-r--r--devel/kdesdk4/Makefile1
-rw-r--r--devel/kdesdk4/pkg-comment1
-rw-r--r--devel/kdevelop/Makefile1
-rw-r--r--devel/kdevelop/pkg-comment1
-rw-r--r--devel/kelp/Makefile1
-rw-r--r--devel/kelp/pkg-comment1
-rw-r--r--devel/kimwitu/Makefile1
-rw-r--r--devel/kimwitu/pkg-comment1
-rw-r--r--devel/lemon/Makefile1
-rw-r--r--devel/lemon/pkg-comment1
-rw-r--r--devel/libIDL/Makefile1
-rw-r--r--devel/libIDL/pkg-comment1
-rw-r--r--devel/libPropList/Makefile1
-rw-r--r--devel/libPropList/pkg-comment1
-rw-r--r--devel/libbonobo/Makefile1
-rw-r--r--devel/libbonobo/pkg-comment1
-rw-r--r--devel/libcapsinetwork/Makefile1
-rw-r--r--devel/libcapsinetwork/pkg-comment1
-rw-r--r--devel/libcoro/Makefile1
-rw-r--r--devel/libcoro/pkg-comment1
-rw-r--r--devel/libdlmalloc/Makefile1
-rw-r--r--devel/libdlmalloc/pkg-comment1
-rw-r--r--devel/libevent/Makefile1
-rw-r--r--devel/libevent/pkg-comment1
-rw-r--r--devel/libglade/Makefile1
-rw-r--r--devel/libglade/pkg-comment1
-rw-r--r--devel/libglade2/Makefile1
-rw-r--r--devel/libglade2/pkg-comment1
-rw-r--r--devel/libgsf/Makefile1
-rw-r--r--devel/libgsf/pkg-comment1
-rw-r--r--devel/libgtop/Makefile1
-rw-r--r--devel/libgtop/pkg-comment1
-rw-r--r--devel/libgtop2/Makefile1
-rw-r--r--devel/libgtop2/pkg-comment1
-rw-r--r--devel/libole2/Makefile1
-rw-r--r--devel/libole2/pkg-comment1
-rw-r--r--devel/libpdel/Makefile1
-rw-r--r--devel/libpdel/pkg-comment1
-rw-r--r--devel/libredblack/Makefile1
-rw-r--r--devel/libredblack/pkg-comment1
-rw-r--r--devel/libsigc++/Makefile1
-rw-r--r--devel/libsigc++/pkg-comment1
-rw-r--r--devel/libsigc++12/Makefile1
-rw-r--r--devel/libsigc++12/pkg-comment1
-rw-r--r--devel/libsigc++20/Makefile1
-rw-r--r--devel/libsigc++20/pkg-comment1
-rw-r--r--devel/libsoup/Makefile1
-rw-r--r--devel/libsoup/pkg-comment1
-rw-r--r--devel/libsoup22/Makefile1
-rw-r--r--devel/libsoup22/pkg-comment1
-rw-r--r--devel/libstocks/Makefile1
-rw-r--r--devel/libstocks/pkg-comment1
-rw-r--r--devel/libtar/Makefile1
-rw-r--r--devel/libtar/pkg-comment1
-rw-r--r--devel/libtool/Makefile1
-rw-r--r--devel/libtool/pkg-comment1
-rw-r--r--devel/libtool13/Makefile1
-rw-r--r--devel/libtool13/pkg-comment1
-rw-r--r--devel/libtool14/Makefile1
-rw-r--r--devel/libtool14/pkg-comment1
-rw-r--r--devel/libtool15/Makefile1
-rw-r--r--devel/libtool15/pkg-comment1
-rw-r--r--devel/libunicode/Makefile1
-rw-r--r--devel/libunicode/pkg-comment1
-rw-r--r--devel/lincvs/Makefile1
-rw-r--r--devel/lincvs/pkg-comment1
-rw-r--r--devel/linux-runrev/Makefile1
-rw-r--r--devel/linux-runrev/pkg-comment1
-rw-r--r--devel/linux_kdump/Makefile1
-rw-r--r--devel/linux_kdump/pkg-comment1
-rw-r--r--devel/linuxthreads/Makefile1
-rw-r--r--devel/linuxthreads/pkg-comment1
-rw-r--r--devel/makeplus/Makefile1
-rw-r--r--devel/makeplus/pkg-comment1
-rw-r--r--devel/memcheck/Makefile1
-rw-r--r--devel/memcheck/pkg-comment1
-rw-r--r--devel/mico/Makefile1
-rw-r--r--devel/mico/pkg-comment1
-rw-r--r--devel/mime/Makefile1
-rw-r--r--devel/mime/pkg-comment1
-rw-r--r--devel/mkmf/Makefile1
-rw-r--r--devel/mkmf/pkg-comment1
-rw-r--r--devel/moonshine/Makefile1
-rw-r--r--devel/moonshine/pkg-comment1
-rw-r--r--devel/nasm/Makefile1
-rw-r--r--devel/nasm/pkg-comment1
-rw-r--r--devel/noweb/Makefile1
-rw-r--r--devel/noweb/pkg-comment1
-rw-r--r--devel/nspr/Makefile1
-rw-r--r--devel/nspr/pkg-comment1
-rw-r--r--devel/oaf/Makefile1
-rw-r--r--devel/oaf/pkg-comment1
-rw-r--r--devel/ocamlweb/Makefile1
-rw-r--r--devel/ocamlweb/pkg-comment1
-rw-r--r--devel/omniORB/Makefile1
-rw-r--r--devel/omniORB/pkg-comment1
-rw-r--r--devel/ossp-al/Makefile1
-rw-r--r--devel/ossp-al/pkg-comment1
-rw-r--r--devel/ossp-cfg/Makefile1
-rw-r--r--devel/ossp-cfg/pkg-comment1
-rw-r--r--devel/ossp-ex/Makefile1
-rw-r--r--devel/ossp-ex/pkg-comment1
-rw-r--r--devel/ossp-l2/Makefile1
-rw-r--r--devel/ossp-l2/pkg-comment1
-rw-r--r--devel/ossp-val/Makefile1
-rw-r--r--devel/ossp-val/pkg-comment1
-rw-r--r--devel/ossp-var/Makefile1
-rw-r--r--devel/ossp-var/pkg-comment1
-rw-r--r--devel/p5-Algorithm-Diff/Makefile1
-rw-r--r--devel/p5-Algorithm-Diff/pkg-comment1
-rw-r--r--devel/p5-Algorithm-Permute/Makefile1
-rw-r--r--devel/p5-Algorithm-Permute/pkg-comment1
-rw-r--r--devel/p5-AtExit/Makefile1
-rw-r--r--devel/p5-AtExit/pkg-comment1
-rw-r--r--devel/p5-BSD-stat/Makefile1
-rw-r--r--devel/p5-BSD-stat/pkg-comment1
-rw-r--r--devel/p5-Cache-Cache/Makefile1
-rw-r--r--devel/p5-Cache-Cache/pkg-comment1
-rw-r--r--devel/p5-Carp-Assert/Makefile1
-rw-r--r--devel/p5-Carp-Assert/pkg-comment1
-rw-r--r--devel/p5-Class-Accessor/Makefile1
-rw-r--r--devel/p5-Class-Accessor/pkg-comment1
-rw-r--r--devel/p5-Class-ArrayObjects/Makefile1
-rw-r--r--devel/p5-Class-ArrayObjects/pkg-comment1
-rw-r--r--devel/p5-Class-Autouse/Makefile1
-rw-r--r--devel/p5-Class-Autouse/pkg-comment1
-rw-r--r--devel/p5-Class-BlackHole/Makefile1
-rw-r--r--devel/p5-Class-BlackHole/pkg-comment1
-rw-r--r--devel/p5-Class-Contract/Makefile1
-rw-r--r--devel/p5-Class-Contract/pkg-comment1
-rw-r--r--devel/p5-Class-Data-Inheritable/Makefile1
-rw-r--r--devel/p5-Class-Data-Inheritable/pkg-comment1
-rw-r--r--devel/p5-Class-Date/Makefile1
-rw-r--r--devel/p5-Class-Date/pkg-comment1
-rw-r--r--devel/p5-Class-Default/Makefile1
-rw-r--r--devel/p5-Class-Default/pkg-comment1
-rw-r--r--devel/p5-Class-Delegation/Makefile1
-rw-r--r--devel/p5-Class-Delegation/pkg-comment1
-rw-r--r--devel/p5-Class-Factory-Util/Makefile1
-rw-r--r--devel/p5-Class-Factory-Util/pkg-comment1
-rw-r--r--devel/p5-Class-Factory/Makefile1
-rw-r--r--devel/p5-Class-Factory/pkg-comment1
-rw-r--r--devel/p5-Class-ISA/Makefile1
-rw-r--r--devel/p5-Class-ISA/pkg-comment1
-rw-r--r--devel/p5-Class-Inner/Makefile1
-rw-r--r--devel/p5-Class-Inner/pkg-comment1
-rw-r--r--devel/p5-Class-Inspector/Makefile1
-rw-r--r--devel/p5-Class-Inspector/pkg-comment1
-rw-r--r--devel/p5-Class-Loader/Makefile1
-rw-r--r--devel/p5-Class-Loader/pkg-comment1
-rw-r--r--devel/p5-Class-Tangram/Makefile1
-rw-r--r--devel/p5-Class-Tangram/pkg-comment1
-rw-r--r--devel/p5-Class-Tom/Makefile1
-rw-r--r--devel/p5-Class-Tom/pkg-comment1
-rw-r--r--devel/p5-Class-Trigger/Makefile1
-rw-r--r--devel/p5-Class-Trigger/pkg-comment1
-rw-r--r--devel/p5-Class-WhiteHole/Makefile1
-rw-r--r--devel/p5-Class-WhiteHole/pkg-comment1
-rw-r--r--devel/p5-Clone/Makefile1
-rw-r--r--devel/p5-Clone/pkg-comment1
-rw-r--r--devel/p5-Config-General/Makefile1
-rw-r--r--devel/p5-Config-General/pkg-comment1
-rw-r--r--devel/p5-Config-Setting/Makefile1
-rw-r--r--devel/p5-Config-Setting/pkg-comment1
-rw-r--r--devel/p5-Coro/Makefile1
-rw-r--r--devel/p5-Coro/pkg-comment1
-rw-r--r--devel/p5-Curses-Widgets/Makefile1
-rw-r--r--devel/p5-Curses-Widgets/pkg-comment1
-rw-r--r--devel/p5-Data-Compare/Makefile1
-rw-r--r--devel/p5-Data-Compare/pkg-comment1
-rw-r--r--devel/p5-Data-Flow/Makefile1
-rw-r--r--devel/p5-Data-Flow/pkg-comment1
-rw-r--r--devel/p5-Data-Serializer/Makefile1
-rw-r--r--devel/p5-Data-Serializer/pkg-comment1
-rw-r--r--devel/p5-Data-UUID/Makefile1
-rw-r--r--devel/p5-Data-UUID/pkg-comment1
-rw-r--r--devel/p5-Date-Leapyear/Makefile1
-rw-r--r--devel/p5-Date-Leapyear/pkg-comment1
-rw-r--r--devel/p5-Devel-Constants/Makefile1
-rw-r--r--devel/p5-Devel-Constants/pkg-comment1
-rw-r--r--devel/p5-Devel-Leak/Makefile1
-rw-r--r--devel/p5-Devel-Leak/pkg-comment1
-rw-r--r--devel/p5-Devel-Modlist/Makefile1
-rw-r--r--devel/p5-Devel-Modlist/pkg-comment1
-rw-r--r--devel/p5-Devel-ObjectTracker/Makefile1
-rw-r--r--devel/p5-Devel-ObjectTracker/pkg-comment1
-rw-r--r--devel/p5-Devel-Profiler/Makefile1
-rw-r--r--devel/p5-Devel-Profiler/pkg-comment1
-rw-r--r--devel/p5-Devel-ptkdb/Makefile1
-rw-r--r--devel/p5-Devel-ptkdb/pkg-comment1
-rw-r--r--devel/p5-Dialog/Makefile1
-rw-r--r--devel/p5-Dialog/pkg-comment1
-rw-r--r--devel/p5-Errno/Makefile1
-rw-r--r--devel/p5-Errno/pkg-comment1
-rw-r--r--devel/p5-File-Lock/Makefile1
-rw-r--r--devel/p5-File-Lock/pkg-comment1
-rw-r--r--devel/p5-File-NFSLock/Makefile1
-rw-r--r--devel/p5-File-NFSLock/pkg-comment1
-rw-r--r--devel/p5-File-ReadBackwards/Makefile1
-rw-r--r--devel/p5-File-ReadBackwards/pkg-comment1
-rw-r--r--devel/p5-File-Spec/Makefile1
-rw-r--r--devel/p5-File-Spec/pkg-comment1
-rw-r--r--devel/p5-File-Temp/Makefile1
-rw-r--r--devel/p5-File-Temp/pkg-comment1
-rw-r--r--devel/p5-File-Tools/Makefile1
-rw-r--r--devel/p5-File-Tools/pkg-comment1
-rw-r--r--devel/p5-Filter-CBC/Makefile1
-rw-r--r--devel/p5-Filter-CBC/pkg-comment1
-rw-r--r--devel/p5-Getopt-Declare/Makefile1
-rw-r--r--devel/p5-Getopt-Declare/pkg-comment1
-rw-r--r--devel/p5-Getopt-Long/Makefile1
-rw-r--r--devel/p5-Getopt-Long/pkg-comment1
-rw-r--r--devel/p5-IO-Multiplex/Makefile1
-rw-r--r--devel/p5-IO-Multiplex/pkg-comment1
-rw-r--r--devel/p5-IO-String/Makefile1
-rw-r--r--devel/p5-IO-String/pkg-comment1
-rw-r--r--devel/p5-IPC-Locker/Makefile1
-rw-r--r--devel/p5-IPC-Locker/pkg-comment1
-rw-r--r--devel/p5-IPC-Run/Makefile1
-rw-r--r--devel/p5-IPC-Run/pkg-comment1
-rw-r--r--devel/p5-IPC-Shareable/Makefile1
-rw-r--r--devel/p5-IPC-Shareable/pkg-comment1
-rw-r--r--devel/p5-Locale-PGetText/Makefile1
-rw-r--r--devel/p5-Locale-PGetText/pkg-comment1
-rw-r--r--devel/p5-Locale-gettext/Makefile1
-rw-r--r--devel/p5-Locale-gettext/pkg-comment1
-rw-r--r--devel/p5-Memoize/Makefile1
-rw-r--r--devel/p5-Memoize/pkg-comment1
-rw-r--r--devel/p5-ORBit/Makefile1
-rw-r--r--devel/p5-ORBit/pkg-comment1
-rw-r--r--devel/p5-POE-Component-Client-DNS/Makefile1
-rw-r--r--devel/p5-POE-Component-Client-DNS/pkg-comment1
-rw-r--r--devel/p5-POE-Component-Client-HTTP/Makefile1
-rw-r--r--devel/p5-POE-Component-Client-HTTP/pkg-comment1
-rw-r--r--devel/p5-POE-Component-Client-POP3/Makefile1
-rw-r--r--devel/p5-POE-Component-Client-POP3/pkg-comment1
-rw-r--r--devel/p5-POE-Component-DBIAgent/Makefile1
-rw-r--r--devel/p5-POE-Component-DBIAgent/pkg-comment1
-rw-r--r--devel/p5-POE-Component-DirWatch/Makefile1
-rw-r--r--devel/p5-POE-Component-DirWatch/pkg-comment1
-rw-r--r--devel/p5-POE-Component-Logger/Makefile1
-rw-r--r--devel/p5-POE-Component-Logger/pkg-comment1
-rw-r--r--devel/p5-POE-Session-Cascading/Makefile1
-rw-r--r--devel/p5-POE-Session-Cascading/pkg-comment1
-rw-r--r--devel/p5-PathTools/Makefile1
-rw-r--r--devel/p5-PathTools/pkg-comment1
-rw-r--r--devel/p5-Proc-Background/Makefile1
-rw-r--r--devel/p5-Proc-Background/pkg-comment1
-rw-r--r--devel/p5-Proc-PIDFile/Makefile1
-rw-r--r--devel/p5-Proc-PIDFile/pkg-comment1
-rw-r--r--devel/p5-Proc-Simple/Makefile1
-rw-r--r--devel/p5-Proc-Simple/pkg-comment1
-rw-r--r--devel/p5-Rcs-Agent/Makefile1
-rw-r--r--devel/p5-Rcs-Agent/pkg-comment1
-rw-r--r--devel/p5-Rcs/Makefile1
-rw-r--r--devel/p5-Rcs/pkg-comment1
-rw-r--r--devel/p5-ReadLine-Gnu/Makefile1
-rw-r--r--devel/p5-ReadLine-Gnu/pkg-comment1
-rw-r--r--devel/p5-ReadLine-Perl/Makefile1
-rw-r--r--devel/p5-ReadLine-Perl/pkg-comment1
-rw-r--r--devel/p5-Resources/Makefile1
-rw-r--r--devel/p5-Resources/pkg-comment1
-rw-r--r--devel/p5-SPOPS/Makefile1
-rw-r--r--devel/p5-SPOPS/pkg-comment1
-rw-r--r--devel/p5-Search-Binary/Makefile1
-rw-r--r--devel/p5-Search-Binary/pkg-comment1
-rw-r--r--devel/p5-Server-FastPL/Makefile1
-rw-r--r--devel/p5-Server-FastPL/pkg-comment1
-rw-r--r--devel/p5-Set-NestedGroups/Makefile1
-rw-r--r--devel/p5-Set-NestedGroups/pkg-comment1
-rw-r--r--devel/p5-Set-Object/Makefile1
-rw-r--r--devel/p5-Set-Object/pkg-comment1
-rw-r--r--devel/p5-Set-Scalar/Makefile1
-rw-r--r--devel/p5-Set-Scalar/pkg-comment1
-rw-r--r--devel/p5-Sort-Versions/Makefile1
-rw-r--r--devel/p5-Sort-Versions/pkg-comment1
-rw-r--r--devel/p5-Storable/Makefile1
-rw-r--r--devel/p5-Storable/pkg-comment1
-rw-r--r--devel/p5-String-CRC32/Makefile1
-rw-r--r--devel/p5-String-CRC32/pkg-comment1
-rw-r--r--devel/p5-String-Similarity/Makefile1
-rw-r--r--devel/p5-String-Similarity/pkg-comment1
-rw-r--r--devel/p5-System2/Makefile1
-rw-r--r--devel/p5-System2/pkg-comment1
-rw-r--r--devel/p5-Term-Prompt/Makefile1
-rw-r--r--devel/p5-Term-Prompt/pkg-comment1
-rw-r--r--devel/p5-Test-Exception/Makefile1
-rw-r--r--devel/p5-Test-Exception/pkg-comment1
-rw-r--r--devel/p5-Test-Unit/Makefile1
-rw-r--r--devel/p5-Test-Unit/pkg-comment1
-rw-r--r--devel/p5-Time-Duration/Makefile1
-rw-r--r--devel/p5-Time-Duration/pkg-comment1
-rw-r--r--devel/p5-Time-HiRes/Makefile1
-rw-r--r--devel/p5-Time-HiRes/pkg-comment1
-rw-r--r--devel/p5-Time-Piece/Makefile1
-rw-r--r--devel/p5-Time-Piece/pkg-comment1
-rw-r--r--devel/p5-Time-modules/Makefile1
-rw-r--r--devel/p5-Time-modules/pkg-comment1
-rw-r--r--devel/patch/Makefile1
-rw-r--r--devel/patch/pkg-comment1
-rw-r--r--devel/pcl-cvs-emacs/Makefile1
-rw-r--r--devel/pcl-cvs-emacs/pkg-comment1
-rw-r--r--devel/pharmacy/Makefile1
-rw-r--r--devel/pharmacy/pkg-comment1
-rw-r--r--devel/pinstall/Makefile1
-rw-r--r--devel/pinstall/pkg-comment1
-rw-r--r--devel/pkg-config/Makefile1
-rw-r--r--devel/pkg-config/pkg-comment1
-rw-r--r--devel/pkgconfig/Makefile1
-rw-r--r--devel/pkgconfig/pkg-comment1
-rw-r--r--devel/pmake/Makefile1
-rw-r--r--devel/pmake/pkg-comment1
-rw-r--r--devel/portlint/Makefile1
-rw-r--r--devel/portlint/pkg-comment1
-rw-r--r--devel/py-coro/Makefile1
-rw-r--r--devel/py-coro/pkg-comment1
-rw-r--r--devel/py-game/Makefile1
-rw-r--r--devel/py-game/pkg-comment1
-rw-r--r--devel/py-grouch/Makefile1
-rw-r--r--devel/py-grouch/pkg-comment1
-rw-r--r--devel/py-htmlkit/Makefile1
-rw-r--r--devel/py-htmlkit/pkg-comment1
-rw-r--r--devel/py-kjbuckets/Makefile1
-rw-r--r--devel/py-kjbuckets/pkg-comment1
-rw-r--r--devel/py-kqueue/Makefile1
-rw-r--r--devel/py-kqueue/pkg-comment1
-rw-r--r--devel/py-optik/Makefile1
-rw-r--r--devel/py-optik/pkg-comment1
-rw-r--r--devel/py-orbit/Makefile1
-rw-r--r--devel/py-orbit/pkg-comment1
-rw-r--r--devel/py-sip/Makefile1
-rw-r--r--devel/py-sip/pkg-comment1
-rw-r--r--devel/py-twisted/Makefile1
-rw-r--r--devel/py-twisted/pkg-comment1
-rw-r--r--devel/pychecker/Makefile1
-rw-r--r--devel/pychecker/pkg-comment1
-rw-r--r--devel/qssl/Makefile1
-rw-r--r--devel/qssl/pkg-comment1
-rw-r--r--devel/qtez/Makefile1
-rw-r--r--devel/qtez/pkg-comment1
-rw-r--r--devel/re2c/Makefile1
-rw-r--r--devel/re2c/pkg-comment1
-rw-r--r--devel/rtplib/Makefile1
-rw-r--r--devel/rtplib/pkg-comment1
-rw-r--r--devel/ruby-aspectr/Makefile1
-rw-r--r--devel/ruby-aspectr/pkg-comment1
-rw-r--r--devel/ruby-inline/Makefile1
-rw-r--r--devel/ruby-inline/pkg-comment1
-rw-r--r--devel/rubygem-inline/Makefile1
-rw-r--r--devel/rubygem-inline/pkg-comment1
-rw-r--r--devel/rvi/Makefile1
-rw-r--r--devel/rvi/pkg-comment1
-rw-r--r--devel/sdcc/Makefile1
-rw-r--r--devel/sdcc/pkg-comment1
-rw-r--r--devel/sdl12/Makefile1
-rw-r--r--devel/sdl12/pkg-comment1
-rw-r--r--devel/sdl_ldbad/Makefile1
-rw-r--r--devel/sdl_ldbad/pkg-comment1
-rw-r--r--devel/simgear/Makefile1
-rw-r--r--devel/simgear/pkg-comment1
-rw-r--r--devel/simulavr/Makefile1
-rw-r--r--devel/simulavr/pkg-comment1
-rw-r--r--devel/sip/Makefile1
-rw-r--r--devel/sip/pkg-comment1
-rw-r--r--devel/soup/Makefile1
-rw-r--r--devel/soup/pkg-comment1
-rw-r--r--devel/sourcenav/Makefile1
-rw-r--r--devel/sourcenav/pkg-comment1
-rw-r--r--devel/st/Makefile1
-rw-r--r--devel/st/pkg-comment1
-rw-r--r--devel/t1lib/Makefile1
-rw-r--r--devel/t1lib/pkg-comment1
-rw-r--r--devel/tcl-memchan/Makefile1
-rw-r--r--devel/tcl-memchan/pkg-comment1
-rw-r--r--devel/tcl-neo/Makefile1
-rw-r--r--devel/tcl-neo/pkg-comment1
-rw-r--r--devel/tcl-trf/Makefile1
-rw-r--r--devel/tcl-trf/pkg-comment1
-rw-r--r--devel/tclgetopts/Makefile1
-rw-r--r--devel/tclgetopts/pkg-comment1
-rw-r--r--devel/tcllib/Makefile1
-rw-r--r--devel/tcllib/pkg-comment1
-rw-r--r--devel/tcltls/Makefile1
-rw-r--r--devel/tcltls/pkg-comment1
-rw-r--r--devel/tdl/Makefile1
-rw-r--r--devel/tdl/pkg-comment1
-rw-r--r--devel/tinyq/Makefile1
-rw-r--r--devel/tinyq/pkg-comment1
-rw-r--r--devel/tkp4/Makefile1
-rw-r--r--devel/tkp4/pkg-comment1
-rw-r--r--devel/tvision/Makefile1
-rw-r--r--devel/tvision/pkg-comment1
-rw-r--r--devel/uclmmbase/Makefile1
-rw-r--r--devel/uclmmbase/pkg-comment1
-rw-r--r--devel/veepee/Makefile1
-rw-r--r--devel/veepee/pkg-comment1
-rw-r--r--devel/zthread/Makefile1
-rw-r--r--devel/zthread/pkg-comment1
-rw-r--r--dns/bind8/Makefile1
-rw-r--r--dns/bind8/pkg-comment1
-rw-r--r--dns/ddclient/Makefile1
-rw-r--r--dns/ddclient/pkg-comment1
-rw-r--r--dns/dnrd/Makefile1
-rw-r--r--dns/dnrd/pkg-comment1
-rw-r--r--dns/dnstop/Makefile1
-rw-r--r--dns/dnstop/pkg-comment1
-rw-r--r--dns/dnswalk/Makefile1
-rw-r--r--dns/dnswalk/pkg-comment1
-rw-r--r--dns/ez-ipupdate/Makefile1
-rw-r--r--dns/ez-ipupdate/pkg-comment1
-rw-r--r--dns/geta/Makefile1
-rw-r--r--dns/geta/pkg-comment1
-rw-r--r--dns/h2n/Makefile1
-rw-r--r--dns/h2n/pkg-comment1
-rw-r--r--dns/host/Makefile1
-rw-r--r--dns/host/pkg-comment1
-rw-r--r--dns/nslint/Makefile1
-rw-r--r--dns/nslint/pkg-comment1
-rw-r--r--dns/p5-Net-DNS-ZoneFile/Makefile1
-rw-r--r--dns/p5-Net-DNS-ZoneFile/pkg-comment1
-rw-r--r--dns/p5-Net-DNS/Makefile1
-rw-r--r--dns/p5-Net-DNS/pkg-comment1
-rw-r--r--dns/p5-POE-Component-Client-DNS/Makefile1
-rw-r--r--dns/p5-POE-Component-Client-DNS/pkg-comment1
-rw-r--r--editors/AbiWord/Makefile1
-rw-r--r--editors/AbiWord/pkg-comment1
-rw-r--r--editors/aee/Makefile1
-rw-r--r--editors/aee/pkg-comment1
-rw-r--r--editors/boiling-egg/Makefile1
-rw-r--r--editors/boiling-egg/pkg-comment1
-rw-r--r--editors/bpatch/Makefile1
-rw-r--r--editors/bpatch/pkg-comment1
-rw-r--r--editors/bvi/Makefile1
-rw-r--r--editors/bvi/pkg-comment1
-rw-r--r--editors/calligra/Makefile1
-rw-r--r--editors/calligra/pkg-comment1
-rw-r--r--editors/color-mate/Makefile1
-rw-r--r--editors/color-mate/pkg-comment1
-rw-r--r--editors/dedit/Makefile1
-rw-r--r--editors/dedit/pkg-comment1
-rw-r--r--editors/emacs20-dl/Makefile1
-rw-r--r--editors/emacs20-dl/pkg-comment1
-rw-r--r--editors/emacs20-mule-devel/Makefile1
-rw-r--r--editors/emacs20-mule-devel/pkg-comment1
-rw-r--r--editors/emacs21/Makefile1
-rw-r--r--editors/emacs21/pkg-comment1
-rw-r--r--editors/eshell-emacs20/Makefile1
-rw-r--r--editors/eshell-emacs20/pkg-comment1
-rw-r--r--editors/fb/Makefile1
-rw-r--r--editors/fb/pkg-comment1
-rw-r--r--editors/gedit/Makefile1
-rw-r--r--editors/gedit/pkg-comment1
-rw-r--r--editors/gedit2/Makefile1
-rw-r--r--editors/gedit2/pkg-comment1
-rw-r--r--editors/ghex/Makefile1
-rw-r--r--editors/ghex/pkg-comment1
-rw-r--r--editors/ghex2/Makefile1
-rw-r--r--editors/ghex2/pkg-comment1
-rw-r--r--editors/glimmer/Makefile1
-rw-r--r--editors/glimmer/pkg-comment1
-rw-r--r--editors/hexedit/Makefile1
-rw-r--r--editors/hexedit/pkg-comment1
-rw-r--r--editors/hexpert/Makefile1
-rw-r--r--editors/hexpert/pkg-comment1
-rw-r--r--editors/hnb/Makefile1
-rw-r--r--editors/hnb/pkg-comment1
-rw-r--r--editors/jedit/Makefile1
-rw-r--r--editors/jedit/pkg-comment1
-rw-r--r--editors/jext/Makefile1
-rw-r--r--editors/jext/pkg-comment1
-rw-r--r--editors/joe-devel/Makefile1
-rw-r--r--editors/koffice-kde3/Makefile1
-rw-r--r--editors/koffice-kde3/pkg-comment1
-rw-r--r--editors/koffice-kde4/Makefile1
-rw-r--r--editors/koffice-kde4/pkg-comment1
-rw-r--r--editors/kxmleditor/Makefile1
-rw-r--r--editors/leim20/Makefile1
-rw-r--r--editors/leim21/Makefile1
-rw-r--r--editors/leo/Makefile1
-rw-r--r--editors/manedit/Makefile1
-rw-r--r--editors/mg/Makefile1
-rw-r--r--editors/mg/pkg-comment1
-rw-r--r--editors/mode-info/Makefile1
-rw-r--r--editors/mode-info/pkg-comment1
-rw-r--r--editors/moleskine/Makefile1
-rw-r--r--editors/moleskine/pkg-comment1
-rw-r--r--editors/muggy/Makefile1
-rw-r--r--editors/muggy/pkg-comment1
-rw-r--r--editors/mule-common/Makefile1
-rw-r--r--editors/mule-common/pkg-comment1
-rw-r--r--editors/nedit/Makefile1
-rw-r--r--editors/nedit/pkg-comment1
-rw-r--r--editors/nvi-devel/Makefile1
-rw-r--r--editors/nvi-devel/pkg-comment1
-rw-r--r--editors/scite/Makefile1
-rw-r--r--editors/scite/pkg-comment1
-rw-r--r--editors/staroffice52/Makefile1
-rw-r--r--editors/staroffice52/pkg-comment1
-rw-r--r--editors/staroffice60/Makefile1
-rw-r--r--editors/staroffice60/pkg-comment1
-rw-r--r--editors/staroffice70/Makefile1
-rw-r--r--editors/staroffice70/pkg-comment1
-rw-r--r--editors/thoteditor/Makefile1
-rw-r--r--editors/thoteditor/pkg-comment1
-rw-r--r--editors/uzap/Makefile1
-rw-r--r--editors/uzap/pkg-comment1
-rw-r--r--editors/ved/Makefile1
-rw-r--r--editors/ved/pkg-comment1
-rw-r--r--editors/vigor/Makefile1
-rw-r--r--editors/vigor/pkg-comment1
-rw-r--r--editors/vim5/Makefile1
-rw-r--r--editors/vim5/pkg-comment1
-rw-r--r--editors/wordperfect/Makefile1
-rw-r--r--editors/wordperfect/pkg-comment1
-rw-r--r--editors/xemacs-additional-packages/Makefile1
-rw-r--r--editors/xemacs-additional-packages/pkg-comment1
-rw-r--r--editors/xemacs-basic-mule-packages/Makefile1
-rw-r--r--editors/xemacs-basic-mule-packages/pkg-comment1
-rw-r--r--editors/xemacs-comm-packages/Makefile1
-rw-r--r--editors/xemacs-comm-packages/pkg-comment1
-rw-r--r--editors/xemacs-games-packages/Makefile1
-rw-r--r--editors/xemacs-games-packages/pkg-comment1
-rw-r--r--editors/xemacs-libs-packages/Makefile1
-rw-r--r--editors/xemacs-libs-packages/pkg-comment1
-rw-r--r--editors/xemacs-mule-packages/Makefile1
-rw-r--r--editors/xemacs-mule-packages/pkg-comment1
-rw-r--r--editors/xemacs-oa-packages/Makefile1
-rw-r--r--editors/xemacs-oa-packages/pkg-comment1
-rw-r--r--editors/xemacs-packages/Makefile1
-rw-r--r--editors/xemacs-packages/pkg-comment1
-rw-r--r--editors/xemacs-prog-packages/Makefile1
-rw-r--r--editors/xemacs-prog-packages/pkg-comment1
-rw-r--r--editors/xemacs-wp-packages/Makefile1
-rw-r--r--editors/xemacs-wp-packages/pkg-comment1
-rw-r--r--editors/xemacs21-sumo/Makefile1
-rw-r--r--editors/xemacs21-sumo/pkg-comment1
-rw-r--r--editors/xenon/Makefile1
-rw-r--r--editors/xenon/pkg-comment1
-rw-r--r--editors/yudit/Makefile1
-rw-r--r--editors/yudit/pkg-comment1
-rw-r--r--emulators/basiliskII/Makefile1
-rw-r--r--emulators/basiliskII/pkg-comment1
-rw-r--r--emulators/bfe/Makefile1
-rw-r--r--emulators/bfe/pkg-comment1
-rw-r--r--emulators/bochs/Makefile1
-rw-r--r--emulators/bochs/pkg-comment1
-rw-r--r--emulators/cingb/Makefile1
-rw-r--r--emulators/cingb/pkg-comment1
-rw-r--r--emulators/cpmtools/Makefile1
-rw-r--r--emulators/cpmtools/pkg-comment1
-rw-r--r--emulators/darcnes/Makefile1
-rw-r--r--emulators/darcnes/pkg-comment1
-rw-r--r--emulators/dgen-sdl/Makefile1
-rw-r--r--emulators/dgen-sdl/pkg-comment1
-rw-r--r--emulators/freesci/Makefile1
-rw-r--r--emulators/freesci/pkg-comment1
-rw-r--r--emulators/gbe/Makefile1
-rw-r--r--emulators/gbe/pkg-comment1
-rw-r--r--emulators/generator/Makefile1
-rw-r--r--emulators/generator/pkg-comment1
-rw-r--r--emulators/gngb/Makefile1
-rw-r--r--emulators/gngb/pkg-comment1
-rw-r--r--emulators/gnuboy/Makefile1
-rw-r--r--emulators/gnuboy/pkg-comment1
-rw-r--r--emulators/gsnes9x/Makefile1
-rw-r--r--emulators/gsnes9x/pkg-comment1
-rw-r--r--emulators/hercules/Makefile1
-rw-r--r--emulators/hercules/pkg-comment1
-rw-r--r--emulators/hfs/Makefile1
-rw-r--r--emulators/hfs/pkg-comment1
-rw-r--r--emulators/hfsutils/Makefile1
-rw-r--r--emulators/hfsutils/pkg-comment1
-rw-r--r--emulators/ines/Makefile1
-rw-r--r--emulators/ines/pkg-comment1
-rw-r--r--emulators/linux-winetools/Makefile1
-rw-r--r--emulators/linux-winetools/pkg-comment1
-rw-r--r--emulators/mastergear/Makefile1
-rw-r--r--emulators/mastergear/pkg-comment1
-rw-r--r--emulators/minivmac/Makefile1
-rw-r--r--emulators/minivmac/pkg-comment1
-rw-r--r--emulators/mtools/Makefile1
-rw-r--r--emulators/mtools/pkg-comment1
-rw-r--r--emulators/osf1_base/Makefile1
-rw-r--r--emulators/osf1_base/pkg-comment1
-rw-r--r--emulators/pcemu/Makefile1
-rw-r--r--emulators/pcemu/pkg-comment1
-rw-r--r--emulators/psim-freebsd/Makefile1
-rw-r--r--emulators/psim-freebsd/pkg-comment1
-rw-r--r--emulators/rtc/Makefile1
-rw-r--r--emulators/rtc/pkg-comment1
-rw-r--r--emulators/sim/Makefile1
-rw-r--r--emulators/sim/pkg-comment1
-rw-r--r--emulators/simh/Makefile1
-rw-r--r--emulators/simh/pkg-comment1
-rw-r--r--emulators/ski/Makefile1
-rw-r--r--emulators/ski/pkg-comment1
-rw-r--r--emulators/snes9x/Makefile1
-rw-r--r--emulators/snes9x/pkg-comment1
-rw-r--r--emulators/tkhfs/Makefile1
-rw-r--r--emulators/tkhfs/pkg-comment1
-rw-r--r--emulators/tuxnes/Makefile1
-rw-r--r--emulators/tuxnes/pkg-comment1
-rw-r--r--emulators/vgb/Makefile1
-rw-r--r--emulators/vgb/pkg-comment1
-rw-r--r--emulators/visualos/Makefile1
-rw-r--r--emulators/visualos/pkg-comment1
-rw-r--r--emulators/vmsbackup/Makefile1
-rw-r--r--emulators/vmsbackup/pkg-comment1
-rw-r--r--emulators/vpce/Makefile1
-rw-r--r--emulators/vpce/pkg-comment1
-rw-r--r--emulators/wine-devel/Makefile1
-rw-r--r--emulators/wine-devel/pkg-comment1
-rw-r--r--emulators/wine/Makefile1
-rw-r--r--emulators/wine/pkg-comment1
-rw-r--r--emulators/winetools/Makefile1
-rw-r--r--emulators/winetools/pkg-comment1
-rw-r--r--emulators/xzx/Makefile1
-rw-r--r--emulators/xzx/pkg-comment1
-rw-r--r--finance/emma/Makefile1
-rw-r--r--finance/emma/pkg-comment1
-rw-r--r--finance/gnomepm/Makefile1
-rw-r--r--finance/gnomepm/pkg-comment1
-rw-r--r--finance/gnucash-devel/Makefile1
-rw-r--r--finance/gnucash-devel/pkg-comment1
-rw-r--r--finance/gnucash/Makefile1
-rw-r--r--finance/gnucash/pkg-comment1
-rw-r--r--finance/libstocks/Makefile1
-rw-r--r--finance/libstocks/pkg-comment1
-rw-r--r--finance/p5-Business-CreditCard/Makefile1
-rw-r--r--finance/p5-Business-CreditCard/pkg-comment1
-rw-r--r--finance/p5-Finance-Quote/Makefile1
-rw-r--r--finance/p5-Finance-Quote/pkg-comment1
-rw-r--r--finance/xquote/Makefile1
-rw-r--r--finance/xquote/pkg-comment1
-rw-r--r--french/daCode/Makefile1
-rw-r--r--french/daCode/pkg-comment1
-rw-r--r--french/kde3-i18n/Makefile1
-rw-r--r--french/kde3-i18n/pkg-comment1
-rw-r--r--french/kde4-l10n/Makefile1
-rw-r--r--french/kde4-l10n/pkg-comment1
-rw-r--r--french/spip/Makefile1
-rw-r--r--french/spip/pkg-comment1
-rw-r--r--french/staroffice52/Makefile1
-rw-r--r--french/staroffice52/pkg-comment1
-rw-r--r--ftp/axyftp/Makefile1
-rw-r--r--ftp/axyftp/pkg-comment1
-rw-r--r--ftp/bftpd/Makefile1
-rw-r--r--ftp/bftpd/pkg-comment1
-rw-r--r--ftp/emacs-wget/Makefile1
-rw-r--r--ftp/emacs-wget/pkg-comment1
-rw-r--r--ftp/gtm/Makefile1
-rw-r--r--ftp/gtm/pkg-comment1
-rw-r--r--ftp/jftpgw/Makefile1
-rw-r--r--ftp/jftpgw/pkg-comment1
-rw-r--r--ftp/llnlxdir/Makefile1
-rw-r--r--ftp/llnlxdir/pkg-comment1
-rw-r--r--ftp/llnlxftp/Makefile1
-rw-r--r--ftp/llnlxftp/pkg-comment1
-rw-r--r--ftp/lukemftp/Makefile1
-rw-r--r--ftp/lukemftp/pkg-comment1
-rw-r--r--ftp/ncftp/Makefile1
-rw-r--r--ftp/ncftp/pkg-comment1
-rw-r--r--ftp/ncftp1/Makefile1
-rw-r--r--ftp/ncftp1/pkg-comment1
-rw-r--r--ftp/ncftp3/Makefile1
-rw-r--r--ftp/ncftp3/pkg-comment1
-rw-r--r--ftp/oftpd/Makefile1
-rw-r--r--ftp/oftpd/pkg-comment1
-rw-r--r--ftp/omi/Makefile1
-rw-r--r--ftp/omi/pkg-comment1
-rw-r--r--ftp/p5-Net-FTPServer/Makefile1
-rw-r--r--ftp/p5-Net-FTPServer/pkg-comment1
-rw-r--r--ftp/p5-POE-Component-Client-FTP/Makefile1
-rw-r--r--ftp/p5-POE-Component-Client-FTP/pkg-comment1
-rw-r--r--ftp/paraget/Makefile1
-rw-r--r--ftp/paraget/pkg-comment1
-rw-r--r--ftp/proftpd-devel/Makefile1
-rw-r--r--ftp/proftpd-devel/pkg-comment1
-rw-r--r--ftp/proftpd/Makefile1
-rw-r--r--ftp/proftpd/pkg-comment1
-rw-r--r--ftp/sftp/Makefile1
-rw-r--r--ftp/sftp/pkg-comment1
-rw-r--r--ftp/spegla/Makefile1
-rw-r--r--ftp/spegla/pkg-comment1
-rw-r--r--ftp/wu-ftpd+ipv6/Makefile1
-rw-r--r--ftp/wu-ftpd+ipv6/pkg-comment1
-rw-r--r--ftp/wu-ftpd/Makefile1
-rw-r--r--ftp/wu-ftpd/pkg-comment1
-rw-r--r--games/abuse/Makefile1
-rw-r--r--games/abuse/pkg-comment1
-rw-r--r--games/abuse_sdl/Makefile1
-rw-r--r--games/abuse_sdl/pkg-comment1
-rw-r--r--games/acm/Makefile1
-rw-r--r--games/acm/pkg-comment1
-rw-r--r--games/amphetamine/Makefile1
-rw-r--r--games/amphetamine/pkg-comment1
-rw-r--r--games/angband/Makefile1
-rw-r--r--games/angband/pkg-comment1
-rw-r--r--games/asc/Makefile1
-rw-r--r--games/asc/pkg-comment1
-rw-r--r--games/atomix/Makefile1
-rw-r--r--games/atomix/pkg-comment1
-rw-r--r--games/awele/Makefile1
-rw-r--r--games/awele/pkg-comment1
-rw-r--r--games/bomberinstinct/Makefile1
-rw-r--r--games/bomberinstinct/pkg-comment1
-rw-r--r--games/bombermaze/Makefile1
-rw-r--r--games/bombermaze/pkg-comment1
-rw-r--r--games/burgerspace/Makefile1
-rw-r--r--games/burgerspace/pkg-comment1
-rw-r--r--games/clanbomber/Makefile1
-rw-r--r--games/clanbomber/pkg-comment1
-rw-r--r--games/corewars/Makefile1
-rw-r--r--games/corewars/pkg-comment1
-rw-r--r--games/cosmo/Makefile1
-rw-r--r--games/cosmo/pkg-comment1
-rw-r--r--games/cowsay/Makefile1
-rw-r--r--games/cowsay/pkg-comment1
-rw-r--r--games/criticalmass/Makefile1
-rw-r--r--games/criticalmass/pkg-comment1
-rw-r--r--games/digger-vgl/Makefile1
-rw-r--r--games/digger-vgl/pkg-comment1
-rw-r--r--games/doom/Makefile1
-rw-r--r--games/doom/pkg-comment1
-rw-r--r--games/eboard/Makefile1
-rw-r--r--games/eboard/pkg-comment1
-rw-r--r--games/etuxracer/Makefile1
-rw-r--r--games/etuxracer/pkg-comment1
-rw-r--r--games/falconseye/Makefile1
-rw-r--r--games/falconseye/pkg-comment1
-rw-r--r--games/farblazer/Makefile1
-rw-r--r--games/farblazer/pkg-comment1
-rw-r--r--games/fgfs-base/Makefile1
-rw-r--r--games/fgfs-base/pkg-comment1
-rw-r--r--games/fkiss/Makefile1
-rw-r--r--games/fkiss/pkg-comment1
-rw-r--r--games/flightgear-data/Makefile1
-rw-r--r--games/flightgear-data/pkg-comment1
-rw-r--r--games/flightgear/Makefile1
-rw-r--r--games/flightgear/pkg-comment1
-rw-r--r--games/frabs/Makefile1
-rw-r--r--games/frabs/pkg-comment1
-rw-r--r--games/freesci/Makefile1
-rw-r--r--games/freesci/pkg-comment1
-rw-r--r--games/fsgs/Makefile1
-rw-r--r--games/fsgs/pkg-comment1
-rw-r--r--games/gcompris/Makefile1
-rw-r--r--games/gcompris/pkg-comment1
-rw-r--r--games/gcompris2/Makefile1
-rw-r--r--games/gcompris2/pkg-comment1
-rw-r--r--games/glchess/Makefile1
-rw-r--r--games/glchess/pkg-comment1
-rw-r--r--games/gma/Makefile1
-rw-r--r--games/gma/pkg-comment1
-rw-r--r--games/gniffel/Makefile1
-rw-r--r--games/gniffel/pkg-comment1
-rw-r--r--games/gnome-games/Makefile1
-rw-r--r--games/gnome-games/pkg-comment1
-rw-r--r--games/gnomechess/Makefile1
-rw-r--r--games/gnomechess/pkg-comment1
-rw-r--r--games/gnomegames/Makefile1
-rw-r--r--games/gnomegames/pkg-comment1
-rw-r--r--games/gnomegames2/Makefile1
-rw-r--r--games/gnomegames2/pkg-comment1
-rw-r--r--games/gnomermind/Makefile1
-rw-r--r--games/gnomermind/pkg-comment1
-rw-r--r--games/gnomoku/Makefile1
-rw-r--r--games/gnomoku/pkg-comment1
-rw-r--r--games/gnushogi/Makefile1
-rw-r--r--games/gnushogi/pkg-comment1
-rw-r--r--games/golddig/Makefile1
-rw-r--r--games/golddig/pkg-comment1
-rw-r--r--games/grubinvaders/Makefile1
-rw-r--r--games/grubinvaders/pkg-comment1
-rw-r--r--games/gtkabale/Makefile1
-rw-r--r--games/gtkabale/pkg-comment1
-rw-r--r--games/gtktetcolor/Makefile1
-rw-r--r--games/gtktetcolor/pkg-comment1
-rw-r--r--games/halflifeserver/Makefile1
-rw-r--r--games/halflifeserver/pkg-comment1
-rw-r--r--games/heroes/Makefile1
-rw-r--r--games/heroes/pkg-comment1
-rw-r--r--games/icebreaker/Makefile1
-rw-r--r--games/icebreaker/pkg-comment1
-rw-r--r--games/inform/Makefile1
-rw-r--r--games/inform/pkg-comment1
-rw-r--r--games/jetpack/Makefile1
-rw-r--r--games/jetpack/pkg-comment1
-rw-r--r--games/jzip/Makefile1
-rw-r--r--games/jzip/pkg-comment1
-rw-r--r--games/kdegames3/Makefile1
-rw-r--r--games/kdegames3/pkg-comment1
-rw-r--r--games/kdegames4/Makefile1
-rw-r--r--games/kdegames4/pkg-comment1
-rw-r--r--games/lbreakout/Makefile1
-rw-r--r--games/lbreakout/pkg-comment1
-rw-r--r--games/linux-q3ademo/Makefile1
-rw-r--r--games/linux-q3ademo/pkg-comment1
-rw-r--r--games/linux-quake3-demo/Makefile1
-rw-r--r--games/linux-quake3-demo/pkg-comment1
-rw-r--r--games/linux-quake3/Makefile1
-rw-r--r--games/linux-quake3/pkg-comment1
-rw-r--r--games/ltris/Makefile1
-rw-r--r--games/ltris/pkg-comment1
-rw-r--r--games/maelstrom/Makefile1
-rw-r--r--games/maelstrom/pkg-comment1
-rw-r--r--games/mindguard/Makefile1
-rw-r--r--games/mindguard/pkg-comment1
-rw-r--r--games/mythserver/Makefile1
-rw-r--r--games/mythserver/pkg-comment1
-rw-r--r--games/netrek-BRMH-bin/Makefile1
-rw-r--r--games/netrek-BRMH-bin/pkg-comment1
-rw-r--r--games/netrek-COW3-bin/Makefile1
-rw-r--r--games/netrek-COW3-bin/pkg-comment1
-rw-r--r--games/newvox/Makefile1
-rw-r--r--games/newvox/pkg-comment1
-rw-r--r--games/nil/Makefile1
-rw-r--r--games/nil/pkg-comment1
-rw-r--r--games/pengpong/Makefile1
-rw-r--r--games/pengpong/pkg-comment1
-rw-r--r--games/pysol/Makefile1
-rw-r--r--games/pysol/pkg-comment1
-rw-r--r--games/q3-paks/Makefile1
-rw-r--r--games/q3-paks/pkg-comment1
-rw-r--r--games/q3server/Makefile1
-rw-r--r--games/q3server/pkg-comment1
-rw-r--r--games/qgo/Makefile1
-rw-r--r--games/qgo/pkg-comment1
-rw-r--r--games/qix/Makefile1
-rw-r--r--games/qix/pkg-comment1
-rw-r--r--games/qkmj/Makefile1
-rw-r--r--games/qkmj/pkg-comment1
-rw-r--r--games/qstat/Makefile1
-rw-r--r--games/qstat/pkg-comment1
-rw-r--r--games/quake3-data/Makefile1
-rw-r--r--games/quake3-data/pkg-comment1
-rw-r--r--games/robocode/Makefile1
-rw-r--r--games/robocode/pkg-comment1
-rw-r--r--games/rt2-demo/Makefile1
-rw-r--r--games/rt2-demo/pkg-comment1
-rw-r--r--games/rtcw-paks/Makefile1
-rw-r--r--games/rtcw-paks/pkg-comment1
-rw-r--r--games/rtcw/Makefile1
-rw-r--r--games/rtcw/pkg-comment1
-rw-r--r--games/scorched3d-devel/Makefile1
-rw-r--r--games/scorched3d-devel/pkg-comment1
-rw-r--r--games/scorched3d/Makefile1
-rw-r--r--games/scorched3d/pkg-comment1
-rw-r--r--games/sdlroids/Makefile1
-rw-r--r--games/sdlroids/pkg-comment1
-rw-r--r--games/seahaven/Makefile1
-rw-r--r--games/seahaven/pkg-comment1
-rw-r--r--games/solarwolf/Makefile1
-rw-r--r--games/solarwolf/pkg-comment1
-rw-r--r--games/speyes/Makefile1
-rw-r--r--games/speyes/pkg-comment1
-rw-r--r--games/stvef-paks/Makefile1
-rw-r--r--games/stvef-paks/pkg-comment1
-rw-r--r--games/stvef-server/Makefile1
-rw-r--r--games/stvef-server/pkg-comment1
-rw-r--r--games/tads/Makefile1
-rw-r--r--games/tads/pkg-comment1
-rw-r--r--games/teg/Makefile1
-rw-r--r--games/teg/pkg-comment1
-rw-r--r--games/tksol/Makefile1
-rw-r--r--games/tksol/pkg-comment1
-rw-r--r--games/tome/Makefile1
-rw-r--r--games/tome/pkg-comment1
-rw-r--r--games/ttraffic/Makefile1
-rw-r--r--games/ttraffic/pkg-comment1
-rw-r--r--games/tuxracer-commercial/Makefile1
-rw-r--r--games/tuxracer-commercial/pkg-comment1
-rw-r--r--games/tuxracer/Makefile1
-rw-r--r--games/tuxracer/pkg-comment1
-rw-r--r--games/tuxtype/Makefile1
-rw-r--r--games/tuxtype/pkg-comment1
-rw-r--r--games/tvp/Makefile1
-rw-r--r--games/tvp/pkg-comment1
-rw-r--r--games/uox3/Makefile1
-rw-r--r--games/uox3/pkg-comment1
-rw-r--r--games/utserver-to/Makefile1
-rw-r--r--games/utserver-to/pkg-comment1
-rw-r--r--games/wmtictactoe/Makefile1
-rw-r--r--games/wmtictactoe/pkg-comment1
-rw-r--r--games/wtf/Makefile1
-rw-r--r--games/wtf/pkg-comment1
-rw-r--r--games/xarchon/Makefile1
-rw-r--r--games/xarchon/pkg-comment1
-rw-r--r--games/xbat/Makefile1
-rw-r--r--games/xbat/pkg-comment1
-rw-r--r--games/xblast-beta/Makefile1
-rw-r--r--games/xblast-beta/pkg-comment1
-rw-r--r--games/xblast/Makefile1
-rw-r--r--games/xblast/pkg-comment1
-rw-r--r--games/xcubes/Makefile1
-rw-r--r--games/xcubes/pkg-comment1
-rw-r--r--games/xdeblock/Makefile1
-rw-r--r--games/xdeblock/pkg-comment1
-rw-r--r--games/xdino/Makefile1
-rw-r--r--games/xdino/pkg-comment1
-rw-r--r--games/xeyesplus/Makefile1
-rw-r--r--games/xeyesplus/pkg-comment1
-rw-r--r--games/xflame/Makefile1
-rw-r--r--games/xflame/pkg-comment1
-rw-r--r--games/xfrisk/Makefile1
-rw-r--r--games/xfrisk/pkg-comment1
-rw-r--r--games/xgammon/Makefile1
-rw-r--r--games/xgammon/pkg-comment1
-rw-r--r--games/xgolgo/Makefile1
-rw-r--r--games/xgolgo/pkg-comment1
-rw-r--r--games/xhime/Makefile1
-rw-r--r--games/xhime/pkg-comment1
-rw-r--r--games/xinfocom/Makefile1
-rw-r--r--games/xinfocom/pkg-comment1
-rw-r--r--games/xinvaders3d/Makefile1
-rw-r--r--games/xinvaders3d/pkg-comment1
-rw-r--r--games/xjewel/Makefile1
-rw-r--r--games/xjewel/pkg-comment1
-rw-r--r--games/xjig/Makefile1
-rw-r--r--games/xjig/pkg-comment1
-rw-r--r--games/xkobo/Makefile1
-rw-r--r--games/xkobo/pkg-comment1
-rw-r--r--games/xmahjongg/Makefile1
-rw-r--r--games/xmahjongg/pkg-comment1
-rw-r--r--games/xmine/Makefile1
-rw-r--r--games/xmine/pkg-comment1
-rw-r--r--games/xminehunter/Makefile1
-rw-r--r--games/xminehunter/pkg-comment1
-rw-r--r--games/xmris/Makefile1
-rw-r--r--games/xmris/pkg-comment1
-rw-r--r--games/xonix/Makefile1
-rw-r--r--games/xonix/pkg-comment1
-rw-r--r--games/xosmulti/Makefile1
-rw-r--r--games/xosmulti/pkg-comment1
-rw-r--r--games/xpacman/Makefile1
-rw-r--r--games/xpacman/pkg-comment1
-rw-r--r--games/xpat2/Makefile1
-rw-r--r--games/xpat2/pkg-comment1
-rw-r--r--games/xphotohunter/Makefile1
-rw-r--r--games/xphotohunter/pkg-comment1
-rw-r--r--games/xpuyo/Makefile1
-rw-r--r--games/xpuyo/pkg-comment1
-rw-r--r--games/xpuzzletama/Makefile1
-rw-r--r--games/xpuzzletama/pkg-comment1
-rw-r--r--games/xroach/Makefile1
-rw-r--r--games/xroach/pkg-comment1
-rw-r--r--games/xrubik/Makefile1
-rw-r--r--games/xrubik/pkg-comment1
-rw-r--r--games/xscavenger/Makefile1
-rw-r--r--games/xscavenger/pkg-comment1
-rw-r--r--games/xscorch/Makefile1
-rw-r--r--games/xscorch/pkg-comment1
-rw-r--r--games/xshisen/Makefile1
-rw-r--r--games/xshisen/pkg-comment1
-rw-r--r--games/xshogi/Makefile1
-rw-r--r--games/xshogi/pkg-comment1
-rw-r--r--games/xskat/Makefile1
-rw-r--r--games/xskat/pkg-comment1
-rw-r--r--games/xsoldier/Makefile1
-rw-r--r--games/xsoldier/pkg-comment1
-rw-r--r--games/xspringies/Makefile1
-rw-r--r--games/xspringies/pkg-comment1
-rw-r--r--games/xtriangles/Makefile1
-rw-r--r--games/xtriangles/pkg-comment1
-rw-r--r--games/xzip/Makefile1
-rw-r--r--games/xzip/pkg-comment1
-rw-r--r--german/citrix_ica/Makefile1
-rw-r--r--german/citrix_ica/pkg-comment1
-rw-r--r--german/citrix_xenapp/Makefile1
-rw-r--r--german/citrix_xenapp/pkg-comment1
-rw-r--r--german/kde3-i18n/Makefile1
-rw-r--r--german/kde3-i18n/pkg-comment1
-rw-r--r--german/kde4-l10n/Makefile1
-rw-r--r--german/kde4-l10n/pkg-comment1
-rw-r--r--german/staroffice52/Makefile1
-rw-r--r--german/staroffice52/pkg-comment1
-rw-r--r--german/staroffice70/Makefile1
-rw-r--r--german/staroffice70/pkg-comment1
-rw-r--r--graphics/Cgraph/Makefile1
-rw-r--r--graphics/Cgraph/pkg-comment1
-rw-r--r--graphics/Mesa3/Makefile1
-rw-r--r--graphics/Mesa3/pkg-comment1
-rw-r--r--graphics/backfract/Makefile1
-rw-r--r--graphics/backfract/pkg-comment1
-rw-r--r--graphics/camserv/Makefile1
-rw-r--r--graphics/camserv/pkg-comment1
-rw-r--r--graphics/chbg/Makefile1
-rw-r--r--graphics/chbg/pkg-comment1
-rw-r--r--graphics/crw/Makefile1
-rw-r--r--graphics/crw/pkg-comment1
-rw-r--r--graphics/cybervrml97/Makefile1
-rw-r--r--graphics/cybervrml97/pkg-comment1
-rw-r--r--graphics/dia/Makefile1
-rw-r--r--graphics/dia/pkg-comment1
-rw-r--r--graphics/diacanvas/Makefile1
-rw-r--r--graphics/diacanvas/pkg-comment1
-rw-r--r--graphics/dri-devel/Makefile1
-rw-r--r--graphics/dri-devel/pkg-comment1
-rw-r--r--graphics/drm-kmod/Makefile1
-rw-r--r--graphics/drm-kmod/pkg-comment1
-rw-r--r--graphics/dumpmpeg/Makefile1
-rw-r--r--graphics/dumpmpeg/pkg-comment1
-rw-r--r--graphics/electriceyes/Makefile1
-rw-r--r--graphics/electriceyes/pkg-comment1
-rw-r--r--graphics/enjoympeg/Makefile1
-rw-r--r--graphics/enjoympeg/pkg-comment1
-rw-r--r--graphics/eog/Makefile1
-rw-r--r--graphics/eog/pkg-comment1
-rw-r--r--graphics/eog2/Makefile1
-rw-r--r--graphics/eog2/pkg-comment1
-rw-r--r--graphics/eps2png/Makefile1
-rw-r--r--graphics/eps2png/pkg-comment1
-rw-r--r--graphics/eterm-bg/Makefile1
-rw-r--r--graphics/eterm-bg/pkg-comment1
-rw-r--r--graphics/figurine/Makefile1
-rw-r--r--graphics/figurine/pkg-comment1
-rw-r--r--graphics/frontline/Makefile1
-rw-r--r--graphics/frontline/pkg-comment1
-rw-r--r--graphics/fujiplay/Makefile1
-rw-r--r--graphics/fujiplay/pkg-comment1
-rw-r--r--graphics/g2/Makefile1
-rw-r--r--graphics/g2/pkg-comment1
-rw-r--r--graphics/gdtclft/Makefile1
-rw-r--r--graphics/gdtclft/pkg-comment1
-rw-r--r--graphics/geomview/Makefile1
-rw-r--r--graphics/geomview/pkg-comment1
-rw-r--r--graphics/gifmerge/Makefile1
-rw-r--r--graphics/gifmerge/pkg-comment1
-rw-r--r--graphics/giftool/Makefile1
-rw-r--r--graphics/giftool/pkg-comment1
-rw-r--r--graphics/giftrans/Makefile1
-rw-r--r--graphics/giftrans/pkg-comment1
-rw-r--r--graphics/gimp1/Makefile1
-rw-r--r--graphics/gimp1/pkg-comment1
-rw-r--r--graphics/gkrellkam/Makefile1
-rw-r--r--graphics/gkrellkam/pkg-comment1
-rw-r--r--graphics/glass/Makefile1
-rw-r--r--graphics/glass/pkg-comment1
-rw-r--r--graphics/glide3/Makefile1
-rw-r--r--graphics/glide3/pkg-comment1
-rw-r--r--graphics/gpaint/Makefile1
-rw-r--r--graphics/gpaint/pkg-comment1
-rw-r--r--graphics/gqview/Makefile1
-rw-r--r--graphics/gqview/pkg-comment1
-rw-r--r--graphics/gridpix/Makefile1
-rw-r--r--graphics/gridpix/pkg-comment1
-rw-r--r--graphics/gtkdps/Makefile1
-rw-r--r--graphics/gtkdps/pkg-comment1
-rw-r--r--graphics/gtkfig/Makefile1
-rw-r--r--graphics/gtkfig/pkg-comment1
-rw-r--r--graphics/gtkgraph/Makefile1
-rw-r--r--graphics/gtkgraph/pkg-comment1
-rw-r--r--graphics/gtksee/Makefile1
-rw-r--r--graphics/gtksee/pkg-comment1
-rw-r--r--graphics/guilib/Makefile1
-rw-r--r--graphics/guilib/pkg-comment1
-rw-r--r--graphics/hdf/Makefile1
-rw-r--r--graphics/hdf/pkg-comment1
-rw-r--r--graphics/icod/Makefile1
-rw-r--r--graphics/icod/pkg-comment1
-rw-r--r--graphics/imlib/Makefile1
-rw-r--r--graphics/imlib/pkg-comment1
-rw-r--r--graphics/jasper/Makefile1
-rw-r--r--graphics/jasper/pkg-comment1
-rw-r--r--graphics/jbigkit/Makefile1
-rw-r--r--graphics/jbigkit/pkg-comment1
-rw-r--r--graphics/jgv/Makefile1
-rw-r--r--graphics/jgv/pkg-comment1
-rw-r--r--graphics/jpeginfo/Makefile1
-rw-r--r--graphics/jpeginfo/pkg-comment1
-rw-r--r--graphics/jpgtn/Makefile1
-rw-r--r--graphics/jpgtn/pkg-comment1
-rw-r--r--graphics/juno-2/Makefile1
-rw-r--r--graphics/juno-2/pkg-comment1
-rw-r--r--graphics/kdegraphics3/Makefile1
-rw-r--r--graphics/kdegraphics3/pkg-comment1
-rw-r--r--graphics/kdegraphics4/Makefile1
-rw-r--r--graphics/kdegraphics4/pkg-comment1
-rw-r--r--graphics/kisomandel/Makefile1
-rw-r--r--graphics/kisomandel/pkg-comment1
-rw-r--r--graphics/lcms/Makefile1
-rw-r--r--graphics/lcms/pkg-comment1
-rw-r--r--graphics/lib3ds/Makefile1
-rw-r--r--graphics/lib3ds/pkg-comment1
-rw-r--r--graphics/libart_lgpl/Makefile1
-rw-r--r--graphics/libart_lgpl/pkg-comment1
-rw-r--r--graphics/libart_lgpl2/Makefile1
-rw-r--r--graphics/libart_lgpl2/pkg-comment1
-rw-r--r--graphics/libaux/Makefile1
-rw-r--r--graphics/libaux/pkg-comment1
-rw-r--r--graphics/libdjvu++/Makefile1
-rw-r--r--graphics/libdjvu++/pkg-comment1
-rw-r--r--graphics/libexif/Makefile1
-rw-r--r--graphics/libexif/pkg-comment1
-rw-r--r--graphics/libfpx/Makefile1
-rw-r--r--graphics/libfpx/pkg-comment1
-rw-r--r--graphics/liblug/Makefile1
-rw-r--r--graphics/liblug/pkg-comment1
-rw-r--r--graphics/libmng/Makefile1
-rw-r--r--graphics/libmng/pkg-comment1
-rw-r--r--graphics/libmorph/Makefile1
-rw-r--r--graphics/libmorph/pkg-comment1
-rw-r--r--graphics/librsvg/Makefile1
-rw-r--r--graphics/librsvg/pkg-comment1
-rw-r--r--graphics/librsvg2/Makefile1
-rw-r--r--graphics/librsvg2/pkg-comment1
-rw-r--r--graphics/linux_dri/Makefile1
-rw-r--r--graphics/linux_dri/pkg-comment1
-rw-r--r--graphics/linux_glx/Makefile1
-rw-r--r--graphics/linux_glx/pkg-comment1
-rw-r--r--graphics/mesagl/Makefile1
-rw-r--r--graphics/mesagl/pkg-comment1
-rw-r--r--graphics/mgp-gallery/Makefile1
-rw-r--r--graphics/mgp-gallery/pkg-comment1
-rw-r--r--graphics/morpheus/Makefile1
-rw-r--r--graphics/morpheus/pkg-comment1
-rw-r--r--graphics/mrsidviewer/Makefile1
-rw-r--r--graphics/mrsidviewer/pkg-comment1
-rw-r--r--graphics/mtv/Makefile1
-rw-r--r--graphics/mtv/pkg-comment1
-rw-r--r--graphics/netshow/Makefile1
-rw-r--r--graphics/netshow/pkg-comment1
-rw-r--r--graphics/p5-Gimp/Makefile1
-rw-r--r--graphics/p5-Gimp/pkg-comment1
-rw-r--r--graphics/p5-GraphViz/Makefile1
-rw-r--r--graphics/p5-GraphViz/pkg-comment1
-rw-r--r--graphics/p5-Graphics-ColorNames/Makefile1
-rw-r--r--graphics/p5-Graphics-ColorNames/pkg-comment1
-rw-r--r--graphics/p5-PGPLOT/Makefile1
-rw-r--r--graphics/p5-PGPLOT/pkg-comment1
-rw-r--r--graphics/peps/Makefile1
-rw-r--r--graphics/peps/pkg-comment1
-rw-r--r--graphics/pgperl/Makefile1
-rw-r--r--graphics/pgperl/pkg-comment1
-rw-r--r--graphics/pgplot/Makefile1
-rw-r--r--graphics/pgplot/pkg-comment1
-rw-r--r--graphics/pixmap/Makefile1
-rw-r--r--graphics/pixmap/pkg-comment1
-rw-r--r--graphics/plasma-kmod/Makefile1
-rw-r--r--graphics/plasma-kmod/pkg-comment1
-rw-r--r--graphics/plotutils/Makefile1
-rw-r--r--graphics/plotutils/pkg-comment1
-rw-r--r--graphics/png/Makefile1
-rw-r--r--graphics/png/pkg-comment1
-rw-r--r--graphics/png2html/Makefile1
-rw-r--r--graphics/png2html/pkg-comment1
-rw-r--r--graphics/pngcrush/Makefile1
-rw-r--r--graphics/pngcrush/pkg-comment1
-rw-r--r--graphics/povray/Makefile1
-rw-r--r--graphics/povray/pkg-comment1
-rw-r--r--graphics/povray36/Makefile1
-rw-r--r--graphics/povray36/pkg-comment1
-rw-r--r--graphics/povray37/Makefile1
-rw-r--r--graphics/povray37/pkg-comment1
-rw-r--r--graphics/proj/Makefile1
-rw-r--r--graphics/proj/pkg-comment1
-rw-r--r--graphics/pstoepsi/Makefile1
-rw-r--r--graphics/pstoepsi/pkg-comment1
-rw-r--r--graphics/pvmpov/Makefile1
-rw-r--r--graphics/pvmpov/pkg-comment1
-rw-r--r--graphics/py-exif/Makefile1
-rw-r--r--graphics/py-exif/pkg-comment1
-rw-r--r--graphics/py-imaging/Makefile1
-rw-r--r--graphics/py-imaging/pkg-comment1
-rw-r--r--graphics/py-opengl/Makefile1
-rw-r--r--graphics/py-opengl/pkg-comment1
-rw-r--r--graphics/qcread/Makefile1
-rw-r--r--graphics/qcread/pkg-comment1
-rw-r--r--graphics/scr2png/Makefile1
-rw-r--r--graphics/scr2png/pkg-comment1
-rw-r--r--graphics/scwm-icons/Makefile1
-rw-r--r--graphics/scwm-icons/pkg-comment1
-rw-r--r--graphics/sdl_image/Makefile1
-rw-r--r--graphics/sdl_image/pkg-comment1
-rw-r--r--graphics/sdl_ttf/Makefile1
-rw-r--r--graphics/sdl_ttf/pkg-comment1
-rw-r--r--graphics/seejpeg/Makefile1
-rw-r--r--graphics/seejpeg/pkg-comment1
-rw-r--r--graphics/smpeg-xmms/Makefile1
-rw-r--r--graphics/smpeg-xmms/pkg-comment1
-rw-r--r--graphics/stamp/Makefile1
-rw-r--r--graphics/stamp/pkg-comment1
-rw-r--r--graphics/svgalib/Makefile1
-rw-r--r--graphics/svgalib/pkg-comment1
-rw-r--r--graphics/synaesthesia/Makefile1
-rw-r--r--graphics/synaesthesia/pkg-comment1
-rw-r--r--graphics/threeDS/Makefile1
-rw-r--r--graphics/threeDS/pkg-comment1
-rw-r--r--graphics/tiff/Makefile1
-rw-r--r--graphics/tiff/pkg-comment1
-rw-r--r--graphics/tkxanim/Makefile1
-rw-r--r--graphics/tkxanim/pkg-comment1
-rw-r--r--graphics/txtmerge/Makefile1
-rw-r--r--graphics/txtmerge/pkg-comment1
-rw-r--r--graphics/utah-glx/Makefile1
-rw-r--r--graphics/utah-glx/pkg-comment1
-rw-r--r--graphics/vertex/Makefile1
-rw-r--r--graphics/vertex/pkg-comment1
-rw-r--r--graphics/vid/Makefile1
-rw-r--r--graphics/vid/pkg-comment1
-rw-r--r--graphics/view3ds/Makefile1
-rw-r--r--graphics/view3ds/pkg-comment1
-rw-r--r--graphics/vlc/Makefile1
-rw-r--r--graphics/vlc/pkg-comment1
-rw-r--r--graphics/whirlgif/Makefile1
-rw-r--r--graphics/whirlgif/pkg-comment1
-rw-r--r--graphics/wmicons/Makefile1
-rw-r--r--graphics/wmicons/pkg-comment1
-rw-r--r--graphics/xaos/Makefile1
-rw-r--r--graphics/xaos/pkg-comment1
-rw-r--r--graphics/xbmbrowser/Makefile1
-rw-r--r--graphics/xbmbrowser/pkg-comment1
-rw-r--r--graphics/xdgagrab/Makefile1
-rw-r--r--graphics/xdgagrab/pkg-comment1
-rw-r--r--graphics/xface.el/Makefile1
-rw-r--r--graphics/xface.el/pkg-comment1
-rw-r--r--graphics/xli/Makefile1
-rw-r--r--graphics/xli/pkg-comment1
-rw-r--r--graphics/xmagv/Makefile1
-rw-r--r--graphics/xmagv/pkg-comment1
-rw-r--r--graphics/xmms-gdancer/Makefile1
-rw-r--r--graphics/xmms-gdancer/pkg-comment1
-rw-r--r--graphics/xmps/Makefile1
-rw-r--r--graphics/xmps/pkg-comment1
-rw-r--r--graphics/xpdf/Makefile1
-rw-r--r--graphics/xpdf/pkg-comment1
-rw-r--r--graphics/xpx/Makefile1
-rw-r--r--graphics/xpx/pkg-comment1
-rw-r--r--hebrew/kde3-i18n/Makefile1
-rw-r--r--hebrew/kde3-i18n/pkg-comment1
-rw-r--r--hebrew/kde4-l10n/Makefile1
-rw-r--r--hebrew/kde4-l10n/pkg-comment1
-rw-r--r--hungarian/kde3-i18n/Makefile1
-rw-r--r--hungarian/kde3-i18n/pkg-comment1
-rw-r--r--hungarian/kde4-l10n/Makefile1
-rw-r--r--hungarian/kde4-l10n/pkg-comment1
-rw-r--r--irc/bnc/Makefile1
-rw-r--r--irc/bnc/pkg-comment1
-rw-r--r--irc/dcc/Makefile1
-rw-r--r--irc/dcc/pkg-comment1
-rw-r--r--irc/irchat-pj-emacs20/Makefile1
-rw-r--r--irc/irchat-pj-emacs20/pkg-comment1
-rw-r--r--irc/iroffer/Makefile1
-rw-r--r--irc/iroffer/pkg-comment1
-rw-r--r--irc/irssi-devel/Makefile1
-rw-r--r--irc/irssi-devel/pkg-comment1
-rw-r--r--irc/irssi/Makefile1
-rw-r--r--irc/irssi/pkg-comment1
-rw-r--r--irc/liece-dcc/Makefile1
-rw-r--r--irc/liece-dcc/pkg-comment1
-rw-r--r--irc/liece/Makefile1
-rw-r--r--irc/liece/pkg-comment1
-rw-r--r--irc/muh/Makefile1
-rw-r--r--irc/muh/pkg-comment1
-rw-r--r--irc/p5-IRC/Makefile1
-rw-r--r--irc/p5-IRC/pkg-comment1
-rw-r--r--irc/p5-POE-Component-IRC-Object/Makefile1
-rw-r--r--irc/p5-POE-Component-IRC-Object/pkg-comment1
-rw-r--r--irc/pure-emacs20/Makefile1
-rw-r--r--irc/pure-emacs20/pkg-comment1
-rw-r--r--irc/quirc/Makefile1
-rw-r--r--irc/quirc/pkg-comment1
-rw-r--r--irc/riece-emacs21/Makefile1
-rw-r--r--irc/riece-emacs21/pkg-comment1
-rw-r--r--irc/riece/Makefile1
-rw-r--r--irc/riece/pkg-comment1
-rw-r--r--irc/sirc/Makefile1
-rw-r--r--irc/sirc/pkg-comment1
-rw-r--r--irc/tkirc/Makefile1
-rw-r--r--irc/tkirc/pkg-comment1
-rw-r--r--irc/xchat/Makefile1
-rw-r--r--irc/xchat/pkg-comment1
-rw-r--r--irc/xchat1/Makefile1
-rw-r--r--irc/xchat1/pkg-comment1
-rw-r--r--japanese/ASCIIdates98-fpw/Makefile1
-rw-r--r--japanese/ASCIIdates98-fpw/pkg-comment1
-rw-r--r--japanese/CGdic-fpw/Makefile1
-rw-r--r--japanese/CGdic-fpw/pkg-comment1
-rw-r--r--japanese/Canna/Makefile1
-rw-r--r--japanese/Canna/pkg-comment1
-rw-r--r--japanese/VTPSfont/Makefile1
-rw-r--r--japanese/VTPSfont/pkg-comment1
-rw-r--r--japanese/Wnn6-lib/Makefile1
-rw-r--r--japanese/Wnn6-lib/pkg-comment1
-rw-r--r--japanese/Wnn6/Makefile1
-rw-r--r--japanese/Wnn6/pkg-comment1
-rw-r--r--japanese/Wnn7-lib/Makefile1
-rw-r--r--japanese/Wnn7-lib/pkg-comment1
-rw-r--r--japanese/addttfont/Makefile1
-rw-r--r--japanese/addttfont/pkg-comment1
-rw-r--r--japanese/anthy/Makefile1
-rw-r--r--japanese/anthy/pkg-comment1
-rw-r--r--japanese/aterm/Makefile1
-rw-r--r--japanese/aterm/pkg-comment1
-rw-r--r--japanese/bible_names-fpw/Makefile1
-rw-r--r--japanese/bible_names-fpw/pkg-comment1
-rw-r--r--japanese/canna-lib/Makefile1
-rw-r--r--japanese/canna-lib/pkg-comment1
-rw-r--r--japanese/canna-server/Makefile1
-rw-r--r--japanese/canna-server/pkg-comment1
-rw-r--r--japanese/cdrom2/Makefile1
-rw-r--r--japanese/cdrom2/pkg-comment1
-rw-r--r--japanese/csrd/Makefile1
-rw-r--r--japanese/csrd/pkg-comment1
-rw-r--r--japanese/ddskk/Makefile1
-rw-r--r--japanese/ddskk/pkg-comment1
-rw-r--r--japanese/devil-fpw/Makefile1
-rw-r--r--japanese/devil-fpw/pkg-comment1
-rw-r--r--japanese/diclookup-emacs20/Makefile1
-rw-r--r--japanese/diclookup-emacs20/pkg-comment1
-rw-r--r--japanese/diclookup-mule/Makefile1
-rw-r--r--japanese/diclookup-mule/pkg-comment1
-rw-r--r--japanese/dserver/Makefile1
-rw-r--r--japanese/dserver/pkg-comment1
-rw-r--r--japanese/dvi2ps/Makefile1
-rw-r--r--japanese/dvi2ps/pkg-comment1
-rw-r--r--japanese/dvi2tty/Makefile1
-rw-r--r--japanese/dvi2tty/pkg-comment1
-rw-r--r--japanese/easypr/Makefile1
-rw-r--r--japanese/easypr/pkg-comment1
-rw-r--r--japanese/ebd-fpw/Makefile1
-rw-r--r--japanese/ebd-fpw/pkg-comment1
-rw-r--r--japanese/eblook/Makefile1
-rw-r--r--japanese/eblook/pkg-comment1
-rw-r--r--japanese/edict-fpw/Makefile1
-rw-r--r--japanese/edict-fpw/pkg-comment1
-rw-r--r--japanese/edict-sdic/Makefile1
-rw-r--r--japanese/edict-sdic/pkg-comment1
-rw-r--r--japanese/ee/Makefile1
-rw-r--r--japanese/ee/pkg-comment1
-rw-r--r--japanese/eijiro-fpw/Makefile1
-rw-r--r--japanese/eijiro-fpw/pkg-comment1
-rw-r--r--japanese/elisp-manual/Makefile1
-rw-r--r--japanese/elisp-manual/pkg-comment1
-rw-r--r--japanese/emacs-manual/Makefile1
-rw-r--r--japanese/emacs-manual/pkg-comment1
-rw-r--r--japanese/emacs20-dl-canna/Makefile1
-rw-r--r--japanese/emacs20-dl-canna/pkg-comment1
-rw-r--r--japanese/emacs20-dl-wnn6/Makefile1
-rw-r--r--japanese/emacs20-dl-wnn6/pkg-comment1
-rw-r--r--japanese/escpf/Makefile1
-rw-r--r--japanese/escpf/pkg-comment1
-rw-r--r--japanese/flower-fpw/Makefile1
-rw-r--r--japanese/flower-fpw/pkg-comment1
-rw-r--r--japanese/foldoc-fpw/Makefile1
-rw-r--r--japanese/foldoc-fpw/pkg-comment1
-rw-r--r--japanese/font-shinonome/Makefile1
-rw-r--r--japanese/font-shinonome/pkg-comment1
-rw-r--r--japanese/freepwing/Makefile1
-rw-r--r--japanese/freepwing/pkg-comment1
-rw-r--r--japanese/fumeikai-fpw/Makefile1
-rw-r--r--japanese/fumeikai-fpw/pkg-comment1
-rw-r--r--japanese/gicq/Makefile1
-rw-r--r--japanese/gicq/pkg-comment1
-rw-r--r--japanese/gxditview/Makefile1
-rw-r--r--japanese/gxditview/pkg-comment1
-rw-r--r--japanese/ical/Makefile1
-rw-r--r--japanese/ircII/Makefile1
-rw-r--r--japanese/ircII/pkg-comment1
-rw-r--r--japanese/japaneseAFM/Makefile1
-rw-r--r--japanese/japaneseAFM/pkg-comment1
-rw-r--r--japanese/jargon-fpw/Makefile1
-rw-r--r--japanese/jargon-fpw/pkg-comment1
-rw-r--r--japanese/jcode.pl/Makefile1
-rw-r--r--japanese/jcode.pl/pkg-comment1
-rw-r--r--japanese/jhd/Makefile1
-rw-r--r--japanese/jhd/pkg-comment1
-rw-r--r--japanese/jisx0213-fonts/Makefile1
-rw-r--r--japanese/jisx0213-fonts/pkg-comment1
-rw-r--r--japanese/jls/Makefile1
-rw-r--r--japanese/jls/pkg-comment1
-rw-r--r--japanese/jmode/Makefile1
-rw-r--r--japanese/jmode/pkg-comment1
-rw-r--r--japanese/jyuroku/Makefile1
-rw-r--r--japanese/jyuroku/pkg-comment1
-rw-r--r--japanese/k12/Makefile1
-rw-r--r--japanese/k12/pkg-comment1
-rw-r--r--japanese/kakasi/Makefile1
-rw-r--r--japanese/kakasi/pkg-comment1
-rw-r--r--japanese/kbanner/Makefile1
-rw-r--r--japanese/kbanner/pkg-comment1
-rw-r--r--japanese/kcc/Makefile1
-rw-r--r--japanese/kcc/pkg-comment1
-rw-r--r--japanese/kde3-i18n/Makefile1
-rw-r--r--japanese/kde3-i18n/pkg-comment1
-rw-r--r--japanese/kde4-l10n/Makefile1
-rw-r--r--japanese/kde4-l10n/pkg-comment1
-rw-r--r--japanese/kon2-16dot/Makefile1
-rw-r--r--japanese/kon2-16dot/pkg-comment1
-rw-r--r--japanese/kpcal/Makefile1
-rw-r--r--japanese/kpcal/pkg-comment1
-rw-r--r--japanese/kterm/Makefile1
-rw-r--r--japanese/kterm/pkg-comment1
-rw-r--r--japanese/kterm16c/Makefile1
-rw-r--r--japanese/kterm16c/pkg-comment1
-rw-r--r--japanese/lambdamoo/Makefile1
-rw-r--r--japanese/lambdamoo/pkg-comment1
-rw-r--r--japanese/libicq/Makefile1
-rw-r--r--japanese/libicq/pkg-comment1
-rw-r--r--japanese/libimg/Makefile1
-rw-r--r--japanese/libimg/pkg-comment1
-rw-r--r--japanese/linux-JM/Makefile1
-rw-r--r--japanese/linux-JM/pkg-comment1
-rw-r--r--japanese/lipsf/Makefile1
-rw-r--r--japanese/lipsf/pkg-comment1
-rw-r--r--japanese/lsd-fpw/Makefile1
-rw-r--r--japanese/lsd-fpw/pkg-comment1
-rw-r--r--japanese/lynx-current/Makefile1
-rw-r--r--japanese/lynx-current/pkg-comment1
-rw-r--r--japanese/lynx/Makefile1
-rw-r--r--japanese/lynx/pkg-comment1
-rw-r--r--japanese/lyx-doc/Makefile1
-rw-r--r--japanese/lyx-doc/pkg-comment1
-rw-r--r--japanese/lyx/Makefile1
-rw-r--r--japanese/lyx/pkg-comment1
-rw-r--r--japanese/man-doc/Makefile1
-rw-r--r--japanese/man-doc/pkg-comment1
-rw-r--r--japanese/marumoji-fonts/Makefile1
-rw-r--r--japanese/marumoji-fonts/pkg-comment1
-rw-r--r--japanese/mikachan-ttfonts/Makefile1
-rw-r--r--japanese/mikachan-ttfonts/pkg-comment1
-rw-r--r--japanese/mimekit/Makefile1
-rw-r--r--japanese/mimekit/pkg-comment1
-rw-r--r--japanese/mypaedia-fpw-package/Makefile1
-rw-r--r--japanese/mypaedia-fpw-package/pkg-comment1
-rw-r--r--japanese/mypaedia-fpw/Makefile1
-rw-r--r--japanese/mypaedia-fpw/pkg-comment1
-rw-r--r--japanese/namazu/Makefile1
-rw-r--r--japanese/namazu/pkg-comment1
-rw-r--r--japanese/nethack32/Makefile1
-rw-r--r--japanese/nethack32/pkg-comment1
-rw-r--r--japanese/netscape48-communicator/Makefile1
-rw-r--r--japanese/netscape48-communicator/pkg-comment1
-rw-r--r--japanese/newosaka/Makefile1
-rw-r--r--japanese/newosaka/pkg-comment1
-rw-r--r--japanese/nkf/Makefile1
-rw-r--r--japanese/nkf/pkg-comment1
-rw-r--r--japanese/okphone/Makefile1
-rw-r--r--japanese/okphone/pkg-comment1
-rw-r--r--japanese/otojiro-fpw/Makefile1
-rw-r--r--japanese/otojiro-fpw/pkg-comment1
-rw-r--r--japanese/p5-jcode.pl/Makefile1
-rw-r--r--japanese/p5-jcode.pl/pkg-comment1
-rw-r--r--japanese/p5-manual/Makefile1
-rw-r--r--japanese/p5-manual/pkg-comment1
-rw-r--r--japanese/p5-mkres/Makefile1
-rw-r--r--japanese/p5-mkres/pkg-comment1
-rw-r--r--japanese/p5-nkf/Makefile1
-rw-r--r--japanese/p5-nkf/pkg-comment1
-rw-r--r--japanese/paledit/Makefile1
-rw-r--r--japanese/paledit/pkg-comment1
-rw-r--r--japanese/pejv-fpw/Makefile1
-rw-r--r--japanese/pejv-fpw/pkg-comment1
-rw-r--r--japanese/perl5/Makefile1
-rw-r--r--japanese/perl5/pkg-comment1
-rw-r--r--japanese/postgresql-tcltk/Makefile1
-rw-r--r--japanese/postgresql-tcltk/pkg-comment1
-rw-r--r--japanese/prn/Makefile1
-rw-r--r--japanese/prn/pkg-comment1
-rw-r--r--japanese/ptex-base/Makefile1
-rw-r--r--japanese/ptex-base/pkg-comment1
-rw-r--r--japanese/ptex-common/Makefile1
-rw-r--r--japanese/ptex-common/pkg-comment1
-rw-r--r--japanese/ptex-euc/Makefile1
-rw-r--r--japanese/ptex-euc/pkg-comment1
-rw-r--r--japanese/ptex-jis/Makefile1
-rw-r--r--japanese/ptex-jis/pkg-comment1
-rw-r--r--japanese/ptex-sjis/Makefile1
-rw-r--r--japanese/ptex-sjis/pkg-comment1
-rw-r--r--japanese/ptex/Makefile1
-rw-r--r--japanese/ptex/pkg-comment1
-rw-r--r--japanese/qkc/Makefile1
-rw-r--r--japanese/qkc/pkg-comment1
-rw-r--r--japanese/recjis/Makefile1
-rw-r--r--japanese/recjis/pkg-comment1
-rw-r--r--japanese/roget-fpw/Makefile1
-rw-r--r--japanese/roget-fpw/pkg-comment1
-rw-r--r--japanese/ryaku-fpw/Makefile1
-rw-r--r--japanese/ryaku-fpw/pkg-comment1
-rw-r--r--japanese/sdic/Makefile1
-rw-r--r--japanese/sdic/pkg-comment1
-rw-r--r--japanese/shinonome/Makefile1
-rw-r--r--japanese/shinonome/pkg-comment1
-rw-r--r--japanese/skk10-elisp-emacs20/Makefile1
-rw-r--r--japanese/skk10-elisp-emacs20/pkg-comment1
-rw-r--r--japanese/srd-fpw-package/Makefile1
-rw-r--r--japanese/srd-fpw-package/pkg-comment1
-rw-r--r--japanese/srd-fpw/Makefile1
-rw-r--r--japanese/srd-fpw/pkg-comment1
-rw-r--r--japanese/tgif/Makefile1
-rw-r--r--japanese/tgif/pkg-comment1
-rw-r--r--japanese/tkstep80/Makefile1
-rw-r--r--japanese/tkstep80/pkg-comment1
-rw-r--r--japanese/typist/Makefile1
-rw-r--r--japanese/typist/pkg-comment1
-rw-r--r--japanese/vera-fpw/Makefile1
-rw-r--r--japanese/vera-fpw/pkg-comment1
-rw-r--r--japanese/vfghostscript/Makefile1
-rw-r--r--japanese/vfghostscript/pkg-comment1
-rw-r--r--japanese/vfghostscript5/Makefile1
-rw-r--r--japanese/vfghostscript5/pkg-comment1
-rw-r--r--japanese/vfghostscript55/Makefile1
-rw-r--r--japanese/vfghostscript55/pkg-comment1
-rw-r--r--japanese/vflib/Makefile1
-rw-r--r--japanese/vflib/pkg-comment1
-rw-r--r--japanese/vftool/Makefile1
-rw-r--r--japanese/vftool/pkg-comment1
-rw-r--r--japanese/vfxdvi300/Makefile1
-rw-r--r--japanese/vfxdvi300/pkg-comment1
-rw-r--r--japanese/waeijiro-fpw/Makefile1
-rw-r--r--japanese/waeijiro-fpw/pkg-comment1
-rw-r--r--japanese/wdic-fpw/Makefile1
-rw-r--r--japanese/wdic-fpw/pkg-comment1
-rw-r--r--japanese/weather-emacs20/Makefile1
-rw-r--r--japanese/weather-emacs20/pkg-comment1
-rw-r--r--japanese/web1913-fpw/Makefile1
-rw-r--r--japanese/web1913-fpw/pkg-comment1
-rw-r--r--japanese/wnn7egg/Makefile1
-rw-r--r--japanese/wnn7egg/pkg-comment1
-rw-r--r--japanese/wordnet-fpw/Makefile1
-rw-r--r--japanese/wordnet-fpw/pkg-comment1
-rw-r--r--japanese/wwasw-fpw/Makefile1
-rw-r--r--japanese/wwasw-fpw/pkg-comment1
-rw-r--r--japanese/xjman/Makefile1
-rw-r--r--japanese/xjman/pkg-comment1
-rw-r--r--japanese/xjtext/Makefile1
-rw-r--r--japanese/xjtext/pkg-comment1
-rw-r--r--japanese/xnetmaj/Makefile1
-rw-r--r--japanese/xnetmaj/pkg-comment1
-rw-r--r--japanese/xpdf/Makefile1
-rw-r--r--japanese/xpdf/pkg-comment1
-rw-r--r--japanese/xshodo/Makefile1
-rw-r--r--japanese/xshodo/pkg-comment1
-rw-r--r--java/bugseeker-demo/Makefile1
-rw-r--r--java/bugseeker-demo/pkg-comment1
-rw-r--r--java/bugseeker/Makefile1
-rw-r--r--java/bugseeker/pkg-comment1
-rw-r--r--java/cryptix-jce/Makefile1
-rw-r--r--java/cryptix-jce/pkg-comment1
-rw-r--r--java/forte/Makefile1
-rw-r--r--java/forte/pkg-comment1
-rw-r--r--java/guavac/Makefile1
-rw-r--r--java/guavac/pkg-comment1
-rw-r--r--java/jad/Makefile1
-rw-r--r--java/jad/pkg-comment1
-rw-r--r--java/jaf/Makefile1
-rw-r--r--java/jaf/pkg-comment1
-rw-r--r--java/jakarta-bcel/Makefile1
-rw-r--r--java/jakarta-bcel/pkg-comment1
-rw-r--r--java/jakarta-commons-beanutils/Makefile1
-rw-r--r--java/jakarta-commons-beanutils/pkg-comment1
-rw-r--r--java/jakarta-commons-cli/Makefile1
-rw-r--r--java/jakarta-commons-cli/pkg-comment1
-rw-r--r--java/jakarta-commons-collections/Makefile1
-rw-r--r--java/jakarta-commons-collections/pkg-comment1
-rw-r--r--java/jakarta-commons-lang/Makefile1
-rw-r--r--java/jakarta-commons-lang/pkg-comment1
-rw-r--r--java/jakarta-commons-logging/Makefile1
-rw-r--r--java/jakarta-commons-logging/pkg-comment1
-rw-r--r--java/janosvm/Makefile1
-rw-r--r--java/janosvm/pkg-comment1
-rw-r--r--java/java-tutorial/Makefile1
-rw-r--r--java/java-tutorial/pkg-comment1
-rw-r--r--java/javamail/Makefile1
-rw-r--r--java/javamail/pkg-comment1
-rw-r--r--java/javavmwrapper/Makefile1
-rw-r--r--java/javavmwrapper/pkg-comment1
-rw-r--r--java/javel/Makefile1
-rw-r--r--java/javel/pkg-comment1
-rw-r--r--java/jboss2/Makefile1
-rw-r--r--java/jboss2/pkg-comment1
-rw-r--r--java/jboss3/Makefile1
-rw-r--r--java/jboss3/pkg-comment1
-rw-r--r--java/jboss4/Makefile1
-rw-r--r--java/jboss4/pkg-comment1
-rw-r--r--java/jboss5/Makefile1
-rw-r--r--java/jboss5/pkg-comment1
-rw-r--r--java/jdk11-doc/Makefile1
-rw-r--r--java/jdk11-doc/pkg-comment1
-rw-r--r--java/jdk11/Makefile1
-rw-r--r--java/jdk11/pkg-comment1
-rw-r--r--java/jdk12-doc/Makefile1
-rw-r--r--java/jdk12-doc/pkg-comment1
-rw-r--r--java/jdk13-doc/Makefile1
-rw-r--r--java/jdk13-doc/pkg-comment1
-rw-r--r--java/jdk14-doc/Makefile1
-rw-r--r--java/jdk14-doc/pkg-comment1
-rw-r--r--java/jdom/Makefile1
-rw-r--r--java/jdom/pkg-comment1
-rw-r--r--java/jikes/Makefile1
-rw-r--r--java/jikes/pkg-comment1
-rw-r--r--java/jlint/Makefile1
-rw-r--r--java/jlint/pkg-comment1
-rw-r--r--java/jre/Makefile1
-rw-r--r--java/jre/pkg-comment1
-rw-r--r--java/jump/Makefile1
-rw-r--r--java/jump/pkg-comment1
-rw-r--r--java/junit/Makefile1
-rw-r--r--java/junit/pkg-comment1
-rw-r--r--java/linux-blackdown-jdk12/Makefile1
-rw-r--r--java/linux-blackdown-jdk12/pkg-comment1
-rw-r--r--java/linux-blackdown-jdk13/Makefile1
-rw-r--r--java/linux-blackdown-jdk13/pkg-comment1
-rw-r--r--java/linux-blackdown-jdk14/Makefile1
-rw-r--r--java/linux-blackdown-jdk14/pkg-comment1
-rw-r--r--java/linux-sun-jdk12/Makefile1
-rw-r--r--java/linux-sun-jdk12/pkg-comment1
-rw-r--r--java/linux-sun-jdk13/Makefile1
-rw-r--r--java/linux-sun-jdk13/pkg-comment1
-rw-r--r--java/linux-sun-jdk14/Makefile1
-rw-r--r--java/linux-sun-jdk14/pkg-comment1
-rw-r--r--java/mmake/Makefile1
-rw-r--r--java/mmake/pkg-comment1
-rw-r--r--java/netcomponents/Makefile1
-rw-r--r--java/netcomponents/pkg-comment1
-rw-r--r--java/openjit/Makefile1
-rw-r--r--java/openjit/pkg-comment1
-rw-r--r--java/sablevm/Makefile1
-rw-r--r--java/sablevm/pkg-comment1
-rw-r--r--java/shujit/Makefile1
-rw-r--r--java/shujit/pkg-comment1
-rw-r--r--java/tya/Makefile1
-rw-r--r--java/tya/pkg-comment1
-rw-r--r--java/xalan-j/Makefile1
-rw-r--r--java/xalan-j/pkg-comment1
-rw-r--r--korean/a2ps/Makefile1
-rw-r--r--korean/a2ps/pkg-comment1
-rw-r--r--korean/ami/Makefile1
-rw-r--r--korean/ami/pkg-comment1
-rw-r--r--korean/baekmukfonts-bdf/Makefile1
-rw-r--r--korean/baekmukfonts-bdf/pkg-comment1
-rw-r--r--korean/baekmukfonts-ttf/Makefile1
-rw-r--r--korean/baekmukfonts-ttf/pkg-comment1
-rw-r--r--korean/byeoroo/Makefile1
-rw-r--r--korean/byeoroo/pkg-comment1
-rw-r--r--korean/elm/Makefile1
-rw-r--r--korean/elm/pkg-comment1
-rw-r--r--korean/ftghostscript5/Makefile1
-rw-r--r--korean/ftghostscript5/pkg-comment1
-rw-r--r--korean/gau/Makefile1
-rw-r--r--korean/gau/pkg-comment1
-rw-r--r--korean/ghostscript55httf/Makefile1
-rw-r--r--korean/ghostscript55httf/pkg-comment1
-rw-r--r--korean/gtkcomm/Makefile1
-rw-r--r--korean/gtkcomm/pkg-comment1
-rw-r--r--korean/h2ps/Makefile1
-rw-r--r--korean/h2ps/pkg-comment1
-rw-r--r--korean/han/Makefile1
-rw-r--r--korean/han/pkg-comment1
-rw-r--r--korean/hanIM/Makefile1
-rw-r--r--korean/hanIM/pkg-comment1
-rw-r--r--korean/hanemacs/Makefile1
-rw-r--r--korean/hanemacs/pkg-comment1
-rw-r--r--korean/hanmiscutils/Makefile1
-rw-r--r--korean/hanmiscutils/pkg-comment1
-rw-r--r--korean/hanterm-xf86/Makefile1
-rw-r--r--korean/hanterm-xf86/pkg-comment1
-rw-r--r--korean/hanterm/Makefile1
-rw-r--r--korean/hanterm/pkg-comment1
-rw-r--r--korean/hanyangfonts/Makefile1
-rw-r--r--korean/hanyangfonts/pkg-comment1
-rw-r--r--korean/hcode/Makefile1
-rw-r--r--korean/hcode/pkg-comment1
-rw-r--r--korean/helvis/Makefile1
-rw-r--r--korean/helvis/pkg-comment1
-rw-r--r--korean/hlatex-psfonts-uhc-extra/Makefile1
-rw-r--r--korean/hlatex-psfonts-uhc-extra/pkg-comment1
-rw-r--r--korean/hlatex-wansung/Makefile1
-rw-r--r--korean/hlatex-wansung/pkg-comment1
-rw-r--r--korean/hlatex/Makefile1
-rw-r--r--korean/hlatex/pkg-comment1
-rw-r--r--korean/hlatexfonts-ocf/Makefile1
-rw-r--r--korean/hlatexfonts-ocf/pkg-comment1
-rw-r--r--korean/hlatexp/Makefile1
-rw-r--r--korean/hlatexp/pkg-comment1
-rw-r--r--korean/hmconv/Makefile1
-rw-r--r--korean/hmconv/pkg-comment1
-rw-r--r--korean/hpscat/Makefile1
-rw-r--r--korean/hpscat/pkg-comment1
-rw-r--r--korean/htexp/Makefile1
-rw-r--r--korean/htexp/pkg-comment1
-rw-r--r--korean/johabfonts/Makefile1
-rw-r--r--korean/johabfonts/pkg-comment1
-rw-r--r--korean/kaistfonts/Makefile1
-rw-r--r--korean/kaistfonts/pkg-comment1
-rw-r--r--korean/kde3-i18n/Makefile1
-rw-r--r--korean/kde3-i18n/pkg-comment1
-rw-r--r--korean/kde4-l10n/Makefile1
-rw-r--r--korean/kde4-l10n/pkg-comment1
-rw-r--r--korean/linux_locale/Makefile1
-rw-r--r--korean/linux_locale/pkg-comment1
-rw-r--r--korean/linuxdoc-sgml/Makefile1
-rw-r--r--korean/linuxdoc-sgml/pkg-comment1
-rw-r--r--korean/mizifont/Makefile1
-rw-r--r--korean/mizifont/pkg-comment1
-rw-r--r--korean/mkisofs/Makefile1
-rw-r--r--korean/mkisofs/pkg-comment1
-rw-r--r--korean/mozilla-klp/Makefile1
-rw-r--r--korean/mozilla-klp/pkg-comment1
-rw-r--r--korean/msdosfs/Makefile1
-rw-r--r--korean/msdosfs/pkg-comment1
-rw-r--r--korean/munhwafonts-cid/Makefile1
-rw-r--r--korean/munhwafonts-cid/pkg-comment1
-rw-r--r--korean/netscape48-communicator/Makefile1
-rw-r--r--korean/netscape48-communicator/pkg-comment1
-rw-r--r--korean/nh2ps/Makefile1
-rw-r--r--korean/nh2ps/pkg-comment1
-rw-r--r--korean/nhpf/Makefile1
-rw-r--r--korean/nhpf/pkg-comment1
-rw-r--r--korean/nhppf/Makefile1
-rw-r--r--korean/nhppf/pkg-comment1
-rw-r--r--korean/pgp.language/Makefile1
-rw-r--r--korean/pgp.language/pkg-comment1
-rw-r--r--korean/pinetreefonts/Makefile1
-rw-r--r--korean/pinetreefonts/pkg-comment1
-rw-r--r--korean/texinfo/Makefile1
-rw-r--r--korean/texinfo/pkg-comment1
-rw-r--r--korean/uniksc/Makefile1
-rw-r--r--korean/uniksc/pkg-comment1
-rw-r--r--lang/afnix/Makefile1
-rw-r--r--lang/afnix/pkg-comment1
-rw-r--r--lang/aleph/Makefile1
-rw-r--r--lang/aleph/pkg-comment1
-rw-r--r--lang/bwbasic/Makefile1
-rw-r--r--lang/bwbasic/pkg-comment1
-rw-r--r--lang/caml-light/Makefile1
-rw-r--r--lang/caml-light/pkg-comment1
-rw-r--r--lang/cel/Makefile1
-rw-r--r--lang/cel/pkg-comment1
-rw-r--r--lang/cli/Makefile1
-rw-r--r--lang/cli/pkg-comment1
-rw-r--r--lang/dice/Makefile1
-rw-r--r--lang/dice/pkg-comment1
-rw-r--r--lang/diveintopython/Makefile1
-rw-r--r--lang/diveintopython/pkg-comment1
-rw-r--r--lang/drscheme/Makefile1
-rw-r--r--lang/drscheme/pkg-comment1
-rw-r--r--lang/ezm3/Makefile1
-rw-r--r--lang/ezm3/pkg-comment1
-rw-r--r--lang/forth/Makefile1
-rw-r--r--lang/forth/pkg-comment1
-rw-r--r--lang/gawk/Makefile1
-rw-r--r--lang/gawk/pkg-comment1
-rw-r--r--lang/gnomebasic/Makefile1
-rw-r--r--lang/gnomebasic/pkg-comment1
-rw-r--r--lang/icc/Makefile1
-rw-r--r--lang/icc/pkg-comment1
-rw-r--r--lang/icc7/Makefile1
-rw-r--r--lang/icc7/pkg-comment1
-rw-r--r--lang/ifc/Makefile1
-rw-r--r--lang/ifc/pkg-comment1
-rw-r--r--lang/ifc7/Makefile1
-rw-r--r--lang/ifc7/pkg-comment1
-rw-r--r--lang/intercal/Makefile1
-rw-r--r--lang/intercal/pkg-comment1
-rw-r--r--lang/librep/Makefile1
-rw-r--r--lang/librep/pkg-comment1
-rw-r--r--lang/m3gdb/Makefile1
-rw-r--r--lang/m3gdb/pkg-comment1
-rw-r--r--lang/mdk/Makefile1
-rw-r--r--lang/mdk/pkg-comment1
-rw-r--r--lang/mmix/Makefile1
-rw-r--r--lang/mmix/pkg-comment1
-rw-r--r--lang/moscow_ml/Makefile1
-rw-r--r--lang/moscow_ml/pkg-comment1
-rw-r--r--lang/objc/Makefile1
-rw-r--r--lang/objc/pkg-comment1
-rw-r--r--lang/ocaml-mode.el/Makefile1
-rw-r--r--lang/ocaml-mode.el/pkg-comment1
-rw-r--r--lang/p2c/Makefile1
-rw-r--r--lang/p2c/pkg-comment1
-rw-r--r--lang/p5-Data-JavaScript/Makefile1
-rw-r--r--lang/p5-Data-JavaScript/pkg-comment1
-rw-r--r--lang/p5-ExtUtils-F77/Makefile1
-rw-r--r--lang/p5-ExtUtils-F77/pkg-comment1
-rw-r--r--lang/p5-F77/Makefile1
-rw-r--r--lang/p5-F77/pkg-comment1
-rw-r--r--lang/p5-Switch/Makefile1
-rw-r--r--lang/p5-Switch/pkg-comment1
-rw-r--r--lang/pbasic/Makefile1
-rw-r--r--lang/pbasic/pkg-comment1
-rw-r--r--lang/perl5.10/Makefile1
-rw-r--r--lang/perl5.10/pkg-comment1
-rw-r--r--lang/perl5.12/Makefile1
-rw-r--r--lang/perl5.12/pkg-comment1
-rw-r--r--lang/perl5.14/Makefile1
-rw-r--r--lang/perl5.14/pkg-comment1
-rw-r--r--lang/perl5.16/Makefile1
-rw-r--r--lang/perl5.16/pkg-comment1
-rw-r--r--lang/perl5.6/Makefile1
-rw-r--r--lang/perl5.6/pkg-comment1
-rw-r--r--lang/perl5.8/Makefile1
-rw-r--r--lang/perl5.8/pkg-comment1
-rw-r--r--lang/perl5/Makefile1
-rw-r--r--lang/perl5/pkg-comment1
-rw-r--r--lang/pfe-devel/Makefile1
-rw-r--r--lang/pfe-devel/pkg-comment1
-rw-r--r--lang/pfe/Makefile1
-rw-r--r--lang/pfe/pkg-comment1
-rw-r--r--lang/php_doc/Makefile1
-rw-r--r--lang/php_doc/pkg-comment1
-rw-r--r--lang/pm3-base/Makefile1
-rw-r--r--lang/pm3-base/pkg-comment1
-rw-r--r--lang/pm3-forms/Makefile1
-rw-r--r--lang/pm3-forms/pkg-comment1
-rw-r--r--lang/pm3-gui/Makefile1
-rw-r--r--lang/pm3-gui/pkg-comment1
-rw-r--r--lang/pm3-m3tk/Makefile1
-rw-r--r--lang/pm3-m3tk/pkg-comment1
-rw-r--r--lang/pm3-net/Makefile1
-rw-r--r--lang/pm3-net/pkg-comment1
-rw-r--r--lang/pm3-netobj/Makefile1
-rw-r--r--lang/pm3-netobj/pkg-comment1
-rw-r--r--lang/py-compiler/Makefile1
-rw-r--r--lang/py-compiler/pkg-comment1
-rw-r--r--lang/py-mx-base/Makefile1
-rw-r--r--lang/py-mx-base/pkg-comment1
-rw-r--r--lang/python-doc-html/Makefile1
-rw-r--r--lang/python-doc-html/pkg-comment1
-rw-r--r--lang/python15/Makefile1
-rw-r--r--lang/python15/pkg-comment1
-rw-r--r--lang/python20/Makefile1
-rw-r--r--lang/python20/pkg-comment1
-rw-r--r--lang/python21/Makefile1
-rw-r--r--lang/python21/pkg-comment1
-rw-r--r--lang/ratfor/Makefile1
-rw-r--r--lang/ratfor/pkg-comment1
-rw-r--r--lang/sbcl/Makefile1
-rw-r--r--lang/sbcl/pkg-comment1
-rw-r--r--lang/scriba/Makefile1
-rw-r--r--lang/scriba/pkg-comment1
-rw-r--r--lang/scsh/Makefile1
-rw-r--r--lang/scsh/pkg-comment1
-rw-r--r--lang/siod/Makefile1
-rw-r--r--lang/siod/pkg-comment1
-rw-r--r--lang/slib/Makefile1
-rw-r--r--lang/slib/pkg-comment1
-rw-r--r--lang/slisp/Makefile1
-rw-r--r--lang/slisp/pkg-comment1
-rw-r--r--lang/sml-mode.el/Makefile1
-rw-r--r--lang/sml-mode.el/pkg-comment1
-rw-r--r--lang/sml-nj/Makefile1
-rw-r--r--lang/sml-nj/pkg-comment1
-rw-r--r--lang/snobol/Makefile1
-rw-r--r--lang/snobol/pkg-comment1
-rw-r--r--lang/starlogo/Makefile1
-rw-r--r--lang/starlogo/pkg-comment1
-rw-r--r--lang/swi-pl/Makefile1
-rw-r--r--lang/swi-pl/pkg-comment1
-rw-r--r--lang/tcl81-thread/Makefile1
-rw-r--r--lang/tcl81-thread/pkg-comment1
-rw-r--r--lang/tclX/Makefile1
-rw-r--r--lang/tclX/pkg-comment1
-rw-r--r--lang/tclX82/Makefile1
-rw-r--r--lang/tclX82/pkg-comment1
-rw-r--r--lang/tinycobol/Makefile1
-rw-r--r--lang/tinycobol/pkg-comment1
-rw-r--r--mail/abook/Makefile1
-rw-r--r--mail/abook/pkg-comment1
-rw-r--r--mail/adcomplain/Makefile1
-rw-r--r--mail/adcomplain/pkg-comment1
-rw-r--r--mail/autosig/Makefile1
-rw-r--r--mail/autosig/pkg-comment1
-rw-r--r--mail/biabam/Makefile1
-rw-r--r--mail/biabam/pkg-comment1
-rw-r--r--mail/cclient/Makefile1
-rw-r--r--mail/cclient/pkg-comment1
-rw-r--r--mail/courier-imap/Makefile1
-rw-r--r--mail/courier-imap/pkg-comment1
-rw-r--r--mail/cucipop/Makefile1
-rw-r--r--mail/cucipop/pkg-comment1
-rw-r--r--mail/demime/Makefile1
-rw-r--r--mail/demime/pkg-comment1
-rw-r--r--mail/drbl/Makefile1
-rw-r--r--mail/drbl/pkg-comment1
-rw-r--r--mail/emh/Makefile1
-rw-r--r--mail/emh/pkg-comment1
-rw-r--r--mail/exim-doc-html/Makefile1
-rw-r--r--mail/exim-doc-html/pkg-comment1
-rw-r--r--mail/exim-monitor/Makefile1
-rw-r--r--mail/exim-monitor/pkg-comment1
-rw-r--r--mail/exim-old/Makefile1
-rw-r--r--mail/exim-old/pkg-comment1
-rw-r--r--mail/exim/Makefile1
-rw-r--r--mail/exim/pkg-comment1
-rw-r--r--mail/ezmlm-idx/Makefile1
-rw-r--r--mail/ezmlm-idx/pkg-comment1
-rw-r--r--mail/ezmlm/Makefile1
-rw-r--r--mail/ezmlm/pkg-comment1
-rw-r--r--mail/gbiff/Makefile1
-rw-r--r--mail/gbiff/pkg-comment1
-rw-r--r--mail/glbiff/Makefile1
-rw-r--r--mail/glbiff/pkg-comment1
-rw-r--r--mail/grepmail/Makefile1
-rw-r--r--mail/grepmail/pkg-comment1
-rw-r--r--mail/hbiff/Makefile1
-rw-r--r--mail/hbiff/pkg-comment1
-rw-r--r--mail/im/Makefile1
-rw-r--r--mail/im/pkg-comment1
-rw-r--r--mail/imap-uw/Makefile1
-rw-r--r--mail/imap-uw/pkg-comment1
-rw-r--r--mail/isync/Makefile1
-rw-r--r--mail/isync/pkg-comment1
-rw-r--r--mail/liamail/Makefile1
-rw-r--r--mail/liamail/pkg-comment1
-rw-r--r--mail/liboe/Makefile1
-rw-r--r--mail/liboe/pkg-comment1
-rw-r--r--mail/listmanager/Makefile1
-rw-r--r--mail/listmanager/pkg-comment1
-rw-r--r--mail/mailagent/Makefile1
-rw-r--r--mail/mailagent/pkg-comment1
-rw-r--r--mail/maildrop/Makefile1
-rw-r--r--mail/maildrop/pkg-comment1
-rw-r--r--mail/mailman/Makefile1
-rw-r--r--mail/mailman/pkg-comment1
-rw-r--r--mail/majordomo/Makefile1
-rw-r--r--mail/majordomo/pkg-comment1
-rw-r--r--mail/mboxgrep/Makefile1
-rw-r--r--mail/mboxgrep/pkg-comment1
-rw-r--r--mail/metamail/Makefile1
-rw-r--r--mail/metamail/pkg-comment1
-rw-r--r--mail/mmc/Makefile1
-rw-r--r--mail/mmc/pkg-comment1
-rw-r--r--mail/namg/Makefile1
-rw-r--r--mail/namg/pkg-comment1
-rw-r--r--mail/nullmailer/Makefile1
-rw-r--r--mail/nullmailer/pkg-comment1
-rw-r--r--mail/openwebmail/Makefile1
-rw-r--r--mail/openwebmail/pkg-comment1
-rw-r--r--mail/p5-Email-Find/Makefile1
-rw-r--r--mail/p5-Email-Find/pkg-comment1
-rw-r--r--mail/p5-Email-Valid/Makefile1
-rw-r--r--mail/p5-Email-Valid/pkg-comment1
-rw-r--r--mail/p5-Mail-Audit/Makefile1
-rw-r--r--mail/p5-Mail-Audit/pkg-comment1
-rw-r--r--mail/p5-Mail-Box1/Makefile1
-rw-r--r--mail/p5-Mail-Box1/pkg-comment1
-rw-r--r--mail/p5-Mail-CClient/Makefile1
-rw-r--r--mail/p5-Mail-CClient/pkg-comment1
-rw-r--r--mail/p5-Mail-IMAPClient/Makefile1
-rw-r--r--mail/p5-Mail-IMAPClient/pkg-comment1
-rw-r--r--mail/p5-Mail-ListDetector/Makefile1
-rw-r--r--mail/p5-Mail-ListDetector/pkg-comment1
-rw-r--r--mail/p5-Mail-POP3Client/Makefile1
-rw-r--r--mail/p5-Mail-POP3Client/pkg-comment1
-rw-r--r--mail/p5-Mail-QuoteWrap/Makefile1
-rw-r--r--mail/p5-Mail-QuoteWrap/pkg-comment1
-rw-r--r--mail/p5-Mail-SpamAssassin-snapshot/Makefile1
-rw-r--r--mail/p5-Mail-SpamAssassin-snapshot/pkg-comment1
-rw-r--r--mail/p5-Mail-Verify/Makefile1
-rw-r--r--mail/p5-Mail-Verify/pkg-comment1
-rw-r--r--mail/p5-POE-Component-Client-POP3/Makefile1
-rw-r--r--mail/p5-POE-Component-Client-POP3/pkg-comment1
-rw-r--r--mail/pgen/Makefile1
-rw-r--r--mail/pgen/pkg-comment1
-rw-r--r--mail/pgpsendmail/Makefile1
-rw-r--r--mail/pgpsendmail/pkg-comment1
-rw-r--r--mail/pine-pgp-filters/Makefile1
-rw-r--r--mail/pine-pgp-filters/pkg-comment1
-rw-r--r--mail/pmail/Makefile1
-rw-r--r--mail/pmail/pkg-comment1
-rw-r--r--mail/popper/Makefile1
-rw-r--r--mail/popper/pkg-comment1
-rw-r--r--mail/poppy/Makefile1
-rw-r--r--mail/poppy/pkg-comment1
-rw-r--r--mail/premail/Makefile1
-rw-r--r--mail/premail/pkg-comment1
-rw-r--r--mail/procmail/Makefile1
-rw-r--r--mail/procmail/pkg-comment1
-rw-r--r--mail/prom-mew/Makefile1
-rw-r--r--mail/prom-mew/pkg-comment1
-rw-r--r--mail/prom-wl/Makefile1
-rw-r--r--mail/prom-wl/pkg-comment1
-rw-r--r--mail/pygmy/Makefile1
-rw-r--r--mail/pygmy/pkg-comment1
-rw-r--r--mail/qmHandle/Makefile1
-rw-r--r--mail/qmHandle/pkg-comment1
-rw-r--r--mail/qmail-contrib/Makefile1
-rw-r--r--mail/qmail-contrib/pkg-comment1
-rw-r--r--mail/qmailanalog/Makefile1
-rw-r--r--mail/qmailanalog/pkg-comment1
-rw-r--r--mail/qmhandle/Makefile1
-rw-r--r--mail/qmhandle/pkg-comment1
-rw-r--r--mail/qtools/Makefile1
-rw-r--r--mail/qtools/pkg-comment1
-rw-r--r--mail/razor-agents/Makefile1
-rw-r--r--mail/razor-agents/pkg-comment1
-rw-r--r--mail/regm/Makefile1
-rw-r--r--mail/regm/pkg-comment1
-rw-r--r--mail/ricochet/Makefile1
-rw-r--r--mail/ricochet/pkg-comment1
-rw-r--r--mail/rmime/Makefile1
-rw-r--r--mail/rmime/pkg-comment1
-rw-r--r--mail/rmoldmail/Makefile1
-rw-r--r--mail/rmoldmail/pkg-comment1
-rw-r--r--mail/serialmail/Makefile1
-rw-r--r--mail/serialmail/pkg-comment1
-rw-r--r--mail/sigit/Makefile1
-rw-r--r--mail/sigit/pkg-comment1
-rw-r--r--mail/sonicmail/Makefile1
-rw-r--r--mail/sonicmail/pkg-comment1
-rw-r--r--mail/spambnc/Makefile1
-rw-r--r--mail/spambnc/pkg-comment1
-rw-r--r--mail/spamprobe/Makefile1
-rw-r--r--mail/spamprobe/pkg-comment1
-rw-r--r--mail/sqwebmail/Makefile1
-rw-r--r--mail/sqwebmail/pkg-comment1
-rw-r--r--mail/tlb/Makefile1
-rw-r--r--mail/tlb/pkg-comment1
-rw-r--r--mail/vqadmin/Makefile1
-rw-r--r--mail/vqadmin/pkg-comment1
-rw-r--r--mail/wmbiff/Makefile1
-rw-r--r--mail/wmbiff/pkg-comment1
-rw-r--r--mail/wmmail/Makefile1
-rw-r--r--mail/wmmail/pkg-comment1
-rw-r--r--mail/wmmaiload/Makefile1
-rw-r--r--mail/wmmaiload/pkg-comment1
-rw-r--r--mail/wmmultipop3/Makefile1
-rw-r--r--mail/wmmultipop3/pkg-comment1
-rw-r--r--mail/wmpop3/Makefile1
-rw-r--r--mail/wmpop3/pkg-comment1
-rw-r--r--mail/xfmail/Makefile1
-rw-r--r--mail/xfmail/pkg-comment1
-rw-r--r--mail/xlbiff/Makefile1
-rw-r--r--mail/xlbiff/pkg-comment1
-rw-r--r--mail/youbin/Makefile1
-rw-r--r--mail/youbin/pkg-comment1
-rw-r--r--math/calc/Makefile1
-rw-r--r--math/calc/pkg-comment1
-rw-r--r--math/ccmath/Makefile1
-rw-r--r--math/ccmath/pkg-comment1
-rw-r--r--math/dcdflib/Makefile1
-rw-r--r--math/dcdflib/pkg-comment1
-rw-r--r--math/diehard/Makefile1
-rw-r--r--math/diehard/pkg-comment1
-rw-r--r--math/fudgit/Makefile1
-rw-r--r--math/fudgit/pkg-comment1
-rw-r--r--math/gap/Makefile1
-rw-r--r--math/gap/pkg-comment1
-rw-r--r--math/gexpr/Makefile1
-rw-r--r--math/gexpr/pkg-comment1
-rw-r--r--math/gnumeric/Makefile1
-rw-r--r--math/gnumeric/pkg-comment1
-rw-r--r--math/gnumeric2/Makefile1
-rw-r--r--math/gnumeric2/pkg-comment1
-rw-r--r--math/gnuplot/Makefile1
-rw-r--r--math/gnuplot/pkg-comment1
-rw-r--r--math/grpn/Makefile1
-rw-r--r--math/grpn/pkg-comment1
-rw-r--r--math/guppi/Makefile1
-rw-r--r--math/guppi/pkg-comment1
-rw-r--r--math/jacal/Makefile1
-rw-r--r--math/jacal/pkg-comment1
-rw-r--r--math/javanns/Makefile1
-rw-r--r--math/javanns/pkg-comment1
-rw-r--r--math/kcalc/Makefile1
-rw-r--r--math/kcalc/pkg-comment1
-rw-r--r--math/lapack++/Makefile1
-rw-r--r--math/lapack++/pkg-comment1
-rw-r--r--math/lapack/Makefile1
-rw-r--r--math/lapack/pkg-comment1
-rw-r--r--math/librandlib/Makefile1
-rw-r--r--math/librandlib/pkg-comment1
-rw-r--r--math/libranlib/Makefile1
-rw-r--r--math/libranlib/pkg-comment1
-rw-r--r--math/mtrxmath/Makefile1
-rw-r--r--math/mtrxmath/pkg-comment1
-rw-r--r--math/mupad/Makefile1
-rw-r--r--math/mupad/pkg-comment1
-rw-r--r--math/octave-devel/Makefile1
-rw-r--r--math/octave-devel/pkg-comment1
-rw-r--r--math/octave/Makefile1
-rw-r--r--math/octave/pkg-comment1
-rw-r--r--math/p5-Bit-Vector/Makefile1
-rw-r--r--math/p5-Bit-Vector/pkg-comment1
-rw-r--r--math/p5-Graph/Makefile1
-rw-r--r--math/p5-Graph/pkg-comment1
-rw-r--r--math/p5-Math-Base85/Makefile1
-rw-r--r--math/p5-Math-Base85/pkg-comment1
-rw-r--r--math/p5-Math-BigInt/Makefile1
-rw-r--r--math/p5-Math-BigInt/pkg-comment1
-rw-r--r--math/p5-Math-LinearCombination/Makefile1
-rw-r--r--math/p5-Math-LinearCombination/pkg-comment1
-rw-r--r--math/p5-Math-Pari/Makefile1
-rw-r--r--math/p5-Math-Pari/pkg-comment1
-rw-r--r--math/p5-Math-Random-MT/Makefile1
-rw-r--r--math/p5-Math-Random-MT/pkg-comment1
-rw-r--r--math/p5-Math-Random/Makefile1
-rw-r--r--math/p5-Math-Random/pkg-comment1
-rw-r--r--math/p5-Math-SimpleVariable/Makefile1
-rw-r--r--math/p5-Math-SimpleVariable/pkg-comment1
-rw-r--r--math/p5-Math-TrulyRandom/Makefile1
-rw-r--r--math/p5-Math-TrulyRandom/pkg-comment1
-rw-r--r--math/p5-Set-Window/Makefile1
-rw-r--r--math/p5-Set-Window/pkg-comment1
-rw-r--r--math/p5-Statistics-ChiSquare/Makefile1
-rw-r--r--math/p5-Statistics-ChiSquare/pkg-comment1
-rw-r--r--math/p5-Statistics-Descriptive/Makefile1
-rw-r--r--math/p5-Statistics-Descriptive/pkg-comment1
-rw-r--r--math/p5-Statistics-Distributions/Makefile1
-rw-r--r--math/p5-Statistics-Distributions/pkg-comment1
-rw-r--r--math/p5-Statistics-LTU/Makefile1
-rw-r--r--math/p5-Statistics-LTU/pkg-comment1
-rw-r--r--math/p5-Statistics-OLS/Makefile1
-rw-r--r--math/p5-Statistics-OLS/pkg-comment1
-rw-r--r--math/p5-Statistics-Table-F/Makefile1
-rw-r--r--math/p5-Statistics-Table-F/pkg-comment1
-rw-r--r--math/py-gato/Makefile1
-rw-r--r--math/py-gato/pkg-comment1
-rw-r--r--math/py-gnuplot/Makefile1
-rw-r--r--math/py-gnuplot/pkg-comment1
-rw-r--r--math/py-mpz/Makefile1
-rw-r--r--math/py-mpz/pkg-comment1
-rw-r--r--math/py-numeric/Makefile1
-rw-r--r--math/py-numeric/pkg-comment1
-rw-r--r--math/py-numeric17/Makefile1
-rw-r--r--math/py-numeric17/pkg-comment1
-rw-r--r--math/py-scientific/Makefile1
-rw-r--r--math/py-scientific/pkg-comment1
-rw-r--r--math/qscanplot/Makefile1
-rw-r--r--math/qscanplot/pkg-comment1
-rw-r--r--math/randlib/Makefile1
-rw-r--r--math/randlib/pkg-comment1
-rw-r--r--math/rcalc/Makefile1
-rw-r--r--math/rcalc/pkg-comment1
-rw-r--r--math/scigraphica/Makefile1
-rw-r--r--math/scigraphica/pkg-comment1
-rw-r--r--math/siag/Makefile1
-rw-r--r--math/siag/pkg-comment1
-rw-r--r--math/snns/Makefile1
-rw-r--r--math/snns/pkg-comment1
-rw-r--r--math/solitaire/Makefile1
-rw-r--r--math/solitaire/pkg-comment1
-rw-r--r--math/wingz3/Makefile1
-rw-r--r--math/wingz3/pkg-comment1
-rw-r--r--math/wmcalc/Makefile1
-rw-r--r--math/wmcalc/pkg-comment1
-rw-r--r--math/xgfe/Makefile1
-rw-r--r--math/xgfe/pkg-comment1
-rw-r--r--math/xplot/Makefile1
-rw-r--r--math/xplot/pkg-comment1
-rw-r--r--mbone/imm/Makefile1
-rw-r--r--mbone/imm/pkg-comment1
-rw-r--r--mbone/nte/Makefile1
-rw-r--r--mbone/nte/pkg-comment1
-rw-r--r--mbone/rat/Makefile1
-rw-r--r--mbone/rat/pkg-comment1
-rw-r--r--mbone/rqm/Makefile1
-rw-r--r--mbone/rqm/pkg-comment1
-rw-r--r--mbone/rtpmon/Makefile1
-rw-r--r--mbone/rtpmon/pkg-comment1
-rw-r--r--mbone/rtptools/Makefile1
-rw-r--r--mbone/rtptools/pkg-comment1
-rw-r--r--mbone/sdr/Makefile1
-rw-r--r--mbone/sdr/pkg-comment1
-rw-r--r--mbone/vat/Makefile1
-rw-r--r--mbone/vat/pkg-comment1
-rw-r--r--mbone/vic/Makefile1
-rw-r--r--mbone/vic/pkg-comment1
-rw-r--r--mbone/wb/Makefile1
-rw-r--r--mbone/wb/pkg-comment1
-rw-r--r--misc/44bsd-more/Makefile1
-rw-r--r--misc/44bsd-more/pkg-comment1
-rw-r--r--misc/achievo/Makefile1
-rw-r--r--misc/achievo/pkg-comment1
-rw-r--r--misc/airoflash/Makefile1
-rw-r--r--misc/airoflash/pkg-comment1
-rw-r--r--misc/alevt/Makefile1
-rw-r--r--misc/alevt/pkg-comment1
-rw-r--r--misc/asbutton/Makefile1
-rw-r--r--misc/asbutton/pkg-comment1
-rw-r--r--misc/astrolog/Makefile1
-rw-r--r--misc/astrolog/pkg-comment1
-rw-r--r--misc/bbjd/Makefile1
-rw-r--r--misc/bbjd/pkg-comment1
-rw-r--r--misc/bidwatcher/Makefile1
-rw-r--r--misc/bidwatcher/pkg-comment1
-rw-r--r--misc/bottlerocket/Makefile1
-rw-r--r--misc/bottlerocket/pkg-comment1
-rw-r--r--misc/cassowary/Makefile1
-rw-r--r--misc/cassowary/pkg-comment1
-rw-r--r--misc/chef/Makefile1
-rw-r--r--misc/chef/pkg-comment1
-rw-r--r--misc/cmatrix/Makefile1
-rw-r--r--misc/cmatrix/pkg-comment1
-rw-r--r--misc/deco/Makefile1
-rw-r--r--misc/deco/pkg-comment1
-rw-r--r--misc/dnetc/Makefile1
-rw-r--r--misc/dnetc/pkg-comment1
-rw-r--r--misc/elscreen/Makefile1
-rw-r--r--misc/elscreen/pkg-comment1
-rw-r--r--misc/emma/Makefile1
-rw-r--r--misc/emma/pkg-comment1
-rw-r--r--misc/estic/Makefile1
-rw-r--r--misc/estic/pkg-comment1
-rw-r--r--misc/explosions/Makefile1
-rw-r--r--misc/explosions/pkg-comment1
-rw-r--r--misc/ezload/Makefile1
-rw-r--r--misc/ezload/pkg-comment1
-rw-r--r--misc/figlet-fonts/Makefile1
-rw-r--r--misc/figlet-fonts/pkg-comment1
-rw-r--r--misc/figlet/Makefile1
-rw-r--r--misc/figlet/pkg-comment1
-rw-r--r--misc/flyway/Makefile1
-rw-r--r--misc/flyway/pkg-comment1
-rw-r--r--misc/gkrellm-reminder/Makefile1
-rw-r--r--misc/gkrellm-reminder/pkg-comment1
-rw-r--r--misc/gkrellmaflag/Makefile1
-rw-r--r--misc/gkrellmaflag/pkg-comment1
-rw-r--r--misc/gkrellmlaunch/Makefile1
-rw-r--r--misc/gkrellmlaunch/pkg-comment1
-rw-r--r--misc/gkrellmlaunch2/Makefile1
-rw-r--r--misc/gkrellmlaunch2/pkg-comment1
-rw-r--r--misc/gkrellscore/Makefile1
-rw-r--r--misc/gkrellscore/pkg-comment1
-rw-r--r--misc/gkrellweather/Makefile1
-rw-r--r--misc/gkrellweather/pkg-comment1
-rw-r--r--misc/gnome-icon-theme/Makefile1
-rw-r--r--misc/gnome-icon-theme/pkg-comment1
-rw-r--r--misc/gnome-mime-data/Makefile1
-rw-r--r--misc/gnome-mime-data/pkg-comment1
-rw-r--r--misc/gnome-user-docs/Makefile1
-rw-r--r--misc/gnome-user-docs/pkg-comment1
-rw-r--r--misc/gnomehier/Makefile1
-rw-r--r--misc/gnomehier/pkg-comment1
-rw-r--r--misc/gnomemimedata/Makefile1
-rw-r--r--misc/gnomemimedata/pkg-comment1
-rw-r--r--misc/gnomepm/Makefile1
-rw-r--r--misc/gnomepm/pkg-comment1
-rw-r--r--misc/gnomeuserdocs/Makefile1
-rw-r--r--misc/gnomeuserdocs/pkg-comment1
-rw-r--r--misc/gnomeuserdocs2/Makefile1
-rw-r--r--misc/gnomeuserdocs2/pkg-comment1
-rw-r--r--misc/gnomeutils/Makefile1
-rw-r--r--misc/gnomeutils/pkg-comment1
-rw-r--r--misc/gnomeutils2/Makefile1
-rw-r--r--misc/gnomeutils2/pkg-comment1
-rw-r--r--misc/gplbp/Makefile1
-rw-r--r--misc/gplbp/pkg-comment1
-rw-r--r--misc/gtkfind/Makefile1
-rw-r--r--misc/gtkfind/pkg-comment1
-rw-r--r--misc/gtl/Makefile1
-rw-r--r--misc/gtl/pkg-comment1
-rw-r--r--misc/icemc/Makefile1
-rw-r--r--misc/icemc/pkg-comment1
-rw-r--r--misc/instant-server/Makefile1
-rw-r--r--misc/instant-server/pkg-comment1
-rw-r--r--misc/instant-workstation/Makefile1
-rw-r--r--misc/instant-workstation/pkg-comment1
-rw-r--r--misc/jive/Makefile1
-rw-r--r--misc/jive/pkg-comment1
-rw-r--r--misc/kde3-i18n-af/Makefile1
-rw-r--r--misc/kde3-i18n-af/pkg-comment1
-rw-r--r--misc/kde3-i18n-ar/Makefile1
-rw-r--r--misc/kde3-i18n-ar/pkg-comment1
-rw-r--r--misc/kde3-i18n-az/Makefile1
-rw-r--r--misc/kde3-i18n-az/pkg-comment1
-rw-r--r--misc/kde3-i18n-bg/Makefile1
-rw-r--r--misc/kde3-i18n-bg/pkg-comment1
-rw-r--r--misc/kde3-i18n-bs/Makefile1
-rw-r--r--misc/kde3-i18n-bs/pkg-comment1
-rw-r--r--misc/kde3-i18n-ca/Makefile1
-rw-r--r--misc/kde3-i18n-ca/pkg-comment1
-rw-r--r--misc/kde3-i18n-cs/Makefile1
-rw-r--r--misc/kde3-i18n-cs/pkg-comment1
-rw-r--r--misc/kde3-i18n-da/Makefile1
-rw-r--r--misc/kde3-i18n-da/pkg-comment1
-rw-r--r--misc/kde3-i18n-el/Makefile1
-rw-r--r--misc/kde3-i18n-el/pkg-comment1
-rw-r--r--misc/kde3-i18n-en_GB/Makefile1
-rw-r--r--misc/kde3-i18n-en_GB/pkg-comment1
-rw-r--r--misc/kde3-i18n-eo/Makefile1
-rw-r--r--misc/kde3-i18n-eo/pkg-comment1
-rw-r--r--misc/kde3-i18n-es/Makefile1
-rw-r--r--misc/kde3-i18n-es/pkg-comment1
-rw-r--r--misc/kde3-i18n-et/Makefile1
-rw-r--r--misc/kde3-i18n-et/pkg-comment1
-rw-r--r--misc/kde3-i18n-fi/Makefile1
-rw-r--r--misc/kde3-i18n-fi/pkg-comment1
-rw-r--r--misc/kde3-i18n-he/Makefile1
-rw-r--r--misc/kde3-i18n-he/pkg-comment1
-rw-r--r--misc/kde3-i18n-hr/Makefile1
-rw-r--r--misc/kde3-i18n-hr/pkg-comment1
-rw-r--r--misc/kde3-i18n-hu/Makefile1
-rw-r--r--misc/kde3-i18n-hu/pkg-comment1
-rw-r--r--misc/kde3-i18n-id/Makefile1
-rw-r--r--misc/kde3-i18n-id/pkg-comment1
-rw-r--r--misc/kde3-i18n-is/Makefile1
-rw-r--r--misc/kde3-i18n-is/pkg-comment1
-rw-r--r--misc/kde3-i18n-it/Makefile1
-rw-r--r--misc/kde3-i18n-it/pkg-comment1
-rw-r--r--misc/kde3-i18n-lt/Makefile1
-rw-r--r--misc/kde3-i18n-lt/pkg-comment1
-rw-r--r--misc/kde3-i18n-lv/Makefile1
-rw-r--r--misc/kde3-i18n-lv/pkg-comment1
-rw-r--r--misc/kde3-i18n-mt/Makefile1
-rw-r--r--misc/kde3-i18n-mt/pkg-comment1
-rw-r--r--misc/kde3-i18n-nb/Makefile1
-rw-r--r--misc/kde3-i18n-nb/pkg-comment1
-rw-r--r--misc/kde3-i18n-nl/Makefile1
-rw-r--r--misc/kde3-i18n-nl/pkg-comment1
-rw-r--r--misc/kde3-i18n-nn/Makefile1
-rw-r--r--misc/kde3-i18n-nn/pkg-comment1
-rw-r--r--misc/kde3-i18n-pl/Makefile1
-rw-r--r--misc/kde3-i18n-pl/pkg-comment1
-rw-r--r--misc/kde3-i18n-ro/Makefile1
-rw-r--r--misc/kde3-i18n-ro/pkg-comment1
-rw-r--r--misc/kde3-i18n-sk/Makefile1
-rw-r--r--misc/kde3-i18n-sk/pkg-comment1
-rw-r--r--misc/kde3-i18n-sl/Makefile1
-rw-r--r--misc/kde3-i18n-sl/pkg-comment1
-rw-r--r--misc/kde3-i18n-sr/Makefile1
-rw-r--r--misc/kde3-i18n-sr/pkg-comment1
-rw-r--r--misc/kde3-i18n-sv/Makefile1
-rw-r--r--misc/kde3-i18n-sv/pkg-comment1
-rw-r--r--misc/kde3-i18n-ta/Makefile1
-rw-r--r--misc/kde3-i18n-ta/pkg-comment1
-rw-r--r--misc/kde3-i18n-th/Makefile1
-rw-r--r--misc/kde3-i18n-th/pkg-comment1
-rw-r--r--misc/kde3-i18n-tr/Makefile1
-rw-r--r--misc/kde3-i18n-tr/pkg-comment1
-rw-r--r--misc/kde3-i18n-ven/Makefile1
-rw-r--r--misc/kde3-i18n-ven/pkg-comment1
-rw-r--r--misc/kde3-i18n-vi/Makefile1
-rw-r--r--misc/kde3-i18n-vi/pkg-comment1
-rw-r--r--misc/kde3-i18n-xh/Makefile1
-rw-r--r--misc/kde3-i18n-xh/pkg-comment1
-rw-r--r--misc/kde3-i18n-zu/Makefile1
-rw-r--r--misc/kde3-i18n-zu/pkg-comment1
-rw-r--r--misc/kde3-i18n/Makefile1
-rw-r--r--misc/kde3-i18n/pkg-comment1
-rw-r--r--misc/kde4-i18n-is/Makefile1
-rw-r--r--misc/kde4-i18n-is/pkg-comment1
-rw-r--r--misc/kde4-l10n-bg/Makefile1
-rw-r--r--misc/kde4-l10n-bg/pkg-comment1
-rw-r--r--misc/kde4-l10n-ca/Makefile1
-rw-r--r--misc/kde4-l10n-ca/pkg-comment1
-rw-r--r--misc/kde4-l10n-cs/Makefile1
-rw-r--r--misc/kde4-l10n-cs/pkg-comment1
-rw-r--r--misc/kde4-l10n-da/Makefile1
-rw-r--r--misc/kde4-l10n-da/pkg-comment1
-rw-r--r--misc/kde4-l10n-el/Makefile1
-rw-r--r--misc/kde4-l10n-el/pkg-comment1
-rw-r--r--misc/kde4-l10n-en_GB/Makefile1
-rw-r--r--misc/kde4-l10n-en_GB/pkg-comment1
-rw-r--r--misc/kde4-l10n-eo/Makefile1
-rw-r--r--misc/kde4-l10n-eo/pkg-comment1
-rw-r--r--misc/kde4-l10n-es/Makefile1
-rw-r--r--misc/kde4-l10n-es/pkg-comment1
-rw-r--r--misc/kde4-l10n-et/Makefile1
-rw-r--r--misc/kde4-l10n-et/pkg-comment1
-rw-r--r--misc/kde4-l10n-fi/Makefile1
-rw-r--r--misc/kde4-l10n-fi/pkg-comment1
-rw-r--r--misc/kde4-l10n-is/Makefile1
-rw-r--r--misc/kde4-l10n-is/pkg-comment1
-rw-r--r--misc/kde4-l10n-it/Makefile1
-rw-r--r--misc/kde4-l10n-it/pkg-comment1
-rw-r--r--misc/kde4-l10n-lt/Makefile1
-rw-r--r--misc/kde4-l10n-lt/pkg-comment1
-rw-r--r--misc/kde4-l10n-lv/Makefile1
-rw-r--r--misc/kde4-l10n-lv/pkg-comment1
-rw-r--r--misc/kde4-l10n-nb/Makefile1
-rw-r--r--misc/kde4-l10n-nb/pkg-comment1
-rw-r--r--misc/kde4-l10n-nl/Makefile1
-rw-r--r--misc/kde4-l10n-nl/pkg-comment1
-rw-r--r--misc/kde4-l10n-nn/Makefile1
-rw-r--r--misc/kde4-l10n-nn/pkg-comment1
-rw-r--r--misc/kde4-l10n-ro/Makefile1
-rw-r--r--misc/kde4-l10n-ro/pkg-comment1
-rw-r--r--misc/kde4-l10n-sk/Makefile1
-rw-r--r--misc/kde4-l10n-sk/pkg-comment1
-rw-r--r--misc/kde4-l10n-sl/Makefile1
-rw-r--r--misc/kde4-l10n-sl/pkg-comment1
-rw-r--r--misc/kde4-l10n-sr/Makefile1
-rw-r--r--misc/kde4-l10n-sr/pkg-comment1
-rw-r--r--misc/kde4-l10n-sv/Makefile1
-rw-r--r--misc/kde4-l10n-sv/pkg-comment1
-rw-r--r--misc/kde4-l10n-ta/Makefile1
-rw-r--r--misc/kde4-l10n-ta/pkg-comment1
-rw-r--r--misc/kde4-l10n-th/Makefile1
-rw-r--r--misc/kde4-l10n-th/pkg-comment1
-rw-r--r--misc/kde4-l10n-tr/Makefile1
-rw-r--r--misc/kde4-l10n-tr/pkg-comment1
-rw-r--r--misc/kde4-l10n/Makefile1
-rw-r--r--misc/kde4-l10n/pkg-comment1
-rw-r--r--misc/kdeaddons3/Makefile1
-rw-r--r--misc/kdeaddons3/pkg-comment1
-rw-r--r--misc/kdeedu3/Makefile1
-rw-r--r--misc/kdeedu3/pkg-comment1
-rw-r--r--misc/kdeedu4/Makefile1
-rw-r--r--misc/kdeedu4/pkg-comment1
-rw-r--r--misc/kdeutils3/Makefile1
-rw-r--r--misc/kdeutils3/pkg-comment1
-rw-r--r--misc/kdeutils4/Makefile1
-rw-r--r--misc/kdeutils4/pkg-comment1
-rw-r--r--misc/kp/Makefile1
-rw-r--r--misc/kp/pkg-comment1
-rw-r--r--misc/kwatch/Makefile1
-rw-r--r--misc/kwatch/pkg-comment1
-rw-r--r--misc/libelysium/Makefile1
-rw-r--r--misc/libelysium/pkg-comment1
-rw-r--r--misc/lile/Makefile1
-rw-r--r--misc/lile/pkg-comment1
-rw-r--r--misc/man.el/Makefile1
-rw-r--r--misc/man.el/pkg-comment1
-rw-r--r--misc/menushki/Makefile1
-rw-r--r--misc/menushki/pkg-comment1
-rw-r--r--misc/metatheme2/Makefile1
-rw-r--r--misc/metatheme2/pkg-comment1
-rw-r--r--misc/mgp-mode.el/Makefile1
-rw-r--r--misc/mgp-mode.el/pkg-comment1
-rw-r--r--misc/misterproper/Makefile1
-rw-r--r--misc/misterproper/pkg-comment1
-rw-r--r--misc/mmv/Makefile1
-rw-r--r--misc/mmv/pkg-comment1
-rw-r--r--misc/mshell/Makefile1
-rw-r--r--misc/mshell/pkg-comment1
-rw-r--r--misc/mtx/Makefile1
-rw-r--r--misc/mtx/pkg-comment1
-rw-r--r--misc/p5-Business-CreditCard/Makefile1
-rw-r--r--misc/p5-Business-CreditCard/pkg-comment1
-rw-r--r--misc/p5-Data-Buffer/Makefile1
-rw-r--r--misc/p5-Data-Buffer/pkg-comment1
-rw-r--r--misc/p5-Finance-Quote/Makefile1
-rw-r--r--misc/p5-Finance-Quote/pkg-comment1
-rw-r--r--misc/p5-Geo-Weather/Makefile1
-rw-r--r--misc/p5-Geo-Weather/pkg-comment1
-rw-r--r--misc/p5-I18N-Charset/Makefile1
-rw-r--r--misc/p5-I18N-Charset/pkg-comment1
-rw-r--r--misc/p5-LEGO-RCX/Makefile1
-rw-r--r--misc/p5-LEGO-RCX/pkg-comment1
-rw-r--r--misc/p5-Locale-Codes/Makefile1
-rw-r--r--misc/p5-Locale-Codes/pkg-comment1
-rw-r--r--misc/p5-Locale-Msgcat/Makefile1
-rw-r--r--misc/p5-Locale-Msgcat/pkg-comment1
-rw-r--r--misc/pdmenu/Makefile1
-rw-r--r--misc/pdmenu/pkg-comment1
-rw-r--r--misc/pg/Makefile1
-rw-r--r--misc/pg/pkg-comment1
-rw-r--r--misc/porteasy/Makefile1
-rw-r--r--misc/porteasy/pkg-comment1
-rw-r--r--misc/proxyper/Makefile1
-rw-r--r--misc/proxyper/pkg-comment1
-rw-r--r--misc/py-distutils/Makefile1
-rw-r--r--misc/py-distutils/pkg-comment1
-rw-r--r--misc/pypanda/Makefile1
-rw-r--r--misc/pypanda/pkg-comment1
-rw-r--r--misc/quotes/Makefile1
-rw-r--r--misc/quotes/pkg-comment1
-rw-r--r--misc/reed/Makefile1
-rw-r--r--misc/reed/pkg-comment1
-rw-r--r--misc/rfc/Makefile1
-rw-r--r--misc/rfc/pkg-comment1
-rw-r--r--misc/rtfm/Makefile1
-rw-r--r--misc/rtfm/pkg-comment1
-rw-r--r--misc/screen/Makefile1
-rw-r--r--misc/screen/pkg-comment1
-rw-r--r--misc/seizedesktop/Makefile1
-rw-r--r--misc/seizedesktop/pkg-comment1
-rw-r--r--misc/shuffle/Makefile1
-rw-r--r--misc/shuffle/pkg-comment1
-rw-r--r--misc/since/Makefile1
-rw-r--r--misc/since/pkg-comment1
-rw-r--r--misc/snowflake/Makefile1
-rw-r--r--misc/snowflake/pkg-comment1
-rw-r--r--misc/team/Makefile1
-rw-r--r--misc/team/pkg-comment1
-rw-r--r--misc/tet/Makefile1
-rw-r--r--misc/tet/pkg-comment1
-rw-r--r--misc/tkman/Makefile1
-rw-r--r--misc/tkman/pkg-comment1
-rw-r--r--misc/tvguide/Makefile1
-rw-r--r--misc/tvguide/pkg-comment1
-rw-r--r--misc/uk-phone/Makefile1
-rw-r--r--misc/uk-phone/pkg-comment1
-rw-r--r--misc/uk-postcodes/Makefile1
-rw-r--r--misc/uk-postcodes/pkg-comment1
-rw-r--r--misc/vbidecode/Makefile1
-rw-r--r--misc/vbidecode/pkg-comment1
-rw-r--r--misc/vera/Makefile1
-rw-r--r--misc/vera/pkg-comment1
-rw-r--r--misc/videotext/Makefile1
-rw-r--r--misc/videotext/pkg-comment1
-rw-r--r--misc/wmScoreBoard/Makefile1
-rw-r--r--misc/wmScoreBoard/pkg-comment1
-rw-r--r--misc/wmcp/Makefile1
-rw-r--r--misc/wmcp/pkg-comment1
-rw-r--r--misc/wmessage/Makefile1
-rw-r--r--misc/wmessage/pkg-comment1
-rw-r--r--misc/wmtunlo/Makefile1
-rw-r--r--misc/wmtunlo/pkg-comment1
-rw-r--r--misc/wmweather/Makefile1
-rw-r--r--misc/wmweather/pkg-comment1
-rw-r--r--misc/xd/Makefile1
-rw-r--r--misc/xd/pkg-comment1
-rw-r--r--misc/xgas/Makefile1
-rw-r--r--misc/xgas/pkg-comment1
-rw-r--r--misc/xquote/Makefile1
-rw-r--r--misc/xquote/pkg-comment1
-rw-r--r--multimedia/acme/Makefile1
-rw-r--r--multimedia/acme/pkg-comment1
-rw-r--r--multimedia/camserv/Makefile1
-rw-r--r--multimedia/camserv/pkg-comment1
-rw-r--r--multimedia/dumpmpeg/Makefile1
-rw-r--r--multimedia/dumpmpeg/pkg-comment1
-rw-r--r--multimedia/enjoympeg/Makefile1
-rw-r--r--multimedia/enjoympeg/pkg-comment1
-rw-r--r--multimedia/kdemultimedia3/Makefile1
-rw-r--r--multimedia/kdemultimedia3/pkg-comment1
-rw-r--r--multimedia/kdemultimedia4/Makefile1
-rw-r--r--multimedia/kdemultimedia4/pkg-comment1
-rw-r--r--multimedia/mtv/Makefile1
-rw-r--r--multimedia/mtv/pkg-comment1
-rw-r--r--multimedia/nautilus-media/Makefile1
-rw-r--r--multimedia/nautilus-media/pkg-comment1
-rw-r--r--multimedia/netshow/Makefile1
-rw-r--r--multimedia/netshow/pkg-comment1
-rw-r--r--multimedia/smpeg-xmms/Makefile1
-rw-r--r--multimedia/smpeg-xmms/pkg-comment1
-rw-r--r--multimedia/tkxanim/Makefile1
-rw-r--r--multimedia/tkxanim/pkg-comment1
-rw-r--r--multimedia/vcdpad/Makefile1
-rw-r--r--multimedia/vcdpad/pkg-comment1
-rw-r--r--multimedia/vic/Makefile1
-rw-r--r--multimedia/vic/pkg-comment1
-rw-r--r--multimedia/vlc-devel/Makefile1
-rw-r--r--multimedia/vlc-devel/pkg-comment1
-rw-r--r--multimedia/vlc/Makefile1
-rw-r--r--multimedia/vlc/pkg-comment1
-rw-r--r--multimedia/xmps/Makefile1
-rw-r--r--multimedia/xmps/pkg-comment1
-rw-r--r--net-im/ari-yahoo/Makefile1
-rw-r--r--net-im/ari-yahoo/pkg-comment1
-rw-r--r--net-im/ayttm/Makefile1
-rw-r--r--net-im/ayttm/pkg-comment1
-rw-r--r--net-im/centericq/Makefile1
-rw-r--r--net-im/centericq/pkg-comment1
-rw-r--r--net-im/firetalk/Makefile1
-rw-r--r--net-im/firetalk/pkg-comment1
-rw-r--r--net-im/gicq/Makefile1
-rw-r--r--net-im/gicq/pkg-comment1
-rw-r--r--net-im/jabber-aim/Makefile1
-rw-r--r--net-im/jabber-aim/pkg-comment1
-rw-r--r--net-im/jabber-conference/Makefile1
-rw-r--r--net-im/jabber-conference/pkg-comment1
-rw-r--r--net-im/jabber-jud/Makefile1
-rw-r--r--net-im/jabber-jud/pkg-comment1
-rw-r--r--net-im/jabber/Makefile1
-rw-r--r--net-im/jabber/pkg-comment1
-rw-r--r--net-im/libicq/Makefile1
-rw-r--r--net-im/libicq/pkg-comment1
-rw-r--r--net-im/p5-Net-AIM/Makefile1
-rw-r--r--net-im/p5-Net-AIM/pkg-comment1
-rw-r--r--net-im/p5-Net-ICQ2000/Makefile1
-rw-r--r--net-im/p5-Net-ICQ2000/pkg-comment1
-rw-r--r--net-im/vicq/Makefile1
-rw-r--r--net-im/vicq/pkg-comment1
-rw-r--r--net-im/xicq/Makefile1
-rw-r--r--net-im/xicq/pkg-comment1
-rw-r--r--net-mgmt/argus/Makefile1
-rw-r--r--net-mgmt/argus/pkg-comment1
-rw-r--r--net-mgmt/arpwatch-devel/Makefile1
-rw-r--r--net-mgmt/arpwatch-devel/pkg-comment1
-rw-r--r--net-mgmt/arpwatch/Makefile1
-rw-r--r--net-mgmt/arpwatch/pkg-comment1
-rw-r--r--net-mgmt/bsd-airtools/Makefile1
-rw-r--r--net-mgmt/bsd-airtools/pkg-comment1
-rw-r--r--net-mgmt/clog/Makefile1
-rw-r--r--net-mgmt/clog/pkg-comment1
-rw-r--r--net-mgmt/etherape/Makefile1
-rw-r--r--net-mgmt/etherape/pkg-comment1
-rw-r--r--net-mgmt/ettercap/Makefile1
-rw-r--r--net-mgmt/ettercap/pkg-comment1
-rw-r--r--net-mgmt/icmpmonitor/Makefile1
-rw-r--r--net-mgmt/icmpmonitor/pkg-comment1
-rw-r--r--net-mgmt/ipcalc/Makefile1
-rw-r--r--net-mgmt/ipcalc/pkg-comment1
-rw-r--r--net-mgmt/nbtscan/Makefile1
-rw-r--r--net-mgmt/nbtscan/pkg-comment1
-rw-r--r--net-mgmt/nsc/Makefile1
-rw-r--r--net-mgmt/nsc/pkg-comment1
-rw-r--r--net-mgmt/p5-JUNOScript/Makefile1
-rw-r--r--net-mgmt/p5-JUNOScript/pkg-comment1
-rw-r--r--net-mgmt/p5-NetAddr-IP/Makefile1
-rw-r--r--net-mgmt/p5-NetAddr-IP/pkg-comment1
-rw-r--r--net-mgmt/p5-SNMP-Util/Makefile1
-rw-r--r--net-mgmt/p5-SNMP-Util/pkg-comment1
-rw-r--r--net-mgmt/p5-SNMP_Session/Makefile1
-rw-r--r--net-mgmt/p5-SNMP_Session/pkg-comment1
-rw-r--r--net-mgmt/p5-Tie-NetAddr-IP/Makefile1
-rw-r--r--net-mgmt/p5-Tie-NetAddr-IP/pkg-comment1
-rw-r--r--net-mgmt/ruby-snmp/Makefile1
-rw-r--r--net-mgmt/ruby-snmp/pkg-comment1
-rw-r--r--net-mgmt/sting/Makefile1
-rw-r--r--net-mgmt/sting/pkg-comment1
-rw-r--r--net-mgmt/tcpreplay/Makefile1
-rw-r--r--net-mgmt/tcpreplay/pkg-comment1
-rw-r--r--net-p2p/napshare/Makefile1
-rw-r--r--net-p2p/napshare/pkg-comment1
-rw-r--r--net-p2p/opennap/Makefile1
-rw-r--r--net-p2p/opennap/pkg-comment1
-rw-r--r--net/GeoIP/Makefile1
-rw-r--r--net/GeoIP/pkg-comment1
-rw-r--r--net/archie.el/Makefile1
-rw-r--r--net/archie.el/pkg-comment1
-rw-r--r--net/argus/Makefile1
-rw-r--r--net/argus/pkg-comment1
-rw-r--r--net/ari-yahoo/Makefile1
-rw-r--r--net/ari-yahoo/pkg-comment1
-rw-r--r--net/arla/Makefile1
-rw-r--r--net/arla/pkg-comment1
-rw-r--r--net/arprelease/Makefile1
-rw-r--r--net/arprelease/pkg-comment1
-rw-r--r--net/arpwatch-devel/Makefile1
-rw-r--r--net/arpwatch-devel/pkg-comment1
-rw-r--r--net/arpwatch/Makefile1
-rw-r--r--net/arpwatch/pkg-comment1
-rw-r--r--net/ayttm/Makefile1
-rw-r--r--net/ayttm/pkg-comment1
-rw-r--r--net/b2bua/Makefile1
-rw-r--r--net/b2bua/pkg-comment1
-rw-r--r--net/bind8/Makefile1
-rw-r--r--net/bind8/pkg-comment1
-rw-r--r--net/bing/Makefile1
-rw-r--r--net/bing/pkg-comment1
-rw-r--r--net/bsd-airtools/Makefile1
-rw-r--r--net/bsd-airtools/pkg-comment1
-rw-r--r--net/centericq/Makefile1
-rw-r--r--net/centericq/pkg-comment1
-rw-r--r--net/citrix_ica/Makefile1
-rw-r--r--net/citrix_ica/pkg-comment1
-rw-r--r--net/citrix_xenapp/Makefile1
-rw-r--r--net/citrix_xenapp/pkg-comment1
-rw-r--r--net/clog/Makefile1
-rw-r--r--net/clog/pkg-comment1
-rw-r--r--net/clusterit/Makefile1
-rw-r--r--net/clusterit/pkg-comment1
-rw-r--r--net/coda5_doc/Makefile1
-rw-r--r--net/coda5_doc/pkg-comment1
-rw-r--r--net/cphone/Makefile1
-rw-r--r--net/cphone/pkg-comment1
-rw-r--r--net/ctrace/Makefile1
-rw-r--r--net/ctrace/pkg-comment1
-rw-r--r--net/cvsup-mirror/Makefile1
-rw-r--r--net/cvsup-mirror/pkg-comment1
-rw-r--r--net/cvsupit/Makefile1
-rw-r--r--net/cvsupit/pkg-comment1
-rw-r--r--net/dante/Makefile1
-rw-r--r--net/dante/pkg-comment1
-rw-r--r--net/datapipe/Makefile1
-rw-r--r--net/datapipe/pkg-comment1
-rw-r--r--net/ddclient/Makefile1
-rw-r--r--net/ddclient/pkg-comment1
-rw-r--r--net/delegate/Makefile1
-rw-r--r--net/delegate/pkg-comment1
-rw-r--r--net/dictd/Makefile1
-rw-r--r--net/dictd/pkg-comment1
-rw-r--r--net/dnrd/Makefile1
-rw-r--r--net/dnrd/pkg-comment1
-rw-r--r--net/dnstop/Makefile1
-rw-r--r--net/dnstop/pkg-comment1
-rw-r--r--net/dnswalk/Makefile1
-rw-r--r--net/dnswalk/pkg-comment1
-rw-r--r--net/echoping/Makefile1
-rw-r--r--net/echoping/pkg-comment1
-rw-r--r--net/ekiga/Makefile1
-rw-r--r--net/ekiga/pkg-comment1
-rw-r--r--net/etherape/Makefile1
-rw-r--r--net/etherape/pkg-comment1
-rw-r--r--net/etherboot/Makefile1
-rw-r--r--net/etherboot/pkg-comment1
-rw-r--r--net/ettercap/Makefile1
-rw-r--r--net/ettercap/pkg-comment1
-rw-r--r--net/everybuddy/Makefile1
-rw-r--r--net/everybuddy/pkg-comment1
-rw-r--r--net/ez-ipupdate/Makefile1
-rw-r--r--net/ez-ipupdate/pkg-comment1
-rw-r--r--net/firetalk/Makefile1
-rw-r--r--net/firetalk/pkg-comment1
-rw-r--r--net/freeradius/Makefile1
-rw-r--r--net/freeradius/pkg-comment1
-rw-r--r--net/freeradius2/Makefile1
-rw-r--r--net/freeradius2/pkg-comment1
-rw-r--r--net/gatekeeper/Makefile1
-rw-r--r--net/gatekeeper/pkg-comment1
-rw-r--r--net/geotrace/Makefile1
-rw-r--r--net/geotrace/pkg-comment1
-rw-r--r--net/geta/Makefile1
-rw-r--r--net/geta/pkg-comment1
-rw-r--r--net/ggsd/Makefile1
-rw-r--r--net/ggsd/pkg-comment1
-rw-r--r--net/gicq/Makefile1
-rw-r--r--net/gicq/pkg-comment1
-rw-r--r--net/gkrellmqst/Makefile1
-rw-r--r--net/gkrellmqst/pkg-comment1
-rw-r--r--net/gkrellmwireless/Makefile1
-rw-r--r--net/gkrellmwireless/pkg-comment1
-rw-r--r--net/gnet/Makefile1
-rw-r--r--net/gnet/pkg-comment1
-rw-r--r--net/gnomba/Makefile1
-rw-r--r--net/gnomba/pkg-comment1
-rw-r--r--net/gnomeicu/Makefile1
-rw-r--r--net/gnomeicu/pkg-comment1
-rw-r--r--net/gnomemeeting/Makefile1
-rw-r--r--net/gnomemeeting/pkg-comment1
-rw-r--r--net/gnomemeeting2/Makefile1
-rw-r--r--net/gnomemeeting2/pkg-comment1
-rw-r--r--net/gnometelnet/Makefile1
-rw-r--r--net/gnometelnet/pkg-comment1
-rw-r--r--net/gnut/Makefile1
-rw-r--r--net/gnut/pkg-comment1
-rw-r--r--net/h2n/Makefile1
-rw-r--r--net/h2n/pkg-comment1
-rw-r--r--net/hlmaster/Makefile1
-rw-r--r--net/hlmaster/pkg-comment1
-rw-r--r--net/host/Makefile1
-rw-r--r--net/host/pkg-comment1
-rw-r--r--net/http_ping/Makefile1
-rw-r--r--net/http_ping/pkg-comment1
-rw-r--r--net/icmpmonitor/Makefile1
-rw-r--r--net/icmpmonitor/pkg-comment1
-rw-r--r--net/imm/Makefile1
-rw-r--r--net/imm/pkg-comment1
-rw-r--r--net/ipcalc/Makefile1
-rw-r--r--net/ipcalc/pkg-comment1
-rw-r--r--net/iperf/Makefile1
-rw-r--r--net/iperf/pkg-comment1
-rw-r--r--net/jabber-aim/Makefile1
-rw-r--r--net/jabber-aim/pkg-comment1
-rw-r--r--net/jabber-conference/Makefile1
-rw-r--r--net/jabber-conference/pkg-comment1
-rw-r--r--net/jabber-jud/Makefile1
-rw-r--r--net/jabber-jud/pkg-comment1
-rw-r--r--net/jabber/Makefile1
-rw-r--r--net/jabber/pkg-comment1
-rw-r--r--net/jags/Makefile1
-rw-r--r--net/jags/pkg-comment1
-rw-r--r--net/jumpgate/Makefile1
-rw-r--r--net/jumpgate/pkg-comment1
-rw-r--r--net/kdenetwork3/Makefile1
-rw-r--r--net/kdenetwork3/pkg-comment1
-rw-r--r--net/kdenetwork4/Makefile1
-rw-r--r--net/kdenetwork4/pkg-comment1
-rw-r--r--net/kxicq-devel/Makefile1
-rw-r--r--net/kxicq-devel/pkg-comment1
-rw-r--r--net/l2tpd/Makefile1
-rw-r--r--net/l2tpd/pkg-comment1
-rw-r--r--net/lambdamoo/Makefile1
-rw-r--r--net/lambdamoo/pkg-comment1
-rw-r--r--net/ldapsdk/Makefile1
-rw-r--r--net/ldapsdk/pkg-comment1
-rw-r--r--net/libicq/Makefile1
-rw-r--r--net/libicq/pkg-comment1
-rw-r--r--net/libnet-devel/Makefile1
-rw-r--r--net/libnet-devel/pkg-comment1
-rw-r--r--net/linc/Makefile1
-rw-r--r--net/linc/pkg-comment1
-rw-r--r--net/linphone-base/Makefile1
-rw-r--r--net/linphone-base/pkg-comment1
-rw-r--r--net/linphone/Makefile1
-rw-r--r--net/linphone/pkg-comment1
-rw-r--r--net/linuxigd/Makefile1
-rw-r--r--net/linuxigd/pkg-comment1
-rw-r--r--net/mars_nwe/Makefile1
-rw-r--r--net/mars_nwe/pkg-comment1
-rw-r--r--net/mopd/Makefile1
-rw-r--r--net/mopd/pkg-comment1
-rw-r--r--net/mpd/Makefile1
-rw-r--r--net/mpd/pkg-comment1
-rw-r--r--net/mtr/Makefile1
-rw-r--r--net/mtr/pkg-comment1
-rw-r--r--net/napshare/Makefile1
-rw-r--r--net/napshare/pkg-comment1
-rw-r--r--net/nbtscan/Makefile1
-rw-r--r--net/nbtscan/pkg-comment1
-rw-r--r--net/netcat/Makefile1
-rw-r--r--net/netcat/pkg-comment1
-rw-r--r--net/netspeed_applet/Makefile1
-rw-r--r--net/netspeed_applet/pkg-comment1
-rw-r--r--net/nsc/Makefile1
-rw-r--r--net/nsc/pkg-comment1
-rw-r--r--net/nslint/Makefile1
-rw-r--r--net/nslint/pkg-comment1
-rw-r--r--net/ntp-devel/Makefile1
-rw-r--r--net/ntp-devel/pkg-comment1
-rw-r--r--net/ntp-stable/Makefile1
-rw-r--r--net/ntp-stable/pkg-comment1
-rw-r--r--net/ntp/Makefile1
-rw-r--r--net/ntp/pkg-comment1
-rw-r--r--net/nttcp/Makefile1
-rw-r--r--net/nttcp/pkg-comment1
-rw-r--r--net/obnc/Makefile1
-rw-r--r--net/obnc/pkg-comment1
-rw-r--r--net/ohphone/Makefile1
-rw-r--r--net/ohphone/pkg-comment1
-rw-r--r--net/opal/Makefile1
-rw-r--r--net/opal/pkg-comment1
-rw-r--r--net/opal3/Makefile1
-rw-r--r--net/opal3/pkg-comment1
-rw-r--r--net/openam/Makefile1
-rw-r--r--net/openam/pkg-comment1
-rw-r--r--net/opengatekeeper/Makefile1
-rw-r--r--net/opengatekeeper/pkg-comment1
-rw-r--r--net/opengk/Makefile1
-rw-r--r--net/opengk/pkg-comment1
-rw-r--r--net/openh323-112/Makefile1
-rw-r--r--net/openh323-112/pkg-comment1
-rw-r--r--net/openh323/Makefile1
-rw-r--r--net/openh323/pkg-comment1
-rw-r--r--net/openh323proxy/Makefile1
-rw-r--r--net/openh323proxy/pkg-comment1
-rw-r--r--net/openmcu/Makefile1
-rw-r--r--net/openmcu/pkg-comment1
-rw-r--r--net/ossp-sa/Makefile1
-rw-r--r--net/ossp-sa/pkg-comment1
-rw-r--r--net/p5-File-Rsync/Makefile1
-rw-r--r--net/p5-File-Rsync/pkg-comment1
-rw-r--r--net/p5-Frontier-RPC/Makefile1
-rw-r--r--net/p5-Frontier-RPC/pkg-comment1
-rw-r--r--net/p5-Geo-IP/Makefile1
-rw-r--r--net/p5-Geo-IP/pkg-comment1
-rw-r--r--net/p5-IO-Interface/Makefile1
-rw-r--r--net/p5-IO-Interface/pkg-comment1
-rw-r--r--net/p5-JUNOScript/Makefile1
-rw-r--r--net/p5-JUNOScript/pkg-comment1
-rw-r--r--net/p5-Net-AIM/Makefile1
-rw-r--r--net/p5-Net-AIM/pkg-comment1
-rw-r--r--net/p5-Net-BGP/Makefile1
-rw-r--r--net/p5-Net-BGP/pkg-comment1
-rw-r--r--net/p5-Net-BGP4/Makefile1
-rw-r--r--net/p5-Net-BGP4/pkg-comment1
-rw-r--r--net/p5-Net-DNS-ZoneFile/Makefile1
-rw-r--r--net/p5-Net-DNS-ZoneFile/pkg-comment1
-rw-r--r--net/p5-Net-DNS/Makefile1
-rw-r--r--net/p5-Net-DNS/pkg-comment1
-rw-r--r--net/p5-Net-Daemon/Makefile1
-rw-r--r--net/p5-Net-Daemon/pkg-comment1
-rw-r--r--net/p5-Net-Google/Makefile1
-rw-r--r--net/p5-Net-Google/pkg-comment1
-rw-r--r--net/p5-Net-ICQ2000/Makefile1
-rw-r--r--net/p5-Net-ICQ2000/pkg-comment1
-rw-r--r--net/p5-Net-Radius/Makefile1
-rw-r--r--net/p5-Net-Radius/pkg-comment1
-rw-r--r--net/p5-Net-SMPP/Makefile1
-rw-r--r--net/p5-Net-SMPP/pkg-comment1
-rw-r--r--net/p5-Net-SSH-Perl/Makefile1
-rw-r--r--net/p5-Net-SSH-Perl/pkg-comment1
-rw-r--r--net/p5-Net-Traceroute6/Makefile1
-rw-r--r--net/p5-Net-Traceroute6/pkg-comment1
-rw-r--r--net/p5-Net-Whois-Raw/Makefile1
-rw-r--r--net/p5-Net-Whois-Raw/pkg-comment1
-rw-r--r--net/p5-Net-Whois/Makefile1
-rw-r--r--net/p5-Net-Whois/pkg-comment1
-rw-r--r--net/p5-Net-XWhois/Makefile1
-rw-r--r--net/p5-Net-XWhois/pkg-comment1
-rw-r--r--net/p5-Net-Z3950-SimpleServer/Makefile1
-rw-r--r--net/p5-Net-Z3950-SimpleServer/pkg-comment1
-rw-r--r--net/p5-Net/Makefile1
-rw-r--r--net/p5-Net/pkg-comment1
-rw-r--r--net/p5-NetAddr-IP-Count/Makefile1
-rw-r--r--net/p5-NetAddr-IP-Count/pkg-comment1
-rw-r--r--net/p5-NetAddr-IP/Makefile1
-rw-r--r--net/p5-NetAddr-IP/pkg-comment1
-rw-r--r--net/p5-POE-Component-RRDTool/Makefile1
-rw-r--r--net/p5-POE-Component-RRDTool/pkg-comment1
-rw-r--r--net/p5-PlRPC/Makefile1
-rw-r--r--net/p5-PlRPC/pkg-comment1
-rw-r--r--net/p5-SNMP-Util/Makefile1
-rw-r--r--net/p5-SNMP-Util/pkg-comment1
-rw-r--r--net/p5-SNMP_Session/Makefile1
-rw-r--r--net/p5-SNMP_Session/pkg-comment1
-rw-r--r--net/p5-SOAP-Lite/Makefile1
-rw-r--r--net/p5-SOAP-Lite/pkg-comment1
-rw-r--r--net/p5-Socks/Makefile1
-rw-r--r--net/p5-Socks/pkg-comment1
-rw-r--r--net/p5-Tie-NetAddr-IP/Makefile1
-rw-r--r--net/p5-Tie-NetAddr-IP/pkg-comment1
-rw-r--r--net/p5-perl-ldap/Makefile1
-rw-r--r--net/p5-perl-ldap/pkg-comment1
-rw-r--r--net/passlogd/Makefile1
-rw-r--r--net/passlogd/pkg-comment1
-rw-r--r--net/perldap/Makefile1
-rw-r--r--net/perldap/pkg-comment1
-rw-r--r--net/pim6dd/Makefile1
-rw-r--r--net/pim6dd/pkg-comment1
-rw-r--r--net/pim6sd/Makefile1
-rw-r--r--net/pim6sd/pkg-comment1
-rw-r--r--net/pipsecd/Makefile1
-rw-r--r--net/pipsecd/pkg-comment1
-rw-r--r--net/pppoa/Makefile1
-rw-r--r--net/pppoa/pkg-comment1
-rw-r--r--net/pvm/Makefile1
-rw-r--r--net/pvm/pkg-comment1
-rw-r--r--net/pxe/Makefile1
-rw-r--r--net/pxe/pkg-comment1
-rw-r--r--net/py-soapy/Makefile1
-rw-r--r--net/py-soapy/pkg-comment1
-rw-r--r--net/py-xmlrpclib/Makefile1
-rw-r--r--net/py-xmlrpclib/pkg-comment1
-rw-r--r--net/py-zsi-devel/Makefile1
-rw-r--r--net/py-zsi-devel/pkg-comment1
-rw-r--r--net/py-zsi/Makefile1
-rw-r--r--net/py-zsi/pkg-comment1
-rw-r--r--net/radreport/Makefile1
-rw-r--r--net/radreport/pkg-comment1
-rw-r--r--net/radvd/Makefile1
-rw-r--r--net/radvd/pkg-comment1
-rw-r--r--net/rdist6/Makefile1
-rw-r--r--net/rdist6/pkg-comment1
-rw-r--r--net/ripetools/Makefile1
-rw-r--r--net/ripetools/pkg-comment1
-rw-r--r--net/rqm/Makefile1
-rw-r--r--net/rqm/pkg-comment1
-rw-r--r--net/rtptools/Makefile1
-rw-r--r--net/rtptools/pkg-comment1
-rw-r--r--net/ruby-net-geoip/Makefile1
-rw-r--r--net/ruby-net-geoip/pkg-comment1
-rw-r--r--net/ruby-snmp/Makefile1
-rw-r--r--net/ruby-snmp/pkg-comment1
-rw-r--r--net/ruby-spread/Makefile1
-rw-r--r--net/ruby-spread/pkg-comment1
-rw-r--r--net/samba-devel/Makefile1
-rw-r--r--net/samba-devel/pkg-comment1
-rw-r--r--net/samba-tng/Makefile1
-rw-r--r--net/samba-tng/pkg-comment1
-rw-r--r--net/samba/Makefile1
-rw-r--r--net/samba/pkg-comment1
-rw-r--r--net/samba3/Makefile1
-rw-r--r--net/samba3/pkg-comment1
-rw-r--r--net/sambasentinel/Makefile1
-rw-r--r--net/sambasentinel/pkg-comment1
-rw-r--r--net/sdl_net/Makefile1
-rw-r--r--net/sdl_net/pkg-comment1
-rw-r--r--net/sdr/Makefile1
-rw-r--r--net/sdr/pkg-comment1
-rw-r--r--net/slirp/Makefile1
-rw-r--r--net/slirp/pkg-comment1
-rw-r--r--net/smbfs/Makefile1
-rw-r--r--net/smbfs/pkg-comment1
-rw-r--r--net/ssldump/Makefile1
-rw-r--r--net/ssldump/pkg-comment1
-rw-r--r--net/sting/Makefile1
-rw-r--r--net/sting/pkg-comment1
-rw-r--r--net/suckblow/Makefile1
-rw-r--r--net/suckblow/pkg-comment1
-rw-r--r--net/tcpmssd/Makefile1
-rw-r--r--net/tcpmssd/pkg-comment1
-rw-r--r--net/tcpreplay/Makefile1
-rw-r--r--net/tcpreplay/pkg-comment1
-rw-r--r--net/tcpshow/Makefile1
-rw-r--r--net/tcpshow/pkg-comment1
-rw-r--r--net/tcpslice/Makefile1
-rw-r--r--net/tcpslice/pkg-comment1
-rw-r--r--net/tcpstat/Makefile1
-rw-r--r--net/tcpstat/pkg-comment1
-rw-r--r--net/tcptrace/Makefile1
-rw-r--r--net/tcptrace/pkg-comment1
-rw-r--r--net/telnetx/Makefile1
-rw-r--r--net/telnetx/pkg-comment1
-rw-r--r--net/thcrut/Makefile1
-rw-r--r--net/thcrut/pkg-comment1
-rw-r--r--net/tn3270/Makefile1
-rw-r--r--net/tn3270/pkg-comment1
-rw-r--r--net/traceroute/Makefile1
-rw-r--r--net/traceroute/pkg-comment1
-rw-r--r--net/tramp/Makefile1
-rw-r--r--net/tramp/pkg-comment1
-rw-r--r--net/ttcp/Makefile1
-rw-r--r--net/ttcp/pkg-comment1
-rw-r--r--net/udptunnel/Makefile1
-rw-r--r--net/udptunnel/pkg-comment1
-rw-r--r--net/utftpd/Makefile1
-rw-r--r--net/utftpd/pkg-comment1
-rw-r--r--net/vicq/Makefile1
-rw-r--r--net/vicq/pkg-comment1
-rw-r--r--net/vtun/Makefile1
-rw-r--r--net/vtun/pkg-comment1
-rw-r--r--net/wb/Makefile1
-rw-r--r--net/wb/pkg-comment1
-rw-r--r--net/wmq3/Makefile1
-rw-r--r--net/wmq3/pkg-comment1
-rw-r--r--net/xferstats/Makefile1
-rw-r--r--net/xferstats/pkg-comment1
-rw-r--r--net/xicq/Makefile1
-rw-r--r--net/xicq/pkg-comment1
-rw-r--r--net/xprobe/Makefile1
-rw-r--r--net/xprobe/pkg-comment1
-rw-r--r--net/xtraceroute/Makefile1
-rw-r--r--net/xtraceroute/pkg-comment1
-rw-r--r--net/xwhois/Makefile1
-rw-r--r--net/xwhois/pkg-comment1
-rw-r--r--net/zebra-devel/Makefile1
-rw-r--r--net/zebra-devel/pkg-comment1
-rw-r--r--net/zebra-pj/Makefile1
-rw-r--r--net/zebra-pj/pkg-comment1
-rw-r--r--net/zebra/Makefile1
-rw-r--r--net/zebra/pkg-comment1
-rw-r--r--net/ztelnet/Makefile1
-rw-r--r--net/ztelnet/pkg-comment1
-rw-r--r--news/PicMonger/Makefile1
-rw-r--r--news/PicMonger/pkg-comment1
-rw-r--r--news/atp/Makefile1
-rw-r--r--news/atp/pkg-comment1
-rw-r--r--news/aub/Makefile1
-rw-r--r--news/aub/pkg-comment1
-rw-r--r--news/bgrab/Makefile1
-rw-r--r--news/bgrab/pkg-comment1
-rw-r--r--news/cleanfeed/Makefile1
-rw-r--r--news/cleanfeed/pkg-comment1
-rw-r--r--news/grn/Makefile1
-rw-r--r--news/grn/pkg-comment1
-rw-r--r--news/inn-current/Makefile1
-rw-r--r--news/inn-current/pkg-comment1
-rw-r--r--news/inn-stable/Makefile1
-rw-r--r--news/inn-stable/pkg-comment1
-rw-r--r--news/inn/Makefile1
-rw-r--r--news/inn/pkg-comment1
-rw-r--r--news/leafnode+/Makefile1
-rw-r--r--news/leafnode+/pkg-comment1
-rw-r--r--news/newsgrab/Makefile1
-rw-r--r--news/newsgrab/pkg-comment1
-rw-r--r--news/p5-NNTPClient/Makefile1
-rw-r--r--news/p5-NNTPClient/pkg-comment1
-rw-r--r--news/pan/Makefile1
-rw-r--r--news/pan/pkg-comment1
-rw-r--r--news/plor/Makefile1
-rw-r--r--news/plor/pkg-comment1
-rw-r--r--news/slnr/Makefile1
-rw-r--r--news/slnr/pkg-comment1
-rw-r--r--news/slrn/Makefile1
-rw-r--r--news/slrn/pkg-comment1
-rw-r--r--news/t-gnus/Makefile1
-rw-r--r--news/t-gnus/pkg-comment1
-rw-r--r--news/tin/Makefile1
-rw-r--r--news/tin/pkg-comment1
-rw-r--r--news/trn4/Makefile1
-rw-r--r--news/trn4/pkg-comment1
-rw-r--r--news/xmitbin/Makefile1
-rw-r--r--news/xmitbin/pkg-comment1
-rw-r--r--palm/bibelot/Makefile1
-rw-r--r--palm/bibelot/pkg-comment1
-rw-r--r--palm/gnome-pilot-conduits/Makefile1
-rw-r--r--palm/gnome-pilot-conduits/pkg-comment1
-rw-r--r--palm/gnome-pilot/Makefile1
-rw-r--r--palm/gnome-pilot/pkg-comment1
-rw-r--r--palm/gnomepilot-conduits/Makefile1
-rw-r--r--palm/gnomepilot-conduits/pkg-comment1
-rw-r--r--palm/gnomepilot-conduits2/Makefile1
-rw-r--r--palm/gnomepilot-conduits2/pkg-comment1
-rw-r--r--palm/gnomepilot/Makefile1
-rw-r--r--palm/gnomepilot/pkg-comment1
-rw-r--r--palm/gnomepilot2/Makefile1
-rw-r--r--palm/gnomepilot2/pkg-comment1
-rw-r--r--palm/imgvtopgm/Makefile1
-rw-r--r--palm/imgvtopgm/pkg-comment1
-rw-r--r--palm/isilo/Makefile1
-rw-r--r--palm/isilo/pkg-comment1
-rw-r--r--palm/malsync/Makefile1
-rw-r--r--palm/malsync/pkg-comment1
-rw-r--r--palm/pilot-link-devel/Makefile1
-rw-r--r--palm/pilot-link-devel/pkg-comment1
-rw-r--r--palm/pilot-link/Makefile1
-rw-r--r--palm/pilot-link/pkg-comment1
-rw-r--r--palm/romeo/Makefile1
-rw-r--r--palm/romeo/pkg-comment1
-rw-r--r--palm/syncmal/Makefile1
-rw-r--r--palm/syncmal/pkg-comment1
-rw-r--r--picobsd/ssh-picobsd/Makefile1
-rw-r--r--picobsd/ssh-picobsd/pkg-comment1
-rw-r--r--polish/kde3-i18n/Makefile1
-rw-r--r--polish/kde3-i18n/pkg-comment1
-rw-r--r--polish/kde4-l10n/Makefile1
-rw-r--r--polish/kde4-l10n/pkg-comment1
-rw-r--r--ports-mgmt/p5-FreeBSD-Ports/Makefile1
-rw-r--r--ports-mgmt/p5-FreeBSD-Ports/pkg-comment1
-rw-r--r--ports-mgmt/porteasy/Makefile1
-rw-r--r--ports-mgmt/porteasy/pkg-comment1
-rw-r--r--ports-mgmt/portlint/Makefile1
-rw-r--r--ports-mgmt/portlint/pkg-comment1
-rw-r--r--portuguese/kde3-i18n-pt_BR/Makefile1
-rw-r--r--portuguese/kde3-i18n-pt_BR/pkg-comment1
-rw-r--r--portuguese/kde3-i18n/Makefile1
-rw-r--r--portuguese/kde3-i18n/pkg-comment1
-rw-r--r--portuguese/kde4-l10n-pt_BR/Makefile1
-rw-r--r--portuguese/kde4-l10n-pt_BR/pkg-comment1
-rw-r--r--portuguese/kde4-l10n/Makefile1
-rw-r--r--portuguese/kde4-l10n/pkg-comment1
-rw-r--r--portuguese/staroffice52/Makefile1
-rw-r--r--portuguese/staroffice52/pkg-comment1
-rw-r--r--print/a2ps-letter/Makefile1
-rw-r--r--print/a2ps-letter/pkg-comment1
-rw-r--r--print/abc2mtex/Makefile1
-rw-r--r--print/abc2mtex/pkg-comment1
-rw-r--r--print/acrobatviewer/Makefile1
-rw-r--r--print/acrobatviewer/pkg-comment1
-rw-r--r--print/acroread/Makefile1
-rw-r--r--print/acroread/pkg-comment1
-rw-r--r--print/acroread4/Makefile1
-rw-r--r--print/acroread4/pkg-comment1
-rw-r--r--print/adobe-cmaps/Makefile1
-rw-r--r--print/adobe-cmaps/pkg-comment1
-rw-r--r--print/apsfilter/Makefile1
-rw-r--r--print/apsfilter/pkg-comment1
-rw-r--r--print/auctex/Makefile1
-rw-r--r--print/auctex/pkg-comment1
-rw-r--r--print/c2ps-letter/Makefile1
-rw-r--r--print/c2ps-letter/pkg-comment1
-rw-r--r--print/cjk-lyx/Makefile1
-rw-r--r--print/cjk-lyx/pkg-comment1
-rw-r--r--print/cups-base/Makefile1
-rw-r--r--print/cups-base/pkg-comment1
-rw-r--r--print/cups-lpr/Makefile1
-rw-r--r--print/cups-lpr/pkg-comment1
-rw-r--r--print/cups-pstoraster/Makefile1
-rw-r--r--print/cups-pstoraster/pkg-comment1
-rw-r--r--print/cups/Makefile1
-rw-r--r--print/cups/pkg-comment1
-rw-r--r--print/dvi2xx/Makefile1
-rw-r--r--print/dvi2xx/pkg-comment1
-rw-r--r--print/dvips/Makefile1
-rw-r--r--print/dvips/pkg-comment1
-rw-r--r--print/dviselect/Makefile1
-rw-r--r--print/dviselect/pkg-comment1
-rw-r--r--print/freetype2/Makefile1
-rw-r--r--print/freetype2/pkg-comment1
-rw-r--r--print/ggv/Makefile1
-rw-r--r--print/ggv/pkg-comment1
-rw-r--r--print/ggv2/Makefile1
-rw-r--r--print/ggv2/pkg-comment1
-rw-r--r--print/gnome-print/Makefile1
-rw-r--r--print/gnome-print/pkg-comment1
-rw-r--r--print/gnomeprint/Makefile1
-rw-r--r--print/gnomeprint/pkg-comment1
-rw-r--r--print/html2latex/Makefile1
-rw-r--r--print/html2latex/pkg-comment1
-rw-r--r--print/hugelatex/Makefile1
-rw-r--r--print/hugelatex/pkg-comment1
-rw-r--r--print/jadetex/Makefile1
-rw-r--r--print/jadetex/pkg-comment1
-rw-r--r--print/latex/Makefile1
-rw-r--r--print/latex/pkg-comment1
-rw-r--r--print/latex2rtf/Makefile1
-rw-r--r--print/latex2rtf/pkg-comment1
-rw-r--r--print/libgnomeprint/Makefile1
-rw-r--r--print/libgnomeprint/pkg-comment1
-rw-r--r--print/magicfilter/Makefile1
-rw-r--r--print/magicfilter/pkg-comment1
-rw-r--r--print/makeindex/Makefile1
-rw-r--r--print/makeindex/pkg-comment1
-rw-r--r--print/mp-letter/Makefile1
-rw-r--r--print/mp-letter/pkg-comment1
-rw-r--r--print/musixtex/Makefile1
-rw-r--r--print/musixtex/pkg-comment1
-rw-r--r--print/p5-GnomePrint/Makefile1
-rw-r--r--print/p5-GnomePrint/pkg-comment1
-rw-r--r--print/p5-PostScript-Simple/Makefile1
-rw-r--r--print/p5-PostScript-Simple/pkg-comment1
-rw-r--r--print/p5-Text-PDF/Makefile1
-rw-r--r--print/p5-Text-PDF/pkg-comment1
-rw-r--r--print/passivetex/Makefile1
-rw-r--r--print/passivetex/pkg-comment1
-rw-r--r--print/pdflib3/Makefile1
-rw-r--r--print/pdflib3/pkg-comment1
-rw-r--r--print/perlftlib/Makefile1
-rw-r--r--print/perlftlib/pkg-comment1
-rw-r--r--print/preview-latex/Makefile1
-rw-r--r--print/preview-latex/pkg-comment1
-rw-r--r--print/psutils-letter/Makefile1
-rw-r--r--print/psutils-letter/pkg-comment1
-rw-r--r--print/py-freetype/Makefile1
-rw-r--r--print/py-freetype/pkg-comment1
-rw-r--r--print/rlpr/Makefile1
-rw-r--r--print/rlpr/pkg-comment1
-rw-r--r--print/tex/Makefile1
-rw-r--r--print/tex/pkg-comment1
-rw-r--r--print/transfig/Makefile1
-rw-r--r--print/transfig/pkg-comment1
-rw-r--r--print/trueprint/Makefile1
-rw-r--r--print/trueprint/pkg-comment1
-rw-r--r--print/ttftot42/Makefile1
-rw-r--r--print/ttftot42/pkg-comment1
-rw-r--r--print/virtualpaper/Makefile1
-rw-r--r--print/virtualpaper/pkg-comment1
-rw-r--r--print/wmlpq/Makefile1
-rw-r--r--print/wmlpq/pkg-comment1
-rw-r--r--print/xdvi/Makefile1
-rw-r--r--print/xdvi/pkg-comment1
-rw-r--r--print/xmltex/Makefile1
-rw-r--r--print/xmltex/pkg-comment1
-rw-r--r--russian/X.language/Makefile1
-rw-r--r--russian/X.language/pkg-comment1
-rw-r--r--russian/d1489/Makefile1
-rw-r--r--russian/d1489/pkg-comment1
-rw-r--r--russian/elm.language/Makefile1
-rw-r--r--russian/elm.language/pkg-comment1
-rw-r--r--russian/kde3-i18n/Makefile1
-rw-r--r--russian/kde3-i18n/pkg-comment1
-rw-r--r--russian/kde4-l10n/Makefile1
-rw-r--r--russian/kde4-l10n/pkg-comment1
-rw-r--r--russian/koi8r-ps/Makefile1
-rw-r--r--russian/koi8r-ps/pkg-comment1
-rw-r--r--russian/p5-XML-Parser-encodings/Makefile1
-rw-r--r--russian/p5-XML-Parser-encodings/pkg-comment1
-rw-r--r--russian/pgp.language/Makefile1
-rw-r--r--russian/pgp.language/pkg-comment1
-rw-r--r--russian/pine.language/Makefile1
-rw-r--r--russian/pine.language/pkg-comment1
-rw-r--r--russian/pscyr/Makefile1
-rw-r--r--russian/pscyr/pkg-comment1
-rw-r--r--russian/rus-ispell/Makefile1
-rw-r--r--russian/rus-ispell/pkg-comment1
-rw-r--r--science/hdf/Makefile1
-rw-r--r--science/hdf/pkg-comment1
-rw-r--r--science/mpqc/Makefile1
-rw-r--r--science/mpqc/pkg-comment1
-rw-r--r--security/aafid2/Makefile1
-rw-r--r--security/aafid2/pkg-comment1
-rw-r--r--security/aide/Makefile1
-rw-r--r--security/aide/pkg-comment1
-rw-r--r--security/audit/Makefile1
-rw-r--r--security/audit/pkg-comment1
-rw-r--r--security/authforce/Makefile1
-rw-r--r--security/authforce/pkg-comment1
-rw-r--r--security/beecrypt/Makefile1
-rw-r--r--security/beecrypt/pkg-comment1
-rw-r--r--security/bfbtester/Makefile1
-rw-r--r--security/bfbtester/pkg-comment1
-rw-r--r--security/calife-devel/Makefile1
-rw-r--r--security/calife-devel/pkg-comment1
-rw-r--r--security/calife/Makefile1
-rw-r--r--security/calife/pkg-comment1
-rw-r--r--security/cfs/Makefile1
-rw-r--r--security/cfs/pkg-comment1
-rw-r--r--security/checkpassword/Makefile1
-rw-r--r--security/checkpassword/pkg-comment1
-rw-r--r--security/chrootuid/Makefile1
-rw-r--r--security/chrootuid/pkg-comment1
-rw-r--r--security/cksfv/Makefile1
-rw-r--r--security/cksfv/pkg-comment1
-rw-r--r--security/cryptopp/Makefile1
-rw-r--r--security/cryptopp/pkg-comment1
-rw-r--r--security/donkey/Makefile1
-rw-r--r--security/donkey/pkg-comment1
-rw-r--r--security/drwebd/Makefile1
-rw-r--r--security/drwebd/pkg-comment1
-rw-r--r--security/dsniff/Makefile1
-rw-r--r--security/dsniff/pkg-comment1
-rw-r--r--security/fakebo/Makefile1
-rw-r--r--security/fakebo/pkg-comment1
-rw-r--r--security/fpm/Makefile1
-rw-r--r--security/fpm/pkg-comment1
-rw-r--r--security/fragrouter/Makefile1
-rw-r--r--security/fragrouter/pkg-comment1
-rw-r--r--security/fsh/Makefile1
-rw-r--r--security/fsh/pkg-comment1
-rw-r--r--security/fwanalog/Makefile1
-rw-r--r--security/fwanalog/pkg-comment1
-rw-r--r--security/gringotts/Makefile1
-rw-r--r--security/gringotts/pkg-comment1
-rw-r--r--security/gtk-knocker/Makefile1
-rw-r--r--security/gtk-knocker/pkg-comment1
-rw-r--r--security/ipfmeta/Makefile1
-rw-r--r--security/ipfmeta/pkg-comment1
-rw-r--r--security/its4/Makefile1
-rw-r--r--security/its4/pkg-comment1
-rw-r--r--security/keynote/Makefile1
-rw-r--r--security/keynote/pkg-comment1
-rw-r--r--security/keyprint/Makefile1
-rw-r--r--security/keyprint/pkg-comment1
-rw-r--r--security/kgpg-kde4/Makefile1
-rw-r--r--security/kgpg-kde4/pkg-comment1
-rw-r--r--security/knocker/Makefile1
-rw-r--r--security/knocker/pkg-comment1
-rw-r--r--security/krb5-16/Makefile1
-rw-r--r--security/krb5-16/pkg-comment1
-rw-r--r--security/krb5-17/Makefile1
-rw-r--r--security/krb5-17/pkg-comment1
-rw-r--r--security/krb5-appl/Makefile1
-rw-r--r--security/krb5-appl/pkg-comment1
-rw-r--r--security/krb5-beta/Makefile1
-rw-r--r--security/krb5-beta/pkg-comment1
-rw-r--r--security/krb5/Makefile1
-rw-r--r--security/krb5/pkg-comment1
-rw-r--r--security/kssh/Makefile1
-rw-r--r--security/kssh/pkg-comment1
-rw-r--r--security/kwallet/Makefile1
-rw-r--r--security/kwallet/pkg-comment1
-rw-r--r--security/libgringotts/Makefile1
-rw-r--r--security/libgringotts/pkg-comment1
-rw-r--r--security/liedentd/Makefile1
-rw-r--r--security/liedentd/pkg-comment1
-rw-r--r--security/lxnb/Makefile1
-rw-r--r--security/lxnb/pkg-comment1
-rw-r--r--security/mussh/Makefile1
-rw-r--r--security/mussh/pkg-comment1
-rw-r--r--security/nss/Makefile1
-rw-r--r--security/nss/pkg-comment1
-rw-r--r--security/openssh-askpass/Makefile1
-rw-r--r--security/openssh-askpass/pkg-comment1
-rw-r--r--security/opieprint/Makefile1
-rw-r--r--security/opieprint/pkg-comment1
-rw-r--r--security/p5-Authen-PAM/Makefile1
-rw-r--r--security/p5-Authen-PAM/pkg-comment1
-rw-r--r--security/p5-Crypt-Cryptix/Makefile1
-rw-r--r--security/p5-Crypt-Cryptix/pkg-comment1
-rw-r--r--security/p5-Crypt-DES_EDE3/Makefile1
-rw-r--r--security/p5-Crypt-DES_EDE3/pkg-comment1
-rw-r--r--security/p5-Crypt-DH/Makefile1
-rw-r--r--security/p5-Crypt-DH/pkg-comment1
-rw-r--r--security/p5-Crypt-DSA/Makefile1
-rw-r--r--security/p5-Crypt-DSA/pkg-comment1
-rw-r--r--security/p5-Crypt-ECB/Makefile1
-rw-r--r--security/p5-Crypt-ECB/pkg-comment1
-rw-r--r--security/p5-Crypt-PassGen/Makefile1
-rw-r--r--security/p5-Crypt-PassGen/pkg-comment1
-rw-r--r--security/p5-Crypt-Primes/Makefile1
-rw-r--r--security/p5-Crypt-Primes/pkg-comment1
-rw-r--r--security/p5-Crypt-RIPEMD160/Makefile1
-rw-r--r--security/p5-Crypt-RIPEMD160/pkg-comment1
-rw-r--r--security/p5-Crypt-RSA/Makefile1
-rw-r--r--security/p5-Crypt-RSA/pkg-comment1
-rw-r--r--security/p5-Crypt-Random/Makefile1
-rw-r--r--security/p5-Crypt-Random/pkg-comment1
-rw-r--r--security/p5-Digest-BubbleBabble/Makefile1
-rw-r--r--security/p5-Digest-BubbleBabble/pkg-comment1
-rw-r--r--security/p5-Digest-MD2/Makefile1
-rw-r--r--security/p5-Digest-MD2/pkg-comment1
-rw-r--r--security/p5-Digest-MD5/Makefile1
-rw-r--r--security/p5-Digest-MD5/pkg-comment1
-rw-r--r--security/p5-Digest-Nilsimsa/Makefile1
-rw-r--r--security/p5-Digest-Nilsimsa/pkg-comment1
-rw-r--r--security/p5-Digest/Makefile1
-rw-r--r--security/p5-Digest/pkg-comment1
-rw-r--r--security/p5-Filter-CBC/Makefile1
-rw-r--r--security/p5-Filter-CBC/pkg-comment1
-rw-r--r--security/p5-IO-Socket-SSL/Makefile1
-rw-r--r--security/p5-IO-Socket-SSL/pkg-comment1
-rw-r--r--security/p5-Tie-EncryptedHash/Makefile1
-rw-r--r--security/p5-Tie-EncryptedHash/pkg-comment1
-rw-r--r--security/pam-mysql/Makefile1
-rw-r--r--security/pam-mysql/pkg-comment1
-rw-r--r--security/pam_alreadyloggedin/Makefile1
-rw-r--r--security/pam_alreadyloggedin/pkg-comment1
-rw-r--r--security/pam_krb5/Makefile1
-rw-r--r--security/pam_krb5/pkg-comment1
-rw-r--r--security/pgp/Makefile1
-rw-r--r--security/pgp/pkg-comment1
-rw-r--r--security/pgp5/Makefile1
-rw-r--r--security/pgp5/pkg-comment1
-rw-r--r--security/portscanner/Makefile1
-rw-r--r--security/portscanner/pkg-comment1
-rw-r--r--security/ppgen/Makefile1
-rw-r--r--security/ppgen/pkg-comment1
-rw-r--r--security/pscan/Makefile1
-rw-r--r--security/pscan/pkg-comment1
-rw-r--r--security/pwman/Makefile1
-rw-r--r--security/pwman/pkg-comment1
-rw-r--r--security/py-pycrypto/Makefile1
-rw-r--r--security/py-pycrypto/pkg-comment1
-rw-r--r--security/qident/Makefile1
-rw-r--r--security/qident/pkg-comment1
-rw-r--r--security/qtfw/Makefile1
-rw-r--r--security/qtfw/pkg-comment1
-rw-r--r--security/racoon/Makefile1
-rw-r--r--security/racoon/pkg-comment1
-rw-r--r--security/racoon2/Makefile1
-rw-r--r--security/racoon2/pkg-comment1
-rw-r--r--security/radiusniff/Makefile1
-rw-r--r--security/radiusniff/pkg-comment1
-rw-r--r--security/rain/Makefile1
-rw-r--r--security/rain/pkg-comment1
-rw-r--r--security/rats/Makefile1
-rw-r--r--security/rats/pkg-comment1
-rw-r--r--security/rsaref/Makefile1
-rw-r--r--security/rsaref/pkg-comment1
-rw-r--r--security/saferpay/Makefile1
-rw-r--r--security/saferpay/pkg-comment1
-rw-r--r--security/safesh/Makefile1
-rw-r--r--security/safesh/pkg-comment1
-rw-r--r--security/scanssh/Makefile1
-rw-r--r--security/scanssh/pkg-comment1
-rw-r--r--security/secpanel/Makefile1
-rw-r--r--security/secpanel/pkg-comment1
-rw-r--r--security/siphon/Makefile1
-rw-r--r--security/siphon/pkg-comment1
-rw-r--r--security/skip/Makefile1
-rw-r--r--security/skip/pkg-comment1
-rw-r--r--security/snort/Makefile1
-rw-r--r--security/snort/pkg-comment1
-rw-r--r--security/snortsnarf/Makefile1
-rw-r--r--security/snortsnarf/pkg-comment1
-rw-r--r--security/ssh-multiadd/Makefile1
-rw-r--r--security/ssh-multiadd/pkg-comment1
-rw-r--r--security/sst/Makefile1
-rw-r--r--security/sst/pkg-comment1
-rw-r--r--security/sudo/Makefile1
-rw-r--r--security/sudo/pkg-comment1
-rw-r--r--security/super/Makefile1
-rw-r--r--security/super/pkg-comment1
-rw-r--r--security/tripwire-131/Makefile1
-rw-r--r--security/tripwire-131/pkg-comment1
-rw-r--r--security/tripwire/Makefile1
-rw-r--r--security/tripwire/pkg-comment1
-rw-r--r--security/vlock/Makefile1
-rw-r--r--security/vlock/pkg-comment1
-rw-r--r--security/vncrypt/Makefile1
-rw-r--r--security/vncrypt/pkg-comment1
-rw-r--r--security/vpnd/Makefile1
-rw-r--r--security/vpnd/pkg-comment1
-rw-r--r--security/vscan/Makefile1
-rw-r--r--security/vscan/pkg-comment1
-rw-r--r--security/whisker/Makefile1
-rw-r--r--security/whisker/pkg-comment1
-rw-r--r--security/xinetd/Makefile1
-rw-r--r--security/xinetd/pkg-comment1
-rw-r--r--shells/bash/Makefile1
-rw-r--r--shells/bash/pkg-comment1
-rw-r--r--shells/bash2/Makefile1
-rw-r--r--shells/bash2/pkg-comment1
-rw-r--r--shells/bash3/Makefile1
-rw-r--r--shells/bash3/pkg-comment1
-rw-r--r--shells/mudsh/Makefile1
-rw-r--r--shells/mudsh/pkg-comment1
-rw-r--r--shells/osh/Makefile1
-rw-r--r--shells/osh/pkg-comment1
-rw-r--r--shells/pash/Makefile1
-rw-r--r--shells/pash/pkg-comment1
-rw-r--r--shells/pdksh/Makefile1
-rw-r--r--shells/pdksh/pkg-comment1
-rw-r--r--shells/sash/Makefile1
-rw-r--r--shells/sash/pkg-comment1
-rw-r--r--shells/wapsh/Makefile1
-rw-r--r--shells/wapsh/pkg-comment1
-rw-r--r--shells/zsh-devel/Makefile1
-rw-r--r--shells/zsh-devel/pkg-comment1
-rw-r--r--sysutils/3dm/Makefile1
-rw-r--r--sysutils/3dm/pkg-comment1
-rw-r--r--sysutils/44bsd-more/Makefile1
-rw-r--r--sysutils/44bsd-more/pkg-comment1
-rw-r--r--sysutils/ascpu/Makefile1
-rw-r--r--sysutils/ascpu/pkg-comment1
-rw-r--r--sysutils/bbapm/Makefile1
-rw-r--r--sysutils/bbapm/pkg-comment1
-rw-r--r--sysutils/cd-write/Makefile1
-rw-r--r--sysutils/cd-write/pkg-comment1
-rw-r--r--sysutils/cd9660_unicode/Makefile1
-rw-r--r--sysutils/cd9660_unicode/pkg-comment1
-rw-r--r--sysutils/cdroot/Makefile1
-rw-r--r--sysutils/cdroot/pkg-comment1
-rw-r--r--sysutils/cfengine/Makefile1
-rw-r--r--sysutils/cfengine/pkg-comment1
-rw-r--r--sysutils/cfengine2/Makefile1
-rw-r--r--sysutils/cfengine2/pkg-comment1
-rw-r--r--sysutils/cfengine3-legacy/Makefile1
-rw-r--r--sysutils/cfengine3-legacy/pkg-comment1
-rw-r--r--sysutils/cfengine3/Makefile1
-rw-r--r--sysutils/cfengine3/pkg-comment1
-rw-r--r--sysutils/colorize/Makefile1
-rw-r--r--sysutils/colorize/pkg-comment1
-rw-r--r--sysutils/comconsole/Makefile1
-rw-r--r--sysutils/comconsole/pkg-comment1
-rw-r--r--sysutils/cpdup/Makefile1
-rw-r--r--sysutils/cpdup/pkg-comment1
-rw-r--r--sysutils/dirdiff/Makefile1
-rw-r--r--sysutils/dirdiff/pkg-comment1
-rw-r--r--sysutils/eject/Makefile1
-rw-r--r--sysutils/eject/pkg-comment1
-rw-r--r--sysutils/fortunelock/Makefile1
-rw-r--r--sysutils/fortunelock/pkg-comment1
-rw-r--r--sysutils/ftrace/Makefile1
-rw-r--r--sysutils/ftrace/pkg-comment1
-rw-r--r--sysutils/gconf-editor/Makefile1
-rw-r--r--sysutils/gconf-editor/pkg-comment1
-rw-r--r--sysutils/gkrellflynn/Makefile1
-rw-r--r--sysutils/gkrellflynn/pkg-comment1
-rw-r--r--sysutils/gkrellmouse/Makefile1
-rw-r--r--sysutils/gkrellmouse/pkg-comment1
-rw-r--r--sysutils/glload/Makefile1
-rw-r--r--sysutils/glload/pkg-comment1
-rw-r--r--sysutils/gnome-control-center/Makefile1
-rw-r--r--sysutils/gnome-control-center/pkg-comment1
-rw-r--r--sysutils/gnome-control-center1/Makefile1
-rw-r--r--sysutils/gnome-control-center1/pkg-comment1
-rw-r--r--sysutils/gnome-pkgview/Makefile1
-rw-r--r--sysutils/gnome-pkgview/pkg-comment1
-rw-r--r--sysutils/gnome-system-monitor/Makefile1
-rw-r--r--sysutils/gnome-system-monitor/pkg-comment1
-rw-r--r--sysutils/gnomecontrolcenter/Makefile1
-rw-r--r--sysutils/gnomecontrolcenter/pkg-comment1
-rw-r--r--sysutils/gnomecontrolcenter2/Makefile1
-rw-r--r--sysutils/gnomecontrolcenter2/pkg-comment1
-rw-r--r--sysutils/gnomefind/Makefile1
-rw-r--r--sysutils/gnomefind/pkg-comment1
-rw-r--r--sysutils/gnomesystemmonitor/Makefile1
-rw-r--r--sysutils/gnomesystemmonitor/pkg-comment1
-rw-r--r--sysutils/grub/Makefile1
-rw-r--r--sysutils/grub/pkg-comment1
-rw-r--r--sysutils/gtop/Makefile1
-rw-r--r--sysutils/gtop/pkg-comment1
-rw-r--r--sysutils/gupsc/Makefile1
-rw-r--r--sysutils/gupsc/pkg-comment1
-rw-r--r--sysutils/installwatch/Makefile1
-rw-r--r--sysutils/installwatch/pkg-comment1
-rw-r--r--sysutils/jailer/Makefile1
-rw-r--r--sysutils/jailer/pkg-comment1
-rw-r--r--sysutils/jailutils/Makefile1
-rw-r--r--sysutils/jailutils/pkg-comment1
-rw-r--r--sysutils/kdeadmin3/Makefile1
-rw-r--r--sysutils/kdeadmin3/pkg-comment1
-rw-r--r--sysutils/kdeadmin4/Makefile1
-rw-r--r--sysutils/kdeadmin4/pkg-comment1
-rw-r--r--sysutils/kdf/Makefile1
-rw-r--r--sysutils/kdf/pkg-comment1
-rw-r--r--sysutils/kfloppy/Makefile1
-rw-r--r--sysutils/kfloppy/pkg-comment1
-rw-r--r--sysutils/lavaps/Makefile1
-rw-r--r--sysutils/lavaps/pkg-comment1
-rw-r--r--sysutils/libretto-config/Makefile1
-rw-r--r--sysutils/libretto-config/pkg-comment1
-rw-r--r--sysutils/lmmon/Makefile1
-rw-r--r--sysutils/lmmon/pkg-comment1
-rw-r--r--sysutils/log_analysis/Makefile1
-rw-r--r--sysutils/log_analysis/pkg-comment1
-rw-r--r--sysutils/lsof/Makefile1
-rw-r--r--sysutils/lsof/pkg-comment1
-rw-r--r--sysutils/medusa/Makefile1
-rw-r--r--sysutils/medusa/pkg-comment1
-rw-r--r--sysutils/mgeupsd/Makefile1
-rw-r--r--sysutils/mgeupsd/pkg-comment1
-rw-r--r--sysutils/msyslog/Makefile1
-rw-r--r--sysutils/msyslog/pkg-comment1
-rw-r--r--sysutils/no-login/Makefile1
-rw-r--r--sysutils/no-login/pkg-comment1
-rw-r--r--sysutils/nut/Makefile1
-rw-r--r--sysutils/nut/pkg-comment1
-rw-r--r--sysutils/nut22/Makefile1
-rw-r--r--sysutils/nut22/pkg-comment1
-rw-r--r--sysutils/nwclient/Makefile1
-rw-r--r--sysutils/nwclient/pkg-comment1
-rw-r--r--sysutils/nwclient602/Makefile1
-rw-r--r--sysutils/nwclient602/pkg-comment1
-rw-r--r--sysutils/p5-File-Which/Makefile1
-rw-r--r--sysutils/p5-File-Which/pkg-comment1
-rw-r--r--sysutils/p5-Filesys-DiskSpace/Makefile1
-rw-r--r--sysutils/p5-Filesys-DiskSpace/pkg-comment1
-rw-r--r--sysutils/p5-Schedule-Cron/Makefile1
-rw-r--r--sysutils/p5-Schedule-Cron/pkg-comment1
-rw-r--r--sysutils/p5-Schedule-Match/Makefile1
-rw-r--r--sysutils/p5-Schedule-Match/pkg-comment1
-rw-r--r--sysutils/p5-Stat-lsMode/Makefile1
-rw-r--r--sysutils/p5-Stat-lsMode/pkg-comment1
-rw-r--r--sysutils/p5-SyslogScan/Makefile1
-rw-r--r--sysutils/p5-SyslogScan/pkg-comment1
-rw-r--r--sysutils/paicc/Makefile1
-rw-r--r--sysutils/paicc/pkg-comment1
-rw-r--r--sysutils/pmap/Makefile1
-rw-r--r--sysutils/pmap/pkg-comment1
-rw-r--r--sysutils/procmap/Makefile1
-rw-r--r--sysutils/procmap/pkg-comment1
-rw-r--r--sysutils/pstree/Makefile1
-rw-r--r--sysutils/pstree/pkg-comment1
-rw-r--r--sysutils/pyfind/Makefile1
-rw-r--r--sysutils/pyfind/pkg-comment1
-rw-r--r--sysutils/readlink/Makefile1
-rw-r--r--sysutils/readlink/pkg-comment1
-rw-r--r--sysutils/reed/Makefile1
-rw-r--r--sysutils/reed/pkg-comment1
-rw-r--r--sysutils/roottail/Makefile1
-rw-r--r--sysutils/roottail/pkg-comment1
-rw-r--r--sysutils/samefile/Makefile1
-rw-r--r--sysutils/samefile/pkg-comment1
-rw-r--r--sysutils/screen/Makefile1
-rw-r--r--sysutils/screen/pkg-comment1
-rw-r--r--sysutils/service-config/Makefile1
-rw-r--r--sysutils/service-config/pkg-comment1
-rw-r--r--sysutils/shlock/Makefile1
-rw-r--r--sysutils/shlock/pkg-comment1
-rw-r--r--sysutils/su2/Makefile1
-rw-r--r--sysutils/su2/pkg-comment1
-rw-r--r--sysutils/sweeper/Makefile1
-rw-r--r--sysutils/sweeper/pkg-comment1
-rw-r--r--sysutils/ticker.app/Makefile1
-rw-r--r--sysutils/ticker.app/pkg-comment1
-rw-r--r--sysutils/tmpwatch/Makefile1
-rw-r--r--sysutils/tmpwatch/pkg-comment1
-rw-r--r--sysutils/whowatch/Makefile1
-rw-r--r--sysutils/whowatch/pkg-comment1
-rw-r--r--sysutils/wmapm/Makefile1
-rw-r--r--sysutils/wmapm/pkg-comment1
-rw-r--r--sysutils/wmapmload/Makefile1
-rw-r--r--sysutils/wmapmload/pkg-comment1
-rw-r--r--sysutils/wmbattery/Makefile1
-rw-r--r--sysutils/wmbattery/pkg-comment1
-rw-r--r--sysutils/wmcpuload/Makefile1
-rw-r--r--sysutils/wmcpuload/pkg-comment1
-rw-r--r--sysutils/wmcube-gdk/Makefile1
-rw-r--r--sysutils/wmcube-gdk/pkg-comment1
-rw-r--r--sysutils/wmcube/Makefile1
-rw-r--r--sysutils/wmcube/pkg-comment1
-rw-r--r--sysutils/wmfire/Makefile1
-rw-r--r--sysutils/wmfire/pkg-comment1
-rw-r--r--sysutils/wmlmmon/Makefile1
-rw-r--r--sysutils/wmlmmon/pkg-comment1
-rw-r--r--sysutils/wmlongrun/Makefile1
-rw-r--r--sysutils/wmlongrun/pkg-comment1
-rw-r--r--sysutils/wmmemload/Makefile1
-rw-r--r--sysutils/wmmemload/pkg-comment1
-rw-r--r--sysutils/wmmemmon/Makefile1
-rw-r--r--sysutils/wmmemmon/pkg-comment1
-rw-r--r--sysutils/wmpccard/Makefile1
-rw-r--r--sysutils/wmpccard/pkg-comment1
-rw-r--r--sysutils/wmzazof/Makefile1
-rw-r--r--sysutils/wmzazof/pkg-comment1
-rw-r--r--sysutils/xbattbar/Makefile1
-rw-r--r--sysutils/xbattbar/pkg-comment1
-rw-r--r--sysutils/xfsm/Makefile1
-rw-r--r--sysutils/xfsm/pkg-comment1
-rw-r--r--sysutils/xwatch/Makefile1
-rw-r--r--sysutils/xwatch/pkg-comment1
-rw-r--r--sysutils/xwipower/Makefile1
-rw-r--r--sysutils/xwipower/pkg-comment1
-rw-r--r--sysutils/yawho/Makefile1
-rw-r--r--sysutils/yawho/pkg-comment1
-rw-r--r--textproc/ant-xinclude-task/Makefile1
-rw-r--r--textproc/ant-xinclude-task/pkg-comment1
-rw-r--r--textproc/antiword/Makefile1
-rw-r--r--textproc/antiword/pkg-comment1
-rw-r--r--textproc/ascii2pdf/Makefile1
-rw-r--r--textproc/ascii2pdf/pkg-comment1
-rw-r--r--textproc/bibtex2html/Makefile1
-rw-r--r--textproc/bibtex2html/pkg-comment1
-rw-r--r--textproc/cdiff/Makefile1
-rw-r--r--textproc/cdiff/pkg-comment1
-rw-r--r--textproc/code2html/Makefile1
-rw-r--r--textproc/code2html/pkg-comment1
-rw-r--r--textproc/cole/Makefile1
-rw-r--r--textproc/cole/pkg-comment1
-rw-r--r--textproc/dict/Makefile1
-rw-r--r--textproc/dict/pkg-comment1
-rw-r--r--textproc/diff-mode.el/Makefile1
-rw-r--r--textproc/diff-mode.el/pkg-comment1
-rw-r--r--textproc/docbook-241/Makefile1
-rw-r--r--textproc/docbook-241/pkg-comment1
-rw-r--r--textproc/docbook-300/Makefile1
-rw-r--r--textproc/docbook-300/pkg-comment1
-rw-r--r--textproc/docbook-310/Makefile1
-rw-r--r--textproc/docbook-310/pkg-comment1
-rw-r--r--textproc/docbook-400/Makefile1
-rw-r--r--textproc/docbook-400/pkg-comment1
-rw-r--r--textproc/docbook-410/Makefile1
-rw-r--r--textproc/docbook-410/pkg-comment1
-rw-r--r--textproc/docbook-sk/Makefile1
-rw-r--r--textproc/docbook-sk/pkg-comment1
-rw-r--r--textproc/docbook-tdg/Makefile1
-rw-r--r--textproc/docbook-tdg/pkg-comment1
-rw-r--r--textproc/docbook-xsl/Makefile1
-rw-r--r--textproc/docbook-xsl/pkg-comment1
-rw-r--r--textproc/docbook/Makefile1
-rw-r--r--textproc/docbook/pkg-comment1
-rw-r--r--textproc/docbookide.el/Makefile1
-rw-r--r--textproc/docbookide.el/pkg-comment1
-rw-r--r--textproc/docproj/Makefile1
-rw-r--r--textproc/docproj/pkg-comment1
-rw-r--r--textproc/dsssl-docbook-cygnus/Makefile1
-rw-r--r--textproc/dsssl-docbook-cygnus/pkg-comment1
-rw-r--r--textproc/dtd-catalogs/Makefile1
-rw-r--r--textproc/dtd-catalogs/pkg-comment1
-rw-r--r--textproc/fdp-tools/Makefile1
-rw-r--r--textproc/fdp-tools/pkg-comment1
-rw-r--r--textproc/fop/Makefile1
-rw-r--r--textproc/fop/pkg-comment1
-rw-r--r--textproc/glimpse/Makefile1
-rw-r--r--textproc/glimpse/pkg-comment1
-rw-r--r--textproc/gmat/Makefile1
-rw-r--r--textproc/gmat/pkg-comment1
-rw-r--r--textproc/gnome-spell/Makefile1
-rw-r--r--textproc/gnome-spell/pkg-comment1
-rw-r--r--textproc/gnomespell-devel/Makefile1
-rw-r--r--textproc/gnomespell-devel/pkg-comment1
-rw-r--r--textproc/gnomespell/Makefile1
-rw-r--r--textproc/gnomespell/pkg-comment1
-rw-r--r--textproc/gtkspell/Makefile1
-rw-r--r--textproc/gtkspell/pkg-comment1
-rw-r--r--textproc/gtkspell2/Makefile1
-rw-r--r--textproc/gtkspell2/pkg-comment1
-rw-r--r--textproc/htdig/Makefile1
-rw-r--r--textproc/htdig/pkg-comment1
-rw-r--r--textproc/intltool/Makefile1
-rw-r--r--textproc/intltool/pkg-comment1
-rw-r--r--textproc/ispell/Makefile1
-rw-r--r--textproc/ispell/pkg-comment1
-rw-r--r--textproc/libxml/Makefile1
-rw-r--r--textproc/libxml/pkg-comment1
-rw-r--r--textproc/man2html/Makefile1
-rw-r--r--textproc/man2html/pkg-comment1
-rw-r--r--textproc/mkcatalog/Makefile1
-rw-r--r--textproc/mkcatalog/pkg-comment1
-rw-r--r--textproc/modlogan/Makefile1
-rw-r--r--textproc/modlogan/pkg-comment1
-rw-r--r--textproc/nfbtrans/Makefile1
-rw-r--r--textproc/nfbtrans/pkg-comment1
-rw-r--r--textproc/p5-CSS-SAC/Makefile1
-rw-r--r--textproc/p5-CSS-SAC/pkg-comment1
-rw-r--r--textproc/p5-DelimMatch/Makefile1
-rw-r--r--textproc/p5-DelimMatch/pkg-comment1
-rw-r--r--textproc/p5-FreeBSD-Ports/Makefile1
-rw-r--r--textproc/p5-FreeBSD-Ports/pkg-comment1
-rw-r--r--textproc/p5-HTML-Format/Makefile1
-rw-r--r--textproc/p5-HTML-Format/pkg-comment1
-rw-r--r--textproc/p5-NetAddr-IP-Find/Makefile1
-rw-r--r--textproc/p5-NetAddr-IP-Find/pkg-comment1
-rw-r--r--textproc/p5-PDF-Create/Makefile1
-rw-r--r--textproc/p5-PDF-Create/pkg-comment1
-rw-r--r--textproc/p5-Pod-Constants/Makefile1
-rw-r--r--textproc/p5-Pod-Constants/pkg-comment1
-rw-r--r--textproc/p5-Pod-POM/Makefile1
-rw-r--r--textproc/p5-Pod-POM/pkg-comment1
-rw-r--r--textproc/p5-Pod-Parser/Makefile1
-rw-r--r--textproc/p5-Pod-Parser/pkg-comment1
-rw-r--r--textproc/p5-PodParser/Makefile1
-rw-r--r--textproc/p5-PodParser/pkg-comment1
-rw-r--r--textproc/p5-RDF-Core/Makefile1
-rw-r--r--textproc/p5-RDF-Core/pkg-comment1
-rw-r--r--textproc/p5-RDF-Notation3/Makefile1
-rw-r--r--textproc/p5-RDF-Notation3/pkg-comment1
-rw-r--r--textproc/p5-RDFStore/Makefile1
-rw-r--r--textproc/p5-RDFStore/pkg-comment1
-rw-r--r--textproc/p5-Sort-ArbBiLex/Makefile1
-rw-r--r--textproc/p5-Sort-ArbBiLex/pkg-comment1
-rw-r--r--textproc/p5-Sort-Fields/Makefile1
-rw-r--r--textproc/p5-Sort-Fields/pkg-comment1
-rw-r--r--textproc/p5-Sort-PolySort/Makefile1
-rw-r--r--textproc/p5-Sort-PolySort/pkg-comment1
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/Makefile1
-rw-r--r--textproc/p5-Spreadsheet-ParseExcel/pkg-comment1
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/Makefile1
-rw-r--r--textproc/p5-Spreadsheet-WriteExcel/pkg-comment1
-rw-r--r--textproc/p5-String-ShellQuote/Makefile1
-rw-r--r--textproc/p5-String-ShellQuote/pkg-comment1
-rw-r--r--textproc/p5-String-Strip/Makefile1
-rw-r--r--textproc/p5-String-Strip/pkg-comment1
-rw-r--r--textproc/p5-Text-Autoformat/Makefile1
-rw-r--r--textproc/p5-Text-Autoformat/pkg-comment1
-rw-r--r--textproc/p5-Text-Balanced/Makefile1
-rw-r--r--textproc/p5-Text-Balanced/pkg-comment1
-rw-r--r--textproc/p5-Text-Bind/Makefile1
-rw-r--r--textproc/p5-Text-Bind/pkg-comment1
-rw-r--r--textproc/p5-Text-CSV/Makefile1
-rw-r--r--textproc/p5-Text-CSV/pkg-comment1
-rw-r--r--textproc/p5-Text-CSV_XS/Makefile1
-rw-r--r--textproc/p5-Text-CSV_XS/pkg-comment1
-rw-r--r--textproc/p5-Text-Diff/Makefile1
-rw-r--r--textproc/p5-Text-Diff/pkg-comment1
-rw-r--r--textproc/p5-Text-DoubleMetaphone/Makefile1
-rw-r--r--textproc/p5-Text-DoubleMetaphone/pkg-comment1
-rw-r--r--textproc/p5-Text-EtText/Makefile1
-rw-r--r--textproc/p5-Text-EtText/pkg-comment1
-rw-r--r--textproc/p5-Text-FillIn/Makefile1
-rw-r--r--textproc/p5-Text-FillIn/pkg-comment1
-rw-r--r--textproc/p5-Text-Filter-Chain/Makefile1
-rw-r--r--textproc/p5-Text-Filter-Chain/pkg-comment1
-rw-r--r--textproc/p5-Text-Filter/Makefile1
-rw-r--r--textproc/p5-Text-Filter/pkg-comment1
-rw-r--r--textproc/p5-Text-FixedLength-Extra/Makefile1
-rw-r--r--textproc/p5-Text-FixedLength-Extra/pkg-comment1
-rw-r--r--textproc/p5-Text-FixedLength/Makefile1
-rw-r--r--textproc/p5-Text-FixedLength/pkg-comment1
-rw-r--r--textproc/p5-Text-Flowchart/Makefile1
-rw-r--r--textproc/p5-Text-Flowchart/pkg-comment1
-rw-r--r--textproc/p5-Text-Format/Makefile1
-rw-r--r--textproc/p5-Text-Format/pkg-comment1
-rw-r--r--textproc/p5-Text-Graphics/Makefile1
-rw-r--r--textproc/p5-Text-Graphics/pkg-comment1
-rw-r--r--textproc/p5-Text-Query/Makefile1
-rw-r--r--textproc/p5-Text-Query/pkg-comment1
-rw-r--r--textproc/p5-Text-SimpleTemplate/Makefile1
-rw-r--r--textproc/p5-Text-SimpleTemplate/pkg-comment1
-rw-r--r--textproc/p5-Text-Tmpl/Makefile1
-rw-r--r--textproc/p5-Text-Tmpl/pkg-comment1
-rw-r--r--textproc/p5-Text-Wrapper/Makefile1
-rw-r--r--textproc/p5-Text-Wrapper/pkg-comment1
-rw-r--r--textproc/p5-URI-Find/Makefile1
-rw-r--r--textproc/p5-URI-Find/pkg-comment1
-rw-r--r--textproc/p5-XML-DBMS/Makefile1
-rw-r--r--textproc/p5-XML-DBMS/pkg-comment1
-rw-r--r--textproc/p5-XML-DT/Makefile1
-rw-r--r--textproc/p5-XML-DT/pkg-comment1
-rw-r--r--textproc/p5-XML-Dumper/Makefile1
-rw-r--r--textproc/p5-XML-Dumper/pkg-comment1
-rw-r--r--textproc/p5-XML-Filter-BufferText/Makefile1
-rw-r--r--textproc/p5-XML-Filter-BufferText/pkg-comment1
-rw-r--r--textproc/p5-XML-Filter-DetectWS/Makefile1
-rw-r--r--textproc/p5-XML-Filter-DetectWS/pkg-comment1
-rw-r--r--textproc/p5-XML-Filter-Reindent/Makefile1
-rw-r--r--textproc/p5-XML-Filter-Reindent/pkg-comment1
-rw-r--r--textproc/p5-XML-Filter-SAXT/Makefile1
-rw-r--r--textproc/p5-XML-Filter-SAXT/pkg-comment1
-rw-r--r--textproc/p5-XML-Filter-XInclude/Makefile1
-rw-r--r--textproc/p5-XML-Filter-XInclude/pkg-comment1
-rw-r--r--textproc/p5-XML-Filter-XSLT/Makefile1
-rw-r--r--textproc/p5-XML-Filter-XSLT/pkg-comment1
-rw-r--r--textproc/p5-XML-Generator-DBI/Makefile1
-rw-r--r--textproc/p5-XML-Generator-DBI/pkg-comment1
-rw-r--r--textproc/p5-XML-Handler-YAWriter/Makefile1
-rw-r--r--textproc/p5-XML-Handler-YAWriter/pkg-comment1
-rw-r--r--textproc/p5-XML-Node/Makefile1
-rw-r--r--textproc/p5-XML-Node/pkg-comment1
-rw-r--r--textproc/p5-XML-Quote/Makefile1
-rw-r--r--textproc/p5-XML-Quote/pkg-comment1
-rw-r--r--textproc/p5-XML-RegExp/Makefile1
-rw-r--r--textproc/p5-XML-RegExp/pkg-comment1
-rw-r--r--textproc/p5-XML-SAX-Expat/Makefile1
-rw-r--r--textproc/p5-XML-SAX-Expat/pkg-comment1
-rw-r--r--textproc/p5-XML-SAX-Simple/Makefile1
-rw-r--r--textproc/p5-XML-SAX-Simple/pkg-comment1
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/Makefile1
-rw-r--r--textproc/p5-XML-SAXDriver-Sablotron/pkg-comment1
-rw-r--r--textproc/p5-XML-Twig/Makefile1
-rw-r--r--textproc/p5-XML-Twig/pkg-comment1
-rw-r--r--textproc/p5-XML-XPath/Makefile1
-rw-r--r--textproc/p5-XML-XPath/pkg-comment1
-rw-r--r--textproc/p5-libxml/Makefile1
-rw-r--r--textproc/p5-libxml/pkg-comment1
-rw-r--r--textproc/p5-podlators/Makefile1
-rw-r--r--textproc/p5-podlators/pkg-comment1
-rw-r--r--textproc/py-4suite/Makefile1
-rw-r--r--textproc/py-4suite/pkg-comment1
-rw-r--r--textproc/py-csv/Makefile1
-rw-r--r--textproc/py-csv/pkg-comment1
-rw-r--r--textproc/py-dsv/Makefile1
-rw-r--r--textproc/py-dsv/pkg-comment1
-rw-r--r--textproc/py-martel/Makefile1
-rw-r--r--textproc/py-martel/pkg-comment1
-rw-r--r--textproc/py-sgrep/Makefile1
-rw-r--r--textproc/py-sgrep/pkg-comment1
-rw-r--r--textproc/py-trex/Makefile1
-rw-r--r--textproc/py-trex/pkg-comment1
-rw-r--r--textproc/py-xml/Makefile1
-rw-r--r--textproc/py-xml/pkg-comment1
-rw-r--r--textproc/replaceit/Makefile1
-rw-r--r--textproc/replaceit/pkg-comment1
-rw-r--r--textproc/rman/Makefile1
-rw-r--r--textproc/rman/pkg-comment1
-rw-r--r--textproc/rtfreader/Makefile1
-rw-r--r--textproc/rtfreader/pkg-comment1
-rw-r--r--textproc/ruby-libxml/Makefile1
-rw-r--r--textproc/ruby-libxml/pkg-comment1
-rw-r--r--textproc/ruby-libxslt/Makefile1
-rw-r--r--textproc/ruby-libxslt/pkg-comment1
-rw-r--r--textproc/rxp/Makefile1
-rw-r--r--textproc/rxp/pkg-comment1
-rw-r--r--textproc/sarep/Makefile1
-rw-r--r--textproc/sarep/pkg-comment1
-rw-r--r--textproc/scr2txt/Makefile1
-rw-r--r--textproc/scr2txt/pkg-comment1
-rw-r--r--textproc/scrollkeeper/Makefile1
-rw-r--r--textproc/scrollkeeper/pkg-comment1
-rw-r--r--textproc/sdocbook-xml/Makefile1
-rw-r--r--textproc/sdocbook-xml/pkg-comment1
-rw-r--r--textproc/sed_inplace/Makefile1
-rw-r--r--textproc/sed_inplace/pkg-comment1
-rw-r--r--textproc/sgrep/Makefile1
-rw-r--r--textproc/sgrep/pkg-comment1
-rw-r--r--textproc/sgrep2/Makefile1
-rw-r--r--textproc/sgrep2/pkg-comment1
-rw-r--r--textproc/source-highlight/Makefile1
-rw-r--r--textproc/source-highlight/pkg-comment1
-rw-r--r--textproc/sp/Makefile1
-rw-r--r--textproc/sp/pkg-comment1
-rw-r--r--textproc/tclExpat/Makefile1
-rw-r--r--textproc/tclExpat/pkg-comment1
-rw-r--r--textproc/tkdiff/Makefile1
-rw-r--r--textproc/tkdiff/pkg-comment1
-rw-r--r--textproc/tnef2txt/Makefile1
-rw-r--r--textproc/tnef2txt/pkg-comment1
-rw-r--r--textproc/txt2tags/Makefile1
-rw-r--r--textproc/txt2tags/pkg-comment1
-rw-r--r--textproc/ua-ispell/Makefile1
-rw-r--r--textproc/ua-ispell/pkg-comment1
-rw-r--r--textproc/urlview/Makefile1
-rw-r--r--textproc/urlview/pkg-comment1
-rw-r--r--textproc/word2x/Makefile1
-rw-r--r--textproc/word2x/pkg-comment1
-rw-r--r--textproc/wordnet/Makefile1
-rw-r--r--textproc/wordnet/pkg-comment1
-rw-r--r--textproc/xalan-j/Makefile1
-rw-r--r--textproc/xalan-j/pkg-comment1
-rw-r--r--textproc/xerces-j/Makefile1
-rw-r--r--textproc/xerces-j/pkg-comment1
-rw-r--r--textproc/xincluder/Makefile1
-rw-r--r--textproc/xincluder/pkg-comment1
-rw-r--r--textproc/xlhtml/Makefile1
-rw-r--r--textproc/xlhtml/pkg-comment1
-rw-r--r--textproc/xls2xml/Makefile1
-rw-r--r--textproc/xls2xml/pkg-comment1
-rw-r--r--textproc/xml-i18n-tools/Makefile1
-rw-r--r--textproc/xml-i18n-tools/pkg-comment1
-rw-r--r--textproc/xmlenc/Makefile1
-rw-r--r--textproc/xmlenc/pkg-comment1
-rw-r--r--textproc/xsl-docbook-modular/Makefile1
-rw-r--r--textproc/xsl-docbook-modular/pkg-comment1
-rw-r--r--textproc/xxdiff/Makefile1
-rw-r--r--textproc/xxdiff/pkg-comment1
-rw-r--r--textproc/y2l/Makefile1
-rw-r--r--textproc/y2l/pkg-comment1
-rw-r--r--textproc/yodl/Makefile1
-rw-r--r--textproc/yodl/pkg-comment1
-rw-r--r--ukrainian/ispell/Makefile1
-rw-r--r--ukrainian/ispell/pkg-comment1
-rw-r--r--ukrainian/kde3-i18n/Makefile1
-rw-r--r--ukrainian/kde3-i18n/pkg-comment1
-rw-r--r--ukrainian/kde4-l10n/Makefile1
-rw-r--r--ukrainian/kde4-l10n/pkg-comment1
-rw-r--r--ukrainian/monacofonts/Makefile1
-rw-r--r--ukrainian/monacofonts/pkg-comment1
-rw-r--r--vietnamese/kde3-i18n/Makefile1
-rw-r--r--vietnamese/kde3-i18n/pkg-comment1
-rw-r--r--vietnamese/libviet/Makefile1
-rw-r--r--vietnamese/libviet/pkg-comment1
-rw-r--r--vietnamese/unicode-uhoai/Makefile1
-rw-r--r--vietnamese/unicode-uhoai/pkg-comment1
-rw-r--r--vietnamese/vi2vn/Makefile1
-rw-r--r--vietnamese/vi2vn/pkg-comment1
-rw-r--r--vietnamese/vis2u/Makefile1
-rw-r--r--vietnamese/vis2u/pkg-comment1
-rw-r--r--vietnamese/vn7to8/Makefile1
-rw-r--r--vietnamese/vn7to8/pkg-comment1
-rw-r--r--vietnamese/vnconvert/Makefile1
-rw-r--r--vietnamese/vnconvert/pkg-comment1
-rw-r--r--vietnamese/vnelvis/Makefile1
-rw-r--r--vietnamese/vnelvis/pkg-comment1
-rw-r--r--vietnamese/vnless/Makefile1
-rw-r--r--vietnamese/vnless/pkg-comment1
-rw-r--r--vietnamese/vnlpr/Makefile1
-rw-r--r--vietnamese/vnlpr/pkg-comment1
-rw-r--r--vietnamese/vnpstext/Makefile1
-rw-r--r--vietnamese/vnpstext/pkg-comment1
-rw-r--r--vietnamese/vnroff/Makefile1
-rw-r--r--vietnamese/vnroff/pkg-comment1
-rw-r--r--vietnamese/vnterm/Makefile1
-rw-r--r--vietnamese/vnterm/pkg-comment1
-rw-r--r--vietnamese/vntex/Makefile1
-rw-r--r--vietnamese/vntex/pkg-comment1
-rw-r--r--vietnamese/vnxfonts/Makefile1
-rw-r--r--vietnamese/vnxfonts/pkg-comment1
-rw-r--r--www/WebMagick/Makefile1
-rw-r--r--www/WebMagick/pkg-comment1
-rw-r--r--www/adzap/Makefile1
-rw-r--r--www/adzap/pkg-comment1
-rw-r--r--www/amyc/Makefile1
-rw-r--r--www/amyc/pkg-comment1
-rw-r--r--www/analog/Makefile1
-rw-r--r--www/analog/pkg-comment1
-rw-r--r--www/apache13+ipv6/Makefile1
-rw-r--r--www/apache13+ipv6/pkg-comment1
-rw-r--r--www/apache13/Makefile1
-rw-r--r--www/apache13/pkg-comment1
-rw-r--r--www/aria/Makefile1
-rw-r--r--www/aria/pkg-comment1
-rw-r--r--www/bk2site/Makefile1
-rw-r--r--www/bk2site/pkg-comment1
-rw-r--r--www/bluefish/Makefile1
-rw-r--r--www/bluefish/pkg-comment1
-rw-r--r--www/cgi-lib.pl/Makefile1
-rw-r--r--www/cgi-lib.pl/pkg-comment1
-rw-r--r--www/cgiparse/Makefile1
-rw-r--r--www/cgiparse/pkg-comment1
-rw-r--r--www/cheetah/Makefile1
-rw-r--r--www/cheetah/pkg-comment1
-rw-r--r--www/crawl/Makefile1
-rw-r--r--www/crawl/pkg-comment1
-rw-r--r--www/css-mode.el/Makefile1
-rw-r--r--www/css-mode.el/pkg-comment1
-rw-r--r--www/demoroniser/Makefile1
-rw-r--r--www/demoroniser/pkg-comment1
-rw-r--r--www/djvuplugin/Makefile1
-rw-r--r--www/djvuplugin/pkg-comment1
-rw-r--r--www/encompass/Makefile1
-rw-r--r--www/encompass/pkg-comment1
-rw-r--r--www/erwn/Makefile1
-rw-r--r--www/erwn/pkg-comment1
-rw-r--r--www/evg/Makefile1
-rw-r--r--www/evg/pkg-comment1
-rw-r--r--www/fcgi/Makefile1
-rw-r--r--www/fcgi/pkg-comment1
-rw-r--r--www/firefox-devel/Makefile1
-rw-r--r--www/firefox-devel/pkg-comment1
-rw-r--r--www/firefox-esr/Makefile1
-rw-r--r--www/firefox-esr/pkg-comment1
-rw-r--r--www/firefox/Makefile1
-rw-r--r--www/firefox/pkg-comment1
-rw-r--r--www/firefox10/Makefile1
-rw-r--r--www/firefox10/pkg-comment1
-rw-r--r--www/firefox15/Makefile1
-rw-r--r--www/firefox15/pkg-comment1
-rw-r--r--www/firefox3-devel/Makefile1
-rw-r--r--www/firefox3-devel/pkg-comment1
-rw-r--r--www/firefox35/Makefile1
-rw-r--r--www/firefox35/pkg-comment1
-rw-r--r--www/firefox36/Makefile1
-rw-r--r--www/firefox36/pkg-comment1
-rw-r--r--www/flashpluginwrapper/Makefile1
-rw-r--r--www/flashpluginwrapper/pkg-comment1
-rw-r--r--www/flock/Makefile1
-rw-r--r--www/flock/pkg-comment1
-rw-r--r--www/galeon/Makefile1
-rw-r--r--www/galeon/pkg-comment1
-rw-r--r--www/galeon2/Makefile1
-rw-r--r--www/galeon2/pkg-comment1
-rw-r--r--www/glibwww/Makefile1
-rw-r--r--www/glibwww/pkg-comment1
-rw-r--r--www/gtkhtml/Makefile1
-rw-r--r--www/gtkhtml/pkg-comment1
-rw-r--r--www/gtkhtml3/Makefile1
-rw-r--r--www/gtkhtml3/pkg-comment1
-rw-r--r--www/gtkhtml38/Makefile1
-rw-r--r--www/gtkhtml38/pkg-comment1
-rw-r--r--www/htdump/Makefile1
-rw-r--r--www/htdump/pkg-comment1
-rw-r--r--www/html2wml/Makefile1
-rw-r--r--www/html2wml/pkg-comment1
-rw-r--r--www/htmlpp/Makefile1
-rw-r--r--www/htmlpp/pkg-comment1
-rw-r--r--www/httptunnel/Makefile1
-rw-r--r--www/httptunnel/pkg-comment1
-rw-r--r--www/httrack/Makefile1
-rw-r--r--www/httrack/pkg-comment1
-rw-r--r--www/hypermail/Makefile1
-rw-r--r--www/hypermail/pkg-comment1
-rw-r--r--www/jakarta-jmeter/Makefile1
-rw-r--r--www/jakarta-jmeter/pkg-comment1
-rw-r--r--www/jakarta-tomcat3/Makefile1
-rw-r--r--www/jakarta-tomcat3/pkg-comment1
-rw-r--r--www/jakarta-tomcat4/Makefile1
-rw-r--r--www/jakarta-tomcat4/pkg-comment1
-rw-r--r--www/jakarta-tomcat41/Makefile1
-rw-r--r--www/jakarta-tomcat41/pkg-comment1
-rw-r--r--www/kdewebdev/Makefile1
-rw-r--r--www/kdewebdev/pkg-comment1
-rw-r--r--www/kdewebdev4/Makefile1
-rw-r--r--www/kdewebdev4/pkg-comment1
-rw-r--r--www/knowledgekit/Makefile1
-rw-r--r--www/knowledgekit/pkg-comment1
-rw-r--r--www/libghttp/Makefile1
-rw-r--r--www/libghttp/pkg-comment1
-rw-r--r--www/linux-flashplugin/Makefile1
-rw-r--r--www/linux-flashplugin/pkg-comment1
-rw-r--r--www/linux-opera-devel/Makefile1
-rw-r--r--www/linux-opera-devel/pkg-comment1
-rw-r--r--www/linux-opera/Makefile1
-rw-r--r--www/linux-opera/pkg-comment1
-rw-r--r--www/linux-opera7/Makefile1
-rw-r--r--www/linux-opera7/pkg-comment1
-rw-r--r--www/linuxpluginwrapper/Makefile1
-rw-r--r--www/linuxpluginwrapper/pkg-comment1
-rw-r--r--www/lws/Makefile1
-rw-r--r--www/lws/pkg-comment1
-rw-r--r--www/lynx-current/Makefile1
-rw-r--r--www/lynx-current/pkg-comment1
-rw-r--r--www/mathopd/Makefile1
-rw-r--r--www/mathopd/pkg-comment1
-rw-r--r--www/mdw/Makefile1
-rw-r--r--www/mdw/pkg-comment1
-rw-r--r--www/mergelog/Makefile1
-rw-r--r--www/mergelog/pkg-comment1
-rw-r--r--www/mhonarc/Makefile1
-rw-r--r--www/mhonarc/pkg-comment1
-rw-r--r--www/mini_httpd/Makefile1
-rw-r--r--www/mini_httpd/pkg-comment1
-rw-r--r--www/mnogosearch/Makefile1
-rw-r--r--www/mnogosearch/pkg-comment1
-rw-r--r--www/mnogosearch31/Makefile1
-rw-r--r--www/mnogosearch31/pkg-comment1
-rw-r--r--www/mod_auth_external/Makefile1
-rw-r--r--www/mod_auth_external/pkg-comment1
-rw-r--r--www/mod_auth_kerb/Makefile1
-rw-r--r--www/mod_auth_kerb/pkg-comment1
-rw-r--r--www/mod_auth_kerb2/Makefile1
-rw-r--r--www/mod_auth_kerb2/pkg-comment1
-rw-r--r--www/mod_auth_mysql_another/Makefile1
-rw-r--r--www/mod_auth_mysql_another/pkg-comment1
-rw-r--r--www/mod_auth_pam/Makefile1
-rw-r--r--www/mod_auth_pam/pkg-comment1
-rw-r--r--www/mod_auth_pgsql/Makefile1
-rw-r--r--www/mod_auth_pgsql/pkg-comment1
-rw-r--r--www/mod_backhand/Makefile1
-rw-r--r--www/mod_backhand/pkg-comment1
-rw-r--r--www/mod_cvs/Makefile1
-rw-r--r--www/mod_cvs/pkg-comment1
-rw-r--r--www/mod_dtcl/Makefile1
-rw-r--r--www/mod_dtcl/pkg-comment1
-rw-r--r--www/mod_extract_forwarded/Makefile1
-rw-r--r--www/mod_extract_forwarded/pkg-comment1
-rw-r--r--www/mod_extract_forwarded_ap13/Makefile1
-rw-r--r--www/mod_extract_forwarded_ap13/pkg-comment1
-rw-r--r--www/mod_frontpage/Makefile1
-rw-r--r--www/mod_frontpage/pkg-comment1
-rw-r--r--www/mod_geoip/Makefile1
-rw-r--r--www/mod_geoip/pkg-comment1
-rw-r--r--www/mod_jk/Makefile1
-rw-r--r--www/mod_jk/pkg-comment1
-rw-r--r--www/mod_perl/Makefile1
-rw-r--r--www/mod_perl/pkg-comment1
-rw-r--r--www/mod_php4/Makefile1
-rw-r--r--www/mod_php4/pkg-comment1
-rw-r--r--www/mod_php5/Makefile1
-rw-r--r--www/mod_php5/pkg-comment1
-rw-r--r--www/mod_proxy_add_forward/Makefile1
-rw-r--r--www/mod_proxy_add_forward/pkg-comment1
-rw-r--r--www/mod_scgi/Makefile1
-rw-r--r--www/mod_scgi/pkg-comment1
-rw-r--r--www/mod_sqlinclude/Makefile1
-rw-r--r--www/mod_sqlinclude/pkg-comment1
-rw-r--r--www/mod_throttle/Makefile1
-rw-r--r--www/mod_throttle/pkg-comment1
-rw-r--r--www/mod_watch/Makefile1
-rw-r--r--www/mod_watch/pkg-comment1
-rw-r--r--www/mozilla-devel/Makefile1
-rw-r--r--www/mozilla-devel/pkg-comment1
-rw-r--r--www/mozilla-embedded-devel/Makefile1
-rw-r--r--www/mozilla-embedded-devel/pkg-comment1
-rw-r--r--www/mozilla-embedded-vendor/Makefile1
-rw-r--r--www/mozilla-embedded-vendor/pkg-comment1
-rw-r--r--www/mozilla-embedded/Makefile1
-rw-r--r--www/mozilla-embedded/pkg-comment1
-rw-r--r--www/mozilla-firebird/Makefile1
-rw-r--r--www/mozilla-firebird/pkg-comment1
-rw-r--r--www/mozilla-headers-devel/Makefile1
-rw-r--r--www/mozilla-headers-devel/pkg-comment1
-rw-r--r--www/mozilla-headers-vendor/Makefile1
-rw-r--r--www/mozilla-headers-vendor/pkg-comment1
-rw-r--r--www/mozilla-headers/Makefile1
-rw-r--r--www/mozilla-headers/pkg-comment1
-rw-r--r--www/mozilla-vendor/Makefile1
-rw-r--r--www/mozilla-vendor/pkg-comment1
-rw-r--r--www/mozilla/Makefile1
-rw-r--r--www/mozilla/pkg-comment1
-rw-r--r--www/nautilus-gtkhtml/Makefile1
-rw-r--r--www/nautilus-gtkhtml/pkg-comment1
-rw-r--r--www/neowebscript/Makefile1
-rw-r--r--www/neowebscript/pkg-comment1
-rw-r--r--www/netraider/Makefile1
-rw-r--r--www/netraider/pkg-comment1
-rw-r--r--www/netscape-remote/Makefile1
-rw-r--r--www/netscape-remote/pkg-comment1
-rw-r--r--www/nscache/Makefile1
-rw-r--r--www/nscache/pkg-comment1
-rw-r--r--www/nspostgres/Makefile1
-rw-r--r--www/nspostgres/pkg-comment1
-rw-r--r--www/openvrml/Makefile1
-rw-r--r--www/openvrml/pkg-comment1
-rw-r--r--www/opera-devel/Makefile1
-rw-r--r--www/opera-devel/pkg-comment1
-rw-r--r--www/opera/Makefile1
-rw-r--r--www/opera/pkg-comment1
-rw-r--r--www/orion-devel/Makefile1
-rw-r--r--www/orion-devel/pkg-comment1
-rw-r--r--www/orion/Makefile1
-rw-r--r--www/orion/pkg-comment1
-rw-r--r--www/p5-Apache-Admin-Config/Makefile1
-rw-r--r--www/p5-Apache-Admin-Config/pkg-comment1
-rw-r--r--www/p5-Apache-DBI/Makefile1
-rw-r--r--www/p5-Apache-DBI/pkg-comment1
-rw-r--r--www/p5-Apache-Radius/Makefile1
-rw-r--r--www/p5-Apache-Radius/pkg-comment1
-rw-r--r--www/p5-Apache-Reload/Makefile1
-rw-r--r--www/p5-Apache-Reload/pkg-comment1
-rw-r--r--www/p5-CGI-Application/Makefile1
-rw-r--r--www/p5-CGI-Application/pkg-comment1
-rw-r--r--www/p5-CGI-XMLApplication/Makefile1
-rw-r--r--www/p5-CGI-XMLApplication/pkg-comment1
-rw-r--r--www/p5-FastCGI/Makefile1
-rw-r--r--www/p5-FastCGI/pkg-comment1
-rw-r--r--www/p5-GtkHTML/Makefile1
-rw-r--r--www/p5-GtkHTML/pkg-comment1
-rw-r--r--www/p5-HTML-Element-Extended/Makefile1
-rw-r--r--www/p5-HTML-Element-Extended/pkg-comment1
-rw-r--r--www/p5-HTML-Parser/Makefile1
-rw-r--r--www/p5-HTML-Parser/pkg-comment1
-rw-r--r--www/p5-HTML-Summary/Makefile1
-rw-r--r--www/p5-HTML-Summary/pkg-comment1
-rw-r--r--www/p5-HTML-Table/Makefile1
-rw-r--r--www/p5-HTML-Table/pkg-comment1
-rw-r--r--www/p5-HTML-TableLayout/Makefile1
-rw-r--r--www/p5-HTML-TableLayout/pkg-comment1
-rw-r--r--www/p5-HTML-Tree/Makefile1
-rw-r--r--www/p5-HTML-Tree/pkg-comment1
-rw-r--r--www/p5-HTML-Webmake/Makefile1
-rw-r--r--www/p5-HTML-Webmake/pkg-comment1
-rw-r--r--www/p5-HTTP-BrowserDetect/Makefile1
-rw-r--r--www/p5-HTTP-BrowserDetect/pkg-comment1
-rw-r--r--www/p5-HTTP-DAV/Makefile1
-rw-r--r--www/p5-HTTP-DAV/pkg-comment1
-rw-r--r--www/p5-HTTP-GHTTP/Makefile1
-rw-r--r--www/p5-HTTP-GHTTP/pkg-comment1
-rw-r--r--www/p5-POE-Component-Client-HTTP/Makefile1
-rw-r--r--www/p5-POE-Component-Client-HTTP/pkg-comment1
-rw-r--r--www/p5-ParallelUA/Makefile1
-rw-r--r--www/p5-ParallelUA/pkg-comment1
-rw-r--r--www/p5-Template-Toolkit/Makefile1
-rw-r--r--www/p5-Template-Toolkit/pkg-comment1
-rw-r--r--www/p5-URI-Sequin/Makefile1
-rw-r--r--www/p5-URI-Sequin/pkg-comment1
-rw-r--r--www/p5-WWW-Automate/Makefile1
-rw-r--r--www/p5-WWW-Automate/pkg-comment1
-rw-r--r--www/p5-libapreq/Makefile1
-rw-r--r--www/p5-libapreq/pkg-comment1
-rw-r--r--www/p5-libwww/Makefile1
-rw-r--r--www/p5-libwww/pkg-comment1
-rw-r--r--www/pgdriver/Makefile1
-rw-r--r--www/pgdriver/pkg-comment1
-rw-r--r--www/phoenix/Makefile1
-rw-r--r--www/phoenix/pkg-comment1
-rw-r--r--www/phpbb/Makefile1
-rw-r--r--www/phpbb/pkg-comment1
-rw-r--r--www/pound/Makefile1
-rw-r--r--www/pound/pkg-comment1
-rw-r--r--www/publicfile/Makefile1
-rw-r--r--www/publicfile/pkg-comment1
-rw-r--r--www/py-scgi/Makefile1
-rw-r--r--www/py-scgi/pkg-comment1
-rw-r--r--www/qdecoder/Makefile1
-rw-r--r--www/qdecoder/pkg-comment1
-rw-r--r--www/quanta/Makefile1
-rw-r--r--www/quanta/pkg-comment1
-rw-r--r--www/quixote/Makefile1
-rw-r--r--www/quixote/pkg-comment1
-rw-r--r--www/ruby-tmpl/Makefile1
-rw-r--r--www/ruby-tmpl/pkg-comment1
-rw-r--r--www/seamonkey/Makefile1
-rw-r--r--www/seamonkey/pkg-comment1
-rw-r--r--www/seamonkey2/Makefile1
-rw-r--r--www/seamonkey2/pkg-comment1
-rw-r--r--www/smb_auth/Makefile1
-rw-r--r--www/smb_auth/pkg-comment1
-rw-r--r--www/snarf/Makefile1
-rw-r--r--www/snarf/pkg-comment1
-rw-r--r--www/squid/Makefile1
-rw-r--r--www/squid/pkg-comment1
-rw-r--r--www/squid24/Makefile1
-rw-r--r--www/squid24/pkg-comment1
-rw-r--r--www/squid25/Makefile1
-rw-r--r--www/squid25/pkg-comment1
-rw-r--r--www/squid26/Makefile1
-rw-r--r--www/squid26/pkg-comment1
-rw-r--r--www/squid27/Makefile1
-rw-r--r--www/squid27/pkg-comment1
-rw-r--r--www/squid30/Makefile1
-rw-r--r--www/squid30/pkg-comment1
-rw-r--r--www/squid31/Makefile1
-rw-r--r--www/squid31/pkg-comment1
-rw-r--r--www/squidclients/Makefile1
-rw-r--r--www/squidclients/pkg-comment1
-rw-r--r--www/squidtimes/Makefile1
-rw-r--r--www/squidtimes/pkg-comment1
-rw-r--r--www/squirm/Makefile1
-rw-r--r--www/squirm/pkg-comment1
-rw-r--r--www/squishdot/Makefile1
-rw-r--r--www/squishdot/pkg-comment1
-rw-r--r--www/tclhttpd/Makefile1
-rw-r--r--www/tclhttpd/pkg-comment1
-rw-r--r--www/thttpd/Makefile1
-rw-r--r--www/thttpd/pkg-comment1
-rw-r--r--www/tomcat41/Makefile1
-rw-r--r--www/tomcat41/pkg-comment1
-rw-r--r--www/transproxy/Makefile1
-rw-r--r--www/transproxy/pkg-comment1
-rw-r--r--www/udmsearch/Makefile1
-rw-r--r--www/udmsearch/pkg-comment1
-rw-r--r--www/viewml/Makefile1
-rw-r--r--www/viewml/pkg-comment1
-rw-r--r--www/w3-4/Makefile1
-rw-r--r--www/w3-4/pkg-comment1
-rw-r--r--www/w3mir/Makefile1
-rw-r--r--www/w3mir/pkg-comment1
-rw-r--r--www/wcol/Makefile1
-rw-r--r--www/wcol/pkg-comment1
-rw-r--r--www/webcrawl/Makefile1
-rw-r--r--www/webcrawl/pkg-comment1
-rw-r--r--www/webfs/Makefile1
-rw-r--r--www/webfs/pkg-comment1
-rw-r--r--www/wsmake/Makefile1
-rw-r--r--www/wsmake/pkg-comment1
-rw-r--r--www/wwwoffle/Makefile1
-rw-r--r--www/wwwoffle/pkg-comment1
-rw-r--r--www/wwwstat/Makefile1
-rw-r--r--www/wwwstat/pkg-comment1
-rw-r--r--www/znavigator/Makefile1
-rw-r--r--www/znavigator/pkg-comment1
-rw-r--r--www/zope-cmf/Makefile1
-rw-r--r--www/zope-cmf/pkg-comment1
-rw-r--r--www/zope-cmfforum/Makefile1
-rw-r--r--www/zope-cmfforum/pkg-comment1
-rw-r--r--www/zope-guf/Makefile1
-rw-r--r--www/zope-guf/pkg-comment1
-rw-r--r--www/zope-zmysqlda/Makefile1
-rw-r--r--www/zope-zmysqlda/pkg-comment1
-rw-r--r--www/zope-zpt/Makefile1
-rw-r--r--www/zope-zpt/pkg-comment1
-rw-r--r--www/zope-zwiki/Makefile1
-rw-r--r--www/zope-zwiki/pkg-comment1
-rw-r--r--www/zope/Makefile1
-rw-r--r--www/zope/pkg-comment1
-rw-r--r--www/zope210/Makefile1
-rw-r--r--www/zope210/pkg-comment1
-rw-r--r--www/zope211/Makefile1
-rw-r--r--www/zope211/pkg-comment1
-rw-r--r--www/zope213/Makefile1
-rw-r--r--www/zope213/pkg-comment1
-rw-r--r--www/zope28/Makefile1
-rw-r--r--www/zope28/pkg-comment1
-rw-r--r--www/zope29/Makefile1
-rw-r--r--www/zope29/pkg-comment1
-rw-r--r--x11-clocks/asclock/Makefile1
-rw-r--r--x11-clocks/asclock/pkg-comment1
-rw-r--r--x11-clocks/astime/Makefile1
-rw-r--r--x11-clocks/astime/pkg-comment1
-rw-r--r--x11-clocks/eyeclock/Makefile1
-rw-r--r--x11-clocks/eyeclock/pkg-comment1
-rw-r--r--x11-clocks/kdetoys3/Makefile1
-rw-r--r--x11-clocks/kdetoys3/pkg-comment1
-rw-r--r--x11-clocks/kdetoys4/Makefile1
-rw-r--r--x11-clocks/kdetoys4/pkg-comment1
-rw-r--r--x11-clocks/mlclock/Makefile1
-rw-r--r--x11-clocks/mlclock/pkg-comment1
-rw-r--r--x11-clocks/pclock/Makefile1
-rw-r--r--x11-clocks/pclock/pkg-comment1
-rw-r--r--x11-clocks/sanduhr/Makefile1
-rw-r--r--x11-clocks/sanduhr/pkg-comment1
-rw-r--r--x11-clocks/washerdryer/Makefile1
-rw-r--r--x11-clocks/washerdryer/pkg-comment1
-rw-r--r--x11-clocks/wmcalclock/Makefile1
-rw-r--r--x11-clocks/wmcalclock/pkg-comment1
-rw-r--r--x11-clocks/wmclockmon/Makefile1
-rw-r--r--x11-clocks/wmclockmon/pkg-comment1
-rw-r--r--x11-clocks/wmdate/Makefile1
-rw-r--r--x11-clocks/wmdate/pkg-comment1
-rw-r--r--x11-clocks/wmfishtime/Makefile1
-rw-r--r--x11-clocks/wmfishtime/pkg-comment1
-rw-r--r--x11-clocks/wmfuzzy/Makefile1
-rw-r--r--x11-clocks/wmfuzzy/pkg-comment1
-rw-r--r--x11-clocks/wmitime/Makefile1
-rw-r--r--x11-clocks/wmitime/pkg-comment1
-rw-r--r--x11-clocks/wmtimer/Makefile1
-rw-r--r--x11-clocks/wmtimer/pkg-comment1
-rw-r--r--x11-clocks/wmtz/Makefile1
-rw-r--r--x11-clocks/wmtz/pkg-comment1
-rw-r--r--x11-clocks/xdaliclock/Makefile1
-rw-r--r--x11-clocks/xdaliclock/pkg-comment1
-rw-r--r--x11-fm/binder/Makefile1
-rw-r--r--x11-fm/binder/pkg-comment1
-rw-r--r--x11-fm/cfm/Makefile1
-rw-r--r--x11-fm/cfm/pkg-comment1
-rw-r--r--x11-fm/filerunner/Makefile1
-rw-r--r--x11-fm/filerunner/pkg-comment1
-rw-r--r--x11-fm/nautilus/Makefile1
-rw-r--r--x11-fm/nautilus/pkg-comment1
-rw-r--r--x11-fm/nautilus2/Makefile1
-rw-r--r--x11-fm/nautilus2/pkg-comment1
-rw-r--r--x11-fm/rox-base/Makefile1
-rw-r--r--x11-fm/rox-base/pkg-comment1
-rw-r--r--x11-fm/xnc/Makefile1
-rw-r--r--x11-fm/xnc/pkg-comment1
-rw-r--r--x11-fonts/XFree86-4-font100dpi/Makefile1
-rw-r--r--x11-fonts/XFree86-4-font100dpi/pkg-comment1
-rw-r--r--x11-fonts/XFree86-4-font75dpi/Makefile1
-rw-r--r--x11-fonts/XFree86-4-font75dpi/pkg-comment1
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontCyrillic/pkg-comment1
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-comment1
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontEncodings/pkg-comment1
-rw-r--r--x11-fonts/XFree86-4-fontScalable/Makefile1
-rw-r--r--x11-fonts/XFree86-4-fontScalable/pkg-comment1
-rw-r--r--x11-fonts/bitmap-fonts/Makefile1
-rw-r--r--x11-fonts/bitmap-fonts/pkg-comment1
-rw-r--r--x11-fonts/cyr-rfx/Makefile1
-rw-r--r--x11-fonts/cyr-rfx/pkg-comment1
-rw-r--r--x11-fonts/etlfonts/Makefile1
-rw-r--r--x11-fonts/etlfonts/pkg-comment1
-rw-r--r--x11-fonts/geminifonts/Makefile1
-rw-r--r--x11-fonts/geminifonts/pkg-comment1
-rw-r--r--x11-fonts/getbdf/Makefile1
-rw-r--r--x11-fonts/getbdf/pkg-comment1
-rw-r--r--x11-fonts/intlfonts/Makefile1
-rw-r--r--x11-fonts/intlfonts/pkg-comment1
-rw-r--r--x11-fonts/nexfontsel/Makefile1
-rw-r--r--x11-fonts/nexfontsel/pkg-comment1
-rw-r--r--x11-fonts/p5-Font-AFM/Makefile1
-rw-r--r--x11-fonts/p5-Font-AFM/pkg-comment1
-rw-r--r--x11-fonts/sharefonts/Makefile1
-rw-r--r--x11-fonts/sharefonts/pkg-comment1
-rw-r--r--x11-fonts/xfontselector/Makefile1
-rw-r--r--x11-fonts/xfontselector/pkg-comment1
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile1
-rw-r--r--x11-servers/XFree86-4-FontServer/pkg-comment1
-rw-r--r--x11-servers/XFree86-4-NestServer/Makefile1
-rw-r--r--x11-servers/XFree86-4-NestServer/pkg-comment1
-rw-r--r--x11-servers/XFree86-4-PrintServer/Makefile1
-rw-r--r--x11-servers/XFree86-4-PrintServer/pkg-comment1
-rw-r--r--x11-servers/XFree86-4-Server-snap/Makefile1
-rw-r--r--x11-servers/XFree86-4-Server-snap/pkg-comment1
-rw-r--r--x11-servers/XFree86-4-Server/Makefile1
-rw-r--r--x11-servers/XFree86-4-Server/pkg-comment1
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/Makefile1
-rw-r--r--x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment1
-rw-r--r--x11-servers/x2x/Makefile1
-rw-r--r--x11-servers/x2x/pkg-comment1
-rw-r--r--x11-themes/buffy/Makefile1
-rw-r--r--x11-themes/buffy/pkg-comment1
-rw-r--r--x11-themes/clean-theme-gtk/Makefile1
-rw-r--r--x11-themes/clean-theme-gtk/pkg-comment1
-rw-r--r--x11-themes/gnome-look/Makefile1
-rw-r--r--x11-themes/gnome-look/pkg-comment1
-rw-r--r--x11-themes/gnome-themes/Makefile1
-rw-r--r--x11-themes/gnome-themes/pkg-comment1
-rw-r--r--x11-themes/gtk-engines-collection/Makefile1
-rw-r--r--x11-themes/gtk-engines-collection/pkg-comment1
-rw-r--r--x11-themes/gtk-engines/Makefile1
-rw-r--r--x11-themes/gtk-engines/pkg-comment1
-rw-r--r--x11-themes/gtk-engines2/Makefile1
-rw-r--r--x11-themes/gtk-engines2/pkg-comment1
-rw-r--r--x11-themes/gtkstep-pastel/Makefile1
-rw-r--r--x11-themes/gtkstep-pastel/pkg-comment1
-rw-r--r--x11-themes/kdeartwork3/Makefile1
-rw-r--r--x11-themes/kdeartwork3/pkg-comment1
-rw-r--r--x11-themes/kdeartwork4/Makefile1
-rw-r--r--x11-themes/kdeartwork4/pkg-comment1
-rw-r--r--x11-themes/mosfet-liquid/Makefile1
-rw-r--r--x11-themes/mosfet-liquid/pkg-comment1
-rw-r--r--x11-themes/qnxstyle/Makefile1
-rw-r--r--x11-themes/qnxstyle/pkg-comment1
-rw-r--r--x11-themes/thinice/Makefile1
-rw-r--r--x11-themes/thinice/pkg-comment1
-rw-r--r--x11-toolkits/at-spi/Makefile1
-rw-r--r--x11-toolkits/at-spi/pkg-comment1
-rw-r--r--x11-toolkits/bakery/Makefile1
-rw-r--r--x11-toolkits/bakery/pkg-comment1
-rw-r--r--x11-toolkits/buffy/Makefile1
-rw-r--r--x11-toolkits/buffy/pkg-comment1
-rw-r--r--x11-toolkits/clean-theme-gtk/Makefile1
-rw-r--r--x11-toolkits/clean-theme-gtk/pkg-comment1
-rw-r--r--x11-toolkits/easygtk/Makefile1
-rw-r--r--x11-toolkits/easygtk/pkg-comment1
-rw-r--r--x11-toolkits/eel/Makefile1
-rw-r--r--x11-toolkits/eel/pkg-comment1
-rw-r--r--x11-toolkits/eel2/Makefile1
-rw-r--r--x11-toolkits/eel2/pkg-comment1
-rw-r--r--x11-toolkits/gail/Makefile1
-rw-r--r--x11-toolkits/gail/pkg-comment1
-rw-r--r--x11-toolkits/gal/Makefile1
-rw-r--r--x11-toolkits/gal/pkg-comment1
-rw-r--r--x11-toolkits/gal2/Makefile1
-rw-r--r--x11-toolkits/gal2/pkg-comment1
-rw-r--r--x11-toolkits/gdl/Makefile1
-rw-r--r--x11-toolkits/gdl/pkg-comment1
-rw-r--r--x11-toolkits/gnome--/Makefile1
-rw-r--r--x11-toolkits/gnome--/pkg-comment1
-rw-r--r--x11-toolkits/gnome-look/Makefile1
-rw-r--r--x11-toolkits/gnome-look/pkg-comment1
-rw-r--r--x11-toolkits/gnome-themes/Makefile1
-rw-r--r--x11-toolkits/gnome-themes/pkg-comment1
-rw-r--r--x11-toolkits/gob/Makefile1
-rw-r--r--x11-toolkits/gob/pkg-comment1
-rw-r--r--x11-toolkits/gtk--/Makefile1
-rw-r--r--x11-toolkits/gtk--/pkg-comment1
-rw-r--r--x11-toolkits/gtk--2/Makefile1
-rw-r--r--x11-toolkits/gtk--2/pkg-comment1
-rw-r--r--x11-toolkits/gtk-engines-collection/Makefile1
-rw-r--r--x11-toolkits/gtk-engines-collection/pkg-comment1
-rw-r--r--x11-toolkits/gtk-engines/Makefile1
-rw-r--r--x11-toolkits/gtk-engines/pkg-comment1
-rw-r--r--x11-toolkits/gtk-engines2/Makefile1
-rw-r--r--x11-toolkits/gtk-engines2/pkg-comment1
-rw-r--r--x11-toolkits/gtk-sharp-devel/Makefile1
-rw-r--r--x11-toolkits/gtk-sharp-devel/pkg-comment1
-rw-r--r--x11-toolkits/gtk-sharp/Makefile1
-rw-r--r--x11-toolkits/gtk-sharp/pkg-comment1
-rw-r--r--x11-toolkits/gtk-sharp10/Makefile1
-rw-r--r--x11-toolkits/gtk-sharp10/pkg-comment1
-rw-r--r--x11-toolkits/gtk-sharp20/Makefile1
-rw-r--r--x11-toolkits/gtk-sharp20/pkg-comment1
-rw-r--r--x11-toolkits/gtk-thinice-engine/Makefile1
-rw-r--r--x11-toolkits/gtk-thinice-engine/pkg-comment1
-rw-r--r--x11-toolkits/gtk12/Makefile1
-rw-r--r--x11-toolkits/gtk12/pkg-comment1
-rw-r--r--x11-toolkits/gtk20/Makefile1
-rw-r--r--x11-toolkits/gtk20/pkg-comment1
-rw-r--r--x11-toolkits/gtk30/Makefile1
-rw-r--r--x11-toolkits/gtk30/pkg-comment1
-rw-r--r--x11-toolkits/gtkextra--/Makefile1
-rw-r--r--x11-toolkits/gtkextra--/pkg-comment1
-rw-r--r--x11-toolkits/gtkextra/Makefile1
-rw-r--r--x11-toolkits/gtkextra/pkg-comment1
-rw-r--r--x11-toolkits/gtkextra2/Makefile1
-rw-r--r--x11-toolkits/gtkextra2/pkg-comment1
-rw-r--r--x11-toolkits/gtkglarea2/Makefile1
-rw-r--r--x11-toolkits/gtkglarea2/pkg-comment1
-rw-r--r--x11-toolkits/gtkmm12/Makefile1
-rw-r--r--x11-toolkits/gtkmm12/pkg-comment1
-rw-r--r--x11-toolkits/gtkmm20/Makefile1
-rw-r--r--x11-toolkits/gtkmm20/pkg-comment1
-rw-r--r--x11-toolkits/gtkmm24/Makefile1
-rw-r--r--x11-toolkits/gtkmm24/pkg-comment1
-rw-r--r--x11-toolkits/gtkmm30/Makefile1
-rw-r--r--x11-toolkits/gtkmm30/pkg-comment1
-rw-r--r--x11-toolkits/gtkscintilla/Makefile1
-rw-r--r--x11-toolkits/gtkscintilla/pkg-comment1
-rw-r--r--x11-toolkits/gtkstep-pastel/Makefile1
-rw-r--r--x11-toolkits/gtkstep-pastel/pkg-comment1
-rw-r--r--x11-toolkits/guile-gnome/Makefile1
-rw-r--r--x11-toolkits/guile-gnome/pkg-comment1
-rw-r--r--x11-toolkits/guile-gtk/Makefile1
-rw-r--r--x11-toolkits/guile-gtk/pkg-comment1
-rw-r--r--x11-toolkits/iv/Makefile1
-rw-r--r--x11-toolkits/iv/pkg-comment1
-rw-r--r--x11-toolkits/libgail-gnome/Makefile1
-rw-r--r--x11-toolkits/libgail-gnome/pkg-comment1
-rw-r--r--x11-toolkits/libgnomeprintui/Makefile1
-rw-r--r--x11-toolkits/libgnomeprintui/pkg-comment1
-rw-r--r--x11-toolkits/libgnomeui/Makefile1
-rw-r--r--x11-toolkits/libgnomeui/pkg-comment1
-rw-r--r--x11-toolkits/libgtkeditor/Makefile1
-rw-r--r--x11-toolkits/libgtkeditor/pkg-comment1
-rw-r--r--x11-toolkits/libwnck/Makefile1
-rw-r--r--x11-toolkits/libwnck/pkg-comment1
-rw-r--r--x11-toolkits/libzvt/Makefile1
-rw-r--r--x11-toolkits/libzvt/pkg-comment1
-rw-r--r--x11-toolkits/mowitz/Makefile1
-rw-r--r--x11-toolkits/mowitz/pkg-comment1
-rw-r--r--x11-toolkits/neXtaw/Makefile1
-rw-r--r--x11-toolkits/neXtaw/pkg-comment1
-rw-r--r--x11-toolkits/open-motif/Makefile1
-rw-r--r--x11-toolkits/open-motif/pkg-comment1
-rw-r--r--x11-toolkits/p5-GdkImlib/Makefile1
-rw-r--r--x11-toolkits/p5-GdkImlib/pkg-comment1
-rw-r--r--x11-toolkits/p5-GdkPixbuf/Makefile1
-rw-r--r--x11-toolkits/p5-GdkPixbuf/pkg-comment1
-rw-r--r--x11-toolkits/p5-Glade/Makefile1
-rw-r--r--x11-toolkits/p5-Glade/pkg-comment1
-rw-r--r--x11-toolkits/p5-Glade2/Makefile1
-rw-r--r--x11-toolkits/p5-Glade2/pkg-comment1
-rw-r--r--x11-toolkits/p5-Gnome/Makefile1
-rw-r--r--x11-toolkits/p5-Gnome/pkg-comment1
-rw-r--r--x11-toolkits/p5-GnomeApplet/Makefile1
-rw-r--r--x11-toolkits/p5-GnomeApplet/pkg-comment1
-rw-r--r--x11-toolkits/p5-Gtk/Makefile1
-rw-r--r--x11-toolkits/p5-Gtk/pkg-comment1
-rw-r--r--x11-toolkits/p5-GtkXmHTML/Makefile1
-rw-r--r--x11-toolkits/p5-GtkXmHTML/pkg-comment1
-rw-r--r--x11-toolkits/panel--/Makefile1
-rw-r--r--x11-toolkits/panel--/pkg-comment1
-rw-r--r--x11-toolkits/pango/Makefile1
-rw-r--r--x11-toolkits/pango/pkg-comment1
-rw-r--r--x11-toolkits/pike-gtk/Makefile1
-rw-r--r--x11-toolkits/pike-gtk/pkg-comment1
-rw-r--r--x11-toolkits/pmw/Makefile1
-rw-r--r--x11-toolkits/pmw/pkg-comment1
-rw-r--r--x11-toolkits/py-Pmw/Makefile1
-rw-r--r--x11-toolkits/py-Pmw/pkg-comment1
-rw-r--r--x11-toolkits/py-gnome/Makefile1
-rw-r--r--x11-toolkits/py-gnome/pkg-comment1
-rw-r--r--x11-toolkits/py-gtk/Makefile1
-rw-r--r--x11-toolkits/py-gtk/pkg-comment1
-rw-r--r--x11-toolkits/py-gtk2/Makefile1
-rw-r--r--x11-toolkits/py-gtk2/pkg-comment1
-rw-r--r--x11-toolkits/py-gtkscintilla/Makefile1
-rw-r--r--x11-toolkits/py-gtkscintilla/pkg-comment1
-rw-r--r--x11-toolkits/py-kde/Makefile1
-rw-r--r--x11-toolkits/py-kde/pkg-comment1
-rw-r--r--x11-toolkits/py-qt/Makefile1
-rw-r--r--x11-toolkits/py-qt/pkg-comment1
-rw-r--r--x11-toolkits/py-tkinter/Makefile1
-rw-r--r--x11-toolkits/py-tkinter/pkg-comment1
-rw-r--r--x11-toolkits/py-wxPython/Makefile1
-rw-r--r--x11-toolkits/py-wxPython/pkg-comment1
-rw-r--r--x11-toolkits/py-wxPython24/Makefile1
-rw-r--r--x11-toolkits/py-wxPython24/pkg-comment1
-rw-r--r--x11-toolkits/py-wxPython26/Makefile1
-rw-r--r--x11-toolkits/py-wxPython26/pkg-comment1
-rw-r--r--x11-toolkits/py-wxPython28/Makefile1
-rw-r--r--x11-toolkits/py-wxPython28/pkg-comment1
-rw-r--r--x11-toolkits/qt145/Makefile1
-rw-r--r--x11-toolkits/qt145/pkg-comment1
-rw-r--r--x11-toolkits/rep-gtk/Makefile1
-rw-r--r--x11-toolkits/rep-gtk/pkg-comment1
-rw-r--r--x11-toolkits/rep-gtk2/Makefile1
-rw-r--r--x11-toolkits/rep-gtk2/pkg-comment1
-rw-r--r--x11-toolkits/thinice/Makefile1
-rw-r--r--x11-toolkits/thinice/pkg-comment1
-rw-r--r--x11-toolkits/tix/Makefile1
-rw-r--r--x11-toolkits/tix/pkg-comment1
-rw-r--r--x11-toolkits/v/Makefile1
-rw-r--r--x11-toolkits/v/pkg-comment1
-rw-r--r--x11-toolkits/vdk/Makefile1
-rw-r--r--x11-toolkits/vdk/pkg-comment1
-rw-r--r--x11-toolkits/vdkbuilder/Makefile1
-rw-r--r--x11-toolkits/vdkbuilder/pkg-comment1
-rw-r--r--x11-toolkits/wxgtk-devel/Makefile1
-rw-r--r--x11-toolkits/wxgtk-devel/pkg-comment1
-rw-r--r--x11-toolkits/wxgtk/Makefile1
-rw-r--r--x11-toolkits/wxgtk/pkg-comment1
-rw-r--r--x11-toolkits/wxgtk24/Makefile1
-rw-r--r--x11-toolkits/wxgtk24/pkg-comment1
-rw-r--r--x11-toolkits/xforms/Makefile1
-rw-r--r--x11-toolkits/xforms/pkg-comment1
-rw-r--r--x11-wm/afterstep-stable/Makefile1
-rw-r--r--x11-wm/afterstep-stable/pkg-comment1
-rw-r--r--x11-wm/amaterus/Makefile1
-rw-r--r--x11-wm/amaterus/pkg-comment1
-rw-r--r--x11-wm/bbapm/Makefile1
-rw-r--r--x11-wm/bbapm/pkg-comment1
-rw-r--r--x11-wm/bbrun/Makefile1
-rw-r--r--x11-wm/bbrun/pkg-comment1
-rw-r--r--x11-wm/e16/Makefile1
-rw-r--r--x11-wm/e16/pkg-comment1
-rw-r--r--x11-wm/enlightenment-devel/Makefile1
-rw-r--r--x11-wm/enlightenment-devel/pkg-comment1
-rw-r--r--x11-wm/enlightenment/Makefile1
-rw-r--r--x11-wm/enlightenment/pkg-comment1
-rw-r--r--x11-wm/flwm/Makefile1
-rw-r--r--x11-wm/flwm/pkg-comment1
-rw-r--r--x11-wm/fvwm/Makefile1
-rw-r--r--x11-wm/fvwm/pkg-comment1
-rw-r--r--x11-wm/fvwm2-devel/Makefile1
-rw-r--r--x11-wm/fvwm2-devel/pkg-comment1
-rw-r--r--x11-wm/fvwm2/Makefile1
-rw-r--r--x11-wm/fvwm2/pkg-comment1
-rw-r--r--x11-wm/fvwm24/Makefile1
-rw-r--r--x11-wm/fvwm24/pkg-comment1
-rw-r--r--x11-wm/fvwm95/Makefile1
-rw-r--r--x11-wm/fvwm95/pkg-comment1
-rw-r--r--x11-wm/gnome2wmaker/Makefile1
-rw-r--r--x11-wm/gnome2wmaker/pkg-comment1
-rw-r--r--x11-wm/icemc/Makefile1
-rw-r--r--x11-wm/icemc/pkg-comment1
-rw-r--r--x11-wm/icewm/Makefile1
-rw-r--r--x11-wm/icewm/pkg-comment1
-rw-r--r--x11-wm/kdeartwork3/Makefile1
-rw-r--r--x11-wm/kdeartwork3/pkg-comment1
-rw-r--r--x11-wm/libdockapp/Makefile1
-rw-r--r--x11-wm/libdockapp/pkg-comment1
-rw-r--r--x11-wm/metacity/Makefile1
-rw-r--r--x11-wm/metacity/pkg-comment1
-rw-r--r--x11-wm/mlvwm/Makefile1
-rw-r--r--x11-wm/mlvwm/pkg-comment1
-rw-r--r--x11-wm/mosfet-liquid/Makefile1
-rw-r--r--x11-wm/mosfet-liquid/pkg-comment1
-rw-r--r--x11-wm/olvwm/Makefile1
-rw-r--r--x11-wm/olvwm/pkg-comment1
-rw-r--r--x11-wm/phluid/Makefile1
-rw-r--r--x11-wm/phluid/pkg-comment1
-rw-r--r--x11-wm/pwm/Makefile1
-rw-r--r--x11-wm/pwm/pkg-comment1
-rw-r--r--x11-wm/qnxstyle/Makefile1
-rw-r--r--x11-wm/qnxstyle/pkg-comment1
-rw-r--r--x11-wm/qvwm/Makefile1
-rw-r--r--x11-wm/qvwm/pkg-comment1
-rw-r--r--x11-wm/sawfish/Makefile1
-rw-r--r--x11-wm/sawfish/pkg-comment1
-rw-r--r--x11-wm/sawfish2/Makefile1
-rw-r--r--x11-wm/sawfish2/pkg-comment1
-rw-r--r--x11-wm/scwm/Makefile1
-rw-r--r--x11-wm/scwm/pkg-comment1
-rw-r--r--x11-wm/spager/Makefile1
-rw-r--r--x11-wm/spager/pkg-comment1
-rw-r--r--x11-wm/tvtwm/Makefile1
-rw-r--r--x11-wm/tvtwm/pkg-comment1
-rw-r--r--x11-wm/w9wm/Makefile1
-rw-r--r--x11-wm/w9wm/pkg-comment1
-rw-r--r--x11-wm/windowmaker/Makefile1
-rw-r--r--x11-wm/windowmaker/pkg-comment1
-rw-r--r--x11-wm/wm2/Makefile1
-rw-r--r--x11-wm/wm2/pkg-comment1
-rw-r--r--x11-wm/wmcp/Makefile1
-rw-r--r--x11-wm/wmcp/pkg-comment1
-rw-r--r--x11-wm/wmg/Makefile1
-rw-r--r--x11-wm/wmg/pkg-comment1
-rw-r--r--x11-wm/xwmm/Makefile1
-rw-r--r--x11-wm/xwmm/pkg-comment1
-rw-r--r--x11/bbrun/Makefile1
-rw-r--r--x11/bbrun/pkg-comment1
-rw-r--r--x11/wmessage/Makefile1
-rw-r--r--x11/wmessage/pkg-comment1
5445 files changed, 2726 insertions, 2719 deletions
diff --git a/accessibility/at-spi/Makefile b/accessibility/at-spi/Makefile
index 475f05818565..60a4d0437386 100644
--- a/accessibility/at-spi/Makefile
+++ b/accessibility/at-spi/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An Assistive Technology Service Provider Interface
LIB_DEPENDS= gailutil.17:${PORTSDIR}/x11-toolkits/gail \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
diff --git a/accessibility/at-spi/pkg-comment b/accessibility/at-spi/pkg-comment
deleted file mode 100644
index 147c5c72af79..000000000000
--- a/accessibility/at-spi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Assistive Technology Service Provider Interface
diff --git a/accessibility/atk/Makefile b/accessibility/atk/Makefile
index 6ca7fa395a88..67d0c7ca7452 100644
--- a/accessibility/atk/Makefile
+++ b/accessibility/atk/Makefile
@@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME accessibility toolkit (ATK)
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/accessibility/atk/pkg-comment b/accessibility/atk/pkg-comment
deleted file mode 100644
index 12a15ec5d95c..000000000000
--- a/accessibility/atk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME accessibility toolkit (ATK)
diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index c3515535376d..81072197b081 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An implementation of the ATK interfaces for GTK+ widgets
LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
diff --git a/accessibility/gail/pkg-comment b/accessibility/gail/pkg-comment
deleted file mode 100644
index 916da666154f..000000000000
--- a/accessibility/gail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the ATK interfaces for GTK+ widgets
diff --git a/arabic/kde3-i18n/Makefile b/arabic/kde3-i18n/Makefile
index 6aa3a4ea8524..ae0b4323ca49 100644
--- a/arabic/kde3-i18n/Makefile
+++ b/arabic/kde3-i18n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ar-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/arabic/kde3-i18n/pkg-comment b/arabic/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/arabic/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/arabic/kde4-l10n/Makefile b/arabic/kde4-l10n/Makefile
index 6aa3a4ea8524..ae0b4323ca49 100644
--- a/arabic/kde4-l10n/Makefile
+++ b/arabic/kde4-l10n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ar-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/arabic/kde4-l10n/pkg-comment b/arabic/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/arabic/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/archivers/arc/Makefile b/archivers/arc/Makefile
index 704e339ddbfb..1e528f2d7eba 100644
--- a/archivers/arc/Makefile
+++ b/archivers/arc/Makefile
@@ -14,6 +14,7 @@ DISTNAME= arc521e.pl8
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
+COMMENT= Create & extract files from DOS .ARC files
NO_WRKSUBDIR= yes
MAN1= arc.1
diff --git a/archivers/arc/pkg-comment b/archivers/arc/pkg-comment
deleted file mode 100644
index a55247be7748..000000000000
--- a/archivers/arc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create & extract files from DOS .ARC files
diff --git a/archivers/ark/Makefile b/archivers/ark/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/archivers/ark/Makefile
+++ b/archivers/ark/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/archivers/ark/pkg-comment b/archivers/ark/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/archivers/ark/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 4b2a91bf95e4..800a2727d92c 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= archivers
MASTER_SITES= http://www.kyz.uklinux.net/downloads/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A program to extract Microsoft cabinet (.CAB) files
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/archivers/cabextract/pkg-comment b/archivers/cabextract/pkg-comment
deleted file mode 100644
index c6ec00820e4b..000000000000
--- a/archivers/cabextract/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to extract Microsoft cabinet (.CAB) files
diff --git a/archivers/deepforest/Makefile b/archivers/deepforest/Makefile
index 5ad0a062baef..6d9a2cb44785 100644
--- a/archivers/deepforest/Makefile
+++ b/archivers/deepforest/Makefile
@@ -15,6 +15,7 @@ DISTNAME= DeepForest-${PORTVERSION}
EXTRACT_ONLY= # extracted directly in install target
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A simple compress utilty using on JDE
RUN_DEPENDS= ${RUN_DEP_LIST}
LIB_DEPENDS= ${LIB_DEP_LIST}
diff --git a/archivers/deepforest/pkg-comment b/archivers/deepforest/pkg-comment
deleted file mode 100644
index 84684d219208..000000000000
--- a/archivers/deepforest/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple compress utilty using on JDE
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 804b2c5656ee..b4c4a887b5ec 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -15,6 +15,7 @@ DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An archive manager for zip files, tar, etc.
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \
diff --git a/archivers/file-roller/pkg-comment b/archivers/file-roller/pkg-comment
deleted file mode 100644
index 4bcb773bfd35..000000000000
--- a/archivers/file-roller/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An archive manager for zip files, tar, etc.
diff --git a/archivers/fileroller/Makefile b/archivers/fileroller/Makefile
index 804b2c5656ee..b4c4a887b5ec 100644
--- a/archivers/fileroller/Makefile
+++ b/archivers/fileroller/Makefile
@@ -15,6 +15,7 @@ DISTNAME= file-roller-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An archive manager for zip files, tar, etc.
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip \
diff --git a/archivers/fileroller/pkg-comment b/archivers/fileroller/pkg-comment
deleted file mode 100644
index 4bcb773bfd35..000000000000
--- a/archivers/fileroller/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An archive manager for zip files, tar, etc.
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 982c3e6ca4c2..a8f7605d0209 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ha0999
EXTRACT_SUFX= .tgz
MAINTAINER= ache@FreeBSD.org
+COMMENT= The HA archiver using the HSC compression method
NO_WRKSUBDIR= yes
MAKEFILE= makefile.nix
diff --git a/archivers/ha/pkg-comment b/archivers/ha/pkg-comment
deleted file mode 100644
index 2f3d0100db29..000000000000
--- a/archivers/ha/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The HA archiver using the HSC compression method
diff --git a/archivers/hpack.non-usa.only/Makefile b/archivers/hpack.non-usa.only/Makefile
index 02ff2eb232ff..e5d811f4be36 100644
--- a/archivers/hpack.non-usa.only/Makefile
+++ b/archivers/hpack.non-usa.only/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://src.doc.ic.ac.uk/Mirrors/sunsite.doc.ic.ac.uk/hpack/
DISTNAME= hpack79src
MAINTAINER= ache@FreeBSD.org
+COMMENT= Multi-System Archiver with open keys PGP-based security
NO_WRKSUBDIR= yes
MAKEFILE= makefile
diff --git a/archivers/hpack.non-usa.only/pkg-comment b/archivers/hpack.non-usa.only/pkg-comment
deleted file mode 100644
index 0e6df8584050..000000000000
--- a/archivers/hpack.non-usa.only/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-System Archiver with open keys PGP-based security
diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
index f75b9fa35039..2da0488ae26b 100644
--- a/archivers/lha/Makefile
+++ b/archivers/lha/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www2m.biglobe.ne.jp/~dolphin/lha/prog/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.//}
MAINTAINER= ache@FreeBSD.org
+COMMENT= Archive files using LZW compression (.lzh files)
MAN1= lha.1
MANLANG= ja
diff --git a/archivers/lha/pkg-comment b/archivers/lha/pkg-comment
deleted file mode 100644
index 7333fab13f25..000000000000
--- a/archivers/lha/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Archive files using LZW compression (.lzh files)
diff --git a/archivers/libarc/Makefile b/archivers/libarc/Makefile
index c6cfbf3ea1bb..705b2d9b14eb 100644
--- a/archivers/libarc/Makefile
+++ b/archivers/libarc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= archivers devel
MASTER_SITES= http://www.onicos.com/staff/iz/release/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Tiny C library to decompress data in several popular compression formats
INSTALLS_SHLIB= yes
diff --git a/archivers/libarc/pkg-comment b/archivers/libarc/pkg-comment
deleted file mode 100644
index fc2ff3e2d358..000000000000
--- a/archivers/libarc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tiny C library to decompress data in several popular compression formats
diff --git a/archivers/libcabinet/Makefile b/archivers/libcabinet/Makefile
index 75e1fbe0e2f5..07e98c313694 100644
--- a/archivers/libcabinet/Makefile
+++ b/archivers/libcabinet/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= archivers
MASTER_SITES= http://trill.cis.fordham.edu/~barbacha/cabinet_library/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A portable library and utility to use Microsoft cabinet files (.cab)
INSTALLS_SHLIB= yes
diff --git a/archivers/libcabinet/pkg-comment b/archivers/libcabinet/pkg-comment
deleted file mode 100644
index 605d6580bab3..000000000000
--- a/archivers/libcabinet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable library and utility to use Microsoft cabinet files (.cab)
diff --git a/archivers/nulib/Makefile b/archivers/nulib/Makefile
index 37e5e9eb1f30..7c17e483b4d9 100644
--- a/archivers/nulib/Makefile
+++ b/archivers/nulib/Makefile
@@ -15,6 +15,7 @@ DISTNAME= nulib325
EXTRACT_SUFX= .tar.Z
MAINTAINER= jseger@FreeBSD.org
+COMMENT= NuFX archive utility
WRKSRC= ${WRKDIR}/nulib
MAN1= nulib.1
diff --git a/archivers/nulib/pkg-comment b/archivers/nulib/pkg-comment
deleted file mode 100644
index f29f3bd5184e..000000000000
--- a/archivers/nulib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NuFX archive utility
diff --git a/archivers/p5-Compress-Zlib/Makefile b/archivers/p5-Compress-Zlib/Makefile
index 64b462edabc6..2f3444504147 100644
--- a/archivers/p5-Compress-Zlib/Makefile
+++ b/archivers/p5-Compress-Zlib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Compress
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 interface to zlib compression library
PERL_CONFIGURE= YES
diff --git a/archivers/p5-Compress-Zlib/pkg-comment b/archivers/p5-Compress-Zlib/pkg-comment
deleted file mode 100644
index 798ac793e156..000000000000
--- a/archivers/p5-Compress-Zlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to zlib compression library
diff --git a/archivers/rar/Makefile b/archivers/rar/Makefile
index aafd69d0dde6..6324971d2737 100644
--- a/archivers/rar/Makefile
+++ b/archivers/rar/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://files10.rarlab.com/rar/ \
DISTNAME= rarbsd-3.1.1
MAINTAINER= ache@FreeBSD.org
+COMMENT= File archiver (binary port)
CAT1= rar.1
diff --git a/archivers/rar/pkg-comment b/archivers/rar/pkg-comment
deleted file mode 100644
index 0190de1c7792..000000000000
--- a/archivers/rar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File archiver (binary port)
diff --git a/archivers/rpm/Makefile b/archivers/rpm/Makefile
index b031fc9bcfa6..f309f07615ea 100644
--- a/archivers/rpm/Makefile
+++ b/archivers/rpm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/ \
ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-3.0.x/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= The Red Hat Package Manager
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
popt.0:${PORTSDIR}/devel/popt
diff --git a/archivers/rpm/pkg-comment b/archivers/rpm/pkg-comment
deleted file mode 100644
index b312119efb71..000000000000
--- a/archivers/rpm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Red Hat Package Manager
diff --git a/archivers/sectar/Makefile b/archivers/sectar/Makefile
index 3aef85d45683..aff14f428dc9 100644
--- a/archivers/sectar/Makefile
+++ b/archivers/sectar/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= star
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A program to create encrypted tar archives
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/archivers/sectar/pkg-comment b/archivers/sectar/pkg-comment
deleted file mode 100644
index 7743cafd1dcb..000000000000
--- a/archivers/sectar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to create encrypted tar archives
diff --git a/archivers/ucl/Makefile b/archivers/ucl/Makefile
index b0ce1bd42fc6..734dd25f199e 100644
--- a/archivers/ucl/Makefile
+++ b/archivers/ucl/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= archivers devel
MASTER_SITES= http://www.oberhumer.com/opensource/ucl/download/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A data compression library with low memory usage during decompression
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
diff --git a/archivers/ucl/pkg-comment b/archivers/ucl/pkg-comment
deleted file mode 100644
index 99765129ec45..000000000000
--- a/archivers/ucl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A data compression library with low memory usage during decompression
diff --git a/archivers/unarj/Makefile b/archivers/unarj/Makefile
index 97e7c87ae012..c80df1881441 100644
--- a/archivers/unarj/Makefile
+++ b/archivers/unarj/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
EXTRACT_SUFX= .tgz
MAINTAINER= ache@FreeBSD.org
+COMMENT= Allows files to be extracted from ARJ archives
do-install:
${INSTALL} -d -m 755 -o $(SHAREOWN) -g ${SHAREGRP} \
diff --git a/archivers/unarj/pkg-comment b/archivers/unarj/pkg-comment
deleted file mode 100644
index b1b02603b8de..000000000000
--- a/archivers/unarj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows files to be extracted from ARJ archives
diff --git a/archivers/unrar/Makefile b/archivers/unrar/Makefile
index 14fa0a49e10e..56252a8435f3 100644
--- a/archivers/unrar/Makefile
+++ b/archivers/unrar/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://files2.rarlab.com/rar/
DISTNAME= unrarsrc-3.1.4
MAINTAINER= ache@FreeBSD.org
+COMMENT= Extract, view & test RAR archives
WRKSRC= ${WRKDIR}/unrar
diff --git a/archivers/unrar/pkg-comment b/archivers/unrar/pkg-comment
deleted file mode 100644
index d7f1467d13b1..000000000000
--- a/archivers/unrar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extract, view & test RAR archives
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index dcbd2ce1a7d7..05fadfad2b30 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.info-zip.org/pub/infozip/src/ \
DISTFILES= ${PORTNAME}550.tar.gz
MAINTAINER= ache@FreeBSD.org
+COMMENT= List, test and extract compressed files in a ZIP archive
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAKEFILE= unix/Makefile
diff --git a/archivers/unzip/pkg-comment b/archivers/unzip/pkg-comment
deleted file mode 100644
index f6044b632042..000000000000
--- a/archivers/unzip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-List, test and extract compressed files in a ZIP archive
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 0581910a918b..5566b8a77b7b 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.jormas.com/~vesuri/xpk/ \
http://energyhq.homeip.net/files/
MAINTAINER= adamw@FreeBSD.org
+COMMENT= The eXternal PacKer (XPK) library system
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/archivers/xpk/pkg-comment b/archivers/xpk/pkg-comment
deleted file mode 100644
index 8452e0436a1c..000000000000
--- a/archivers/xpk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The eXternal PacKer (XPK) library system
diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
index 86f9938f2d26..2ed9e7e3dc5a 100644
--- a/archivers/zip/Makefile
+++ b/archivers/zip/Makefile
@@ -16,6 +16,7 @@ ZCRYPT_SRC= zcrypt29-exportable.zip
DISTFILES= zip23${EXTRACT_SUFX} ${ZCRYPT_SRC}
MAINTAINER= ache@FreeBSD.org
+COMMENT= Create/update ZIP files compatible with pkzip
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/archivers/zip/pkg-comment b/archivers/zip/pkg-comment
deleted file mode 100644
index 4765fa18f547..000000000000
--- a/archivers/zip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create/update ZIP files compatible with pkzip
diff --git a/archivers/zoo/Makefile b/archivers/zoo/Makefile
index 51cbe18fc660..55ecfa98dea1 100644
--- a/archivers/zoo/Makefile
+++ b/archivers/zoo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/arcers/
DISTNAME= zoo-2.10pl1
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Manipulate archives of files in compressed form
NO_WRKSUBDIR= yes
ALL_TARGET= bsdansi
diff --git a/archivers/zoo/pkg-comment b/archivers/zoo/pkg-comment
deleted file mode 100644
index e876601ab5b7..000000000000
--- a/archivers/zoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Manipulate archives of files in compressed form
diff --git a/astro/dgpsip/Makefile b/astro/dgpsip/Makefile
index 4a51208c0be9..3383508bd3c5 100644
--- a/astro/dgpsip/Makefile
+++ b/astro/dgpsip/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= astro
MASTER_SITES= http://www.wsrcc.com/wolfgang/ftp/
MAINTAINER= dbaker@FreeBSD.org
+COMMENT= Differential GPS over IP communication device
GNU_CONFIGURE= yes
diff --git a/astro/dgpsip/pkg-comment b/astro/dgpsip/pkg-comment
deleted file mode 100644
index 7d78a47d56cc..000000000000
--- a/astro/dgpsip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Differential GPS over IP communication device
diff --git a/astro/gkrellmearth/Makefile b/astro/gkrellmearth/Makefile
index de73c7d14478..58036d9c9631 100644
--- a/astro/gkrellmearth/Makefile
+++ b/astro/gkrellmearth/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= gkrellm
DISTNAME= ${PORTNAME}_anim-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A plugin for GKrellM that displays a rotating earth
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/astro/gkrellmearth/pkg-comment b/astro/gkrellmearth/pkg-comment
deleted file mode 100644
index 6451f10a0b33..000000000000
--- a/astro/gkrellmearth/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A plugin for GKrellM that displays a rotating earth
diff --git a/astro/gkrellmoon/Makefile b/astro/gkrellmoon/Makefile
index ba12b05b1b69..59ae7cc5c0e5 100644
--- a/astro/gkrellmoon/Makefile
+++ b/astro/gkrellmoon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gkrellmoon
MAINTAINER= pat@FreeBSD.org
+COMMENT= A moon clock plugin for Gkrellm
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/astro/gkrellmoon/pkg-comment b/astro/gkrellmoon/pkg-comment
deleted file mode 100644
index 2c52d4fcbde7..000000000000
--- a/astro/gkrellmoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A moon clock plugin for Gkrellm
diff --git a/astro/glunarclock/Makefile b/astro/glunarclock/Makefile
index fa500299564c..5248c6d2ad4f 100644
--- a/astro/glunarclock/Makefile
+++ b/astro/glunarclock/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GNOME applet which displays the current phase of the Moon
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/astro/glunarclock/pkg-comment b/astro/glunarclock/pkg-comment
deleted file mode 100644
index 2698acf88f1d..000000000000
--- a/astro/glunarclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME applet which displays the current phase of the Moon
diff --git a/astro/spacechart/Makefile b/astro/spacechart/Makefile
index c18bfcd9b1d0..8f071ca150c5 100644
--- a/astro/spacechart/Makefile
+++ b/astro/spacechart/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= SpaceChart is a star chart viewer for GNOME
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/astro/spacechart/pkg-comment b/astro/spacechart/pkg-comment
deleted file mode 100644
index 0d14a8c5ec1b..000000000000
--- a/astro/spacechart/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SpaceChart is a star chart viewer for GNOME
diff --git a/astro/starplot/Makefile b/astro/starplot/Makefile
index bda519bda9e8..cc4fbf1b9fff 100644
--- a/astro/starplot/Makefile
+++ b/astro/starplot/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= astro
MASTER_SITES= http://www.princeton.edu/~kmccarty/downloads/
MAINTAINER= pat@FreeBSD.org
+COMMENT= 3-dimensional viewer for star charts
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/astro/starplot/pkg-comment b/astro/starplot/pkg-comment
deleted file mode 100644
index 928fc9acbf39..000000000000
--- a/astro/starplot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3-dimensional viewer for star charts
diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile
index 574f0d7219da..5de03155d838 100644
--- a/astro/sunclock/Makefile
+++ b/astro/sunclock/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
EXTRACT_SUFX= .tgz
MAINTAINER= pat@FreeBSD.org
+COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/astro/sunclock/pkg-comment b/astro/sunclock/pkg-comment
deleted file mode 100644
index 05fdc844c2d7..000000000000
--- a/astro/sunclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shows which portion of the Earth's surface is illuminated by the Sun
diff --git a/astro/wmglobe/Makefile b/astro/wmglobe/Makefile
index 4bca14da928c..c1ad1f2f0163 100644
--- a/astro/wmglobe/Makefile
+++ b/astro/wmglobe/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= astro windowmaker
MASTER_SITES= http://perso.linuxfr.org/jdumont/wmg/
MAINTAINER= will@FreeBSD.org
+COMMENT= A neat xearth-like WindowMaker dockapp
LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker
diff --git a/astro/wmglobe/pkg-comment b/astro/wmglobe/pkg-comment
deleted file mode 100644
index 637fe172810f..000000000000
--- a/astro/wmglobe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A neat xearth-like WindowMaker dockapp
diff --git a/astro/wmjupiter/Makefile b/astro/wmjupiter/Makefile
index 2e41028b6f0c..f8598f799154 100644
--- a/astro/wmjupiter/Makefile
+++ b/astro/wmjupiter/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= astro windowmaker
MASTER_SITES= http://www.inxsoft.net/wmjupiter/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Dockapp that displays information on jupiter
WRKSRC= ${WRKDIR}/wmJupiter
USE_X_PREFIX= yes
diff --git a/astro/wmjupiter/pkg-comment b/astro/wmjupiter/pkg-comment
deleted file mode 100644
index 6bd5c79aa68a..000000000000
--- a/astro/wmjupiter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dockapp that displays information on jupiter
diff --git a/astro/wmmoonclock/Makefile b/astro/wmmoonclock/Makefile
index 4a267c5e1b57..c98511c3ef17 100644
--- a/astro/wmmoonclock/Makefile
+++ b/astro/wmmoonclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= astro windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Displays the phase of the moon, plus orbital data
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
diff --git a/astro/wmmoonclock/pkg-comment b/astro/wmmoonclock/pkg-comment
deleted file mode 100644
index 35835c70f9fd..000000000000
--- a/astro/wmmoonclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Displays the phase of the moon, plus orbital data
diff --git a/astro/wmsolar/Makefile b/astro/wmsolar/Makefile
index 31179392056b..ec31bd82ab45 100644
--- a/astro/wmsolar/Makefile
+++ b/astro/wmsolar/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= astro windowmaker
MASTER_SITES= http://www.inxsoft.net/wmsolar/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A dockapp that displays the solar system viewed from top
WRKSRC= ${WRKDIR}/wmSolar
USE_X_PREFIX= yes
diff --git a/astro/wmsolar/pkg-comment b/astro/wmsolar/pkg-comment
deleted file mode 100644
index 9369412bbce0..000000000000
--- a/astro/wmsolar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockapp that displays the solar system viewed from top
diff --git a/astro/xglobe/Makefile b/astro/xglobe/Makefile
index 6279d01b289e..668ef4eca14d 100644
--- a/astro/xglobe/Makefile
+++ b/astro/xglobe/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= astro
MASTER_SITES= http://www.cs.unc.edu/~scheuerm/xglobe/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Displays a view of the Earth (like xearth) with a rendered photo map
USE_QT_VER= 3
USE_X_PREFIX= yes
diff --git a/astro/xglobe/pkg-comment b/astro/xglobe/pkg-comment
deleted file mode 100644
index 9fb7fa1689c3..000000000000
--- a/astro/xglobe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Displays a view of the Earth (like xearth) with a rendered photo map
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile
index 3585d97468eb..6334b2a42fb0 100644
--- a/astro/xplanet/Makefile
+++ b/astro/xplanet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= will@FreeBSD.org
+COMMENT= Draw pictures of the earth textured by an image
LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \
freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/astro/xplanet/pkg-comment b/astro/xplanet/pkg-comment
deleted file mode 100644
index f330ef185567..000000000000
--- a/astro/xplanet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Draw pictures of the earth textured by an image
diff --git a/audio/HVSC-Update/Makefile b/audio/HVSC-Update/Makefile
index bd7f6308adcc..e6cb46a5a2fa 100644
--- a/audio/HVSC-Update/Makefile
+++ b/audio/HVSC-Update/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-Tool-${PORTVERSION}-Source
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= Update program for the HVSC C= 64 SID tune collection
BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
diff --git a/audio/HVSC-Update/pkg-comment b/audio/HVSC-Update/pkg-comment
deleted file mode 100644
index c5fb3f2de338..000000000000
--- a/audio/HVSC-Update/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Update program for the HVSC C= 64 SID tune collection
diff --git a/audio/abcmidi/Makefile b/audio/abcmidi/Makefile
index e8544d0da4f2..1d6bf27c2663 100644
--- a/audio/abcmidi/Makefile
+++ b/audio/abcmidi/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://abc.sourceforge.net/abcMIDI/
DISTNAME= abcMIDI
MAINTAINER= sue@FreeBSD.org
+COMMENT= Convert abc music files to MIDI and PostScript
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/abcmidi/pkg-comment b/audio/abcmidi/pkg-comment
deleted file mode 100644
index 79a4d9803956..000000000000
--- a/audio/abcmidi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert abc music files to MIDI and PostScript
diff --git a/audio/abcselect/Makefile b/audio/abcselect/Makefile
index 0dc10f802087..8e1c5ef7345f 100644
--- a/audio/abcselect/Makefile
+++ b/audio/abcselect/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.lautengesellschaft.de/cdmm/
DISTNAME= ${PORTNAME}
MAINTAINER= sue@FreeBSD.org
+COMMENT= Extract parts, movements, etc from abc music files
USE_PERL5= yes
NO_BUILD= yes
diff --git a/audio/abcselect/pkg-comment b/audio/abcselect/pkg-comment
deleted file mode 100644
index e76f76ee9e28..000000000000
--- a/audio/abcselect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extract parts, movements, etc from abc music files
diff --git a/audio/ac3dec/Makefile b/audio/ac3dec/Makefile
index 2455db14a874..60a4f05f00dd 100644
--- a/audio/ac3dec/Makefile
+++ b/audio/ac3dec/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= audio
MASTER_SITES= http://dara.notbsd.org/~aholtzma/ac3/tarballs/
MAINTAINER= 3d@FreeBSD.org
+COMMENT= Software for research in digital audio coding/decoding
GNU_CONFIGURE= yes
ONLY_FOR_ARCHS= i386 alpha
diff --git a/audio/ac3dec/pkg-comment b/audio/ac3dec/pkg-comment
deleted file mode 100644
index 03d51ac7e22f..000000000000
--- a/audio/ac3dec/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Software for research in digital audio coding/decoding
diff --git a/audio/amp/Makefile b/audio/amp/Makefile
index e4ba570ec96b..0fc11260243a 100644
--- a/audio/amp/Makefile
+++ b/audio/amp/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= audio
MASTER_SITES= ftp://ftp.clara.net/pub/unix/Audio/
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Another mp3 player
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/amp/pkg-comment b/audio/amp/pkg-comment
deleted file mode 100644
index ea1558ac966c..000000000000
--- a/audio/amp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another mp3 player
diff --git a/audio/ample/Makefile b/audio/ample/Makefile
index 6f5544a72fbc..d0755bae24f4 100644
--- a/audio/ample/Makefile
+++ b/audio/ample/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= patrick@FreeBSD.org
+COMMENT= Allows you to listen to your own MP3's away from home
GNU_CONFIGURE= yes
diff --git a/audio/ample/pkg-comment b/audio/ample/pkg-comment
deleted file mode 100644
index fe1b5904e8db..000000000000
--- a/audio/ample/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows you to listen to your own MP3's away from home
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index eb5c78fc0829..2e64e0de9859 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Audio system for the KDE integrated X11 desktop
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile
diff --git a/audio/arts/pkg-comment b/audio/arts/pkg-comment
deleted file mode 100644
index 65fa88e2d49e..000000000000
--- a/audio/arts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Audio system for the KDE integrated X11 desktop
diff --git a/audio/bladeenc/Makefile b/audio/bladeenc/Makefile
index bfbe4709bceb..0e0981c67724 100644
--- a/audio/bladeenc/Makefile
+++ b/audio/bladeenc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://bladeenc.mp3.no/source/ \
EXTRACT_SUFX= -src-stable.tar.gz
MAINTAINER= dirk@FreeBSD.org
+COMMENT= MP3 encoder
GNU_CONFIGURE= yes
diff --git a/audio/bladeenc/pkg-comment b/audio/bladeenc/pkg-comment
deleted file mode 100644
index db4c24959fa1..000000000000
--- a/audio/bladeenc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MP3 encoder
diff --git a/audio/btc/Makefile b/audio/btc/Makefile
index eb129c07ebd7..b5f6d77da4dc 100644
--- a/audio/btc/Makefile
+++ b/audio/btc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.harmony-central.com/Bass/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= billf@FreeBSD.org
+COMMENT= A tool for creating bass tablature
WRKSRC= ${WRKDIR}
diff --git a/audio/btc/pkg-comment b/audio/btc/pkg-comment
deleted file mode 100644
index 2d14c07291c5..000000000000
--- a/audio/btc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for creating bass tablature
diff --git a/audio/ermixer/Makefile b/audio/ermixer/Makefile
index fc3d491dfa83..4289f1819d73 100644
--- a/audio/ermixer/Makefile
+++ b/audio/ermixer/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= audio kde
MASTER_SITES= http://erevan.cuore.org/files/ermixer/
MAINTAINER= alane@FreeBSD.org
+COMMENT= A command-line, ncurses, and Qt-GUI OSS audio mixer
USE_QT_VER= 3
USE_GMAKE= yes
diff --git a/audio/ermixer/pkg-comment b/audio/ermixer/pkg-comment
deleted file mode 100644
index b504ba758965..000000000000
--- a/audio/ermixer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line, ncurses, and Qt-GUI OSS audio mixer
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index e5696d4968dd..055adb15d7fe 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/esound/0.2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A sound library for enlightenment package
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/audio/esound/pkg-comment b/audio/esound/pkg-comment
deleted file mode 100644
index e7e09827ab77..000000000000
--- a/audio/esound/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sound library for enlightenment package
diff --git a/audio/extace/Makefile b/audio/extace/Makefile
index a82ec1fb728d..8909da3e7524 100644
--- a/audio/extace/Makefile
+++ b/audio/extace/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= extace
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An Audio Visualization plugin for the X Window System
LIB_DEPENDS= fftw.2:${PORTSDIR}/math/fftw
diff --git a/audio/extace/pkg-comment b/audio/extace/pkg-comment
deleted file mode 100644
index 0f165423444a..000000000000
--- a/audio/extace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Audio Visualization plugin for the X Window System
diff --git a/audio/glame/Makefile b/audio/glame/Makefile
index 8684e41a1fb5..1c9e792c791e 100644
--- a/audio/glame/Makefile
+++ b/audio/glame/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A powerful, fast, stable, and easily extensible sound editor for GNOME
LIB_DEPENDS= ltdl.1:${PORTSDIR}/devel/libtool
diff --git a/audio/glame/pkg-comment b/audio/glame/pkg-comment
deleted file mode 100644
index 3c87ef7c2daa..000000000000
--- a/audio/glame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A powerful, fast, stable, and easily extensible sound editor for GNOME
diff --git a/audio/gnome-audio/Makefile b/audio/gnome-audio/Makefile
index aefc714cc1d1..46f000c59f9e 100644
--- a/audio/gnome-audio/Makefile
+++ b/audio/gnome-audio/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-audio/1.4
DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Sound files for use with GNOME
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/gnome-audio/pkg-comment b/audio/gnome-audio/pkg-comment
deleted file mode 100644
index c061452c9b05..000000000000
--- a/audio/gnome-audio/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sound files for use with GNOME
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile
index 99c155157bb8..f2933c36a7ea 100644
--- a/audio/gnome-media/Makefile
+++ b/audio/gnome-media/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Multimedia applications for the GNOME 2.0 desktop
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
diff --git a/audio/gnome-media/pkg-comment b/audio/gnome-media/pkg-comment
deleted file mode 100644
index c2e90fe69c22..000000000000
--- a/audio/gnome-media/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multimedia applications for the GNOME 2.0 desktop
diff --git a/audio/gnomeaudio/Makefile b/audio/gnomeaudio/Makefile
index aefc714cc1d1..46f000c59f9e 100644
--- a/audio/gnomeaudio/Makefile
+++ b/audio/gnomeaudio/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-audio/1.4
DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Sound files for use with GNOME
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/gnomeaudio/pkg-comment b/audio/gnomeaudio/pkg-comment
deleted file mode 100644
index c061452c9b05..000000000000
--- a/audio/gnomeaudio/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sound files for use with GNOME
diff --git a/audio/gnomeaudio2/Makefile b/audio/gnomeaudio2/Makefile
index aefc714cc1d1..46f000c59f9e 100644
--- a/audio/gnomeaudio2/Makefile
+++ b/audio/gnomeaudio2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-audio/1.4
DISTNAME= gnome-audio-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Sound files for use with GNOME
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/gnomeaudio2/pkg-comment b/audio/gnomeaudio2/pkg-comment
deleted file mode 100644
index c061452c9b05..000000000000
--- a/audio/gnomeaudio2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sound files for use with GNOME
diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile
index 0b8331b07bbf..80e673a5aae3 100644
--- a/audio/gnomemedia/Makefile
+++ b/audio/gnomemedia/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/gnome-media/1.2
DISTNAME= gnome-media-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Multimedia applications for the GNOME desktop
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
diff --git a/audio/gnomemedia/pkg-comment b/audio/gnomemedia/pkg-comment
deleted file mode 100644
index 0028a932b1e0..000000000000
--- a/audio/gnomemedia/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multimedia applications for the GNOME desktop
diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile
index 99c155157bb8..f2933c36a7ea 100644
--- a/audio/gnomemedia2/Makefile
+++ b/audio/gnomemedia2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-media-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Multimedia applications for the GNOME 2.0 desktop
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox
LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
diff --git a/audio/gnomemedia2/pkg-comment b/audio/gnomemedia2/pkg-comment
deleted file mode 100644
index c2e90fe69c22..000000000000
--- a/audio/gnomemedia2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multimedia applications for the GNOME 2.0 desktop
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index 1e7ce33b34e3..0a4487ca9afa 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -13,6 +13,7 @@ DISTNAME= gogo239b
EXTRACT_SUFX= .tgz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Very fast MP3 encoder using recent x86 processors' features
# More than version 0.98
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
diff --git a/audio/gogo/pkg-comment b/audio/gogo/pkg-comment
deleted file mode 100644
index 84fc09b42d63..000000000000
--- a/audio/gogo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Very fast MP3 encoder using recent x86 processors' features
diff --git a/audio/grip/Makefile b/audio/grip/Makefile
index 40438f6225cc..14f6ad343352 100644
--- a/audio/grip/Makefile
+++ b/audio/grip/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=grip
MAINTAINER= alane@FreeBSD.org
+COMMENT= GTK-based front-end to external cd audio rippers and mp3 encoders
LIB_DEPENDS= id3-3.8.2:${PORTSDIR}/audio/id3lib \
ghttp.1:${PORTSDIR}/www/libghttp
diff --git a/audio/grip/pkg-comment b/audio/grip/pkg-comment
deleted file mode 100644
index 2df572fd33ab..000000000000
--- a/audio/grip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK-based front-end to external cd audio rippers and mp3 encoders
diff --git a/audio/id3el/Makefile b/audio/id3el/Makefile
index 31d69b81511b..27b5fd5042ad 100644
--- a/audio/id3el/Makefile
+++ b/audio/id3el/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.gentei.org/~yuuji/software/mpg123el/
DISTNAME= id3el-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= An add-on to edit an id3 tag for mpg123-mode (mpg123.el) on Emacsen
RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/site-lisp/mpg123.el:${PORTSDIR}/audio/mpg123.el
diff --git a/audio/id3el/pkg-comment b/audio/id3el/pkg-comment
deleted file mode 100644
index d1472ace0c08..000000000000
--- a/audio/id3el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An add-on to edit an id3 tag for mpg123-mode (mpg123.el) on Emacsen
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index f95403652fb4..c1ee493dc167 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= lame
MAINTAINER= netchild@FreeBSD.org
+COMMENT= ISO code based fast MP3 encoder kit
.if ${MACHINE_ARCH} == "i386"
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
diff --git a/audio/lame/pkg-comment b/audio/lame/pkg-comment
deleted file mode 100644
index 9e6741c34345..000000000000
--- a/audio/lame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ISO code based fast MP3 encoder kit
diff --git a/audio/libaudiofile/Makefile b/audio/libaudiofile/Makefile
index cdf4d1bb5010..e5c36d017c78 100644
--- a/audio/libaudiofile/Makefile
+++ b/audio/libaudiofile/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/audiofile/0.2
DISTNAME= audiofile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A sound library for SGI audio file
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/audio/libaudiofile/pkg-comment b/audio/libaudiofile/pkg-comment
deleted file mode 100644
index b1d3e5c4ad62..000000000000
--- a/audio/libaudiofile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sound library for SGI audio file
diff --git a/audio/libworkman/Makefile b/audio/libworkman/Makefile
index 5d9c46727149..eec7793a3208 100644
--- a/audio/libworkman/Makefile
+++ b/audio/libworkman/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= jim
DISTNAME= ${PORTNAME}-1999-06-20
MAINTAINER= jim@FreeBSD.org
+COMMENT= Workman library required by some audio apps
WRKSRC= ${WRKDIR}/libworkman
USE_IMAKE= yes
diff --git a/audio/libworkman/pkg-comment b/audio/libworkman/pkg-comment
deleted file mode 100644
index 3f997c06aeb5..000000000000
--- a/audio/libworkman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Workman library required by some audio apps
diff --git a/audio/linux-vsound/Makefile b/audio/linux-vsound/Makefile
index a437356aa52c..717708cc0e78 100644
--- a/audio/linux-vsound/Makefile
+++ b/audio/linux-vsound/Makefile
@@ -14,6 +14,7 @@ DISTNAME= vsound-${PORTVERSION}
EXTRACT_ONLY=
MAINTAINER= kris@FreeBSD.org
+COMMENT= Utility for capturing audio streams from Linux binaries
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox/
diff --git a/audio/linux-vsound/pkg-comment b/audio/linux-vsound/pkg-comment
deleted file mode 100644
index 0f404455bb9d..000000000000
--- a/audio/linux-vsound/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility for capturing audio streams from Linux binaries
diff --git a/audio/lplayer/Makefile b/audio/lplayer/Makefile
index 40a28bc53e46..9e9980545bfb 100644
--- a/audio/lplayer/Makefile
+++ b/audio/lplayer/Makefile
@@ -18,6 +18,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= A QT program to queue lots of MP3s for random XMMS play
BUILD_DEPENDS= xmms-config:${PORTSDIR}/multimedia/xmms
diff --git a/audio/lplayer/pkg-comment b/audio/lplayer/pkg-comment
deleted file mode 100644
index c3184ba3b5dc..000000000000
--- a/audio/lplayer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QT program to queue lots of MP3s for random XMMS play
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 5b7ef66e11b0..971a410192c9 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= audio
MASTER_SITES= http://www.stack.nl/~brama/mp3blaster/src/
MAINTAINER= greid@FreeBSD.org
+COMMENT= MP3 console ncurses-based player
.include <bsd.port.pre.mk>
diff --git a/audio/mp3blaster/pkg-comment b/audio/mp3blaster/pkg-comment
deleted file mode 100644
index 0b85511d4af8..000000000000
--- a/audio/mp3blaster/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MP3 console ncurses-based player
diff --git a/audio/mp3chew/Makefile b/audio/mp3chew/Makefile
index c3feffa3b952..f9c821a080b1 100644
--- a/audio/mp3chew/Makefile
+++ b/audio/mp3chew/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= # none left
# informed maintainer - edwin 20021226
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A program to rename mismatched and garbled MP3 filenames
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/audio/mp3chew/pkg-comment b/audio/mp3chew/pkg-comment
deleted file mode 100644
index ff0f44ed80ff..000000000000
--- a/audio/mp3chew/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to rename mismatched and garbled MP3 filenames
diff --git a/audio/mp3ck/Makefile b/audio/mp3ck/Makefile
index 9e4ac1959e0a..da656ed9bd66 100644
--- a/audio/mp3ck/Makefile
+++ b/audio/mp3ck/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= yar@FreeBSD.org
+COMMENT= A consistency check utility for MPEG Layer 2 or 3 files or streams
MAN1= mp3ck.1
diff --git a/audio/mp3ck/pkg-comment b/audio/mp3ck/pkg-comment
deleted file mode 100644
index 3545a3325afa..000000000000
--- a/audio/mp3ck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A consistency check utility for MPEG Layer 2 or 3 files or streams
diff --git a/audio/mp3info/Makefile b/audio/mp3info/Makefile
index c674092edfe9..e90cab5cff01 100644
--- a/audio/mp3info/Makefile
+++ b/audio/mp3info/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= apps/sound/mp3-utils/mp3info
EXTRACT_SUFX= .tgz
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool to manipulate ID3 tags for MP3 files
USE_GNOMENG= yes
WANT_GNOME= yes
diff --git a/audio/mp3info/pkg-comment b/audio/mp3info/pkg-comment
deleted file mode 100644
index d569d2590080..000000000000
--- a/audio/mp3info/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to manipulate ID3 tags for MP3 files
diff --git a/audio/mpg123.el/Makefile b/audio/mpg123.el/Makefile
index b4ea86de0d0e..69f1272d5f70 100644
--- a/audio/mpg123.el/Makefile
+++ b/audio/mpg123.el/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= # empty
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Front-end to mpg123 audio player for Emacsen
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/audio/mpg123.el/pkg-comment b/audio/mpg123.el/pkg-comment
deleted file mode 100644
index 7db914aa9297..000000000000
--- a/audio/mpg123.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Front-end to mpg123 audio player for Emacsen
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index 38a7ffa009eb..a4d51ce4a682 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -22,6 +22,7 @@ PATCHFILES= mpg123-059r-v6-20000713b.diff.gz:ipv6 \
PATCH_DIST_STRIP= -p1
MAINTAINER= des@FreeBSD.org
+COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio
USE_GNOMENG= yes
WANT_GNOME= yes
diff --git a/audio/mpg123/pkg-comment b/audio/mpg123/pkg-comment
deleted file mode 100644
index bc0691f6026b..000000000000
--- a/audio/mpg123/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command-line player for mpeg layer 1, 2 and 3 audio
diff --git a/audio/napster/Makefile b/audio/napster/Makefile
index 37ca5de3bc0d..170caf86de7c 100644
--- a/audio/napster/Makefile
+++ b/audio/napster/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nap
MAINTAINER= petef@FreeBSD.org
+COMMENT= An MP3 sharing, search, and chat client for the OpenNAP network
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/audio/napster/pkg-comment b/audio/napster/pkg-comment
deleted file mode 100644
index b951c5142ef2..000000000000
--- a/audio/napster/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An MP3 sharing, search, and chat client for the OpenNAP network
diff --git a/audio/opennap/Makefile b/audio/opennap/Makefile
index f86eedab437f..bc8af4b8e9f3 100644
--- a/audio/opennap/Makefile
+++ b/audio/opennap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= The OpenNAP open-source Napster server
USE_GMAKE= YES
GNU_CONFIGURE= YES
diff --git a/audio/opennap/pkg-comment b/audio/opennap/pkg-comment
deleted file mode 100644
index 7d1ebf6f0af1..000000000000
--- a/audio/opennap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The OpenNAP open-source Napster server
diff --git a/audio/py-ao/Makefile b/audio/py-ao/Makefile
index 2a2fb8ee34ea..528172d3de54 100644
--- a/audio/py-ao/Makefile
+++ b/audio/py-ao/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyao-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A python wrapper for ao, an audio device abstraction library
LIB_DEPENDS= ao.3:${PORTSDIR}/audio/libao
diff --git a/audio/py-ao/pkg-comment b/audio/py-ao/pkg-comment
deleted file mode 100644
index 16fed096d580..000000000000
--- a/audio/py-ao/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A python wrapper for ao, an audio device abstraction library
diff --git a/audio/py-ogg/Makefile b/audio/py-ogg/Makefile
index 103f46e75705..0a6cdbdeb821 100644
--- a/audio/py-ogg/Makefile
+++ b/audio/py-ogg/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyogg-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Object-oriented Python bindings for the ogg library
LIB_DEPENDS= ogg.4:${PORTSDIR}/audio/libogg
diff --git a/audio/py-ogg/pkg-comment b/audio/py-ogg/pkg-comment
deleted file mode 100644
index ef3ffba62d36..000000000000
--- a/audio/py-ogg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Object-oriented Python bindings for the ogg library
diff --git a/audio/py-vorbis/Makefile b/audio/py-vorbis/Makefile
index 89176373704b..7ebc1fe0c417 100644
--- a/audio/py-vorbis/Makefile
+++ b/audio/py-vorbis/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyvorbis-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Object-oriented Python bindings for the vorbis library
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_oggmodule.so:${PORTSDIR}/audio/py-ogg
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/_oggmodule.so:${PORTSDIR}/audio/py-ogg
diff --git a/audio/py-vorbis/pkg-comment b/audio/py-vorbis/pkg-comment
deleted file mode 100644
index de1ec7261d3d..000000000000
--- a/audio/py-vorbis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Object-oriented Python bindings for the vorbis library
diff --git a/audio/pysol-sound-server/Makefile b/audio/pysol-sound-server/Makefile
index f20d189f53c1..fc92d1e7326c 100644
--- a/audio/pysol-sound-server/Makefile
+++ b/audio/pysol-sound-server/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= sobomax
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Python extension module to play sounds and background music
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
smpeg.1:${PORTSDIR}/graphics/smpeg \
diff --git a/audio/pysol-sound-server/pkg-comment b/audio/pysol-sound-server/pkg-comment
deleted file mode 100644
index 542eaba834d2..000000000000
--- a/audio/pysol-sound-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python extension module to play sounds and background music
diff --git a/audio/quelcom/Makefile b/audio/quelcom/Makefile
index 56260639482f..22e3146daeed 100644
--- a/audio/quelcom/Makefile
+++ b/audio/quelcom/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= audio
MASTER_SITES= http://www.etse.urv.es/~dmanye/quelcom/src/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A set of command-line utilities for MP3 and wave files
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/audio/quelcom/pkg-comment b/audio/quelcom/pkg-comment
deleted file mode 100644
index 3693dea33c7d..000000000000
--- a/audio/quelcom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of command-line utilities for MP3 and wave files
diff --git a/audio/rat/Makefile b/audio/rat/Makefile
index 3313ef9c5305..903757fd1cf1 100644
--- a/audio/rat/Makefile
+++ b/audio/rat/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= \
http://www.icir.org/hodson/ucl-mirror/
MAINTAINER= orion@freebsd.org
+COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool
TCLTK_VERSION= 8.2
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/audio/rat/pkg-comment b/audio/rat/pkg-comment
deleted file mode 100644
index abcb956e03eb..000000000000
--- a/audio/rat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IPv4/v6 Multicast and unicast audio conferencing tool
diff --git a/audio/replay/Makefile b/audio/replay/Makefile
index 1c675c7b5dca..86c7c66b1a62 100644
--- a/audio/replay/Makefile
+++ b/audio/replay/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= X11/gtkbuffet/apps/replay
DISTNAME= ${PORTNAME}-source-dgtk_${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Another GTK-based mp3 player
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/audio/replay/pkg-comment b/audio/replay/pkg-comment
deleted file mode 100644
index 64d30f40974e..000000000000
--- a/audio/replay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another GTK-based mp3 player
diff --git a/audio/sbagen/Makefile b/audio/sbagen/Makefile
index ace8eadc8bab..3d36e045242d 100644
--- a/audio/sbagen/Makefile
+++ b/audio/sbagen/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= greid@FreeBSD.org
+COMMENT= A sequenced binaural wave generator
SHAREFILES= t-alpha t-beta t-calm t-calm2 t-delta t-focus t-focus-1 \
t-focus-2 t-focus2 t-mix1 t-seqall t-test10 t-test10b \
diff --git a/audio/sbagen/pkg-comment b/audio/sbagen/pkg-comment
deleted file mode 100644
index a1cf275793b6..000000000000
--- a/audio/sbagen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sequenced binaural wave generator
diff --git a/audio/sdl_mixer/Makefile b/audio/sdl_mixer/Makefile
index 75963be580e8..c70899fb0e5f 100644
--- a/audio/sdl_mixer/Makefile
+++ b/audio/sdl_mixer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.libsdl.org/projects/SDL_mixer/release/
DISTNAME= SDL_mixer-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A sample multi-channel audio mixer library
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
smpeg.1:${PORTSDIR}/graphics/smpeg \
diff --git a/audio/sdl_mixer/pkg-comment b/audio/sdl_mixer/pkg-comment
deleted file mode 100644
index a0bf118928a2..000000000000
--- a/audio/sdl_mixer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sample multi-channel audio mixer library
diff --git a/audio/shntool/Makefile b/audio/shntool/Makefile
index 4a580ad5ec01..b606f0a966fb 100644
--- a/audio/shntool/Makefile
+++ b/audio/shntool/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= fenner
EXTRACT_SUFX= .tar.gz
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= Multi-purpose .wav/.shn processing utility
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/audio/shntool/pkg-comment b/audio/shntool/pkg-comment
deleted file mode 100644
index bc49ab410a60..000000000000
--- a/audio/shntool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-purpose .wav/.shn processing utility
diff --git a/audio/snowstar/Makefile b/audio/snowstar/Makefile
index 012c112ddfee..276a3a1e4081 100644
--- a/audio/snowstar/Makefile
+++ b/audio/snowstar/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= http://www.daft.com/~armadilo/projects/snowstar/
EXTRACT_SUFX= .tar
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= A GUI interface to copy files to/from the Diamond Rio
RUN_DEPENDS= rio:${PORTSDIR}/audio/rio \
wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/audio/snowstar/pkg-comment b/audio/snowstar/pkg-comment
deleted file mode 100644
index 4021993e7a05..000000000000
--- a/audio/snowstar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI interface to copy files to/from the Diamond Rio
diff --git a/audio/soribada/Makefile b/audio/soribada/Makefile
index a824b5c1d483..d50b14accb6f 100644
--- a/audio/soribada/Makefile
+++ b/audio/soribada/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= audio
MASTER_SITES= http://soribada.kldp.org/depot/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Soribada client
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/audio/soribada/pkg-comment b/audio/soribada/pkg-comment
deleted file mode 100644
index c7ea69f8b0e1..000000000000
--- a/audio/soribada/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Soribada client
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index 6e4e93dfbd54..cec9f2625ad4 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= audio
MASTER_SITES= http://splay.sourceforge.net/tgz/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= An audio player that decodes MPEG Layer I,II,III and WAV files
GNU_CONFIGURE= yes
MAN1= splay.1
diff --git a/audio/splay/pkg-comment b/audio/splay/pkg-comment
deleted file mode 100644
index 286a32f1b708..000000000000
--- a/audio/splay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An audio player that decodes MPEG Layer I,II,III and WAV files
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index c33d33f4b6e3..968feaf0d15b 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A sound editor for the GNOME/GTK 1.2 desktop
LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \
samplerate.0:${PORTSDIR}/audio/libsamplerate \
diff --git a/audio/sweep/pkg-comment b/audio/sweep/pkg-comment
deleted file mode 100644
index 6c8efe474fde..000000000000
--- a/audio/sweep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sound editor for the GNOME/GTK 1.2 desktop
diff --git a/audio/tempest_for_eliza/Makefile b/audio/tempest_for_eliza/Makefile
index 931bbaa94a37..02495e11c8e7 100644
--- a/audio/tempest_for_eliza/Makefile
+++ b/audio/tempest_for_eliza/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= audio
MASTER_SITES= http://www.erikyyy.de/tempest/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A program to send AM radio signals using a PC monitor
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/audio/tempest_for_eliza/pkg-comment b/audio/tempest_for_eliza/pkg-comment
deleted file mode 100644
index ca9db689d890..000000000000
--- a/audio/tempest_for_eliza/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to send AM radio signals using a PC monitor
diff --git a/audio/uade/Makefile b/audio/uade/Makefile
index a014a68901f4..ff69ccdac43a 100644
--- a/audio/uade/Makefile
+++ b/audio/uade/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.ee.tut.fi/%7Eheikki/uade/pre/
DISTFILES= uade-${PORTVERSION}-pre3-antiwar${EXTRACT_SUFX}
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Unix Amiga Delitracker Emulator with XMMS Input plugin.
LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/audio/uade/pkg-comment b/audio/uade/pkg-comment
deleted file mode 100644
index 2aa92a810b1f..000000000000
--- a/audio/uade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unix Amiga Delitracker Emulator with XMMS Input plugin.
diff --git a/audio/umix/Makefile b/audio/umix/Makefile
index b5c00b40ae2a..89e99483079a 100644
--- a/audio/umix/Makefile
+++ b/audio/umix/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= An advanced tool for adjusting soundcard mixers, designed as a replacement for aumix
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/audio/umix/pkg-comment b/audio/umix/pkg-comment
deleted file mode 100644
index dd0c04047d9d..000000000000
--- a/audio/umix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An advanced tool for adjusting soundcard mixers, designed as a replacement for aumix
diff --git a/audio/vat/Makefile b/audio/vat/Makefile
index ed6fdd84684e..a8a81d499bce 100644
--- a/audio/vat/Makefile
+++ b/audio/vat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
MAINTAINER= fenner@FreeBSD.org
+COMMENT= The Visual Audio Tool - multicast audioconferencing
GSM_DIR= ${.CURDIR}/../../audio/gsm
GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10
diff --git a/audio/vat/pkg-comment b/audio/vat/pkg-comment
deleted file mode 100644
index e16ddfdfa5eb..000000000000
--- a/audio/vat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Visual Audio Tool - multicast audioconferencing
diff --git a/audio/wmmp3/Makefile b/audio/wmmp3/Makefile
index 92d4b22f9883..4f0f15136743 100644
--- a/audio/wmmp3/Makefile
+++ b/audio/wmmp3/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= audio windowmaker
MASTER_SITES= http://www.dotfiles.com/software/wmmp3/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A front-end for mpg123 in a Window Maker dockapp
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/audio/wmmp3/pkg-comment b/audio/wmmp3/pkg-comment
deleted file mode 100644
index 08182730df39..000000000000
--- a/audio/wmmp3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A front-end for mpg123 in a Window Maker dockapp
diff --git a/audio/wmtune/Makefile b/audio/wmtune/Makefile
index 0fb7d627afc3..6901b0c847a9 100644
--- a/audio/wmtune/Makefile
+++ b/audio/wmtune/Makefile
@@ -16,6 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:wmtune \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Dockable radio program for the BT848/878 and RadioTrack cards
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/audio/wmtune/pkg-comment b/audio/wmtune/pkg-comment
deleted file mode 100644
index 830a3cc15f94..000000000000
--- a/audio/wmtune/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dockable radio program for the BT848/878 and RadioTrack cards
diff --git a/audio/wsoundprefs/Makefile b/audio/wsoundprefs/Makefile
index 6bec16486859..88e16014ccea 100644
--- a/audio/wsoundprefs/Makefile
+++ b/audio/wsoundprefs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
DISTNAME= WSoundPrefs-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A utility for configuring sounds to play for Window Maker events
BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
diff --git a/audio/wsoundprefs/pkg-comment b/audio/wsoundprefs/pkg-comment
deleted file mode 100644
index 71acc82602a2..000000000000
--- a/audio/wsoundprefs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility for configuring sounds to play for Window Maker events
diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile
index dbece68c6248..ebcb1699fe51 100644
--- a/audio/wsoundserver/Makefile
+++ b/audio/wsoundserver/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/
DISTNAME= WSoundServer-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The sound server for Window Maker
BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
diff --git a/audio/wsoundserver/pkg-comment b/audio/wsoundserver/pkg-comment
deleted file mode 100644
index 41c2e0d52832..000000000000
--- a/audio/wsoundserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The sound server for Window Maker
diff --git a/audio/x11amp/Makefile b/audio/x11amp/Makefile
index a1c3333bbe56..2b85ad0004a8 100644
--- a/audio/x11amp/Makefile
+++ b/audio/x11amp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.cs.tu-berlin.de/pub/misc/x11amp/0.9/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-beta/}
MAINTAINER= dburr@FreeBSD.org
+COMMENT= X11-based MP3 player with nice graphical interface
USE_XLIB= yes
USE_GNOMENG= yes
diff --git a/audio/x11amp/pkg-comment b/audio/x11amp/pkg-comment
deleted file mode 100644
index 28af9b6d763c..000000000000
--- a/audio/x11amp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11-based MP3 player with nice graphical interface
diff --git a/audio/xcd/Makefile b/audio/xcd/Makefile
index 8efa3ab611e3..520f808f37f5 100644
--- a/audio/xcd/Makefile
+++ b/audio/xcd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A Tcl/Tk CD player
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/audio/xcd/pkg-comment b/audio/xcd/pkg-comment
deleted file mode 100644
index b599e351b9d9..000000000000
--- a/audio/xcd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tcl/Tk CD player
diff --git a/audio/xhippo/Makefile b/audio/xhippo/Makefile
index 7c0a217f48be..fc2022ac4b39 100644
--- a/audio/xhippo/Makefile
+++ b/audio/xhippo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= xhippo
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A Generic music player for UNIX systems
RUN_DEPENDS= mpg123:${PORTSDIR}/audio/mpg123
diff --git a/audio/xhippo/pkg-comment b/audio/xhippo/pkg-comment
deleted file mode 100644
index 8c8b9eb25157..000000000000
--- a/audio/xhippo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Generic music player for UNIX systems
diff --git a/audio/xmms-crossfade/Makefile b/audio/xmms-crossfade/Makefile
index 26ad9b578f48..15a72f6280e1 100644
--- a/audio/xmms-crossfade/Makefile
+++ b/audio/xmms-crossfade/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.netcologne.de/~nc-eisenlpe2/xmms-crossfade/ \
ftp://ftp.falsehope.com/pub/xmms-crossfade/
MAINTAINER= pat@FreeBSD.org
+COMMENT= XMMS Output plugin for crossfading between songs
LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-crossfade/pkg-comment b/audio/xmms-crossfade/pkg-comment
deleted file mode 100644
index efdcd0012d78..000000000000
--- a/audio/xmms-crossfade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XMMS Output plugin for crossfading between songs
diff --git a/audio/xmms-crystality/Makefile b/audio/xmms-crystality/Makefile
index dc13f1413d5e..a5bf94935200 100644
--- a/audio/xmms-crystality/Makefile
+++ b/audio/xmms-crystality/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= xmms-
DISTNAME= ${PORTNAME}-plugin-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Realtime XMMS plugin for remastering mp3 sound
LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-crystality/pkg-comment b/audio/xmms-crystality/pkg-comment
deleted file mode 100644
index aa27da315046..000000000000
--- a/audio/xmms-crystality/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Realtime XMMS plugin for remastering mp3 sound
diff --git a/audio/xmms-uade/Makefile b/audio/xmms-uade/Makefile
index a014a68901f4..ff69ccdac43a 100644
--- a/audio/xmms-uade/Makefile
+++ b/audio/xmms-uade/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.ee.tut.fi/%7Eheikki/uade/pre/
DISTFILES= uade-${PORTVERSION}-pre3-antiwar${EXTRACT_SUFX}
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Unix Amiga Delitracker Emulator with XMMS Input plugin.
LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/audio/xmms-uade/pkg-comment b/audio/xmms-uade/pkg-comment
deleted file mode 100644
index 2aa92a810b1f..000000000000
--- a/audio/xmms-uade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unix Amiga Delitracker Emulator with XMMS Input plugin.
diff --git a/audio/xmms-volnorm/Makefile b/audio/xmms-volnorm/Makefile
index d6aa717fc880..1b92fba84404 100644
--- a/audio/xmms-volnorm/Makefile
+++ b/audio/xmms-volnorm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://volnorm.sourceforge.net/
PKGNAMEPREFIX= xmms-
MAINTAINER= pat@FreeBSD.org
+COMMENT= Volume Normalizer plugin for XMMS
LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms
diff --git a/audio/xmms-volnorm/pkg-comment b/audio/xmms-volnorm/pkg-comment
deleted file mode 100644
index af4f09f23c8b..000000000000
--- a/audio/xmms-volnorm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Volume Normalizer plugin for XMMS
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 78016794600d..efe1e3afe39c 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= demon@FreeBSD.org
+COMMENT= Yet Another Mp3 Tool which helps you to organize your mp3s
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/audio/yamt/pkg-comment b/audio/yamt/pkg-comment
deleted file mode 100644
index a446fdf2b439..000000000000
--- a/audio/yamt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another Mp3 Tool which helps you to organize your mp3s
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index 95247112226e..0dff57f6766c 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.acnc.com/benchmarks/ \
DISTNAME= bonnie
MAINTAINER= se@FreeBSD.org
+COMMENT= Performance Test of Filesystem I/O
NO_WRKSUBDIR= yes
#CFLAGS+= -static
diff --git a/benchmarks/bonnie/pkg-comment b/benchmarks/bonnie/pkg-comment
deleted file mode 100644
index d22f59d4d38a..000000000000
--- a/benchmarks/bonnie/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Performance Test of Filesystem I/O
diff --git a/benchmarks/bytebench/Makefile b/benchmarks/bytebench/Makefile
index b6ea556aa8da..4ee7052fa5b6 100644
--- a/benchmarks/bytebench/Makefile
+++ b/benchmarks/bytebench/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.inria.fr/system/benchmark/
EXTRACT_SUFX= .tar.Z
MAINTAINER= se@FreeBSD.org
+COMMENT= The BYTE magazine benchmark suite
do-install:
-${MKDIR} $(PREFIX)/lib/bytebench
diff --git a/benchmarks/bytebench/pkg-comment b/benchmarks/bytebench/pkg-comment
deleted file mode 100644
index 4b271f82ad70..000000000000
--- a/benchmarks/bytebench/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The BYTE magazine benchmark suite
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index 899c72291593..f2d230cf4128 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= benchmarks
MASTER_SITES= http://www.kusa.ac.jp/~yukio-m/dbs/software1.1.5/
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A distributed network benchmarking system
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/benchmarks/dbs/pkg-comment b/benchmarks/dbs/pkg-comment
deleted file mode 100644
index b019f4bf984b..000000000000
--- a/benchmarks/dbs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A distributed network benchmarking system
diff --git a/benchmarks/iozone/Makefile b/benchmarks/iozone/Makefile
index 7cdda6490f2d..f0d53e16daca 100644
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/}
EXTRACT_SUFX= .tar
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Performance Test of Sequential File I/O
WRKSRC= ${WRKDIR}/src/current
diff --git a/benchmarks/iozone/pkg-comment b/benchmarks/iozone/pkg-comment
deleted file mode 100644
index 4ff4e7b3d135..000000000000
--- a/benchmarks/iozone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Performance Test of Sequential File I/O
diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile
index 140779f93a15..f45d8aed8afe 100644
--- a/benchmarks/iperf/Makefile
+++ b/benchmarks/iperf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://dast.nlanr.net/Projects/Iperf/
DISTNAME= iperf-1.6.5-source
MAINTAINER= smace@FreeBSD.org
+COMMENT= A tool to measure maximum TCP and UDP bandwidth
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/benchmarks/iperf/pkg-comment b/benchmarks/iperf/pkg-comment
deleted file mode 100644
index 5d78b5a2f384..000000000000
--- a/benchmarks/iperf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to measure maximum TCP and UDP bandwidth
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 521f2139d7da..b41f059e5797 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A system performance measurement tool
ALL_TARGET= build
MAKE_ENV= PATH=${PATH}:${WRKSRC}/scripts
diff --git a/benchmarks/lmbench/pkg-comment b/benchmarks/lmbench/pkg-comment
deleted file mode 100644
index 591a21e5e11f..000000000000
--- a/benchmarks/lmbench/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A system performance measurement tool
diff --git a/benchmarks/netperf/Makefile b/benchmarks/netperf/Makefile
index ad7bd63de70a..c86f69038f28 100644
--- a/benchmarks/netperf/Makefile
+++ b/benchmarks/netperf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.cup.hp.com/dist/networking/benchmarks/netperf/
DISTNAME= netperf-2.2pl3
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Rick Jones' <raj@cup.hp.com> network performance benchmarking package
MAKEFILE= makefile
MAN1= netperf.1 netserver.1
diff --git a/benchmarks/netperf/pkg-comment b/benchmarks/netperf/pkg-comment
deleted file mode 100644
index 180b4759b2d1..000000000000
--- a/benchmarks/netperf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rick Jones' <raj@cup.hp.com> network performance benchmarking package
diff --git a/benchmarks/netpipe/Makefile b/benchmarks/netpipe/Makefile
index ba409cbcfacb..133c061f68e9 100644
--- a/benchmarks/netpipe/Makefile
+++ b/benchmarks/netpipe/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= http://www.scl.ameslab.gov/Projects/Netpipe/code/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A self-scaling network benchmark
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKEFILE= makefile
diff --git a/benchmarks/netpipe/pkg-comment b/benchmarks/netpipe/pkg-comment
deleted file mode 100644
index 82ff6d15d94e..000000000000
--- a/benchmarks/netpipe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A self-scaling network benchmark
diff --git a/benchmarks/nttcp/Makefile b/benchmarks/nttcp/Makefile
index 11caf18dda60..3b5ee3b308ef 100644
--- a/benchmarks/nttcp/Makefile
+++ b/benchmarks/nttcp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.leo.org/~bartel/nttcp/ \
MASTER_SITE_SUBDIR= billf
MAINTAINER= billf@FreeBSD.org
+COMMENT= A client/server program for testing network performance
ALL_TARGET= nttcp
MAN1= nttcp.1
diff --git a/benchmarks/nttcp/pkg-comment b/benchmarks/nttcp/pkg-comment
deleted file mode 100644
index 24a2539e003c..000000000000
--- a/benchmarks/nttcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A client/server program for testing network performance
diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index b02812a4bbce..6fa5f3adbaf2 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= A benchmarking tool for Web proxies
IS_INTERACTIVE= yes
diff --git a/benchmarks/polygraph/pkg-comment b/benchmarks/polygraph/pkg-comment
deleted file mode 100644
index 5ad3561e2ca7..000000000000
--- a/benchmarks/polygraph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A benchmarking tool for Web proxies
diff --git a/benchmarks/polygraph31/Makefile b/benchmarks/polygraph31/Makefile
index b02812a4bbce..6fa5f3adbaf2 100644
--- a/benchmarks/polygraph31/Makefile
+++ b/benchmarks/polygraph31/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= A benchmarking tool for Web proxies
IS_INTERACTIVE= yes
diff --git a/benchmarks/polygraph31/pkg-comment b/benchmarks/polygraph31/pkg-comment
deleted file mode 100644
index 5ad3561e2ca7..000000000000
--- a/benchmarks/polygraph31/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A benchmarking tool for Web proxies
diff --git a/benchmarks/pybench/Makefile b/benchmarks/pybench/Makefile
index 9b31a37f080b..23d27325ea68 100644
--- a/benchmarks/pybench/Makefile
+++ b/benchmarks/pybench/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= benchmarks python
MASTER_SITES= http://www.lemburg.com/files/python/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An extensible benchmark suite for Python
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/benchmarks/pybench/pkg-comment b/benchmarks/pybench/pkg-comment
deleted file mode 100644
index f714b49436c5..000000000000
--- a/benchmarks/pybench/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible benchmark suite for Python
diff --git a/benchmarks/rawio/Makefile b/benchmarks/rawio/Makefile
index 52e6a96477b5..d3a9498722f7 100644
--- a/benchmarks/rawio/Makefile
+++ b/benchmarks/rawio/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= benchmarks
MASTER_SITES= ftp://ftp.lemis.com/pub/
MAINTAINER= grog@FreeBSD.org
+COMMENT= Test performance of low-level storage devices
NO_WRKSUBDIR= yes
MAN1= rawio.1
diff --git a/benchmarks/rawio/pkg-comment b/benchmarks/rawio/pkg-comment
deleted file mode 100644
index ac1db9a6efe6..000000000000
--- a/benchmarks/rawio/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Test performance of low-level storage devices
diff --git a/benchmarks/ttcp/Makefile b/benchmarks/ttcp/Makefile
index 9557a832240e..a8819a3a0840 100644
--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.sgi.com/sgi/src/ttcp/
DISTFILES= ttcp.c ttcp.1 README
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Benchmarking tool for analysing TCP and UDP performance
EXTRACT_ONLY= #none
NO_WRKSUBDIR= yes
diff --git a/benchmarks/ttcp/pkg-comment b/benchmarks/ttcp/pkg-comment
deleted file mode 100644
index 764ed03d460c..000000000000
--- a/benchmarks/ttcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Benchmarking tool for analysing TCP and UDP performance
diff --git a/benchmarks/ubench/Makefile b/benchmarks/ubench/Makefile
index 2ce0eb74fda9..a4c0e4a2b21f 100644
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/benchmark
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Unix Benchmark Utility for CPU(s) and memory
HAS_CONFIGURE= yes
diff --git a/benchmarks/ubench/pkg-comment b/benchmarks/ubench/pkg-comment
deleted file mode 100644
index 876323db95fb..000000000000
--- a/benchmarks/ubench/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unix Benchmark Utility for CPU(s) and memory
diff --git a/benchmarks/unixbench/Makefile b/benchmarks/unixbench/Makefile
index b6ea556aa8da..4ee7052fa5b6 100644
--- a/benchmarks/unixbench/Makefile
+++ b/benchmarks/unixbench/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.inria.fr/system/benchmark/
EXTRACT_SUFX= .tar.Z
MAINTAINER= se@FreeBSD.org
+COMMENT= The BYTE magazine benchmark suite
do-install:
-${MKDIR} $(PREFIX)/lib/bytebench
diff --git a/benchmarks/unixbench/pkg-comment b/benchmarks/unixbench/pkg-comment
deleted file mode 100644
index 4b271f82ad70..000000000000
--- a/benchmarks/unixbench/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The BYTE magazine benchmark suite
diff --git a/biology/coalesce/Makefile b/biology/coalesce/Makefile
index 7dd0ff4bdbc0..9ab00a08e28a 100644
--- a/biology/coalesce/Makefile
+++ b/biology/coalesce/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A program to fit population models
NO_WRKSUBDIR= yes
ALL_TARGET= ${PORTNAME}
diff --git a/biology/coalesce/pkg-comment b/biology/coalesce/pkg-comment
deleted file mode 100644
index 8e9f159f703c..000000000000
--- a/biology/coalesce/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to fit population models
diff --git a/biology/emboss/Makefile b/biology/emboss/Makefile
index 1fece8dd82b9..c847e0ad7627 100644
--- a/biology/emboss/Makefile
+++ b/biology/emboss/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME:U}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of open source tools for genetic sequence analysis
LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
diff --git a/biology/emboss/pkg-comment b/biology/emboss/pkg-comment
deleted file mode 100644
index 5b05a785f6fc..000000000000
--- a/biology/emboss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of open source tools for genetic sequence analysis
diff --git a/biology/fasta/Makefile b/biology/fasta/Makefile
index cc5e4089b90e..839caa26c8a1 100644
--- a/biology/fasta/Makefile
+++ b/biology/fasta/Makefile
@@ -13,6 +13,7 @@ DISTNAME= fasta${PORTVERSION:S/.//g}
EXTRACT_SUFX= .shar.Z
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of programs for searching DNA and protein databases
NO_CDROM= May not be sold or incorporated into a commercial product
WRKSRC= ${WRKDIR}/fasta
diff --git a/biology/fasta/pkg-comment b/biology/fasta/pkg-comment
deleted file mode 100644
index b4e576aaaea1..000000000000
--- a/biology/fasta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of programs for searching DNA and protein databases
diff --git a/biology/fasta3/Makefile b/biology/fasta3/Makefile
index 3c0523f5afab..25dcad20ddcf 100644
--- a/biology/fasta3/Makefile
+++ b/biology/fasta3/Makefile
@@ -13,6 +13,7 @@ DISTNAME= fasta${PORTVERSION:S/.//g}
EXTRACT_SUFX= .shar.Z
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of programs for searching DNA and protein databases, v3
NO_CDROM= May not be sold or incorporated into a commercial product
WRKSRC= ${WRKDIR}/fasta3
diff --git a/biology/fasta3/pkg-comment b/biology/fasta3/pkg-comment
deleted file mode 100644
index 20092179946a..000000000000
--- a/biology/fasta3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of programs for searching DNA and protein databases, v3
diff --git a/biology/fluctuate/Makefile b/biology/fluctuate/Makefile
index 551298c13b85..abc0950132a2 100644
--- a/biology/fluctuate/Makefile
+++ b/biology/fluctuate/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A program to fit population models
NO_WRKSUBDIR= yes
ALL_TARGET= ${PORTNAME}
diff --git a/biology/fluctuate/pkg-comment b/biology/fluctuate/pkg-comment
deleted file mode 100644
index 8e9f159f703c..000000000000
--- a/biology/fluctuate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to fit population models
diff --git a/biology/hmmer/Makefile b/biology/hmmer/Makefile
index 92658fd19195..331931775dc7 100644
--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.genetics.wustl.edu/pub/eddy/hmmer/${VERSIONSTRING}/
DISTNAME= ${PORTNAME}-${VERSIONSTRING}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Profile hidden Markov models for biological sequence analysis
GNU_CONFIGURE= yes
USE_PERL5= yes
diff --git a/biology/hmmer/pkg-comment b/biology/hmmer/pkg-comment
deleted file mode 100644
index fe4433a6b575..000000000000
--- a/biology/hmmer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Profile hidden Markov models for biological sequence analysis
diff --git a/biology/lamarc/Makefile b/biology/lamarc/Makefile
index 38dc0c528979..9fa785a587aa 100644
--- a/biology/lamarc/Makefile
+++ b/biology/lamarc/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # none
EXTRACT_ONLY= # empty
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A package of programs for computing population parameters
RUN_DEPENDS= coalesce:${PORTSDIR}/biology/coalesce \
fluctuate:${PORTSDIR}/biology/fluctuate \
diff --git a/biology/lamarc/pkg-comment b/biology/lamarc/pkg-comment
deleted file mode 100644
index 65c98d705236..000000000000
--- a/biology/lamarc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A package of programs for computing population parameters
diff --git a/biology/migrate/Makefile b/biology/migrate/Makefile
index e5741f073751..3af3e84a2889 100644
--- a/biology/migrate/Makefile
+++ b/biology/migrate/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/lamarc/migrate/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A program to estimate population sizes and migration rates
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
CONFIGURE_WRKSRC= ${WRKSRC}/src
diff --git a/biology/migrate/pkg-comment b/biology/migrate/pkg-comment
deleted file mode 100644
index 1cf2d7f16689..000000000000
--- a/biology/migrate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to estimate population sizes and migration rates
diff --git a/biology/p5-bioperl-devel/Makefile b/biology/p5-bioperl-devel/Makefile
index dfedb429f9fb..ca7a2c0c5390 100644
--- a/biology/p5-bioperl-devel/Makefile
+++ b/biology/p5-bioperl-devel/Makefile
@@ -15,6 +15,7 @@ PKGNAMESUFFIX= -devel
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of Perl modules for bioinformatics (developer's release)
# These are all run-time dependencies, but listing them in ${BUILD_DEPENDS}
# prevents a flood of build-time warnings.
diff --git a/biology/p5-bioperl-devel/pkg-comment b/biology/p5-bioperl-devel/pkg-comment
deleted file mode 100644
index bb7e0ab0ff27..000000000000
--- a/biology/p5-bioperl-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of Perl modules for bioinformatics (developer's release)
diff --git a/biology/p5-bioperl/Makefile b/biology/p5-bioperl/Makefile
index 669216b4f0b8..28ae5758aaf0 100644
--- a/biology/p5-bioperl/Makefile
+++ b/biology/p5-bioperl/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX= p5-
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of Perl modules for bioinformatics
# These are all run-time dependencies, but listing them in ${BUILD_DEPENDS}
# prevents a flood of build-time warnings.
diff --git a/biology/p5-bioperl/pkg-comment b/biology/p5-bioperl/pkg-comment
deleted file mode 100644
index 6603d94dc286..000000000000
--- a/biology/p5-bioperl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of Perl modules for bioinformatics
diff --git a/biology/py-biopython/Makefile b/biology/py-biopython/Makefile
index baddf2076a49..2c0ba22b639e 100644
--- a/biology/py-biopython/Makefile
+++ b/biology/py-biopython/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a/a/}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of Python modules for bioinformatics
BUILD_DEPENDS= ${PYDISTUTILS}
RUN_DEPENDS= ${PYNUMERIC} \
diff --git a/biology/py-biopython/pkg-comment b/biology/py-biopython/pkg-comment
deleted file mode 100644
index 0310e64fb4a0..000000000000
--- a/biology/py-biopython/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of Python modules for bioinformatics
diff --git a/biology/pymol/Makefile b/biology/pymol/Makefile
index 4591e45daf3d..267c761a5647 100644
--- a/biology/pymol/Makefile
+++ b/biology/pymol/Makefile
@@ -14,6 +14,7 @@ DISTNAME= pymol-${PORTVERSION:S/./_/}-src
EXTRACT_SUFX= .tgz
MAINTAINER= maho@FreeBSD.org
+COMMENT= Free and Open-Source molecular modeling system
BUILD_DEPENDS= ${PYNUMERIC}
RUN_DEPENDS= ${PYNUMERIC} \
diff --git a/biology/pymol/pkg-comment b/biology/pymol/pkg-comment
deleted file mode 100644
index 6c056b09dc9c..000000000000
--- a/biology/pymol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free and Open-Source molecular modeling system
diff --git a/biology/recombine/Makefile b/biology/recombine/Makefile
index 51e89b10632f..bf13cb66ee9f 100644
--- a/biology/recombine/Makefile
+++ b/biology/recombine/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://evolution.genetics.washington.edu/pub/lamarc/recombine/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A program to fit population models across sites
NO_WRKSUBDIR= yes
ALL_TARGET= ${PORTNAME}
diff --git a/biology/recombine/pkg-comment b/biology/recombine/pkg-comment
deleted file mode 100644
index 00509aa636c0..000000000000
--- a/biology/recombine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to fit population models across sites
diff --git a/biology/t_coffee/Makefile b/biology/t_coffee/Makefile
index f1d3ddb63800..7a70657ae5f3 100644
--- a/biology/t_coffee/Makefile
+++ b/biology/t_coffee/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://igs-server.cnrs-mrs.fr/~cnotred/Packages/
DISTNAME= T-COFFEE_distribution
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A multiple DNA or protein sequence alignment package
BUILD_DEPENDS= clustalw:${PORTSDIR}/biology/clustalw
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/biology/t_coffee/pkg-comment b/biology/t_coffee/pkg-comment
deleted file mode 100644
index c0f726dcae6b..000000000000
--- a/biology/t_coffee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiple DNA or protein sequence alignment package
diff --git a/cad/atlc/Makefile b/cad/atlc/Makefile
index 2cbe7bc963b5..ddda41b4f8d9 100644
--- a/cad/atlc/Makefile
+++ b/cad/atlc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/atlc/}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A tool to calculate the impedance of transmission lines
USE_REINPLACE= YES
GNU_CONFIGURE= YES
diff --git a/cad/atlc/pkg-comment b/cad/atlc/pkg-comment
deleted file mode 100644
index 835c6dfd3795..000000000000
--- a/cad/atlc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to calculate the impedance of transmission lines
diff --git a/cad/cascade/Makefile b/cad/cascade/Makefile
index 7e688f761044..a03d34bfa6a9 100644
--- a/cad/cascade/Makefile
+++ b/cad/cascade/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/rfcascade/}
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A simple tool to analyze noise and distortion of a RF system
GNU_CONFIGURE= YES
diff --git a/cad/cascade/pkg-comment b/cad/cascade/pkg-comment
deleted file mode 100644
index aed730d8f1d7..000000000000
--- a/cad/cascade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple tool to analyze noise and distortion of a RF system
diff --git a/cad/iverilog/Makefile b/cad/iverilog/Makefile
index c54e737371aa..da95c1926c41 100644
--- a/cad/iverilog/Makefile
+++ b/cad/iverilog/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://icarus.com/pub/eda/verilog/v${PORTVERSION}/
DISTNAME= verilog-${PORTVERSION}
MAINTAINER= keichii@FreeBSD.org
+COMMENT= Icarus Verilog is a Verilog simulation and synthesis tool
GNU_CONFIGURE= yes
diff --git a/cad/iverilog/pkg-comment b/cad/iverilog/pkg-comment
deleted file mode 100644
index 55674ec9ee77..000000000000
--- a/cad/iverilog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Icarus Verilog is a Verilog simulation and synthesis tool
diff --git a/cad/sceptre/Makefile b/cad/sceptre/Makefile
index 8b7c34a2d15b..ba649c86bfae 100644
--- a/cad/sceptre/Makefile
+++ b/cad/sceptre/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= cad
MASTER_SITES= ftp://novilux.fh-friedberg.de/pub/sceptre/
MAINTAINER= grog@FreeBSD.org
+COMMENT= SCEPTRE is a general purpose circuit analysis program
BUILD_DEPENDS= f77:${PORTSDIR}/lang/f77
diff --git a/cad/sceptre/pkg-comment b/cad/sceptre/pkg-comment
deleted file mode 100644
index b53dcbb64563..000000000000
--- a/cad/sceptre/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SCEPTRE is a general purpose circuit analysis program
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index fdc46f75d6d7..8d465cbf0558 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ViPEC-${PORTVERSION}
MAINTAINER= kde@freebsd.org
+COMMENT= Analyze high frequency, linear electrical networks
BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake
diff --git a/cad/vipec/pkg-comment b/cad/vipec/pkg-comment
deleted file mode 100644
index 45c1059afb52..000000000000
--- a/cad/vipec/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Analyze high frequency, linear electrical networks
diff --git a/comms/bpl+/Makefile b/comms/bpl+/Makefile
index 2f17a5030cec..4751ee591881 100644
--- a/comms/bpl+/Makefile
+++ b/comms/bpl+/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= max
DISTNAME= ${PORTNAME}
MAINTAINER= max@FreeBSD.org
+COMMENT= B Plus file transfer protocol
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bpl ${PREFIX}/bin
diff --git a/comms/bpl+/pkg-comment b/comms/bpl+/pkg-comment
deleted file mode 100644
index f1a069932ba3..000000000000
--- a/comms/bpl+/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-B Plus file transfer protocol
diff --git a/comms/comserv/Makefile b/comms/comserv/Makefile
index c444ecb96a9c..347a0720e28a 100644
--- a/comms/comserv/Makefile
+++ b/comms/comserv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= bsd
MAINTAINER= bsd@FreeBSD.org
+COMMENT= Provide network access to local serial ports and make remote ports appear local
MAN8= comservd.8
MANCOMPRESSED= yes
diff --git a/comms/comserv/pkg-comment b/comms/comserv/pkg-comment
deleted file mode 100644
index 53504de85fe4..000000000000
--- a/comms/comserv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provide network access to local serial ports and make remote ports appear local
diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index 544bab70fbd4..56fefa04d50f 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.physics.purdue.edu/pub/pundits/
EXTRACT_SUFX= .tgz
MAINTAINER= cy@FreeBSD.org
+COMMENT= Manage remote serial consoles via TCP/IP
BUILD_DEPENDS= makeme:${PORTSDIR}/devel/msrc0 \
mkcmd:${PORTSDIR}/devel/mkcmd
diff --git a/comms/conserver/pkg-comment b/comms/conserver/pkg-comment
deleted file mode 100644
index 32176afed413..000000000000
--- a/comms/conserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Manage remote serial consoles via TCP/IP
diff --git a/comms/ecu/Makefile b/comms/ecu/Makefile
index a1c377bb3bfa..17a085e8386f 100644
--- a/comms/ecu/Makefile
+++ b/comms/ecu/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= comms
MASTER_SITES= ftp://tsx-11.mit.edu/pub/linux/sources/usr.bin/Communications/
MAINTAINER= ache@FreeBSD.org
+COMMENT= Extended Call Utility
USE_REINPLACE= yes
diff --git a/comms/ecu/pkg-comment b/comms/ecu/pkg-comment
deleted file mode 100644
index 97cfe496e1c9..000000000000
--- a/comms/ecu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extended Call Utility
diff --git a/comms/efax/Makefile b/comms/efax/Makefile
index e4e76e2ae977..a50c2a56fce3 100644
--- a/comms/efax/Makefile
+++ b/comms/efax/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= comms
MASTER_SITES= http://shino.pos.to/linux/
MAINTAINER= mita@FreeBSD.org
+COMMENT= Fax send/receive program
FORBIDDEN= "Buffer overflow yielding setuid uucp"
diff --git a/comms/efax/pkg-comment b/comms/efax/pkg-comment
deleted file mode 100644
index d11c45fc3d38..000000000000
--- a/comms/efax/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fax send/receive program
diff --git a/comms/gnokii/Makefile b/comms/gnokii/Makefile
index f5731fe4407d..5fad283ae8a6 100644
--- a/comms/gnokii/Makefile
+++ b/comms/gnokii/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
# ftp://ftp.gnokii.org/pub/gnokii/
MAINTAINER= anders@FreeBSD.org
+COMMENT= Tools to talk to Nokia cellular phones
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/comms/gnokii/pkg-comment b/comms/gnokii/pkg-comment
deleted file mode 100644
index 0dc4b0ab6030..000000000000
--- a/comms/gnokii/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tools to talk to Nokia cellular phones
diff --git a/comms/ixj/Makefile b/comms/ixj/Makefile
index 8b635423ee18..99b6c7de0d51 100644
--- a/comms/ixj/Makefile
+++ b/comms/ixj/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://telepresence.dmem.strath.ac.uk/pub/openh323/
DISTNAME= ixj_freebsd-${PORTVERSION}
MAINTAINER= roger@freebsd.org
+COMMENT= Driver for Quicknet Internet PhoneJack and LineJack. Used by OpenH323
ONLY_FOR_ARCHS= i386
diff --git a/comms/ixj/pkg-comment b/comms/ixj/pkg-comment
deleted file mode 100644
index 5661b05aea18..000000000000
--- a/comms/ixj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Driver for Quicknet Internet PhoneJack and LineJack. Used by OpenH323
diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile
index 7a6c86e367cb..ddc680d24574 100644
--- a/comms/kpsk/Makefile
+++ b/comms/kpsk/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= kpsk
MAINTAINER= patrick@FreeBSD.org
+COMMENT= A PSK31 digital radio communications application for the KDE 3.x
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
diff --git a/comms/kpsk/pkg-comment b/comms/kpsk/pkg-comment
deleted file mode 100644
index d3eb66af6022..000000000000
--- a/comms/kpsk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PSK31 digital radio communications application for the KDE 3.x
diff --git a/comms/kremotecontrol/Makefile b/comms/kremotecontrol/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/comms/kremotecontrol/Makefile
+++ b/comms/kremotecontrol/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/comms/kremotecontrol/pkg-comment b/comms/kremotecontrol/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/comms/kremotecontrol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index a5606f97d4f2..89e6c1437c7f 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://alpha.greenie.net/pub/mgetty/source/1.1/
DISTNAME= mgetty1.1.30-Dec16
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Handle external logins, send and receive faxes
USE_PERL5= yes
diff --git a/comms/mgetty+sendfax/pkg-comment b/comms/mgetty+sendfax/pkg-comment
deleted file mode 100644
index 1307873fcb0e..000000000000
--- a/comms/mgetty+sendfax/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Handle external logins, send and receive faxes
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 05995ef03a0e..bfc68583b6f6 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= anders@FreeBSD.org
+COMMENT= An MS-DOS Telix serial communication program "workalike"
RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz \
lsz:${PORTSDIR}/comms/lrzsz
diff --git a/comms/minicom/pkg-comment b/comms/minicom/pkg-comment
deleted file mode 100644
index 3586e830392c..000000000000
--- a/comms/minicom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An MS-DOS Telix serial communication program "workalike"
diff --git a/comms/mlan/Makefile b/comms/mlan/Makefile
index a592d0922109..0738e9854156 100644
--- a/comms/mlan/Makefile
+++ b/comms/mlan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.dalsemi.com/pub/auto_id/public/
DISTNAME= mlpb103
MAINTAINER= phk@FreeBSD.org
+COMMENT= API for Dallas Semiconductors 1-wire lan devices
NO_WRKSUBDIR= yes
USE_ZIP= yes
diff --git a/comms/mlan/pkg-comment b/comms/mlan/pkg-comment
deleted file mode 100644
index e8ea36fb1bc3..000000000000
--- a/comms/mlan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-API for Dallas Semiconductors 1-wire lan devices
diff --git a/comms/mlan3/Makefile b/comms/mlan3/Makefile
index 7a3f4b5901f2..b58f90237a1e 100644
--- a/comms/mlan3/Makefile
+++ b/comms/mlan3/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.dalsemi.com/pub/auto_id/public/
DISTNAME= owpd300b
MAINTAINER= hm@FreeBSD.org
+COMMENT= Version 3.00 beta API for Dallas Semiconductors 1-wire lan devices
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/comms/mlan3/pkg-comment b/comms/mlan3/pkg-comment
deleted file mode 100644
index aba1131ceb2f..000000000000
--- a/comms/mlan3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Version 3.00 beta API for Dallas Semiconductors 1-wire lan devices
diff --git a/comms/mserver/Makefile b/comms/mserver/Makefile
index 8dc5bbb74295..6eb040dbf257 100644
--- a/comms/mserver/Makefile
+++ b/comms/mserver/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.usf.uni-kassel.de/pub/unix/modem/ \
ftp://ftp.be.uu.net/pub/staff/carl/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Network modem sharing server
MAKE_ARGS= CC="${CC}" CCOPTS="${CFLAGS}"
diff --git a/comms/mserver/pkg-comment b/comms/mserver/pkg-comment
deleted file mode 100644
index 6afaa6b9676f..000000000000
--- a/comms/mserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network modem sharing server
diff --git a/comms/seyon/Makefile b/comms/seyon/Makefile
index f588af34e9a2..bcc2483f3a54 100644
--- a/comms/seyon/Makefile
+++ b/comms/seyon/Makefile
@@ -13,6 +13,7 @@ DISTNAME= Seyon-${PORTVERSION}
EXTRACT_SUFX= -tar.Z
MAINTAINER= me@FreeBSD.org
+COMMENT= A communications package for the X Window system
WRKSRC= ${WRKDIR}/seyon
USE_IMAKE= yes
diff --git a/comms/seyon/pkg-comment b/comms/seyon/pkg-comment
deleted file mode 100644
index c625b73869d5..000000000000
--- a/comms/seyon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A communications package for the X Window system
diff --git a/comms/sms_client/Makefile b/comms/sms_client/Makefile
index b745375b043d..7d436471ff98 100644
--- a/comms/sms_client/Makefile
+++ b/comms/sms_client/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= comms
MASTER_SITES= http://www.styx.demon.co.uk/archive/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A simple UNIX SMS client to send messages to phones or pagers
HAS_CONFIGURE= yes
diff --git a/comms/sms_client/pkg-comment b/comms/sms_client/pkg-comment
deleted file mode 100644
index 98b27ac7e12a..000000000000
--- a/comms/sms_client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple UNIX SMS client to send messages to phones or pagers
diff --git a/comms/sredird/Makefile b/comms/sredird/Makefile
index 7388437eb985..05ff66974b03 100644
--- a/comms/sredird/Makefile
+++ b/comms/sredird/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/serial
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= RFC 2217 compliant serial port redirector
do-build:
${CC} ${CFLAGS} -Wall -o ${WRKSRC}/sredird ${WRKSRC}/sredird.c
diff --git a/comms/sredird/pkg-comment b/comms/sredird/pkg-comment
deleted file mode 100644
index 0a030045f740..000000000000
--- a/comms/sredird/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RFC 2217 compliant serial port redirector
diff --git a/comms/tkscanfax/Makefile b/comms/tkscanfax/Makefile
index 51ba6214f208..9d9e565d9259 100644
--- a/comms/tkscanfax/Makefile
+++ b/comms/tkscanfax/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= comms
MASTER_SITES= http://shino.pos.to/linux/
MAINTAINER= mita@FreeBSD.org
+COMMENT= Tcl/Tk frontend for fax scan/receive/send program (command is tkfax)
RUN_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80
diff --git a/comms/tkscanfax/pkg-comment b/comms/tkscanfax/pkg-comment
deleted file mode 100644
index 854459c780d4..000000000000
--- a/comms/tkscanfax/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcl/Tk frontend for fax scan/receive/send program (command is tkfax)
diff --git a/comms/viewfax/Makefile b/comms/viewfax/Makefile
index 04b7210d94b4..e84d4067e343 100644
--- a/comms/viewfax/Makefile
+++ b/comms/viewfax/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= comms
MASTER_SITES= ftp://ftp.leo.org/pub/comp/os/unix/networking/mgetty/
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Display files containing g3 and/or g4 coded fax pages
USE_IMAKE= yes
diff --git a/comms/viewfax/pkg-comment b/comms/viewfax/pkg-comment
deleted file mode 100644
index fd5a9b240aba..000000000000
--- a/comms/viewfax/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display files containing g3 and/or g4 coded fax pages
diff --git a/comms/xcept/Makefile b/comms/xcept/Makefile
index 20e40940e8b4..8395f973c246 100644
--- a/comms/xcept/Makefile
+++ b/comms/xcept/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
MAINTAINER= joerg@FreeBSD.org
+COMMENT= A decoder for the CEPT (Btx) protocol
USE_XLIB= yes
MAN1= xcept.1
diff --git a/comms/xcept/pkg-comment b/comms/xcept/pkg-comment
deleted file mode 100644
index 9ecf09e6d022..000000000000
--- a/comms/xcept/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A decoder for the CEPT (Btx) protocol
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 63178df664fb..04b6541dbc1b 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= comms
MASTER_SITES= http://people.debian.org/~pa3aba/download/
MAINTAINER= patrick@FreeBSD.org
+COMMENT= An Amateur Radio station logging application
USE_GTK= yes
GNU_CONFIGURE= yes
diff --git a/comms/xlog/pkg-comment b/comms/xlog/pkg-comment
deleted file mode 100644
index 20c42e05ddff..000000000000
--- a/comms/xlog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Amateur Radio station logging application
diff --git a/comms/yaps/Makefile b/comms/yaps/Makefile
index 3bad494526b7..5f321c2b736a 100644
--- a/comms/yaps/Makefile
+++ b/comms/yaps/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/serialcomm/machines
MAINTAINER= se@FreeBSD.org
+COMMENT= Yet Another Pager Software: send messages to pager (SMS, TAP, ...)
USE_GMAKE= true
diff --git a/comms/yaps/pkg-comment b/comms/yaps/pkg-comment
deleted file mode 100644
index 7d474ab92cbf..000000000000
--- a/comms/yaps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another Pager Software: send messages to pager (SMS, TAP, ...)
diff --git a/comms/yawmppp/Makefile b/comms/yawmppp/Makefile
index 230a1e4b9ee6..b97910b13d05 100644
--- a/comms/yawmppp/Makefile
+++ b/comms/yawmppp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= comms windowmaker
MASTER_SITES= ftp://ftp.seul.org/pub/yawmppp/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A Window Maker dockapp that helps with easy use of pppd
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/comms/yawmppp/pkg-comment b/comms/yawmppp/pkg-comment
deleted file mode 100644
index 3c099131455b..000000000000
--- a/comms/yawmppp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Window Maker dockapp that helps with easy use of pppd
diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile
index f4e15e287dab..008886b95c9e 100644
--- a/converters/cn2jp/Makefile
+++ b/converters/cn2jp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://w3.sys.es.osaka-u.ac.jp/~seke/software/cn2jp/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
+COMMENT= A library for code translation between Chinese and Japanese
INSTALLS_SHLIB= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/converters/cn2jp/pkg-comment b/converters/cn2jp/pkg-comment
deleted file mode 100644
index d87f939a6fbd..000000000000
--- a/converters/cn2jp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for code translation between Chinese and Japanese
diff --git a/converters/dumpasn1/Makefile b/converters/dumpasn1/Makefile
index 77c2590ef91a..bd227aa46f78 100644
--- a/converters/dumpasn1/Makefile
+++ b/converters/dumpasn1/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
EXTRACT_ONLY=
MAINTAINER= kris@FreeBSD.org
+COMMENT= Dumps the contents of an ASN.1 encoded file, e.g. an SSL certificate
.include <bsd.port.pre.mk>
diff --git a/converters/dumpasn1/pkg-comment b/converters/dumpasn1/pkg-comment
deleted file mode 100644
index 42abd0c492bf..000000000000
--- a/converters/dumpasn1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dumps the contents of an ASN.1 encoded file, e.g. an SSL certificate
diff --git a/converters/fconv/Makefile b/converters/fconv/Makefile
index c42eb4a27980..c24d7d28ef88 100644
--- a/converters/fconv/Makefile
+++ b/converters/fconv/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= chris
MAINTAINER= chris@FreeBSD.org
+COMMENT= Converts DOS or Mac-style files to Unix format, and vice-versa
.include <bsd.port.mk>
diff --git a/converters/fconv/pkg-comment b/converters/fconv/pkg-comment
deleted file mode 100644
index e5b0678f20e8..000000000000
--- a/converters/fconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts DOS or Mac-style files to Unix format, and vice-versa
diff --git a/converters/gbase/Makefile b/converters/gbase/Makefile
index 9336e6e708ec..240fe25c0aee 100644
--- a/converters/gbase/Makefile
+++ b/converters/gbase/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= converters
MASTER_SITES= http://www.hibernaculum.net/download/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A program to convert between the 4 common bases used in programming
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/converters/gbase/pkg-comment b/converters/gbase/pkg-comment
deleted file mode 100644
index 1eef9b7d20aa..000000000000
--- a/converters/gbase/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to convert between the 4 common bases used in programming
diff --git a/converters/ish/Makefile b/converters/ish/Makefile
index d4d3a6c1f01a..6a08f039a3b1 100644
--- a/converters/ish/Makefile
+++ b/converters/ish/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= converters
MASTER_SITES= ${MASTER_SITE_PORTS_JP}
MAINTAINER= hosokawa@jp.FreeBSD.org
+COMMENT= Binary-to-text file-encoder
MAKEFILE= makefile
ALL_TARGET= ish
diff --git a/converters/ish/pkg-comment b/converters/ish/pkg-comment
deleted file mode 100644
index 083a21fd8d17..000000000000
--- a/converters/ish/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Binary-to-text file-encoder
diff --git a/converters/libiconv/Makefile b/converters/libiconv/Makefile
index bee50c4eaf42..650cf358ebfa 100644
--- a/converters/libiconv/Makefile
+++ b/converters/libiconv/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A character set conversion library
USE_LIBTOOL= yes
LIBTOOLFILES= configure libcharset/configure
diff --git a/converters/libiconv/pkg-comment b/converters/libiconv/pkg-comment
deleted file mode 100644
index 0fe2128f8d95..000000000000
--- a/converters/libiconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A character set conversion library
diff --git a/converters/mmencode/Makefile b/converters/mmencode/Makefile
index 97f16bff3d1c..a1786597f042 100644
--- a/converters/mmencode/Makefile
+++ b/converters/mmencode/Makefile
@@ -15,6 +15,7 @@ DISTNAME= mm${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= kbyanc@posi.net
+COMMENT= Translate to and from mail-oriented encoding formats
WRKSRC= ${WRKDIR}/${DISTNAME}/src/metamail
diff --git a/converters/mmencode/pkg-comment b/converters/mmencode/pkg-comment
deleted file mode 100644
index b80de6f2a2a6..000000000000
--- a/converters/mmencode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translate to and from mail-oriented encoding formats
diff --git a/converters/mpack/Makefile b/converters/mpack/Makefile
index 685fc94b3062..0031a84b1e58 100644
--- a/converters/mpack/Makefile
+++ b/converters/mpack/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
+COMMENT= External MIME packer/unpacker
WRKSRC= ${WRKDIR}/mpack
MAKEFLAGS= -f
diff --git a/converters/mpack/pkg-comment b/converters/mpack/pkg-comment
deleted file mode 100644
index c3c423d839f1..000000000000
--- a/converters/mpack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-External MIME packer/unpacker
diff --git a/converters/p5-Boulder/Makefile b/converters/p5-Boulder/Makefile
index fd83f702ca2d..ed59fad2f438 100644
--- a/converters/p5-Boulder/Makefile
+++ b/converters/p5-Boulder/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Boulder
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= An API for hierarchical tag/value structures
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser/Expat.pm:${PORTSDIR}/textproc/p5-XML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/converters/p5-Boulder/pkg-comment b/converters/p5-Boulder/pkg-comment
deleted file mode 100644
index c2399ce9f2e8..000000000000
--- a/converters/p5-Boulder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An API for hierarchical tag/value structures
diff --git a/converters/p5-Convert-ASN1/Makefile b/converters/p5-Convert-ASN1/Makefile
index 97657be751ec..b3cad384e604 100644
--- a/converters/p5-Convert-ASN1/Makefile
+++ b/converters/p5-Convert-ASN1/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Convert
PKGNAMEPREFIX= p5-
MAINTAINER= scrappy@FreeBSD.org
+COMMENT= Perl5 module to encode and decode ASN.1 data structures
PERL_CONFIGURE= YES
diff --git a/converters/p5-Convert-ASN1/pkg-comment b/converters/p5-Convert-ASN1/pkg-comment
deleted file mode 100644
index c4f01c50b88c..000000000000
--- a/converters/p5-Convert-ASN1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to encode and decode ASN.1 data structures
diff --git a/converters/p5-Convert-BER/Makefile b/converters/p5-Convert-BER/Makefile
index 5201c60855ce..1309fd48cc0f 100644
--- a/converters/p5-Convert-BER/Makefile
+++ b/converters/p5-Convert-BER/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Convert
PKGNAMEPREFIX= p5-
MAINTAINER= scrappy@FreeBSD.org
+COMMENT= Perl5 module to encode and decode objects using Basic Encoding Rules (BER)
PERL_CONFIGURE= YES
diff --git a/converters/p5-Convert-BER/pkg-comment b/converters/p5-Convert-BER/pkg-comment
deleted file mode 100644
index f0190bda7aa7..000000000000
--- a/converters/p5-Convert-BER/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to encode and decode objects using Basic Encoding Rules (BER)
diff --git a/converters/p5-Convert-PEM/Makefile b/converters/p5-Convert-PEM/Makefile
index e341ceb9bbda..a33c1e4c9bd9 100644
--- a/converters/p5-Convert-PEM/Makefile
+++ b/converters/p5-Convert-PEM/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Convert
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Read/write access to ASN.1-encoded PEM files with optional encryption
PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
BUILD_DEPENDS= ${PERLBASE}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
diff --git a/converters/p5-Convert-PEM/pkg-comment b/converters/p5-Convert-PEM/pkg-comment
deleted file mode 100644
index 7bb3d95df646..000000000000
--- a/converters/p5-Convert-PEM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Read/write access to ASN.1-encoded PEM files with optional encryption
diff --git a/converters/p5-Convert-Recode/Makefile b/converters/p5-Convert-Recode/Makefile
index a4912a22e702..acedcf5643b2 100644
--- a/converters/p5-Convert-Recode/Makefile
+++ b/converters/p5-Convert-Recode/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Convert
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Front end to the GNU recode program
RUN_DEPENDS= recode:${PORTSDIR}/converters/recode
diff --git a/converters/p5-Convert-Recode/pkg-comment b/converters/p5-Convert-Recode/pkg-comment
deleted file mode 100644
index ac3282dda5b1..000000000000
--- a/converters/p5-Convert-Recode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Front end to the GNU recode program
diff --git a/converters/p5-Convert-UU/Makefile b/converters/p5-Convert-UU/Makefile
index 47eceb36fb6d..fb12b6309c98 100644
--- a/converters/p5-Convert-UU/Makefile
+++ b/converters/p5-Convert-UU/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Convert
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module for uuencode and uudecode
PERL_CONFIGURE= YES
diff --git a/converters/p5-Convert-UU/pkg-comment b/converters/p5-Convert-UU/pkg-comment
deleted file mode 100644
index 9ce652f5609a..000000000000
--- a/converters/p5-Convert-UU/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for uuencode and uudecode
diff --git a/converters/p5-Convert-UUlib/Makefile b/converters/p5-Convert-UUlib/Makefile
index 67ea772ad1c6..33b3c4ca4159 100644
--- a/converters/p5-Convert-UUlib/Makefile
+++ b/converters/p5-Convert-UUlib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Convert
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl5 interface to the uulib library (a.k.a. uudeview/uuenview)
PERL_CONFIGURE= yes
diff --git a/converters/p5-Convert-UUlib/pkg-comment b/converters/p5-Convert-UUlib/pkg-comment
deleted file mode 100644
index 7c437eb85080..000000000000
--- a/converters/p5-Convert-UUlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to the uulib library (a.k.a. uudeview/uuenview)
diff --git a/converters/p5-Text-Iconv/Makefile b/converters/p5-Text-Iconv/Makefile
index 2a40447cc7e1..085668dedacd 100644
--- a/converters/p5-Text-Iconv/Makefile
+++ b/converters/p5-Text-Iconv/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl interface to iconv() codeset conversion function
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/converters/p5-Text-Iconv/pkg-comment b/converters/p5-Text-Iconv/pkg-comment
deleted file mode 100644
index 3b1c6c5de053..000000000000
--- a/converters/p5-Text-Iconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to iconv() codeset conversion function
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile
index b7a840de2a91..165a4f42a401 100644
--- a/converters/psiconv/Makefile
+++ b/converters/psiconv/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= converters devel
MASTER_SITES= http://huizen.dds.nl/~frodol/psiconv/
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A conversion utility to convert Psion 5(MX) files into other formats
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/converters/psiconv/pkg-comment b/converters/psiconv/pkg-comment
deleted file mode 100644
index dea7930d20d3..000000000000
--- a/converters/psiconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A conversion utility to convert Psion 5(MX) files into other formats
diff --git a/converters/recode/Makefile b/converters/recode/Makefile
index debda6200a82..eeb204bab360 100644
--- a/converters/recode/Makefile
+++ b/converters/recode/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= recode
MAINTAINER= demon@FreeBSD.org
+COMMENT= Converts files between character sets and usages
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/converters/recode/pkg-comment b/converters/recode/pkg-comment
deleted file mode 100644
index 8d499e2cedb0..000000000000
--- a/converters/recode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts files between character sets and usages
diff --git a/converters/siconv/Makefile b/converters/siconv/Makefile
index 71b5c225a560..0f926d2fa3fd 100644
--- a/converters/siconv/Makefile
+++ b/converters/siconv/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= converters
MASTER_SITES= http://www.technocage.com/~caskey/siconv/download/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Convert data from one character set to another
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/converters/siconv/pkg-comment b/converters/siconv/pkg-comment
deleted file mode 100644
index b0d1bce8c7a1..000000000000
--- a/converters/siconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert data from one character set to another
diff --git a/converters/trans/Makefile b/converters/trans/Makefile
index bdd5b8be1f4a..5c794039c50c 100644
--- a/converters/trans/Makefile
+++ b/converters/trans/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.kostis.net/freeware/
DISTNAME= trans120
MAINTAINER= ache@FreeBSD.org
+COMMENT= Character Encoding Converter Generator Package
LIBDIR= ${PREFIX}/lib/trans
ALL= transhtm transiso transce8 transtab checkiso checkuni
diff --git a/converters/trans/pkg-comment b/converters/trans/pkg-comment
deleted file mode 100644
index b13fd5c02712..000000000000
--- a/converters/trans/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Character Encoding Converter Generator Package
diff --git a/converters/uudeview/Makefile b/converters/uudeview/Makefile
index 1f87a0096289..dec5ccefba6d 100644
--- a/converters/uudeview/Makefile
+++ b/converters/uudeview/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= converters
MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
MAINTAINER= hoek@FreeBSD.org
+COMMENT= A program for uu/xx/Base64/BinHex/yEnc de-/encoding
LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib
diff --git a/converters/uudeview/pkg-comment b/converters/uudeview/pkg-comment
deleted file mode 100644
index 14facaf17c72..000000000000
--- a/converters/uudeview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program for uu/xx/Base64/BinHex/yEnc de-/encoding
diff --git a/converters/uulib/Makefile b/converters/uulib/Makefile
index 2e0f9decb2bf..3d9ca3e6adb0 100644
--- a/converters/uulib/Makefile
+++ b/converters/uulib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
DISTNAME= uudeview-${PORTVERSION}
MAINTAINER= hoek@FreeBSD.org
+COMMENT= A library for uu/xx/Base64/BinHex/yEnc de-/encoding
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
diff --git a/converters/uulib/pkg-comment b/converters/uulib/pkg-comment
deleted file mode 100644
index 485a85cc4ef8..000000000000
--- a/converters/uulib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for uu/xx/Base64/BinHex/yEnc de-/encoding
diff --git a/converters/xdeview/Makefile b/converters/xdeview/Makefile
index ff0f7c864c34..2b3a7288d7db 100644
--- a/converters/xdeview/Makefile
+++ b/converters/xdeview/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.fpx.de/fp/Software/UUDeview/download/
DISTNAME= uudeview-${PORTVERSION}
MAINTAINER= hoek@FreeBSD.org
+COMMENT= An X11 program for uu/xx/Base64/BinHex/yEnc de-/encoding
LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib \
tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/converters/xdeview/pkg-comment b/converters/xdeview/pkg-comment
deleted file mode 100644
index 5946f58b8d2c..000000000000
--- a/converters/xdeview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 program for uu/xx/Base64/BinHex/yEnc de-/encoding
diff --git a/databases/arcexplorer/Makefile b/databases/arcexplorer/Makefile
index 274172d01686..6f1e3a975d74 100644
--- a/databases/arcexplorer/Makefile
+++ b/databases/arcexplorer/Makefile
@@ -13,6 +13,7 @@ DISTNAME= Linux_ArcExplorer${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Lightweight java-based GIS data viewer
USE_JAVA= 1.2+
diff --git a/databases/arcexplorer/pkg-comment b/databases/arcexplorer/pkg-comment
deleted file mode 100644
index 2bedaa3c317c..000000000000
--- a/databases/arcexplorer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight java-based GIS data viewer
diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile
index ab4aec24cd9f..feb64c082925 100644
--- a/databases/bbdb/Makefile
+++ b/databases/bbdb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Big Brother Database
EMACS_PORT_NAME?= emacs21
diff --git a/databases/bbdb/pkg-comment b/databases/bbdb/pkg-comment
deleted file mode 100644
index 72c6373cdf43..000000000000
--- a/databases/bbdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Big Brother Database
diff --git a/databases/dbf2mysql/Makefile b/databases/dbf2mysql/Makefile
index 97599b959e6e..ba344417ef45 100644
--- a/databases/dbf2mysql/Makefile
+++ b/databases/dbf2mysql/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://mysql.nixc.net/pub/mysql/Downloads/Contrib/ \
ftp://ftp.plig.org/pub/mysql/Downloads/Contrib/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Programs to convert .dbf files to MySQL tables and vice versa
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/dbf2mysql/pkg-comment b/databases/dbf2mysql/pkg-comment
deleted file mode 100644
index a3a0cfd1afac..000000000000
--- a/databases/dbf2mysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Programs to convert .dbf files to MySQL tables and vice versa
diff --git a/databases/gmysql/Makefile b/databases/gmysql/Makefile
index c1a253bad5a5..88a024fedcbf 100644
--- a/databases/gmysql/Makefile
+++ b/databases/gmysql/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.loth.demon.co.uk/people/steved/projects/gmysql/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= GTK+ frontend for mysql
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/gmysql/pkg-comment b/databases/gmysql/pkg-comment
deleted file mode 100644
index fbe1ef5ed166..000000000000
--- a/databases/gmysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ frontend for mysql
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 362abc19c6d7..5df6aa19a7ee 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gnats
MAINTAINER= des@FreeBSD.org
+COMMENT= Cygnus GNATS bug tracking system
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/databases/gnats/pkg-comment b/databases/gnats/pkg-comment
deleted file mode 100644
index e0a4376cd9c7..000000000000
--- a/databases/gnats/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cygnus GNATS bug tracking system
diff --git a/databases/gnome-db/Makefile b/databases/gnome-db/Makefile
index 668431e096a6..4279eb362ae9 100644
--- a/databases/gnome-db/Makefile
+++ b/databases/gnome-db/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-db-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provide uniform access to data sources for the GNOME environment
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/databases/gnome-db/pkg-comment b/databases/gnome-db/pkg-comment
deleted file mode 100644
index ce1aae1e6b38..000000000000
--- a/databases/gnome-db/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provide uniform access to data sources for the GNOME environment
diff --git a/databases/gnomedb/Makefile b/databases/gnomedb/Makefile
index 668431e096a6..4279eb362ae9 100644
--- a/databases/gnomedb/Makefile
+++ b/databases/gnomedb/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-db-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provide uniform access to data sources for the GNOME environment
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/databases/gnomedb/pkg-comment b/databases/gnomedb/pkg-comment
deleted file mode 100644
index ce1aae1e6b38..000000000000
--- a/databases/gnomedb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provide uniform access to data sources for the GNOME environment
diff --git a/databases/gqlplus/Makefile b/databases/gqlplus/Makefile
index 4f63f8f90a67..92d82de4a2e8 100644
--- a/databases/gqlplus/Makefile
+++ b/databases/gqlplus/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= leeym@FreeBSD.org
+COMMENT= SQL*PLUS with commandline editing, history, and name completion
WRKSRC= ${WRKDIR}/${PORTNAME}
MAKEFILE= makefile
diff --git a/databases/gqlplus/pkg-comment b/databases/gqlplus/pkg-comment
deleted file mode 100644
index d24886b5dc88..000000000000
--- a/databases/gqlplus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SQL*PLUS with commandline editing, history, and name completion
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile
index 46aa1cf4e113..7e2a623d8b35 100644
--- a/databases/grass-i18n/Makefile
+++ b/databases/grass-i18n/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://grass.itc.it/grass5/source/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
MAINTAINER= reg@FreeBSD.org
+COMMENT= An open source Geographical Information System (GIS)
POSTGRESQL_PORT?= databases/postgresql7
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/databases/grass-i18n/pkg-comment b/databases/grass-i18n/pkg-comment
deleted file mode 100644
index 0d1a8e0ff1ed..000000000000
--- a/databases/grass-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open source Geographical Information System (GIS)
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index 46aa1cf4e113..7e2a623d8b35 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://grass.itc.it/grass5/source/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
MAINTAINER= reg@FreeBSD.org
+COMMENT= An open source Geographical Information System (GIS)
POSTGRESQL_PORT?= databases/postgresql7
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/databases/grass/pkg-comment b/databases/grass/pkg-comment
deleted file mode 100644
index 0d1a8e0ff1ed..000000000000
--- a/databases/grass/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open source Geographical Information System (GIS)
diff --git a/databases/jdbc-oracle816/Makefile b/databases/jdbc-oracle816/Makefile
index ea57c9fe3d72..d5f454f7e067 100644
--- a/databases/jdbc-oracle816/Makefile
+++ b/databases/jdbc-oracle816/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= zip
EXTRACT_ONLY= # none
MAINTAINER= patrick@FreeBSD.Org
+COMMENT= The JDBC drivers for Oracle 8.1.6
RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
diff --git a/databases/jdbc-oracle816/pkg-comment b/databases/jdbc-oracle816/pkg-comment
deleted file mode 100644
index d8c91363dcf3..000000000000
--- a/databases/jdbc-oracle816/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The JDBC drivers for Oracle 8.1.6
diff --git a/databases/jdbc-oracle8i/Makefile b/databases/jdbc-oracle8i/Makefile
index ea57c9fe3d72..d5f454f7e067 100644
--- a/databases/jdbc-oracle8i/Makefile
+++ b/databases/jdbc-oracle8i/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= zip
EXTRACT_ONLY= # none
MAINTAINER= patrick@FreeBSD.Org
+COMMENT= The JDBC drivers for Oracle 8.1.6
RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
diff --git a/databases/jdbc-oracle8i/pkg-comment b/databases/jdbc-oracle8i/pkg-comment
deleted file mode 100644
index d8c91363dcf3..000000000000
--- a/databases/jdbc-oracle8i/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The JDBC drivers for Oracle 8.1.6
diff --git a/databases/jdbc-oracle9i/Makefile b/databases/jdbc-oracle9i/Makefile
index ea57c9fe3d72..d5f454f7e067 100644
--- a/databases/jdbc-oracle9i/Makefile
+++ b/databases/jdbc-oracle9i/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= zip
EXTRACT_ONLY= # none
MAINTAINER= patrick@FreeBSD.Org
+COMMENT= The JDBC drivers for Oracle 8.1.6
RUN_DEPENDS= ${LOCALBASE}/jdk1.1.8/bin/java:${PORTSDIR}/java/jdk11
diff --git a/databases/jdbc-oracle9i/pkg-comment b/databases/jdbc-oracle9i/pkg-comment
deleted file mode 100644
index d8c91363dcf3..000000000000
--- a/databases/jdbc-oracle9i/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The JDBC drivers for Oracle 8.1.6
diff --git a/databases/libdbi/Makefile b/databases/libdbi/Makefile
index fb583e8bee85..79b1fb370102 100644
--- a/databases/libdbi/Makefile
+++ b/databases/libdbi/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Database Independent Abstraction Layer for C
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/databases/libdbi/pkg-comment b/databases/libdbi/pkg-comment
deleted file mode 100644
index c39017fb74b2..000000000000
--- a/databases/libdbi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Database Independent Abstraction Layer for C
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index e1e24e7fe1b8..38da8213dbf0 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provides uniform access to different kinds of data sources
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/databases/libgda/pkg-comment b/databases/libgda/pkg-comment
deleted file mode 100644
index be18a121d7f0..000000000000
--- a/databases/libgda/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provides uniform access to different kinds of data sources
diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 081a4b8883e7..bf2ca06586bf 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= libgda-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provides uniform access to different kinds of data sources
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
diff --git a/databases/libgda2/pkg-comment b/databases/libgda2/pkg-comment
deleted file mode 100644
index be18a121d7f0..000000000000
--- a/databases/libgda2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provides uniform access to different kinds of data sources
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 081a4b8883e7..bf2ca06586bf 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -14,6 +14,7 @@ DISTNAME= libgda-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provides uniform access to different kinds of data sources
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
diff --git a/databases/libgda3/pkg-comment b/databases/libgda3/pkg-comment
deleted file mode 100644
index be18a121d7f0..000000000000
--- a/databases/libgda3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provides uniform access to different kinds of data sources
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index e3fab7b08545..c00a5ff9586e 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/libgnomedb/0.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library components for the GNOME database frontend
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
gda-2.1:${PORTSDIR}/databases/libgda2
diff --git a/databases/libgnomedb/pkg-comment b/databases/libgnomedb/pkg-comment
deleted file mode 100644
index b34a2ea4b4b4..000000000000
--- a/databases/libgnomedb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library components for the GNOME database frontend
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index aecbf360d073..1735b19fd195 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= databases devel
MASTER_SITES= http://orcane.net/freeodbc++/download/${PORTVERSION}/
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A C++ class library and toolset for ODBC access to data sources
BROKEN= "Does not compile"
diff --git a/databases/libodbc++/pkg-comment b/databases/libodbc++/pkg-comment
deleted file mode 100644
index 6c178ca1ef71..000000000000
--- a/databases/libodbc++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ class library and toolset for ODBC access to data sources
diff --git a/databases/lsdb/Makefile b/databases/lsdb/Makefile
index c37d4c059b54..a1ac7e851fa1 100644
--- a/databases/lsdb/Makefile
+++ b/databases/lsdb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://downloads.sourceforge.jp/lsdb/${SFJP_RELEASE_ID}/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Lovely Sister Database
BUILD_DEPENDS= ${LOCALBASE}/share/flim/${FLIM_COOKIE}:${PORTSDIR}/editors/flim${DEPPORT_SUFFIX}
diff --git a/databases/lsdb/pkg-comment b/databases/lsdb/pkg-comment
deleted file mode 100644
index e173f7b4a55a..000000000000
--- a/databases/lsdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lovely Sister Database
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index ac31ed4041af..7911d297f525 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.10
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provide uniform access to data sources for the GNOME 2.0 environment
LIB_DEPENDS= gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \
gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
diff --git a/databases/mergeant/pkg-comment b/databases/mergeant/pkg-comment
deleted file mode 100644
index e61986f6e753..000000000000
--- a/databases/mergeant/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provide uniform access to data sources for the GNOME 2.0 environment
diff --git a/databases/mysql-editor/Makefile b/databases/mysql-editor/Makefile
index 71eb053dcede..a05a8ca3b9eb 100644
--- a/databases/mysql-editor/Makefile
+++ b/databases/mysql-editor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://sorry.vse.cz/~xzemt02/mysql/ \
DISTNAME= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= CGI scripts in Perl to edit your MySQL tables
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${CGI_BIN}:${PORTSDIR}/www/apache13
diff --git a/databases/mysql-editor/pkg-comment b/databases/mysql-editor/pkg-comment
deleted file mode 100644
index 458f119e62fd..000000000000
--- a/databases/mysql-editor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CGI scripts in Perl to edit your MySQL tables
diff --git a/databases/mysql2pgsql/Makefile b/databases/mysql2pgsql/Makefile
index 1ec8e9df72b1..ea5883098741 100644
--- a/databases/mysql2pgsql/Makefile
+++ b/databases/mysql2pgsql/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=
EXTRACT_ONLY= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Convert a MySQL dump to a PostgreSQL dump
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
diff --git a/databases/mysql2pgsql/pkg-comment b/databases/mysql2pgsql/pkg-comment
deleted file mode 100644
index b5dc7eccb821..000000000000
--- a/databases/mysql2pgsql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert a MySQL dump to a PostgreSQL dump
diff --git a/databases/mysqltcl/Makefile b/databases/mysqltcl/Makefile
index b778ef995054..b7eab14c8825 100644
--- a/databases/mysqltcl/Makefile
+++ b/databases/mysqltcl/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= databases tcl83
MASTER_SITES= http://telia.dl.sourceforge.net/mirrors/mysql/Downloads/Contrib/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= TCL module for accessing MySQL databases based on msqltcl
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client \
${TCL_NODOT}:${PORTSDIR}/lang/${TCL_NODOT}
diff --git a/databases/mysqltcl/pkg-comment b/databases/mysqltcl/pkg-comment
deleted file mode 100644
index 100cd7b0abed..000000000000
--- a/databases/mysqltcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TCL module for accessing MySQL databases based on msqltcl
diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile
index c161cdd667dc..d2f1a95351be 100644
--- a/databases/mytop/Makefile
+++ b/databases/mytop/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= databases
MASTER_SITES= http://jeremy.zawodny.com/mysql/mytop/
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Mytop - a top clone for MySQL
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBD/mysql.pm:${PORTSDIR}/databases/p5-DBD-mysql \
diff --git a/databases/mytop/pkg-comment b/databases/mytop/pkg-comment
deleted file mode 100644
index d0ebfa6bd79c..000000000000
--- a/databases/mytop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mytop - a top clone for MySQL
diff --git a/databases/oracle7-client/Makefile b/databases/oracle7-client/Makefile
index e6d5794181a2..d3294a5eb2b2 100644
--- a/databases/oracle7-client/Makefile
+++ b/databases/oracle7-client/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= \
DISTNAME= oracle7.client.OCI
MAINTAINER= skv@FreeBSD.org
+COMMENT= Oracle 7 client
ORACLE_PREFIX= oracle7
DIST_SUBDIR= ${ORACLE_PREFIX}
diff --git a/databases/oracle7-client/pkg-comment b/databases/oracle7-client/pkg-comment
deleted file mode 100644
index 3c893541a54e..000000000000
--- a/databases/oracle7-client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Oracle 7 client
diff --git a/databases/p5-ApacheDBILogConfig/Makefile b/databases/p5-ApacheDBILogConfig/Makefile
index 830837173766..20ec00cbdda9 100644
--- a/databases/p5-ApacheDBILogConfig/Makefile
+++ b/databases/p5-ApacheDBILogConfig/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= Perl module that logs access information in a DBI database
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
diff --git a/databases/p5-ApacheDBILogConfig/pkg-comment b/databases/p5-ApacheDBILogConfig/pkg-comment
deleted file mode 100644
index 0bce4eff8bfc..000000000000
--- a/databases/p5-ApacheDBILogConfig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that logs access information in a DBI database
diff --git a/databases/p5-ApacheDBILogger/Makefile b/databases/p5-ApacheDBILogger/Makefile
index af23ae5295f6..659c5b3b94eb 100644
--- a/databases/p5-ApacheDBILogger/Makefile
+++ b/databases/p5-ApacheDBILogger/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= A module that tracks what's being transferred in a DBI database
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Apache/DBI.pm:${PORTSDIR}/www/p5-Apache-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
diff --git a/databases/p5-ApacheDBILogger/pkg-comment b/databases/p5-ApacheDBILogger/pkg-comment
deleted file mode 100644
index a97aa1d8fac6..000000000000
--- a/databases/p5-ApacheDBILogger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module that tracks what's being transferred in a DBI database
diff --git a/databases/p5-AsciiDB-TagFile/Makefile b/databases/p5-AsciiDB-TagFile/Makefile
index 58dd3394d1e1..1a56eeb1d61e 100644
--- a/databases/p5-AsciiDB-TagFile/Makefile
+++ b/databases/p5-AsciiDB-TagFile/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= AsciiDB
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl tie class for a simple ASCII database
PERL_CONFIGURE= yes
diff --git a/databases/p5-AsciiDB-TagFile/pkg-comment b/databases/p5-AsciiDB-TagFile/pkg-comment
deleted file mode 100644
index 5b9c11df7c1a..000000000000
--- a/databases/p5-AsciiDB-TagFile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl tie class for a simple ASCII database
diff --git a/databases/p5-Class-DBI/Makefile b/databases/p5-Class-DBI/Makefile
index 5a50240be7e7..06236811169c 100644
--- a/databases/p5-Class-DBI/Makefile
+++ b/databases/p5-Class-DBI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Simple Database Abstraction
BUILD_DEPENDS= ${SITE_PERL}/Carp/Assert.pm:${PORTSDIR}/devel/p5-Carp-Assert \
${SITE_PERL}/Class/Accessor.pm:${PORTSDIR}/devel/p5-Class-Accessor \
diff --git a/databases/p5-Class-DBI/pkg-comment b/databases/p5-Class-DBI/pkg-comment
deleted file mode 100644
index 688ea49a1d53..000000000000
--- a/databases/p5-Class-DBI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple Database Abstraction
diff --git a/databases/p5-DBD-InterBase/Makefile b/databases/p5-DBD-InterBase/Makefile
index c7954951acf1..4055c277d67b 100644
--- a/databases/p5-DBD-InterBase/Makefile
+++ b/databases/p5-DBD-InterBase/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= DBI driver for InterBase RDBMS server
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= gds:${PORTSDIR}/databases/firebird
diff --git a/databases/p5-DBD-InterBase/pkg-comment b/databases/p5-DBD-InterBase/pkg-comment
deleted file mode 100644
index cd694767867b..000000000000
--- a/databases/p5-DBD-InterBase/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DBI driver for InterBase RDBMS server
diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 12587740e129..0ecfc11db705 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= DBI driver for Oracle RDBMS server
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${LOCALBASE}/oracle7/rdbms/demo/oracle.mk:${PORTSDIR}/databases/oracle7-client
diff --git a/databases/p5-DBD-Oracle/pkg-comment b/databases/p5-DBD-Oracle/pkg-comment
deleted file mode 100644
index 8e6cedc78180..000000000000
--- a/databases/p5-DBD-Oracle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DBI driver for Oracle RDBMS server
diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile
index 926836db02b3..41c96a7ff411 100644
--- a/databases/p5-DBD-Sybase/Makefile
+++ b/databases/p5-DBD-Sybase/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
MAINTAINER= sheldonh@FreeBSD.org
+COMMENT= A Sybase DBI driver for Perl 5
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= ct.0:${PORTSDIR}/databases/freetds \
diff --git a/databases/p5-DBD-Sybase/pkg-comment b/databases/p5-DBD-Sybase/pkg-comment
deleted file mode 100644
index 888454ad8f26..000000000000
--- a/databases/p5-DBD-Sybase/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Sybase DBI driver for Perl 5
diff --git a/databases/p5-DBI-137/Makefile b/databases/p5-DBI-137/Makefile
index bd0dd042a2b5..50f28c237427 100644
--- a/databases/p5-DBI-137/Makefile
+++ b/databases/p5-DBI-137/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBI
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The perl5 Database Interface. Required for DBD::* modules
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-DBI-137/pkg-comment b/databases/p5-DBI-137/pkg-comment
deleted file mode 100644
index 0539ef8747be..000000000000
--- a/databases/p5-DBI-137/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The perl5 Database Interface. Required for DBD::* modules
diff --git a/databases/p5-DBI/Makefile b/databases/p5-DBI/Makefile
index bd0dd042a2b5..50f28c237427 100644
--- a/databases/p5-DBI/Makefile
+++ b/databases/p5-DBI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBI
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The perl5 Database Interface. Required for DBD::* modules
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/RPC/PlServer.pm:${PORTSDIR}/net/p5-PlRPC
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-DBI/pkg-comment b/databases/p5-DBI/pkg-comment
deleted file mode 100644
index 0539ef8747be..000000000000
--- a/databases/p5-DBI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The perl5 Database Interface. Required for DBD::* modules
diff --git a/databases/p5-DBIWrapper/Makefile b/databases/p5-DBIWrapper/Makefile
index 21dfc9805e32..ad702395a5e7 100644
--- a/databases/p5-DBIWrapper/Makefile
+++ b/databases/p5-DBIWrapper/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= dbi_wrapper-${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl extension for generic DBI database access
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML
diff --git a/databases/p5-DBIWrapper/pkg-comment b/databases/p5-DBIWrapper/pkg-comment
deleted file mode 100644
index 39f6637f454a..000000000000
--- a/databases/p5-DBIWrapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for generic DBI database access
diff --git a/databases/p5-DBIx-DataSource/Makefile b/databases/p5-DBIx-DataSource/Makefile
index 43874475889d..162305cdd555 100644
--- a/databases/p5-DBIx-DataSource/Makefile
+++ b/databases/p5-DBIx-DataSource/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Database-independent create and drop functions
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-DBIx-DataSource/pkg-comment b/databases/p5-DBIx-DataSource/pkg-comment
deleted file mode 100644
index 7e2455f0619c..000000000000
--- a/databases/p5-DBIx-DataSource/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Database-independent create and drop functions
diff --git a/databases/p5-DBIx-Recordset/Makefile b/databases/p5-DBIx-Recordset/Makefile
index 7c2c8a714f58..97aa9a321f0f 100644
--- a/databases/p5-DBIx-Recordset/Makefile
+++ b/databases/p5-DBIx-Recordset/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl module for abstraction and simplification of database access
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-DBIx-Recordset/pkg-comment b/databases/p5-DBIx-Recordset/pkg-comment
deleted file mode 100644
index f50cc106a18e..000000000000
--- a/databases/p5-DBIx-Recordset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for abstraction and simplification of database access
diff --git a/databases/p5-DBIx-SearchBuilder/Makefile b/databases/p5-DBIx-SearchBuilder/Makefile
index 54a961c8c602..5252cfa47905 100644
--- a/databases/p5-DBIx-SearchBuilder/Makefile
+++ b/databases/p5-DBIx-SearchBuilder/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= DBIx
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension for easy SQL SELECT Statement generation
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ReturnValue.pm:${PORTSDIR}/devel/p5-Class-ReturnValue
diff --git a/databases/p5-DBIx-SearchBuilder/pkg-comment b/databases/p5-DBIx-SearchBuilder/pkg-comment
deleted file mode 100644
index dcab1500e651..000000000000
--- a/databases/p5-DBIx-SearchBuilder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for easy SQL SELECT Statement generation
diff --git a/databases/p5-DBZ_File/Makefile b/databases/p5-DBZ_File/Makefile
index c15b4b5ec167..4ac8a19e29e7 100644
--- a/databases/p5-DBZ_File/Makefile
+++ b/databases/p5-DBZ_File/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Perl module to access a DBZ database
PERL_CONFIGURE= yes
CONFIGURE_ARGS= DEFINE="-I${FILESDIR}"
diff --git a/databases/p5-DBZ_File/pkg-comment b/databases/p5-DBZ_File/pkg-comment
deleted file mode 100644
index 342171869310..000000000000
--- a/databases/p5-DBZ_File/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to access a DBZ database
diff --git a/databases/p5-GraphViz-DBI/Makefile b/databases/p5-GraphViz-DBI/Makefile
index 8b9d923e31cd..2ae563f9e789 100644
--- a/databases/p5-GraphViz-DBI/Makefile
+++ b/databases/p5-GraphViz-DBI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= GraphViz
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= GraphViz::DBI - graph database tables and relations
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/GraphViz.pm:${PORTSDIR}/graphics/p5-GraphViz
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-GraphViz-DBI/pkg-comment b/databases/p5-GraphViz-DBI/pkg-comment
deleted file mode 100644
index b5bccb276865..000000000000
--- a/databases/p5-GraphViz-DBI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GraphViz::DBI - graph database tables and relations
diff --git a/databases/p5-Ima-DBI/Makefile b/databases/p5-Ima-DBI/Makefile
index ba4bdebd0d01..f581ee3a6e44 100644
--- a/databases/p5-Ima-DBI/Makefile
+++ b/databases/p5-Ima-DBI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class/TMTM
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Database connection caching and organization
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
${SITE_PERL}/Class/WhiteHole.pm:${PORTSDIR}/devel/p5-Class-WhiteHole \
diff --git a/databases/p5-Ima-DBI/pkg-comment b/databases/p5-Ima-DBI/pkg-comment
deleted file mode 100644
index 3608389cefde..000000000000
--- a/databases/p5-Ima-DBI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Database connection caching and organization
diff --git a/databases/p5-Mysql/Makefile b/databases/p5-Mysql/Makefile
index ee81d683bea3..e1919ebf1e14 100644
--- a/databases/p5-Mysql/Makefile
+++ b/databases/p5-Mysql/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Msql-Mysql-modules-${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Perl5 modules for accessing MySQL databases
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Data/ShowTable.pm:${PORTSDIR}/devel/p5-Data-ShowTable \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-Mysql/pkg-comment b/databases/p5-Mysql/pkg-comment
deleted file mode 100644
index a2e381f8ae1a..000000000000
--- a/databases/p5-Mysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 modules for accessing MySQL databases
diff --git a/databases/p5-POE-Component-DBIAgent/Makefile b/databases/p5-POE-Component-DBIAgent/Makefile
index fa56220e5a4a..7d87457a958c 100644
--- a/databases/p5-POE-Component-DBIAgent/Makefile
+++ b/databases/p5-POE-Component-DBIAgent/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE Component for running asynchronous DBI calls
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
diff --git a/databases/p5-POE-Component-DBIAgent/pkg-comment b/databases/p5-POE-Component-DBIAgent/pkg-comment
deleted file mode 100644
index c7e7a6010879..000000000000
--- a/databases/p5-POE-Component-DBIAgent/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE Component for running asynchronous DBI calls
diff --git a/databases/p5-POE-Component-RRDTool/Makefile b/databases/p5-POE-Component-RRDTool/Makefile
index c383cf859b56..837deba5e469 100644
--- a/databases/p5-POE-Component-RRDTool/Makefile
+++ b/databases/p5-POE-Component-RRDTool/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE interface to Round Robin Database Tools
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
diff --git a/databases/p5-POE-Component-RRDTool/pkg-comment b/databases/p5-POE-Component-RRDTool/pkg-comment
deleted file mode 100644
index f3231ec1d92f..000000000000
--- a/databases/p5-POE-Component-RRDTool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE interface to Round Robin Database Tools
diff --git a/databases/p5-Tangram/Makefile b/databases/p5-Tangram/Makefile
index 1af6fc314f6b..af30e50cb37c 100644
--- a/databases/p5-Tangram/Makefile
+++ b/databases/p5-Tangram/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tangram
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Orthogonal Object Persistence in Relational Databases
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Set/Object.pm:${PORTSDIR}/devel/p5-Set-Object \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-Tangram/pkg-comment b/databases/p5-Tangram/pkg-comment
deleted file mode 100644
index 1c5c9365b71b..000000000000
--- a/databases/p5-Tangram/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Orthogonal Object Persistence in Relational Databases
diff --git a/databases/p5-Text-Query-SQL/Makefile b/databases/p5-Text-Query-SQL/Makefile
index 046537ae1136..a31887e6b92b 100644
--- a/databases/p5-Text-Query-SQL/Makefile
+++ b/databases/p5-Text-Query-SQL/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Text-Query-SQL provides query builders for SQL databases
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Query.pm:${PORTSDIR}/textproc/p5-Text-Query
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/databases/p5-Text-Query-SQL/pkg-comment b/databases/p5-Text-Query-SQL/pkg-comment
deleted file mode 100644
index fbe5b66f92bc..000000000000
--- a/databases/p5-Text-Query-SQL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text-Query-SQL provides query builders for SQL databases
diff --git a/databases/p5-postgresql-plperl/Makefile b/databases/p5-postgresql-plperl/Makefile
index 8178714d4112..2e5043471e31 100644
--- a/databases/p5-postgresql-plperl/Makefile
+++ b/databases/p5-postgresql-plperl/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= databases perl5
PKGNAMEPREFIX= p5-
MAINTAINER= girgen@pingpong.net
+COMMENT= A module for using Perl5 to write SQL functions
POSTGRESQL_PORT?= databases/postgresql7
POSTGRESQL_SUBPORT=YES
diff --git a/databases/p5-postgresql-plperl/pkg-comment b/databases/p5-postgresql-plperl/pkg-comment
deleted file mode 100644
index f874869e9363..000000000000
--- a/databases/p5-postgresql-plperl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module for using Perl5 to write SQL functions
diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile
index fbc954bf0619..8589e83f2527 100644
--- a/databases/phpmyadmin/Makefile
+++ b/databases/phpmyadmin/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.rc/-rc/}
DISTFILES= ${DISTNAME}-${PHP_VERSION}${EXTRACT_SUFX}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A set of PHP-scripts to adminstrate MySQL over the web
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
.if !defined(WITH_PHP3)
diff --git a/databases/phpmyadmin/pkg-comment b/databases/phpmyadmin/pkg-comment
deleted file mode 100644
index e1a824eab440..000000000000
--- a/databases/phpmyadmin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of PHP-scripts to adminstrate MySQL over the web
diff --git a/databases/phpmyadmin211/Makefile b/databases/phpmyadmin211/Makefile
index fbc954bf0619..8589e83f2527 100644
--- a/databases/phpmyadmin211/Makefile
+++ b/databases/phpmyadmin211/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.rc/-rc/}
DISTFILES= ${DISTNAME}-${PHP_VERSION}${EXTRACT_SUFX}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A set of PHP-scripts to adminstrate MySQL over the web
RUN_DEPENDS= ${LOCALBASE}/lib/mysql/libmysqlclient.so:${PORTSDIR}/databases/mysql323-client
.if !defined(WITH_PHP3)
diff --git a/databases/phpmyadmin211/pkg-comment b/databases/phpmyadmin211/pkg-comment
deleted file mode 100644
index e1a824eab440..000000000000
--- a/databases/phpmyadmin211/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of PHP-scripts to adminstrate MySQL over the web
diff --git a/databases/phppgadmin/Makefile b/databases/phppgadmin/Makefile
index 1a45bc2908d1..f7dfc91262c3 100644
--- a/databases/phppgadmin/Makefile
+++ b/databases/phppgadmin/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= phpPgAdmin_${PORTVERSION:S/./-/g}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Web Based Postgres Administration
.if !defined(WITH_PHP3)
.if defined(WITH_APACHE2)
diff --git a/databases/phppgadmin/pkg-comment b/databases/phppgadmin/pkg-comment
deleted file mode 100644
index fa5d66e1fd03..000000000000
--- a/databases/phppgadmin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Web Based Postgres Administration
diff --git a/databases/postgresql-devel/Makefile b/databases/postgresql-devel/Makefile
index a2cfe468d834..75795abf33d7 100644
--- a/databases/postgresql-devel/Makefile
+++ b/databases/postgresql-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://freebsd.sean.chittenden.org/ports/ \
PKGNAMESUFFIX= -devel
MAINTAINER?= seanc@FreeBSD.org
+COMMENT= Development snapshots of PostgreSQL's latest features
DIST_SUBDIR= postgresql
diff --git a/databases/postgresql-devel/pkg-comment b/databases/postgresql-devel/pkg-comment
deleted file mode 100644
index 772f1180e2a2..000000000000
--- a/databases/postgresql-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Development snapshots of PostgreSQL's latest features
diff --git a/databases/postgresql-docs/Makefile b/databases/postgresql-docs/Makefile
index 6326189e0af9..179a8f5d4963 100644
--- a/databases/postgresql-docs/Makefile
+++ b/databases/postgresql-docs/Makefile
@@ -9,6 +9,7 @@ PORTNAME= postgresql
PKGNAMESUFFIX= -docs
MAINTAINER= girgen@pingpong.net
+COMMENT= The PostgreSQL documentation set
POSTGRESQL_SUBPORT= YES
POSTGRESQL_PORT?= databases/postgresql7
diff --git a/databases/postgresql-docs/pkg-comment b/databases/postgresql-docs/pkg-comment
deleted file mode 100644
index f0f5da2160f0..000000000000
--- a/databases/postgresql-docs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The PostgreSQL documentation set
diff --git a/databases/postgresql-jdbc/Makefile b/databases/postgresql-jdbc/Makefile
index 90885b5f8a87..737fa72d6be4 100644
--- a/databases/postgresql-jdbc/Makefile
+++ b/databases/postgresql-jdbc/Makefile
@@ -9,6 +9,7 @@ PORTNAME= postgresql-jdbc
CATEGORIES= databases java
MAINTAINER= girgen@pingpong.net
+COMMENT= The Java JDBC implementation for PostgreSQL
BUILD_DEPENDS= ${LOCALBASE}/bin/ant:${PORTSDIR}/devel/jakarta-ant
diff --git a/databases/postgresql-jdbc/pkg-comment b/databases/postgresql-jdbc/pkg-comment
deleted file mode 100644
index 4643a85c3dcc..000000000000
--- a/databases/postgresql-jdbc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Java JDBC implementation for PostgreSQL
diff --git a/databases/postgresql-pltcl/Makefile b/databases/postgresql-pltcl/Makefile
index 811d1f5925d0..af818fdab38f 100644
--- a/databases/postgresql-pltcl/Makefile
+++ b/databases/postgresql-pltcl/Makefile
@@ -9,6 +9,7 @@ PORTNAME= postgresql-pltcl
CATEGORIES= databases tcl83
MAINTAINER= girgen@pingpong.net
+COMMENT= A module for using Tcl to write SQL functions
POSTGRESQL_PORT?= databases/postgresql7
POSTGRESQL_SUBPORT=YES
diff --git a/databases/postgresql-pltcl/pkg-comment b/databases/postgresql-pltcl/pkg-comment
deleted file mode 100644
index b13eb42969be..000000000000
--- a/databases/postgresql-pltcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module for using Tcl to write SQL functions
diff --git a/databases/postgresql-tcltk/Makefile b/databases/postgresql-tcltk/Makefile
index 7938ceb366da..01d447ac1624 100644
--- a/databases/postgresql-tcltk/Makefile
+++ b/databases/postgresql-tcltk/Makefile
@@ -9,6 +9,7 @@ PORTNAME= postgresql-tcltk
CATEGORIES= databases tcl83 tk83
MAINTAINER= girgen@pingpong.net
+COMMENT= An TCL interface to the database PostgreSQL, including a tk GUI
POSTGRESQL_PORT?= databases/postgresql7
POSTGRESQL_SUBPORT=YES
diff --git a/databases/postgresql-tcltk/pkg-comment b/databases/postgresql-tcltk/pkg-comment
deleted file mode 100644
index e9ecbb8442ee..000000000000
--- a/databases/postgresql-tcltk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An TCL interface to the database PostgreSQL, including a tk GUI
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 00996290e32d..97af0376b668 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= databases
MASTER_SITES= http://jan.kneschke.de/projects/pxtools/download/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Collection of tools to work with Paradox databases
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
intl.4:${PORTSDIR}/devel/gettext
diff --git a/databases/pxtools/pkg-comment b/databases/pxtools/pkg-comment
deleted file mode 100644
index fbf6facb7c72..000000000000
--- a/databases/pxtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of tools to work with Paradox databases
diff --git a/databases/py-MySQLdb-devel/Makefile b/databases/py-MySQLdb-devel/Makefile
index 50a1c052e34a..38e90a473484 100644
--- a/databases/py-MySQLdb-devel/Makefile
+++ b/databases/py-MySQLdb-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= mysql-python
DISTNAME= MySQL-python-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Access a MySQL database through Python
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/py-MySQLdb-devel/pkg-comment b/databases/py-MySQLdb-devel/pkg-comment
deleted file mode 100644
index f3e147950f10..000000000000
--- a/databases/py-MySQLdb-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Access a MySQL database through Python
diff --git a/databases/py-MySQLdb/Makefile b/databases/py-MySQLdb/Makefile
index 50a1c052e34a..38e90a473484 100644
--- a/databases/py-MySQLdb/Makefile
+++ b/databases/py-MySQLdb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= mysql-python
DISTNAME= MySQL-python-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Access a MySQL database through Python
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/py-MySQLdb/pkg-comment b/databases/py-MySQLdb/pkg-comment
deleted file mode 100644
index f3e147950f10..000000000000
--- a/databases/py-MySQLdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Access a MySQL database through Python
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 691d8835ea43..e3dcdd110e0f 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= tg@FreeBSD.org
+COMMENT= Python bindings to the GNU dbm library
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/databases/py-gdbm/pkg-comment b/databases/py-gdbm/pkg-comment
deleted file mode 100644
index f7a560563710..000000000000
--- a/databases/py-gdbm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings to the GNU dbm library
diff --git a/databases/ruby-interbase/Makefile b/databases/ruby-interbase/Makefile
index d72c9ec3a069..35de95e01cc5 100644
--- a/databases/ruby-interbase/Makefile
+++ b/databases/ruby-interbase/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
MAINTAINER= skv@FreeBSD.org
+COMMENT= Ruby interface to Interbase library
LIB_DEPENDS= gds:${PORTSDIR}/databases/firebird
diff --git a/databases/ruby-interbase/pkg-comment b/databases/ruby-interbase/pkg-comment
deleted file mode 100644
index 93cfd41d1b44..000000000000
--- a/databases/ruby-interbase/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ruby interface to Interbase library
diff --git a/databases/sybase-ocsd/Makefile b/databases/sybase-ocsd/Makefile
index d73e765cc1a8..139e2281eb4d 100644
--- a/databases/sybase-ocsd/Makefile
+++ b/databases/sybase-ocsd/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR= sybase
EXTRACT_ONLY=
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Headers and static libraries of Sybase OpenClient
NO_BUILD= no sources :-\
WRKSRC= ${WRKDIR}/sybase
diff --git a/databases/sybase-ocsd/pkg-comment b/databases/sybase-ocsd/pkg-comment
deleted file mode 100644
index 6f5b6c02be72..000000000000
--- a/databases/sybase-ocsd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Headers and static libraries of Sybase OpenClient
diff --git a/databases/tcl-Mysql/Makefile b/databases/tcl-Mysql/Makefile
index 54b909a66c60..784a824fc4a6 100644
--- a/databases/tcl-Mysql/Makefile
+++ b/databases/tcl-Mysql/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= mi@aldan.algebra.com
+COMMENT= TCL module for accessing MySQL databases
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
RUN_DEPENDS= ${TCL_VERSION:S/tcl/tclsh/}:${PORTSDIR}/lang/${TCL_NODOT}
diff --git a/databases/tcl-Mysql/pkg-comment b/databases/tcl-Mysql/pkg-comment
deleted file mode 100644
index 8585492854d5..000000000000
--- a/databases/tcl-Mysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TCL module for accessing MySQL databases
diff --git a/databases/tora/Makefile b/databases/tora/Makefile
index af61fbc69906..8f2b6c4679d3 100644
--- a/databases/tora/Makefile
+++ b/databases/tora/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= anders@FreeBSD.org
+COMMENT= Toolkit for Oracle, a GUI db admin kit supporting MySQL only (for now)
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/tora/pkg-comment b/databases/tora/pkg-comment
deleted file mode 100644
index 57c7d9eb45c0..000000000000
--- a/databases/tora/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Toolkit for Oracle, a GUI db admin kit supporting MySQL only (for now)
diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile
index 6e2ae81e3cce..b49868cc046f 100644
--- a/databases/xmysql/Makefile
+++ b/databases/xmysql/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://web.wt.net/~dblhack/ \
http://bonn.linux.tucows.com/files/x11/office/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= X11 front end to the MySQL database engine
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/xmysql/pkg-comment b/databases/xmysql/pkg-comment
deleted file mode 100644
index 7434e5075351..000000000000
--- a/databases/xmysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 front end to the MySQL database engine
diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile
index 520025e8f289..c52fc1b58ef2 100644
--- a/databases/xmysqladmin/Makefile
+++ b/databases/xmysqladmin/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://ftp.gwdg.de/pub/misc/mysql/Downloads/Contrib/ \
ftp://mysql.secsup.org/pub/software/mysql/Downloads/Contrib/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= X11 front end to the mysqladmin command of the MySQL database engine
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \
mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/databases/xmysqladmin/pkg-comment b/databases/xmysqladmin/pkg-comment
deleted file mode 100644
index 2cdf647c91b2..000000000000
--- a/databases/xmysqladmin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 front end to the mysqladmin command of the MySQL database engine
diff --git a/databases/zodb/Makefile b/databases/zodb/Makefile
index 4c71b6a53732..d6289cdf5f8a 100644
--- a/databases/zodb/Makefile
+++ b/databases/zodb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.zope.org/Products/StandaloneZODB/
DISTNAME= StandaloneZODB-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= The Zope Object Database, a persistent object database for Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/bsddb3/__init__.py:${PORTSDIR}/databases/py-bsddb3
diff --git a/databases/zodb/pkg-comment b/databases/zodb/pkg-comment
deleted file mode 100644
index 93cad7b2947b..000000000000
--- a/databases/zodb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Zope Object Database, a persistent object database for Python
diff --git a/databases/zpygresqlda/Makefile b/databases/zpygresqlda/Makefile
index 16bd89930e51..9a6a5ae79f8a 100644
--- a/databases/zpygresqlda/Makefile
+++ b/databases/zpygresqlda/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.zope.org/Members/reedstrm/ZPyGreSQLDA-rjr/
DISTNAME= ZPyGreSQLDA-0.3-rjr2
MAINTAINER= nbm@FreeBSD.org
+COMMENT= PostgreSQL database adapter for Zope
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
diff --git a/databases/zpygresqlda/pkg-comment b/databases/zpygresqlda/pkg-comment
deleted file mode 100644
index 27ca40a576bf..000000000000
--- a/databases/zpygresqlda/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PostgreSQL database adapter for Zope
diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile
index 7e3013be1512..4e3f6c9b2cba 100644
--- a/deskutils/aspostit/Makefile
+++ b/deskutils/aspostit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_AFTERSTEP}
MASTER_SITE_SUBDIR= apps/aspostit
MAINTAINER= kris@FreeBSD.org
+COMMENT= An AfterStep dockable version of XPostIt
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg/
diff --git a/deskutils/aspostit/pkg-comment b/deskutils/aspostit/pkg-comment
deleted file mode 100644
index 01c534a907c8..000000000000
--- a/deskutils/aspostit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An AfterStep dockable version of XPostIt
diff --git a/deskutils/bigyear/Makefile b/deskutils/bigyear/Makefile
index 8b82793b1cec..3491f4d2a0ea 100644
--- a/deskutils/bigyear/Makefile
+++ b/deskutils/bigyear/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://mahon.cwx.net/sources/
DISTNAME= ${PORTNAME}
MAINTAINER= greid@FreeBSD.org
+COMMENT= A program to print a large (one month per page) calendar
MAN1= bigyear.1
diff --git a/deskutils/bigyear/pkg-comment b/deskutils/bigyear/pkg-comment
deleted file mode 100644
index adfe1ab6561d..000000000000
--- a/deskutils/bigyear/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to print a large (one month per page) calendar
diff --git a/deskutils/dailystrips/Makefile b/deskutils/dailystrips/Makefile
index a6061d147f4e..c821c5b20964 100644
--- a/deskutils/dailystrips/Makefile
+++ b/deskutils/dailystrips/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Utility to download or view your favorite online comic strips daily
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
diff --git a/deskutils/dailystrips/pkg-comment b/deskutils/dailystrips/pkg-comment
deleted file mode 100644
index bc0cc38da948..000000000000
--- a/deskutils/dailystrips/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to download or view your favorite online comic strips daily
diff --git a/deskutils/gaddr/Makefile b/deskutils/gaddr/Makefile
index fddc0f9bf73a..0e6aae826c8d 100644
--- a/deskutils/gaddr/Makefile
+++ b/deskutils/gaddr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= deskutils gnome
MASTER_SITES= http://www.cse.unl.edu/~cluening/gaddr/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A GTK (and optionally, GNOME) address book
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/gaddr/pkg-comment b/deskutils/gaddr/pkg-comment
deleted file mode 100644
index 0e86898ed0be..000000000000
--- a/deskutils/gaddr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK (and optionally, GNOME) address book
diff --git a/deskutils/gemcal/Makefile b/deskutils/gemcal/Makefile
index 4944a78e2c13..ddfca2cbd78f 100644
--- a/deskutils/gemcal/Makefile
+++ b/deskutils/gemcal/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.quickhack.net/mhc/arc/
DISTNAME= mhc-current-snap${PORTVERSION}
MAINTAINER?= yoichi@FreeBSD.org
+COMMENT= Calendar program for MHC
RUN_DEPENDS= ${RUBY_SITEARCHLIBDIR}/gtk.so:${PORTSDIR}/x11-toolkits/ruby-gtk
diff --git a/deskutils/gemcal/pkg-comment b/deskutils/gemcal/pkg-comment
deleted file mode 100644
index 9ce0cb5b8a3d..000000000000
--- a/deskutils/gemcal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Calendar program for MHC
diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile
index 853ec2a3ff80..056223e704cb 100644
--- a/deskutils/gnome-pim/Makefile
+++ b/deskutils/gnome-pim/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-pim-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome pim package
.if !defined(WITHOUT_PILOT)
BUILD_DEPENDS= ${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
diff --git a/deskutils/gnome-pim/pkg-comment b/deskutils/gnome-pim/pkg-comment
deleted file mode 100644
index c3e7f3958055..000000000000
--- a/deskutils/gnome-pim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome pim package
diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index 94b107947b2e..50e4bbb0850c 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 support utilities
LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel
diff --git a/deskutils/gnome-utils/pkg-comment b/deskutils/gnome-utils/pkg-comment
deleted file mode 100644
index 14a9b8e02998..000000000000
--- a/deskutils/gnome-utils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 support utilities
diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile
index 853ec2a3ff80..056223e704cb 100644
--- a/deskutils/gnomepim/Makefile
+++ b/deskutils/gnomepim/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-pim-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome pim package
.if !defined(WITHOUT_PILOT)
BUILD_DEPENDS= ${X11BASE}/lib/gnome-pilot/conduits/libemail_conduit.so:${PORTSDIR}/palm/gnomepilot-conduits
diff --git a/deskutils/gnomepim/pkg-comment b/deskutils/gnomepim/pkg-comment
deleted file mode 100644
index c3e7f3958055..000000000000
--- a/deskutils/gnomepim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome pim package
diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile
index 94b107947b2e..50e4bbb0850c 100644
--- a/deskutils/gnomeutils2/Makefile
+++ b/deskutils/gnomeutils2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 support utilities
LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel
diff --git a/deskutils/gnomeutils2/pkg-comment b/deskutils/gnomeutils2/pkg-comment
deleted file mode 100644
index 14a9b8e02998..000000000000
--- a/deskutils/gnomeutils2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 support utilities
diff --git a/deskutils/ical/Makefile b/deskutils/ical/Makefile
index 8be2ea32fe98..f7ec064e9cb0 100644
--- a/deskutils/ical/Makefile
+++ b/deskutils/ical/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.sco.com/skunkware/src/shellutil/ \
ftp://ftp.sunsite.org.uk/Mirrors/ftp.sco.com/skunkware/src/shellutil/
MAINTAINER= obrien@FreeBSD.org
+COMMENT= A calendar application
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/deskutils/ical/pkg-comment b/deskutils/ical/pkg-comment
deleted file mode 100644
index 32b1d77c5f1f..000000000000
--- a/deskutils/ical/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A calendar application
diff --git a/deskutils/jlj/Makefile b/deskutils/jlj/Makefile
index e53b2a657dcf..623c711ecb95 100644
--- a/deskutils/jlj/Makefile
+++ b/deskutils/jlj/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cis.rit.edu/~jerry/Software/perl/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Jerry's command-line LiveJournal.com entry system
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/deskutils/jlj/pkg-comment b/deskutils/jlj/pkg-comment
deleted file mode 100644
index 441d0471998e..000000000000
--- a/deskutils/jlj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jerry's command-line LiveJournal.com entry system
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/deskutils/kcharselect/pkg-comment b/deskutils/kcharselect/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/deskutils/kcharselect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 225f3b082518..23d452c453e4 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Personal Information Management tools for KDE
LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link
diff --git a/deskutils/kdepim3/pkg-comment b/deskutils/kdepim3/pkg-comment
deleted file mode 100644
index 7131824d7f7c..000000000000
--- a/deskutils/kdepim3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Personal Information Management tools for KDE
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 225f3b082518..23d452c453e4 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Personal Information Management tools for KDE
LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link
diff --git a/deskutils/kdepim4/pkg-comment b/deskutils/kdepim4/pkg-comment
deleted file mode 100644
index 7131824d7f7c..000000000000
--- a/deskutils/kdepim4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Personal Information Management tools for KDE
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 225f3b082518..23d452c453e4 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Personal Information Management tools for KDE
LIB_DEPENDS= pisock:${PORTSDIR}/palm/pilot-link
diff --git a/deskutils/kdepim44/pkg-comment b/deskutils/kdepim44/pkg-comment
deleted file mode 100644
index 7131824d7f7c..000000000000
--- a/deskutils/kdepim44/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Personal Information Management tools for KDE
diff --git a/deskutils/knowit/Makefile b/deskutils/knowit/Makefile
index 7183a5c30ca4..0064105c1bb9 100644
--- a/deskutils/knowit/Makefile
+++ b/deskutils/knowit/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= deskutils
MASTER_SITES= http://knowit.sourceforge.net/files/
MAINTAINER= alane@FreeBSD.org
+COMMENT= A note manager with tree organization that uses RTF for storage
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/deskutils/knowit/pkg-comment b/deskutils/knowit/pkg-comment
deleted file mode 100644
index b1c94ba1bbd5..000000000000
--- a/deskutils/knowit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A note manager with tree organization that uses RTF for storage
diff --git a/deskutils/krss/Makefile b/deskutils/krss/Makefile
index 990cfc3904b9..d3281b13fa79 100644
--- a/deskutils/krss/Makefile
+++ b/deskutils/krss/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kde@freebsd.org
+COMMENT= KDE Rich Site Summary viewer
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
diff --git a/deskutils/krss/pkg-comment b/deskutils/krss/pkg-comment
deleted file mode 100644
index e20a0b8bf7e8..000000000000
--- a/deskutils/krss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE Rich Site Summary viewer
diff --git a/deskutils/mhc/Makefile b/deskutils/mhc/Makefile
index 10546d43d54e..600910cffcb6 100644
--- a/deskutils/mhc/Makefile
+++ b/deskutils/mhc/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}-current-snap${PORTVERSION}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Message Harmonized Calendaring system
WRKSRC= ${WRKDIR}/${DISTNAME}/emacs
EMACS_PORT_NAME?= emacs21
diff --git a/deskutils/mhc/pkg-comment b/deskutils/mhc/pkg-comment
deleted file mode 100644
index 2d3b002528fb..000000000000
--- a/deskutils/mhc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message Harmonized Calendaring system
diff --git a/deskutils/plan/Makefile b/deskutils/plan/Makefile
index a060b0569325..0365f11ea756 100644
--- a/deskutils/plan/Makefile
+++ b/deskutils/plan/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= applications
MAINTAINER= deischen@freebsd.org
+COMMENT= An X/Motif schedule planner with calendar
USE_MOTIF= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
diff --git a/deskutils/plan/pkg-comment b/deskutils/plan/pkg-comment
deleted file mode 100644
index 01921695e412..000000000000
--- a/deskutils/plan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X/Motif schedule planner with calendar
diff --git a/deskutils/sliderule/Makefile b/deskutils/sliderule/Makefile
index 7eec9aa51a94..9fabc6658ca5 100644
--- a/deskutils/sliderule/Makefile
+++ b/deskutils/sliderule/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
+COMMENT= The part of X11R3's xcalc featuring a slide rule
USE_IMAKE= yes
MAN1= sliderule.1
diff --git a/deskutils/sliderule/pkg-comment b/deskutils/sliderule/pkg-comment
deleted file mode 100644
index f07ecaec70e8..000000000000
--- a/deskutils/sliderule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The part of X11R3's xcalc featuring a slide rule
diff --git a/deskutils/wmpinboard/Makefile b/deskutils/wmpinboard/Makefile
index dbe3d1fba67f..4fb21c84d04c 100644
--- a/deskutils/wmpinboard/Makefile
+++ b/deskutils/wmpinboard/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tu-ilmenau.de/~gomar/stuff/wmpinboard/ \
http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
+COMMENT= Post-it notes for the WindowMaker dock or AfterStep Wharf
USE_BZIP2= yes
USE_XPM= yes
diff --git a/deskutils/wmpinboard/pkg-comment b/deskutils/wmpinboard/pkg-comment
deleted file mode 100644
index 3354e4e15a6f..000000000000
--- a/deskutils/wmpinboard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Post-it notes for the WindowMaker dock or AfterStep Wharf
diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile
index 665de3c793f6..14d5e369f1fb 100644
--- a/deskutils/xmdiary/Makefile
+++ b/deskutils/xmdiary/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= office
DISTFILES= ${DISTNAME}.tar.gz
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Personal and group calendar utility
NO_CDROM= "Don't sell for profit"
EXTRACT_ONLY= ${DISTNAME}.tar.gz
diff --git a/deskutils/xmdiary/pkg-comment b/deskutils/xmdiary/pkg-comment
deleted file mode 100644
index ed05fd3e7886..000000000000
--- a/deskutils/xmdiary/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Personal and group calendar utility
diff --git a/deskutils/xpostit/Makefile b/deskutils/xpostit/Makefile
index 01d0249a2b27..6abe19aa6fb5 100644
--- a/deskutils/xpostit/Makefile
+++ b/deskutils/xpostit/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= joerg@FreeBSD.org
+COMMENT= PostIt (R) messages onto your X11 screen
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/xpostit
diff --git a/deskutils/xpostit/pkg-comment b/deskutils/xpostit/pkg-comment
deleted file mode 100644
index 9e9fe4516ed2..000000000000
--- a/deskutils/xpostit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PostIt (R) messages onto your X11 screen
diff --git a/deskutils/yank/Makefile b/deskutils/yank/Makefile
index b237a4d99640..16660ee475f0 100644
--- a/deskutils/yank/Makefile
+++ b/deskutils/yank/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= deskutils gnome
MASTER_SITES= http://home.ins.de/~m.hussmann/software/yank/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= A simple notekeeper and todo-list manager for GNOME
PLIST_SUB= PORTVERSION=${PORTVERSION}
diff --git a/deskutils/yank/pkg-comment b/deskutils/yank/pkg-comment
deleted file mode 100644
index 7dbece163b3a..000000000000
--- a/deskutils/yank/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple notekeeper and todo-list manager for GNOME
diff --git a/devel/ORBit/Makefile b/devel/ORBit/Makefile
index f60c64028502..55953b547381 100644
--- a/devel/ORBit/Makefile
+++ b/devel/ORBit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/ORBit/0.5
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= High-performance CORBA ORB with support for the C language
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/devel/ORBit/pkg-comment b/devel/ORBit/pkg-comment
deleted file mode 100644
index 6d31b6a4a11d..000000000000
--- a/devel/ORBit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-performance CORBA ORB with support for the C language
diff --git a/devel/ORBit2/Makefile b/devel/ORBit2/Makefile
index 5898a1a822cb..c29d40ab2efc 100644
--- a/devel/ORBit2/Makefile
+++ b/devel/ORBit2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.6
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= High-performance CORBA ORB with support for the C language
LIB_DEPENDS= IDL-2.0:${PORTSDIR}/devel/libIDL \
popt.0:${PORTSDIR}/devel/popt \
diff --git a/devel/ORBit2/pkg-comment b/devel/ORBit2/pkg-comment
deleted file mode 100644
index 6d31b6a4a11d..000000000000
--- a/devel/ORBit2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-performance CORBA ORB with support for the C language
diff --git a/devel/SN/Makefile b/devel/SN/Makefile
index 55032f0ad721..97b851ee5004 100644
--- a/devel/SN/Makefile
+++ b/devel/SN/Makefile
@@ -23,6 +23,7 @@ MASTER_SITE_SUBDIR= sourcenav/releases/
DISTNAME= SN452
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= Cygnus/GNU/Red Hat's IDE and source code analysis tool
BROKEN= "Does not build"
diff --git a/devel/SN/pkg-comment b/devel/SN/pkg-comment
deleted file mode 100644
index 5e40acf265d5..000000000000
--- a/devel/SN/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cygnus/GNU/Red Hat's IDE and source code analysis tool
diff --git a/devel/a2dev/Makefile b/devel/a2dev/Makefile
index c70528ad7e69..b76a8488126e 100644
--- a/devel/a2dev/Makefile
+++ b/devel/a2dev/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= archie
EXTRACT_SUFX= .tgz
MAINTAINER= archie@FreeBSD.org
+COMMENT= Apple II 6502 assembler, linker, loader, and object file viewer
USE_GMAKE= defined
PATCH_STRIP= -p1
diff --git a/devel/a2dev/pkg-comment b/devel/a2dev/pkg-comment
deleted file mode 100644
index 640f4774a0ad..000000000000
--- a/devel/a2dev/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apple II 6502 assembler, linker, loader, and object file viewer
diff --git a/devel/ac-archive/Makefile b/devel/ac-archive/Makefile
index b0f7f9b80847..a054f8b98e61 100644
--- a/devel/ac-archive/Makefile
+++ b/devel/ac-archive/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= alane@FreeBSD.org
+COMMENT= A set of useful GNU autoconf macros
WANT_AUTOCONF_VER=253
diff --git a/devel/ac-archive/pkg-comment b/devel/ac-archive/pkg-comment
deleted file mode 100644
index d1f4ae1eba94..000000000000
--- a/devel/ac-archive/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of useful GNU autoconf macros
diff --git a/devel/acpicatools/Makefile b/devel/acpicatools/Makefile
index e9c960eee2c3..4a6369579d4f 100644
--- a/devel/acpicatools/Makefile
+++ b/devel/acpicatools/Makefile
@@ -16,6 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
NO_WRKSUBDIR= yes
MAINTAINER= iwasaki@FreeBSD.org
+COMMENT= Some utilities for Intel ACPICA (Debugger, ASL Compiler and etc.).
pre-install:
@${MKDIR} ${PREFIX}/man/man8
diff --git a/devel/acpicatools/pkg-comment b/devel/acpicatools/pkg-comment
deleted file mode 100644
index 338035831954..000000000000
--- a/devel/acpicatools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Some utilities for Intel ACPICA (Debugger, ASL Compiler and etc.).
diff --git a/devel/apache-ant/Makefile b/devel/apache-ant/Makefile
index d535a7a3e773..8c07ede9b5f5 100644
--- a/devel/apache-ant/Makefile
+++ b/devel/apache-ant/Makefile
@@ -17,6 +17,7 @@ DISTNAME= ${PORTNAME}-${ANT_VERSION}-bin
DIST_SUBDIR= jakarta
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java-based build tool, conceptually similar to make
RUN_DEPENDS= ${LOCALBASE}/share/java/classes/crimson.jar:${PORTSDIR}/textproc/crimson
diff --git a/devel/apache-ant/pkg-comment b/devel/apache-ant/pkg-comment
deleted file mode 100644
index c0c4a22757ea..000000000000
--- a/devel/apache-ant/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java-based build tool, conceptually similar to make
diff --git a/devel/arch/Makefile b/devel/arch/Makefile
index f96dae6977d7..f804c71b937f 100644
--- a/devel/arch/Makefile
+++ b/devel/arch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://regexps.com/pub/src/${PORTNAME}/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/pre/}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A distributed source code management / revision control system
USE_GMAKE= yes
HAS_CONFIGURE= yes
diff --git a/devel/arch/pkg-comment b/devel/arch/pkg-comment
deleted file mode 100644
index 6ed7e3da60ce..000000000000
--- a/devel/arch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A distributed source code management / revision control system
diff --git a/devel/as80/Makefile b/devel/as80/Makefile
index c6e12870f45a..66c209107431 100644
--- a/devel/as80/Makefile
+++ b/devel/as80/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.tstrathmann.de/files/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A lightweight 8080/8085 assembler
WRKSRC= ${WRKDIR}/${PORTNAME}
BUILD_WRKSRC= ${WRKSRC}/src
diff --git a/devel/as80/pkg-comment b/devel/as80/pkg-comment
deleted file mode 100644
index d1240b72d8a1..000000000000
--- a/devel/as80/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight 8080/8085 assembler
diff --git a/devel/asmutils/Makefile b/devel/asmutils/Makefile
index 9181d85a008c..7138c3b29a83 100644
--- a/devel/asmutils/Makefile
+++ b/devel/asmutils/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://linuxassembly.org/asmutils/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A set of UNIX utilities written in assembly language
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
diff --git a/devel/asmutils/pkg-comment b/devel/asmutils/pkg-comment
deleted file mode 100644
index d6784be70e3a..000000000000
--- a/devel/asmutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of UNIX utilities written in assembly language
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 6ca7fa395a88..67d0c7ca7452 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME accessibility toolkit (ATK)
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/devel/atk/pkg-comment b/devel/atk/pkg-comment
deleted file mode 100644
index 12a15ec5d95c..000000000000
--- a/devel/atk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME accessibility toolkit (ATK)
diff --git a/devel/autoconf/Makefile b/devel/autoconf/Makefile
index 0ef0bbfedfc0..4e83f34451bb 100644
--- a/devel/autoconf/Makefile
+++ b/devel/autoconf/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
MAINTAINER= alane@FreeBSD.org
+COMMENT= Automatically configure source code on many Un*x platforms
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
help2man:${PORTSDIR}/misc/help2man
diff --git a/devel/autoconf/pkg-comment b/devel/autoconf/pkg-comment
deleted file mode 100644
index 6922f03c2b32..000000000000
--- a/devel/autoconf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automatically configure source code on many Un*x platforms
diff --git a/devel/autoconf213/Makefile b/devel/autoconf213/Makefile
index 7eb87189e4e6..0bd9b92d76b6 100644
--- a/devel/autoconf213/Makefile
+++ b/devel/autoconf213/Makefile
@@ -18,6 +18,7 @@ MASTER_SITE_SUBDIR= binutils autoconf
DISTNAME= autoconf-000227
MAINTAINER= alane@FreeBSD.org
+COMMENT= Automatically configure source code on many Un*x platforms (legacy 2.13 version)
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/devel/autoconf213/pkg-comment b/devel/autoconf213/pkg-comment
deleted file mode 100644
index c3e5d24c6472..000000000000
--- a/devel/autoconf213/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automatically configure source code on many Un*x platforms (legacy 2.13 version)
diff --git a/devel/autoconf253/Makefile b/devel/autoconf253/Makefile
index 0ef0bbfedfc0..4e83f34451bb 100644
--- a/devel/autoconf253/Makefile
+++ b/devel/autoconf253/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
MAINTAINER= alane@FreeBSD.org
+COMMENT= Automatically configure source code on many Un*x platforms
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
help2man:${PORTSDIR}/misc/help2man
diff --git a/devel/autoconf253/pkg-comment b/devel/autoconf253/pkg-comment
deleted file mode 100644
index 6922f03c2b32..000000000000
--- a/devel/autoconf253/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automatically configure source code on many Un*x platforms
diff --git a/devel/automake/Makefile b/devel/automake/Makefile
index 227411ce2165..4002bfc6f66a 100644
--- a/devel/automake/Makefile
+++ b/devel/automake/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
MAINTAINER= alane@FreeBSD.org
+COMMENT= GNU Standards-compliant Makefile generator
GNU_CONFIGURE= yes
CONFIGURE_ENV= PERL=${PERL5}
diff --git a/devel/automake/pkg-comment b/devel/automake/pkg-comment
deleted file mode 100644
index dc2986f74176..000000000000
--- a/devel/automake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Standards-compliant Makefile generator
diff --git a/devel/automake14/Makefile b/devel/automake14/Makefile
index 08ca38cddb9f..9661477b158b 100644
--- a/devel/automake14/Makefile
+++ b/devel/automake14/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= automake
DISTNAME= automake-1.4-p5
MAINTAINER= alane@FreeBSD.org
+COMMENT= GNU Standards-compliant Makefile generator (legacy version 1.4)
GNU_CONFIGURE= yes
CONFIGURE_ENV= PERL=${PERL5}
diff --git a/devel/automake14/pkg-comment b/devel/automake14/pkg-comment
deleted file mode 100644
index 6fb4da2f7e8a..000000000000
--- a/devel/automake14/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Standards-compliant Makefile generator (legacy version 1.4)
diff --git a/devel/automake15/Makefile b/devel/automake15/Makefile
index 227411ce2165..4002bfc6f66a 100644
--- a/devel/automake15/Makefile
+++ b/devel/automake15/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= automake
MAINTAINER= alane@FreeBSD.org
+COMMENT= GNU Standards-compliant Makefile generator
GNU_CONFIGURE= yes
CONFIGURE_ENV= PERL=${PERL5}
diff --git a/devel/automake15/pkg-comment b/devel/automake15/pkg-comment
deleted file mode 100644
index dc2986f74176..000000000000
--- a/devel/automake15/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Standards-compliant Makefile generator
diff --git a/devel/automake16/Makefile b/devel/automake16/Makefile
index 073fd9307218..a3213de45293 100644
--- a/devel/automake16/Makefile
+++ b/devel/automake16/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= automake
DISTNAME= automake-${PORTVERSION}
MAINTAINER= alane@FreeBSD.org
+COMMENT= GNU automake generates input files for GNU autoconf
.undef NO_IGNORE
BORKED= "DON'T EVEN THINK ABOUT IT."
diff --git a/devel/automake16/pkg-comment b/devel/automake16/pkg-comment
deleted file mode 100644
index 0f4b8e405948..000000000000
--- a/devel/automake16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU automake generates input files for GNU autoconf
diff --git a/devel/avr-binutils/Makefile b/devel/avr-binutils/Makefile
index 0e8fb7e2b94d..1ff3497792f8 100644
--- a/devel/avr-binutils/Makefile
+++ b/devel/avr-binutils/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= binutils/releases
PKGNAMEPREFIX= avr-
MAINTAINER= joerg@freebsd.org
+COMMENT= GNU binutils for Atmel AVR 8-bit RISC cross-development
WRKSRC= ${WRKDIR}/binutils-${PORTVERSION}
diff --git a/devel/avr-binutils/pkg-comment b/devel/avr-binutils/pkg-comment
deleted file mode 100644
index dc1bde8ef182..000000000000
--- a/devel/avr-binutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU binutils for Atmel AVR 8-bit RISC cross-development
diff --git a/devel/avr-gcc-3/Makefile b/devel/avr-gcc-3/Makefile
index ea7a0a6c5af3..83860dcbcac4 100644
--- a/devel/avr-gcc-3/Makefile
+++ b/devel/avr-gcc-3/Makefile
@@ -19,6 +19,7 @@ DISTFILES= gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX} \
EXTRACT_ONLY= gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= joerg@freebsd.org
+COMMENT= FSF gcc-2.95.2 for Atmel AVR 8-bit RISC cross-development
BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils \
diff --git a/devel/avr-gcc-3/pkg-comment b/devel/avr-gcc-3/pkg-comment
deleted file mode 100644
index f80516397a68..000000000000
--- a/devel/avr-gcc-3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FSF gcc-2.95.2 for Atmel AVR 8-bit RISC cross-development
diff --git a/devel/avr-gcc/Makefile b/devel/avr-gcc/Makefile
index ea7a0a6c5af3..83860dcbcac4 100644
--- a/devel/avr-gcc/Makefile
+++ b/devel/avr-gcc/Makefile
@@ -19,6 +19,7 @@ DISTFILES= gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX} \
EXTRACT_ONLY= gcc-core+g++-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= joerg@freebsd.org
+COMMENT= FSF gcc-2.95.2 for Atmel AVR 8-bit RISC cross-development
BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils \
diff --git a/devel/avr-gcc/pkg-comment b/devel/avr-gcc/pkg-comment
deleted file mode 100644
index f80516397a68..000000000000
--- a/devel/avr-gcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FSF gcc-2.95.2 for Atmel AVR 8-bit RISC cross-development
diff --git a/devel/avr-gdb/Makefile b/devel/avr-gdb/Makefile
index e54bd0a95d4f..7ad01c12efd0 100644
--- a/devel/avr-gdb/Makefile
+++ b/devel/avr-gdb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gdb/releases
DISTNAME= gdb-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
+COMMENT= GNU GDB 5.2.1 for the AVR target
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/avr-gdb/pkg-comment b/devel/avr-gdb/pkg-comment
deleted file mode 100644
index 4807bad84031..000000000000
--- a/devel/avr-gdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU GDB 5.2.1 for the AVR target
diff --git a/devel/avr-libc/Makefile b/devel/avr-libc/Makefile
index a462a3f6e4f4..7150269c495d 100644
--- a/devel/avr-libc/Makefile
+++ b/devel/avr-libc/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= devel
MASTER_SITES= http://people.freebsd.org/~joerg/
MAINTAINER= joerg@freebsd.org
+COMMENT= A C and math library for the Atmel AVR controller family
BUILD_DEPENDS= avr-as:${PORTSDIR}/devel/avr-binutils \
avr-ld:${PORTSDIR}/devel/avr-binutils \
diff --git a/devel/avr-libc/pkg-comment b/devel/avr-libc/pkg-comment
deleted file mode 100644
index 065154a0d462..000000000000
--- a/devel/avr-libc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C and math library for the Atmel AVR controller family
diff --git a/devel/avrprog/Makefile b/devel/avrprog/Makefile
index 28da90353d0a..3695cd40fe45 100644
--- a/devel/avrprog/Makefile
+++ b/devel/avrprog/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= bsd
MAINTAINER= bsd@FreeBSD.org
+COMMENT= Program to drive a simple parallel port programmer for Atmel AVR CPUs
MAN1= avrprog.1
MANCOMPRESSED= no
diff --git a/devel/avrprog/pkg-comment b/devel/avrprog/pkg-comment
deleted file mode 100644
index 38c20ff597a1..000000000000
--- a/devel/avrprog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Program to drive a simple parallel port programmer for Atmel AVR CPUs
diff --git a/devel/bcc/Makefile b/devel/bcc/Makefile
index 077114f233fa..1f3cffe2fd84 100644
--- a/devel/bcc/Makefile
+++ b/devel/bcc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel lang
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Bruce's C compiler (with as and ld); can do 16-bit code
MAN1= as86.1 bcc.1 bcc-cc1.1 ld86.1
.if !defined(NOMANCOMPRESS)
diff --git a/devel/bcc/pkg-comment b/devel/bcc/pkg-comment
deleted file mode 100644
index 64634f1fddc3..000000000000
--- a/devel/bcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bruce's C compiler (with as and ld); can do 16-bit code
diff --git a/devel/boaconstructor/Makefile b/devel/boaconstructor/Makefile
index 178978c3c8e5..bcd31dd8e42e 100644
--- a/devel/boaconstructor/Makefile
+++ b/devel/boaconstructor/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= boa-constructor
DISTNAME= Boa-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A cross platform RAD GUI Building IDE for wxPython
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/wxc.so:${PORTSDIR}/x11-toolkits/py-wxPython
diff --git a/devel/boaconstructor/pkg-comment b/devel/boaconstructor/pkg-comment
deleted file mode 100644
index a91d4c135cf6..000000000000
--- a/devel/boaconstructor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cross platform RAD GUI Building IDE for wxPython
diff --git a/devel/bonobo-activation/Makefile b/devel/bonobo-activation/Makefile
index c44edca6d5d9..312f2ea27aa9 100644
--- a/devel/bonobo-activation/Makefile
+++ b/devel/bonobo-activation/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An object activation framework for GNOME 2.0
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
ORBit-2.0:${PORTSDIR}/devel/ORBit2
diff --git a/devel/bonobo-activation/pkg-comment b/devel/bonobo-activation/pkg-comment
deleted file mode 100644
index 8fc03b86a545..000000000000
--- a/devel/bonobo-activation/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object activation framework for GNOME 2.0
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 9bd0bb5b8091..8176f07d1613 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/bonobo-conf/0.16
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Bonobo configuration moniker
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/devel/bonobo-conf/pkg-comment b/devel/bonobo-conf/pkg-comment
deleted file mode 100644
index 09df6da22fb1..000000000000
--- a/devel/bonobo-conf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bonobo configuration moniker
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 04ee0d7f2992..a7dda482db7e 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The component and compound document system for GNOME
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/devel/bonobo/pkg-comment b/devel/bonobo/pkg-comment
deleted file mode 100644
index ca21830f7ac3..000000000000
--- a/devel/bonobo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The component and compound document system for GNOME
diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile
index 5fda917dfbd4..3ff2a76779d5 100644
--- a/devel/bug-buddy/Makefile
+++ b/devel/bug-buddy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/bug-buddy/2.0
DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A bug reporting tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/bug-buddy/pkg-comment b/devel/bug-buddy/pkg-comment
deleted file mode 100644
index bf6ab260074b..000000000000
--- a/devel/bug-buddy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bug reporting tool for GNOME
diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile
index 5fda917dfbd4..3ff2a76779d5 100644
--- a/devel/bugbuddy/Makefile
+++ b/devel/bugbuddy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/bug-buddy/2.0
DISTNAME= bug-buddy-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A bug reporting tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/bugbuddy/pkg-comment b/devel/bugbuddy/pkg-comment
deleted file mode 100644
index bf6ab260074b..000000000000
--- a/devel/bugbuddy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bug reporting tool for GNOME
diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile
index 06d8b27702ae..02c250997a13 100644
--- a/devel/bugbuddy2/Makefile
+++ b/devel/bugbuddy2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= bug-buddy-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A bug reporting tool for GNOME 2.0
LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop
diff --git a/devel/bugbuddy2/pkg-comment b/devel/bugbuddy2/pkg-comment
deleted file mode 100644
index 7acf78530e7c..000000000000
--- a/devel/bugbuddy2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bug reporting tool for GNOME 2.0
diff --git a/devel/c2lib/Makefile b/devel/c2lib/Makefile
index eb5ed1255534..190cdd9063a0 100644
--- a/devel/c2lib/Makefile
+++ b/devel/c2lib/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.annexia.org/freeware/${PORTNAME}/
MAINTAINER= alane@FreeBSD.org
+COMMENT= Library of basic structures and memory allocators for C
BUILD_DEPENDS+= cdoc:${.CURDIR}/../../devel/cdoc
BUILD_DEPENDS+= make+:${.CURDIR}/../../devel/makeplus
diff --git a/devel/c2lib/pkg-comment b/devel/c2lib/pkg-comment
deleted file mode 100644
index 0a4e7a655add..000000000000
--- a/devel/c2lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library of basic structures and memory allocators for C
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 51fa23a527fe..19e8a0a24482 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://download.sourceforge.net/cbrowser/ \
MASTER_SITE_SUBDIR=jkoshy
MAINTAINER= jkoshy@freebsd.org
+COMMENT= Graphical front end for cscope and cscope clones
RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83
diff --git a/devel/cbrowser/pkg-comment b/devel/cbrowser/pkg-comment
deleted file mode 100644
index 34e3e78600f9..000000000000
--- a/devel/cbrowser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical front end for cscope and cscope clones
diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile
index a6b070048e82..1d6187d16517 100644
--- a/devel/cc65/Makefile
+++ b/devel/cc65/Makefile
@@ -19,6 +19,7 @@ WRKSRC= ${WRKDIR}/cc65-2.8.0
DISTNAME= cc65-sources-2.8.0
MAINTAINER= hoek@FreeBSD.org
+COMMENT= Cross-compiler for 6502-based systems, includes 65816 assembler
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/cc65/pkg-comment b/devel/cc65/pkg-comment
deleted file mode 100644
index 7d035bcf1064..000000000000
--- a/devel/cc65/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross-compiler for 6502-based systems, includes 65816 assembler
diff --git a/devel/cdialog/Makefile b/devel/cdialog/Makefile
index 654b2a7bd7ee..7010bcbc8e6d 100644
--- a/devel/cdialog/Makefile
+++ b/devel/cdialog/Makefile
@@ -18,6 +18,7 @@ DISTNAME= ${PORTNAME:S|^c||}-${PORTVERSION:S|.200|-200|}
EXTRACT_SUFX= .tgz
MAINTAINER= alane@freebsd.org
+COMMENT= An enhanced version of the 'dialog' command to work with ncurses
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/cdialog/pkg-comment b/devel/cdialog/pkg-comment
deleted file mode 100644
index d5ed4ed4c946..000000000000
--- a/devel/cdialog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An enhanced version of the 'dialog' command to work with ncurses
diff --git a/devel/cdk/Makefile b/devel/cdk/Makefile
index e4a88c936040..58d010cbf250 100644
--- a/devel/cdk/Makefile
+++ b/devel/cdk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://dickey.his.com/cdk/
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= Curses Development Kit for speedy development of full screen programs
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/devel/cdk/pkg-comment b/devel/cdk/pkg-comment
deleted file mode 100644
index e8b0ccf649cf..000000000000
--- a/devel/cdk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Curses Development Kit for speedy development of full screen programs
diff --git a/devel/cdoc/Makefile b/devel/cdoc/Makefile
index 1c095ccc5e53..4bbf0ce0c1cf 100644
--- a/devel/cdoc/Makefile
+++ b/devel/cdoc/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.annexia.org/freeware/${PORTNAME}/
MAINTAINER= alane@FreeBSD.org
+COMMENT= Extracts documentation from C source code comments
BUILD_DEPENDS+= make+:${.CURDIR}/../makeplus
diff --git a/devel/cdoc/pkg-comment b/devel/cdoc/pkg-comment
deleted file mode 100644
index b20578dcc5e3..000000000000
--- a/devel/cdoc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extracts documentation from C source code comments
diff --git a/devel/clanlib-devel/Makefile b/devel/clanlib-devel/Makefile
index ac729329e251..19c2e4e76e81 100644
--- a/devel/clanlib-devel/Makefile
+++ b/devel/clanlib-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/
DISTNAME= ClanLib-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Cross-platform game SDK
LIB_DEPENDS= Hermes.1:${PORTSDIR}/graphics/Hermes \
png.5:${PORTSDIR}/graphics/png \
diff --git a/devel/clanlib-devel/pkg-comment b/devel/clanlib-devel/pkg-comment
deleted file mode 100644
index 72c6c3c7d100..000000000000
--- a/devel/clanlib-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross-platform game SDK
diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile
index ac729329e251..19c2e4e76e81 100644
--- a/devel/clanlib/Makefile
+++ b/devel/clanlib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://dark.x.dtu.dk/~mbn/clanlib/download/
DISTNAME= ClanLib-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Cross-platform game SDK
LIB_DEPENDS= Hermes.1:${PORTSDIR}/graphics/Hermes \
png.5:${PORTSDIR}/graphics/png \
diff --git a/devel/clanlib/pkg-comment b/devel/clanlib/pkg-comment
deleted file mode 100644
index 72c6c3c7d100..000000000000
--- a/devel/clanlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross-platform game SDK
diff --git a/devel/clig/Makefile b/devel/clig/Makefile
index 3ce8073ccec7..f7b3cddf5de6 100644
--- a/devel/clig/Makefile
+++ b/devel/clig/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel tcl82
MASTER_SITES= http://wsd.iitb.fhg.de/~kir/clighome/
MAINTAINER= billf@FreeBSD.org
+COMMENT= Auto-generate an (argc, argv) processor, usage message, and manpage
# This should work with any version of tcl. See also ${MAKE_ENV}.
BUILD_DEPENDS= ${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
diff --git a/devel/clig/pkg-comment b/devel/clig/pkg-comment
deleted file mode 100644
index dad3179c41a3..000000000000
--- a/devel/clig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Auto-generate an (argc, argv) processor, usage message, and manpage
diff --git a/devel/clo++/Makefile b/devel/clo++/Makefile
index 0992ba88c594..74453b6ae916 100644
--- a/devel/clo++/Makefile
+++ b/devel/clo++/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://pmade.org/~pjones/software/clo++/download/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= Command line parser generator
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/devel/clo++/pkg-comment b/devel/clo++/pkg-comment
deleted file mode 100644
index 28fe6a3b80df..000000000000
--- a/devel/clo++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command line parser generator
diff --git a/devel/cons-test/Makefile b/devel/cons-test/Makefile
index 8ca09fd81ae3..94a017148944 100644
--- a/devel/cons-test/Makefile
+++ b/devel/cons-test/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://www.dsmit.com/cons/stable/ \
EXTRACT_SUFX= .tgz
MAINTAINER= rv@FreeBSD.org
+COMMENT= A test bed for `Cons' development
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 ${LOCALBASE}/bin/cons:${PORTSDIR}/devel/cons
diff --git a/devel/cons-test/pkg-comment b/devel/cons-test/pkg-comment
deleted file mode 100644
index 84e001dbd673..000000000000
--- a/devel/cons-test/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A test bed for `Cons' development
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index 334fa69afa8c..927cb9cc5d44 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= An interactive C program browser
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-yacc
diff --git a/devel/cscope/pkg-comment b/devel/cscope/pkg-comment
deleted file mode 100644
index 0d848c89c181..000000000000
--- a/devel/cscope/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interactive C program browser
diff --git a/devel/ctags/Makefile b/devel/ctags/Makefile
index 10b8f6a62528..2da00bb83e3b 100644
--- a/devel/ctags/Makefile
+++ b/devel/ctags/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ctags jkoshy
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= A feature-filled tagfile generator for vi and emacs clones
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-macro-patterns --disable-etags
diff --git a/devel/ctags/pkg-comment b/devel/ctags/pkg-comment
deleted file mode 100644
index 98cb204bef34..000000000000
--- a/devel/ctags/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A feature-filled tagfile generator for vi and emacs clones
diff --git a/devel/cvs+ipv6/Makefile b/devel/cvs+ipv6/Makefile
index 562c4c8ab2da..8288f0b0c7a1 100644
--- a/devel/cvs+ipv6/Makefile
+++ b/devel/cvs+ipv6/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${DISTNAME}-v6-20030123.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver
GNU_CONFIGURE= yes
#USE_GMAKE= yes
diff --git a/devel/cvs+ipv6/pkg-comment b/devel/cvs+ipv6/pkg-comment
deleted file mode 100644
index 8a0c36fd616c..000000000000
--- a/devel/cvs+ipv6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IPv6 enabled cvs. You can use IPv6 connection when using pserver
diff --git a/devel/cvs-devel/Makefile b/devel/cvs-devel/Makefile
index 562c4c8ab2da..8288f0b0c7a1 100644
--- a/devel/cvs-devel/Makefile
+++ b/devel/cvs-devel/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${DISTNAME}-v6-20030123.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= IPv6 enabled cvs. You can use IPv6 connection when using pserver
GNU_CONFIGURE= yes
#USE_GMAKE= yes
diff --git a/devel/cvs-devel/pkg-comment b/devel/cvs-devel/pkg-comment
deleted file mode 100644
index 8a0c36fd616c..000000000000
--- a/devel/cvs-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IPv6 enabled cvs. You can use IPv6 connection when using pserver
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index bf9641857101..a2f49e735745 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sada
EXTRACT_SUFX= .gz
MAINTAINER= sada@FreeBSD.org
+COMMENT= Perl script to turn ``cvs log'' output into HTML
USE_PERL5= yes
NO_BUILD= yes
diff --git a/devel/cvs2html/pkg-comment b/devel/cvs2html/pkg-comment
deleted file mode 100644
index 8b3c83bbd0a5..000000000000
--- a/devel/cvs2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script to turn ``cvs log'' output into HTML
diff --git a/devel/cvspadm/Makefile b/devel/cvspadm/Makefile
index 9ea4c1d0a759..003b842198c4 100644
--- a/devel/cvspadm/Makefile
+++ b/devel/cvspadm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.securityfoo.net/ray/projs/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool for CVS pserver user administration
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/devel/cvspadm/pkg-comment b/devel/cvspadm/pkg-comment
deleted file mode 100644
index ecefe25c5d68..000000000000
--- a/devel/cvspadm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool for CVS pserver user administration
diff --git a/devel/cvsstat/Makefile b/devel/cvsstat/Makefile
index 020b4faa4bef..afed9d893a4c 100644
--- a/devel/cvsstat/Makefile
+++ b/devel/cvsstat/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR= ${PORTNAME}-${PORTVERSION}
EXTRACT_ONLY= # empty
MAINTAINER= petef@FreeBSD.org
+COMMENT= Transforms the output of 'cvs status' to a sorted ASCII table
USE_PERL5= yes
NO_BUILD= yes
diff --git a/devel/cvsstat/pkg-comment b/devel/cvsstat/pkg-comment
deleted file mode 100644
index 1c92a414eab1..000000000000
--- a/devel/cvsstat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transforms the output of 'cvs status' to a sorted ASCII table
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 1d0f9c7a10c2..186ecae0f74c 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= scop
MAINTAINER= freebsd-cvsweb@FreeBSD.org
+COMMENT= WWW CGI script to browse CVS repository trees
NO_BUILD= yes
diff --git a/devel/cvsweb/pkg-comment b/devel/cvsweb/pkg-comment
deleted file mode 100644
index 63c4db196022..000000000000
--- a/devel/cvsweb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW CGI script to browse CVS repository trees
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 1d0f9c7a10c2..186ecae0f74c 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= scop
MAINTAINER= freebsd-cvsweb@FreeBSD.org
+COMMENT= WWW CGI script to browse CVS repository trees
NO_BUILD= yes
diff --git a/devel/cvsweb3/pkg-comment b/devel/cvsweb3/pkg-comment
deleted file mode 100644
index 63c4db196022..000000000000
--- a/devel/cvsweb3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW CGI script to browse CVS repository trees
diff --git a/devel/cvswrap/Makefile b/devel/cvswrap/Makefile
index b81047c7e7a3..a845f20d3ee0 100644
--- a/devel/cvswrap/Makefile
+++ b/devel/cvswrap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES+= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= alfred
MAINTAINER= alfred@FreeBSD.org
+COMMENT= Helper for multiple CVS repositories.
GNU_CONFIGURE= yes
diff --git a/devel/cvswrap/pkg-comment b/devel/cvswrap/pkg-comment
deleted file mode 100644
index 34a45003b437..000000000000
--- a/devel/cvswrap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Helper for multiple CVS repositories.
diff --git a/devel/cweb/Makefile b/devel/cweb/Makefile
index 829b09720052..2ce8e96126d3 100644
--- a/devel/cweb/Makefile
+++ b/devel/cweb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_TEX_CTAN}
MASTER_SITE_SUBDIR= web/c_cpp/cweb
MAINTAINER= tg@FreeBSD.org
+COMMENT= Literate programming tools for the C language
NO_WRKSUBDIR= yes
MAN1= cweb.1
diff --git a/devel/cweb/pkg-comment b/devel/cweb/pkg-comment
deleted file mode 100644
index 929837d3c3d7..000000000000
--- a/devel/cweb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Literate programming tools for the C language
diff --git a/devel/devtodo/Makefile b/devel/devtodo/Makefile
index cb49e9a0c2e5..844616a755bb 100644
--- a/devel/devtodo/Makefile
+++ b/devel/devtodo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://devtodo.sourceforge.net/?${PORTVERSION}/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool to effectively maintain todo lists aimed at developers
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/devel/devtodo/pkg-comment b/devel/devtodo/pkg-comment
deleted file mode 100644
index 0f702d9f4f54..000000000000
--- a/devel/devtodo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to effectively maintain todo lists aimed at developers
diff --git a/devel/diffconvert/Makefile b/devel/diffconvert/Makefile
index 46879fe05384..8db748e381b8 100644
--- a/devel/diffconvert/Makefile
+++ b/devel/diffconvert/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp.ilog.fr/pub/Users/haible/gnu/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A converter between context diff and unidiff formats
PROGRAMS= cd2ud cdiffreverse ud2cd udiffreverse
diff --git a/devel/diffconvert/pkg-comment b/devel/diffconvert/pkg-comment
deleted file mode 100644
index 1018d0918082..000000000000
--- a/devel/diffconvert/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A converter between context diff and unidiff formats
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 9ae20fcdc369..68e8577fd006 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= kde@freebsd.org
+COMMENT= A documentation system for C and C++
ALL_TARGET= all
diff --git a/devel/doxygen/pkg-comment b/devel/doxygen/pkg-comment
deleted file mode 100644
index f4d5958e8fb9..000000000000
--- a/devel/doxygen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A documentation system for C and C++
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 719b90f76db3..89a67cd2be00 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= emacs
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= okazaki@FreeBSD.org
+COMMENT= Collection of useful routines for Emacs lisp programs
# setupel filename
PORT_SETUPEL= elib-startup.el
diff --git a/devel/elib/pkg-comment b/devel/elib/pkg-comment
deleted file mode 100644
index 1c80a66ce0ad..000000000000
--- a/devel/elib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of useful routines for Emacs lisp programs
diff --git a/devel/error/Makefile b/devel/error/Makefile
index ca3e135cc378..9de80eb3a105 100644
--- a/devel/error/Makefile
+++ b/devel/error/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
+COMMENT= Analyze diagnostic error output from compilers and other processors
MANSECTS= 1
MAN1= error.1
diff --git a/devel/error/pkg-comment b/devel/error/pkg-comment
deleted file mode 100644
index 0e85dfa55422..000000000000
--- a/devel/error/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Analyze diagnostic error output from compilers and other processors
diff --git a/devel/fam/Makefile b/devel/fam/Makefile
index ea80ae99d198..dadcf30cf6d0 100644
--- a/devel/fam/Makefile
+++ b/devel/fam/Makefile
@@ -15,6 +15,7 @@ PATCH_DIST_STRIP= -p1
PATCHFILES= freebsd-mntent.patch # freebsd-build.patch
MAINTAINER= alane@FreeBSD.org
+COMMENT= A file alteration monitor
CFLAGS+= -Wno-deprecated
diff --git a/devel/fam/pkg-comment b/devel/fam/pkg-comment
deleted file mode 100644
index 1a5ede04fee3..000000000000
--- a/devel/fam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file alteration monitor
diff --git a/devel/fhist/Makefile b/devel/fhist/Makefile
index 382eb442c0db..a63b7a30943a 100644
--- a/devel/fhist/Makefile
+++ b/devel/fhist/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.canb.auug.org.au/~millerp/ \
http://gd.tuwien.ac.at/softeng/Aegis/
MAINTAINER= jkoshy@freebsd.org
+COMMENT= Utilities to maintain file history, do file comparisions and merges
.include <bsd.port.pre.mk>
diff --git a/devel/fhist/pkg-comment b/devel/fhist/pkg-comment
deleted file mode 100644
index ea43952d9f78..000000000000
--- a/devel/fhist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities to maintain file history, do file comparisions and merges
diff --git a/devel/fnccheck/Makefile b/devel/fnccheck/Makefile
index ddcecb50711c..ea9bf7b24948 100644
--- a/devel/fnccheck/Makefile
+++ b/devel/fnccheck/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www710.univ-lyon1.fr/~yperret/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A profiling library/utilities for C/C++ programs
INSTALLS_SHLIB= yes
diff --git a/devel/fnccheck/pkg-comment b/devel/fnccheck/pkg-comment
deleted file mode 100644
index f2123ffb4c96..000000000000
--- a/devel/fnccheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A profiling library/utilities for C/C++ programs
diff --git a/devel/fnorb/Makefile b/devel/fnorb/Makefile
index 9e2a34b9e97d..430b62230534 100644
--- a/devel/fnorb/Makefile
+++ b/devel/fnorb/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= devel python
MASTER_SITES= http://www.fnorb.org/download/
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A CORBA 2.0 ORB written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/devel/fnorb/pkg-comment b/devel/fnorb/pkg-comment
deleted file mode 100644
index 534669ef033e..000000000000
--- a/devel/fnorb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A CORBA 2.0 ORB written in Python
diff --git a/devel/fortran-utils/Makefile b/devel/fortran-utils/Makefile
index f9008ef4fbf4..320fe95d8308 100644
--- a/devel/fortran-utils/Makefile
+++ b/devel/fortran-utils/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kris
MAINTAINER= kris@FreeBSD.org
+COMMENT= Tools for use with Fortran code, from 4.4BSD
WRKSRC= ${WRKDIR}/fortran-utils
diff --git a/devel/fortran-utils/pkg-comment b/devel/fortran-utils/pkg-comment
deleted file mode 100644
index 6dd00a0e4b81..000000000000
--- a/devel/fortran-utils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tools for use with Fortran code, from 4.4BSD
diff --git a/devel/frink/Makefile b/devel/frink/Makefile
index ef794343b1ba..16c0c798ee08 100644
--- a/devel/frink/Makefile
+++ b/devel/frink/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://catless.ncl.ac.uk/pub/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A tcl formatter and static tester
#MAN1= ${PORTNAME}.1
MANCOMPRESSED= maybe
diff --git a/devel/frink/pkg-comment b/devel/frink/pkg-comment
deleted file mode 100644
index bc41e986226f..000000000000
--- a/devel/frink/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tcl formatter and static tester
diff --git a/devel/funnelweb/Makefile b/devel/funnelweb/Makefile
index db2092400d66..3c89e9a8e237 100644
--- a/devel/funnelweb/Makefile
+++ b/devel/funnelweb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ross.net/funnelweb/funnelweb_v320/
DISTNAME= funnelweb_v320_source
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A powerful literate-programming macro pre-processor
WRKSRC= fw_src/source
diff --git a/devel/funnelweb/pkg-comment b/devel/funnelweb/pkg-comment
deleted file mode 100644
index b426c19e49e5..000000000000
--- a/devel/funnelweb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A powerful literate-programming macro pre-processor
diff --git a/devel/gaa/Makefile b/devel/gaa/Makefile
index f02b11219dae..85abb65cd378 100644
--- a/devel/gaa/Makefile
+++ b/devel/gaa/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= demon@FreeBSD.org
+COMMENT= GPL Argument Analyser
GNU_CONFIGURE= yes
diff --git a/devel/gaa/pkg-comment b/devel/gaa/pkg-comment
deleted file mode 100644
index 1e039647e17f..000000000000
--- a/devel/gaa/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GPL Argument Analyser
diff --git a/devel/gconf/Makefile b/devel/gconf/Makefile
index 9bb59cc299bc..c520b1b76ff1 100644
--- a/devel/gconf/Makefile
+++ b/devel/gconf/Makefile
@@ -15,6 +15,7 @@ DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A configuration database system for GNOME
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile \
db3.3:${PORTSDIR}/databases/db3
diff --git a/devel/gconf/pkg-comment b/devel/gconf/pkg-comment
deleted file mode 100644
index a28ad7d9f0da..000000000000
--- a/devel/gconf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A configuration database system for GNOME
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index f47d5186f56f..dd325e153272 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= GConf-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A configuration database system for GNOME
LIB_DEPENDS= ORBit-2.0:${PORTSDIR}/devel/ORBit2 \
xml2.5:${PORTSDIR}/textproc/libxml2 \
diff --git a/devel/gconf2/pkg-comment b/devel/gconf2/pkg-comment
deleted file mode 100644
index a28ad7d9f0da..000000000000
--- a/devel/gconf2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A configuration database system for GNOME
diff --git a/devel/gdb52/Makefile b/devel/gdb52/Makefile
index 0d8b19f46173..14c25eb8015b 100644
--- a/devel/gdb52/Makefile
+++ b/devel/gdb52/Makefile
@@ -18,6 +18,7 @@ PATCH_SITE_SUBDIR= obrien
PATCHFILES= gdb521_xfree-loadmod.diff
MAINTAINER= mp@FreeBSD.org
+COMMENT= GNU GDB 5.2 developmental snapshot
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/gdb52/pkg-comment b/devel/gdb52/pkg-comment
deleted file mode 100644
index 285920d560a5..000000000000
--- a/devel/gdb52/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU GDB 5.2 developmental snapshot
diff --git a/devel/gdb53/Makefile b/devel/gdb53/Makefile
index 4f9173db1bdb..3f403bb20282 100644
--- a/devel/gdb53/Makefile
+++ b/devel/gdb53/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= gdb/releases
MAINTAINER= mp@FreeBSD.org
+COMMENT= GNU GDB 5.3 developmental snapshot
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/gdb53/pkg-comment b/devel/gdb53/pkg-comment
deleted file mode 100644
index 4a0f21c8cfd7..000000000000
--- a/devel/gdb53/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU GDB 5.3 developmental snapshot
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index 4f9173db1bdb..3f403bb20282 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= gdb/releases
MAINTAINER= mp@FreeBSD.org
+COMMENT= GNU GDB 5.3 developmental snapshot
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/gdb6/pkg-comment b/devel/gdb6/pkg-comment
deleted file mode 100644
index 4a0f21c8cfd7..000000000000
--- a/devel/gdb6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU GDB 5.3 developmental snapshot
diff --git a/devel/gdb66/Makefile b/devel/gdb66/Makefile
index 4f9173db1bdb..3f403bb20282 100644
--- a/devel/gdb66/Makefile
+++ b/devel/gdb66/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEWARE}
MASTER_SITE_SUBDIR= gdb/releases
MAINTAINER= mp@FreeBSD.org
+COMMENT= GNU GDB 5.3 developmental snapshot
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/gdb66/pkg-comment b/devel/gdb66/pkg-comment
deleted file mode 100644
index 4a0f21c8cfd7..000000000000
--- a/devel/gdb66/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU GDB 5.3 developmental snapshot
diff --git a/devel/gengameng/Makefile b/devel/gengameng/Makefile
index 85c40c097a80..d4c4626ff1ef 100644
--- a/devel/gengameng/Makefile
+++ b/devel/gengameng/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/
MAINTAINER= markp@FreeBSD.org
+COMMENT= An SDL game engine library
LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/devel/gengameng/pkg-comment b/devel/gengameng/pkg-comment
deleted file mode 100644
index 2e4a4580a24b..000000000000
--- a/devel/gengameng/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An SDL game engine library
diff --git a/devel/gide/Makefile b/devel/gide/Makefile
index 0db3c3c57777..4e0ab38d5613 100644
--- a/devel/gide/Makefile
+++ b/devel/gide/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gide/0.3
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GTK-based IDE for the C programming Language
BUILD_DEPENDS= xml-i18n-update:${PORTSDIR}/textproc/xml-i18n-tools
LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl \
diff --git a/devel/gide/pkg-comment b/devel/gide/pkg-comment
deleted file mode 100644
index 621a14d6e377..000000000000
--- a/devel/gide/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK-based IDE for the C programming Language
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index c1ad1ea417ab..45a1050dcb1a 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/glade/0.6
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A user interface builder for GTK+/GNOME
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/devel/glade/pkg-comment b/devel/glade/pkg-comment
deleted file mode 100644
index e61ac115a55d..000000000000
--- a/devel/glade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user interface builder for GTK+/GNOME
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 8257cd14a3c9..8c0e5e16644e 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= glade-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A user interface builder for GTK+/GNOME
LIB_DEPENDS= gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/devel/glade2/pkg-comment b/devel/glade2/pkg-comment
deleted file mode 100644
index e61ac115a55d..000000000000
--- a/devel/glade2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user interface builder for GTK+/GNOME
diff --git a/devel/glib12/Makefile b/devel/glib12/Makefile
index 0f6806b5aa53..a780d2d395bd 100644
--- a/devel/glib12/Makefile
+++ b/devel/glib12/Makefile
@@ -16,6 +16,7 @@ BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Some useful routines of C programming (previous stable version)
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/devel/glib12/pkg-comment b/devel/glib12/pkg-comment
deleted file mode 100644
index ac909fff8b2b..000000000000
--- a/devel/glib12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Some useful routines of C programming (previous stable version)
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 4118b66d802d..3595f1b13108 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -18,6 +18,7 @@ MASTER_SITE_SUBDIR= gtk/v${PORTVERSION:R}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Some useful routines of C programming (current stable version)
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/devel/glib20/pkg-comment b/devel/glib20/pkg-comment
deleted file mode 100644
index d8ca064b1b7c..000000000000
--- a/devel/glib20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Some useful routines of C programming (current stable version)
diff --git a/devel/gnome-build/Makefile b/devel/gnome-build/Makefile
index 5a32d8ece5b3..fb582c53c6f9 100644
--- a/devel/gnome-build/Makefile
+++ b/devel/gnome-build/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME:S/gnome/gnome-/}/0.0
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= A GNOME Build Framework (GBF)
LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl
diff --git a/devel/gnome-build/pkg-comment b/devel/gnome-build/pkg-comment
deleted file mode 100644
index 79bcfd20218a..000000000000
--- a/devel/gnome-build/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME Build Framework (GBF)
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile
index 44f6a5959f40..8a26d2d47eb5 100644
--- a/devel/gnome-common/Makefile
+++ b/devel/gnome-common/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Common automake macros for GNOME and GOME 2.0
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/devel/gnome-common/pkg-comment b/devel/gnome-common/pkg-comment
deleted file mode 100644
index 6dc7d88bd628..000000000000
--- a/devel/gnome-common/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Common automake macros for GNOME and GOME 2.0
diff --git a/devel/gnome-crash/Makefile b/devel/gnome-crash/Makefile
index 3619a710d050..027933ce9585 100644
--- a/devel/gnome-crash/Makefile
+++ b/devel/gnome-crash/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-crash/0.0
DISTNAME= gnome-crash-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A small coredump analysis tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/gnome-crash/pkg-comment b/devel/gnome-crash/pkg-comment
deleted file mode 100644
index 5aba8b1e5a60..000000000000
--- a/devel/gnome-crash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small coredump analysis tool for GNOME
diff --git a/devel/gnome-devel/Makefile b/devel/gnome-devel/Makefile
index f0a9e01f1472..ad218b1813b4 100644
--- a/devel/gnome-devel/Makefile
+++ b/devel/gnome-devel/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The "meta-port" for the GNOME development API
RUN_DEPENDS= intltool-merge:${PORTSDIR}/textproc/intltool
LIB_DEPENDS= gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
diff --git a/devel/gnome-devel/pkg-comment b/devel/gnome-devel/pkg-comment
deleted file mode 100644
index 2bdaf0b12a60..000000000000
--- a/devel/gnome-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the GNOME development API
diff --git a/devel/gnome-vfs/Makefile b/devel/gnome-vfs/Makefile
index 7f2af0cea73f..708c2dc48f4e 100644
--- a/devel/gnome-vfs/Makefile
+++ b/devel/gnome-vfs/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME Virtual File System
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
diff --git a/devel/gnome-vfs/pkg-comment b/devel/gnome-vfs/pkg-comment
deleted file mode 100644
index 818ef6f9549b..000000000000
--- a/devel/gnome-vfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME Virtual File System
diff --git a/devel/gnome2-devel/Makefile b/devel/gnome2-devel/Makefile
index 283331cb728d..3803d0b793a3 100644
--- a/devel/gnome2-devel/Makefile
+++ b/devel/gnome2-devel/Makefile
@@ -14,6 +14,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The "meta-port" for the GNOME 2.0 development API
RUN_DEPENDS= intltool-merge:${PORTSDIR}/textproc/intltool \
gnome-autogen.sh:${PORTSDIR}/devel/gnomecommon \
diff --git a/devel/gnome2-devel/pkg-comment b/devel/gnome2-devel/pkg-comment
deleted file mode 100644
index 45293e300f01..000000000000
--- a/devel/gnome2-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the GNOME 2.0 development API
diff --git a/devel/gnomebuild/Makefile b/devel/gnomebuild/Makefile
index 5a32d8ece5b3..fb582c53c6f9 100644
--- a/devel/gnomebuild/Makefile
+++ b/devel/gnomebuild/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME:S/gnome/gnome-/}/0.0
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= A GNOME Build Framework (GBF)
LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl
diff --git a/devel/gnomebuild/pkg-comment b/devel/gnomebuild/pkg-comment
deleted file mode 100644
index 79bcfd20218a..000000000000
--- a/devel/gnomebuild/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME Build Framework (GBF)
diff --git a/devel/gnomecommon/Makefile b/devel/gnomecommon/Makefile
index 44f6a5959f40..8a26d2d47eb5 100644
--- a/devel/gnomecommon/Makefile
+++ b/devel/gnomecommon/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-common-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Common automake macros for GNOME and GOME 2.0
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/devel/gnomecommon/pkg-comment b/devel/gnomecommon/pkg-comment
deleted file mode 100644
index 6dc7d88bd628..000000000000
--- a/devel/gnomecommon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Common automake macros for GNOME and GOME 2.0
diff --git a/devel/gnomecrash/Makefile b/devel/gnomecrash/Makefile
index 3619a710d050..027933ce9585 100644
--- a/devel/gnomecrash/Makefile
+++ b/devel/gnomecrash/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-crash/0.0
DISTNAME= gnome-crash-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A small coredump analysis tool for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/gnomecrash/pkg-comment b/devel/gnomecrash/pkg-comment
deleted file mode 100644
index 5aba8b1e5a60..000000000000
--- a/devel/gnomecrash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small coredump analysis tool for GNOME
diff --git a/devel/gnomedebug/Makefile b/devel/gnomedebug/Makefile
index 8cee4a8d326e..d25c4a9a466e 100644
--- a/devel/gnomedebug/Makefile
+++ b/devel/gnomedebug/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME:S/gnome/gnome-/}/0.1
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= A GNOME Debugging Framework (GDF)
LIB_DEPENDS= gdl.0:${PORTSDIR}/x11-toolkits/gdl
diff --git a/devel/gnomedebug/pkg-comment b/devel/gnomedebug/pkg-comment
deleted file mode 100644
index b94ea20caa52..000000000000
--- a/devel/gnomedebug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME Debugging Framework (GDF)
diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index 7f2af0cea73f..708c2dc48f4e 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-vfs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME Virtual File System
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2 \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
diff --git a/devel/gnomevfs2/pkg-comment b/devel/gnomevfs2/pkg-comment
deleted file mode 100644
index 818ef6f9549b..000000000000
--- a/devel/gnomevfs2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME Virtual File System
diff --git a/devel/gnu-libtool/Makefile b/devel/gnu-libtool/Makefile
index dcd67a7cef70..8ef7c4b7839b 100644
--- a/devel/gnu-libtool/Makefile
+++ b/devel/gnu-libtool/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
MAINTAINER= alane@FreeBSD.org
+COMMENT= Generic shared library support script
# This port has not been upgraded to 1.4 because it is used by about 30% of
# the ports collection, and more testing is needed. If someone can supply a
diff --git a/devel/gnu-libtool/pkg-comment b/devel/gnu-libtool/pkg-comment
deleted file mode 100644
index c64215ed2fdb..000000000000
--- a/devel/gnu-libtool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic shared library support script
diff --git a/devel/gob2/Makefile b/devel/gob2/Makefile
index 54cd11625ec9..9409d9bd514f 100644
--- a/devel/gob2/Makefile
+++ b/devel/gob2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A preprocessor for making GObjects with inline C
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/devel/gob2/pkg-comment b/devel/gob2/pkg-comment
deleted file mode 100644
index 5b0e93e788ca..000000000000
--- a/devel/gob2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A preprocessor for making GObjects with inline C
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 8232162bcdd3..a74e72243e8c 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.gtranslator.org/download/releases/${PORTVERSION}/ \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GNOME application for developing ".pot" files used with GNU Gettext
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/gtranslator/pkg-comment b/devel/gtranslator/pkg-comment
deleted file mode 100644
index 8ebfb2d83fd5..000000000000
--- a/devel/gtranslator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME application for developing ".pot" files used with GNU Gettext
diff --git a/devel/hp48cc/Makefile b/devel/hp48cc/Makefile
index 8a9263429ebb..fa388b65bbb0 100644
--- a/devel/hp48cc/Makefile
+++ b/devel/hp48cc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel lang
MASTER_SITES= http://www.sigala.it/sandro/files/
MAINTAINER= pat@FreeBSD.org
+COMMENT= C-like compiler that translates input code to the HP48 RPN language
USE_BISON= yes
GNU_CONFIGURE= yes
diff --git a/devel/hp48cc/pkg-comment b/devel/hp48cc/pkg-comment
deleted file mode 100644
index 1dc264fa8d64..000000000000
--- a/devel/hp48cc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C-like compiler that translates input code to the HP48 RPN language
diff --git a/devel/idlefork/Makefile b/devel/idlefork/Makefile
index 44de2f60cecf..2c698f324d89 100644
--- a/devel/idlefork/Makefile
+++ b/devel/idlefork/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An official experimental development fork of IDE for Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/devel/idlefork/pkg-comment b/devel/idlefork/pkg-comment
deleted file mode 100644
index 3e906d2ae21f..000000000000
--- a/devel/idlefork/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An official experimental development fork of IDE for Python
diff --git a/devel/imake-4/Makefile b/devel/imake-4/Makefile
index 3c650db988cb..ce6f9e55dde7 100644
--- a/devel/imake-4/Makefile
+++ b/devel/imake-4/Makefile
@@ -18,6 +18,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= Imake and other utilities from XFree86
PREFIX?= ${X11BASE}
USE_PERL5= YES
diff --git a/devel/imake-4/pkg-comment b/devel/imake-4/pkg-comment
deleted file mode 100644
index a7e321f33d62..000000000000
--- a/devel/imake-4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Imake and other utilities from XFree86
diff --git a/devel/imake/Makefile b/devel/imake/Makefile
index beb091ee45a9..f1b55c532098 100644
--- a/devel/imake/Makefile
+++ b/devel/imake/Makefile
@@ -16,6 +16,7 @@ DISTNAME= X336src-1
EXTRACT_SUFX= .tgz
MAINTAINER= max@FreeBSD.org
+COMMENT= Imake and other utilities from XFree86
MANUAL_PACKAGE_BUILD= installs/removes files also in the XFree86 port
diff --git a/devel/imake/pkg-comment b/devel/imake/pkg-comment
deleted file mode 100644
index a7e321f33d62..000000000000
--- a/devel/imake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Imake and other utilities from XFree86
diff --git a/devel/jakarta-ant/Makefile b/devel/jakarta-ant/Makefile
index d535a7a3e773..8c07ede9b5f5 100644
--- a/devel/jakarta-ant/Makefile
+++ b/devel/jakarta-ant/Makefile
@@ -17,6 +17,7 @@ DISTNAME= ${PORTNAME}-${ANT_VERSION}-bin
DIST_SUBDIR= jakarta
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java-based build tool, conceptually similar to make
RUN_DEPENDS= ${LOCALBASE}/share/java/classes/crimson.jar:${PORTSDIR}/textproc/crimson
diff --git a/devel/jakarta-ant/pkg-comment b/devel/jakarta-ant/pkg-comment
deleted file mode 100644
index c0c4a22757ea..000000000000
--- a/devel/jakarta-ant/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java-based build tool, conceptually similar to make
diff --git a/devel/kaptain/Makefile b/devel/kaptain/Makefile
index 6f00e3facb92..d91951fd929c 100644
--- a/devel/kaptain/Makefile
+++ b/devel/kaptain/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= alane@FreeBSD.org
+COMMENT= A tool for building/running QT GUIs for commmand line programs
USE_QT_VER= 3
GNU_CONFIGURE= yes
diff --git a/devel/kaptain/pkg-comment b/devel/kaptain/pkg-comment
deleted file mode 100644
index c6858440b542..000000000000
--- a/devel/kaptain/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for building/running QT GUIs for commmand line programs
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 4e67dade44a0..4cfcc403b4e3 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -14,6 +14,7 @@ USE_QT_VER= 3
USE_KDELIBS_VER=3
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= A graphical user interface around gdb using KDE
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBQTMT="-lqt-mt" \
diff --git a/devel/kdbg/pkg-comment b/devel/kdbg/pkg-comment
deleted file mode 100644
index a6ac9db699e3..000000000000
--- a/devel/kdbg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical user interface around gdb using KDE
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 05f7723ac85e..bd2eecae8e32 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= KDE Software Development Kit
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2
diff --git a/devel/kdesdk3/pkg-comment b/devel/kdesdk3/pkg-comment
deleted file mode 100644
index 50454734fdc5..000000000000
--- a/devel/kdesdk3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE Software Development Kit
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 05f7723ac85e..bd2eecae8e32 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= KDE Software Development Kit
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2
diff --git a/devel/kdesdk4/pkg-comment b/devel/kdesdk4/pkg-comment
deleted file mode 100644
index 50454734fdc5..000000000000
--- a/devel/kdesdk4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE Software Development Kit
diff --git a/devel/kdevelop/Makefile b/devel/kdevelop/Makefile
index a8f48f6beb53..0da17fd9f452 100644
--- a/devel/kdevelop/Makefile
+++ b/devel/kdevelop/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${KDE_DISTNAME}
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Powerful IDE for developing KDE/Qt-based apps
RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
.if defined(WITH_OPTIONAL_DEPENDS)
diff --git a/devel/kdevelop/pkg-comment b/devel/kdevelop/pkg-comment
deleted file mode 100644
index 52a3f145ae77..000000000000
--- a/devel/kdevelop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Powerful IDE for developing KDE/Qt-based apps
diff --git a/devel/kelp/Makefile b/devel/kelp/Makefile
index b3e05ab21fe8..1fa4a6972f60 100644
--- a/devel/kelp/Makefile
+++ b/devel/kelp/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ftp://ftp.cs.ucsd.edu/pub/scg/KeLP/
DISTNAME= KeLP1.3
MAINTAINER= keichii@freebsd.org
+COMMENT= KeLP is a software infrastructure for parallel computing
BUILD_DEPENDS= ${LOCALBASE}/mpich/bin/mpirun:${PORTSDIR}/net/mpich
diff --git a/devel/kelp/pkg-comment b/devel/kelp/pkg-comment
deleted file mode 100644
index 5dec8022ae52..000000000000
--- a/devel/kelp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KeLP is a software infrastructure for parallel computing
diff --git a/devel/kimwitu/Makefile b/devel/kimwitu/Makefile
index 54c68eaf8c8d..cef821bf0171 100644
--- a/devel/kimwitu/Makefile
+++ b/devel/kimwitu/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.cs.utwente.nl/pub/src/kimwitu/
DISTNAME= kc-distr.V${PORTVERSION:S/./_/g}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A tool for processing trees (i.e. terms)
WRKSRC= ${WRKDIR}/${DISTNAME}/src
ALL_TARGET=
diff --git a/devel/kimwitu/pkg-comment b/devel/kimwitu/pkg-comment
deleted file mode 100644
index 12e1aa304eb3..000000000000
--- a/devel/kimwitu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for processing trees (i.e. terms)
diff --git a/devel/lemon/Makefile b/devel/lemon/Makefile
index 5217053de762..893e6bde4614 100644
--- a/devel/lemon/Makefile
+++ b/devel/lemon/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.hwaci.com/sw/lemon/
DISTFILES= lemon.c lempar.c
MAINTAINER= mi@aldan.algebra.com
+COMMENT= An LALR(1) parser generator. Similar in function to yacc and bison
NO_WRKSUBDIR= YES
diff --git a/devel/lemon/pkg-comment b/devel/lemon/pkg-comment
deleted file mode 100644
index 0a3855e1139d..000000000000
--- a/devel/lemon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An LALR(1) parser generator. Similar in function to yacc and bison
diff --git a/devel/libIDL/Makefile b/devel/libIDL/Makefile
index 9a0495394e25..5d628640f504 100644
--- a/devel/libIDL/Makefile
+++ b/devel/libIDL/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.8
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A library for creating trees of CORBA Interface Definition Language files
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/devel/libIDL/pkg-comment b/devel/libIDL/pkg-comment
deleted file mode 100644
index e6b3875dc8fd..000000000000
--- a/devel/libIDL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for creating trees of CORBA Interface Definition Language files
diff --git a/devel/libPropList/Makefile b/devel/libPropList/Makefile
index 6e9aedefc28b..579fc043b9e0 100644
--- a/devel/libPropList/Makefile
+++ b/devel/libPropList/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= libs
DISTNAME= libPropList-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Property library for gnome and Window Maker
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libPropList/pkg-comment b/devel/libPropList/pkg-comment
deleted file mode 100644
index 6c962497aa0e..000000000000
--- a/devel/libPropList/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Property library for gnome and Window Maker
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 00794e595390..4e71ce0f0697 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A component and compound document system for GNOME2
LIB_DEPENDS= bonobo-activation.4:${PORTSDIR}/devel/bonobo-activation
diff --git a/devel/libbonobo/pkg-comment b/devel/libbonobo/pkg-comment
deleted file mode 100644
index 4b4fcf8bf396..000000000000
--- a/devel/libbonobo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A component and compound document system for GNOME2
diff --git a/devel/libcapsinetwork/Makefile b/devel/libcapsinetwork/Makefile
index 193efc23a3f2..d5247d1b7daa 100644
--- a/devel/libcapsinetwork/Makefile
+++ b/devel/libcapsinetwork/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Network library aimed at easy development of C++ server daemons
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libcapsinetwork/pkg-comment b/devel/libcapsinetwork/pkg-comment
deleted file mode 100644
index b36e56d5042b..000000000000
--- a/devel/libcapsinetwork/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network library aimed at easy development of C++ server daemons
diff --git a/devel/libcoro/Makefile b/devel/libcoro/Makefile
index c13771e5d35e..39a114cb475a 100644
--- a/devel/libcoro/Makefile
+++ b/devel/libcoro/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= kbyanc
DISTNAME= coro-${PORTVERSION}
MAINTAINER= kbyanc@posi.net
+COMMENT= C library that implements coroutines
ONLY_FOR_ARCHS= i386
diff --git a/devel/libcoro/pkg-comment b/devel/libcoro/pkg-comment
deleted file mode 100644
index 60c7adf6c06e..000000000000
--- a/devel/libcoro/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C library that implements coroutines
diff --git a/devel/libdlmalloc/Makefile b/devel/libdlmalloc/Makefile
index ebea7dcf351a..5cae9645e2eb 100644
--- a/devel/libdlmalloc/Makefile
+++ b/devel/libdlmalloc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://gee.cs.oswego.edu/pub/misc/ \
DISTFILES= malloc-2.6.5.c
MAINTAINER= roberto@FreeBSD.org
+COMMENT= Small, fast malloc library by Doug Lea
NO_WRKSUBDIR= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libdlmalloc/pkg-comment b/devel/libdlmalloc/pkg-comment
deleted file mode 100644
index 62c5f57e0f10..000000000000
--- a/devel/libdlmalloc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small, fast malloc library by Doug Lea
diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 803028d07645..73fbd1fce387 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://monkey.org/~provos/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Provides an API to execute callback functions on certain events
GNU_CONFIGURE= yes
USE_AUTOMAKE= yes
diff --git a/devel/libevent/pkg-comment b/devel/libevent/pkg-comment
deleted file mode 100644
index 01104bed7324..000000000000
--- a/devel/libevent/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provides an API to execute callback functions on certain events
diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile
index 494458708dae..cdfcc9bc6dd6 100644
--- a/devel/libglade/Makefile
+++ b/devel/libglade/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libglade/0.17
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME glade library
USE_X_PREFIX= yes
USE_PERL5= yes
diff --git a/devel/libglade/pkg-comment b/devel/libglade/pkg-comment
deleted file mode 100644
index 00fc39e87a45..000000000000
--- a/devel/libglade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME glade library
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index c606d5b68bcb..cb01d722efe5 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME glade library
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
diff --git a/devel/libglade2/pkg-comment b/devel/libglade2/pkg-comment
deleted file mode 100644
index 00fc39e87a45..000000000000
--- a/devel/libglade2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME glade library
diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 7b3941a708f6..a230cc57063e 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.7
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An extensible i/o abstraction for dealing with structured file formats
LIB_DEPENDS= bonobo-2.0:${PORTSDIR}/devel/libbonobo \
gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2
diff --git a/devel/libgsf/pkg-comment b/devel/libgsf/pkg-comment
deleted file mode 100644
index 959a72513e66..000000000000
--- a/devel/libgsf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible i/o abstraction for dealing with structured file formats
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index 39272bd6dcde..d3dc50b6939f 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME top library
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
diff --git a/devel/libgtop/pkg-comment b/devel/libgtop/pkg-comment
deleted file mode 100644
index a3c81ffda518..000000000000
--- a/devel/libgtop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME top library
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 0e0cc92b4a6b..ec0a8904da56 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= libgtop-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 top library
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/devel/libgtop2/pkg-comment b/devel/libgtop2/pkg-comment
deleted file mode 100644
index 65286cbcd17a..000000000000
--- a/devel/libgtop2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 top library
diff --git a/devel/libole2/Makefile b/devel/libole2/Makefile
index c62b8b155450..3e63e73b71ed 100644
--- a/devel/libole2/Makefile
+++ b/devel/libole2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libole2/0.2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Support library for OLE functions (MS-Excel) for gnumeric
USE_GMAKE= yes
USE_GNOMENG= yes
diff --git a/devel/libole2/pkg-comment b/devel/libole2/pkg-comment
deleted file mode 100644
index 0295c653fc2c..000000000000
--- a/devel/libole2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Support library for OLE functions (MS-Excel) for gnumeric
diff --git a/devel/libpdel/Makefile b/devel/libpdel/Makefile
index fbc3c6267535..971fbdf3217b 100644
--- a/devel/libpdel/Makefile
+++ b/devel/libpdel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= archie
MAINTAINER= archie@freebsd.org
+COMMENT= Packet Design multi-purpose C library for embedded applications
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/devel/libpdel/pkg-comment b/devel/libpdel/pkg-comment
deleted file mode 100644
index c554578b4c9f..000000000000
--- a/devel/libpdel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Packet Design multi-purpose C library for embedded applications
diff --git a/devel/libredblack/Makefile b/devel/libredblack/Makefile
index 52f82ff97b2f..617847704f2e 100644
--- a/devel/libredblack/Makefile
+++ b/devel/libredblack/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= smace@freebsd.org
+COMMENT= Library that provides the red-black balanced tree algorithm
MAN3= rbcloselist.3 rbdelete.3 rbdestroy.3 rbfind.3 rbinit.3 rblookup.3 \
rbopenlist.3 rbreadlist.3 rbsearch.3 rbwalk.3
diff --git a/devel/libredblack/pkg-comment b/devel/libredblack/pkg-comment
deleted file mode 100644
index 6ca952db405e..000000000000
--- a/devel/libredblack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library that provides the red-black balanced tree algorithm
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index 0dea6325e097..410cc5dc823f 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= libsigc \
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Callback Framework for C++
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/devel/libsigc++/pkg-comment b/devel/libsigc++/pkg-comment
deleted file mode 100644
index 5fea9c6fa201..000000000000
--- a/devel/libsigc++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Callback Framework for C++
diff --git a/devel/libsigc++12/Makefile b/devel/libsigc++12/Makefile
index a33dd125d969..fe7739a2613f 100644
--- a/devel/libsigc++12/Makefile
+++ b/devel/libsigc++12/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Callback Framework for C++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/devel/libsigc++12/pkg-comment b/devel/libsigc++12/pkg-comment
deleted file mode 100644
index 5fea9c6fa201..000000000000
--- a/devel/libsigc++12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Callback Framework for C++
diff --git a/devel/libsigc++20/Makefile b/devel/libsigc++20/Makefile
index a33dd125d969..fe7739a2613f 100644
--- a/devel/libsigc++20/Makefile
+++ b/devel/libsigc++20/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Callback Framework for C++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/devel/libsigc++20/pkg-comment b/devel/libsigc++20/pkg-comment
deleted file mode 100644
index 5fea9c6fa201..000000000000
--- a/devel/libsigc++20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Callback Framework for C++
diff --git a/devel/libsoup/Makefile b/devel/libsoup/Makefile
index b7e914cfb7a6..3651bb0ff911 100644
--- a/devel/libsoup/Makefile
+++ b/devel/libsoup/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A SOAP (Simple Object Access Protocol) implementation in C
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
diff --git a/devel/libsoup/pkg-comment b/devel/libsoup/pkg-comment
deleted file mode 100644
index 0179e22c405c..000000000000
--- a/devel/libsoup/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A SOAP (Simple Object Access Protocol) implementation in C
diff --git a/devel/libsoup22/Makefile b/devel/libsoup22/Makefile
index b7e914cfb7a6..3651bb0ff911 100644
--- a/devel/libsoup22/Makefile
+++ b/devel/libsoup22/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A SOAP (Simple Object Access Protocol) implementation in C
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
diff --git a/devel/libsoup22/pkg-comment b/devel/libsoup22/pkg-comment
deleted file mode 100644
index 0179e22c405c..000000000000
--- a/devel/libsoup22/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A SOAP (Simple Object Access Protocol) implementation in C
diff --git a/devel/libstocks/Makefile b/devel/libstocks/Makefile
index c44d2057547f..8dd6f0f7a05d 100644
--- a/devel/libstocks/Makefile
+++ b/devel/libstocks/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A C library which can be used to fetch stocks quotes
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
diff --git a/devel/libstocks/pkg-comment b/devel/libstocks/pkg-comment
deleted file mode 100644
index c8421758ba49..000000000000
--- a/devel/libstocks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C library which can be used to fetch stocks quotes
diff --git a/devel/libtar/Makefile b/devel/libtar/Makefile
index baa92930d4e5..a0f9a503db0b 100644
--- a/devel/libtar/Makefile
+++ b/devel/libtar/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= ftp://ftp-dev.cso.uiuc.edu/pub/libtar/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A library for manipulating POSIX and GNU tar files
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/libtar/pkg-comment b/devel/libtar/pkg-comment
deleted file mode 100644
index 0aaba00969cb..000000000000
--- a/devel/libtar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for manipulating POSIX and GNU tar files
diff --git a/devel/libtool/Makefile b/devel/libtool/Makefile
index dcd67a7cef70..8ef7c4b7839b 100644
--- a/devel/libtool/Makefile
+++ b/devel/libtool/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
MAINTAINER= alane@FreeBSD.org
+COMMENT= Generic shared library support script
# This port has not been upgraded to 1.4 because it is used by about 30% of
# the ports collection, and more testing is needed. If someone can supply a
diff --git a/devel/libtool/pkg-comment b/devel/libtool/pkg-comment
deleted file mode 100644
index c64215ed2fdb..000000000000
--- a/devel/libtool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic shared library support script
diff --git a/devel/libtool13/Makefile b/devel/libtool13/Makefile
index dcd67a7cef70..8ef7c4b7839b 100644
--- a/devel/libtool13/Makefile
+++ b/devel/libtool13/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
MAINTAINER= alane@FreeBSD.org
+COMMENT= Generic shared library support script
# This port has not been upgraded to 1.4 because it is used by about 30% of
# the ports collection, and more testing is needed. If someone can supply a
diff --git a/devel/libtool13/pkg-comment b/devel/libtool13/pkg-comment
deleted file mode 100644
index c64215ed2fdb..000000000000
--- a/devel/libtool13/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic shared library support script
diff --git a/devel/libtool14/Makefile b/devel/libtool14/Makefile
index dcd67a7cef70..8ef7c4b7839b 100644
--- a/devel/libtool14/Makefile
+++ b/devel/libtool14/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
MAINTAINER= alane@FreeBSD.org
+COMMENT= Generic shared library support script
# This port has not been upgraded to 1.4 because it is used by about 30% of
# the ports collection, and more testing is needed. If someone can supply a
diff --git a/devel/libtool14/pkg-comment b/devel/libtool14/pkg-comment
deleted file mode 100644
index c64215ed2fdb..000000000000
--- a/devel/libtool14/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic shared library support script
diff --git a/devel/libtool15/Makefile b/devel/libtool15/Makefile
index dcd67a7cef70..8ef7c4b7839b 100644
--- a/devel/libtool15/Makefile
+++ b/devel/libtool15/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= libtool
MAINTAINER= alane@FreeBSD.org
+COMMENT= Generic shared library support script
# This port has not been upgraded to 1.4 because it is used by about 30% of
# the ports collection, and more testing is needed. If someone can supply a
diff --git a/devel/libtool15/pkg-comment b/devel/libtool15/pkg-comment
deleted file mode 100644
index c64215ed2fdb..000000000000
--- a/devel/libtool15/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic shared library support script
diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 6729b90844db..a61cf6643a3f 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.gnome
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A library for manipulating Unicode characters and strings
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/devel/libunicode/pkg-comment b/devel/libunicode/pkg-comment
deleted file mode 100644
index bc28bfad96d5..000000000000
--- a/devel/libunicode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for manipulating Unicode characters and strings
diff --git a/devel/lincvs/Makefile b/devel/lincvs/Makefile
index da268c469bbd..508ec2cdfc8d 100644
--- a/devel/lincvs/Makefile
+++ b/devel/lincvs/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-0-generic-src
EXTRACT_SUFX= .tgz
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Graphical CVS front-end using QT2
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/lincvs/pkg-comment b/devel/lincvs/pkg-comment
deleted file mode 100644
index cb1187788f97..000000000000
--- a/devel/lincvs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical CVS front-end using QT2
diff --git a/devel/linux-runrev/Makefile b/devel/linux-runrev/Makefile
index aaaf15562a5d..a7197f3e0167 100644
--- a/devel/linux-runrev/Makefile
+++ b/devel/linux-runrev/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= blackend@FreeBSD.org
+COMMENT= Revolution is a rapid application development environment
RUN_DEPENDS= xanim:${PORTSDIR}/graphics/xanim
diff --git a/devel/linux-runrev/pkg-comment b/devel/linux-runrev/pkg-comment
deleted file mode 100644
index f34b2bdd4ff3..000000000000
--- a/devel/linux-runrev/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Revolution is a rapid application development environment
diff --git a/devel/linux_kdump/Makefile b/devel/linux_kdump/Makefile
index 06768cf823ff..6ea54a67334b 100644
--- a/devel/linux_kdump/Makefile
+++ b/devel/linux_kdump/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= marcel
MAINTAINER= marcel@FreeBSD.org
+COMMENT= Linux-compatability ktrace.out processor
BUILD_DEPENDS= /compat/linux/usr/bin/gcc:${PORTSDIR}/devel/linux_devtools
diff --git a/devel/linux_kdump/pkg-comment b/devel/linux_kdump/pkg-comment
deleted file mode 100644
index c50926dbcdde..000000000000
--- a/devel/linux_kdump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux-compatability ktrace.out processor
diff --git a/devel/linuxthreads/Makefile b/devel/linuxthreads/Makefile
index 757132aa2403..72a50bf863c7 100644
--- a/devel/linuxthreads/Makefile
+++ b/devel/linuxthreads/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= glibc
DISTNAME= glibc-linuxthreads-${PORTVERSION}
MAINTAINER= tegge@freebsd.org
+COMMENT= POSIX pthreads implementation using rfork to generate kernel threads
.include <bsd.port.pre.mk>
diff --git a/devel/linuxthreads/pkg-comment b/devel/linuxthreads/pkg-comment
deleted file mode 100644
index c9529eaa691e..000000000000
--- a/devel/linuxthreads/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POSIX pthreads implementation using rfork to generate kernel threads
diff --git a/devel/makeplus/Makefile b/devel/makeplus/Makefile
index 889bc9c4bd5d..2d01897650ab 100644
--- a/devel/makeplus/Makefile
+++ b/devel/makeplus/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.annexia.org/freeware/${PORTNAME}/
MAINTAINER= alane@FreeBSD.org
+COMMENT= A set of GNU Make rules for building packages with gmake
USE_GMAKE= yes
PREFIX?= ${LOCALBASE}
diff --git a/devel/makeplus/pkg-comment b/devel/makeplus/pkg-comment
deleted file mode 100644
index 87ccfed66d31..000000000000
--- a/devel/makeplus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of GNU Make rules for building packages with gmake
diff --git a/devel/memcheck/Makefile b/devel/memcheck/Makefile
index fe5ad805f518..f98849ecc62b 100644
--- a/devel/memcheck/Makefile
+++ b/devel/memcheck/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.sound.net/~hald/projects/memcheck/
MAINTAINER= demon@FreeBSD.org
+COMMENT= Memory Allocation Checker
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/devel/memcheck/pkg-comment b/devel/memcheck/pkg-comment
deleted file mode 100644
index 02e928373404..000000000000
--- a/devel/memcheck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Memory Allocation Checker
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 93177ff0e570..8c7df88b0951 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.mico.org/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A CORBA 2.0 implementation which goal is freely available
WRKSRC= ${WRKDIR}/mico
INSTALLS_SHLIB= yes
diff --git a/devel/mico/pkg-comment b/devel/mico/pkg-comment
deleted file mode 100644
index 0c6dd3d4d2a7..000000000000
--- a/devel/mico/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A CORBA 2.0 implementation which goal is freely available
diff --git a/devel/mime/Makefile b/devel/mime/Makefile
index fb85afd55bd7..8dae8813382c 100644
--- a/devel/mime/Makefile
+++ b/devel/mime/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://resnet.uoregon.edu/~gurney_j/jmpc/dist/
MAINTAINER= jmg@FreeBSD.org
+COMMENT= C library to parse mime data
GNU_CONFIGURE= yes
diff --git a/devel/mime/pkg-comment b/devel/mime/pkg-comment
deleted file mode 100644
index 5cfb289ff7bf..000000000000
--- a/devel/mime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C library to parse mime data
diff --git a/devel/mkmf/Makefile b/devel/mkmf/Makefile
index 2cf9ae97d0a1..a11daca901d6 100644
--- a/devel/mkmf/Makefile
+++ b/devel/mkmf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.uni-koeln.de/util/
DISTNAME= ${PORTNAME}
MAINTAINER= se@FreeBSD.org
+COMMENT= Creates program and library makefiles for the make(1) command
MAN1= mkmf.1
MANCOMPRESSED= maybe
diff --git a/devel/mkmf/pkg-comment b/devel/mkmf/pkg-comment
deleted file mode 100644
index 7bc092ee3a00..000000000000
--- a/devel/mkmf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Creates program and library makefiles for the make(1) command
diff --git a/devel/moonshine/Makefile b/devel/moonshine/Makefile
index cc4f954bf776..b7444b69e372 100644
--- a/devel/moonshine/Makefile
+++ b/devel/moonshine/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.suite3220.com/pub/Moonshine/1.1/src/
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A customizable IDE that supports a wide variety of languages
USE_QT_VER= 2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/moonshine/pkg-comment b/devel/moonshine/pkg-comment
deleted file mode 100644
index c14b53729db9..000000000000
--- a/devel/moonshine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A customizable IDE that supports a wide variety of languages
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 55c642d81244..d251bba19098 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= nasm
MAINTAINER= murray@FreeBSD.org
+COMMENT= General-purpose multi-platform x86 assembler
USE_BZ2= yes
GNU_CONFIGURE= yes
diff --git a/devel/nasm/pkg-comment b/devel/nasm/pkg-comment
deleted file mode 100644
index 9e7694f67e1a..000000000000
--- a/devel/nasm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-General-purpose multi-platform x86 assembler
diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 3d8e808bc373..a50eda8c0511 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= tg
MAINTAINER= tg@FreeBSD.org
+COMMENT= A simple, extensible literate-programming tool
BUILD_DEPENDS= icont:${PORTSDIR}/lang/icon
RUN_DEPENDS= iconx:${PORTSDIR}/lang/icon
diff --git a/devel/noweb/pkg-comment b/devel/noweb/pkg-comment
deleted file mode 100644
index ce819a0035dd..000000000000
--- a/devel/noweb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple, extensible literate-programming tool
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index 1110435b9cdb..78dbfd592cb8 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= nspr/releases/v${PORTVERSION}/src
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A platform-neutral API for system level and libc like functions
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build
diff --git a/devel/nspr/pkg-comment b/devel/nspr/pkg-comment
deleted file mode 100644
index dcd7e8191984..000000000000
--- a/devel/nspr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A platform-neutral API for system level and libc like functions
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 2669719b6c97..50892f50790b 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/oaf/0.6
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Object Activation Framework for GNOME
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
diff --git a/devel/oaf/pkg-comment b/devel/oaf/pkg-comment
deleted file mode 100644
index 963a7239799a..000000000000
--- a/devel/oaf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Object Activation Framework for GNOME
diff --git a/devel/ocamlweb/Makefile b/devel/ocamlweb/Makefile
index 1bace021db26..35e237ded8a2 100644
--- a/devel/ocamlweb/Makefile
+++ b/devel/ocamlweb/Makefile
@@ -13,6 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DOCFILES}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jkoshy@FreeBSD.ORG
+COMMENT= A literate programming tool for Objective Caml
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/devel/ocamlweb/pkg-comment b/devel/ocamlweb/pkg-comment
deleted file mode 100644
index 7543f47ffd74..000000000000
--- a/devel/ocamlweb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A literate programming tool for Objective Caml
diff --git a/devel/omniORB/Makefile b/devel/omniORB/Makefile
index 95096518f994..1acaa83fb70d 100644
--- a/devel/omniORB/Makefile
+++ b/devel/omniORB/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME:L}
MAINTAINER= ejc@FreeBSD.org
+COMMENT= A robust high performance CORBA ORB for C++ and Python
CONFIGURE_WRKSRC= ${WRKSRC}/build
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
diff --git a/devel/omniORB/pkg-comment b/devel/omniORB/pkg-comment
deleted file mode 100644
index f405edaf64f8..000000000000
--- a/devel/omniORB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A robust high performance CORBA ORB for C++ and Python
diff --git a/devel/ossp-al/Makefile b/devel/ossp-al/Makefile
index 9045fe6b5c89..6057ec7a3b02 100644
--- a/devel/ossp-al/Makefile
+++ b/devel/ossp-al/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/al/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= Defines an abstract type of buffer that can move data without copying
LIB_DEPENDS= ex.10:${.CURDIR}/../../devel/ossp-ex
diff --git a/devel/ossp-al/pkg-comment b/devel/ossp-al/pkg-comment
deleted file mode 100644
index c89090a9a34c..000000000000
--- a/devel/ossp-al/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Defines an abstract type of buffer that can move data without copying
diff --git a/devel/ossp-cfg/Makefile b/devel/ossp-cfg/Makefile
index bc2f1577f287..36a1c1dd7380 100644
--- a/devel/ossp-cfg/Makefile
+++ b/devel/ossp-cfg/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/cfg/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= A library for parsing arbitrary C/C++-style configuration files
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/devel/ossp-cfg/pkg-comment b/devel/ossp-cfg/pkg-comment
deleted file mode 100644
index 676bb9ab341e..000000000000
--- a/devel/ossp-cfg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for parsing arbitrary C/C++-style configuration files
diff --git a/devel/ossp-ex/Makefile b/devel/ossp-ex/Makefile
index a3179c009e86..3c0fac3fd40d 100644
--- a/devel/ossp-ex/Makefile
+++ b/devel/ossp-ex/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/ex/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= OSSP ex is a small exception handling library for use in C
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/ossp-ex/pkg-comment b/devel/ossp-ex/pkg-comment
deleted file mode 100644
index f0a03123ae1d..000000000000
--- a/devel/ossp-ex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OSSP ex is a small exception handling library for use in C
diff --git a/devel/ossp-l2/Makefile b/devel/ossp-l2/Makefile
index 3c68f9ca5640..255aea6ad08b 100644
--- a/devel/ossp-l2/Makefile
+++ b/devel/ossp-l2/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/l2/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= A C library for a flexible and sophisticated Unix logging facility
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/ossp-l2/pkg-comment b/devel/ossp-l2/pkg-comment
deleted file mode 100644
index c8a4f9e13799..000000000000
--- a/devel/ossp-l2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C library for a flexible and sophisticated Unix logging facility
diff --git a/devel/ossp-val/Makefile b/devel/ossp-val/Makefile
index 47ac82d011c0..01b4409e2ad1 100644
--- a/devel/ossp-val/Makefile
+++ b/devel/ossp-val/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/val/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= OSSP val is a flexible name to value mapping library for C variables
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/ossp-val/pkg-comment b/devel/ossp-val/pkg-comment
deleted file mode 100644
index a63757123dd4..000000000000
--- a/devel/ossp-val/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OSSP val is a flexible name to value mapping library for C variables
diff --git a/devel/ossp-var/Makefile b/devel/ossp-var/Makefile
index 9ed85c00a94f..4c95356884ad 100644
--- a/devel/ossp-var/Makefile
+++ b/devel/ossp-var/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/var/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= A flexible, full-featured and fast variable expansion library
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/devel/ossp-var/pkg-comment b/devel/ossp-var/pkg-comment
deleted file mode 100644
index 0c93a23d1411..000000000000
--- a/devel/ossp-var/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A flexible, full-featured and fast variable expansion library
diff --git a/devel/p5-Algorithm-Diff/Makefile b/devel/p5-Algorithm-Diff/Makefile
index 9690bd4b96dd..61fe2221a9ff 100644
--- a/devel/p5-Algorithm-Diff/Makefile
+++ b/devel/p5-Algorithm-Diff/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Algorithm
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl interface to compute differences between two objects
PERL_CONFIGURE= yes
diff --git a/devel/p5-Algorithm-Diff/pkg-comment b/devel/p5-Algorithm-Diff/pkg-comment
deleted file mode 100644
index c62041cdbe14..000000000000
--- a/devel/p5-Algorithm-Diff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to compute differences between two objects
diff --git a/devel/p5-Algorithm-Permute/Makefile b/devel/p5-Algorithm-Permute/Makefile
index f349340f6d9e..5c98da9d9d43 100644
--- a/devel/p5-Algorithm-Permute/Makefile
+++ b/devel/p5-Algorithm-Permute/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Algorithm
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl interface to handy and fast permutation
PERL_CONFIGURE= yes
diff --git a/devel/p5-Algorithm-Permute/pkg-comment b/devel/p5-Algorithm-Permute/pkg-comment
deleted file mode 100644
index 904bf47dda53..000000000000
--- a/devel/p5-Algorithm-Permute/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to handy and fast permutation
diff --git a/devel/p5-AtExit/Makefile b/devel/p5-AtExit/Makefile
index 23ced8ab9475..07cabe2e4896 100644
--- a/devel/p5-AtExit/Makefile
+++ b/devel/p5-AtExit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ../../authors/id/B/BR/BRADAPP
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= AtExit - Perform exit processing for a program or object
PERL_CONFIGURE= yes
CONFIGURE_ARGS= INSTALLDIRS=site
diff --git a/devel/p5-AtExit/pkg-comment b/devel/p5-AtExit/pkg-comment
deleted file mode 100644
index f8756b90b071..000000000000
--- a/devel/p5-AtExit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-AtExit - Perform exit processing for a program or object
diff --git a/devel/p5-BSD-stat/Makefile b/devel/p5-BSD-stat/Makefile
index 8026662fb3f4..492514cdd8f7 100644
--- a/devel/p5-BSD-stat/Makefile
+++ b/devel/p5-BSD-stat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= BSD
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= A stat() with BSD 4.4 extentions
PERL_CONFIGURE= yes
diff --git a/devel/p5-BSD-stat/pkg-comment b/devel/p5-BSD-stat/pkg-comment
deleted file mode 100644
index 7fe6920f47da..000000000000
--- a/devel/p5-BSD-stat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A stat() with BSD 4.4 extentions
diff --git a/devel/p5-Cache-Cache/Makefile b/devel/p5-Cache-Cache/Makefile
index 65dd0547bd4c..dab0288dccf8 100644
--- a/devel/p5-Cache-Cache/Makefile
+++ b/devel/p5-Cache-Cache/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Cache
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Cache::Cache -- Perl Cache interface
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/IPC/ShareLite.pm:${PORTSDIR}/devel/p5-IPC-ShareLite \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Error.pm:${PORTSDIR}/lang/p5-Error \
diff --git a/devel/p5-Cache-Cache/pkg-comment b/devel/p5-Cache-Cache/pkg-comment
deleted file mode 100644
index 91b1c577e4b2..000000000000
--- a/devel/p5-Cache-Cache/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cache::Cache -- Perl Cache interface
diff --git a/devel/p5-Carp-Assert/Makefile b/devel/p5-Carp-Assert/Makefile
index 718c058bcfd3..ff9c6aaafc51 100644
--- a/devel/p5-Carp-Assert/Makefile
+++ b/devel/p5-Carp-Assert/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Carp
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Executable comments like the ANSI C library assert.h
PERL_CONFIGURE= yes
diff --git a/devel/p5-Carp-Assert/pkg-comment b/devel/p5-Carp-Assert/pkg-comment
deleted file mode 100644
index cb1f854f6d8d..000000000000
--- a/devel/p5-Carp-Assert/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Executable comments like the ANSI C library assert.h
diff --git a/devel/p5-Class-Accessor/Makefile b/devel/p5-Class-Accessor/Makefile
index 155bb18288ec..2985c39f478b 100644
--- a/devel/p5-Class-Accessor/Makefile
+++ b/devel/p5-Class-Accessor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Automated accessor generation
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Accessor/pkg-comment b/devel/p5-Class-Accessor/pkg-comment
deleted file mode 100644
index 7ef3f8662f3a..000000000000
--- a/devel/p5-Class-Accessor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automated accessor generation
diff --git a/devel/p5-Class-ArrayObjects/Makefile b/devel/p5-Class-ArrayObjects/Makefile
index 4eadc860fad9..40033fccb139 100644
--- a/devel/p5-Class-ArrayObjects/Makefile
+++ b/devel/p5-Class-ArrayObjects/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Utility class for array based objects
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-ArrayObjects/pkg-comment b/devel/p5-Class-ArrayObjects/pkg-comment
deleted file mode 100644
index d8f87e001e1a..000000000000
--- a/devel/p5-Class-ArrayObjects/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility class for array based objects
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index bd541b836b56..26cdbe247369 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Defer loading of one or more classes
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Autouse/pkg-comment b/devel/p5-Class-Autouse/pkg-comment
deleted file mode 100644
index c7dd4011e1a6..000000000000
--- a/devel/p5-Class-Autouse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Defer loading of one or more classes
diff --git a/devel/p5-Class-BlackHole/Makefile b/devel/p5-Class-BlackHole/Makefile
index 7cfb337e0a55..5b02c89fa9ff 100644
--- a/devel/p5-Class-BlackHole/Makefile
+++ b/devel/p5-Class-BlackHole/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Base class to treat unhandled method calls as no-ops
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-BlackHole/pkg-comment b/devel/p5-Class-BlackHole/pkg-comment
deleted file mode 100644
index 97dc6264f143..000000000000
--- a/devel/p5-Class-BlackHole/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Base class to treat unhandled method calls as no-ops
diff --git a/devel/p5-Class-Contract/Makefile b/devel/p5-Class-Contract/Makefile
index 7d04d8ce83a4..c82b7f1dc6c8 100644
--- a/devel/p5-Class-Contract/Makefile
+++ b/devel/p5-Class-Contract/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Design-by-Contract OO in Perl
PERL_CONFIGURE= yes
PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}"
diff --git a/devel/p5-Class-Contract/pkg-comment b/devel/p5-Class-Contract/pkg-comment
deleted file mode 100644
index a4e70c336b64..000000000000
--- a/devel/p5-Class-Contract/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Design-by-Contract OO in Perl
diff --git a/devel/p5-Class-Data-Inheritable/Makefile b/devel/p5-Class-Data-Inheritable/Makefile
index 05efe5599cec..d2bc3973c59a 100644
--- a/devel/p5-Class-Data-Inheritable/Makefile
+++ b/devel/p5-Class-Data-Inheritable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Inheritable, overridable class data
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/base.pm:${PORTSDIR}/devel/p5-Class-Fields
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Data-Inheritable/pkg-comment b/devel/p5-Class-Data-Inheritable/pkg-comment
deleted file mode 100644
index 828f0a776b7d..000000000000
--- a/devel/p5-Class-Data-Inheritable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Inheritable, overridable class data
diff --git a/devel/p5-Class-Date/Makefile b/devel/p5-Class-Date/Makefile
index b837384e5904..c4448d4b39cc 100644
--- a/devel/p5-Class-Date/Makefile
+++ b/devel/p5-Class-Date/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A Perl class for easy date and time manipulation
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Date/pkg-comment b/devel/p5-Class-Date/pkg-comment
deleted file mode 100644
index 773c64492a26..000000000000
--- a/devel/p5-Class-Date/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl class for easy date and time manipulation
diff --git a/devel/p5-Class-Default/Makefile b/devel/p5-Class-Default/Makefile
index 79c4e41dcf12..3980c1685d64 100644
--- a/devel/p5-Class-Default/Makefile
+++ b/devel/p5-Class-Default/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Static calls apply to a default instantiation
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/Inspector.pm:${PORTSDIR}/devel/p5-Class-Inspector
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Default/pkg-comment b/devel/p5-Class-Default/pkg-comment
deleted file mode 100644
index 8a5feb175120..000000000000
--- a/devel/p5-Class-Default/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Static calls apply to a default instantiation
diff --git a/devel/p5-Class-Delegation/Makefile b/devel/p5-Class-Delegation/Makefile
index f0c1921d8c7d..23d4539a51f0 100644
--- a/devel/p5-Class-Delegation/Makefile
+++ b/devel/p5-Class-Delegation/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Object-oriented delegation
PERL_CONFIGURE= yes
PLIST_SUB+= EXAMPLESDIR="share/examples/${PORTNAME}"
diff --git a/devel/p5-Class-Delegation/pkg-comment b/devel/p5-Class-Delegation/pkg-comment
deleted file mode 100644
index 5811749b39fc..000000000000
--- a/devel/p5-Class-Delegation/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Object-oriented delegation
diff --git a/devel/p5-Class-Factory-Util/Makefile b/devel/p5-Class-Factory-Util/Makefile
index cb53eb06db5e..b38451bef3e3 100644
--- a/devel/p5-Class-Factory-Util/Makefile
+++ b/devel/p5-Class-Factory-Util/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Utility functions for (factory) classes
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Factory-Util/pkg-comment b/devel/p5-Class-Factory-Util/pkg-comment
deleted file mode 100644
index 8cbdff3f04a0..000000000000
--- a/devel/p5-Class-Factory-Util/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility functions for (factory) classes
diff --git a/devel/p5-Class-Factory/Makefile b/devel/p5-Class-Factory/Makefile
index a49f952eb9e8..9212736b4a41 100644
--- a/devel/p5-Class-Factory/Makefile
+++ b/devel/p5-Class-Factory/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Base class for dynamic factory classes
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Factory/pkg-comment b/devel/p5-Class-Factory/pkg-comment
deleted file mode 100644
index a66b51dffc33..000000000000
--- a/devel/p5-Class-Factory/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Base class for dynamic factory classes
diff --git a/devel/p5-Class-ISA/Makefile b/devel/p5-Class-ISA/Makefile
index 19ed4f55e237..56e6f0760279 100644
--- a/devel/p5-Class-ISA/Makefile
+++ b/devel/p5-Class-ISA/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Report the search path for a class's ISA tree
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-ISA/pkg-comment b/devel/p5-Class-ISA/pkg-comment
deleted file mode 100644
index 9edad3384ea0..000000000000
--- a/devel/p5-Class-ISA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Report the search path for a class's ISA tree
diff --git a/devel/p5-Class-Inner/Makefile b/devel/p5-Class-Inner/Makefile
index 9e10f88a66b1..424c100982b6 100644
--- a/devel/p5-Class-Inner/Makefile
+++ b/devel/p5-Class-Inner/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= A perlish implementation of Java like inner classes
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Inner/pkg-comment b/devel/p5-Class-Inner/pkg-comment
deleted file mode 100644
index a82872377444..000000000000
--- a/devel/p5-Class-Inner/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perlish implementation of Java like inner classes
diff --git a/devel/p5-Class-Inspector/Makefile b/devel/p5-Class-Inspector/Makefile
index c242cf01b2dd..45c7bbfcff40 100644
--- a/devel/p5-Class-Inspector/Makefile
+++ b/devel/p5-Class-Inspector/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Provides information about classes
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Class-Inspector/pkg-comment b/devel/p5-Class-Inspector/pkg-comment
deleted file mode 100644
index e132e2d54c96..000000000000
--- a/devel/p5-Class-Inspector/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provides information about classes
diff --git a/devel/p5-Class-Loader/Makefile b/devel/p5-Class-Loader/Makefile
index d921da8237fa..a6f38f0086fe 100644
--- a/devel/p5-Class-Loader/Makefile
+++ b/devel/p5-Class-Loader/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Load modules and create objects on demand
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-Loader/pkg-comment b/devel/p5-Class-Loader/pkg-comment
deleted file mode 100644
index 27a500c20868..000000000000
--- a/devel/p5-Class-Loader/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Load modules and create objects on demand
diff --git a/devel/p5-Class-Tangram/Makefile b/devel/p5-Class-Tangram/Makefile
index a24175d2c638..a58a8ddf2c87 100644
--- a/devel/p5-Class-Tangram/Makefile
+++ b/devel/p5-Class-Tangram/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Create constructors, accessor, update methods for objects from Tangram
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Set/Object.pm:${PORTSDIR}/devel/p5-Set-Object \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip \
diff --git a/devel/p5-Class-Tangram/pkg-comment b/devel/p5-Class-Tangram/pkg-comment
deleted file mode 100644
index 6abc8ad863d8..000000000000
--- a/devel/p5-Class-Tangram/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create constructors, accessor, update methods for objects from Tangram
diff --git a/devel/p5-Class-Tom/Makefile b/devel/p5-Class-Tom/Makefile
index f3ac9692df29..383f658c6ea1 100644
--- a/devel/p5-Class-Tom/Makefile
+++ b/devel/p5-Class-Tom/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A perl module to transport objects from one system to another
BUILD_DEPENDS= ${SITE_PERL}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
diff --git a/devel/p5-Class-Tom/pkg-comment b/devel/p5-Class-Tom/pkg-comment
deleted file mode 100644
index 0874063a02b8..000000000000
--- a/devel/p5-Class-Tom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module to transport objects from one system to another
diff --git a/devel/p5-Class-Trigger/Makefile b/devel/p5-Class-Trigger/Makefile
index adf26e2dd489..b04fd082b021 100644
--- a/devel/p5-Class-Trigger/Makefile
+++ b/devel/p5-Class-Trigger/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Mixin to add / call inheritable triggers
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/Data/Inheritable.pm:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/Scalar.pm:${PORTSDIR}/devel/p5-IO-stringy
diff --git a/devel/p5-Class-Trigger/pkg-comment b/devel/p5-Class-Trigger/pkg-comment
deleted file mode 100644
index 790e630a7a41..000000000000
--- a/devel/p5-Class-Trigger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mixin to add / call inheritable triggers
diff --git a/devel/p5-Class-WhiteHole/Makefile b/devel/p5-Class-WhiteHole/Makefile
index 5902d0146934..35412f308d94 100644
--- a/devel/p5-Class-WhiteHole/Makefile
+++ b/devel/p5-Class-WhiteHole/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Class
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Base class to treat unhandled method calls as errors
PERL_CONFIGURE= yes
diff --git a/devel/p5-Class-WhiteHole/pkg-comment b/devel/p5-Class-WhiteHole/pkg-comment
deleted file mode 100644
index add5501b1819..000000000000
--- a/devel/p5-Class-WhiteHole/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Base class to treat unhandled method calls as errors
diff --git a/devel/p5-Clone/Makefile b/devel/p5-Clone/Makefile
index d9d91a51fa39..880310b29793 100644
--- a/devel/p5-Clone/Makefile
+++ b/devel/p5-Clone/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Clone
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Clone - recursively copy Perl datatypes
PERL_CONFIGURE= yes
diff --git a/devel/p5-Clone/pkg-comment b/devel/p5-Clone/pkg-comment
deleted file mode 100644
index 29920da2c9e9..000000000000
--- a/devel/p5-Clone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone - recursively copy Perl datatypes
diff --git a/devel/p5-Config-General/Makefile b/devel/p5-Config-General/Makefile
index 88b13070822f..9343ab656a02 100644
--- a/devel/p5-Config-General/Makefile
+++ b/devel/p5-Config-General/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Config
PKGNAMEPREFIX= p5-
MAINTAINER= sheldonh@FreeBSD.org
+COMMENT= Perl5 module for handling Apache-style configuration files
PERL_CONFIGURE= YES
diff --git a/devel/p5-Config-General/pkg-comment b/devel/p5-Config-General/pkg-comment
deleted file mode 100644
index 8c8719577a5f..000000000000
--- a/devel/p5-Config-General/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for handling Apache-style configuration files
diff --git a/devel/p5-Config-Setting/Makefile b/devel/p5-Config-Setting/Makefile
index 626e948d39ce..50320a590058 100644
--- a/devel/p5-Config-Setting/Makefile
+++ b/devel/p5-Config-Setting/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.myrddin.demon.co.uk/dist/
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A class that provides an easy interface to use config files
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/devel/p5-Config-Setting/pkg-comment b/devel/p5-Config-Setting/pkg-comment
deleted file mode 100644
index 85f612c84f83..000000000000
--- a/devel/p5-Config-Setting/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A class that provides an easy interface to use config files
diff --git a/devel/p5-Coro/Makefile b/devel/p5-Coro/Makefile
index 10b738147929..6f2e39a86c54 100644
--- a/devel/p5-Coro/Makefile
+++ b/devel/p5-Coro/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Coro
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Coro - coroutine process abstraction for perl
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Event.pm:${PORTSDIR}/devel/p5-Event \
${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils
diff --git a/devel/p5-Coro/pkg-comment b/devel/p5-Coro/pkg-comment
deleted file mode 100644
index 81be5ab1c340..000000000000
--- a/devel/p5-Coro/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Coro - coroutine process abstraction for perl
diff --git a/devel/p5-Curses-Widgets/Makefile b/devel/p5-Curses-Widgets/Makefile
index 84aac60216c7..eb54ab943d6f 100644
--- a/devel/p5-Curses-Widgets/Makefile
+++ b/devel/p5-Curses-Widgets/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= CursesWidgets-${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Curses-based widgets and functions
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Curses-Widgets/pkg-comment b/devel/p5-Curses-Widgets/pkg-comment
deleted file mode 100644
index 83283e7112a3..000000000000
--- a/devel/p5-Curses-Widgets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Curses-based widgets and functions
diff --git a/devel/p5-Data-Compare/Makefile b/devel/p5-Data-Compare/Makefile
index 4175b9f87299..0ea7c5cc48b9 100644
--- a/devel/p5-Data-Compare/Makefile
+++ b/devel/p5-Data-Compare/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Data::Compare - compare perl data structures
PERL_CONFIGURE= yes
diff --git a/devel/p5-Data-Compare/pkg-comment b/devel/p5-Data-Compare/pkg-comment
deleted file mode 100644
index df83ab621fad..000000000000
--- a/devel/p5-Data-Compare/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Data::Compare - compare perl data structures
diff --git a/devel/p5-Data-Flow/Makefile b/devel/p5-Data-Flow/Makefile
index bd949b8a2e87..406eb5f7938c 100644
--- a/devel/p5-Data-Flow/Makefile
+++ b/devel/p5-Data-Flow/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ../by-authors/id/T/TB/TBONE/
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension for simple-minded recipe-controlled build of data
PERL_CONFIGURE= YES
diff --git a/devel/p5-Data-Flow/pkg-comment b/devel/p5-Data-Flow/pkg-comment
deleted file mode 100644
index 67cc876fd4b7..000000000000
--- a/devel/p5-Data-Flow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for simple-minded recipe-controlled build of data
diff --git a/devel/p5-Data-Serializer/Makefile b/devel/p5-Data-Serializer/Makefile
index 12f2437c5c42..7ca85e113009 100644
--- a/devel/p5-Data-Serializer/Makefile
+++ b/devel/p5-Data-Serializer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Modules that serialize data structures
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
diff --git a/devel/p5-Data-Serializer/pkg-comment b/devel/p5-Data-Serializer/pkg-comment
deleted file mode 100644
index 0491e0837cdc..000000000000
--- a/devel/p5-Data-Serializer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules that serialize data structures
diff --git a/devel/p5-Data-UUID/Makefile b/devel/p5-Data-UUID/Makefile
index 95c6760981c2..905fdba03dcc 100644
--- a/devel/p5-Data-UUID/Makefile
+++ b/devel/p5-Data-UUID/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Module for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs)
PERL_CONFIGURE= yes
CONFIGURE_ARGS= </dev/null
diff --git a/devel/p5-Data-UUID/pkg-comment b/devel/p5-Data-UUID/pkg-comment
deleted file mode 100644
index 7820649994cd..000000000000
--- a/devel/p5-Data-UUID/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Module for generating Globally/Universally Unique Identifiers (GUIDs/UUIDs)
diff --git a/devel/p5-Date-Leapyear/Makefile b/devel/p5-Date-Leapyear/Makefile
index 8793114b24a0..da9902f6985b 100644
--- a/devel/p5-Date-Leapyear/Makefile
+++ b/devel/p5-Date-Leapyear/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Date
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to determine if a particular year a leap year
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Date-Leapyear/pkg-comment b/devel/p5-Date-Leapyear/pkg-comment
deleted file mode 100644
index c8890beb3245..000000000000
--- a/devel/p5-Date-Leapyear/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to determine if a particular year a leap year
diff --git a/devel/p5-Devel-Constants/Makefile b/devel/p5-Devel-Constants/Makefile
index 093455ac8a04..b763abc914cc 100644
--- a/devel/p5-Devel-Constants/Makefile
+++ b/devel/p5-Devel-Constants/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to translate constants back to their named symbols
PERL_CONFIGURE= yes
diff --git a/devel/p5-Devel-Constants/pkg-comment b/devel/p5-Devel-Constants/pkg-comment
deleted file mode 100644
index 03ad3730a5be..000000000000
--- a/devel/p5-Devel-Constants/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to translate constants back to their named symbols
diff --git a/devel/p5-Devel-Leak/Makefile b/devel/p5-Devel-Leak/Makefile
index 7eeaed8dc45f..a02daa74296e 100644
--- a/devel/p5-Devel-Leak/Makefile
+++ b/devel/p5-Devel-Leak/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Utility for looking for perl objects that are not reclaimed
PERL_CONFIGURE= yes
diff --git a/devel/p5-Devel-Leak/pkg-comment b/devel/p5-Devel-Leak/pkg-comment
deleted file mode 100644
index c476a30b3e61..000000000000
--- a/devel/p5-Devel-Leak/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility for looking for perl objects that are not reclaimed
diff --git a/devel/p5-Devel-Modlist/Makefile b/devel/p5-Devel-Modlist/Makefile
index 98f0d63d94b9..cba8c47f784e 100644
--- a/devel/p5-Devel-Modlist/Makefile
+++ b/devel/p5-Devel-Modlist/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension to collect module use information
PERL_CONFIGURE= yes
diff --git a/devel/p5-Devel-Modlist/pkg-comment b/devel/p5-Devel-Modlist/pkg-comment
deleted file mode 100644
index 83a9891a17e6..000000000000
--- a/devel/p5-Devel-Modlist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension to collect module use information
diff --git a/devel/p5-Devel-ObjectTracker/Makefile b/devel/p5-Devel-ObjectTracker/Makefile
index 85a24e807aff..7c4f536ea8d6 100644
--- a/devel/p5-Devel-ObjectTracker/Makefile
+++ b/devel/p5-Devel-ObjectTracker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Track object life to detect memory leaks
PERL_CONFIGURE= yes
diff --git a/devel/p5-Devel-ObjectTracker/pkg-comment b/devel/p5-Devel-ObjectTracker/pkg-comment
deleted file mode 100644
index b2185ae46157..000000000000
--- a/devel/p5-Devel-ObjectTracker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Track object life to detect memory leaks
diff --git a/devel/p5-Devel-Profiler/Makefile b/devel/p5-Devel-Profiler/Makefile
index 57c80a2cf454..aad447342403 100644
--- a/devel/p5-Devel-Profiler/Makefile
+++ b/devel/p5-Devel-Profiler/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= A Perl profiler compatible with dprofpp
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Devel-Profiler/pkg-comment b/devel/p5-Devel-Profiler/pkg-comment
deleted file mode 100644
index 863cf921ce45..000000000000
--- a/devel/p5-Devel-Profiler/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl profiler compatible with dprofpp
diff --git a/devel/p5-Devel-ptkdb/Makefile b/devel/p5-Devel-ptkdb/Makefile
index a3f351e458d7..83d5ca9b39fd 100644
--- a/devel/p5-Devel-ptkdb/Makefile
+++ b/devel/p5-Devel-ptkdb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Devel
PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
+COMMENT= Tk debugger for Perl
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
diff --git a/devel/p5-Devel-ptkdb/pkg-comment b/devel/p5-Devel-ptkdb/pkg-comment
deleted file mode 100644
index 9761696db85a..000000000000
--- a/devel/p5-Devel-ptkdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tk debugger for Perl
diff --git a/devel/p5-Dialog/Makefile b/devel/p5-Dialog/Makefile
index 07932e4e1fb8..178c6c215e1a 100644
--- a/devel/p5-Dialog/Makefile
+++ b/devel/p5-Dialog/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Dialog
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Perl interface to dialog(3)
.include <bsd.port.pre.mk>
.if ${OSVERSION} >= 500007
diff --git a/devel/p5-Dialog/pkg-comment b/devel/p5-Dialog/pkg-comment
deleted file mode 100644
index b109e182b44b..000000000000
--- a/devel/p5-Dialog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to dialog(3)
diff --git a/devel/p5-Errno/Makefile b/devel/p5-Errno/Makefile
index 558cfd1093f6..cf080ec0f269 100644
--- a/devel/p5-Errno/Makefile
+++ b/devel/p5-Errno/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Errno
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= A perl5 module providing access to System errno constants
PERL_CONFIGURE= YES
diff --git a/devel/p5-Errno/pkg-comment b/devel/p5-Errno/pkg-comment
deleted file mode 100644
index dd298f4b0265..000000000000
--- a/devel/p5-Errno/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module providing access to System errno constants
diff --git a/devel/p5-File-Lock/Makefile b/devel/p5-File-Lock/Makefile
index 5f078cc4d2a7..d5aa456e9011 100644
--- a/devel/p5-File-Lock/Makefile
+++ b/devel/p5-File-Lock/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module for file locking (flock,fcntl)
PERL_CONFIGURE= yes
diff --git a/devel/p5-File-Lock/pkg-comment b/devel/p5-File-Lock/pkg-comment
deleted file mode 100644
index 61b201db494f..000000000000
--- a/devel/p5-File-Lock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for file locking (flock,fcntl)
diff --git a/devel/p5-File-NFSLock/Makefile b/devel/p5-File-NFSLock/Makefile
index eff65793fbfc..0b65f97c5861 100644
--- a/devel/p5-File-NFSLock/Makefile
+++ b/devel/p5-File-NFSLock/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= File::NFSLock - perl module to do NFS (or not) locking
PERL_CONFIGURE= yes
diff --git a/devel/p5-File-NFSLock/pkg-comment b/devel/p5-File-NFSLock/pkg-comment
deleted file mode 100644
index 4357066064a1..000000000000
--- a/devel/p5-File-NFSLock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File::NFSLock - perl module to do NFS (or not) locking
diff --git a/devel/p5-File-ReadBackwards/Makefile b/devel/p5-File-ReadBackwards/Makefile
index 3d3e27862841..a05bd6210e26 100644
--- a/devel/p5-File-ReadBackwards/Makefile
+++ b/devel/p5-File-ReadBackwards/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= File::ReadBackwards -- read a file backwards by lines
BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-File-ReadBackwards/pkg-comment b/devel/p5-File-ReadBackwards/pkg-comment
deleted file mode 100644
index ddb6382b3a2e..000000000000
--- a/devel/p5-File-ReadBackwards/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File::ReadBackwards -- read a file backwards by lines
diff --git a/devel/p5-File-Spec/Makefile b/devel/p5-File-Spec/Makefile
index f20eb37b51c2..ebf90522cbdf 100644
--- a/devel/p5-File-Spec/Makefile
+++ b/devel/p5-File-Spec/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= A Perl module for portably manipulating file specifications
PERL_CONFIGURE= yes
diff --git a/devel/p5-File-Spec/pkg-comment b/devel/p5-File-Spec/pkg-comment
deleted file mode 100644
index a945e920b6e8..000000000000
--- a/devel/p5-File-Spec/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl module for portably manipulating file specifications
diff --git a/devel/p5-File-Temp/Makefile b/devel/p5-File-Temp/Makefile
index 3d6007c94cb1..a4a02388f367 100644
--- a/devel/p5-File-Temp/Makefile
+++ b/devel/p5-File-Temp/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Perl5 module to generate temporary files or directories safely
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-File-Temp/pkg-comment b/devel/p5-File-Temp/pkg-comment
deleted file mode 100644
index bb4bdf95ceec..000000000000
--- a/devel/p5-File-Temp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to generate temporary files or directories safely
diff --git a/devel/p5-File-Tools/Makefile b/devel/p5-File-Tools/Makefile
index 0cde3180bb44..55038acb203f 100644
--- a/devel/p5-File-Tools/Makefile
+++ b/devel/p5-File-Tools/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module for several file operations: Copy, Recurse and Tools
PERL_CONFIGURE= YES
diff --git a/devel/p5-File-Tools/pkg-comment b/devel/p5-File-Tools/pkg-comment
deleted file mode 100644
index 07be30454402..000000000000
--- a/devel/p5-File-Tools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for several file operations: Copy, Recurse and Tools
diff --git a/devel/p5-Filter-CBC/Makefile b/devel/p5-Filter-CBC/Makefile
index a34527ad657e..1537265e215a 100644
--- a/devel/p5-Filter-CBC/Makefile
+++ b/devel/p5-Filter-CBC/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Filter
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Source filter for Cipher Block Chaining
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
diff --git a/devel/p5-Filter-CBC/pkg-comment b/devel/p5-Filter-CBC/pkg-comment
deleted file mode 100644
index f4bb2c9572ca..000000000000
--- a/devel/p5-Filter-CBC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Source filter for Cipher Block Chaining
diff --git a/devel/p5-Getopt-Declare/Makefile b/devel/p5-Getopt-Declare/Makefile
index 40b2a7f5e8a6..0134d68ec17d 100644
--- a/devel/p5-Getopt-Declare/Makefile
+++ b/devel/p5-Getopt-Declare/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Getopt
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Declaratively Expressed Command-Line Arguments via Regular Expressions
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Getopt-Declare/pkg-comment b/devel/p5-Getopt-Declare/pkg-comment
deleted file mode 100644
index 111fb3b27fdb..000000000000
--- a/devel/p5-Getopt-Declare/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Declaratively Expressed Command-Line Arguments via Regular Expressions
diff --git a/devel/p5-Getopt-Long/Makefile b/devel/p5-Getopt-Long/Makefile
index 1ec644e997f0..a9c4b84f3169 100644
--- a/devel/p5-Getopt-Long/Makefile
+++ b/devel/p5-Getopt-Long/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Getopt
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for extended processing of command line options
PERL_CONFIGURE= yes
diff --git a/devel/p5-Getopt-Long/pkg-comment b/devel/p5-Getopt-Long/pkg-comment
deleted file mode 100644
index d6d9040467f4..000000000000
--- a/devel/p5-Getopt-Long/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for extended processing of command line options
diff --git a/devel/p5-IO-Multiplex/Makefile b/devel/p5-IO-Multiplex/Makefile
index c695af861ba4..14b9fec38818 100644
--- a/devel/p5-IO-Multiplex/Makefile
+++ b/devel/p5-IO-Multiplex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= IO::Multiplex - Manage IO on many file handles
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-IO-Multiplex/pkg-comment b/devel/p5-IO-Multiplex/pkg-comment
deleted file mode 100644
index 3bb64e023e61..000000000000
--- a/devel/p5-IO-Multiplex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IO::Multiplex - Manage IO on many file handles
diff --git a/devel/p5-IO-String/Makefile b/devel/p5-IO-String/Makefile
index 0fbba16e6e4e..5be930b3e6e7 100644
--- a/devel/p5-IO-String/Makefile
+++ b/devel/p5-IO-String/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Simplified Perl5 module to handle I/O on in-core strings
PERL_CONFIGURE= yes
diff --git a/devel/p5-IO-String/pkg-comment b/devel/p5-IO-String/pkg-comment
deleted file mode 100644
index 3f5677780fd0..000000000000
--- a/devel/p5-IO-String/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simplified Perl5 module to handle I/O on in-core strings
diff --git a/devel/p5-IPC-Locker/Makefile b/devel/p5-IPC-Locker/Makefile
index b2c86a07446e..7535af26c50e 100644
--- a/devel/p5-IPC-Locker/Makefile
+++ b/devel/p5-IPC-Locker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= IPC
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Provide a server for locks and clients to access that server
PERL_CONFIGURE= yes
diff --git a/devel/p5-IPC-Locker/pkg-comment b/devel/p5-IPC-Locker/pkg-comment
deleted file mode 100644
index 5f2fc8ce5569..000000000000
--- a/devel/p5-IPC-Locker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provide a server for locks and clients to access that server
diff --git a/devel/p5-IPC-Run/Makefile b/devel/p5-IPC-Run/Makefile
index 429ecc735e09..e2aabcc0cfdd 100644
--- a/devel/p5-IPC-Run/Makefile
+++ b/devel/p5-IPC-Run/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= IPC
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= IPC::Run - Run subprocesses with piping and redirection
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
${SITE_PERL}/${PERL_ARCH}/IO/Handle.pm:${PORTSDIR}/devel/p5-IO \
diff --git a/devel/p5-IPC-Run/pkg-comment b/devel/p5-IPC-Run/pkg-comment
deleted file mode 100644
index e0a9f5ec5ebf..000000000000
--- a/devel/p5-IPC-Run/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IPC::Run - Run subprocesses with piping and redirection
diff --git a/devel/p5-IPC-Shareable/Makefile b/devel/p5-IPC-Shareable/Makefile
index c9af147e7453..82c11aeec751 100644
--- a/devel/p5-IPC-Shareable/Makefile
+++ b/devel/p5-IPC-Shareable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= IPC
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Share Perl variables between processes
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
diff --git a/devel/p5-IPC-Shareable/pkg-comment b/devel/p5-IPC-Shareable/pkg-comment
deleted file mode 100644
index d76bc3e40658..000000000000
--- a/devel/p5-IPC-Shareable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Share Perl variables between processes
diff --git a/devel/p5-Locale-PGetText/Makefile b/devel/p5-Locale-PGetText/Makefile
index 05e5be3b3d86..b873053c200e 100644
--- a/devel/p5-Locale-PGetText/Makefile
+++ b/devel/p5-Locale-PGetText/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Locale
PKGNAMEPREFIX= p5-
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Pure perl implementation of GNU gettext
PERL_CONFIGURE= YES
diff --git a/devel/p5-Locale-PGetText/pkg-comment b/devel/p5-Locale-PGetText/pkg-comment
deleted file mode 100644
index d62b1112ae8b..000000000000
--- a/devel/p5-Locale-PGetText/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pure perl implementation of GNU gettext
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index eb6dcb71cf42..ad0d178098c9 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Locale
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Message handling functions
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/devel/p5-Locale-gettext/pkg-comment b/devel/p5-Locale-gettext/pkg-comment
deleted file mode 100644
index 2ee0cb548970..000000000000
--- a/devel/p5-Locale-gettext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Message handling functions
diff --git a/devel/p5-Memoize/Makefile b/devel/p5-Memoize/Makefile
index 9b18fb955823..cfaa84bf7feb 100644
--- a/devel/p5-Memoize/Makefile
+++ b/devel/p5-Memoize/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Memoize
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Transparently speed up perl functions by caching return values
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Memoize/pkg-comment b/devel/p5-Memoize/pkg-comment
deleted file mode 100644
index 74469912a555..000000000000
--- a/devel/p5-Memoize/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transparently speed up perl functions by caching return values
diff --git a/devel/p5-ORBit/Makefile b/devel/p5-ORBit/Makefile
index e0b424c7530f..bf66118ceb49 100644
--- a/devel/p5-ORBit/Makefile
+++ b/devel/p5-ORBit/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= CORBA-ORBit-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The perl binding for ORBit
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Error.pm:${PORTSDIR}/lang/p5-Error
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit
diff --git a/devel/p5-ORBit/pkg-comment b/devel/p5-ORBit/pkg-comment
deleted file mode 100644
index 83254afff035..000000000000
--- a/devel/p5-ORBit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The perl binding for ORBit
diff --git a/devel/p5-POE-Component-Client-DNS/Makefile b/devel/p5-POE-Component-Client-DNS/Makefile
index 8bf4c1f461f9..30a2a116def4 100644
--- a/devel/p5-POE-Component-Client-DNS/Makefile
+++ b/devel/p5-POE-Component-Client-DNS/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE component for non-blocking/concurrent DNS queries
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
diff --git a/devel/p5-POE-Component-Client-DNS/pkg-comment b/devel/p5-POE-Component-Client-DNS/pkg-comment
deleted file mode 100644
index 5cbf7d4d3aa5..000000000000
--- a/devel/p5-POE-Component-Client-DNS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE component for non-blocking/concurrent DNS queries
diff --git a/devel/p5-POE-Component-Client-HTTP/Makefile b/devel/p5-POE-Component-Client-HTTP/Makefile
index 4c77c1509e50..7b9d7a4b09b3 100644
--- a/devel/p5-POE-Component-Client-HTTP/Makefile
+++ b/devel/p5-POE-Component-Client-HTTP/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE component for non-blocking/concurrent HTTP queries
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/devel/p5-POE-Component-Client-HTTP/pkg-comment b/devel/p5-POE-Component-Client-HTTP/pkg-comment
deleted file mode 100644
index 8c44f9a9c83d..000000000000
--- a/devel/p5-POE-Component-Client-HTTP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE component for non-blocking/concurrent HTTP queries
diff --git a/devel/p5-POE-Component-Client-POP3/Makefile b/devel/p5-POE-Component-Client-POP3/Makefile
index b62ad9e90686..30c1e7e23624 100644
--- a/devel/p5-POE-Component-Client-POP3/Makefile
+++ b/devel/p5-POE-Component-Client-POP3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Impliment a POP3 client POE component
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-POE-Component-Client-POP3/pkg-comment b/devel/p5-POE-Component-Client-POP3/pkg-comment
deleted file mode 100644
index e053ffd9104e..000000000000
--- a/devel/p5-POE-Component-Client-POP3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Impliment a POP3 client POE component
diff --git a/devel/p5-POE-Component-DBIAgent/Makefile b/devel/p5-POE-Component-DBIAgent/Makefile
index fa56220e5a4a..7d87457a958c 100644
--- a/devel/p5-POE-Component-DBIAgent/Makefile
+++ b/devel/p5-POE-Component-DBIAgent/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE Component for running asynchronous DBI calls
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
diff --git a/devel/p5-POE-Component-DBIAgent/pkg-comment b/devel/p5-POE-Component-DBIAgent/pkg-comment
deleted file mode 100644
index c7e7a6010879..000000000000
--- a/devel/p5-POE-Component-DBIAgent/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE Component for running asynchronous DBI calls
diff --git a/devel/p5-POE-Component-DirWatch/Makefile b/devel/p5-POE-Component-DirWatch/Makefile
index 5d6f5d2d26cf..3b20cfe882ea 100644
--- a/devel/p5-POE-Component-DirWatch/Makefile
+++ b/devel/p5-POE-Component-DirWatch/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE directory watcher
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-POE-Component-DirWatch/pkg-comment b/devel/p5-POE-Component-DirWatch/pkg-comment
deleted file mode 100644
index 72ac4ec42d5c..000000000000
--- a/devel/p5-POE-Component-DirWatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE directory watcher
diff --git a/devel/p5-POE-Component-Logger/Makefile b/devel/p5-POE-Component-Logger/Makefile
index 42320acdef65..0f12d637d747 100644
--- a/devel/p5-POE-Component-Logger/Makefile
+++ b/devel/p5-POE-Component-Logger/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= A POE logging class
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/Parallel.pm:${PORTSDIR}/www/p5-ParallelUA
diff --git a/devel/p5-POE-Component-Logger/pkg-comment b/devel/p5-POE-Component-Logger/pkg-comment
deleted file mode 100644
index a6cdeaff9e3e..000000000000
--- a/devel/p5-POE-Component-Logger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A POE logging class
diff --git a/devel/p5-POE-Session-Cascading/Makefile b/devel/p5-POE-Session-Cascading/Makefile
index d8e630c29aa4..49641b3c079d 100644
--- a/devel/p5-POE-Session-Cascading/Makefile
+++ b/devel/p5-POE-Session-Cascading/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Stack-like POE Sessions
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-POE-Session-Cascading/pkg-comment b/devel/p5-POE-Session-Cascading/pkg-comment
deleted file mode 100644
index 439c4d2586ed..000000000000
--- a/devel/p5-POE-Session-Cascading/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Stack-like POE Sessions
diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index f20eb37b51c2..ebf90522cbdf 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= A Perl module for portably manipulating file specifications
PERL_CONFIGURE= yes
diff --git a/devel/p5-PathTools/pkg-comment b/devel/p5-PathTools/pkg-comment
deleted file mode 100644
index a945e920b6e8..000000000000
--- a/devel/p5-PathTools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl module for portably manipulating file specifications
diff --git a/devel/p5-Proc-Background/Makefile b/devel/p5-Proc-Background/Makefile
index b31a9e4af56d..68f4262e0d5f 100644
--- a/devel/p5-Proc-Background/Makefile
+++ b/devel/p5-Proc-Background/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Proc
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl interface to running background processes
PERL_CONFIGURE= yes
diff --git a/devel/p5-Proc-Background/pkg-comment b/devel/p5-Proc-Background/pkg-comment
deleted file mode 100644
index a23ea2f6bf52..000000000000
--- a/devel/p5-Proc-Background/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to running background processes
diff --git a/devel/p5-Proc-PIDFile/Makefile b/devel/p5-Proc-PIDFile/Makefile
index 6918def9b721..0ce0aa76dc04 100644
--- a/devel/p5-Proc-PIDFile/Makefile
+++ b/devel/p5-Proc-PIDFile/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Proc-PID_File-${PORTVERSION}
MAINTAINER= kbyanc@FreeBSD.org
+COMMENT= Perl5 module to prevent multiple instances of a process from running
PERL_CONFIGURE= YES
diff --git a/devel/p5-Proc-PIDFile/pkg-comment b/devel/p5-Proc-PIDFile/pkg-comment
deleted file mode 100644
index 893c21c01664..000000000000
--- a/devel/p5-Proc-PIDFile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to prevent multiple instances of a process from running
diff --git a/devel/p5-Proc-Simple/Makefile b/devel/p5-Proc-Simple/Makefile
index c972dcd79781..3051cdd8659f 100644
--- a/devel/p5-Proc-Simple/Makefile
+++ b/devel/p5-Proc-Simple/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Proc
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module to launch and control background processes
PERL_CONFIGURE= YES
diff --git a/devel/p5-Proc-Simple/pkg-comment b/devel/p5-Proc-Simple/pkg-comment
deleted file mode 100644
index a589fb7864ef..000000000000
--- a/devel/p5-Proc-Simple/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to launch and control background processes
diff --git a/devel/p5-Rcs-Agent/Makefile b/devel/p5-Rcs-Agent/Makefile
index c0102bb5b724..1c5e6b614750 100644
--- a/devel/p5-Rcs-Agent/Makefile
+++ b/devel/p5-Rcs-Agent/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Rcs
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A perl module for RCS archive manipulation
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/String/ShellQuote.pm:${PORTSDIR}/textproc/p5-String-ShellQuote \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
diff --git a/devel/p5-Rcs-Agent/pkg-comment b/devel/p5-Rcs-Agent/pkg-comment
deleted file mode 100644
index a812d3406104..000000000000
--- a/devel/p5-Rcs-Agent/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module for RCS archive manipulation
diff --git a/devel/p5-Rcs/Makefile b/devel/p5-Rcs/Makefile
index 1d8d4e65be62..c6cbba17383e 100644
--- a/devel/p5-Rcs/Makefile
+++ b/devel/p5-Rcs/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Rcs
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl Object Class for Revision Control System (RCS)
PERL_CONFIGURE= yes
diff --git a/devel/p5-Rcs/pkg-comment b/devel/p5-Rcs/pkg-comment
deleted file mode 100644
index fec7743eef78..000000000000
--- a/devel/p5-Rcs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl Object Class for Revision Control System (RCS)
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-ReadLine-Gnu/Makefile
index bdb843fa81ca..15dba066af98 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-ReadLine-Gnu/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Term-${PORTNAME}-${PORTVERSION}
MAINTAINER= mph@FreeBSD.org
+COMMENT= Perl 5 module that allows Term::ReadLine to use GNU readline
PERL_CONFIGURE= yes
diff --git a/devel/p5-ReadLine-Gnu/pkg-comment b/devel/p5-ReadLine-Gnu/pkg-comment
deleted file mode 100644
index f0ad6dae8036..000000000000
--- a/devel/p5-ReadLine-Gnu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl 5 module that allows Term::ReadLine to use GNU readline
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
index b2e6b0c6421b..07c4e0f34d76 100644
--- a/devel/p5-ReadLine-Perl/Makefile
+++ b/devel/p5-ReadLine-Perl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Term-ReadLine-Perl-${PORTVERSION}
MAINTAINER= mph@FreeBSD.org
+COMMENT= Perl 5 module for Term::ReadLine editing without GNU readline
PERL_CONFIGURE= YES
diff --git a/devel/p5-ReadLine-Perl/pkg-comment b/devel/p5-ReadLine-Perl/pkg-comment
deleted file mode 100644
index 6334ff30ee51..000000000000
--- a/devel/p5-ReadLine-Perl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl 5 module for Term::ReadLine editing without GNU readline
diff --git a/devel/p5-Resources/Makefile b/devel/p5-Resources/Makefile
index 8593bd5e2431..80362dd1fc42 100644
--- a/devel/p5-Resources/Makefile
+++ b/devel/p5-Resources/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Resources
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module handling application defaults in Perl
PERL_CONFIGURE= YES
diff --git a/devel/p5-Resources/pkg-comment b/devel/p5-Resources/pkg-comment
deleted file mode 100644
index bc4521ebee63..000000000000
--- a/devel/p5-Resources/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module handling application defaults in Perl
diff --git a/devel/p5-SPOPS/Makefile b/devel/p5-SPOPS/Makefile
index 812f5068a38e..2cb48bd16852 100644
--- a/devel/p5-SPOPS/Makefile
+++ b/devel/p5-SPOPS/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= C/CW/CWINTERS
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Simple Perl Object Persistence with Security
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ISA.pm:${PORTSDIR}/devel/p5-Class-ISA \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
diff --git a/devel/p5-SPOPS/pkg-comment b/devel/p5-SPOPS/pkg-comment
deleted file mode 100644
index 28ede5688437..000000000000
--- a/devel/p5-SPOPS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple Perl Object Persistence with Security
diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index 239aa215c144..957ad1ee0808 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Search
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module that implements a generic binary search algorithm
PERL_CONFIGURE= yes
diff --git a/devel/p5-Search-Binary/pkg-comment b/devel/p5-Search-Binary/pkg-comment
deleted file mode 100644
index 125b664ebf7e..000000000000
--- a/devel/p5-Search-Binary/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that implements a generic binary search algorithm
diff --git a/devel/p5-Server-FastPL/Makefile b/devel/p5-Server-FastPL/Makefile
index c2e6f3b8ce93..9c1911054582 100644
--- a/devel/p5-Server-FastPL/Makefile
+++ b/devel/p5-Server-FastPL/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Server
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to eliminate the compile-time of big scripts
PERL_CONFIGURE= yes
diff --git a/devel/p5-Server-FastPL/pkg-comment b/devel/p5-Server-FastPL/pkg-comment
deleted file mode 100644
index e940bf36b6ab..000000000000
--- a/devel/p5-Server-FastPL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to eliminate the compile-time of big scripts
diff --git a/devel/p5-Set-NestedGroups/Makefile b/devel/p5-Set-NestedGroups/Makefile
index 8720b9ba7113..22e118c70dcb 100644
--- a/devel/p5-Set-NestedGroups/Makefile
+++ b/devel/p5-Set-NestedGroups/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for grouped data eg ACL's, city/state/country etc
PERL_CONFIGURE= yes
diff --git a/devel/p5-Set-NestedGroups/pkg-comment b/devel/p5-Set-NestedGroups/pkg-comment
deleted file mode 100644
index 2a54b4118bba..000000000000
--- a/devel/p5-Set-NestedGroups/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for grouped data eg ACL's, city/state/country etc
diff --git a/devel/p5-Set-Object/Makefile b/devel/p5-Set-Object/Makefile
index 15eb1ca3e511..250fe5fa0a5e 100644
--- a/devel/p5-Set-Object/Makefile
+++ b/devel/p5-Set-Object/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to manage sets of objects
PERL_CONFIGURE= yes
diff --git a/devel/p5-Set-Object/pkg-comment b/devel/p5-Set-Object/pkg-comment
deleted file mode 100644
index 2ac061a82415..000000000000
--- a/devel/p5-Set-Object/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to manage sets of objects
diff --git a/devel/p5-Set-Scalar/Makefile b/devel/p5-Set-Scalar/Makefile
index 3c7348cc9598..a09fa069765f 100644
--- a/devel/p5-Set-Scalar/Makefile
+++ b/devel/p5-Set-Scalar/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module containing a set of scalars, including references
PERL_CONFIGURE= yes
diff --git a/devel/p5-Set-Scalar/pkg-comment b/devel/p5-Set-Scalar/pkg-comment
deleted file mode 100644
index 985c3303756e..000000000000
--- a/devel/p5-Set-Scalar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module containing a set of scalars, including references
diff --git a/devel/p5-Sort-Versions/Makefile b/devel/p5-Sort-Versions/Makefile
index ffd325dd31d5..cce7e9f8bde6 100644
--- a/devel/p5-Sort-Versions/Makefile
+++ b/devel/p5-Sort-Versions/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Sort
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A perl 5 module for sorting of revision-like numbers
PERL_CONFIGURE= YES
diff --git a/devel/p5-Sort-Versions/pkg-comment b/devel/p5-Sort-Versions/pkg-comment
deleted file mode 100644
index c60cf9d7a685..000000000000
--- a/devel/p5-Sort-Versions/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl 5 module for sorting of revision-like numbers
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index efc3b25de016..e40beee098c5 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Storable
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Persistency for perl data structures
BUILD_DEPENDS= ${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Storable/pkg-comment b/devel/p5-Storable/pkg-comment
deleted file mode 100644
index 15924e6859a2..000000000000
--- a/devel/p5-Storable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Persistency for perl data structures
diff --git a/devel/p5-String-CRC32/Makefile b/devel/p5-String-CRC32/Makefile
index 5c2bda7f9480..0f572d817a7c 100644
--- a/devel/p5-String-CRC32/Makefile
+++ b/devel/p5-String-CRC32/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= String
PKGNAMEPREFIX= p5-
MAINTAINER= ache@FreeBSD.org
+COMMENT= Perl interface for cyclic redundency check generation
SITE_PERL= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
PERL_CONFIGURE= yes
diff --git a/devel/p5-String-CRC32/pkg-comment b/devel/p5-String-CRC32/pkg-comment
deleted file mode 100644
index 2a1b08819743..000000000000
--- a/devel/p5-String-CRC32/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface for cyclic redundency check generation
diff --git a/devel/p5-String-Similarity/Makefile b/devel/p5-String-Similarity/Makefile
index 7e239c2a9f1b..36e99535d253 100644
--- a/devel/p5-String-Similarity/Makefile
+++ b/devel/p5-String-Similarity/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= String
PKGNAMEPREFIX= p5-
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= Perl module that calculates the similarity of two strings
PERL_CONFIGURE= yes
diff --git a/devel/p5-String-Similarity/pkg-comment b/devel/p5-String-Similarity/pkg-comment
deleted file mode 100644
index 486167dd7410..000000000000
--- a/devel/p5-String-Similarity/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that calculates the similarity of two strings
diff --git a/devel/p5-System2/Makefile b/devel/p5-System2/Makefile
index 4b4bca623f50..5865eec15590 100644
--- a/devel/p5-System2/Makefile
+++ b/devel/p5-System2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= System2
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= System2 - like system(), but with STDERR available as well
PERL_CONFIGURE= yes
diff --git a/devel/p5-System2/pkg-comment b/devel/p5-System2/pkg-comment
deleted file mode 100644
index 1c50627d523a..000000000000
--- a/devel/p5-System2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-System2 - like system(), but with STDERR available as well
diff --git a/devel/p5-Term-Prompt/Makefile b/devel/p5-Term-Prompt/Makefile
index f83271ae3f1c..85d2782f2bda 100644
--- a/devel/p5-Term-Prompt/Makefile
+++ b/devel/p5-Term-Prompt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Term
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension for prompting a user for information
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/devel/p5-Term-Prompt/pkg-comment b/devel/p5-Term-Prompt/pkg-comment
deleted file mode 100644
index 91681abc389c..000000000000
--- a/devel/p5-Term-Prompt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for prompting a user for information
diff --git a/devel/p5-Test-Exception/Makefile b/devel/p5-Test-Exception/Makefile
index 7534309d2b50..7fb13a07c51a 100644
--- a/devel/p5-Test-Exception/Makefile
+++ b/devel/p5-Test-Exception/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= erwin@lansing.dk
+COMMENT= Test::Exception - test functions for exception based code
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Builder/Tester.pm:${PORTSDIR}/devel/p5-Test-Builder-Tester \
diff --git a/devel/p5-Test-Exception/pkg-comment b/devel/p5-Test-Exception/pkg-comment
deleted file mode 100644
index 4dc54942f4b6..000000000000
--- a/devel/p5-Test-Exception/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Test::Exception - test functions for exception based code
diff --git a/devel/p5-Test-Unit/Makefile b/devel/p5-Test-Unit/Makefile
index 92d044a655cc..174275e62a1c 100644
--- a/devel/p5-Test-Unit/Makefile
+++ b/devel/p5-Test-Unit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Test
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= PerlUnit testing framework
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Devel/Symdump.pm:${PORTSDIR}/devel/p5-Devel-Symdump \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Error.pm:${PORTSDIR}/lang/p5-Error \
diff --git a/devel/p5-Test-Unit/pkg-comment b/devel/p5-Test-Unit/pkg-comment
deleted file mode 100644
index 5c3e71191908..000000000000
--- a/devel/p5-Test-Unit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PerlUnit testing framework
diff --git a/devel/p5-Time-Duration/Makefile b/devel/p5-Time-Duration/Makefile
index 9b1c562f1dcf..519ec316931f 100644
--- a/devel/p5-Time-Duration/Makefile
+++ b/devel/p5-Time-Duration/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Time
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Rounded or exact English expression of durations
PERL_CONFIGURE= yes
diff --git a/devel/p5-Time-Duration/pkg-comment b/devel/p5-Time-Duration/pkg-comment
deleted file mode 100644
index 2892aab0fd37..000000000000
--- a/devel/p5-Time-Duration/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rounded or exact English expression of durations
diff --git a/devel/p5-Time-HiRes/Makefile b/devel/p5-Time-HiRes/Makefile
index e75d3ef75832..f3c7415da302 100644
--- a/devel/p5-Time-HiRes/Makefile
+++ b/devel/p5-Time-HiRes/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Time
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A perl5 module implementing High resolution time, sleep, and alarm
PERL_CONFIGURE= yes
diff --git a/devel/p5-Time-HiRes/pkg-comment b/devel/p5-Time-HiRes/pkg-comment
deleted file mode 100644
index 6151c9a2c33c..000000000000
--- a/devel/p5-Time-HiRes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module implementing High resolution time, sleep, and alarm
diff --git a/devel/p5-Time-Piece/Makefile b/devel/p5-Time-Piece/Makefile
index 8a724186926f..939fc1ed0901 100644
--- a/devel/p5-Time-Piece/Makefile
+++ b/devel/p5-Time-Piece/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Time
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Time::Piece - Object Oriented time objects
PERL_CONFIGURE= yes
diff --git a/devel/p5-Time-Piece/pkg-comment b/devel/p5-Time-Piece/pkg-comment
deleted file mode 100644
index a5a32318d463..000000000000
--- a/devel/p5-Time-Piece/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Time::Piece - Object Oriented time objects
diff --git a/devel/p5-Time-modules/Makefile b/devel/p5-Time-modules/Makefile
index 462903d4f4e0..7ec035b36a67 100644
--- a/devel/p5-Time-modules/Makefile
+++ b/devel/p5-Time-modules/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Time
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Set of modules for time manipulation
PERL_CONFIGURE= yes
diff --git a/devel/p5-Time-modules/pkg-comment b/devel/p5-Time-modules/pkg-comment
deleted file mode 100644
index 2eb0edd87789..000000000000
--- a/devel/p5-Time-modules/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Set of modules for time manipulation
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 7f7a77ff7292..4f263b277781 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= patch
MAINTAINER= petef@FreeBSD.org
+COMMENT= GNU patch utility
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
diff --git a/devel/patch/pkg-comment b/devel/patch/pkg-comment
deleted file mode 100644
index e1e1f747f3a8..000000000000
--- a/devel/patch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU patch utility
diff --git a/devel/pcl-cvs-emacs/Makefile b/devel/pcl-cvs-emacs/Makefile
index 54481e5b014c..d3b712aedf29 100644
--- a/devel/pcl-cvs-emacs/Makefile
+++ b/devel/pcl-cvs-emacs/Makefile
@@ -18,6 +18,7 @@ PATCH_SITE_SUBDIR= okazaki/pcl-cvs
PATCHFILES= pcl-cvs-2.9.9-compat.patch
MAINTAINER?= okazaki@FreeBSD.org
+COMMENT= An Emacs-based front-end to CVS
# startup el filename
PORT_SETUPEL= pcl-cvs-setup.el
diff --git a/devel/pcl-cvs-emacs/pkg-comment b/devel/pcl-cvs-emacs/pkg-comment
deleted file mode 100644
index 468db645e117..000000000000
--- a/devel/pcl-cvs-emacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Emacs-based front-end to CVS
diff --git a/devel/pharmacy/Makefile b/devel/pharmacy/Makefile
index a6ed2390e2fe..a801c7c63a3b 100644
--- a/devel/pharmacy/Makefile
+++ b/devel/pharmacy/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= GNOME frontend for CVS
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/devel/pharmacy/pkg-comment b/devel/pharmacy/pkg-comment
deleted file mode 100644
index d5bdb66dc89e..000000000000
--- a/devel/pharmacy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME frontend for CVS
diff --git a/devel/pinstall/Makefile b/devel/pinstall/Makefile
index 41e32e1bf32b..e42a6db2c5e1 100644
--- a/devel/pinstall/Makefile
+++ b/devel/pinstall/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= des@FreeBSD.org
+COMMENT= A tool for installing files according to a packing list
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/devel/pinstall/pkg-comment b/devel/pinstall/pkg-comment
deleted file mode 100644
index fd42d6df63ab..000000000000
--- a/devel/pinstall/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for installing files according to a packing list
diff --git a/devel/pkg-config/Makefile b/devel/pkg-config/Makefile
index 8eece14cefca..e127b480c804 100644
--- a/devel/pkg-config/Makefile
+++ b/devel/pkg-config/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.15
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An utility used to retrieve information about installed libraries
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/pkg-config/pkg-comment b/devel/pkg-config/pkg-comment
deleted file mode 100644
index 693e559de028..000000000000
--- a/devel/pkg-config/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility used to retrieve information about installed libraries
diff --git a/devel/pkgconfig/Makefile b/devel/pkgconfig/Makefile
index 8eece14cefca..e127b480c804 100644
--- a/devel/pkgconfig/Makefile
+++ b/devel/pkgconfig/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.15
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An utility used to retrieve information about installed libraries
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/pkgconfig/pkg-comment b/devel/pkgconfig/pkg-comment
deleted file mode 100644
index 693e559de028..000000000000
--- a/devel/pkgconfig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility used to retrieve information about installed libraries
diff --git a/devel/pmake/Makefile b/devel/pmake/Makefile
index 37b5e3c189c7..697e969b1f13 100644
--- a/devel/pmake/Makefile
+++ b/devel/pmake/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= steve
EXTRACT_SUFX= .tar.Z
MAINTAINER= steve@freebsd.org
+COMMENT= The parallel make(1) program from the Sprite project
RESTRICTED= "Non-commercial use only"
diff --git a/devel/pmake/pkg-comment b/devel/pmake/pkg-comment
deleted file mode 100644
index 6d366e278978..000000000000
--- a/devel/pmake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The parallel make(1) program from the Sprite project
diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile
index d91f648dc25f..3a6b09f4c26d 100644
--- a/devel/portlint/Makefile
+++ b/devel/portlint/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= mharo@FreeBSD.org
+COMMENT= A verifier for FreeBSD port directory
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/devel/portlint/pkg-comment b/devel/portlint/pkg-comment
deleted file mode 100644
index 01f338f767e7..000000000000
--- a/devel/portlint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A verifier for FreeBSD port directory
diff --git a/devel/py-coro/Makefile b/devel/py-coro/Makefile
index 381c7b38040c..0a331f06df81 100644
--- a/devel/py-coro/Makefile
+++ b/devel/py-coro/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= py-
DISTNAME= ${PORTNAME}_2001_02_02
MAINTAINER= kbyanc@posi.net
+COMMENT= Python coroutine implementation
BUILD_DEPENDS= ${LOCALBASE}/lib/libcoro.a:${PORTSDIR}/devel/libcoro
diff --git a/devel/py-coro/pkg-comment b/devel/py-coro/pkg-comment
deleted file mode 100644
index 723c9f9bad7f..000000000000
--- a/devel/py-coro/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python coroutine implementation
diff --git a/devel/py-game/Makefile b/devel/py-game/Makefile
index 7f2383f2e17b..24e582c3cece 100644
--- a/devel/py-game/Makefile
+++ b/devel/py-game/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://pygame.seul.org/ftp/
DISTNAME= ${PORTNAME:S/-//}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A module designed to write games in Python
BUILD_DEPENDS= ${PYNUMERIC}
LIB_DEPENDS= SDL_ttf.3:${PORTSDIR}/graphics/sdl_ttf \
diff --git a/devel/py-game/pkg-comment b/devel/py-game/pkg-comment
deleted file mode 100644
index 70c2cb435126..000000000000
--- a/devel/py-game/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module designed to write games in Python
diff --git a/devel/py-grouch/Makefile b/devel/py-grouch/Makefile
index e28b8bc17b0f..abb06e042a2c 100644
--- a/devel/py-grouch/Makefile
+++ b/devel/py-grouch/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Grouch-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A system for describing and enforcing a Python object schema
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/devel/py-grouch/pkg-comment b/devel/py-grouch/pkg-comment
deleted file mode 100644
index 7401eb9de355..000000000000
--- a/devel/py-grouch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A system for describing and enforcing a Python object schema
diff --git a/devel/py-htmlkit/Makefile b/devel/py-htmlkit/Makefile
index 6d1dd003ab2c..61196fc7818a 100644
--- a/devel/py-htmlkit/Makefile
+++ b/devel/py-htmlkit/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= py-
DISTNAME= HtmlKit
MAINTAINER= kbyanc@posi.net
+COMMENT= Python package that assists in the dynamic generation of HTML content
USE_PYTHON= yes
PLIST_SUB= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
diff --git a/devel/py-htmlkit/pkg-comment b/devel/py-htmlkit/pkg-comment
deleted file mode 100644
index d133d6591329..000000000000
--- a/devel/py-htmlkit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python package that assists in the dynamic generation of HTML content
diff --git a/devel/py-kjbuckets/Makefile b/devel/py-kjbuckets/Makefile
index d2a63ad8facc..d5a822af6829 100644
--- a/devel/py-kjbuckets/Makefile
+++ b/devel/py-kjbuckets/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= gadfly-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= Graph and set datatypes for Python (C extension)
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/devel/py-kjbuckets/pkg-comment b/devel/py-kjbuckets/pkg-comment
deleted file mode 100644
index 91ae1c8e67cf..000000000000
--- a/devel/py-kjbuckets/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graph and set datatypes for Python (C extension)
diff --git a/devel/py-kqueue/Makefile b/devel/py-kqueue/Makefile
index 35d9d055d053..e13bea97a726 100644
--- a/devel/py-kqueue/Makefile
+++ b/devel/py-kqueue/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= py-
DISTNAME= PyKQueue-${PORTVERSION}
MAINTAINER= dwhite@FreeBSD.org
+COMMENT= Python interface to kqueue(2) and kevent(2) system calls
USE_PYTHON= yes
PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
diff --git a/devel/py-kqueue/pkg-comment b/devel/py-kqueue/pkg-comment
deleted file mode 100644
index 0c89bdf13aed..000000000000
--- a/devel/py-kqueue/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python interface to kqueue(2) and kevent(2) system calls
diff --git a/devel/py-optik/Makefile b/devel/py-optik/Makefile
index d8d4034cc277..3e86952b5a46 100644
--- a/devel/py-optik/Makefile
+++ b/devel/py-optik/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Optik-${PORTVERSION}
MAINTAINER= alane@FreeBSD.org
+COMMENT= A command-line parsing library for Python
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/devel/py-optik/pkg-comment b/devel/py-optik/pkg-comment
deleted file mode 100644
index 8bed3af037bc..000000000000
--- a/devel/py-optik/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line parsing library for Python
diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile
index 125cdd783ef0..0b324398f988 100644
--- a/devel/py-orbit/Makefile
+++ b/devel/py-orbit/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= orbit-python-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Python bindings for ORBit, a CORBA 2.2-compliant ORB
LIB_DEPENDS= ORBit.2:${PORTSDIR}/devel/ORBit
diff --git a/devel/py-orbit/pkg-comment b/devel/py-orbit/pkg-comment
deleted file mode 100644
index ad53b5fe81f8..000000000000
--- a/devel/py-orbit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for ORBit, a CORBA 2.2-compliant ORB
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 52ec0eaeeed9..2940d73430ff 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -11,6 +11,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES=
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Python convenience link to sip library
LIB_DEPENDS= sip.9:${PORTSDIR}/devel/sip
diff --git a/devel/py-sip/pkg-comment b/devel/py-sip/pkg-comment
deleted file mode 100644
index 1bbe1cff9ebc..000000000000
--- a/devel/py-sip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python convenience link to sip library
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 43d8a2b2a206..0c69068db869 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Twisted-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= An event-based Python framework for internet applications
# - Note that Twisted ships with some graphical examples and clients that
# require PyGNOME to run. These are not central to the funcitoning of
diff --git a/devel/py-twisted/pkg-comment b/devel/py-twisted/pkg-comment
deleted file mode 100644
index ae793790e18f..000000000000
--- a/devel/py-twisted/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An event-based Python framework for internet applications
diff --git a/devel/pychecker/Makefile b/devel/pychecker/Makefile
index 550e401892b6..0ff08b7241e2 100644
--- a/devel/pychecker/Makefile
+++ b/devel/pychecker/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A python source code checking tool to help hunting common bugs
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/devel/pychecker/pkg-comment b/devel/pychecker/pkg-comment
deleted file mode 100644
index d9053d8ea772..000000000000
--- a/devel/pychecker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A python source code checking tool to help hunting common bugs
diff --git a/devel/qssl/Makefile b/devel/qssl/Makefile
index 04965da13ccf..cba88c56afc5 100644
--- a/devel/qssl/Makefile
+++ b/devel/qssl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= psi
MAINTAINER= dd@FreeBSD.org
+COMMENT= QSSL is a Qt plugin that helps applications use OpenSSL
SHLIB_MAJOR= 0
diff --git a/devel/qssl/pkg-comment b/devel/qssl/pkg-comment
deleted file mode 100644
index 54c4cfa4012b..000000000000
--- a/devel/qssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QSSL is a Qt plugin that helps applications use OpenSSL
diff --git a/devel/qtez/Makefile b/devel/qtez/Makefile
index c7b9250d205d..de3a281ca841 100644
--- a/devel/qtez/Makefile
+++ b/devel/qtez/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kde@freebsd.org
+COMMENT= Qt Rapid Application Development Environment for X Window System
USE_PERL5= yes
USE_BZIP2= yes
diff --git a/devel/qtez/pkg-comment b/devel/qtez/pkg-comment
deleted file mode 100644
index e3744041d569..000000000000
--- a/devel/qtez/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Qt Rapid Application Development Environment for X Window System
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index 58119049fc9d..9f29b458d83e 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tildeslash.org/re2c/ \
http://www.tobez.org/download/port-mirrors/devel/re2c/
MAINTAINER= eivind@FreeBSD.org
+COMMENT= Compile regular expression to C (much faster final code than flex)
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/devel/re2c/pkg-comment b/devel/re2c/pkg-comment
deleted file mode 100644
index 2f05ccaa0273..000000000000
--- a/devel/re2c/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Compile regular expression to C (much faster final code than flex)
diff --git a/devel/rtplib/Makefile b/devel/rtplib/Makefile
index 102d121b6414..a1dfdc401390 100644
--- a/devel/rtplib/Makefile
+++ b/devel/rtplib/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel mbone
MASTER_SITES= http://www-out.bell-labs.com:80/project/RTPlib/
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A library for developing applications over RTP
RTP_HEADERS= rtp_api.h rtp_highlevel.h rtp_lowlevel.h
diff --git a/devel/rtplib/pkg-comment b/devel/rtplib/pkg-comment
deleted file mode 100644
index 68ae1aea3898..000000000000
--- a/devel/rtplib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for developing applications over RTP
diff --git a/devel/ruby-aspectr/Makefile b/devel/ruby-aspectr/Makefile
index cdc0d9501b67..4da6b2d668a1 100644
--- a/devel/ruby-aspectr/Makefile
+++ b/devel/ruby-aspectr/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/./-/g}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Ruby libraries for Aspect programming
USE_RUBY= yes
diff --git a/devel/ruby-aspectr/pkg-comment b/devel/ruby-aspectr/pkg-comment
deleted file mode 100644
index 254ec65f2c82..000000000000
--- a/devel/ruby-aspectr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ruby libraries for Aspect programming
diff --git a/devel/ruby-inline/Makefile b/devel/ruby-inline/Makefile
index 3312306a6351..b75ae749ca30 100644
--- a/devel/ruby-inline/Makefile
+++ b/devel/ruby-inline/Makefile
@@ -15,6 +15,7 @@ DISTNAME= RubyInline-${PORTVERSION}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Inline::C allows you to embed C/Ruby directly in ruby scripts
USE_RUBY= yes
diff --git a/devel/ruby-inline/pkg-comment b/devel/ruby-inline/pkg-comment
deleted file mode 100644
index f3c86c8a0d00..000000000000
--- a/devel/ruby-inline/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Inline::C allows you to embed C/Ruby directly in ruby scripts
diff --git a/devel/rubygem-inline/Makefile b/devel/rubygem-inline/Makefile
index 3312306a6351..b75ae749ca30 100644
--- a/devel/rubygem-inline/Makefile
+++ b/devel/rubygem-inline/Makefile
@@ -15,6 +15,7 @@ DISTNAME= RubyInline-${PORTVERSION}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Inline::C allows you to embed C/Ruby directly in ruby scripts
USE_RUBY= yes
diff --git a/devel/rubygem-inline/pkg-comment b/devel/rubygem-inline/pkg-comment
deleted file mode 100644
index f3c86c8a0d00..000000000000
--- a/devel/rubygem-inline/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Inline::C allows you to embed C/Ruby directly in ruby scripts
diff --git a/devel/rvi/Makefile b/devel/rvi/Makefile
index fb0808e2c330..18c76d82fa85 100644
--- a/devel/rvi/Makefile
+++ b/devel/rvi/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cs.ru.ac.za/homes/g98t4414/rvi/
DISTNAME= rvi
MAINTAINER= petef@FreeBSD.org
+COMMENT= A simple interface to RCS
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/devel/rvi/pkg-comment b/devel/rvi/pkg-comment
deleted file mode 100644
index 27de5503fec8..000000000000
--- a/devel/rvi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple interface to RCS
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index fe663eeb6768..89d90a170fa6 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.geocities.com/ResearchTriangle/Forum/1353/
DISTNAME= ${PORTNAME}-${PORTVERSION}Ea
MAINTAINER= ambrisko@freebsd.org
+COMMENT= Cross compile 8051 code
WRKSRC= ${WRKDIR}/sdcc219Ea
GNU_CONFIGURE= yes
diff --git a/devel/sdcc/pkg-comment b/devel/sdcc/pkg-comment
deleted file mode 100644
index 28d7fbd2aaf9..000000000000
--- a/devel/sdcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross compile 8051 code
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 3412afed4cbc..359eee56351a 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.libsdl.org/release/ \
DISTNAME= SDL-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Cross-platform multi-media development API (developm. vers.)
LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
diff --git a/devel/sdl12/pkg-comment b/devel/sdl12/pkg-comment
deleted file mode 100644
index 2d9a693c2d5e..000000000000
--- a/devel/sdl12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cross-platform multi-media development API (developm. vers.)
diff --git a/devel/sdl_ldbad/Makefile b/devel/sdl_ldbad/Makefile
index 1da4d34f6531..6401462487b0 100644
--- a/devel/sdl_ldbad/Makefile
+++ b/devel/sdl_ldbad/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A SDL Linux Developer's BandAiD
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/devel/sdl_ldbad/pkg-comment b/devel/sdl_ldbad/pkg-comment
deleted file mode 100644
index cc9062fccfe8..000000000000
--- a/devel/sdl_ldbad/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A SDL Linux Developer's BandAiD
diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile
index 92a0f0b073b2..2daef5f15661 100644
--- a/devel/simgear/Makefile
+++ b/devel/simgear/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.simgear.org/pub/simgear/Source/ \
ftp://ftp.de.flightgear.org/pub/simgear/
MAINTAINER= des@FreeBSD.org
+COMMENT= A toolkit for 3D games and simulations
# These should be LIB_DEPENDS, but it seems bsd.port.mk can't handle
# versionless or static libraries.
diff --git a/devel/simgear/pkg-comment b/devel/simgear/pkg-comment
deleted file mode 100644
index 14e797a7dd45..000000000000
--- a/devel/simgear/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A toolkit for 3D games and simulations
diff --git a/devel/simulavr/Makefile b/devel/simulavr/Makefile
index 8c5a9d88c90c..851cf2a2d579 100644
--- a/devel/simulavr/Makefile
+++ b/devel/simulavr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://savannah.nongnu.org/download/simulavr/
MAINTAINER= joerg@FreeBSD.org
+COMMENT= A simulator for AVR microcontrollers
BUILD_DEPENDS= ${LOCALBASE}/avr/include/avr/io.h:${PORTSDIR}/devel/avr-libc \
avr-ld:${PORTSDIR}/devel/avr-binutils \
diff --git a/devel/simulavr/pkg-comment b/devel/simulavr/pkg-comment
deleted file mode 100644
index 0859e94b2aa3..000000000000
--- a/devel/simulavr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simulator for AVR microcontrollers
diff --git a/devel/sip/Makefile b/devel/sip/Makefile
index 619906428fad..6e8ea85695c4 100644
--- a/devel/sip/Makefile
+++ b/devel/sip/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.river-bank.demon.co.uk/download/sip/
DISTNAME= sip-x11-gpl-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Python to C++ bindings generator
USE_PYTHON= yes
USE_QT_VER= 3
diff --git a/devel/sip/pkg-comment b/devel/sip/pkg-comment
deleted file mode 100644
index 4b49f7034dfd..000000000000
--- a/devel/sip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python to C++ bindings generator
diff --git a/devel/soup/Makefile b/devel/soup/Makefile
index b7e914cfb7a6..3651bb0ff911 100644
--- a/devel/soup/Makefile
+++ b/devel/soup/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.7
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A SOAP (Simple Object Access Protocol) implementation in C
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt
diff --git a/devel/soup/pkg-comment b/devel/soup/pkg-comment
deleted file mode 100644
index 0179e22c405c..000000000000
--- a/devel/soup/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A SOAP (Simple Object Access Protocol) implementation in C
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 55032f0ad721..97b851ee5004 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -23,6 +23,7 @@ MASTER_SITE_SUBDIR= sourcenav/releases/
DISTNAME= SN452
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= Cygnus/GNU/Red Hat's IDE and source code analysis tool
BROKEN= "Does not build"
diff --git a/devel/sourcenav/pkg-comment b/devel/sourcenav/pkg-comment
deleted file mode 100644
index 5e40acf265d5..000000000000
--- a/devel/sourcenav/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cygnus/GNU/Red Hat's IDE and source code analysis tool
diff --git a/devel/st/Makefile b/devel/st/Makefile
index 228f0900741e..2ab894d1d19d 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= state-threads
MAINTAINER= tobez@FreeBSD.org
+COMMENT= State Threads Library for Internet Applications
INSTALLS_SHLIB= yes
ONLY_FOR_ARCHS= i386 alpha
diff --git a/devel/st/pkg-comment b/devel/st/pkg-comment
deleted file mode 100644
index 8904159b822e..000000000000
--- a/devel/st/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-State Threads Library for Internet Applications
diff --git a/devel/t1lib/Makefile b/devel/t1lib/Makefile
index 70a8189016dd..5b45b9ba7675 100644
--- a/devel/t1lib/Makefile
+++ b/devel/t1lib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/graphics
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A Type 1 Rasterizer Library for UNIX/X11
USE_GMAKE= yes
USE_LIBTOOL= yes
diff --git a/devel/t1lib/pkg-comment b/devel/t1lib/pkg-comment
deleted file mode 100644
index 12aaf42ece65..000000000000
--- a/devel/t1lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Type 1 Rasterizer Library for UNIX/X11
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 5333992a2d8d..adc10d16f0c7 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -14,6 +14,7 @@ DISTNAME= memchan${PORTVERSION}
MASTER_SITE_SUBDIR=${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Two new channel types for in-memory channels in TCL8
BUILD_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//}
diff --git a/devel/tcl-memchan/pkg-comment b/devel/tcl-memchan/pkg-comment
deleted file mode 100644
index ea54a8191849..000000000000
--- a/devel/tcl-memchan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Two new channel types for in-memory channels in TCL8
diff --git a/devel/tcl-neo/Makefile b/devel/tcl-neo/Makefile
index 5240dacd18b4..e8b7cd9b6122 100644
--- a/devel/tcl-neo/Makefile
+++ b/devel/tcl-neo/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=nws
DISTNAME= neowebscript-3.3
MAINTAINER= mi@aldan.algebra.com
+COMMENT= The NeoTCL part of NeoWebScript -- an Apache TCL mod
LIB_DEPENDS= tclx83:${PORTSDIR}/lang/tclX82 \
db2:${PORTSDIR}/databases/db2
diff --git a/devel/tcl-neo/pkg-comment b/devel/tcl-neo/pkg-comment
deleted file mode 100644
index c0967a0e2942..000000000000
--- a/devel/tcl-neo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The NeoTCL part of NeoWebScript -- an Apache TCL mod
diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
index bf76a6737ff6..ddc2092ec399 100644
--- a/devel/tcl-trf/Makefile
+++ b/devel/tcl-trf/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= tcl-
DISTNAME= trf${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Data conversion, digests, compression, error-correction for Tcl
BUILD_DEPENDS= tclsh${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER:S/.//} \
${LOCALBASE}/lib/tcl${TCL_VER}/Memchan/pkgIndex.tcl:${PORTSDIR}/devel/tcl-memchan
diff --git a/devel/tcl-trf/pkg-comment b/devel/tcl-trf/pkg-comment
deleted file mode 100644
index 0b9e264543c3..000000000000
--- a/devel/tcl-trf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Data conversion, digests, compression, error-correction for Tcl
diff --git a/devel/tclgetopts/Makefile b/devel/tclgetopts/Makefile
index 8b9f53b39c0a..cfc015f76aab 100644
--- a/devel/tclgetopts/Makefile
+++ b/devel/tclgetopts/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/languages/tcl/alcatel/code/ \
DISTNAME= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Pure TCL code for command line options parsing
NO_BUILD= YES
diff --git a/devel/tclgetopts/pkg-comment b/devel/tclgetopts/pkg-comment
deleted file mode 100644
index cd622376d2d7..000000000000
--- a/devel/tclgetopts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pure TCL code for command line options parsing
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index da821ed111e3..1696561ceb1c 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tcllib
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A collection of utility modules for Tcl
BROKEN= "Creates /root/foo at install-time"
diff --git a/devel/tcllib/pkg-comment b/devel/tcllib/pkg-comment
deleted file mode 100644
index faa9cd5ed4c8..000000000000
--- a/devel/tcllib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of utility modules for Tcl
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index f708466ce3b1..5e93e08c55b8 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=tls
DISTNAME= tls${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= SSL extensions for TCL; dynamicly loadable
LIB_DEPENDS+= tcl${TCLVND}:${PORTSDIR}/lang/tcl${TCLVND}
diff --git a/devel/tcltls/pkg-comment b/devel/tcltls/pkg-comment
deleted file mode 100644
index ad46710b1216..000000000000
--- a/devel/tcltls/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SSL extensions for TCL; dynamicly loadable
diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile
index 5cd192671c25..94979f5ee357 100644
--- a/devel/tdl/Makefile
+++ b/devel/tdl/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel
MASTER_SITES= http://www.rrbcurnow.freeuk.com/tdl/
MAINTAINER= petef@FreeBSD.org
+COMMENT= To-do list manager
USE_REINPLACE= yes
diff --git a/devel/tdl/pkg-comment b/devel/tdl/pkg-comment
deleted file mode 100644
index e036760ec363..000000000000
--- a/devel/tdl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-To-do list manager
diff --git a/devel/tinyq/Makefile b/devel/tinyq/Makefile
index 8f15161f390b..6cb99b14cca0 100644
--- a/devel/tinyq/Makefile
+++ b/devel/tinyq/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= devel kde
MASTER_SITES= http://savannah.nongnu.org/download/tinyq/
MAINTAINER= kde@freebsd.org
+COMMENT= A stripped down version of Qt 3 for use as a utility library
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/devel/tinyq/pkg-comment b/devel/tinyq/pkg-comment
deleted file mode 100644
index 341576c8b977..000000000000
--- a/devel/tinyq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A stripped down version of Qt 3 for use as a utility library
diff --git a/devel/tkp4/Makefile b/devel/tkp4/Makefile
index 6f6c951f3905..72c17efb5cd3 100644
--- a/devel/tkp4/Makefile
+++ b/devel/tkp4/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= devel tk83
MASTER_SITES= http://www.cuug.ab.ca/~macdonal/tkp4/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Tcl/Tk frontends to Perforce's p4
RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
p4:${PORTSDIR}/devel/perforce
diff --git a/devel/tkp4/pkg-comment b/devel/tkp4/pkg-comment
deleted file mode 100644
index 7ed654508807..000000000000
--- a/devel/tkp4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcl/Tk frontends to Perforce's p4
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 00ca4effef4e..5740c6ba6a8d 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE} \
MASTER_SITE_SUBDIR= devel/lang/c++
MAINTAINER= libh@FreeBSD.org
+COMMENT= The Turbo Vision C++ CUI library for UNIX
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/devel/tvision/pkg-comment b/devel/tvision/pkg-comment
deleted file mode 100644
index c5b3b6538363..000000000000
--- a/devel/tvision/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Turbo Vision C++ CUI library for UNIX
diff --git a/devel/uclmmbase/Makefile b/devel/uclmmbase/Makefile
index 27a1f4aae4ae..33d71905bff7 100644
--- a/devel/uclmmbase/Makefile
+++ b/devel/uclmmbase/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/common/
DISTNAME= common-${PORTVERSION}
MAINTAINER= fenner@FreeBSD.org
+COMMENT= Common subroutines for UCL mbone applications
WRKSRC= ${WRKDIR}/common
GNU_CONFIGURE= yes
diff --git a/devel/uclmmbase/pkg-comment b/devel/uclmmbase/pkg-comment
deleted file mode 100644
index 0351cab63a62..000000000000
--- a/devel/uclmmbase/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Common subroutines for UCL mbone applications
diff --git a/devel/veepee/Makefile b/devel/veepee/Makefile
index 61e44646090c..7e5d0b03ceda 100644
--- a/devel/veepee/Makefile
+++ b/devel/veepee/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.river-bank.demon.co.uk/software/
DISTNAME= VeePee-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A user orientated scripting environment for embedding in applications
LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
diff --git a/devel/veepee/pkg-comment b/devel/veepee/pkg-comment
deleted file mode 100644
index ed7804c26ae2..000000000000
--- a/devel/veepee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A user orientated scripting environment for embedding in applications
diff --git a/devel/zthread/Makefile b/devel/zthread/Makefile
index 67683d8dd47d..52acfd999052 100644
--- a/devel/zthread/Makefile
+++ b/devel/zthread/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ZThread-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A platform-independent object-oriented C++ threading library
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/devel/zthread/pkg-comment b/devel/zthread/pkg-comment
deleted file mode 100644
index 12925387766f..000000000000
--- a/devel/zthread/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A platform-independent object-oriented C++ threading library
diff --git a/dns/bind8/Makefile b/dns/bind8/Makefile
index 62cbc9e3be87..4e616d0e67d8 100644
--- a/dns/bind8/Makefile
+++ b/dns/bind8/Makefile
@@ -20,6 +20,7 @@ DISTFILES= bind-src.tar.gz bind-doc.tar.gz
DIST_SUBDIR= bind-${PORTVERSION}
MAINTAINER= DougB@FreeBSD.org
+COMMENT= The Berkeley Internet Name Daemon, an implementation of DNS
.if defined(PORT_REPLACES_BASE_BIND8)
PKGNAMESUFFIX= -base
diff --git a/dns/bind8/pkg-comment b/dns/bind8/pkg-comment
deleted file mode 100644
index aeebc91bec8c..000000000000
--- a/dns/bind8/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Berkeley Internet Name Daemon, an implementation of DNS
diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index bc5a2ad64739..bac69ef95120 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://burry.ca:4141/ddclient/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Update dynamic DNS entries
USE_PERL5= yes
NO_BUILD= yes
diff --git a/dns/ddclient/pkg-comment b/dns/ddclient/pkg-comment
deleted file mode 100644
index 4461f5b763e4..000000000000
--- a/dns/ddclient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Update dynamic DNS entries
diff --git a/dns/dnrd/Makefile b/dns/dnrd/Makefile
index e6da2990897d..eb0a726ae40d 100644
--- a/dns/dnrd/Makefile
+++ b/dns/dnrd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://members.home.com/garsh/dnrd/archive/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A proxy DNS daemon
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/dns/dnrd/pkg-comment b/dns/dnrd/pkg-comment
deleted file mode 100644
index 3c09965e0672..000000000000
--- a/dns/dnrd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A proxy DNS daemon
diff --git a/dns/dnstop/Makefile b/dns/dnstop/Makefile
index 6328c9724ac9..9dcd296d44fc 100644
--- a/dns/dnstop/Makefile
+++ b/dns/dnstop/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= net
MASTER_SITES= http://dnstop.measurement-factory.com/src/
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= Captures and analyzes DNS traffic (or analyzes libpcap dump)
NO_WRKSUBDIR= true
diff --git a/dns/dnstop/pkg-comment b/dns/dnstop/pkg-comment
deleted file mode 100644
index fdc7e34782dd..000000000000
--- a/dns/dnstop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Captures and analyzes DNS traffic (or analyzes libpcap dump)
diff --git a/dns/dnswalk/Makefile b/dns/dnswalk/Makefile
index eb04a3c3b048..25b5fa765d62 100644
--- a/dns/dnswalk/Makefile
+++ b/dns/dnswalk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.visi.com/~barr/dnswalk/
MAINTAINER= mph@freebsd.org
+COMMENT= DNS debugger - requests a zone transfer and analyzes the result
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
diff --git a/dns/dnswalk/pkg-comment b/dns/dnswalk/pkg-comment
deleted file mode 100644
index 8564bc9f11a3..000000000000
--- a/dns/dnswalk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DNS debugger - requests a zone transfer and analyzes the result
diff --git a/dns/ez-ipupdate/Makefile b/dns/ez-ipupdate/Makefile
index 0b30b781dee4..58d999a3c63b 100644
--- a/dns/ez-ipupdate/Makefile
+++ b/dns/ez-ipupdate/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://gusnet.cx/proj/ez-ipupdate/dist/
MAINTAINER= se@FreeBSD.org
+COMMENT= Update your host name on any dynamic DNS service
GNU_CONFIGURE= yes
diff --git a/dns/ez-ipupdate/pkg-comment b/dns/ez-ipupdate/pkg-comment
deleted file mode 100644
index 8f18e608cc5c..000000000000
--- a/dns/ez-ipupdate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Update your host name on any dynamic DNS service
diff --git a/dns/geta/Makefile b/dns/geta/Makefile
index 5da5fdb2c725..b599e08c4fd5 100644
--- a/dns/geta/Makefile
+++ b/dns/geta/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
DISTNAME= pping-${PORTVERSION}
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Geta(GET Address) - Simple IPv4/IPv6 address resolving tool
WRKSRC= ${WRKDIR}/pping
GNU_CONFIGURE= yes
diff --git a/dns/geta/pkg-comment b/dns/geta/pkg-comment
deleted file mode 100644
index 91ede309f27c..000000000000
--- a/dns/geta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Geta(GET Address) - Simple IPv4/IPv6 address resolving tool
diff --git a/dns/h2n/Makefile b/dns/h2n/Makefile
index de8bb03f9e8e..823f76e590a3 100644
--- a/dns/h2n/Makefile
+++ b/dns/h2n/Makefile
@@ -14,6 +14,7 @@ DISTNAME= dns
EXTRACT_SUFX= .tar.Z
MAINTAINER= sada@FreeBSD.org
+COMMENT= Translate host table to name server file format
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/dns/h2n/pkg-comment b/dns/h2n/pkg-comment
deleted file mode 100644
index 247f8b8528bf..000000000000
--- a/dns/h2n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translate host table to name server file format
diff --git a/dns/host/Makefile b/dns/host/Makefile
index 1c19daad9fd5..926f28d53b4e 100644
--- a/dns/host/Makefile
+++ b/dns/host/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An utility to query DNS servers
NO_WRKSUBDIR= yes
diff --git a/dns/host/pkg-comment b/dns/host/pkg-comment
deleted file mode 100644
index 818ac9c70f49..000000000000
--- a/dns/host/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility to query DNS servers
diff --git a/dns/nslint/Makefile b/dns/nslint/Makefile
index 0d04a2a3e28f..55b2a99406ba 100644
--- a/dns/nslint/Makefile
+++ b/dns/nslint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a/a/}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perform consistency checks on DNS zone files
GNU_CONFIGURE= yes
ALL_TARGET= nslint
diff --git a/dns/nslint/pkg-comment b/dns/nslint/pkg-comment
deleted file mode 100644
index 32f06b220550..000000000000
--- a/dns/nslint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perform consistency checks on DNS zone files
diff --git a/dns/p5-Net-DNS-ZoneFile/Makefile b/dns/p5-Net-DNS-ZoneFile/Makefile
index d254bdb045b4..37911b11b556 100644
--- a/dns/p5-Net-DNS-ZoneFile/Makefile
+++ b/dns/p5-Net-DNS-ZoneFile/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension to convert a zone file to a collection of RRs
BUILD_DEPENDS= ${SITE_PERL}/Net/DNS/RR.pm:${PORTSDIR}/net/p5-Net-DNS \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
diff --git a/dns/p5-Net-DNS-ZoneFile/pkg-comment b/dns/p5-Net-DNS-ZoneFile/pkg-comment
deleted file mode 100644
index 55832711cb08..000000000000
--- a/dns/p5-Net-DNS-ZoneFile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension to convert a zone file to a collection of RRs
diff --git a/dns/p5-Net-DNS/Makefile b/dns/p5-Net-DNS/Makefile
index ab79a0a6c31b..19f02b700006 100644
--- a/dns/p5-Net-DNS/Makefile
+++ b/dns/p5-Net-DNS/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Perl5 interface to the DNS resolver, and dymanic updates
# Warnings during build are harmless, the port does not need these to build
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
diff --git a/dns/p5-Net-DNS/pkg-comment b/dns/p5-Net-DNS/pkg-comment
deleted file mode 100644
index f26aa35b1375..000000000000
--- a/dns/p5-Net-DNS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to the DNS resolver, and dymanic updates
diff --git a/dns/p5-POE-Component-Client-DNS/Makefile b/dns/p5-POE-Component-Client-DNS/Makefile
index 8bf4c1f461f9..30a2a116def4 100644
--- a/dns/p5-POE-Component-Client-DNS/Makefile
+++ b/dns/p5-POE-Component-Client-DNS/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE component for non-blocking/concurrent DNS queries
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
diff --git a/dns/p5-POE-Component-Client-DNS/pkg-comment b/dns/p5-POE-Component-Client-DNS/pkg-comment
deleted file mode 100644
index 5cbf7d4d3aa5..000000000000
--- a/dns/p5-POE-Component-Client-DNS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE component for non-blocking/concurrent DNS queries
diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 3eca7f48bac2..99352424f313 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= abiword
DISTNAME= abiword-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An open-source, cross-platform WYSIWYG word processor
# unzip is needed during the installation process
BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip
diff --git a/editors/AbiWord/pkg-comment b/editors/AbiWord/pkg-comment
deleted file mode 100644
index 9156838a8ebf..000000000000
--- a/editors/AbiWord/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open-source, cross-platform WYSIWYG word processor
diff --git a/editors/aee/Makefile b/editors/aee/Makefile
index cda40479ca2d..1631af488eab 100644
--- a/editors/aee/Makefile
+++ b/editors/aee/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= editors
MASTER_SITES= http://mahon.cwx.net/sources/
MAINTAINER= kbyanc@posi.net
+COMMENT= An easy editor with both curses and X11 interfaces
.if !defined(BUILD_XAE)
ALL_TARGET= main
diff --git a/editors/aee/pkg-comment b/editors/aee/pkg-comment
deleted file mode 100644
index 50128e5e13df..000000000000
--- a/editors/aee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy editor with both curses and X11 interfaces
diff --git a/editors/boiling-egg/Makefile b/editors/boiling-egg/Makefile
index 6d45b3375b0e..dc8b1fcbc1f6 100644
--- a/editors/boiling-egg/Makefile
+++ b/editors/boiling-egg/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= # empty
EXTRACT_ONLY= # empty
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= A front-end of Egg V4
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/editors/boiling-egg/pkg-comment b/editors/boiling-egg/pkg-comment
deleted file mode 100644
index b5cd3f43e212..000000000000
--- a/editors/boiling-egg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A front-end of Egg V4
diff --git a/editors/bpatch/Makefile b/editors/bpatch/Makefile
index 404212205687..91990a735a1f 100644
--- a/editors/bpatch/Makefile
+++ b/editors/bpatch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
+COMMENT= A hex editor that doesn't load the whole file at once
MAN1= bpatch.1
NO_WRKSUBDIR= yes
diff --git a/editors/bpatch/pkg-comment b/editors/bpatch/pkg-comment
deleted file mode 100644
index 28258c418b05..000000000000
--- a/editors/bpatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A hex editor that doesn't load the whole file at once
diff --git a/editors/bvi/Makefile b/editors/bvi/Makefile
index dd52e5abef97..523c4e19a51f 100644
--- a/editors/bvi/Makefile
+++ b/editors/bvi/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= bvi
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= A vi-like binary file (hex)editor
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/bvi
diff --git a/editors/bvi/pkg-comment b/editors/bvi/pkg-comment
deleted file mode 100644
index e26acd66c6fe..000000000000
--- a/editors/bvi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A vi-like binary file (hex)editor
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 246b244eacbd..6916eea1ffeb 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src
DIST_SUBDIR= KDE/koffice
MAINTAINER= kde@FreeBSD.org
+COMMENT= Office Suite for KDE3
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/editors/calligra/pkg-comment b/editors/calligra/pkg-comment
deleted file mode 100644
index b4d60bc56d7e..000000000000
--- a/editors/calligra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Office Suite for KDE3
diff --git a/editors/color-mate/Makefile b/editors/color-mate/Makefile
index f8e9604875f2..72f4a8c57414 100644
--- a/editors/color-mate/Makefile
+++ b/editors/color-mate/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= editors elisp
MASTER_SITES= http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Color customizing module for Emacsen
BUILD_DEPENDS= lndir:${PORTSDIR}/x11/XFree86 \
showrgb:${PORTSDIR}/x11/XFree86
diff --git a/editors/color-mate/pkg-comment b/editors/color-mate/pkg-comment
deleted file mode 100644
index 5177f70a34a9..000000000000
--- a/editors/color-mate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Color customizing module for Emacsen
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 8ad33aad4e8f..8bfc53274942 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= pool/main/d/dedit
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A simple GNOME i18n editor
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/editors/dedit/pkg-comment b/editors/dedit/pkg-comment
deleted file mode 100644
index f7fec9045849..000000000000
--- a/editors/dedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple GNOME i18n editor
diff --git a/editors/emacs20-dl/Makefile b/editors/emacs20-dl/Makefile
index b40c5c0b845a..8346faf3bae8 100644
--- a/editors/emacs20-dl/Makefile
+++ b/editors/emacs20-dl/Makefile
@@ -24,6 +24,7 @@ PATCHFILES= emacs-20.4-dl3.diff.gz emacs-20.7-linespace-patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= shige@FreeBSD.org
+COMMENT= GNU editing macros with dynamic loading module function (binary only)
RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
diff --git a/editors/emacs20-dl/pkg-comment b/editors/emacs20-dl/pkg-comment
deleted file mode 100644
index 8e47b5ea4abf..000000000000
--- a/editors/emacs20-dl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU editing macros with dynamic loading module function (binary only)
diff --git a/editors/emacs20-mule-devel/Makefile b/editors/emacs20-mule-devel/Makefile
index 96982729e33d..0e8d0fcd1fc8 100644
--- a/editors/emacs20-mule-devel/Makefile
+++ b/editors/emacs20-mule-devel/Makefile
@@ -24,6 +24,7 @@ PATCHFILES= emacs-${EMACS_VER}-mule-${MULE_VER}.patch \
PATCH_DIST_STRIP= -p1
MAINTAINER= shige@FreeBSD.org
+COMMENT= GNU editing macros with dl module function and mule 4.1(binary only)
BUILD_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
RUN_DEPENDS= emacs-${EMACS_VER}:${PORTSDIR}/editors/emacs20
diff --git a/editors/emacs20-mule-devel/pkg-comment b/editors/emacs20-mule-devel/pkg-comment
deleted file mode 100644
index 5550c8c2287f..000000000000
--- a/editors/emacs20-mule-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU editing macros with dl module function and mule 4.1(binary only)
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 8dc427bee1a3..dcb54d9b6e5c 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nobutaka@FreeBSD.org
+COMMENT= GNU editing macros
.if !defined(WITHOUT_X11)
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
diff --git a/editors/emacs21/pkg-comment b/editors/emacs21/pkg-comment
deleted file mode 100644
index 5f2e16cd82ff..000000000000
--- a/editors/emacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU editing macros
diff --git a/editors/eshell-emacs20/Makefile b/editors/eshell-emacs20/Makefile
index 9fea81ac34a2..c7217cbe39bf 100644
--- a/editors/eshell-emacs20/Makefile
+++ b/editors/eshell-emacs20/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Command shell implemented in emacs lisp
EMACS_PORT_NAME= emacs20
diff --git a/editors/eshell-emacs20/pkg-comment b/editors/eshell-emacs20/pkg-comment
deleted file mode 100644
index 90645a84e940..000000000000
--- a/editors/eshell-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command shell implemented in emacs lisp
diff --git a/editors/fb/Makefile b/editors/fb/Makefile
index ca3631f4caca..f6face632c11 100644
--- a/editors/fb/Makefile
+++ b/editors/fb/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= _tar.gz
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Binary File Viewer, Editor, & Manipulator (and a lot more)
NO_WRKSUBDIR= Yes
diff --git a/editors/fb/pkg-comment b/editors/fb/pkg-comment
deleted file mode 100644
index e770301bf277..000000000000
--- a/editors/fb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Binary File Viewer, Editor, & Manipulator (and a lot more)
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index 9141098b6868..0d4d6b0952fb 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gedit/0.9
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A small but powerful text editor for Gnome Desktop Environment
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/editors/gedit/pkg-comment b/editors/gedit/pkg-comment
deleted file mode 100644
index 27ffa7128246..000000000000
--- a/editors/gedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small but powerful text editor for Gnome Desktop Environment
diff --git a/editors/gedit2/Makefile b/editors/gedit2/Makefile
index 0b2d61edb2b2..ce9b80e586b3 100644
--- a/editors/gedit2/Makefile
+++ b/editors/gedit2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gedit-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A small but powerful text editor for Gnome 2.0 Desktop Environment
LIB_DEPENDS= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
diff --git a/editors/gedit2/pkg-comment b/editors/gedit2/pkg-comment
deleted file mode 100644
index 331894a2cae5..000000000000
--- a/editors/gedit2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small but powerful text editor for Gnome 2.0 Desktop Environment
diff --git a/editors/ghex/Makefile b/editors/ghex/Makefile
index 7c21e182e072..02d569c5b6bf 100644
--- a/editors/ghex/Makefile
+++ b/editors/ghex/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/ghex/1.2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME hex editor
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/editors/ghex/pkg-comment b/editors/ghex/pkg-comment
deleted file mode 100644
index f55f49eb31e1..000000000000
--- a/editors/ghex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME hex editor
diff --git a/editors/ghex2/Makefile b/editors/ghex2/Makefile
index 83cb72cfa88d..cbd72344c63c 100644
--- a/editors/ghex2/Makefile
+++ b/editors/ghex2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2 hex editor
LIB_DEPENDS= gailutil.17:${PORTSDIR}/x11-toolkits/gail \
gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
diff --git a/editors/ghex2/pkg-comment b/editors/ghex2/pkg-comment
deleted file mode 100644
index ea010c6d3019..000000000000
--- a/editors/ghex2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2 hex editor
diff --git a/editors/glimmer/Makefile b/editors/glimmer/Makefile
index 4df39927a3f9..07f760bd1038 100644
--- a/editors/glimmer/Makefile
+++ b/editors/glimmer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A full featured code editor for GNOME desktop with many advanced features
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gtkmodule.so:${PORTSDIR}/x11-toolkits/py-gtk
diff --git a/editors/glimmer/pkg-comment b/editors/glimmer/pkg-comment
deleted file mode 100644
index b01f25303985..000000000000
--- a/editors/glimmer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full featured code editor for GNOME desktop with many advanced features
diff --git a/editors/hexedit/Makefile b/editors/hexedit/Makefile
index 732502373f3d..67e13693ab3a 100644
--- a/editors/hexedit/Makefile
+++ b/editors/hexedit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= utils/file/hex
EXTRACT_SUFX= .src.tgz
MAINTAINER= obrien@FreeBSD.org
+COMMENT= View and edit files in hexadecimal or ASCII
WRKSRC= ${WRKDIR}/${DISTNAME:S/-${PORTVERSION}//}
GNU_CONFIGURE= yes
diff --git a/editors/hexedit/pkg-comment b/editors/hexedit/pkg-comment
deleted file mode 100644
index b14a078e3b14..000000000000
--- a/editors/hexedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View and edit files in hexadecimal or ASCII
diff --git a/editors/hexpert/Makefile b/editors/hexpert/Makefile
index 9c442926a76a..46faae75ad58 100644
--- a/editors/hexpert/Makefile
+++ b/editors/hexpert/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= peter
MAINTAINER= peter@FreeBSD.org
+COMMENT= Hexpert - a simple but flexible binary file editor
.include <bsd.port.mk>
diff --git a/editors/hexpert/pkg-comment b/editors/hexpert/pkg-comment
deleted file mode 100644
index fa672f22a14f..000000000000
--- a/editors/hexpert/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hexpert - a simple but flexible binary file editor
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index ac7cbdfb7618..31a82dad101a 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Hierarchical NoteBook a data organizer
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
USE_GMAKE= yes
diff --git a/editors/hnb/pkg-comment b/editors/hnb/pkg-comment
deleted file mode 100644
index 5ee92dafd4e4..000000000000
--- a/editors/hnb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hierarchical NoteBook a data organizer
diff --git a/editors/jedit/Makefile b/editors/jedit/Makefile
index 2b75adb4702d..4e3b0c22e763 100644
--- a/editors/jedit/Makefile
+++ b/editors/jedit/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX= .jar
EXTRACT_ONLY=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Powerful programmer's text editor written in Java
BUILD_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
diff --git a/editors/jedit/pkg-comment b/editors/jedit/pkg-comment
deleted file mode 100644
index 9768e76e8b18..000000000000
--- a/editors/jedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Powerful programmer's text editor written in Java
diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index 0b03c485d92a..70e8e6025852 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= jext
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Powerful 100% pure Java text editor
RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jdk13
diff --git a/editors/jext/pkg-comment b/editors/jext/pkg-comment
deleted file mode 100644
index 70be8a6a72c3..000000000000
--- a/editors/jext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Powerful 100% pure Java text editor
diff --git a/editors/joe-devel/Makefile b/editors/joe-devel/Makefile
index 5f05e397fea1..3f16bc09a5ef 100644
--- a/editors/joe-devel/Makefile
+++ b/editors/joe-devel/Makefile
@@ -14,6 +14,7 @@ DISTNAME= joe-${PORTVERSION:S/p/-pre/}
EXTRACT_SUFX= .tgz
MAINTAINER= petef@FreeBSD.org
+COMMENT= Development version of Joe's own editor
MAN1= joe.1
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 246b244eacbd..6916eea1ffeb 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src
DIST_SUBDIR= KDE/koffice
MAINTAINER= kde@FreeBSD.org
+COMMENT= Office Suite for KDE3
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/editors/koffice-kde3/pkg-comment b/editors/koffice-kde3/pkg-comment
deleted file mode 100644
index b4d60bc56d7e..000000000000
--- a/editors/koffice-kde3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Office Suite for KDE3
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 246b244eacbd..6916eea1ffeb 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${PORTNAME}-${PORTVERSION}/src
DIST_SUBDIR= KDE/koffice
MAINTAINER= kde@FreeBSD.org
+COMMENT= Office Suite for KDE3
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/editors/koffice-kde4/pkg-comment b/editors/koffice-kde4/pkg-comment
deleted file mode 100644
index b4d60bc56d7e..000000000000
--- a/editors/koffice-kde4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Office Suite for KDE3
diff --git a/editors/kxmleditor/Makefile b/editors/kxmleditor/Makefile
index a1ed40e3e28f..f62b1b8abb15 100644
--- a/editors/kxmleditor/Makefile
+++ b/editors/kxmleditor/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= XML editor for KDE
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index c0f8108c4cd6..8fc8119bc688 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
MAINTAINER= shige@FreeBSD.org
+COMMENT= Libraries of (GNU) Emacs Input Method
LATEST_LINK= leim20
diff --git a/editors/leim21/Makefile b/editors/leim21/Makefile
index 251c8e04c3f1..810294251e41 100644
--- a/editors/leim21/Makefile
+++ b/editors/leim21/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= emacs
MAINTAINER= shige@FreeBSD.org
+COMMENT= Libraries of (GNU) Emacs Input Method
LATEST_LINK= leim21
diff --git a/editors/leo/Makefile b/editors/leo/Makefile
index 33a2d7b30d9a..5f9ecdc3caa2 100644
--- a/editors/leo/Makefile
+++ b/editors/leo/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}.zip ${SBOOKFILE} ${EXAMPLESFILES} ${WEBDOCSFILE}
DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
MAINTAINER= alane@freebsd.org
+COMMENT= An advanced outline editor
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/editors/manedit/Makefile b/editors/manedit/Makefile
index 163bac42f2f7..655086f2ce9f 100644
--- a/editors/manedit/Makefile
+++ b/editors/manedit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ftp://wolfpack.twu.net/users/wolfpack/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A UNIX manual page editor and viewer
WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}
diff --git a/editors/mg/Makefile b/editors/mg/Makefile
index d7efbb38baed..c52aa1a6d92b 100644
--- a/editors/mg/Makefile
+++ b/editors/mg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
+COMMENT= A small, fast Emacs-like editor
MANSECTS= 1
MAN1= mg.1
diff --git a/editors/mg/pkg-comment b/editors/mg/pkg-comment
deleted file mode 100644
index 9448a84e3dc9..000000000000
--- a/editors/mg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small, fast Emacs-like editor
diff --git a/editors/mode-info/Makefile b/editors/mode-info/Makefile
index 4c28abb666e4..3af3352bc7bc 100644
--- a/editors/mode-info/Makefile
+++ b/editors/mode-info/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= elisp
MASTER_SITES= http://namazu.org/~tsuchiya/elisp/
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Functions to refer Manuals on Emacsen with describe-* like interface
MI_INDEX+= mi-emacs.idx
MI_WITH_ELISP?= yes
diff --git a/editors/mode-info/pkg-comment b/editors/mode-info/pkg-comment
deleted file mode 100644
index 450565e31a51..000000000000
--- a/editors/mode-info/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Functions to refer Manuals on Emacsen with describe-* like interface
diff --git a/editors/moleskine/Makefile b/editors/moleskine/Makefile
index 0deb93184f47..974ce78bdca9 100644
--- a/editors/moleskine/Makefile
+++ b/editors/moleskine/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME:S/^m/M/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A generic source code editor for the GNOME desktop
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
${PYTHON_SITELIBDIR}/_gtkscintillamodule.so:${PORTSDIR}/x11-toolkits/py-gtkscintilla
diff --git a/editors/moleskine/pkg-comment b/editors/moleskine/pkg-comment
deleted file mode 100644
index e31422bc2bb0..000000000000
--- a/editors/moleskine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic source code editor for the GNOME desktop
diff --git a/editors/muggy/Makefile b/editors/muggy/Makefile
index 37a3ab91449b..73c59540a4c3 100644
--- a/editors/muggy/Makefile
+++ b/editors/muggy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.aaa-int.or.jp/~jfactory/Factory/JDE/dist/
DISTNAME= Muggy-${PORTVERSION}
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A simple text editor for the X on TkStep
RUN_DEPENDS= ${RUN_DEP_LIST}
LIB_DEPENDS= ${LIB_DEP_LIST}
diff --git a/editors/muggy/pkg-comment b/editors/muggy/pkg-comment
deleted file mode 100644
index 91f56a54b962..000000000000
--- a/editors/muggy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple text editor for the X on TkStep
diff --git a/editors/mule-common/Makefile b/editors/mule-common/Makefile
index e97a80f5ce36..07c253e4a906 100644
--- a/editors/mule-common/Makefile
+++ b/editors/mule-common/Makefile
@@ -16,6 +16,7 @@ DISTFILES= mule-${MULE_VERSION}-${EMACS_VERSION}.tar.gz \
mule-${MULE_VERSION}-${EMACS_VERSION}.patch-981002.tar.gz
MAINTAINER= taoka@FreeBSD.org
+COMMENT= For a multilingual emacs, emacs lisp files, info pages, etc (except executables)
MULE_VERSION= 2.3
EMACS_VERSION= 19.34
diff --git a/editors/mule-common/pkg-comment b/editors/mule-common/pkg-comment
deleted file mode 100644
index 352793a7a6f6..000000000000
--- a/editors/mule-common/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-For a multilingual emacs, emacs lisp files, info pages, etc (except executables)
diff --git a/editors/nedit/Makefile b/editors/nedit/Makefile
index a563650d4326..b6502dc23cd2 100644
--- a/editors/nedit/Makefile
+++ b/editors/nedit/Makefile
@@ -16,6 +16,7 @@ DISTFILES= nedit-5.3-source.tar.bz2 nedit.app-defaults
EXTRACT_ONLY= nedit-5.3-source.tar.bz2
MAINTAINER= deischen@freebsd.org
+COMMENT= An X11/Motif GUI text editor for programs and plain text files
USE_BZIP2= yes
USE_MOTIF= yes
diff --git a/editors/nedit/pkg-comment b/editors/nedit/pkg-comment
deleted file mode 100644
index ecd7dd966d0d..000000000000
--- a/editors/nedit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11/Motif GUI text editor for programs and plain text files
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index ade2f73a6182..d0f1736dc8ca 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.kotnet.org/~skimo/nvi/devel/ \
MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
+COMMENT= Development snapshot of the world-renown nvi editor
BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
diff --git a/editors/nvi-devel/pkg-comment b/editors/nvi-devel/pkg-comment
deleted file mode 100644
index 82a97cb574b3..000000000000
--- a/editors/nvi-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Development snapshot of the world-renown nvi editor
diff --git a/editors/scite/Makefile b/editors/scite/Makefile
index 6c1d6dd0f61e..8b18532704c4 100644
--- a/editors/scite/Makefile
+++ b/editors/scite/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A full-featured SCIntilla based Text Editor for GTK/GNOME
LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
diff --git a/editors/scite/pkg-comment b/editors/scite/pkg-comment
deleted file mode 100644
index 3ad1e2da60b6..000000000000
--- a/editors/scite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full-featured SCIntilla based Text Editor for GTK/GNOME
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 5593cefcdb20..3d96142f233e 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -30,6 +30,7 @@ DISTFILES+= soa-5_2-ga-bin-linux-en.bin
EXTRACT_ONLY= 109939-03.tar.Z
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/editors/staroffice52/pkg-comment b/editors/staroffice52/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/editors/staroffice52/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
diff --git a/editors/staroffice60/Makefile b/editors/staroffice60/Makefile
index 5c4a1388b990..9c71de2359bf 100644
--- a/editors/staroffice60/Makefile
+++ b/editors/staroffice60/Makefile
@@ -24,6 +24,7 @@ DISTFILES+= soa-6_0-ga-bin-linux-en.bin
EXTRACT_ONLY= 112887-03.tar
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart
ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
diff --git a/editors/staroffice60/pkg-comment b/editors/staroffice60/pkg-comment
deleted file mode 100644
index cda7c195775d..000000000000
--- a/editors/staroffice60/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wordprocessor/dbase/spreadheet/drawing/chart
diff --git a/editors/staroffice70/Makefile b/editors/staroffice70/Makefile
index 5c4a1388b990..9c71de2359bf 100644
--- a/editors/staroffice70/Makefile
+++ b/editors/staroffice70/Makefile
@@ -24,6 +24,7 @@ DISTFILES+= soa-6_0-ga-bin-linux-en.bin
EXTRACT_ONLY= 112887-03.tar
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart
ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
diff --git a/editors/staroffice70/pkg-comment b/editors/staroffice70/pkg-comment
deleted file mode 100644
index cda7c195775d..000000000000
--- a/editors/staroffice70/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wordprocessor/dbase/spreadheet/drawing/chart
diff --git a/editors/thoteditor/Makefile b/editors/thoteditor/Makefile
index a5e23704340c..36ee7224fef6 100644
--- a/editors/thoteditor/Makefile
+++ b/editors/thoteditor/Makefile
@@ -18,6 +18,7 @@ MASTER_SITE_SUBDIR= apps/editors/X/thot
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= An structured document editor, offering a graphical WYSIWYG interface
THOT_SUBDIR= Target
USE_MOTIF= yes
diff --git a/editors/thoteditor/pkg-comment b/editors/thoteditor/pkg-comment
deleted file mode 100644
index 2efa373b9e3f..000000000000
--- a/editors/thoteditor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An structured document editor, offering a graphical WYSIWYG interface
diff --git a/editors/uzap/Makefile b/editors/uzap/Makefile
index fbe0a4b75c7e..7c1dfc8ddd2a 100644
--- a/editors/uzap/Makefile
+++ b/editors/uzap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
DISTNAME= ${PORTNAME}
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Visual binary file editor
# restrictive Copyright; the author is no longer reachable, however :-(
RESTRICTED= "Restrictive copyright"
diff --git a/editors/uzap/pkg-comment b/editors/uzap/pkg-comment
deleted file mode 100644
index 548a9baa588f..000000000000
--- a/editors/uzap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Visual binary file editor
diff --git a/editors/ved/Makefile b/editors/ved/Makefile
index 886c97505c3f..0b2b308220f1 100644
--- a/editors/ved/Makefile
+++ b/editors/ved/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= editors
MASTER_SITES= ftp://ftp.fokus.gmd.de/pub/unix/ved/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A small and fast screen-oriented editor.
USE_GMAKE= yes
diff --git a/editors/ved/pkg-comment b/editors/ved/pkg-comment
deleted file mode 100644
index df47f257b040..000000000000
--- a/editors/ved/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small and fast screen-oriented editor.
diff --git a/editors/vigor/Makefile b/editors/vigor/Makefile
index 102e12f66e3c..61a5b262864f 100644
--- a/editors/vigor/Makefile
+++ b/editors/vigor/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= billf@FreeBSD.org
+COMMENT= A vi clone inspired by the userfriendly comic strip
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 \
tcl82.1:${PORTSDIR}/lang/tcl82
diff --git a/editors/vigor/pkg-comment b/editors/vigor/pkg-comment
deleted file mode 100644
index 021a8c0ccf32..000000000000
--- a/editors/vigor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A vi clone inspired by the userfriendly comic strip
diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 127e76c8969d..05efd179eac1 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -25,6 +25,7 @@ PATCHFILES+= 5.8.0${p}
.endfor
MAINTAINER?= obrien@FreeBSD.org
+COMMENT= Vi "workalike", with many additional features
.if defined(PACKAGE_BUILDING) && !defined(LITE)
BUILD_DEPENDS= tclsh8.0:${PORTSDIR}/lang/tcl80
diff --git a/editors/vim5/pkg-comment b/editors/vim5/pkg-comment
deleted file mode 100644
index 06543ff852c3..000000000000
--- a/editors/vim5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Vi "workalike", with many additional features
diff --git a/editors/wordperfect/Makefile b/editors/wordperfect/Makefile
index 479d9c766503..59017160a03f 100644
--- a/editors/wordperfect/Makefile
+++ b/editors/wordperfect/Makefile
@@ -14,6 +14,7 @@ DISTNAME= GUILG00
EXTRACT_SUFX= .GZ
MAINTAINER= msmith@freebsd.org
+COMMENT= Graphical word processor ported from Windows
ONLY_FOR_ARCHS= i386
NO_CDROM= "LIC: redistribution not allowed"
diff --git a/editors/wordperfect/pkg-comment b/editors/wordperfect/pkg-comment
deleted file mode 100644
index 8d04b793cb77..000000000000
--- a/editors/wordperfect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical word processor ported from Windows
diff --git a/editors/xemacs-additional-packages/Makefile b/editors/xemacs-additional-packages/Makefile
index 354532158116..3bc71f311193 100644
--- a/editors/xemacs-additional-packages/Makefile
+++ b/editors/xemacs-additional-packages/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Additional XEmacs elisp packages
RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.zenirc:${PORTSDIR}/editors/xemacs-comm-packages \
${LOCALBASE}/lib/xemacs/xemacs-packages/pkginfo/MANIFEST.misc-games:${PORTSDIR}/editors/xemacs-games-packages \
diff --git a/editors/xemacs-additional-packages/pkg-comment b/editors/xemacs-additional-packages/pkg-comment
deleted file mode 100644
index c70f9cc5da78..000000000000
--- a/editors/xemacs-additional-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional XEmacs elisp packages
diff --git a/editors/xemacs-basic-mule-packages/Makefile b/editors/xemacs-basic-mule-packages/Makefile
index 1535d62f7dea..3e7d6349f155 100644
--- a/editors/xemacs-basic-mule-packages/Makefile
+++ b/editors/xemacs-basic-mule-packages/Makefile
@@ -20,6 +20,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Basic XEmacs elisp packages with Mule(basic-mule)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-basic-mule-packages/pkg-comment b/editors/xemacs-basic-mule-packages/pkg-comment
deleted file mode 100644
index 31f0c4e9cb05..000000000000
--- a/editors/xemacs-basic-mule-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Basic XEmacs elisp packages with Mule(basic-mule)
diff --git a/editors/xemacs-comm-packages/Makefile b/editors/xemacs-comm-packages/Makefile
index 7f31674d0848..2ef0fa031b66 100644
--- a/editors/xemacs-comm-packages/Makefile
+++ b/editors/xemacs-comm-packages/Makefile
@@ -28,6 +28,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Communication(comm)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-comm-packages/pkg-comment b/editors/xemacs-comm-packages/pkg-comment
deleted file mode 100644
index 535a01a5d21d..000000000000
--- a/editors/xemacs-comm-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Communication(comm)
diff --git a/editors/xemacs-games-packages/Makefile b/editors/xemacs-games-packages/Makefile
index 293ae05b1bf4..60e6b2d4aef6 100644
--- a/editors/xemacs-games-packages/Makefile
+++ b/editors/xemacs-games-packages/Makefile
@@ -19,6 +19,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Games(games)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-games-packages/pkg-comment b/editors/xemacs-games-packages/pkg-comment
deleted file mode 100644
index aef5c0488665..000000000000
--- a/editors/xemacs-games-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Games(games)
diff --git a/editors/xemacs-libs-packages/Makefile b/editors/xemacs-libs-packages/Makefile
index 28a41972ec9f..6b38b422a316 100644
--- a/editors/xemacs-libs-packages/Makefile
+++ b/editors/xemacs-libs-packages/Makefile
@@ -21,6 +21,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Libraries(libs)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-libs-packages/pkg-comment b/editors/xemacs-libs-packages/pkg-comment
deleted file mode 100644
index 8a4e79dc54fc..000000000000
--- a/editors/xemacs-libs-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Libraries(libs)
diff --git a/editors/xemacs-mule-packages/Makefile b/editors/xemacs-mule-packages/Makefile
index 96977d230c36..07517ca893bd 100644
--- a/editors/xemacs-mule-packages/Makefile
+++ b/editors/xemacs-mule-packages/Makefile
@@ -24,6 +24,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Mule(mule-packages)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-mule-packages/pkg-comment b/editors/xemacs-mule-packages/pkg-comment
deleted file mode 100644
index d8bc5ce62bcf..000000000000
--- a/editors/xemacs-mule-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Mule(mule-packages)
diff --git a/editors/xemacs-oa-packages/Makefile b/editors/xemacs-oa-packages/Makefile
index 954e76ca9a61..343612a6302c 100644
--- a/editors/xemacs-oa-packages/Makefile
+++ b/editors/xemacs-oa-packages/Makefile
@@ -23,6 +23,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Office Automation(oa)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-oa-packages/pkg-comment b/editors/xemacs-oa-packages/pkg-comment
deleted file mode 100644
index 783a4d97e0b8..000000000000
--- a/editors/xemacs-oa-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Office Automation(oa)
diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index a65aac5c5f9b..5f04b82c5cbc 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -119,6 +119,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Basic XEmacs elisp packages(xemacs-packages)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-packages/pkg-comment b/editors/xemacs-packages/pkg-comment
deleted file mode 100644
index 81fea6e21032..000000000000
--- a/editors/xemacs-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Basic XEmacs elisp packages(xemacs-packages)
diff --git a/editors/xemacs-prog-packages/Makefile b/editors/xemacs-prog-packages/Makefile
index 08418c5357e5..dd482f86d407 100644
--- a/editors/xemacs-prog-packages/Makefile
+++ b/editors/xemacs-prog-packages/Makefile
@@ -24,6 +24,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Programing(prog)
RUN_DEPENDS= ${XEMACSDIR}/mule-packages/lisp/elib/avltree.el:${.CURDIR}/../xemacs-basic-mule-packages
diff --git a/editors/xemacs-prog-packages/pkg-comment b/editors/xemacs-prog-packages/pkg-comment
deleted file mode 100644
index c050eebf9d57..000000000000
--- a/editors/xemacs-prog-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Programing(prog)
diff --git a/editors/xemacs-wp-packages/Makefile b/editors/xemacs-wp-packages/Makefile
index 7d0cf87db95f..f02b190e0d4c 100644
--- a/editors/xemacs-wp-packages/Makefile
+++ b/editors/xemacs-wp-packages/Makefile
@@ -20,6 +20,7 @@ DISTFILES= \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XEmacs elisp packages for Word Processing(wp)
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PACKAGES_SUBDIR}
diff --git a/editors/xemacs-wp-packages/pkg-comment b/editors/xemacs-wp-packages/pkg-comment
deleted file mode 100644
index b114988fa689..000000000000
--- a/editors/xemacs-wp-packages/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs elisp packages for Word Processing(wp)
diff --git a/editors/xemacs21-sumo/Makefile b/editors/xemacs21-sumo/Makefile
index 08fe17c2ebfe..20ec7281efc0 100644
--- a/editors/xemacs21-sumo/Makefile
+++ b/editors/xemacs21-sumo/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= kiri@FreeBSD.org
+COMMENT= The "meta-port" for XEmacs with SUMO packages
RUN_DEPENDS= ${RUN_DEP_LIST}
# below line would be remove comment and add RUN_DEPNDS after any xemacs-*-packages added
diff --git a/editors/xemacs21-sumo/pkg-comment b/editors/xemacs21-sumo/pkg-comment
deleted file mode 100644
index 7e0724b12229..000000000000
--- a/editors/xemacs21-sumo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for XEmacs with SUMO packages
diff --git a/editors/xenon/Makefile b/editors/xenon/Makefile
index 0b899d3c2a3a..c9f70f8c015f 100644
--- a/editors/xenon/Makefile
+++ b/editors/xenon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://sydney.proximity.com.au/~ben/xenon/dist/ \
ftp://yankee.proximitygroup.com/pub/xenon/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Simple X-based text editor
USE_GMAKE= yes
USE_REINPLACE= yes
diff --git a/editors/xenon/pkg-comment b/editors/xenon/pkg-comment
deleted file mode 100644
index 21a3b1729025..000000000000
--- a/editors/xenon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple X-based text editor
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 5610bb014aa8..d9afdde65262 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= apps/editors/X
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
+COMMENT= Multi-lingual unicode text editor with TTF support
BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
diff --git a/editors/yudit/pkg-comment b/editors/yudit/pkg-comment
deleted file mode 100644
index 16a187d485b8..000000000000
--- a/editors/yudit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-lingual unicode text editor with TTF support
diff --git a/emulators/basiliskII/Makefile b/emulators/basiliskII/Makefile
index 872759f07184..e217ce7e1229 100644
--- a/emulators/basiliskII/Makefile
+++ b/emulators/basiliskII/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= basilisk
DISTNAME= BasiliskII_src_31052001
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A free, portable, Open Source 68k Mac emulator
WRKSRC= ${WRKDIR}/BasiliskII-${PORTVERSION}/src/Unix
diff --git a/emulators/basiliskII/pkg-comment b/emulators/basiliskII/pkg-comment
deleted file mode 100644
index b359a8614cd0..000000000000
--- a/emulators/basiliskII/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free, portable, Open Source 68k Mac emulator
diff --git a/emulators/bfe/Makefile b/emulators/bfe/Makefile
index 60a392cd877e..df4300911ccd 100644
--- a/emulators/bfe/Makefile
+++ b/emulators/bfe/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= emulators
MASTER_SITES= http://www.qzx.com/bfe/_download/
MAINTAINER= greid@FreeBSD.org
+COMMENT= X11 GUI for the bochs debugger
LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms
RUN_DEPENDS= bochs:${PORTSDIR}/emulators/bochs
diff --git a/emulators/bfe/pkg-comment b/emulators/bfe/pkg-comment
deleted file mode 100644
index 07b3b96669c3..000000000000
--- a/emulators/bfe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 GUI for the bochs debugger
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 45319b11fe57..adfc8fc21043 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz
MAINTAINER= anholt@FreeBSD.org
+COMMENT= An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
# Global variables
#
diff --git a/emulators/bochs/pkg-comment b/emulators/bochs/pkg-comment
deleted file mode 100644
index f2138abb184b..000000000000
--- a/emulators/bochs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An IA-32 (x86) PC emulator that runs DOS, Win 95, and more
diff --git a/emulators/cingb/Makefile b/emulators/cingb/Makefile
index 0441d408908a..01f56057fbda 100644
--- a/emulators/cingb/Makefile
+++ b/emulators/cingb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= yet another Nintendo GameBoy(tm) emulator
WRKSRC= ${WRKDIR}/cingb
diff --git a/emulators/cingb/pkg-comment b/emulators/cingb/pkg-comment
deleted file mode 100644
index 9c1e1c670f2d..000000000000
--- a/emulators/cingb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-yet another Nintendo GameBoy(tm) emulator
diff --git a/emulators/cpmtools/Makefile b/emulators/cpmtools/Makefile
index 9692e75f72ea..c8b720c8dfd7 100644
--- a/emulators/cpmtools/Makefile
+++ b/emulators/cpmtools/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTNAME= cpm-${PORTVERSION}
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Utility to transfer files from/to CP/M (R) diskettes
WRKSRC= ${WRKDIR}/cpm
MAN1= cpm.1
diff --git a/emulators/cpmtools/pkg-comment b/emulators/cpmtools/pkg-comment
deleted file mode 100644
index d198974083df..000000000000
--- a/emulators/cpmtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to transfer files from/to CP/M (R) diskettes
diff --git a/emulators/darcnes/Makefile b/emulators/darcnes/Makefile
index 7eada6fb9de8..b237fb76716a 100644
--- a/emulators/darcnes/Makefile
+++ b/emulators/darcnes/Makefile
@@ -13,6 +13,7 @@ DISTNAME= dn${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= multi-system emulator
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/emulators/darcnes/pkg-comment b/emulators/darcnes/pkg-comment
deleted file mode 100644
index 62c4c3528d7c..000000000000
--- a/emulators/darcnes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-multi-system emulator
diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index 4537ee3c3fe8..6476f5acc6eb 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= emulators
MASTER_SITES= http://pknet.com/~joe/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A wonderful Sega Genesis/MegaDrive emulator
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/emulators/dgen-sdl/pkg-comment b/emulators/dgen-sdl/pkg-comment
deleted file mode 100644
index ceb8917c87fa..000000000000
--- a/emulators/dgen-sdl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A wonderful Sega Genesis/MegaDrive emulator
diff --git a/emulators/freesci/Makefile b/emulators/freesci/Makefile
index ba0b6e9cf8af..4bd8e202cf37 100644
--- a/emulators/freesci/Makefile
+++ b/emulators/freesci/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.task.gda.pl/pub/games/linuxgames/freesci/ \
http://pelit.saunalahti.fi/telenation/linuxgames/freesci/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A portable interpreter for SCI games, such as the Space Quest series.
LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi \
png.5:${PORTSDIR}/graphics/png
diff --git a/emulators/freesci/pkg-comment b/emulators/freesci/pkg-comment
deleted file mode 100644
index 67a2decef7ed..000000000000
--- a/emulators/freesci/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable interpreter for SCI games, such as the Space Quest series.
diff --git a/emulators/gbe/Makefile b/emulators/gbe/Makefile
index 8a8c1efd0c29..ac63bf7d1733 100644
--- a/emulators/gbe/Makefile
+++ b/emulators/gbe/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= emulators
MASTER_SITES= http://www.zophar.net/unix/Files/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Nintendo GameBoy(tm) emulator with GNU source code
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/emulators/gbe/pkg-comment b/emulators/gbe/pkg-comment
deleted file mode 100644
index 3f9f9ac490c2..000000000000
--- a/emulators/gbe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nintendo GameBoy(tm) emulator with GNU source code
diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile
index 10e93b4b9fdc..e8b919b05245 100644
--- a/emulators/generator/Makefile
+++ b/emulators/generator/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= emulators
MASTER_SITES= http://www.squish.net/generator/files/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= SEGA Genesis emulator
LIB_DEPENDS= tcl82.1:${PORTSDIR}/lang/tcl82 \
tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/emulators/generator/pkg-comment b/emulators/generator/pkg-comment
deleted file mode 100644
index 5d0f3c1f9234..000000000000
--- a/emulators/generator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEGA Genesis emulator
diff --git a/emulators/gngb/Makefile b/emulators/gngb/Makefile
index 4a8d26755baf..a351d83ee8d9 100644
--- a/emulators/gngb/Makefile
+++ b/emulators/gngb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://membres.lycos.fr/frogus/gngb/download/
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= GameBoy(tm) emulator
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/emulators/gngb/pkg-comment b/emulators/gngb/pkg-comment
deleted file mode 100644
index b2ccdad9ac89..000000000000
--- a/emulators/gngb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GameBoy(tm) emulator
diff --git a/emulators/gnuboy/Makefile b/emulators/gnuboy/Makefile
index 680f95eb93ed..88330620e2b8 100644
--- a/emulators/gnuboy/Makefile
+++ b/emulators/gnuboy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://gnuboy.unix-fu.org/src/ \
http://brightrain.aerifal.cx/~laguna/src/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Nintendo GameBoy emulator
LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib \
SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/emulators/gnuboy/pkg-comment b/emulators/gnuboy/pkg-comment
deleted file mode 100644
index 5f20f1683b26..000000000000
--- a/emulators/gnuboy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nintendo GameBoy emulator
diff --git a/emulators/gsnes9x/Makefile b/emulators/gsnes9x/Makefile
index e9474293abe0..1b03913cede9 100644
--- a/emulators/gsnes9x/Makefile
+++ b/emulators/gsnes9x/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= GSnes9x-${PORTVERSION}
MAINTAINER= kbyanc@posi.net
+COMMENT= A GTK front-end for the Snes9X SNES emulator
RUN_DEPENDS= snes9x:${PORTSDIR}/emulators/snes9x
diff --git a/emulators/gsnes9x/pkg-comment b/emulators/gsnes9x/pkg-comment
deleted file mode 100644
index 7b561356951d..000000000000
--- a/emulators/gsnes9x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK front-end for the Snes9X SNES emulator
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index 84591759cbd4..3d7c34e37bdf 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= emulators
MASTER_SITES= http://www.conmicro.cx/hercules/
MAINTAINER= phk@FreeBSD.org
+COMMENT= The Hercules System/370, ESA/390, and z/Architecture Emulator
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/emulators/hercules/pkg-comment b/emulators/hercules/pkg-comment
deleted file mode 100644
index e302b0543a42..000000000000
--- a/emulators/hercules/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Hercules System/370, ESA/390, and z/Architecture Emulator
diff --git a/emulators/hfs/Makefile b/emulators/hfs/Makefile
index 626138de7b71..3b4abffa0ea1 100644
--- a/emulators/hfs/Makefile
+++ b/emulators/hfs/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}${PORTVERSION:S/./_/}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Read Macintosh HFS floppy disks, hard drives and CDROMs
USE_GMAKE= yes
MAN1= hfs.1
diff --git a/emulators/hfs/pkg-comment b/emulators/hfs/pkg-comment
deleted file mode 100644
index 0cdca0f05350..000000000000
--- a/emulators/hfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Read Macintosh HFS floppy disks, hard drives and CDROMs
diff --git a/emulators/hfsutils/Makefile b/emulators/hfsutils/Makefile
index 9b7ef3083e7a..b8ad3489c73c 100644
--- a/emulators/hfsutils/Makefile
+++ b/emulators/hfsutils/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= emulators tk82
MASTER_SITES= ftp://ftp.mars.org/pub/hfs/
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Yet Another HFS Utility
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/emulators/hfsutils/pkg-comment b/emulators/hfsutils/pkg-comment
deleted file mode 100644
index f2b8fc387fc0..000000000000
--- a/emulators/hfsutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another HFS Utility
diff --git a/emulators/ines/Makefile b/emulators/ines/Makefile
index d9a6fbd81ed8..55c99b526355 100644
--- a/emulators/ines/Makefile
+++ b/emulators/ines/Makefile
@@ -13,6 +13,7 @@ DISTNAME= iNES22-FreeBSD-80x86-bin
EXTRACT_SUFX= .tar.Z
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Nintendo Entertainment System emlator for X
NO_WRKSUBDIR= yes
USE_X_PREFIX= yes
diff --git a/emulators/ines/pkg-comment b/emulators/ines/pkg-comment
deleted file mode 100644
index 5fb164687207..000000000000
--- a/emulators/ines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nintendo Entertainment System emlator for X
diff --git a/emulators/linux-winetools/Makefile b/emulators/linux-winetools/Makefile
index 4b94c34ff394..29f74d8a695f 100644
--- a/emulators/linux-winetools/Makefile
+++ b/emulators/linux-winetools/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=
EXTRACT_ONLY=
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A setup and configuration tool for WINE
RUN_DEPENDS= wine:${PORTSDIR}/emulators/wine
diff --git a/emulators/linux-winetools/pkg-comment b/emulators/linux-winetools/pkg-comment
deleted file mode 100644
index ec992dbd594d..000000000000
--- a/emulators/linux-winetools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A setup and configuration tool for WINE
diff --git a/emulators/mastergear/Makefile b/emulators/mastergear/Makefile
index 487eace5fbe5..3dc4b40653f8 100644
--- a/emulators/mastergear/Makefile
+++ b/emulators/mastergear/Makefile
@@ -13,6 +13,7 @@ DISTNAME= MG13-FreeBSD-80x86-bin
EXTRACT_SUFX= .tar.Z
MAINTAINER= nakai@FreeBSD.org
+COMMENT= SEGA Master System and Game Gear emulator for X
NO_WRKSUBDIR= yes
ONLY_FOR_ARCHS= i386
diff --git a/emulators/mastergear/pkg-comment b/emulators/mastergear/pkg-comment
deleted file mode 100644
index 2f72cf0368b5..000000000000
--- a/emulators/mastergear/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SEGA Master System and Game Gear emulator for X
diff --git a/emulators/minivmac/Makefile b/emulators/minivmac/Makefile
index 62788694efc5..e223bdf160ed 100644
--- a/emulators/minivmac/Makefile
+++ b/emulators/minivmac/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}.src
EXTRACT_SUFX= .tgz
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A miniature Macintosh emulator
USE_REINPLACE= yes
USE_XLIB= yes
diff --git a/emulators/minivmac/pkg-comment b/emulators/minivmac/pkg-comment
deleted file mode 100644
index 08571d44ef04..000000000000
--- a/emulators/minivmac/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A miniature Macintosh emulator
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 29bce236b7b4..1bc1cfeb1c77 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -17,6 +17,7 @@ PATCHFILES= mtools-3.9.8-20011127.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A collection of tools for manipulating MSDOS files
GNU_CONFIGURE= yes
.if !defined(WITHOUT_X11)
diff --git a/emulators/mtools/pkg-comment b/emulators/mtools/pkg-comment
deleted file mode 100644
index a3105a35f06c..000000000000
--- a/emulators/mtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of tools for manipulating MSDOS files
diff --git a/emulators/osf1_base/Makefile b/emulators/osf1_base/Makefile
index 42397f02a9af..e07fa7f43137 100644
--- a/emulators/osf1_base/Makefile
+++ b/emulators/osf1_base/Makefile
@@ -14,6 +14,7 @@ DISTNAME= netscape-4.7-3.alpha
EXTRACT_SUFX= .rpm
MAINTAINER= obrien@FreeBSD.org
+COMMENT= The base set of libraries needed in OSF/1 (Tru64) mode
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/emulators/osf1_base/pkg-comment b/emulators/osf1_base/pkg-comment
deleted file mode 100644
index f1a1ba1586cc..000000000000
--- a/emulators/osf1_base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of libraries needed in OSF/1 (Tru64) mode
diff --git a/emulators/pcemu/Makefile b/emulators/pcemu/Makefile
index 947b56ca7ff3..718e788af631 100644
--- a/emulators/pcemu/Makefile
+++ b/emulators/pcemu/Makefile
@@ -24,6 +24,7 @@ MASTER_SITES+= ftp://ftp.cs.bris.ac.uk/pub/users/hedley/
DISTNAME= pcemu1.01alpha
MAINTAINER= joerg@FreeBSD.org
+COMMENT= An 8086 PC emulator, by David Hedley
.include <bsd.port.pre.mk>
diff --git a/emulators/pcemu/pkg-comment b/emulators/pcemu/pkg-comment
deleted file mode 100644
index 9d1d1031f5fc..000000000000
--- a/emulators/pcemu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An 8086 PC emulator, by David Hedley
diff --git a/emulators/psim-freebsd/Makefile b/emulators/psim-freebsd/Makefile
index e2f4e5f76ebf..31817646187c 100644
--- a/emulators/psim-freebsd/Makefile
+++ b/emulators/psim-freebsd/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= gdb/releases
DISTNAME= gdb-${PORTVERSION}
MAINTAINER= mp@FreeBSD.org
+COMMENT= PowerPC simulator (PSIM) running in the GNU GDB 5
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/emulators/psim-freebsd/pkg-comment b/emulators/psim-freebsd/pkg-comment
deleted file mode 100644
index b74cbfba51be..000000000000
--- a/emulators/psim-freebsd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PowerPC simulator (PSIM) running in the GNU GDB 5
diff --git a/emulators/rtc/Makefile b/emulators/rtc/Makefile
index 1f00a81fa2c4..52b3868fcf2d 100644
--- a/emulators/rtc/Makefile
+++ b/emulators/rtc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= freebsd-emulation@FreeBSD.org
+COMMENT= Kernel module which provides /dev/rtc device support
WRKSRC= ${WRKDIR}/files
diff --git a/emulators/rtc/pkg-comment b/emulators/rtc/pkg-comment
deleted file mode 100644
index 3d284619d361..000000000000
--- a/emulators/rtc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kernel module which provides /dev/rtc device support
diff --git a/emulators/sim/Makefile b/emulators/sim/Makefile
index 7914bab93fff..763e2d61d63e 100644
--- a/emulators/sim/Makefile
+++ b/emulators/sim/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=jedgar
DISTNAME= ${PORTNAME}hv210-1
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= PDP-8, PDP-11, PDP-1, other 18b PDP, Nova, and IBM 1401 simulators
USE_ZIP= yes
USE_GMAKE= yes
diff --git a/emulators/sim/pkg-comment b/emulators/sim/pkg-comment
deleted file mode 100644
index bae7bcefa42d..000000000000
--- a/emulators/sim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PDP-8, PDP-11, PDP-1, other 18b PDP, Nova, and IBM 1401 simulators
diff --git a/emulators/simh/Makefile b/emulators/simh/Makefile
index 7914bab93fff..763e2d61d63e 100644
--- a/emulators/simh/Makefile
+++ b/emulators/simh/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=jedgar
DISTNAME= ${PORTNAME}hv210-1
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= PDP-8, PDP-11, PDP-1, other 18b PDP, Nova, and IBM 1401 simulators
USE_ZIP= yes
USE_GMAKE= yes
diff --git a/emulators/simh/pkg-comment b/emulators/simh/pkg-comment
deleted file mode 100644
index bae7bcefa42d..000000000000
--- a/emulators/simh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PDP-8, PDP-11, PDP-1, other 18b PDP, Nova, and IBM 1401 simulators
diff --git a/emulators/ski/Makefile b/emulators/ski/Makefile
index e7454732162c..548f41b4a897 100644
--- a/emulators/ski/Makefile
+++ b/emulators/ski/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ski-0.943l-2.i386
EXTRACT_SUFX= .rpm
MAINTAINER= freebsd-ia64@FreeBSD.org
+COMMENT= HP's Ski IA-64 simulator
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/emulators/ski/pkg-comment b/emulators/ski/pkg-comment
deleted file mode 100644
index 2428c4cdf1ac..000000000000
--- a/emulators/ski/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HP's Ski IA-64 simulator
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 486467c92329..bca715d7bf8a 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.snes9x.com/zips/
DISTNAME= s9xs137c
MAINTAINER= green@FreeBSD.org
+COMMENT= Super Nintendo Entertainment System(SNES) Emulator
.if ${MACHINE_ARCH} == i386
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
diff --git a/emulators/snes9x/pkg-comment b/emulators/snes9x/pkg-comment
deleted file mode 100644
index 71eef7eca23e..000000000000
--- a/emulators/snes9x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Super Nintendo Entertainment System(SNES) Emulator
diff --git a/emulators/tkhfs/Makefile b/emulators/tkhfs/Makefile
index 6f9d4eb9ccfa..78f5042c10a0 100644
--- a/emulators/tkhfs/Makefile
+++ b/emulators/tkhfs/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A Tcl/Tk front end to the hfs program
RUN_DEPENDS= hfs:${PORTSDIR}/emulators/hfs \
wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/emulators/tkhfs/pkg-comment b/emulators/tkhfs/pkg-comment
deleted file mode 100644
index 03030060916b..000000000000
--- a/emulators/tkhfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tcl/Tk front end to the hfs program
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 7d4a6ef8c84f..e3e730aca650 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= asmodai@freebsd.org
+COMMENT= A Nintendo Entertainment System 8-bit emulator
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/emulators/tuxnes/pkg-comment b/emulators/tuxnes/pkg-comment
deleted file mode 100644
index 289030f9ac1a..000000000000
--- a/emulators/tuxnes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Nintendo Entertainment System 8-bit emulator
diff --git a/emulators/vgb/Makefile b/emulators/vgb/Makefile
index f2e7c750d2d8..a8bc874583bd 100644
--- a/emulators/vgb/Makefile
+++ b/emulators/vgb/Makefile
@@ -14,6 +14,7 @@ DISTNAME= VGB
EXTRACT_SUFX= .tar.Z
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Nintendo GameBoy(tm) emulator
WRKSRC= ${WRKDIR}/GB
diff --git a/emulators/vgb/pkg-comment b/emulators/vgb/pkg-comment
deleted file mode 100644
index 9fdb4c3483c8..000000000000
--- a/emulators/vgb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Nintendo GameBoy(tm) emulator
diff --git a/emulators/visualos/Makefile b/emulators/visualos/Makefile
index 288d1fc5d466..b1b15ae8a12c 100644
--- a/emulators/visualos/Makefile
+++ b/emulators/visualos/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= visualos
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A visual simulator of an operating system to help understand how OSes work
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/emulators/visualos/pkg-comment b/emulators/visualos/pkg-comment
deleted file mode 100644
index 98451e6440be..000000000000
--- a/emulators/visualos/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A visual simulator of an operating system to help understand how OSes work
diff --git a/emulators/vmsbackup/Makefile b/emulators/vmsbackup/Makefile
index 0136101792cb..3386e00ede4b 100644
--- a/emulators/vmsbackup/Makefile
+++ b/emulators/vmsbackup/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= jmb@FreeBSD.org
+COMMENT= Reads VMS BACKUP tapes
MAN1= vmsbackup.1
MANCOMPRESSED= yes
diff --git a/emulators/vmsbackup/pkg-comment b/emulators/vmsbackup/pkg-comment
deleted file mode 100644
index 6d4db9fb5ab2..000000000000
--- a/emulators/vmsbackup/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Reads VMS BACKUP tapes
diff --git a/emulators/vpce/Makefile b/emulators/vpce/Makefile
index e52571bbaac7..5117b2116d4a 100644
--- a/emulators/vpce/Makefile
+++ b/emulators/vpce/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}_freebsd
EXTRACT_SUFX= .tgz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= PC Engine (TG16) emulator on X
NO_WRKSUBDIR= yes
USE_XLIB= yes
diff --git a/emulators/vpce/pkg-comment b/emulators/vpce/pkg-comment
deleted file mode 100644
index def370aafc97..000000000000
--- a/emulators/vpce/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PC Engine (TG16) emulator on X
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 15718f53deea..548f9f2c9acb 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ALPHA/wine/development
DISTNAME= Wine-${PORTVERSION:S/.//g}
MAINTAINER= gerald@FreeBSD.org
+COMMENT= Microsoft Windows 3.1/95/98/NT/2000 emulator for Unix
WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g}
GNU_CONFIGURE= yes
diff --git a/emulators/wine-devel/pkg-comment b/emulators/wine-devel/pkg-comment
deleted file mode 100644
index 1ab86d8ff101..000000000000
--- a/emulators/wine-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft Windows 3.1/95/98/NT/2000 emulator for Unix
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index 15718f53deea..548f9f2c9acb 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ALPHA/wine/development
DISTNAME= Wine-${PORTVERSION:S/.//g}
MAINTAINER= gerald@FreeBSD.org
+COMMENT= Microsoft Windows 3.1/95/98/NT/2000 emulator for Unix
WRKSRC= ${WRKDIR}/wine-${PORTVERSION:S/.//g}
GNU_CONFIGURE= yes
diff --git a/emulators/wine/pkg-comment b/emulators/wine/pkg-comment
deleted file mode 100644
index 1ab86d8ff101..000000000000
--- a/emulators/wine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft Windows 3.1/95/98/NT/2000 emulator for Unix
diff --git a/emulators/winetools/Makefile b/emulators/winetools/Makefile
index 4b94c34ff394..29f74d8a695f 100644
--- a/emulators/winetools/Makefile
+++ b/emulators/winetools/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=
EXTRACT_ONLY=
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A setup and configuration tool for WINE
RUN_DEPENDS= wine:${PORTSDIR}/emulators/wine
diff --git a/emulators/winetools/pkg-comment b/emulators/winetools/pkg-comment
deleted file mode 100644
index ec992dbd594d..000000000000
--- a/emulators/winetools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A setup and configuration tool for WINE
diff --git a/emulators/xzx/Makefile b/emulators/xzx/Makefile
index 6fba6926a04a..4868f1f0f99a 100644
--- a/emulators/xzx/Makefile
+++ b/emulators/xzx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.philosys.de/~kunze/xzx.purespace.de/xzx/
DISTNAME= ${PORTNAME}-pro-${PORTVERSION}-eval
MAINTAINER= adamw@FreeBSD.org
+COMMENT= ZX Spectrum (48K/128K/+3) Emulator for X11
# xmkmf is used in configure script
BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
diff --git a/emulators/xzx/pkg-comment b/emulators/xzx/pkg-comment
deleted file mode 100644
index c1d5a92f2049..000000000000
--- a/emulators/xzx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ZX Spectrum (48K/128K/+3) Emulator for X11
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index 69055e2c333d..76a495309cb7 100644
--- a/finance/emma/Makefile
+++ b/finance/emma/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://rainbow.mimuw.edu.pl/~la181249/emma/packages/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/-1/}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A personal finance manager for Gnome
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/DateTime/DateTime.py:${PORTSDIR}/lang/py-mx-base
diff --git a/finance/emma/pkg-comment b/finance/emma/pkg-comment
deleted file mode 100644
index da3da484c47d..000000000000
--- a/finance/emma/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A personal finance manager for Gnome
diff --git a/finance/gnomepm/Makefile b/finance/gnomepm/Makefile
index a02496aae5af..9221a950d749 100644
--- a/finance/gnomepm/Makefile
+++ b/finance/gnomepm/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sobomax
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A small GNOME app that collects stock information from Yahoo!(c) Finance
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/finance/gnomepm/pkg-comment b/finance/gnomepm/pkg-comment
deleted file mode 100644
index 5c61f393a268..000000000000
--- a/finance/gnomepm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small GNOME app that collects stock information from Yahoo!(c) Finance
diff --git a/finance/gnucash-devel/Makefile b/finance/gnucash-devel/Makefile
index a6f7e10b8f84..8ba5761e4008 100644
--- a/finance/gnucash-devel/Makefile
+++ b/finance/gnucash-devel/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \
MASTER_SITE_SUBDIR= gnucash
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Quicken-like money and finace manager
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile \
guppi.16:${PORTSDIR}/math/guppi \
diff --git a/finance/gnucash-devel/pkg-comment b/finance/gnucash-devel/pkg-comment
deleted file mode 100644
index e34c361e9bae..000000000000
--- a/finance/gnucash-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quicken-like money and finace manager
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index a6f7e10b8f84..8ba5761e4008 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://www.gnucash.org/pub/gnucash/sources/stable/ \
MASTER_SITE_SUBDIR= gnucash
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Quicken-like money and finace manager
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile \
guppi.16:${PORTSDIR}/math/guppi \
diff --git a/finance/gnucash/pkg-comment b/finance/gnucash/pkg-comment
deleted file mode 100644
index e34c361e9bae..000000000000
--- a/finance/gnucash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quicken-like money and finace manager
diff --git a/finance/libstocks/Makefile b/finance/libstocks/Makefile
index c44d2057547f..8dd6f0f7a05d 100644
--- a/finance/libstocks/Makefile
+++ b/finance/libstocks/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A C library which can be used to fetch stocks quotes
USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
diff --git a/finance/libstocks/pkg-comment b/finance/libstocks/pkg-comment
deleted file mode 100644
index c8421758ba49..000000000000
--- a/finance/libstocks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C library which can be used to fetch stocks quotes
diff --git a/finance/p5-Business-CreditCard/Makefile b/finance/p5-Business-CreditCard/Makefile
index 94770cb1fd2e..45a56ddf644b 100644
--- a/finance/p5-Business-CreditCard/Makefile
+++ b/finance/p5-Business-CreditCard/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Business
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl5 module to validate/generate credit card checksums/names
PERL_CONFIGURE= YES
diff --git a/finance/p5-Business-CreditCard/pkg-comment b/finance/p5-Business-CreditCard/pkg-comment
deleted file mode 100644
index 5621ce297f69..000000000000
--- a/finance/p5-Business-CreditCard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to validate/generate credit card checksums/names
diff --git a/finance/p5-Finance-Quote/Makefile b/finance/p5-Finance-Quote/Makefile
index 002e5f70697a..202cf52c706d 100644
--- a/finance/p5-Finance-Quote/Makefile
+++ b/finance/p5-Finance-Quote/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Finance
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Get stock and mutual fund quotes from various exchanges
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
diff --git a/finance/p5-Finance-Quote/pkg-comment b/finance/p5-Finance-Quote/pkg-comment
deleted file mode 100644
index c588c5667f0e..000000000000
--- a/finance/p5-Finance-Quote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Get stock and mutual fund quotes from various exchanges
diff --git a/finance/xquote/Makefile b/finance/xquote/Makefile
index 1ca48419d80c..09838e7b0dd3 100644
--- a/finance/xquote/Makefile
+++ b/finance/xquote/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://sunsite.dk/xinvest/ \
MASTER_SITE_SUBDIR= applications
MAINTAINER= mph@freebsd.org
+COMMENT= A quote retrieval tool for X
USE_MOTIF= yes
USE_IMAKE= yes
diff --git a/finance/xquote/pkg-comment b/finance/xquote/pkg-comment
deleted file mode 100644
index ea9eb7ef535e..000000000000
--- a/finance/xquote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A quote retrieval tool for X
diff --git a/french/daCode/Makefile b/french/daCode/Makefile
index a787e441ff10..51b1e3b8e44d 100644
--- a/french/daCode/Makefile
+++ b/french/daCode/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=dacode
MAINTAINER= gioria@FreeBSD.org
+COMMENT= A web publication system used by http://www.linuxfr.org
RUN_DEPENDS+= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
diff --git a/french/daCode/pkg-comment b/french/daCode/pkg-comment
deleted file mode 100644
index 9aaaf9dd04c9..000000000000
--- a/french/daCode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web publication system used by http://www.linuxfr.org
diff --git a/french/kde3-i18n/Makefile b/french/kde3-i18n/Makefile
index 7cd2689cf2b1..f4e22e824739 100644
--- a/french/kde3-i18n/Makefile
+++ b/french/kde3-i18n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= fr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/french/kde3-i18n/pkg-comment b/french/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/french/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/french/kde4-l10n/Makefile b/french/kde4-l10n/Makefile
index 7cd2689cf2b1..f4e22e824739 100644
--- a/french/kde4-l10n/Makefile
+++ b/french/kde4-l10n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= fr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/french/kde4-l10n/pkg-comment b/french/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/french/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/french/spip/Makefile b/french/spip/Makefile
index e5d52aab3afa..e95eee2e1e5e 100644
--- a/french/spip/Makefile
+++ b/french/spip/Makefile
@@ -13,6 +13,7 @@ DISTNAME= SPIP-v1-5
EXTRACT_SUFX= .tgz
MAINTAINER= gioria@FreeBSD.org
+COMMENT= A web publication system
BUILD_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/lang/php3
diff --git a/french/spip/pkg-comment b/french/spip/pkg-comment
deleted file mode 100644
index fad4e4a90e1c..000000000000
--- a/french/spip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web publication system
diff --git a/french/staroffice52/Makefile b/french/staroffice52/Makefile
index 5f72927a9ab7..d06c3aa7b25c 100644
--- a/french/staroffice52/Makefile
+++ b/french/staroffice52/Makefile
@@ -30,6 +30,7 @@ DISTFILES+= soa-5_2-ga-bin-linux-fr.bin so-5_2-ga-bin-linux-fr.bin
EXTRACT_ONLY= 109939-03.tar.Z
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Suite bureautique intégrée
FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/french/staroffice52/pkg-comment b/french/staroffice52/pkg-comment
deleted file mode 100644
index 41f77516d378..000000000000
--- a/french/staroffice52/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Suite bureautique intégrée
diff --git a/ftp/axyftp/Makefile b/ftp/axyftp/Makefile
index fe441a74b7ff..2d28d9a391ce 100644
--- a/ftp/axyftp/Makefile
+++ b/ftp/axyftp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.wxftp.seul.org/pub/wxftp/${PORTVERSION}/ \
ftp://ftp.bitcon.no/.10/linux/linuxberg/files/x11/network/
MAINTAINER= kris@FreeBSD.org
+COMMENT= X Window System FTP client, with WSftp-like UI
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/ftp/axyftp/pkg-comment b/ftp/axyftp/pkg-comment
deleted file mode 100644
index 5a94e9a3c0b5..000000000000
--- a/ftp/axyftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X Window System FTP client, with WSftp-like UI
diff --git a/ftp/bftpd/Makefile b/ftp/bftpd/Makefile
index 6dbf33539281..150fca0a17b4 100644
--- a/ftp/bftpd/Makefile
+++ b/ftp/bftpd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= ftp
MASTER_SITES= http://bftpd.sourceforge.net/downloads/src/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Very configurable FTP server that can do chroot easily
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-pam
diff --git a/ftp/bftpd/pkg-comment b/ftp/bftpd/pkg-comment
deleted file mode 100644
index ed3863250d91..000000000000
--- a/ftp/bftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Very configurable FTP server that can do chroot easily
diff --git a/ftp/emacs-wget/Makefile b/ftp/emacs-wget/Makefile
index 8626364fc741..db460b0034db 100644
--- a/ftp/emacs-wget/Makefile
+++ b/ftp/emacs-wget/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= ftp www
MASTER_SITES= http://pop-club.hp.infoseek.co.jp/emacs/emacs-wget/
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Simple front-end to wget on Emacsen
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/ftp/emacs-wget/pkg-comment b/ftp/emacs-wget/pkg-comment
deleted file mode 100644
index 52c357a62f0a..000000000000
--- a/ftp/emacs-wget/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple front-end to wget on Emacsen
diff --git a/ftp/gtm/Makefile b/ftp/gtm/Makefile
index eb1f025c2999..1e93e0a078da 100644
--- a/ftp/gtm/Makefile
+++ b/ftp/gtm/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= gtm \
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The GNOME Transfer Manager, a front-end to wget
BUILD_DEPENDS= wget:${PORTSDIR}/ftp/wget
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/ftp/gtm/pkg-comment b/ftp/gtm/pkg-comment
deleted file mode 100644
index 658e883cd227..000000000000
--- a/ftp/gtm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNOME Transfer Manager, a front-end to wget
diff --git a/ftp/jftpgw/Makefile b/ftp/jftpgw/Makefile
index dd6e2c5eab20..383f56430f9b 100644
--- a/ftp/jftpgw/Makefile
+++ b/ftp/jftpgw/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= ftp
MASTER_SITES= http://www.mcknight.de/jftpgw/
MAINTAINER= se@FreeBSD.org
+COMMENT= Highly configurable FTP proxy
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/ftp/jftpgw/pkg-comment b/ftp/jftpgw/pkg-comment
deleted file mode 100644
index aacba70caaee..000000000000
--- a/ftp/jftpgw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Highly configurable FTP proxy
diff --git a/ftp/llnlxdir/Makefile b/ftp/llnlxdir/Makefile
index d9533823c66e..ca9126dd9f15 100644
--- a/ftp/llnlxdir/Makefile
+++ b/ftp/llnlxdir/Makefile
@@ -13,6 +13,7 @@ DISTNAME= latest_xdir
EXTRACT_SUFX= .tar.Z
MAINTAINER= dima@FreeBSD.org
+COMMENT= Motif FTP client with drag-and-drop file transfer
MAN1= xdir.1
diff --git a/ftp/llnlxdir/pkg-comment b/ftp/llnlxdir/pkg-comment
deleted file mode 100644
index 1bd1bb27dc91..000000000000
--- a/ftp/llnlxdir/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Motif FTP client with drag-and-drop file transfer
diff --git a/ftp/llnlxftp/Makefile b/ftp/llnlxftp/Makefile
index b79c812f516b..647cbcaa7b15 100644
--- a/ftp/llnlxftp/Makefile
+++ b/ftp/llnlxftp/Makefile
@@ -14,6 +14,7 @@ DISTNAME= latest_xftp
EXTRACT_SUFX= .tar.Z
MAINTAINER= dima@FreeBSD.org
+COMMENT= Motif FTP client
WRKSRC= ${WRKDIR}/llnlxftp2.1/sources
USE_MOTIF= yes
diff --git a/ftp/llnlxftp/pkg-comment b/ftp/llnlxftp/pkg-comment
deleted file mode 100644
index 9dec038cd45b..000000000000
--- a/ftp/llnlxftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Motif FTP client
diff --git a/ftp/lukemftp/Makefile b/ftp/lukemftp/Makefile
index 9444302c07c1..651930abc7b1 100644
--- a/ftp/lukemftp/Makefile
+++ b/ftp/lukemftp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= ftp
MASTER_SITES= ftp://ftp.netbsd.org/pub/NetBSD/misc/lukemftp/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Enhanced ftp client from NetBSD
GNU_CONFIGURE= yes
diff --git a/ftp/lukemftp/pkg-comment b/ftp/lukemftp/pkg-comment
deleted file mode 100644
index 7d8ecff9c7bb..000000000000
--- a/ftp/lukemftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Enhanced ftp client from NetBSD
diff --git a/ftp/ncftp/Makefile b/ftp/ncftp/Makefile
index f292ba612233..1766676e5911 100644
--- a/ftp/ncftp/Makefile
+++ b/ftp/ncftp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
DISTNAME= ncftp-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
+COMMENT= FTP replacement with advanced user interface
MAN1= ncftp.1
diff --git a/ftp/ncftp/pkg-comment b/ftp/ncftp/pkg-comment
deleted file mode 100644
index 74f015677bfd..000000000000
--- a/ftp/ncftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FTP replacement with advanced user interface
diff --git a/ftp/ncftp1/Makefile b/ftp/ncftp1/Makefile
index f292ba612233..1766676e5911 100644
--- a/ftp/ncftp1/Makefile
+++ b/ftp/ncftp1/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ncftp.com/ncftp/
DISTNAME= ncftp-${PORTVERSION}
MAINTAINER= obrien@FreeBSD.org
+COMMENT= FTP replacement with advanced user interface
MAN1= ncftp.1
diff --git a/ftp/ncftp1/pkg-comment b/ftp/ncftp1/pkg-comment
deleted file mode 100644
index 74f015677bfd..000000000000
--- a/ftp/ncftp1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FTP replacement with advanced user interface
diff --git a/ftp/ncftp3/Makefile b/ftp/ncftp3/Makefile
index 635657830b14..4834df4dfb5f 100644
--- a/ftp/ncftp3/Makefile
+++ b/ftp/ncftp3/Makefile
@@ -18,6 +18,7 @@ PATCHFILES= ncftp-314-v6-20020709.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= obrien@FreeBSD.org
+COMMENT= ftp replacement with advanced user interface
.if defined(INSTALL_AS_NCFTP)
LATEST_LINK= ncftp
diff --git a/ftp/ncftp3/pkg-comment b/ftp/ncftp3/pkg-comment
deleted file mode 100644
index 80b124dc8e03..000000000000
--- a/ftp/ncftp3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ftp replacement with advanced user interface
diff --git a/ftp/oftpd/Makefile b/ftp/oftpd/Makefile
index 2e017c8fc7eb..20a6169da7bb 100644
--- a/ftp/oftpd/Makefile
+++ b/ftp/oftpd/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.time-travellers.org/oftpd/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= A threaded, anonymous only FTP server designed for security
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/ftp/oftpd/pkg-comment b/ftp/oftpd/pkg-comment
deleted file mode 100644
index fa06ddb86bd4..000000000000
--- a/ftp/oftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A threaded, anonymous only FTP server designed for security
diff --git a/ftp/omi/Makefile b/ftp/omi/Makefile
index 4bf0060c9b08..2f70b4ab17fc 100644
--- a/ftp/omi/Makefile
+++ b/ftp/omi/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.nuug.no/pub/anders/distfiles/ \
DISTNAME= omi-alpha-9
MAINTAINER= ache@FreeBSD.org
+COMMENT= "mirror" subtrees of FTP servers
ALL_TARGET= freebsd
diff --git a/ftp/omi/pkg-comment b/ftp/omi/pkg-comment
deleted file mode 100644
index 283984f6cd04..000000000000
--- a/ftp/omi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-"mirror" subtrees of FTP servers
diff --git a/ftp/p5-Net-FTPServer/Makefile b/ftp/p5-Net-FTPServer/Makefile
index 913bcbbc4d1b..1135da224cbe 100644
--- a/ftp/p5-Net-FTPServer/Makefile
+++ b/ftp/p5-Net-FTPServer/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A full-featured, secure, extensible and configurable Perl FTP server
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Authen/PAM.pm:${PORTSDIR}/security/p5-Authen-PAM \
${SITE_PERL}/${PERL_ARCH}/BSD/Resource.pm:${PORTSDIR}/devel/p5-BSD-Resource \
diff --git a/ftp/p5-Net-FTPServer/pkg-comment b/ftp/p5-Net-FTPServer/pkg-comment
deleted file mode 100644
index 8de9f3810260..000000000000
--- a/ftp/p5-Net-FTPServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full-featured, secure, extensible and configurable Perl FTP server
diff --git a/ftp/p5-POE-Component-Client-FTP/Makefile b/ftp/p5-POE-Component-Client-FTP/Makefile
index 0f8d832ee5e1..583bf9b68232 100644
--- a/ftp/p5-POE-Component-Client-FTP/Makefile
+++ b/ftp/p5-POE-Component-Client-FTP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Implements an FTP client POE Component
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/ftp/p5-POE-Component-Client-FTP/pkg-comment b/ftp/p5-POE-Component-Client-FTP/pkg-comment
deleted file mode 100644
index 18cfe7f95b08..000000000000
--- a/ftp/p5-POE-Component-Client-FTP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Implements an FTP client POE Component
diff --git a/ftp/paraget/Makefile b/ftp/paraget/Makefile
index 9ed1cec1b9dc..49c740ed9bf3 100644
--- a/ftp/paraget/Makefile
+++ b/ftp/paraget/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Parallel ftp-fetching program
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/MethodMaker.pm:${PORTSDIR}/devel/p5-Class-MethodMaker
diff --git a/ftp/paraget/pkg-comment b/ftp/paraget/pkg-comment
deleted file mode 100644
index bd6b6f1510c0..000000000000
--- a/ftp/paraget/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Parallel ftp-fetching program
diff --git a/ftp/proftpd-devel/Makefile b/ftp/proftpd-devel/Makefile
index 3d94c5152dc7..d439d9f115ef 100644
--- a/ftp/proftpd-devel/Makefile
+++ b/ftp/proftpd-devel/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.proftpd.net/distrib/source/ \
DISTNAME= ${PORTNAME}-1.2.6
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Highly configurable ftp daemon
MAN1= ftpcount.1 ftpwho.1
MAN5= xferlog.5
diff --git a/ftp/proftpd-devel/pkg-comment b/ftp/proftpd-devel/pkg-comment
deleted file mode 100644
index 31b65c3f855c..000000000000
--- a/ftp/proftpd-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Highly configurable ftp daemon
diff --git a/ftp/proftpd/Makefile b/ftp/proftpd/Makefile
index 3d94c5152dc7..d439d9f115ef 100644
--- a/ftp/proftpd/Makefile
+++ b/ftp/proftpd/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.proftpd.net/distrib/source/ \
DISTNAME= ${PORTNAME}-1.2.6
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Highly configurable ftp daemon
MAN1= ftpcount.1 ftpwho.1
MAN5= xferlog.5
diff --git a/ftp/proftpd/pkg-comment b/ftp/proftpd/pkg-comment
deleted file mode 100644
index 31b65c3f855c..000000000000
--- a/ftp/proftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Highly configurable ftp daemon
diff --git a/ftp/sftp/Makefile b/ftp/sftp/Makefile
index 6bfeb9da44f0..23c9a08aa125 100644
--- a/ftp/sftp/Makefile
+++ b/ftp/sftp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.xbill.org/pub/sftp/old/ \
http://www.komquats.com/distfiles/
MAINTAINER= cy@FreeBSD.org
+COMMENT= An ftp replacement that runs over an ssh tunnel
.include <bsd.port.pre.mk>
diff --git a/ftp/sftp/pkg-comment b/ftp/sftp/pkg-comment
deleted file mode 100644
index 002fe83242e4..000000000000
--- a/ftp/sftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An ftp replacement that runs over an ssh tunnel
diff --git a/ftp/spegla/Makefile b/ftp/spegla/Makefile
index 231376032729..527584a20cde 100644
--- a/ftp/spegla/Makefile
+++ b/ftp/spegla/Makefile
@@ -17,6 +17,7 @@ PATCH_SITES= http://www.imasy.or.jp/~ume/ipv6/
PATCHFILES= ${DISTNAME}-ipv6-20020129-3.diff.gz
MAINTAINER= jkh@FreeBSD.org
+COMMENT= A mirror program for FTP sites (written in C)
MANCOMPRESSED= yes
MAN1= spegla.1
diff --git a/ftp/spegla/pkg-comment b/ftp/spegla/pkg-comment
deleted file mode 100644
index 33643a63db4e..000000000000
--- a/ftp/spegla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mirror program for FTP sites (written in C)
diff --git a/ftp/wu-ftpd+ipv6/Makefile b/ftp/wu-ftpd+ipv6/Makefile
index 56c83f812a26..ecd5e270f4a9 100644
--- a/ftp/wu-ftpd+ipv6/Makefile
+++ b/ftp/wu-ftpd+ipv6/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= wu-ftpd-262-v6-20020830.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= A replacement ftp server for Un*x systems
USE_AUTOCONF= yes
CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \
diff --git a/ftp/wu-ftpd+ipv6/pkg-comment b/ftp/wu-ftpd+ipv6/pkg-comment
deleted file mode 100644
index 47292e734244..000000000000
--- a/ftp/wu-ftpd+ipv6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement ftp server for Un*x systems
diff --git a/ftp/wu-ftpd/Makefile b/ftp/wu-ftpd/Makefile
index ddd03d2b7f48..57d3782b3bb0 100644
--- a/ftp/wu-ftpd/Makefile
+++ b/ftp/wu-ftpd/Makefile
@@ -14,6 +14,7 @@ CATEGORIES= ftp
MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/wu-ftpd/
MAINTAINER= ache@FreeBSD.org
+COMMENT= A replacement ftp server for Un*x systems
USE_AUTOCONF= yes
CONFIGURE_ARGS= --enable-rfc931 --disable-pasvip --enable-opie \
diff --git a/ftp/wu-ftpd/pkg-comment b/ftp/wu-ftpd/pkg-comment
deleted file mode 100644
index 47292e734244..000000000000
--- a/ftp/wu-ftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement ftp server for Un*x systems
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 294cce7d490a..c40a781585ea 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -14,6 +14,7 @@ DISTFILES= abuse_datafiles.tar.gz
EXTRACT_ONLY= # empty
MAINTAINER= des@freebsd.org
+COMMENT= The classic 2D action game Abuse
RUN_DEPENDS= abuse.sdl:${PORTSDIR}/games/abuse_sdl
diff --git a/games/abuse/pkg-comment b/games/abuse/pkg-comment
deleted file mode 100644
index a94a0072ade8..000000000000
--- a/games/abuse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The classic 2D action game Abuse
diff --git a/games/abuse_sdl/Makefile b/games/abuse_sdl/Makefile
index c21b7dbea086..050b0cae98a3 100644
--- a/games/abuse_sdl/Makefile
+++ b/games/abuse_sdl/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.labyrinth.net.au/~trandor/abuse/files/
MAINTAINER= des@freebsd.org
+COMMENT= An SDL port of the Abuse game engine
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12:install
diff --git a/games/abuse_sdl/pkg-comment b/games/abuse_sdl/pkg-comment
deleted file mode 100644
index b20fcae2cd09..000000000000
--- a/games/abuse_sdl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An SDL port of the Abuse game engine
diff --git a/games/acm/Makefile b/games/acm/Makefile
index a6787f862094..9d40ee72dcc7 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.websimulations.com/pub/download/
MAINTAINER= se@FreeBSD.org
+COMMENT= A flight simulator for X11
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/games/acm/pkg-comment b/games/acm/pkg-comment
deleted file mode 100644
index 4a2f41e444c0..000000000000
--- a/games/acm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A flight simulator for X11
diff --git a/games/amphetamine/Makefile b/games/amphetamine/Makefile
index ce026980a359..8409c373c360 100644
--- a/games/amphetamine/Makefile
+++ b/games/amphetamine/Makefile
@@ -13,6 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-data-${DATAVERSION}${EXTRACT_SUFX}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A 2D - Jump'n'run shooter
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/games/amphetamine/pkg-comment b/games/amphetamine/pkg-comment
deleted file mode 100644
index e478ad5e486f..000000000000
--- a/games/amphetamine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 2D - Jump'n'run shooter
diff --git a/games/angband/Makefile b/games/angband/Makefile
index be0cddb33d19..187f080aa1c5 100644
--- a/games/angband/Makefile
+++ b/games/angband/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://clockwork.dementia.org/angband/Source/ \
ftp://ftp.sunet.se/pub/games/Angband/Source/
MAINTAINER= mph@freebsd.org
+COMMENT= Rogue-like game with color, X11 support
GNU_CONFIGURE= yes
.if !defined(WITHOUT_X11)
diff --git a/games/angband/pkg-comment b/games/angband/pkg-comment
deleted file mode 100644
index f2e66600ee1b..000000000000
--- a/games/angband/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rogue-like game with color, X11 support
diff --git a/games/asc/Makefile b/games/asc/Makefile
index c904dc54be5c..a44b1c31acca 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asc-hq
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A turn based, multiplayer strategic game with very nice graphics
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/games/asc/pkg-comment b/games/asc/pkg-comment
deleted file mode 100644
index a46399a96c1a..000000000000
--- a/games/asc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A turn based, multiplayer strategic game with very nice graphics
diff --git a/games/atomix/Makefile b/games/atomix/Makefile
index fcd6cc17290f..e2320e6985f8 100644
--- a/games/atomix/Makefile
+++ b/games/atomix/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games gnome
MASTER_SITES= http://www.informatik.uni-oldenburg.de/~pearl/download/
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A yet another little mind game
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/games/atomix/pkg-comment b/games/atomix/pkg-comment
deleted file mode 100644
index a53fd4d6fdea..000000000000
--- a/games/atomix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A yet another little mind game
diff --git a/games/awele/Makefile b/games/awele/Makefile
index bbe2266a5c1b..be4a8798f41c 100644
--- a/games/awele/Makefile
+++ b/games/awele/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www-air.inria.fr/ftp/Jean-Paul/
DISTFILES= ${PORTNAME}1.0.tgz
MAINTAINER= tg@FreeBSD.org
+COMMENT= An african board game
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/games/awele/pkg-comment b/games/awele/pkg-comment
deleted file mode 100644
index 615165549250..000000000000
--- a/games/awele/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An african board game
diff --git a/games/bomberinstinct/Makefile b/games/bomberinstinct/Makefile
index 756c11f65fae..73c3bc061c32 100644
--- a/games/bomberinstinct/Makefile
+++ b/games/bomberinstinct/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= BomberInstinct-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A nice Bomberman-like multiplayer game
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/bomberinstinct/pkg-comment b/games/bomberinstinct/pkg-comment
deleted file mode 100644
index f0d8bc3c3f65..000000000000
--- a/games/bomberinstinct/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nice Bomberman-like multiplayer game
diff --git a/games/bombermaze/Makefile b/games/bombermaze/Makefile
index b19e8f4a453e..d88aa67c6426 100644
--- a/games/bombermaze/Makefile
+++ b/games/bombermaze/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A Bomberman clone for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/games/bombermaze/pkg-comment b/games/bombermaze/pkg-comment
deleted file mode 100644
index fe0dc75521cf..000000000000
--- a/games/bombermaze/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Bomberman clone for GNOME
diff --git a/games/burgerspace/Makefile b/games/burgerspace/Makefile
index 715b9f7fa766..0bfa4e1692da 100644
--- a/games/burgerspace/Makefile
+++ b/games/burgerspace/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www3.sympatico.ca/sarrazip/dev/
MAINTAINER= markp@FreeBSD.org
+COMMENT= A BurgerTime clone
LIB_DEPENDS= gengameng.4:${PORTSDIR}/devel/gengameng \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/games/burgerspace/pkg-comment b/games/burgerspace/pkg-comment
deleted file mode 100644
index b0f30134ae8e..000000000000
--- a/games/burgerspace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A BurgerTime clone
diff --git a/games/clanbomber/Makefile b/games/clanbomber/Makefile
index 92aa7e4b5544..23dc693b6a9d 100644
--- a/games/clanbomber/Makefile
+++ b/games/clanbomber/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A bomberman-like multiplayer game
LIB_DEPENDS= clanCore.0:${PORTSDIR}/devel/clanlib
diff --git a/games/clanbomber/pkg-comment b/games/clanbomber/pkg-comment
deleted file mode 100644
index 2e51940a65b0..000000000000
--- a/games/clanbomber/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bomberman-like multiplayer game
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 89ed590c036b..6d92b07923e1 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jim@FreeBSD.org
+COMMENT= A simulation came where the goal is to crash each other's programs
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/games/corewars/pkg-comment b/games/corewars/pkg-comment
deleted file mode 100644
index 012722484dfc..000000000000
--- a/games/corewars/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simulation came where the goal is to crash each other's programs
diff --git a/games/cosmo/Makefile b/games/cosmo/Makefile
index da96c79494fb..a51e3f06b3ad 100644
--- a/games/cosmo/Makefile
+++ b/games/cosmo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.riken.go.jp/pub/Linux/vine/VinePlus/1.1/JG-0.9.1/other-s
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} moon.tif.gz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Clone of Cosmo Gang the Puzzle (Namco)
NO_CDROM= Possible copyright infringement
diff --git a/games/cosmo/pkg-comment b/games/cosmo/pkg-comment
deleted file mode 100644
index bf4bde95451d..000000000000
--- a/games/cosmo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of Cosmo Gang the Puzzle (Namco)
diff --git a/games/cowsay/Makefile b/games/cowsay/Makefile
index 8743621d0af1..f9d6e495ac33 100644
--- a/games/cowsay/Makefile
+++ b/games/cowsay/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.nog.net/pub/tony/cowsay/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Configurable talking characters in ASCII art
USE_PERL5= yes
diff --git a/games/cowsay/pkg-comment b/games/cowsay/pkg-comment
deleted file mode 100644
index 005444310ad6..000000000000
--- a/games/cowsay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Configurable talking characters in ASCII art
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index bb782409f377..5b7cd60c61e9 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= criticalmass
DISTNAME= CriticalMass-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= An SDL/OpenGL space shoot'em up game
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_image.10:${PORTSDIR}/graphics/sdl_image \
diff --git a/games/criticalmass/pkg-comment b/games/criticalmass/pkg-comment
deleted file mode 100644
index 146826e81fbd..000000000000
--- a/games/criticalmass/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An SDL/OpenGL space shoot'em up game
diff --git a/games/digger-vgl/Makefile b/games/digger-vgl/Makefile
index f80c3b8a02ee..8d72a29cd536 100644
--- a/games/digger-vgl/Makefile
+++ b/games/digger-vgl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.digger.org/
DISTNAME= ${PORTNAME}-${DIGREL}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= FreeBSD graphics console (VGL) version of the famous Digger game
.if defined(WITH_SOUND)
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config
diff --git a/games/digger-vgl/pkg-comment b/games/digger-vgl/pkg-comment
deleted file mode 100644
index bafe6d3813bc..000000000000
--- a/games/digger-vgl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FreeBSD graphics console (VGL) version of the famous Digger game
diff --git a/games/doom/Makefile b/games/doom/Makefile
index 92d4bdd0740c..9976686585a0 100644
--- a/games/doom/Makefile
+++ b/games/doom/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES?= ftp://ftp.idsoftware.com/idstuff/source/ \
DISTNAME= doomsrc
MAINTAINER= jmz@FreeBSD.org
+COMMENT= DOOM: the game and the sound server
NO_CDROM= requested by IDsoftware
diff --git a/games/doom/pkg-comment b/games/doom/pkg-comment
deleted file mode 100644
index 1b1f52e73d13..000000000000
--- a/games/doom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DOOM: the game and the sound server
diff --git a/games/eboard/Makefile b/games/eboard/Makefile
index 314adc789798..72a78bcb4f5f 100644
--- a/games/eboard/Makefile
+++ b/games/eboard/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} eboard-extras-${EXTRASVERSION}.tar.gz
MAINTAINER= petef@FreeBSD.org
+COMMENT= GTK+ chess board interface (mainly for FICS and chessd)
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/games/eboard/pkg-comment b/games/eboard/pkg-comment
deleted file mode 100644
index d0ba1413918a..000000000000
--- a/games/eboard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ chess board interface (mainly for FICS and chessd)
diff --git a/games/etuxracer/Makefile b/games/etuxracer/Makefile
index b4fe5931245b..188b2b483dee 100644
--- a/games/etuxracer/Makefile
+++ b/games/etuxracer/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= A 3d penguin racing game using OpenGL
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
tcl83.1:${PORTSDIR}/lang/tcl83
diff --git a/games/etuxracer/pkg-comment b/games/etuxracer/pkg-comment
deleted file mode 100644
index 3aae59168873..000000000000
--- a/games/etuxracer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3d penguin racing game using OpenGL
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index c73543d8fc3d..f1321a807623 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= falconseye
DISTNAME= nethack_source_331_jtp_${PORTVERSION:S/.//g}
MAINTAINER= kris@FreeBSD.org
+COMMENT= NetHack derivative
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
diff --git a/games/falconseye/pkg-comment b/games/falconseye/pkg-comment
deleted file mode 100644
index c5a580ab093e..000000000000
--- a/games/falconseye/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NetHack derivative
diff --git a/games/farblazer/Makefile b/games/farblazer/Makefile
index 2228512081cf..bf5e6e497510 100644
--- a/games/farblazer/Makefile
+++ b/games/farblazer/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.zipcon.net/~adamf/software/farblazer/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An action/arcade game originally based of StarBlazer on the Apple ][
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
diff --git a/games/farblazer/pkg-comment b/games/farblazer/pkg-comment
deleted file mode 100644
index aa88ee1e7c1a..000000000000
--- a/games/farblazer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An action/arcade game originally based of StarBlazer on the Apple ][
diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index 141ccaf8ecf0..22200908c044 100644
--- a/games/fgfs-base/Makefile
+++ b/games/fgfs-base/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${BASEFILE}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= des@FreeBSD.org
+COMMENT= The FlightGear flight simulator
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
diff --git a/games/fgfs-base/pkg-comment b/games/fgfs-base/pkg-comment
deleted file mode 100644
index 7a94a4cf8f05..000000000000
--- a/games/fgfs-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The FlightGear flight simulator
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 55511dfb10d9..d4c428a4efaa 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.oersted.co.jp/~yav/soft/fkiss/
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Freely enjoy childlike KISS, French-KISS!
RUN_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/games/fkiss/pkg-comment b/games/fkiss/pkg-comment
deleted file mode 100644
index d0153cd5bc51..000000000000
--- a/games/fkiss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Freely enjoy childlike KISS, French-KISS!
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index 141ccaf8ecf0..22200908c044 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${BASEFILE}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= des@FreeBSD.org
+COMMENT= The FlightGear flight simulator
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
diff --git a/games/flightgear-data/pkg-comment b/games/flightgear-data/pkg-comment
deleted file mode 100644
index 7a94a4cf8f05..000000000000
--- a/games/flightgear-data/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The FlightGear flight simulator
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index 141ccaf8ecf0..22200908c044 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${BASEFILE}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= des@FreeBSD.org
+COMMENT= The FlightGear flight simulator
BUILD_DEPENDS= ${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \
${LOCALBASE}/lib/libmk4.a:${PORTSDIR}/databases/metakit \
diff --git a/games/flightgear/pkg-comment b/games/flightgear/pkg-comment
deleted file mode 100644
index 7a94a4cf8f05..000000000000
--- a/games/flightgear/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The FlightGear flight simulator
diff --git a/games/frabs/Makefile b/games/frabs/Makefile
index d0317f2b5a83..2c0795198452 100644
--- a/games/frabs/Makefile
+++ b/games/frabs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cs.uidaho.edu/~cass0664/fRaBs/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= des@freebsd.org
+COMMENT= The fRaBs (Free Abuse) data files for the Abuse game engine
RUN_DEPENDS= abuse.sdl:${PORTSDIR}/games/abuse_sdl
diff --git a/games/frabs/pkg-comment b/games/frabs/pkg-comment
deleted file mode 100644
index dc1fd827912f..000000000000
--- a/games/frabs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The fRaBs (Free Abuse) data files for the Abuse game engine
diff --git a/games/freesci/Makefile b/games/freesci/Makefile
index ba0b6e9cf8af..4bd8e202cf37 100644
--- a/games/freesci/Makefile
+++ b/games/freesci/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.task.gda.pl/pub/games/linuxgames/freesci/ \
http://pelit.saunalahti.fi/telenation/linuxgames/freesci/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A portable interpreter for SCI games, such as the Space Quest series.
LIB_DEPENDS= ggi.2:${PORTSDIR}/graphics/libggi \
png.5:${PORTSDIR}/graphics/png
diff --git a/games/freesci/pkg-comment b/games/freesci/pkg-comment
deleted file mode 100644
index 67a2decef7ed..000000000000
--- a/games/freesci/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable interpreter for SCI games, such as the Space Quest series.
diff --git a/games/fsgs/Makefile b/games/fsgs/Makefile
index bb610164396e..f4332b33ca99 100644
--- a/games/fsgs/Makefile
+++ b/games/fsgs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.net-games.com/downloads/
DISTFILES= fsgs07126bsd.tgz fsgs0721lx.tgz
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= Free network game server with ladders, player rankings, more
NO_BUILD= yes
diff --git a/games/fsgs/pkg-comment b/games/fsgs/pkg-comment
deleted file mode 100644
index 3967fdaa33f1..000000000000
--- a/games/fsgs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free network game server with ladders, player rankings, more
diff --git a/games/gcompris/Makefile b/games/gcompris/Makefile
index 4f5f2b172531..57f69b945fe6 100644
--- a/games/gcompris/Makefile
+++ b/games/gcompris/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A simple Gnome-based education game for children starting at 3
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools
diff --git a/games/gcompris/pkg-comment b/games/gcompris/pkg-comment
deleted file mode 100644
index 3855ec239dfa..000000000000
--- a/games/gcompris/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple Gnome-based education game for children starting at 3
diff --git a/games/gcompris2/Makefile b/games/gcompris2/Makefile
index 4f5f2b172531..57f69b945fe6 100644
--- a/games/gcompris2/Makefile
+++ b/games/gcompris2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A simple Gnome-based education game for children starting at 3
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= ogg123:${PORTSDIR}/audio/vorbis-tools
diff --git a/games/gcompris2/pkg-comment b/games/gcompris2/pkg-comment
deleted file mode 100644
index 3855ec239dfa..000000000000
--- a/games/gcompris2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple Gnome-based education game for children starting at 3
diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 9d473601bf96..73c6999ec792 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A 3D OpenGL based chess game
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
diff --git a/games/glchess/pkg-comment b/games/glchess/pkg-comment
deleted file mode 100644
index 4ad608745379..000000000000
--- a/games/glchess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3D OpenGL based chess game
diff --git a/games/gma/Makefile b/games/gma/Makefile
index 811e69e8761c..961084ab477a 100644
--- a/games/gma/Makefile
+++ b/games/gma/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.student.nada.kth.se/~d92-jwa/code/gma/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Go-moku game which learns playing the game from studying its opponent
USE_GCC= 2.95
GNU_CONFIGURE= yes
diff --git a/games/gma/pkg-comment b/games/gma/pkg-comment
deleted file mode 100644
index 4886f9186f1f..000000000000
--- a/games/gma/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Go-moku game which learns playing the game from studying its opponent
diff --git a/games/gniffel/Makefile b/games/gniffel/Makefile
index 5f403ad7a5e2..8ae760588277 100644
--- a/games/gniffel/Makefile
+++ b/games/gniffel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games gnome
MASTER_SITES= http://www.informatik.fh-wiesbaden.de/~i820/downloads/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A clone of the famous Yatzi game, also known as Kniffel, for GNOME
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/games/gniffel/pkg-comment b/games/gniffel/pkg-comment
deleted file mode 100644
index a41de55c4bc2..000000000000
--- a/games/gniffel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of the famous Yatzi game, also known as Kniffel, for GNOME
diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile
index ba50055baa69..d46a85a97b87 100644
--- a/games/gnome-games/Makefile
+++ b/games/gnome-games/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The game applications package for the Gnome 2.0 Desktop Environment
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
guile.10:${PORTSDIR}/lang/guile
diff --git a/games/gnome-games/pkg-comment b/games/gnome-games/pkg-comment
deleted file mode 100644
index 23e9d267d8a4..000000000000
--- a/games/gnome-games/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The game applications package for the Gnome 2.0 Desktop Environment
diff --git a/games/gnomechess/Makefile b/games/gnomechess/Makefile
index 69daaf6d438a..fdfe2efca9ee 100644
--- a/games/gnomechess/Makefile
+++ b/games/gnomechess/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-chess/0.3
DISTNAME= gnome-chess-${PORTVERSION}
MAINTAINER= reg@FreeBSD.org
+COMMENT= A GUI chess front-end to crafy, for the GNOME Desktop Environment
BUILD_DEPENDS= crafty:${PORTSDIR}/games/crafty
RUN_DEPENDS= crafty:${PORTSDIR}/games/crafty
diff --git a/games/gnomechess/pkg-comment b/games/gnomechess/pkg-comment
deleted file mode 100644
index 8fceda5172b1..000000000000
--- a/games/gnomechess/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI chess front-end to crafy, for the GNOME Desktop Environment
diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile
index 81cd848c2c20..c3b5da83cf19 100644
--- a/games/gnomegames/Makefile
+++ b/games/gnomegames/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The game applications package for the Gnome Desktop Environment
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
diff --git a/games/gnomegames/pkg-comment b/games/gnomegames/pkg-comment
deleted file mode 100644
index 489fad24d405..000000000000
--- a/games/gnomegames/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The game applications package for the Gnome Desktop Environment
diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile
index ba50055baa69..d46a85a97b87 100644
--- a/games/gnomegames2/Makefile
+++ b/games/gnomegames2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The game applications package for the Gnome 2.0 Desktop Environment
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
guile.10:${PORTSDIR}/lang/guile
diff --git a/games/gnomegames2/pkg-comment b/games/gnomegames2/pkg-comment
deleted file mode 100644
index 23e9d267d8a4..000000000000
--- a/games/gnomegames2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The game applications package for the Gnome 2.0 Desktop Environment
diff --git a/games/gnomermind/Makefile b/games/gnomermind/Makefile
index a069c6362f10..37eb73b48004 100644
--- a/games/gnomermind/Makefile
+++ b/games/gnomermind/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A puzzle game for Gnome, loosely based on the classic MasterMind game
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/games/gnomermind/pkg-comment b/games/gnomermind/pkg-comment
deleted file mode 100644
index 39b66d8b5a8b..000000000000
--- a/games/gnomermind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A puzzle game for Gnome, loosely based on the classic MasterMind game
diff --git a/games/gnomoku/Makefile b/games/gnomoku/Makefile
index 6dedfae30058..92998618e264 100644
--- a/games/gnomoku/Makefile
+++ b/games/gnomoku/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.4
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A Gomoku game for GNOME Desktop
LIB_DEPENDS= gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
diff --git a/games/gnomoku/pkg-comment b/games/gnomoku/pkg-comment
deleted file mode 100644
index efed18b300b7..000000000000
--- a/games/gnomoku/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Gomoku game for GNOME Desktop
diff --git a/games/gnushogi/Makefile b/games/gnushogi/Makefile
index 24bb61e97bde..751074febd74 100644
--- a/games/gnushogi/Makefile
+++ b/games/gnushogi/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gnushogi
DISTNAME= gnushogi-1.2p03
MAINTAINER= nakai@FreeBSD.org
+COMMENT= GNU version of Shogi
DOCFILES= BOOKFILES CHANGES CONTRIB COPYING GENERAL INSTALL PORTING \
README-FIRST listserv.ref shogi.rules tutorial1.gam tutorial2.gam
diff --git a/games/gnushogi/pkg-comment b/games/gnushogi/pkg-comment
deleted file mode 100644
index 8a708f7070a8..000000000000
--- a/games/gnushogi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU version of Shogi
diff --git a/games/golddig/Makefile b/games/golddig/Makefile
index fd0aecb75e98..593a108e5009 100644
--- a/games/golddig/Makefile
+++ b/games/golddig/Makefile
@@ -13,6 +13,7 @@ DISTNAME= golddig2
EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Getting the Gold and Avoiding Death
USE_XLIB= yes
MAN6= golddig.6
diff --git a/games/golddig/pkg-comment b/games/golddig/pkg-comment
deleted file mode 100644
index 81c0f411f421..000000000000
--- a/games/golddig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Getting the Gold and Avoiding Death
diff --git a/games/grubinvaders/Makefile b/games/grubinvaders/Makefile
index 410f483ec24d..3212fbc4bc6b 100644
--- a/games/grubinvaders/Makefile
+++ b/games/grubinvaders/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.erikyyy.de/invaders/
DISTNAME= invaders-${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= This is grubinvaders, a multi boot compliant game for i386
RUN_DEPENDS= ${LOCALBASE}/sbin/grub:${PORTSDIR}/sysutils/grub
diff --git a/games/grubinvaders/pkg-comment b/games/grubinvaders/pkg-comment
deleted file mode 100644
index 5d34cca67bea..000000000000
--- a/games/grubinvaders/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This is grubinvaders, a multi boot compliant game for i386
diff --git a/games/gtkabale/Makefile b/games/gtkabale/Makefile
index 08f89dc69a41..b2ace22d70ea 100644
--- a/games/gtkabale/Makefile
+++ b/games/gtkabale/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.seindal.dk/pub/rene/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A lazy version of solitaire game
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/games/gtkabale/pkg-comment b/games/gtkabale/pkg-comment
deleted file mode 100644
index bac6edc07f76..000000000000
--- a/games/gtkabale/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lazy version of solitaire game
diff --git a/games/gtktetcolor/Makefile b/games/gtktetcolor/Makefile
index 8e05776eb2dd..275074398c7f 100644
--- a/games/gtktetcolor/Makefile
+++ b/games/gtktetcolor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://canopus.iacp.dvo.ru/pub/Games/gtktetcolor/ \
http://metalab.unc.edu/pub/Linux/games/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A game for GNOME that resembles well-known tetris and columns
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/games/gtktetcolor/pkg-comment b/games/gtktetcolor/pkg-comment
deleted file mode 100644
index dcced90bafce..000000000000
--- a/games/gtktetcolor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game for GNOME that resembles well-known tetris and columns
diff --git a/games/halflifeserver/Makefile b/games/halflifeserver/Makefile
index 4afb9f2d2cee..a66f364c59dd 100644
--- a/games/halflifeserver/Makefile
+++ b/games/halflifeserver/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games linux
DISTNAME= hlds_l_${PORTVERSION:S/.//g}_full
MAINTAINER= pat@FreeBSD.org
+COMMENT= Half-Life Dedicated Server for Linux
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
diff --git a/games/halflifeserver/pkg-comment b/games/halflifeserver/pkg-comment
deleted file mode 100644
index 5311863a5f2d..000000000000
--- a/games/halflifeserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Half-Life Dedicated Server for Linux
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 0fa6853520f4..bbb509086a2c 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
#PATCHFILES= heroes-0.7-errata.patch
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A game of yore similar to the "Tron" and "Nibbles"
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
diff --git a/games/heroes/pkg-comment b/games/heroes/pkg-comment
deleted file mode 100644
index 0a30efe5e4ca..000000000000
--- a/games/heroes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game of yore similar to the "Tron" and "Nibbles"
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index 6f7115ecdafa..3c10dce27309 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.mattdm.org/icebreaker/1.2.x/
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A game similar to Jezzball or Barrack
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/icebreaker/pkg-comment b/games/icebreaker/pkg-comment
deleted file mode 100644
index a29cdb2e14e3..000000000000
--- a/games/icebreaker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game similar to Jezzball or Barrack
diff --git a/games/inform/Makefile b/games/inform/Makefile
index 6fd8491cbfc3..d6e121642e7c 100644
--- a/games/inform/Makefile
+++ b/games/inform/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/sou
DISTFILES= inform621_source.zip inform_library610.zip
MAINTAINER= mph@freebsd.org
+COMMENT= Compiler for producing text adventure games
.if !defined(NOPORTDOCS)
MASTER_SITES+= ftp://ftp.ifarchive.org/if-archive/infocom/compilers/inform6/manuals/old/
diff --git a/games/inform/pkg-comment b/games/inform/pkg-comment
deleted file mode 100644
index 3b38a2eea66d..000000000000
--- a/games/inform/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Compiler for producing text adventure games
diff --git a/games/jetpack/Makefile b/games/jetpack/Makefile
index f05c051721fc..6ef2567ff27f 100644
--- a/games/jetpack/Makefile
+++ b/games/jetpack/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Arcade action game for X11
USE_IMAKE= yes
MAKE_FLAGS= PREFIX=${PREFIX} -f
diff --git a/games/jetpack/pkg-comment b/games/jetpack/pkg-comment
deleted file mode 100644
index 9a2b4125a513..000000000000
--- a/games/jetpack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Arcade action game for X11
diff --git a/games/jzip/Makefile b/games/jzip/Makefile
index 5e6ff8d01ca7..43a1ea9d6aad 100644
--- a/games/jzip/Makefile
+++ b/games/jzip/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= mph
DISTNAME= jzip201g
MAINTAINER= mph@freebsd.org
+COMMENT= A text-mode Infocom game interpreter
USE_ZIP= yes
diff --git a/games/jzip/pkg-comment b/games/jzip/pkg-comment
deleted file mode 100644
index 126a73911158..000000000000
--- a/games/jzip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text-mode Infocom game interpreter
diff --git a/games/kdegames3/Makefile b/games/kdegames3/Makefile
index 0ed327617674..27073a297749 100644
--- a/games/kdegames3/Makefile
+++ b/games/kdegames3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Games for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/games/kdegames3/pkg-comment b/games/kdegames3/pkg-comment
deleted file mode 100644
index affc783e3bc3..000000000000
--- a/games/kdegames3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Games for the KDE integrated X11 desktop
diff --git a/games/kdegames4/Makefile b/games/kdegames4/Makefile
index 0ed327617674..27073a297749 100644
--- a/games/kdegames4/Makefile
+++ b/games/kdegames4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Games for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/games/kdegames4/pkg-comment b/games/kdegames4/pkg-comment
deleted file mode 100644
index affc783e3bc3..000000000000
--- a/games/kdegames4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Games for the KDE integrated X11 desktop
diff --git a/games/lbreakout/Makefile b/games/lbreakout/Makefile
index 633279b91ee7..5d6984407c07 100644
--- a/games/lbreakout/Makefile
+++ b/games/lbreakout/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lgames
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A nice clone of classical Breakout game
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/games/lbreakout/pkg-comment b/games/lbreakout/pkg-comment
deleted file mode 100644
index f14a901ff2f5..000000000000
--- a/games/lbreakout/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nice clone of classical Breakout game
diff --git a/games/linux-q3ademo/Makefile b/games/linux-q3ademo/Makefile
index 7cad0d4d5f70..bfc38e82d8ed 100644
--- a/games/linux-q3ademo/Makefile
+++ b/games/linux-q3ademo/Makefile
@@ -19,6 +19,7 @@ DISTNAME= linuxq3ademo-1.11-6.x86.gz.sh
EXTRACT_SUFX=
MAINTAINER= 3d@freebsd.org
+COMMENT= Linux 3d shooter from id Software / Loki Software (demo version)
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
/compat/linux/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
diff --git a/games/linux-q3ademo/pkg-comment b/games/linux-q3ademo/pkg-comment
deleted file mode 100644
index 825399067aaf..000000000000
--- a/games/linux-q3ademo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux 3d shooter from id Software / Loki Software (demo version)
diff --git a/games/linux-quake3-demo/Makefile b/games/linux-quake3-demo/Makefile
index 7cad0d4d5f70..bfc38e82d8ed 100644
--- a/games/linux-quake3-demo/Makefile
+++ b/games/linux-quake3-demo/Makefile
@@ -19,6 +19,7 @@ DISTNAME= linuxq3ademo-1.11-6.x86.gz.sh
EXTRACT_SUFX=
MAINTAINER= 3d@freebsd.org
+COMMENT= Linux 3d shooter from id Software / Loki Software (demo version)
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
/compat/linux/lib/libGL.so:${PORTSDIR}/graphics/linux_glx
diff --git a/games/linux-quake3-demo/pkg-comment b/games/linux-quake3-demo/pkg-comment
deleted file mode 100644
index 825399067aaf..000000000000
--- a/games/linux-quake3-demo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux 3d shooter from id Software / Loki Software (demo version)
diff --git a/games/linux-quake3/Makefile b/games/linux-quake3/Makefile
index c4112d55bc3c..db3080a1e0cb 100644
--- a/games/linux-quake3/Makefile
+++ b/games/linux-quake3/Makefile
@@ -14,6 +14,7 @@ DISTNAME= linuxq3apoint-${PORTVERSION}.x86
EXTRACT_SUFX= .run
MAINTAINER= pat@FreeBSD.org
+COMMENT= Quake III Arena Dedicated Server for Linux
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
diff --git a/games/linux-quake3/pkg-comment b/games/linux-quake3/pkg-comment
deleted file mode 100644
index b788736f92f7..000000000000
--- a/games/linux-quake3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quake III Arena Dedicated Server for Linux
diff --git a/games/ltris/Makefile b/games/ltris/Makefile
index 7f1cde1ccf32..30ec4f2ceb29 100644
--- a/games/ltris/Makefile
+++ b/games/ltris/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lgames
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An another tetris clone but a good one with bunch of cool features
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/ltris/pkg-comment b/games/ltris/pkg-comment
deleted file mode 100644
index 1c62deaed605..000000000000
--- a/games/ltris/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An another tetris clone but a good one with bunch of cool features
diff --git a/games/maelstrom/Makefile b/games/maelstrom/Makefile
index 3a725ad3a767..4df0a8699f2e 100644
--- a/games/maelstrom/Makefile
+++ b/games/maelstrom/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.devolution.com/~slouken/projects/Maelstrom/src/
DISTNAME= Maelstrom-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Asteroids-style game for X Window System
LIB_DEPENDS= SDL_net.0:${PORTSDIR}/net/sdl_net
diff --git a/games/maelstrom/pkg-comment b/games/maelstrom/pkg-comment
deleted file mode 100644
index 050568e5ee91..000000000000
--- a/games/maelstrom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asteroids-style game for X Window System
diff --git a/games/mindguard/Makefile b/games/mindguard/Makefile
index 5c0778d69cd5..782990a86b3b 100644
--- a/games/mindguard/Makefile
+++ b/games/mindguard/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://zapatopi.net/mindguard/
EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
+COMMENT= Helpful utility for detecting and jamming harmful mind-control rays
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/games/mindguard/pkg-comment b/games/mindguard/pkg-comment
deleted file mode 100644
index bbc715f65dd3..000000000000
--- a/games/mindguard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Helpful utility for detecting and jamming harmful mind-control rays
diff --git a/games/mythserver/Makefile b/games/mythserver/Makefile
index 5aabc27bca92..8cab10ec50de 100644
--- a/games/mythserver/Makefile
+++ b/games/mythserver/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://support.bungie.com/ftp/pub/win/misc/
DISTNAME= metaserver2open
MAINTAINER= adamw@FreeBSD.org
+COMMENT= Bungie.net MythII Metaserver Open Source
USE_ZIP= yes
USE_GMAKE= yes
diff --git a/games/mythserver/pkg-comment b/games/mythserver/pkg-comment
deleted file mode 100644
index cc70ec3c20e2..000000000000
--- a/games/mythserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bungie.net MythII Metaserver Open Source
diff --git a/games/netrek-BRMH-bin/Makefile b/games/netrek-BRMH-bin/Makefile
index dde585c489f3..9e5f063dbd8b 100644
--- a/games/netrek-BRMH-bin/Makefile
+++ b/games/netrek-BRMH-bin/Makefile
@@ -13,6 +13,7 @@ DISTNAME= BRMH-2.2p2.freebsd.bin
EXTRACT_SUFX= .gz
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A 16-player network space battle/conquest game with a Star Trek theme
USE_X_PREFIX= YES
NO_BUILD= YES
diff --git a/games/netrek-BRMH-bin/pkg-comment b/games/netrek-BRMH-bin/pkg-comment
deleted file mode 100644
index 21dce8cba443..000000000000
--- a/games/netrek-BRMH-bin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 16-player network space battle/conquest game with a Star Trek theme
diff --git a/games/netrek-COW3-bin/Makefile b/games/netrek-COW3-bin/Makefile
index 15f4c569d022..acbcb0294c87 100644
--- a/games/netrek-COW3-bin/Makefile
+++ b/games/netrek-COW3-bin/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://bigbang.astro.indiana.edu/pub/netrek/COW/COW-bin/
DISTFILES= COW.3.00pl0.FreeBSD.gz
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A 16-player network space battle/conquest game with a Star Trek theme
USE_X_PREFIX= YES
NO_BUILD= YES
diff --git a/games/netrek-COW3-bin/pkg-comment b/games/netrek-COW3-bin/pkg-comment
deleted file mode 100644
index 21dce8cba443..000000000000
--- a/games/netrek-COW3-bin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 16-player network space battle/conquest game with a Star Trek theme
diff --git a/games/newvox/Makefile b/games/newvox/Makefile
index c66a66942b02..41853a48ee29 100644
--- a/games/newvox/Makefile
+++ b/games/newvox/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.libsdl.org/projects/newvox/src/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Voxel-style landscape rendering fly-by
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/games/newvox/pkg-comment b/games/newvox/pkg-comment
deleted file mode 100644
index 6952da5441c9..000000000000
--- a/games/newvox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Voxel-style landscape rendering fly-by
diff --git a/games/nil/Makefile b/games/nil/Makefile
index 9ebabd1e3d5d..282079ddb0fe 100644
--- a/games/nil/Makefile
+++ b/games/nil/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME} sobomax
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A multiplayer game that can be described as Quake in 2D or Worms done right
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/nil/pkg-comment b/games/nil/pkg-comment
deleted file mode 100644
index f7ae707e4d9c..000000000000
--- a/games/nil/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiplayer game that can be described as Quake in 2D or Worms done right
diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile
index ba35b9471955..5a513f128a8b 100644
--- a/games/pengpong/Makefile
+++ b/games/pengpong/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A cross-platform pong game written in SDL
LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/games/pengpong/pkg-comment b/games/pengpong/pkg-comment
deleted file mode 100644
index c4f2efcec573..000000000000
--- a/games/pengpong/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cross-platform pong game written in SDL
diff --git a/games/pysol/Makefile b/games/pysol/Makefile
index 78b06d16d98b..68c7531afa67 100644
--- a/games/pysol/Makefile
+++ b/games/pysol/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://pysol2.sourceforge.net/download/ \
http://www.oberhumer.com/opensource/pysol/download/
MAINTAINER= tg@FreeBSD.org
+COMMENT= Solitaire game, written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/games/pysol/pkg-comment b/games/pysol/pkg-comment
deleted file mode 100644
index 5f398386683b..000000000000
--- a/games/pysol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Solitaire game, written in Python
diff --git a/games/q3-paks/Makefile b/games/q3-paks/Makefile
index 7ef4becfb4d1..5ac75923097e 100644
--- a/games/q3-paks/Makefile
+++ b/games/q3-paks/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= q3-paks
IGNOREFILES= ${ALLFILES}
MAINTAINER= nik@FreeBSD.org
+COMMENT= Quake 3 for Linux .pk3 files
# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
# directory hierarchy for us.
diff --git a/games/q3-paks/pkg-comment b/games/q3-paks/pkg-comment
deleted file mode 100644
index 019701a10eb7..000000000000
--- a/games/q3-paks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quake 3 for Linux .pk3 files
diff --git a/games/q3server/Makefile b/games/q3server/Makefile
index c4112d55bc3c..db3080a1e0cb 100644
--- a/games/q3server/Makefile
+++ b/games/q3server/Makefile
@@ -14,6 +14,7 @@ DISTNAME= linuxq3apoint-${PORTVERSION}.x86
EXTRACT_SUFX= .run
MAINTAINER= pat@FreeBSD.org
+COMMENT= Quake III Arena Dedicated Server for Linux
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
diff --git a/games/q3server/pkg-comment b/games/q3server/pkg-comment
deleted file mode 100644
index b788736f92f7..000000000000
--- a/games/q3server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quake III Arena Dedicated Server for Linux
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 760fca6c6a94..7f0596d0c1df 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@freebsd.org
+COMMENT= A Go board and SGF editor written with the Qt library
USE_REINPLACE= yes
USE_QT_VER= 3
diff --git a/games/qgo/pkg-comment b/games/qgo/pkg-comment
deleted file mode 100644
index 6a9e563e4ddf..000000000000
--- a/games/qgo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Go board and SGF editor written with the Qt library
diff --git a/games/qix/Makefile b/games/qix/Makefile
index dfd7d07fec63..3755b7aa8585 100644
--- a/games/qix/Makefile
+++ b/games/qix/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= The classic arcade game
.if defined(WITHOUT_X11)
MAKE_ARGS= NO_X11=yes
diff --git a/games/qix/pkg-comment b/games/qix/pkg-comment
deleted file mode 100644
index 8dbd40eaef59..000000000000
--- a/games/qix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The classic arcade game
diff --git a/games/qkmj/Makefile b/games/qkmj/Makefile
index b0347b36c6b4..9137ac5e5977 100644
--- a/games/qkmj/Makefile
+++ b/games/qkmj/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=
EXTRACT_ONLY=
MAINTAINER= clive@FreeBSD.org
+COMMENT= QKMJ - QK Ma2Jong4 client
ONLY_FOR_ARCHS= i386
diff --git a/games/qkmj/pkg-comment b/games/qkmj/pkg-comment
deleted file mode 100644
index ff53ce055ef4..000000000000
--- a/games/qkmj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QKMJ - QK Ma2Jong4 client
diff --git a/games/qstat/Makefile b/games/qstat/Makefile
index 86f808f3ba87..31d7df7b0993 100644
--- a/games/qstat/Makefile
+++ b/games/qstat/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.qstat.org/
DISTNAME= qstat${PORTVERSION:S/.//g}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A command line program to query game servers on the net
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/qstat ${PREFIX}/bin
diff --git a/games/qstat/pkg-comment b/games/qstat/pkg-comment
deleted file mode 100644
index 9ae9ae0f8d11..000000000000
--- a/games/qstat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command line program to query game servers on the net
diff --git a/games/quake3-data/Makefile b/games/quake3-data/Makefile
index 7ef4becfb4d1..5ac75923097e 100644
--- a/games/quake3-data/Makefile
+++ b/games/quake3-data/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= q3-paks
IGNOREFILES= ${ALLFILES}
MAINTAINER= nik@FreeBSD.org
+COMMENT= Quake 3 for Linux .pk3 files
# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
# directory hierarchy for us.
diff --git a/games/quake3-data/pkg-comment b/games/quake3-data/pkg-comment
deleted file mode 100644
index 019701a10eb7..000000000000
--- a/games/quake3-data/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quake 3 for Linux .pk3 files
diff --git a/games/robocode/Makefile b/games/robocode/Makefile
index ea1218dd6fd2..4632225a72b2 100644
--- a/games/robocode/Makefile
+++ b/games/robocode/Makefile
@@ -13,6 +13,7 @@ DISTNAME= robocode-setup-${PORTVERSION}
EXTRACT_SUFX= .jar
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A game for learning Java[tm] programming language
USE_JAVA= 1.3+
diff --git a/games/robocode/pkg-comment b/games/robocode/pkg-comment
deleted file mode 100644
index 831f87b71a1a..000000000000
--- a/games/robocode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game for learning Java[tm] programming language
diff --git a/games/rt2-demo/Makefile b/games/rt2-demo/Makefile
index bc40602d869a..80ea210a8315 100644
--- a/games/rt2-demo/Makefile
+++ b/games/rt2-demo/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX= .run
EXTRACT_ONLY=
MAINTAINER= se@FreeBSD.org
+COMMENT= The free demo of Railroad Tycoon II
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/games/rt2-demo/pkg-comment b/games/rt2-demo/pkg-comment
deleted file mode 100644
index 916d954a8054..000000000000
--- a/games/rt2-demo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The free demo of Railroad Tycoon II
diff --git a/games/rtcw-paks/Makefile b/games/rtcw-paks/Makefile
index 5d34b587df83..734aa3341d2a 100644
--- a/games/rtcw-paks/Makefile
+++ b/games/rtcw-paks/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR= rtcw-paks
IGNOREFILES= ${ALLFILES}
MAINTAINER= nik@FreeBSD.org
+COMMENT= Return to Castle Wolfenstein for Linux .pk3 files
# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
# directory hierarchy for us.
diff --git a/games/rtcw-paks/pkg-comment b/games/rtcw-paks/pkg-comment
deleted file mode 100644
index 723f7449d268..000000000000
--- a/games/rtcw-paks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Return to Castle Wolfenstein for Linux .pk3 files
diff --git a/games/rtcw/Makefile b/games/rtcw/Makefile
index 63967c5dea32..42a6ad2d0b09 100644
--- a/games/rtcw/Makefile
+++ b/games/rtcw/Makefile
@@ -13,6 +13,7 @@ DISTNAME= wolf-linux-${PORTVERSION}.x86
EXTRACT_SUFX= .run
MAINTAINER= nik@FreeBSD.org
+COMMENT= Return to Castle Wolfenstein for Linux
ONLY_FOR_ARCHS= i386
USE_LINUX_PREFIX= yes
diff --git a/games/rtcw/pkg-comment b/games/rtcw/pkg-comment
deleted file mode 100644
index d5a8f3ac6237..000000000000
--- a/games/rtcw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Return to Castle Wolfenstein for Linux
diff --git a/games/scorched3d-devel/Makefile b/games/scorched3d-devel/Makefile
index 86f07961349d..107624a83adc 100644
--- a/games/scorched3d-devel/Makefile
+++ b/games/scorched3d-devel/Makefile
@@ -16,6 +16,7 @@ PATCH_SITES= ftp://ftp.jurai.net/users/winter/patches/
PATCHFILES= scorched3d-0.32.0-FreeBSD.patch.0.gz
MAINTAINER= mdodd@FreeBSD.org
+COMMENT= Scorched is a game based loosely on the classic DOS game
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/games/scorched3d-devel/pkg-comment b/games/scorched3d-devel/pkg-comment
deleted file mode 100644
index 4f6527ddf24f..000000000000
--- a/games/scorched3d-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scorched is a game based loosely on the classic DOS game
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index 86f07961349d..107624a83adc 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -16,6 +16,7 @@ PATCH_SITES= ftp://ftp.jurai.net/users/winter/patches/
PATCHFILES= scorched3d-0.32.0-FreeBSD.patch.0.gz
MAINTAINER= mdodd@FreeBSD.org
+COMMENT= Scorched is a game based loosely on the classic DOS game
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/games/scorched3d/pkg-comment b/games/scorched3d/pkg-comment
deleted file mode 100644
index 4f6527ddf24f..000000000000
--- a/games/scorched3d/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scorched is a game based loosely on the classic DOS game
diff --git a/games/sdlroids/Makefile b/games/sdlroids/Makefile
index c250072703c8..a4ee3d5baf54 100644
--- a/games/sdlroids/Makefile
+++ b/games/sdlroids/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An enhanced shoot-the-asteroids game
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/sdlroids/pkg-comment b/games/sdlroids/pkg-comment
deleted file mode 100644
index 013f563abb7f..000000000000
--- a/games/sdlroids/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An enhanced shoot-the-asteroids game
diff --git a/games/seahaven/Makefile b/games/seahaven/Makefile
index afa98c6f19a7..2890eaa6dc13 100644
--- a/games/seahaven/Makefile
+++ b/games/seahaven/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= imp@FreeBSD.org
+COMMENT= The classic, lightweight version of Seahaven Towers
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/games/seahaven/pkg-comment b/games/seahaven/pkg-comment
deleted file mode 100644
index 5acd9b2c77eb..000000000000
--- a/games/seahaven/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The classic, lightweight version of Seahaven Towers
diff --git a/games/solarwolf/Makefile b/games/solarwolf/Makefile
index 2526ac4ffe5c..093f7d81dfe8 100644
--- a/games/solarwolf/Makefile
+++ b/games/solarwolf/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= games
MASTER_SITES= http://www.pygame.org/shredwheat/solarwolf/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An action/arcade game originally based of SolarFox on the Atari 2600
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
diff --git a/games/solarwolf/pkg-comment b/games/solarwolf/pkg-comment
deleted file mode 100644
index 855cc0408eda..000000000000
--- a/games/solarwolf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An action/arcade game originally based of SolarFox on the Atari 2600
diff --git a/games/speyes/Makefile b/games/speyes/Makefile
index a80135b2bd12..6a4e72362d94 100644
--- a/games/speyes/Makefile
+++ b/games/speyes/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://okb-1.org/speyes/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= WindowMaker dockapp/xeyes clone using SouthPark characters
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/speyes/pkg-comment b/games/speyes/pkg-comment
deleted file mode 100644
index 6090e902687b..000000000000
--- a/games/speyes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WindowMaker dockapp/xeyes clone using SouthPark characters
diff --git a/games/stvef-paks/Makefile b/games/stvef-paks/Makefile
index ccb525c8a1f6..bfdf6776207f 100644
--- a/games/stvef-paks/Makefile
+++ b/games/stvef-paks/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= stvef
IGNOREFILES= ${ALLFILES}
MAINTAINER= nik@FreeBSD.org
+COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux .pk3 files
# Make this a BUILD_ rather than a RUN_DEPEND so that it can create the
# directory hierarchy for us.
diff --git a/games/stvef-paks/pkg-comment b/games/stvef-paks/pkg-comment
deleted file mode 100644
index 280d789f3beb..000000000000
--- a/games/stvef-paks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Star Trek Voyager: Elite Forces dedicated server for Linux .pk3 files
diff --git a/games/stvef-server/Makefile b/games/stvef-server/Makefile
index 39dba7a45c39..e6ab9c8da05b 100644
--- a/games/stvef-server/Makefile
+++ b/games/stvef-server/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ftp://3dgamers.in-span.net/pub/3dgamers/games/stveliteforce/
DISTFILES= stveflinuxdedicated120.zip
MAINTAINER= nik@FreeBSD.org
+COMMENT= Star Trek Voyager: Elite Forces dedicated server for Linux
ONLY_FOR_ARCHS= i386
USE_ZIP= yes
diff --git a/games/stvef-server/pkg-comment b/games/stvef-server/pkg-comment
deleted file mode 100644
index c157314f55bf..000000000000
--- a/games/stvef-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Star Trek Voyager: Elite Forces dedicated server for Linux
diff --git a/games/tads/Makefile b/games/tads/Makefile
index 009bac9a5be0..c4db8dcbfb63 100644
--- a/games/tads/Makefile
+++ b/games/tads/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.ifarchive.org/if-archive/programming/tads2/source/
DISTNAME= tads23-unix
MAINTAINER= kris@FreeBSD.org
+COMMENT= TADS compiler/interpreter for interactive fiction
WRKSRC= ${WRKDIR}/tads/tads2
MAKEFILE= makefile
diff --git a/games/tads/pkg-comment b/games/tads/pkg-comment
deleted file mode 100644
index 4993fa5c940d..000000000000
--- a/games/tads/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TADS compiler/interpreter for interactive fiction
diff --git a/games/teg/Makefile b/games/teg/Makefile
index 4a1e8c69e649..bd7de1c3ec79 100644
--- a/games/teg/Makefile
+++ b/games/teg/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A turn-based strategy game for GNOME
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/games/teg/pkg-comment b/games/teg/pkg-comment
deleted file mode 100644
index 55e5af42b1e4..000000000000
--- a/games/teg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A turn-based strategy game for GNOME
diff --git a/games/tksol/Makefile b/games/tksol/Makefile
index 3bceaecdc706..22ed59a62192 100644
--- a/games/tksol/Makefile
+++ b/games/tksol/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.cs.umd.edu/pub/misc_software/tksol/
EXTRACT_SUFX= .tar.Z
MAINTAINER= tg@FreeBSD.org
+COMMENT= A version of the card game solitaire
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/games/tksol/pkg-comment b/games/tksol/pkg-comment
deleted file mode 100644
index 0f82bec40b0f..000000000000
--- a/games/tksol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A version of the card game solitaire
diff --git a/games/tome/Makefile b/games/tome/Makefile
index f7bb2bc3b81a..fe45c32aeadf 100644
--- a/games/tome/Makefile
+++ b/games/tome/Makefile
@@ -13,6 +13,7 @@ DISTNAME= tome-212-src
EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
+COMMENT= Roguelike dungeon exploration game based on JRR Tolkien's works
ALL_TARGET= # empty
MAKEFILE= makefile.std
diff --git a/games/tome/pkg-comment b/games/tome/pkg-comment
deleted file mode 100644
index 7651a3f729ec..000000000000
--- a/games/tome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Roguelike dungeon exploration game based on JRR Tolkien's works
diff --git a/games/ttraffic/Makefile b/games/ttraffic/Makefile
index 15e13bf4d726..a1427c55eb5b 100644
--- a/games/ttraffic/Makefile
+++ b/games/ttraffic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://alpha.luc.ac.be/Research/Algebra/Members/Ttraffic/ \
http://www.tobez.org/download/port-mirrors/games/ttraffic/
MAINTAINER= tobez@FreeBSD.org
+COMMENT= TTraffic - A Tcl/Tk version of Rush Hour
BUILD_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83
RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83
diff --git a/games/ttraffic/pkg-comment b/games/ttraffic/pkg-comment
deleted file mode 100644
index 47094a2c5a89..000000000000
--- a/games/ttraffic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TTraffic - A Tcl/Tk version of Rush Hour
diff --git a/games/tuxracer-commercial/Makefile b/games/tuxracer-commercial/Makefile
index b4fe5931245b..188b2b483dee 100644
--- a/games/tuxracer-commercial/Makefile
+++ b/games/tuxracer-commercial/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= A 3d penguin racing game using OpenGL
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
tcl83.1:${PORTSDIR}/lang/tcl83
diff --git a/games/tuxracer-commercial/pkg-comment b/games/tuxracer-commercial/pkg-comment
deleted file mode 100644
index 3aae59168873..000000000000
--- a/games/tuxracer-commercial/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3d penguin racing game using OpenGL
diff --git a/games/tuxracer/Makefile b/games/tuxracer/Makefile
index b4fe5931245b..188b2b483dee 100644
--- a/games/tuxracer/Makefile
+++ b/games/tuxracer/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \
${PORTNAME}-data-${PORTVERSION}.tar.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= A 3d penguin racing game using OpenGL
LIB_DEPENDS= SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer \
tcl83.1:${PORTSDIR}/lang/tcl83
diff --git a/games/tuxracer/pkg-comment b/games/tuxracer/pkg-comment
deleted file mode 100644
index 3aae59168873..000000000000
--- a/games/tuxracer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3d penguin racing game using OpenGL
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index f3a26665fa5c..7a8792a0844a 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= An educational typing tutor starring Tux the Linux Penguin
LIB_DEPENDS= SDL_image.10:${PORTSDIR}/graphics/sdl_image \
SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
diff --git a/games/tuxtype/pkg-comment b/games/tuxtype/pkg-comment
deleted file mode 100644
index bf9b75f86ddf..000000000000
--- a/games/tuxtype/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An educational typing tutor starring Tux the Linux Penguin
diff --git a/games/tvp/Makefile b/games/tvp/Makefile
index 28de3ff19b24..5c5b21b94b4c 100644
--- a/games/tvp/Makefile
+++ b/games/tvp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games tk82
MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/president/
MAINTAINER= hoek@FreeBSD.org
+COMMENT= Play the cardgame President (or Ass) against 3 AIs
# Comment-out this (and CFLAGS) to compile only the CLI and ansi interfaces
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/games/tvp/pkg-comment b/games/tvp/pkg-comment
deleted file mode 100644
index a80342a90246..000000000000
--- a/games/tvp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Play the cardgame President (or Ass) against 3 AIs
diff --git a/games/uox3/Makefile b/games/uox3/Makefile
index 6ba78ce927b7..a9500ab9d998 100644
--- a/games/uox3/Makefile
+++ b/games/uox3/Makefile
@@ -13,6 +13,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} tqpsworld${EXTRACT_SUFX}
DISTNAME= uox3v6902-linux
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A GPL'd server for Origin Systems' Ultima Online multiplayer game
DIST_SUBDIR= uox3
USE_ZIP= YES
diff --git a/games/uox3/pkg-comment b/games/uox3/pkg-comment
deleted file mode 100644
index 881bfcc06128..000000000000
--- a/games/uox3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GPL'd server for Origin Systems' Ultima Online multiplayer game
diff --git a/games/utserver-to/Makefile b/games/utserver-to/Makefile
index c8b0056688c5..04a5fceb6efc 100644
--- a/games/utserver-to/Makefile
+++ b/games/utserver-to/Makefile
@@ -19,6 +19,7 @@ DISTNAME?= TacticalOps220
.endif
MAINTAINER?= pat@FreeBSD.org
+COMMENT?= Unreal Tournament mod Tactical Ops full server package for Linux
RUN_DEPENDS= ${LINUXBASE}/usr/games/ut-server/System/ucc-bin:${UTSERVER_PORT}
diff --git a/games/utserver-to/pkg-comment b/games/utserver-to/pkg-comment
deleted file mode 100644
index 7c7284b007ad..000000000000
--- a/games/utserver-to/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unreal Tournament mod Tactical Ops full server package for Linux
diff --git a/games/wmtictactoe/Makefile b/games/wmtictactoe/Makefile
index 83941876c4f5..47bbb6132541 100644
--- a/games/wmtictactoe/Makefile
+++ b/games/wmtictactoe/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= jim
DISTNAME= wmtictactoe-1.1-1
MAINTAINER= jim@FreeBSD.org
+COMMENT= A dockable TicTacToe game for WindowMaker and AfterStep
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/wmtictactoe.app/wmtictactoe
diff --git a/games/wmtictactoe/pkg-comment b/games/wmtictactoe/pkg-comment
deleted file mode 100644
index e5e52ccc9eae..000000000000
--- a/games/wmtictactoe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable TicTacToe game for WindowMaker and AfterStep
diff --git a/games/wtf/Makefile b/games/wtf/Makefile
index cdc3499992e3..e39c47ff4375 100644
--- a/games/wtf/Makefile
+++ b/games/wtf/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.mu.org/~mux/wtf/ \
MASTER_SITE_SUBDIR= petef
MAINTAINER= mux@FreeBSD.org
+COMMENT= Translates common Internet acronyms
NO_BUILD= yes
diff --git a/games/wtf/pkg-comment b/games/wtf/pkg-comment
deleted file mode 100644
index 5bae616aa90c..000000000000
--- a/games/wtf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translates common Internet acronyms
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index 3a7f4992d25b..4fd88e087271 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.seul.org/pub/xarchon/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A chess-like strategy game with battle options
USE_XLIB= yes
USE_GNOMENG= yes
diff --git a/games/xarchon/pkg-comment b/games/xarchon/pkg-comment
deleted file mode 100644
index c20645963401..000000000000
--- a/games/xarchon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A chess-like strategy game with battle options
diff --git a/games/xbat/Makefile b/games/xbat/Makefile
index 2fb5a48a44c1..b955d5226b0c 100644
--- a/games/xbat/Makefile
+++ b/games/xbat/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.nemoto.ecei.tohoku.ac.jp/~wai/Xbat/
DISTNAME= xev111
MAINTAINER= nakai@FreeBSD.org
+COMMENT= XEVIOUS like shooting game
NO_CDROM= Possible copyright infringement
diff --git a/games/xbat/pkg-comment b/games/xbat/pkg-comment
deleted file mode 100644
index 47d040cf6d1d..000000000000
--- a/games/xbat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEVIOUS like shooting game
diff --git a/games/xblast-beta/Makefile b/games/xblast-beta/Makefile
index 58af6812bf1d..c14f3c6919d4 100644
--- a/games/xblast-beta/Makefile
+++ b/games/xblast-beta/Makefile
@@ -17,6 +17,7 @@ DISTFILES= xblast-2.6.1.sound${EXTRACT_SUFX} \
xblast-tnt-unix.tar.gz
MAINTAINER= se@FreeBSD.org
+COMMENT= Multi-player real-time strategy game for X11 (beta release)
WRKSRC= ${WRKDIR}/XBlast-2.6-sound
USE_IMAKE= yes
diff --git a/games/xblast-beta/pkg-comment b/games/xblast-beta/pkg-comment
deleted file mode 100644
index 1048ae2a18b3..000000000000
--- a/games/xblast-beta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-player real-time strategy game for X11 (beta release)
diff --git a/games/xblast/Makefile b/games/xblast/Makefile
index 169ed93ff2d1..60bf53814356 100644
--- a/games/xblast/Makefile
+++ b/games/xblast/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games/arcade
DISTNAME= ${PORTNAME}-${PORTVERSION}.sound
MAINTAINER= se@FreeBSD.org
+COMMENT= Multi-player real-time strategy game for X11
WRKSRC= ${WRKDIR}/XBlast-2.6-sound
USE_IMAKE= yes
diff --git a/games/xblast/pkg-comment b/games/xblast/pkg-comment
deleted file mode 100644
index 534f34f85101..000000000000
--- a/games/xblast/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-player real-time strategy game for X11
diff --git a/games/xcubes/Makefile b/games/xcubes/Makefile
index 5298ba4c3149..b1f69d8051c8 100644
--- a/games/xcubes/Makefile
+++ b/games/xcubes/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Cube puzzle for X11
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xcubes/pkg-comment b/games/xcubes/pkg-comment
deleted file mode 100644
index 89fe808690c8..000000000000
--- a/games/xcubes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cube puzzle for X11
diff --git a/games/xdeblock/Makefile b/games/xdeblock/Makefile
index c77af624bde0..763483038437 100644
--- a/games/xdeblock/Makefile
+++ b/games/xdeblock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.vector.co.jp/pack/unix/game/action/block/
DISTFILES= ${PORTNAME}.tgz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Block action game
WRKSRC= ${WRKDIR}/xdeblo_v1.0
USE_IMAKE= yes
diff --git a/games/xdeblock/pkg-comment b/games/xdeblock/pkg-comment
deleted file mode 100644
index 8b2e7debe41e..000000000000
--- a/games/xdeblock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Block action game
diff --git a/games/xdino/Makefile b/games/xdino/Makefile
index 42cea2d954f6..2129ed484265 100644
--- a/games/xdino/Makefile
+++ b/games/xdino/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Dino puzzle game for X11
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xdino/pkg-comment b/games/xdino/pkg-comment
deleted file mode 100644
index f5bde3313c73..000000000000
--- a/games/xdino/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dino puzzle game for X11
diff --git a/games/xeyesplus/Makefile b/games/xeyesplus/Makefile
index f5cb70cdd7b9..848dd70f7242 100644
--- a/games/xeyesplus/Makefile
+++ b/games/xeyesplus/Makefile
@@ -13,6 +13,7 @@ DISTNAME= xeyes+${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Horrible eyes looking at your mouse cursor
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xeyesplus/pkg-comment b/games/xeyesplus/pkg-comment
deleted file mode 100644
index 7045c9c23661..000000000000
--- a/games/xeyesplus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Horrible eyes looking at your mouse cursor
diff --git a/games/xflame/Makefile b/games/xflame/Makefile
index ce1770bf3dc8..8ad98f7b8ec9 100644
--- a/games/xflame/Makefile
+++ b/games/xflame/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.owlnet.rice.edu/~rahul/
MAINTAINER= kris@FreeBSD.org
+COMMENT= A cool animated flame
USE_IMAKE= yes
diff --git a/games/xflame/pkg-comment b/games/xflame/pkg-comment
deleted file mode 100644
index 21b4aad7150a..000000000000
--- a/games/xflame/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cool animated flame
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index dc40cc604bff..2410dec09b3b 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://cvs.morphy.iki.fi/xfrisk/
DISTNAME= XFrisk-${PORTVERSION}
MAINTAINER= mph@freebsd.org
+COMMENT= A multi-player networked Risk game for X11
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/games/xfrisk/pkg-comment b/games/xfrisk/pkg-comment
deleted file mode 100644
index 09e83b492e44..000000000000
--- a/games/xfrisk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-player networked Risk game for X11
diff --git a/games/xgammon/Makefile b/games/xgammon/Makefile
index cb1782c1a828..cac3543876d6 100644
--- a/games/xgammon/Makefile
+++ b/games/xgammon/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= -15.src.rpm
PATCH_DIST_STRIP= -p1
MAINTAINER= tg@FreeBSD.org
+COMMENT= A backgammon program for X11
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/games/xgammon/pkg-comment b/games/xgammon/pkg-comment
deleted file mode 100644
index 04062e44b5e5..000000000000
--- a/games/xgammon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A backgammon program for X11
diff --git a/games/xgolgo/Makefile b/games/xgolgo/Makefile
index 9590785dc9e4..244679a233c0 100644
--- a/games/xgolgo/Makefile
+++ b/games/xgolgo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.nemoto.ecei.tohoku.ac.jp/pub/X11/misc/
DISTNAME= xeyes-g
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Xgolgo watches what you are doing and whether you're hostile or not
WRKSRC= ${WRKDIR}/xeyes
USE_IMAKE= yes
diff --git a/games/xgolgo/pkg-comment b/games/xgolgo/pkg-comment
deleted file mode 100644
index 15a66db2f256..000000000000
--- a/games/xgolgo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xgolgo watches what you are doing and whether you're hostile or not
diff --git a/games/xhime/Makefile b/games/xhime/Makefile
index 25b971d8e9d9..dc06211931ad 100644
--- a/games/xhime/Makefile
+++ b/games/xhime/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tcp-ip.or.jp/~shochan/linux/
DISTFILES= xhime151.tgz
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Resident Himechan for X Window System
WRKSRC= ${WRKDIR}/xhime1.51
USE_IMAKE= yes
diff --git a/games/xhime/pkg-comment b/games/xhime/pkg-comment
deleted file mode 100644
index 9a39caf383b3..000000000000
--- a/games/xhime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Resident Himechan for X Window System
diff --git a/games/xinfocom/Makefile b/games/xinfocom/Makefile
index 8072e5d2bf6f..fc2c42686775 100644
--- a/games/xinfocom/Makefile
+++ b/games/xinfocom/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= mph
DISTFILES= unix8m.tgz
MAINTAINER= mph@freebsd.org
+COMMENT= An Infocom game interpreter for X11
WRKSRC= ${WRKDIR}/xinfocom
diff --git a/games/xinfocom/pkg-comment b/games/xinfocom/pkg-comment
deleted file mode 100644
index e5de25e4f2ce..000000000000
--- a/games/xinfocom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Infocom game interpreter for X11
diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile
index c56763b86b3d..ded4971969db 100644
--- a/games/xinvaders3d/Makefile
+++ b/games/xinvaders3d/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= 3D Vector-graphics Space Invaders clone for X
USE_X_PREFIX= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/games/xinvaders3d/pkg-comment b/games/xinvaders3d/pkg-comment
deleted file mode 100644
index da6d452fafa2..000000000000
--- a/games/xinvaders3d/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3D Vector-graphics Space Invaders clone for X
diff --git a/games/xjewel/Makefile b/games/xjewel/Makefile
index 0c8d6590bb4f..02d345718fa1 100644
--- a/games/xjewel/Makefile
+++ b/games/xjewel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.warwick.ac.uk/pub/x11/ \
EXTRACT_SUFX= .tar.z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= X11 dropping jewels game
USE_IMAKE= yes
diff --git a/games/xjewel/pkg-comment b/games/xjewel/pkg-comment
deleted file mode 100644
index c13b713608f1..000000000000
--- a/games/xjewel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 dropping jewels game
diff --git a/games/xjig/Makefile b/games/xjig/Makefile
index c6363035c089..1ef40644fc9d 100644
--- a/games/xjig/Makefile
+++ b/games/xjig/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= games
EXTRACT_SUFX= .tgz
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Jigsaw puzzle game for X11
USE_XLIB= yes
MAKEFILE= Makefile.Linux
diff --git a/games/xjig/pkg-comment b/games/xjig/pkg-comment
deleted file mode 100644
index 4766f1703299..000000000000
--- a/games/xjig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jigsaw puzzle game for X11
diff --git a/games/xkobo/Makefile b/games/xkobo/Makefile
index a6b3dbc360fd..6eae33de7b49 100644
--- a/games/xkobo/Makefile
+++ b/games/xkobo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= games
MAINTAINER= will@FreeBSD.org
+COMMENT= Multi-way scrolling shoot 'em up game for X. Strangely addictive
USE_IMAKE= yes
ALL_TARGET= xkobo
diff --git a/games/xkobo/pkg-comment b/games/xkobo/pkg-comment
deleted file mode 100644
index adb46c268ce7..000000000000
--- a/games/xkobo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-way scrolling shoot 'em up game for X. Strangely addictive
diff --git a/games/xmahjongg/Makefile b/games/xmahjongg/Makefile
index 49230c43b017..ddca2fea0e53 100644
--- a/games/xmahjongg/Makefile
+++ b/games/xmahjongg/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.lcdf.org/xmahjongg/
MAINTAINER= joerg@freebsd.org
+COMMENT= The Chinese game of Mahjongg for X11
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/games/xmahjongg/pkg-comment b/games/xmahjongg/pkg-comment
deleted file mode 100644
index c91bc3346f6b..000000000000
--- a/games/xmahjongg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Chinese game of Mahjongg for X11
diff --git a/games/xmine/Makefile b/games/xmine/Makefile
index a894c612d31b..15e2233abb88 100644
--- a/games/xmine/Makefile
+++ b/games/xmine/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTNAME= ${PKGNAME}-Xaw
MAINTAINER= joerg@FreeBSD.org
+COMMENT= The `Athena' port of the xminesweeper game
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/games/xmine/pkg-comment b/games/xmine/pkg-comment
deleted file mode 100644
index 9ae78f7370f9..000000000000
--- a/games/xmine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The `Athena' port of the xminesweeper game
diff --git a/games/xminehunter/Makefile b/games/xminehunter/Makefile
index 114970bdff5e..a9f7e401bf5b 100644
--- a/games/xminehunter/Makefile
+++ b/games/xminehunter/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= tg@FreeBSD.org
+COMMENT= A Motif minesweeper game
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/games/xminehunter/pkg-comment b/games/xminehunter/pkg-comment
deleted file mode 100644
index a1756d94281c..000000000000
--- a/games/xminehunter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Motif minesweeper game
diff --git a/games/xmris/Makefile b/games/xmris/Makefile
index 382a3753afd7..95b6f6482922 100644
--- a/games/xmris/Makefile
+++ b/games/xmris/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A version of the Mr Do video arcade game for X11
USE_IMAKE= yes
MAKE_FLAGS= XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f
diff --git a/games/xmris/pkg-comment b/games/xmris/pkg-comment
deleted file mode 100644
index e5af96b20f3a..000000000000
--- a/games/xmris/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A version of the Mr Do video arcade game for X11
diff --git a/games/xonix/Makefile b/games/xonix/Makefile
index cc11b1a137f7..e5e40d5236d3 100644
--- a/games/xonix/Makefile
+++ b/games/xonix/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Try to win land without colliding with `flyers' and `eaters'
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xonix/pkg-comment b/games/xonix/pkg-comment
deleted file mode 100644
index 532e061a221b..000000000000
--- a/games/xonix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Try to win land without colliding with `flyers' and `eaters'
diff --git a/games/xosmulti/Makefile b/games/xosmulti/Makefile
index 7adac0a2cd3e..e78a529ef957 100644
--- a/games/xosmulti/Makefile
+++ b/games/xosmulti/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}_tar
EXTRACT_SUFX= .gz
MAINTAINER= flathill@FreeBSD.org
+COMMENT= A littele girl catoon on the top of the active window
WRKSRC= ${WRKDIR}/xosmulti
USE_X_PREFIX= yes
diff --git a/games/xosmulti/pkg-comment b/games/xosmulti/pkg-comment
deleted file mode 100644
index ff66d1287ae5..000000000000
--- a/games/xosmulti/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A littele girl catoon on the top of the active window
diff --git a/games/xpacman/Makefile b/games/xpacman/Makefile
index ca049a5ecda1..e94119affd12 100644
--- a/games/xpacman/Makefile
+++ b/games/xpacman/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.nvg.unit.no/pub/pacman/
DISTNAME= pacman10
MAINTAINER= joerg@FreeBSD.org
+COMMENT= An old action game
NO_WRKSUBDIR= Does not unpack into subdir.
USE_ZIP= yes
diff --git a/games/xpacman/pkg-comment b/games/xpacman/pkg-comment
deleted file mode 100644
index ae17384be8ea..000000000000
--- a/games/xpacman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An old action game
diff --git a/games/xpat2/Makefile b/games/xpat2/Makefile
index 5927eda78e9f..6744fd3e05ed 100644
--- a/games/xpat2/Makefile
+++ b/games/xpat2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
MAINTAINER= mph@freebsd.org
+COMMENT= An X11 solitaire game with 14 variations
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xpat2/pkg-comment b/games/xpat2/pkg-comment
deleted file mode 100644
index 2866f0ce7fb6..000000000000
--- a/games/xpat2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 solitaire game with 14 variations
diff --git a/games/xphotohunter/Makefile b/games/xphotohunter/Makefile
index e1da38daf53c..87b042a960c6 100644
--- a/games/xphotohunter/Makefile
+++ b/games/xphotohunter/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://micro.ee.nthu.edu.tw/~tomcat/Xphotohunter/
MAINTAINER= clive@FreeBSD.org
+COMMENT= A game looking for the difference between two pictures
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/games/xphotohunter/pkg-comment b/games/xphotohunter/pkg-comment
deleted file mode 100644
index 1b6fedbf0225..000000000000
--- a/games/xphotohunter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A game looking for the difference between two pictures
diff --git a/games/xpuyo/Makefile b/games/xpuyo/Makefile
index 8fbe06608e32..a5dd75eeb3a5 100644
--- a/games/xpuyo/Makefile
+++ b/games/xpuyo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= ftp://ftp.meme.hokudai.ac.jp/pub/games/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Puyo-puyo, tetris like puzzle game for X11
WRKSRC= ${WRKDIR}/xpuyo
USE_IMAKE= yes
diff --git a/games/xpuyo/pkg-comment b/games/xpuyo/pkg-comment
deleted file mode 100644
index cb0556e56c71..000000000000
--- a/games/xpuyo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Puyo-puyo, tetris like puzzle game for X11
diff --git a/games/xpuzzletama/Makefile b/games/xpuzzletama/Makefile
index a9b862df2500..988af4ba2bb6 100644
--- a/games/xpuzzletama/Makefile
+++ b/games/xpuzzletama/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://stardust.sfc.wide.ad.jp/pub/JG/JG-0.9.1/sources/ \
ftp://mirror.nucba.ac.jp/mirror/JG/JG-0.9.1/sources/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Puzzle tama, a tetris like game
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xpuzzletama/pkg-comment b/games/xpuzzletama/pkg-comment
deleted file mode 100644
index a947dc479c48..000000000000
--- a/games/xpuzzletama/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Puzzle tama, a tetris like game
diff --git a/games/xroach/Makefile b/games/xroach/Makefile
index 6f594e622af0..13dc9f0a11cf 100644
--- a/games/xroach/Makefile
+++ b/games/xroach/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_BACKUP}
DISTNAME= ${PORTNAME}
MAINTAINER= markm@FreeBSD.org
+COMMENT= Cockroaches hide under your windows
MAN6= xroach.6
MANCOMPRESSED= maybe
diff --git a/games/xroach/pkg-comment b/games/xroach/pkg-comment
deleted file mode 100644
index 18c81d198634..000000000000
--- a/games/xroach/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cockroaches hide under your windows
diff --git a/games/xrubik/Makefile b/games/xrubik/Makefile
index dbb64ac8bdf8..74258b41ceac 100644
--- a/games/xrubik/Makefile
+++ b/games/xrubik/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= nakai@FreeBSD.org
+COMMENT= X-based rubik's cube(tm)
WRKSRC= ${WRKDIR}/xrubik
USE_IMAKE= yes
diff --git a/games/xrubik/pkg-comment b/games/xrubik/pkg-comment
deleted file mode 100644
index 088053b2eba4..000000000000
--- a/games/xrubik/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X-based rubik's cube(tm)
diff --git a/games/xscavenger/Makefile b/games/xscavenger/Makefile
index e9bd964f8467..a66b0abee855 100644
--- a/games/xscavenger/Makefile
+++ b/games/xscavenger/Makefile
@@ -13,6 +13,7 @@ DISTNAME= xscavenger-142
EXTRACT_SUFX= .tgz
MAINTAINER= eivind@FreeBSD.org
+COMMENT= A Lode Runner clone for X11
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_IMAKE= yes
diff --git a/games/xscavenger/pkg-comment b/games/xscavenger/pkg-comment
deleted file mode 100644
index 6ef269e5d314..000000000000
--- a/games/xscavenger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Lode Runner clone for X11
diff --git a/games/xscorch/Makefile b/games/xscorch/Makefile
index 05777a9357ab..60c3707ea2a3 100644
--- a/games/xscorch/Makefile
+++ b/games/xscorch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://chaos2.org/xscorch/ \
http://mirror.dok.org/xscorch/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Multiplayer tank shoot-em-up
LIB_DEPENDS= mikmod.2:${PORTSDIR}/audio/libmikmod
diff --git a/games/xscorch/pkg-comment b/games/xscorch/pkg-comment
deleted file mode 100644
index b918ee969278..000000000000
--- a/games/xscorch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiplayer tank shoot-em-up
diff --git a/games/xshisen/Makefile b/games/xshisen/Makefile
index 4e12cd619125..b25952268ec0 100644
--- a/games/xshisen/Makefile
+++ b/games/xshisen/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.techfirm.co.jp/~masaoki/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Shisen-sho puzzle game for X11
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
diff --git a/games/xshisen/pkg-comment b/games/xshisen/pkg-comment
deleted file mode 100644
index 632660b4de81..000000000000
--- a/games/xshisen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shisen-sho puzzle game for X11
diff --git a/games/xshogi/Makefile b/games/xshogi/Makefile
index f5f8b93ad4a0..130f473e18db 100644
--- a/games/xshogi/Makefile
+++ b/games/xshogi/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= xshogi
DISTNAME= xshogi-1.2p03
MAINTAINER= nakai@FreeBSD.org
+COMMENT= The Japanese chess-like game for X Window System
RUN_DEPENDS= ${LOCALBASE}/libexec/gnushogix:${PORTSDIR}/games/gnushogi
diff --git a/games/xshogi/pkg-comment b/games/xshogi/pkg-comment
deleted file mode 100644
index 71e27abac7f8..000000000000
--- a/games/xshogi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Japanese chess-like game for X Window System
diff --git a/games/xskat/Makefile b/games/xskat/Makefile
index 7a3e2a1fd09c..f5e49e28663d 100644
--- a/games/xskat/Makefile
+++ b/games/xskat/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.gulu.net/xskat/
MAINTAINER= tg@FreeBSD.org
+COMMENT= Play the card game Skat
USE_IMAKE= yes
MAN1= xskat.1 xskat-de.1
diff --git a/games/xskat/pkg-comment b/games/xskat/pkg-comment
deleted file mode 100644
index f16fc2afd249..000000000000
--- a/games/xskat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Play the card game Skat
diff --git a/games/xsoldier/Makefile b/games/xsoldier/Makefile
index 050b22b21f46..71324da2c4b8 100644
--- a/games/xsoldier/Makefile
+++ b/games/xsoldier/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= games
MASTER_SITES= http://www.surfline.ne.jp/hachi/xsoldier/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Shooting game for x11
USE_IMAKE= yes
USE_XPM= yes
diff --git a/games/xsoldier/pkg-comment b/games/xsoldier/pkg-comment
deleted file mode 100644
index 190465c1831c..000000000000
--- a/games/xsoldier/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shooting game for x11
diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index 224da5531640..ef6fd9e0b9a2 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
DISTFILES= xspringies.1.1.tar.Z
MAINTAINER= jkh@FreeBSD.org
+COMMENT= A mass and spring simulation system
USE_IMAKE= yes
MAN1= xspringies.1
diff --git a/games/xspringies/pkg-comment b/games/xspringies/pkg-comment
deleted file mode 100644
index 68ec17008f76..000000000000
--- a/games/xspringies/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mass and spring simulation system
diff --git a/games/xtriangles/Makefile b/games/xtriangles/Makefile
index f5d5023cf462..7091f8566cb6 100644
--- a/games/xtriangles/Makefile
+++ b/games/xtriangles/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games/xpuzzles
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Triangles puzzle
WRKSRC= ${WRKDIR}/${PORTNAME}
USE_IMAKE= yes
diff --git a/games/xtriangles/pkg-comment b/games/xtriangles/pkg-comment
deleted file mode 100644
index 78f6a44ef876..000000000000
--- a/games/xtriangles/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Triangles puzzle
diff --git a/games/xzip/Makefile b/games/xzip/Makefile
index 8540743fd98b..b01a24839a00 100644
--- a/games/xzip/Makefile
+++ b/games/xzip/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.ifarchive.org/if-archive/infocom/interpreters/zip/ \
DISTFILES= xzip182.tar.Z
MAINTAINER= mph@freebsd.org
+COMMENT= An Infocom game interpreter that runs under X11
WRKSRC= ${WRKDIR}/xzip
ALL_TARGET=
diff --git a/games/xzip/pkg-comment b/games/xzip/pkg-comment
deleted file mode 100644
index 65fd261b4e97..000000000000
--- a/games/xzip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Infocom game interpreter that runs under X11
diff --git a/german/citrix_ica/Makefile b/german/citrix_ica/Makefile
index 33edc932d39a..8f81896d91aa 100644
--- a/german/citrix_ica/Makefile
+++ b/german/citrix_ica/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=
DISTNAME= ${PORTNAME}-linuxx86-de
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/german/citrix_ica/pkg-comment b/german/citrix_ica/pkg-comment
deleted file mode 100644
index 70d23f88a95f..000000000000
--- a/german/citrix_ica/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Citrix(R) client for the Microsoft Windows Terminal Server
diff --git a/german/citrix_xenapp/Makefile b/german/citrix_xenapp/Makefile
index 33edc932d39a..8f81896d91aa 100644
--- a/german/citrix_xenapp/Makefile
+++ b/german/citrix_xenapp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=
DISTNAME= ${PORTNAME}-linuxx86-de
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/german/citrix_xenapp/pkg-comment b/german/citrix_xenapp/pkg-comment
deleted file mode 100644
index 70d23f88a95f..000000000000
--- a/german/citrix_xenapp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Citrix(R) client for the Microsoft Windows Terminal Server
diff --git a/german/kde3-i18n/Makefile b/german/kde3-i18n/Makefile
index 217ab052e233..06ae1b6afe79 100644
--- a/german/kde3-i18n/Makefile
+++ b/german/kde3-i18n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= de-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/german/kde3-i18n/pkg-comment b/german/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/german/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/german/kde4-l10n/Makefile b/german/kde4-l10n/Makefile
index 217ab052e233..06ae1b6afe79 100644
--- a/german/kde4-l10n/Makefile
+++ b/german/kde4-l10n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= de-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/german/kde4-l10n/pkg-comment b/german/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/german/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/german/staroffice52/Makefile b/german/staroffice52/Makefile
index 33c50584274d..1e466b4e0534 100644
--- a/german/staroffice52/Makefile
+++ b/german/staroffice52/Makefile
@@ -28,6 +28,7 @@ DISTFILES+= soa-5_2-ga-bin-linux-de.bin
EXTRACT_ONLY= 109939-03.tar.Z
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/german/staroffice52/pkg-comment b/german/staroffice52/pkg-comment
deleted file mode 100644
index 7c6d1b73d17a..000000000000
--- a/german/staroffice52/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated wordprocessor/dbase/spreadheet/drawing/chart/browser
diff --git a/german/staroffice70/Makefile b/german/staroffice70/Makefile
index 5c4a1388b990..9c71de2359bf 100644
--- a/german/staroffice70/Makefile
+++ b/german/staroffice70/Makefile
@@ -24,6 +24,7 @@ DISTFILES+= soa-6_0-ga-bin-linux-en.bin
EXTRACT_ONLY= 112887-03.tar
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Wordprocessor/dbase/spreadheet/drawing/chart
ONLY_FOR_ARCHS= i386
NO_CDROM= 'Must be bought and downloaded direct from Sun via www interface'
diff --git a/german/staroffice70/pkg-comment b/german/staroffice70/pkg-comment
deleted file mode 100644
index cda7c195775d..000000000000
--- a/german/staroffice70/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wordprocessor/dbase/spreadheet/drawing/chart
diff --git a/graphics/Cgraph/Makefile b/graphics/Cgraph/Makefile
index 9be58f231386..1d4814930e8d 100644
--- a/graphics/Cgraph/Makefile
+++ b/graphics/Cgraph/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tobez.org/download/port-mirrors/graphics/Cgraph/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A PostScript plotting library in C
WRKSRC= ${WRKDIR}/Cgraph/source
diff --git a/graphics/Cgraph/pkg-comment b/graphics/Cgraph/pkg-comment
deleted file mode 100644
index 8cc944089ca5..000000000000
--- a/graphics/Cgraph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PostScript plotting library in C
diff --git a/graphics/Mesa3/Makefile b/graphics/Mesa3/Makefile
index a8e187592a9d..058a4f88a044 100644
--- a/graphics/Mesa3/Makefile
+++ b/graphics/Mesa3/Makefile
@@ -17,6 +17,7 @@ DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A graphics library similar to SGI's OpenGL
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/graphics/Mesa3/pkg-comment b/graphics/Mesa3/pkg-comment
deleted file mode 100644
index a93f20caeb27..000000000000
--- a/graphics/Mesa3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphics library similar to SGI's OpenGL
diff --git a/graphics/backfract/Makefile b/graphics/backfract/Makefile
index de740a2524b9..33b133027d61 100644
--- a/graphics/backfract/Makefile
+++ b/graphics/backfract/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://www.inetarena.com/~wms/comp/backfract/
MAINTAINER= patrick@FreeBSD.org
+COMMENT= Fractal image animated wallpaper program
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
diff --git a/graphics/backfract/pkg-comment b/graphics/backfract/pkg-comment
deleted file mode 100644
index e55d16ff8424..000000000000
--- a/graphics/backfract/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fractal image animated wallpaper program
diff --git a/graphics/camserv/Makefile b/graphics/camserv/Makefile
index 03756c9df790..9fb463299565 100644
--- a/graphics/camserv/Makefile
+++ b/graphics/camserv/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://cserv.sourceforge.net/old/
MAINTAINER= chein@freebsd.org
+COMMENT= Camserv is a free program to do streaming video via the web
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/camserv/pkg-comment b/graphics/camserv/pkg-comment
deleted file mode 100644
index 0af656ee3a91..000000000000
--- a/graphics/camserv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Camserv is a free program to do streaming video via the web
diff --git a/graphics/chbg/Makefile b/graphics/chbg/Makefile
index 74a3c450f3fe..1b15c629116d 100644
--- a/graphics/chbg/Makefile
+++ b/graphics/chbg/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= netchild@FreeBSD.org
+COMMENT= Change Background Picture with time period
# GNOME parts aren't prefix safe, they install into "gnome-config --prefix"
USE_X_PREFIX= yes
diff --git a/graphics/chbg/pkg-comment b/graphics/chbg/pkg-comment
deleted file mode 100644
index e92d8bec7cbc..000000000000
--- a/graphics/chbg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Change Background Picture with time period
diff --git a/graphics/crw/Makefile b/graphics/crw/Makefile
index e8b5c35bddc2..da31a52c00ac 100644
--- a/graphics/crw/Makefile
+++ b/graphics/crw/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://apollo.backplane.com/FreeBSDPorts/
MAINTAINER= dillon@FreeBSD.ORG
+COMMENT= A utility to process Canon camera RAW (.crw) files
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/graphics/crw/pkg-comment b/graphics/crw/pkg-comment
deleted file mode 100644
index 5c0c904315d8..000000000000
--- a/graphics/crw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility to process Canon camera RAW (.crw) files
diff --git a/graphics/cybervrml97/Makefile b/graphics/cybervrml97/Makefile
index 0b889b36ac5c..9311fbd35b43 100644
--- a/graphics/cybervrml97/Makefile
+++ b/graphics/cybervrml97/Makefile
@@ -14,6 +14,7 @@ DISTFILES= cv97r${PORTVERSION:S/.//g}${EXTRACT_SUFX} Makefile
EXTRACT_ONLY= cv97r${PORTVERSION:S/.//g}${EXTRACT_SUFX}
MAINTAINER= 3d@FreeBSD.org
+COMMENT= A development library of VRML97/2.0 applications
DIST_SUBDIR= ${PORTNAME}
USE_MESA= yes
diff --git a/graphics/cybervrml97/pkg-comment b/graphics/cybervrml97/pkg-comment
deleted file mode 100644
index 9ffcee2b1686..000000000000
--- a/graphics/cybervrml97/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A development library of VRML97/2.0 applications
diff --git a/graphics/dia/Makefile b/graphics/dia/Makefile
index 76e7a1a65caf..95a993ace2fa 100644
--- a/graphics/dia/Makefile
+++ b/graphics/dia/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/dia/0.90
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= Diagram creation program, similar to Visio
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
diff --git a/graphics/dia/pkg-comment b/graphics/dia/pkg-comment
deleted file mode 100644
index fd6dfbd6b180..000000000000
--- a/graphics/dia/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Diagram creation program, similar to Visio
diff --git a/graphics/diacanvas/Makefile b/graphics/diacanvas/Makefile
index c3d6b751cfc5..24b1a11fc198 100644
--- a/graphics/diacanvas/Makefile
+++ b/graphics/diacanvas/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= http://www.linuxstart.com/~arjan/diacanvas/download/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A general drawing canvas from dia dialog editor
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/graphics/diacanvas/pkg-comment b/graphics/diacanvas/pkg-comment
deleted file mode 100644
index 3dd817d2e97d..000000000000
--- a/graphics/diacanvas/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A general drawing canvas from dia dialog editor
diff --git a/graphics/dri-devel/Makefile b/graphics/dri-devel/Makefile
index a000c0caf3ca..4eb79561dd2e 100644
--- a/graphics/dri-devel/Makefile
+++ b/graphics/dri-devel/Makefile
@@ -19,6 +19,7 @@ PATCH_SITE_SUBDIR= anholt/dri-devel
PATCHFILES= dri-20020826-${PORTVERSION}.diff.bz2
MAINTAINER= anholt@FreeBSD.org
+COMMENT= Unstable DRI (3d HW OpenGL acceleration) drivers for some chipsets
RUN_DEPENDS= XFree86:${PORTSDIR}/x11-servers/XFree86-4-Server
diff --git a/graphics/dri-devel/pkg-comment b/graphics/dri-devel/pkg-comment
deleted file mode 100644
index 8473007a0dc9..000000000000
--- a/graphics/dri-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unstable DRI (3d HW OpenGL acceleration) drivers for some chipsets
diff --git a/graphics/drm-kmod/Makefile b/graphics/drm-kmod/Makefile
index 33754e61fba8..1d8491cd731c 100644
--- a/graphics/drm-kmod/Makefile
+++ b/graphics/drm-kmod/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics x11
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= anholt
MAINTAINER= anholt@FreeBSD.org
+COMMENT= A FreeBSD kernel modules for 3d acceleration with the DRI
USE_REINPLACE= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/drm-kmod/pkg-comment b/graphics/drm-kmod/pkg-comment
deleted file mode 100644
index a1463e51f7b3..000000000000
--- a/graphics/drm-kmod/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A FreeBSD kernel modules for 3d acceleration with the DRI
diff --git a/graphics/dumpmpeg/Makefile b/graphics/dumpmpeg/Makefile
index 5bb1e079ac7f..345de3db980c 100644
--- a/graphics/dumpmpeg/Makefile
+++ b/graphics/dumpmpeg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Dump frames from mpeg movies
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
smpeg:${PORTSDIR}/graphics/smpeg
diff --git a/graphics/dumpmpeg/pkg-comment b/graphics/dumpmpeg/pkg-comment
deleted file mode 100644
index 309b17751e32..000000000000
--- a/graphics/dumpmpeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dump frames from mpeg movies
diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile
index bb195603d6e4..fae25fd09e89 100644
--- a/graphics/electriceyes/Makefile
+++ b/graphics/electriceyes/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/ee/0.3
DISTNAME= ee-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A graphic view base imlib & gtk
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/electriceyes/pkg-comment b/graphics/electriceyes/pkg-comment
deleted file mode 100644
index 58c6e908bd55..000000000000
--- a/graphics/electriceyes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphic view base imlib & gtk
diff --git a/graphics/enjoympeg/Makefile b/graphics/enjoympeg/Makefile
index 3df20f79f687..5c4f8de2a774 100644
--- a/graphics/enjoympeg/Makefile
+++ b/graphics/enjoympeg/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= http://people.freenet.de/for_Ki/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= An MPEG-1 video player
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
smpeg:${PORTSDIR}/graphics/smpeg
diff --git a/graphics/enjoympeg/pkg-comment b/graphics/enjoympeg/pkg-comment
deleted file mode 100644
index a2ea77ddd04f..000000000000
--- a/graphics/enjoympeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An MPEG-1 video player
diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index d9c836313c91..d02765963cda 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/eog/0.6
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The Eye Of Gnome image viewer
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/graphics/eog/pkg-comment b/graphics/eog/pkg-comment
deleted file mode 100644
index ec89bb01c1be..000000000000
--- a/graphics/eog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Eye Of Gnome image viewer
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index f2ba7999cbf5..60bb493fd044 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= eog-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The Eye Of Gnome image viewer
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
diff --git a/graphics/eog2/pkg-comment b/graphics/eog2/pkg-comment
deleted file mode 100644
index ec89bb01c1be..000000000000
--- a/graphics/eog2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Eye Of Gnome image viewer
diff --git a/graphics/eps2png/Makefile b/graphics/eps2png/Makefile
index 364d0e58dd71..68c2664ecf21 100644
--- a/graphics/eps2png/Makefile
+++ b/graphics/eps2png/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/Johan_Vromans
MAINTAINER= nik@freebsd.org
+COMMENT= Converts EPS images to PNG
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
diff --git a/graphics/eps2png/pkg-comment b/graphics/eps2png/pkg-comment
deleted file mode 100644
index 3ab0252f4541..000000000000
--- a/graphics/eps2png/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts EPS images to PNG
diff --git a/graphics/eterm-bg/Makefile b/graphics/eterm-bg/Makefile
index f18f021db959..d106c76f600d 100644
--- a/graphics/eterm-bg/Makefile
+++ b/graphics/eterm-bg/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.enlightenment.org/pub/enlightenment/Eterm/ \
DISTNAME= Eterm-bg-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Image files for background of Eterm
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/graphics/eterm-bg/pkg-comment b/graphics/eterm-bg/pkg-comment
deleted file mode 100644
index 7af14f738ae5..000000000000
--- a/graphics/eterm-bg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Image files for background of Eterm
diff --git a/graphics/figurine/Makefile b/graphics/figurine/Makefile
index a5ab8e41aeaf..dc4f18ca67cd 100644
--- a/graphics/figurine/Makefile
+++ b/graphics/figurine/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= blackend@FreeBSD.org
+COMMENT= A drawing program for X11
RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig
diff --git a/graphics/figurine/pkg-comment b/graphics/figurine/pkg-comment
deleted file mode 100644
index ff868001c8a3..000000000000
--- a/graphics/figurine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A drawing program for X11
diff --git a/graphics/frontline/Makefile b/graphics/frontline/Makefile
index 5568d8d85295..75c5bcb5321c 100644
--- a/graphics/frontline/Makefile
+++ b/graphics/frontline/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= autotrace
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An autotrace GUI FRONTend like streamLINE(TM)
LIB_DEPENDS= autotrace.3:${PORTSDIR}/graphics/autotrace \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
diff --git a/graphics/frontline/pkg-comment b/graphics/frontline/pkg-comment
deleted file mode 100644
index ba8965d1fe6a..000000000000
--- a/graphics/frontline/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An autotrace GUI FRONTend like streamLINE(TM)
diff --git a/graphics/fujiplay/Makefile b/graphics/fujiplay/Makefile
index eba3b9c10d91..c4aa5826e571 100644
--- a/graphics/fujiplay/Makefile
+++ b/graphics/fujiplay/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Digital camera downloading tool for Fujifilm digital cameras
NO_WRKSUBDIR= yes
diff --git a/graphics/fujiplay/pkg-comment b/graphics/fujiplay/pkg-comment
deleted file mode 100644
index 05f5074d80e2..000000000000
--- a/graphics/fujiplay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Digital camera downloading tool for Fujifilm digital cameras
diff --git a/graphics/g2/Makefile b/graphics/g2/Makefile
index 9613d4ea92e3..5f850e324c83 100644
--- a/graphics/g2/Makefile
+++ b/graphics/g2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/graphics
MAINTAINER= billf@FreeBSD.org
+COMMENT= An easy to use, portable and powerful 2D graphics library
LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
diff --git a/graphics/g2/pkg-comment b/graphics/g2/pkg-comment
deleted file mode 100644
index 902d58e3286f..000000000000
--- a/graphics/g2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy to use, portable and powerful 2D graphics library
diff --git a/graphics/gdtclft/Makefile b/graphics/gdtclft/Makefile
index 6abe20d97646..686dfaae0569 100644
--- a/graphics/gdtclft/Makefile
+++ b/graphics/gdtclft/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.graphviz.org/pub/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A TCL interface to the Thomas Boutell's Gd library
LIB_DEPENDS= tcl${TCL_DVER}.1:${PORTSDIR}/lang/tcl${TCL_DVER} \
gd:${PORTSDIR}/graphics/gd2
diff --git a/graphics/gdtclft/pkg-comment b/graphics/gdtclft/pkg-comment
deleted file mode 100644
index 02947077bab6..000000000000
--- a/graphics/gdtclft/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A TCL interface to the Thomas Boutell's Gd library
diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile
index 088c8c87cca8..c9f7743b7bd1 100644
--- a/graphics/geomview/Makefile
+++ b/graphics/geomview/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ftp1.sourceforge.net/geomview/ \
ftp://ftp1.sourceforge.net/pub/sourceforge/geomview/
MAINTAINER= fenner@freebsd.org
+COMMENT= An interactive viewer for 3- and 4-D geometric objects
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
# can't get autoconf to like forms.h, punt for now
diff --git a/graphics/geomview/pkg-comment b/graphics/geomview/pkg-comment
deleted file mode 100644
index 38df20b517af..000000000000
--- a/graphics/geomview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interactive viewer for 3- and 4-D geometric objects
diff --git a/graphics/gifmerge/Makefile b/graphics/gifmerge/Makefile
index ab786f6222f2..9b9bb96e9bf2 100644
--- a/graphics/gifmerge/Makefile
+++ b/graphics/gifmerge/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTFILES= gifmerge.tar
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A tool for making a GIF Animation
ALL_TARGET= gifmerge
NO_WRKSUBDIR= yes
diff --git a/graphics/gifmerge/pkg-comment b/graphics/gifmerge/pkg-comment
deleted file mode 100644
index 5e41f5fbc4a4..000000000000
--- a/graphics/gifmerge/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for making a GIF Animation
diff --git a/graphics/giftool/Makefile b/graphics/giftool/Makefile
index 81719b9739be..71f1517b4728 100644
--- a/graphics/giftool/Makefile
+++ b/graphics/giftool/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://ftp.sbs.de/pub/www/tools/giftool/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A tool for GIF89a transparent option and interlace mode
NO_CDROM= "Shareware"
diff --git a/graphics/giftool/pkg-comment b/graphics/giftool/pkg-comment
deleted file mode 100644
index 4410918d46f8..000000000000
--- a/graphics/giftool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for GIF89a transparent option and interlace mode
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index aceabdc79e71..d14394a20940 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.rz.uni-karlsruhe.de/pub/net/www/tools/giftrans/
DISTFILES= giftrans.c giftrans.1
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A tool for GIF89a transparent option and interlace mode
DIST_SUBDIR= giftrans
NO_WRKSUBDIR= yes
diff --git a/graphics/giftrans/pkg-comment b/graphics/giftrans/pkg-comment
deleted file mode 100644
index 4410918d46f8..000000000000
--- a/graphics/giftrans/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for GIF89a transparent option and interlace mode
diff --git a/graphics/gimp1/Makefile b/graphics/gimp1/Makefile
index 11a61f57664d..0adce980c537 100644
--- a/graphics/gimp1/Makefile
+++ b/graphics/gimp1/Makefile
@@ -21,6 +21,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
mpeg_lib-1.3.1.tar.gz:mpeg
MAINTAINER= gnome@FreeBSD.org
+COMMENT= the GNU Image Manipulation Program
LIB_DEPENDS= aa.1:${PORTSDIR}/graphics/aalib \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/gimp1/pkg-comment b/graphics/gimp1/pkg-comment
deleted file mode 100644
index 82c1e265f543..000000000000
--- a/graphics/gimp1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-the GNU Image Manipulation Program
diff --git a/graphics/gkrellkam/Makefile b/graphics/gkrellkam/Makefile
index 096b2fe366c8..b7a08da24914 100644
--- a/graphics/gkrellkam/Makefile
+++ b/graphics/gkrellkam/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= GKrellM plugin that display thumbnails of periodically updated images
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/graphics/gkrellkam/pkg-comment b/graphics/gkrellkam/pkg-comment
deleted file mode 100644
index 7952655153bf..000000000000
--- a/graphics/gkrellkam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GKrellM plugin that display thumbnails of periodically updated images
diff --git a/graphics/glass/Makefile b/graphics/glass/Makefile
index a333b06db97d..a6a7f3fd5e9e 100644
--- a/graphics/glass/Makefile
+++ b/graphics/glass/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= GLASS (openGL Articulated Structure System) is a 3D library
USE_MESA= yes
USE_X_PREFIX= yes
diff --git a/graphics/glass/pkg-comment b/graphics/glass/pkg-comment
deleted file mode 100644
index f3d906ece496..000000000000
--- a/graphics/glass/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GLASS (openGL Articulated Structure System) is a 3D library
diff --git a/graphics/glide3/Makefile b/graphics/glide3/Makefile
index e5e13e494913..8a0af122d172 100644
--- a/graphics/glide3/Makefile
+++ b/graphics/glide3/Makefile
@@ -19,6 +19,7 @@ EXTRACT_SUFX= .tar.bz2
#The distfile is CVS Glide3-FreeBSD branch with */glide3/tests/* removed
MAINTAINER= anholt@freebsd.org
+COMMENT= Library to support 3dfx Voodoo3/4/5/Banshee with the DRI
USE_BZIP2= yes
WRKSRC= ${WRKDIR}/Glide3
diff --git a/graphics/glide3/pkg-comment b/graphics/glide3/pkg-comment
deleted file mode 100644
index 25954ca506ad..000000000000
--- a/graphics/glide3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library to support 3dfx Voodoo3/4/5/Banshee with the DRI
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 6fa991d76c08..08a8cbafd79e 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= ftp://alpha.gnu.org/pub/gnu/gpaint/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A small-scale painting program for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/graphics/gpaint/pkg-comment b/graphics/gpaint/pkg-comment
deleted file mode 100644
index 14a31f4ee2ef..000000000000
--- a/graphics/gpaint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small-scale painting program for GNOME
diff --git a/graphics/gqview/Makefile b/graphics/gqview/Makefile
index d40744ea4895..6945e9e2214c 100644
--- a/graphics/gqview/Makefile
+++ b/graphics/gqview/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Another gtk-based graphic file viewer
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/graphics/gqview/pkg-comment b/graphics/gqview/pkg-comment
deleted file mode 100644
index ff87c6a484fb..000000000000
--- a/graphics/gqview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another gtk-based graphic file viewer
diff --git a/graphics/gridpix/Makefile b/graphics/gridpix/Makefile
index 279ed6d7f0ad..59fc53db9474 100644
--- a/graphics/gridpix/Makefile
+++ b/graphics/gridpix/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asami/GridPix
DISTNAME= GridPix-${PORTVERSION}
MAINTAINER= asami@FreeBSD.org
+COMMENT= Present large images efficiently over the Internet
BUILD_DEPENDS= ${LOCALBASE}/lib/libnetpbm.a:${PORTSDIR}/graphics/netpbm
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/gridpix/pkg-comment b/graphics/gridpix/pkg-comment
deleted file mode 100644
index 27ffa6036abf..000000000000
--- a/graphics/gridpix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Present large images efficiently over the Internet
diff --git a/graphics/gtkdps/Makefile b/graphics/gtkdps/Makefile
index 5af47f305f52..71f5b428ee27 100644
--- a/graphics/gtkdps/Makefile
+++ b/graphics/gtkdps/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/personal/masata-y/gtkDPS/
DISTNAME= gtkDPS-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Gtk bindings for the Display GhostScript System
BUILD_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
RUN_DEPENDS= pswrap:${PORTSDIR}/x11/dgs
diff --git a/graphics/gtkdps/pkg-comment b/graphics/gtkdps/pkg-comment
deleted file mode 100644
index bea6d75a97d9..000000000000
--- a/graphics/gtkdps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk bindings for the Display GhostScript System
diff --git a/graphics/gtkfig/Makefile b/graphics/gtkfig/Makefile
index 26583c63b2ed..5bf42916f47c 100644
--- a/graphics/gtkfig/Makefile
+++ b/graphics/gtkfig/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://k332.feld.cvut.cz/pub/local/lemming/gtkfig/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Figure-drawing tool
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/graphics/gtkfig/pkg-comment b/graphics/gtkfig/pkg-comment
deleted file mode 100644
index 823f26d20b72..000000000000
--- a/graphics/gtkfig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Figure-drawing tool
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index d70f722bdf55..5eb824c5a968 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jedgar
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Graphing calculator using GTK+
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/graphics/gtkgraph/pkg-comment b/graphics/gtkgraph/pkg-comment
deleted file mode 100644
index 1a4858d6d8e5..000000000000
--- a/graphics/gtkgraph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphing calculator using GTK+
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index 0b96488c5977..57b910a6b0b0 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.linux.tucows.com/files/x11/graphics/ \
http://www.physik.TU-Berlin.DE/~ibex/ports/distfiles/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Image viewer
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/graphics/gtksee/pkg-comment b/graphics/gtksee/pkg-comment
deleted file mode 100644
index ae8ee9f1f106..000000000000
--- a/graphics/gtksee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Image viewer
diff --git a/graphics/guilib/Makefile b/graphics/guilib/Makefile
index 248df0a0484d..5014dd00e5df 100644
--- a/graphics/guilib/Makefile
+++ b/graphics/guilib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.libsdl.org/projects/GUIlib/src/
DISTNAME= GUIlib-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A very simple GUI framework for use with SDL
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/graphics/guilib/pkg-comment b/graphics/guilib/pkg-comment
deleted file mode 100644
index a0c2ea7c789e..000000000000
--- a/graphics/guilib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very simple GUI framework for use with SDL
diff --git a/graphics/hdf/Makefile b/graphics/hdf/Makefile
index d2be7566329f..9339a6559700 100644
--- a/graphics/hdf/Makefile
+++ b/graphics/hdf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/tar/
DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Hierarchical Data Format library (from NCSA)
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/hdf/pkg-comment b/graphics/hdf/pkg-comment
deleted file mode 100644
index 2f8affd569f0..000000000000
--- a/graphics/hdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hierarchical Data Format library (from NCSA)
diff --git a/graphics/icod/Makefile b/graphics/icod/Makefile
index 8e0436bf5c3e..59fbb705fb34 100644
--- a/graphics/icod/Makefile
+++ b/graphics/icod/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= jedgar
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Utility to convert Windows icon files to xpm format
WRKSRC= ${WRKDIR}/icod
ALL_TARGET= icod
diff --git a/graphics/icod/pkg-comment b/graphics/icod/pkg-comment
deleted file mode 100644
index 1ae280181ea1..000000000000
--- a/graphics/icod/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to convert Windows icon files to xpm format
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index eae501a1507b..c29962ea633f 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/imlib/1.9
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A graphic library for enlightenment package
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/imlib/pkg-comment b/graphics/imlib/pkg-comment
deleted file mode 100644
index f8f167a8d892..000000000000
--- a/graphics/imlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphic library for enlightenment package
diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index 5fc782eef15e..f0049c4d80d5 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \
MASTER_SITE_SUBDIR= ImageMagick/delegates
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An implementation of the codec specified in the JPEG-2000 standard
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/jasper/pkg-comment b/graphics/jasper/pkg-comment
deleted file mode 100644
index bd74f2b6ffd0..000000000000
--- a/graphics/jasper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the codec specified in the JPEG-2000 standard
diff --git a/graphics/jbigkit/Makefile b/graphics/jbigkit/Makefile
index 299503747f00..a71a09d4fb33 100644
--- a/graphics/jbigkit/Makefile
+++ b/graphics/jbigkit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://www.cl.cam.ac.uk/~mgk25/download/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Lossless compression for bi-level images such as scanned pages, faxes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/jbigkit/pkg-comment b/graphics/jbigkit/pkg-comment
deleted file mode 100644
index e3404664397c..000000000000
--- a/graphics/jbigkit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lossless compression for bi-level images such as scanned pages, faxes
diff --git a/graphics/jgv/Makefile b/graphics/jgv/Makefile
index 8ce44de2b00f..44ea9c076bf8 100644
--- a/graphics/jgv/Makefile
+++ b/graphics/jgv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.aaa-int.or.jp/~jfactory/JDE/dist/
DISTNAME= JGV-${PORTVERSION}
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A graphic viewer with various image types
RUN_DEPENDS= ${RUN_DEP_LIST}
LIB_DEPENDS= ${LIB_DEP_LIST}
diff --git a/graphics/jgv/pkg-comment b/graphics/jgv/pkg-comment
deleted file mode 100644
index fedc02516666..000000000000
--- a/graphics/jgv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphic viewer with various image types
diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile
index fef659258673..963952f25e2b 100644
--- a/graphics/jpeginfo/Makefile
+++ b/graphics/jpeginfo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://www.cc.jyu.fi/~tjko/src/
MAINTAINER= ache@freebsd.org
+COMMENT= Generate listing and MD5, check jpegs for error, delete broken ones
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/jpeginfo/pkg-comment b/graphics/jpeginfo/pkg-comment
deleted file mode 100644
index e206807c5818..000000000000
--- a/graphics/jpeginfo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generate listing and MD5, check jpegs for error, delete broken ones
diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile
index f5c08f5e19cb..1a4f55af38d2 100644
--- a/graphics/jpgtn/Makefile
+++ b/graphics/jpgtn/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/misc
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Creates thumbnails of JPEG images
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/jpgtn/pkg-comment b/graphics/jpgtn/pkg-comment
deleted file mode 100644
index d92277a2f223..000000000000
--- a/graphics/jpgtn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Creates thumbnails of JPEG images
diff --git a/graphics/juno-2/Makefile b/graphics/juno-2/Makefile
index fbe83c3d0740..ee37cd69b8eb 100644
--- a/graphics/juno-2/Makefile
+++ b/graphics/juno-2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.research.compaq.com/SRC/juno-2/
DISTNAME= juno-sources
MAINTAINER= jdp@FreeBSD.org
+COMMENT= A powerful and extensible constraint-based drawing editor
BUILD_DEPENDS= ${L1}libm3netobj${L2}:${PORTSDIR}/lang/pm3-netobj \
${L1}libm3formsvbt${L2}:${PORTSDIR}/lang/pm3-forms
diff --git a/graphics/juno-2/pkg-comment b/graphics/juno-2/pkg-comment
deleted file mode 100644
index 1b4138d26c5a..000000000000
--- a/graphics/juno-2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A powerful and extensible constraint-based drawing editor
diff --git a/graphics/kdegraphics3/Makefile b/graphics/kdegraphics3/Makefile
index aa5736a98a67..8290dd73f2bd 100644
--- a/graphics/kdegraphics3/Makefile
+++ b/graphics/kdegraphics3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Graphics utilities for the KDE3 integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/graphics/kdegraphics3/pkg-comment b/graphics/kdegraphics3/pkg-comment
deleted file mode 100644
index 56b139d3c6b2..000000000000
--- a/graphics/kdegraphics3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphics utilities for the KDE3 integrated X11 desktop
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index aa5736a98a67..8290dd73f2bd 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Graphics utilities for the KDE3 integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/graphics/kdegraphics4/pkg-comment b/graphics/kdegraphics4/pkg-comment
deleted file mode 100644
index 56b139d3c6b2..000000000000
--- a/graphics/kdegraphics4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphics utilities for the KDE3 integrated X11 desktop
diff --git a/graphics/kisomandel/Makefile b/graphics/kisomandel/Makefile
index c63a0dd58c36..d653f66b569d 100644
--- a/graphics/kisomandel/Makefile
+++ b/graphics/kisomandel/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= http://helsteger.supereva.it/kisomandel/
MAINTAINER= kde@freebsd.org
+COMMENT= A fractal rendering program with nice 3d-display in realtime
LIB_DEPENDS= png:${PORTSDIR}/graphics/png
diff --git a/graphics/kisomandel/pkg-comment b/graphics/kisomandel/pkg-comment
deleted file mode 100644
index 4f83fa7f31e5..000000000000
--- a/graphics/kisomandel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fractal rendering program with nice 3d-display in realtime
diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile
index 20ed5521a6f8..98a495e39d06 100644
--- a/graphics/lcms/Makefile
+++ b/graphics/lcms/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR=${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Light Color Management System -- a color management library
INSTALLS_SHLIB= yes
MAKEFILE= ${FILESDIR}/Makefile.bsd
diff --git a/graphics/lcms/pkg-comment b/graphics/lcms/pkg-comment
deleted file mode 100644
index ed822224e73a..000000000000
--- a/graphics/lcms/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Light Color Management System -- a color management library
diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index 84c1c87c996b..8139790354cd 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A library for handling 3DS (3D Studio) files
USE_MESA= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/lib3ds/pkg-comment b/graphics/lib3ds/pkg-comment
deleted file mode 100644
index c362167dce5d..000000000000
--- a/graphics/lib3ds/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for handling 3DS (3D Studio) files
diff --git a/graphics/libart_lgpl/Makefile b/graphics/libart_lgpl/Makefile
index 72fc6e64cac1..2c0f4090384d 100644
--- a/graphics/libart_lgpl/Makefile
+++ b/graphics/libart_lgpl/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library for high-performance 2D graphics
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/graphics/libart_lgpl/pkg-comment b/graphics/libart_lgpl/pkg-comment
deleted file mode 100644
index fc711cf88b80..000000000000
--- a/graphics/libart_lgpl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for high-performance 2D graphics
diff --git a/graphics/libart_lgpl2/Makefile b/graphics/libart_lgpl2/Makefile
index 72fc6e64cac1..2c0f4090384d 100644
--- a/graphics/libart_lgpl2/Makefile
+++ b/graphics/libart_lgpl2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library for high-performance 2D graphics
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/graphics/libart_lgpl2/pkg-comment b/graphics/libart_lgpl2/pkg-comment
deleted file mode 100644
index fc711cf88b80..000000000000
--- a/graphics/libart_lgpl2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for high-performance 2D graphics
diff --git a/graphics/libaux/Makefile b/graphics/libaux/Makefile
index 89a929f256a1..ae71f5b72cbd 100644
--- a/graphics/libaux/Makefile
+++ b/graphics/libaux/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.rus.uni-stuttgart.de/pub/systems/sgi/OpenGL/contrib/
DISTFILES= libaux${EXTRACT_SUFX} libtk${EXTRACT_SUFX}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A Nano Window Toolkit and Auxiliary Library for OpenGL
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/graphics/libaux/pkg-comment b/graphics/libaux/pkg-comment
deleted file mode 100644
index e7e32cc58974..000000000000
--- a/graphics/libaux/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Nano Window Toolkit and Auxiliary Library for OpenGL
diff --git a/graphics/libdjvu++/Makefile b/graphics/libdjvu++/Makefile
index 571362f99e8e..3d22fa35a06c 100644
--- a/graphics/libdjvu++/Makefile
+++ b/graphics/libdjvu++/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://djvu.research.att.com/open/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= AT&T's DjVu: The Technology for Scanned Documents on the Web
INSTALLS_SHLIB= yes
IS_INTERACTIVE= some think, the AT&T license needs to be acked by the user
diff --git a/graphics/libdjvu++/pkg-comment b/graphics/libdjvu++/pkg-comment
deleted file mode 100644
index a82ec017d34f..000000000000
--- a/graphics/libdjvu++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-AT&T's DjVu: The Technology for Scanned Documents on the Web
diff --git a/graphics/libexif/Makefile b/graphics/libexif/Makefile
index 511fcfcac2ab..3429077fac5a 100644
--- a/graphics/libexif/Makefile
+++ b/graphics/libexif/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pschmied@qwest.net
+COMMENT= Library to read digital camera file meta-data
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/graphics/libexif/pkg-comment b/graphics/libexif/pkg-comment
deleted file mode 100644
index 5ead556496e5..000000000000
--- a/graphics/libexif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library to read digital camera file meta-data
diff --git a/graphics/libfpx/Makefile b/graphics/libfpx/Makefile
index 8a595b16f00a..c232d610c5f1 100644
--- a/graphics/libfpx/Makefile
+++ b/graphics/libfpx/Makefile
@@ -28,6 +28,7 @@ MASTER_SITES= http://imagemagick.sourceforge.net/http/delegates/ \
MASTER_SITE_SUBDIR= ImageMagick/delegates
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Library routines for working with Flashpix images
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
MAKE_ARGS+= -j2
diff --git a/graphics/libfpx/pkg-comment b/graphics/libfpx/pkg-comment
deleted file mode 100644
index 847820796a0e..000000000000
--- a/graphics/libfpx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library routines for working with Flashpix images
diff --git a/graphics/liblug/Makefile b/graphics/liblug/Makefile
index a647a193c5c0..21925c71a455 100644
--- a/graphics/liblug/Makefile
+++ b/graphics/liblug/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs/graphics
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A multi-format graphics manipulation library
LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/graphics/liblug/pkg-comment b/graphics/liblug/pkg-comment
deleted file mode 100644
index d1ea5ccd15f4..000000000000
--- a/graphics/liblug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-format graphics manipulation library
diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile
index 138ba866fce3..2b9bcaa2ba3e 100644
--- a/graphics/libmng/Makefile
+++ b/graphics/libmng/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Multiple-image Network Graphics (MNG) reference library
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
lcms.1:${PORTSDIR}/graphics/lcms
diff --git a/graphics/libmng/pkg-comment b/graphics/libmng/pkg-comment
deleted file mode 100644
index c8040df12c90..000000000000
--- a/graphics/libmng/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiple-image Network Graphics (MNG) reference library
diff --git a/graphics/libmorph/Makefile b/graphics/libmorph/Makefile
index 22f4738680dc..c3fd3998c4db 100644
--- a/graphics/libmorph/Makefile
+++ b/graphics/libmorph/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://wine.sexcity.pl/morpheus/meat/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A library for loading (and saving) 3d models (3d modeller object files)
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/libmorph/pkg-comment b/graphics/libmorph/pkg-comment
deleted file mode 100644
index 23c640b58537..000000000000
--- a/graphics/libmorph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for loading (and saving) 3d models (3d modeller object files)
diff --git a/graphics/librsvg/Makefile b/graphics/librsvg/Makefile
index 973285ff1e07..0b810d415613 100644
--- a/graphics/librsvg/Makefile
+++ b/graphics/librsvg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/librsvg/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library for parsing and rendering SVG vector-graphic files
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/graphics/librsvg/pkg-comment b/graphics/librsvg/pkg-comment
deleted file mode 100644
index c0c650440aeb..000000000000
--- a/graphics/librsvg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for parsing and rendering SVG vector-graphic files
diff --git a/graphics/librsvg2/Makefile b/graphics/librsvg2/Makefile
index 76460874e24e..042fbd38ce2e 100644
--- a/graphics/librsvg2/Makefile
+++ b/graphics/librsvg2/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR= gnome2
DISTNAME= librsvg-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library for parsing and rendering SVG vector-graphic files
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
diff --git a/graphics/librsvg2/pkg-comment b/graphics/librsvg2/pkg-comment
deleted file mode 100644
index c0c650440aeb..000000000000
--- a/graphics/librsvg2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for parsing and rendering SVG vector-graphic files
diff --git a/graphics/linux_dri/Makefile b/graphics/linux_dri/Makefile
index 604b9b52bd05..3826ed7517e1 100644
--- a/graphics/linux_dri/Makefile
+++ b/graphics/linux_dri/Makefile
@@ -18,6 +18,7 @@ DISTFILES= Xbin.tgz:x \
DIST_SUBDIR= linux_dri-${PORTVERSION}
MAINTAINER= anholt@freebsd.org
+COMMENT= Binary Linux DRI libraries for 3D hardware acceleration of linux apps
WRKSRC= ${WRKDIR}/lib
NO_BUILD= yes
diff --git a/graphics/linux_dri/pkg-comment b/graphics/linux_dri/pkg-comment
deleted file mode 100644
index d5e2c751940f..000000000000
--- a/graphics/linux_dri/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Binary Linux DRI libraries for 3D hardware acceleration of linux apps
diff --git a/graphics/linux_glx/Makefile b/graphics/linux_glx/Makefile
index a0e8b33912d6..47285002ca8d 100644
--- a/graphics/linux_glx/Makefile
+++ b/graphics/linux_glx/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= linux_
DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
MAINTAINER= 3d@freebsd.org
+COMMENT= Libraries to make use of glx-aware Linux apps
BUILD_DEPENDS= /compat/linux/sbin/ldconfig:${PORTSDIR}/emulators/linux_base
diff --git a/graphics/linux_glx/pkg-comment b/graphics/linux_glx/pkg-comment
deleted file mode 100644
index 29af4d597740..000000000000
--- a/graphics/linux_glx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libraries to make use of glx-aware Linux apps
diff --git a/graphics/mesagl/Makefile b/graphics/mesagl/Makefile
index a8e187592a9d..058a4f88a044 100644
--- a/graphics/mesagl/Makefile
+++ b/graphics/mesagl/Makefile
@@ -17,6 +17,7 @@ DISTFILES= MesaLib-${PORTVERSION}${EXTRACT_SUFX} \
MesaDemos-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A graphics library similar to SGI's OpenGL
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/graphics/mesagl/pkg-comment b/graphics/mesagl/pkg-comment
deleted file mode 100644
index a93f20caeb27..000000000000
--- a/graphics/mesagl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphics library similar to SGI's OpenGL
diff --git a/graphics/mgp-gallery/Makefile b/graphics/mgp-gallery/Makefile
index 3ecceec5fd05..6467c0730aee 100644
--- a/graphics/mgp-gallery/Makefile
+++ b/graphics/mgp-gallery/Makefile
@@ -20,6 +20,7 @@ DISTFILES= mgp-midgard-${PORTVERSION}.tgz \
DIST_SUBDIR= ${PKGNAMEPREFIX}${PORTNAME}
MAINTAINER= alane@FreeBSD.org
+COMMENT= A collection of various templates for magicpoint
NO_BUILD= yes
USE_X_PREFIX= yes
diff --git a/graphics/mgp-gallery/pkg-comment b/graphics/mgp-gallery/pkg-comment
deleted file mode 100644
index 0848d723c873..000000000000
--- a/graphics/mgp-gallery/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of various templates for magicpoint
diff --git a/graphics/morpheus/Makefile b/graphics/morpheus/Makefile
index 809abe40650f..6c56e1467fd2 100644
--- a/graphics/morpheus/Makefile
+++ b/graphics/morpheus/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= http://wine.sexcity.pl/morpheus/meat/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A mesh (3D model) viewer for GNOME desktop
LIB_DEPENDS= morph.0:${PORTSDIR}/graphics/libmorph \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
diff --git a/graphics/morpheus/pkg-comment b/graphics/morpheus/pkg-comment
deleted file mode 100644
index 73fcc7c8ea89..000000000000
--- a/graphics/morpheus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mesh (3D model) viewer for GNOME desktop
diff --git a/graphics/mrsidviewer/Makefile b/graphics/mrsidviewer/Makefile
index 13f6880f498a..a87c7adec533 100644
--- a/graphics/mrsidviewer/Makefile
+++ b/graphics/mrsidviewer/Makefile
@@ -13,6 +13,7 @@ DISTNAME= MrSID_linux${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= MrSID Viewer displays images compressed into the MrSID format
DOWNLOAD_URL= http://www.lizardtech.com/includes/down.php?p=16&o=4
NO_BUILD= yes
diff --git a/graphics/mrsidviewer/pkg-comment b/graphics/mrsidviewer/pkg-comment
deleted file mode 100644
index 766ed35a5797..000000000000
--- a/graphics/mrsidviewer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MrSID Viewer displays images compressed into the MrSID format
diff --git a/graphics/mtv/Makefile b/graphics/mtv/Makefile
index 98dca8ca5ad4..ebe1769c1d66 100644
--- a/graphics/mtv/Makefile
+++ b/graphics/mtv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glib
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz libSDLx11.so.tar.gz
MAINTAINER= kris@FreeBSD.org
+COMMENT= High-performance MPEG video player (shareware)
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/graphics/mtv/pkg-comment b/graphics/mtv/pkg-comment
deleted file mode 100644
index b231e92867b1..000000000000
--- a/graphics/mtv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-performance MPEG video player (shareware)
diff --git a/graphics/netshow/Makefile b/graphics/netshow/Makefile
index a2676b19cbc5..b0574f667aa3 100644
--- a/graphics/netshow/Makefile
+++ b/graphics/netshow/Makefile
@@ -13,6 +13,7 @@ DISTNAME= netshow_linux
EXTRACT_SUFX= .gz
MAINTAINER= dburr@FreeBSD.org
+COMMENT= Microsoft NetShow video stream player
RESTRICTED= "Commercial software"
NO_CDROM= ${RESTRICTED}
diff --git a/graphics/netshow/pkg-comment b/graphics/netshow/pkg-comment
deleted file mode 100644
index 03cbea42c178..000000000000
--- a/graphics/netshow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft NetShow video stream player
diff --git a/graphics/p5-Gimp/Makefile b/graphics/p5-Gimp/Makefile
index c692f337afe9..2b3123792497 100644
--- a/graphics/p5-Gimp/Makefile
+++ b/graphics/p5-Gimp/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Gimp
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= A perl5 module for writing Gimp extension
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/PDL.pm:${PORTSDIR}/math/PDL \
diff --git a/graphics/p5-Gimp/pkg-comment b/graphics/p5-Gimp/pkg-comment
deleted file mode 100644
index a612fe3b31a9..000000000000
--- a/graphics/p5-Gimp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module for writing Gimp extension
diff --git a/graphics/p5-GraphViz/Makefile b/graphics/p5-GraphViz/Makefile
index 5d48a070487d..1f8fbf075723 100644
--- a/graphics/p5-GraphViz/Makefile
+++ b/graphics/p5-GraphViz/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= GraphViz
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= GraphViz - Perl interface to the GraphViz graphing tool
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IPC/Run.pm:${PORTSDIR}/devel/p5-IPC-Run \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Graph.pm:${PORTSDIR}/math/p5-Graph \
diff --git a/graphics/p5-GraphViz/pkg-comment b/graphics/p5-GraphViz/pkg-comment
deleted file mode 100644
index 8d3f9a5b32d8..000000000000
--- a/graphics/p5-GraphViz/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GraphViz - Perl interface to the GraphViz graphing tool
diff --git a/graphics/p5-Graphics-ColorNames/Makefile b/graphics/p5-Graphics-ColorNames/Makefile
index f93dbc060d1f..f6a66c4ed244 100644
--- a/graphics/p5-Graphics-ColorNames/Makefile
+++ b/graphics/p5-Graphics-ColorNames/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Graphics
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A perl class that defines RGB values for common color names
PERL_CONFIGURE= yes
diff --git a/graphics/p5-Graphics-ColorNames/pkg-comment b/graphics/p5-Graphics-ColorNames/pkg-comment
deleted file mode 100644
index 9871a428a0df..000000000000
--- a/graphics/p5-Graphics-ColorNames/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl class that defines RGB values for common color names
diff --git a/graphics/p5-PGPLOT/Makefile b/graphics/p5-PGPLOT/Makefile
index 0802de95dd5f..ba4712cfb3d6 100644
--- a/graphics/p5-PGPLOT/Makefile
+++ b/graphics/p5-PGPLOT/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= PGPLOT
DISTNAME= PGPLOT-${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A perl5 extension which makes available the pgplot library
LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77
diff --git a/graphics/p5-PGPLOT/pkg-comment b/graphics/p5-PGPLOT/pkg-comment
deleted file mode 100644
index a60c0c72897c..000000000000
--- a/graphics/p5-PGPLOT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 extension which makes available the pgplot library
diff --git a/graphics/peps/Makefile b/graphics/peps/Makefile
index e69bec5d8a55..d73f4ff30acc 100644
--- a/graphics/peps/Makefile
+++ b/graphics/peps/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= petef
MAINTAINER= petef@FreeBSD.org
+COMMENT= Converts EPS images to anti-aliased PGM bitmaps
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu \
pnmtopng:${PORTSDIR}/graphics/netpbm
diff --git a/graphics/peps/pkg-comment b/graphics/peps/pkg-comment
deleted file mode 100644
index 8f3f00b37349..000000000000
--- a/graphics/peps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts EPS images to anti-aliased PGM bitmaps
diff --git a/graphics/pgperl/Makefile b/graphics/pgperl/Makefile
index 0802de95dd5f..ba4712cfb3d6 100644
--- a/graphics/pgperl/Makefile
+++ b/graphics/pgperl/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= PGPLOT
DISTNAME= PGPLOT-${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A perl5 extension which makes available the pgplot library
LIB_DEPENDS= pgplot.5:${PORTSDIR}/graphics/pgplot
BUILD_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/ExtUtils/F77.pm:${PORTSDIR}/lang/p5-F77
diff --git a/graphics/pgperl/pkg-comment b/graphics/pgperl/pkg-comment
deleted file mode 100644
index a60c0c72897c..000000000000
--- a/graphics/pgperl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 extension which makes available the pgplot library
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index e0aaf5769fe6..7faf68be7b9c 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.astro.caltech.edu/pub/pgplot/
DISTNAME= ${PORTNAME}${PORTVERSION:R}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A C/FORTRAN library for drawing graphs on a variety of display devices
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_XLIB= yes
diff --git a/graphics/pgplot/pkg-comment b/graphics/pgplot/pkg-comment
deleted file mode 100644
index c7f9352271e5..000000000000
--- a/graphics/pgplot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C/FORTRAN library for drawing graphs on a variety of display devices
diff --git a/graphics/pixmap/Makefile b/graphics/pixmap/Makefile
index dd3f61080e2c..46f778d76338 100644
--- a/graphics/pixmap/Makefile
+++ b/graphics/pixmap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= applications/pixmap
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A pixmap editor based on XPM library
WRKSRC= ${WRKDIR}/pixmap
USE_IMAKE= yes
diff --git a/graphics/pixmap/pkg-comment b/graphics/pixmap/pkg-comment
deleted file mode 100644
index 3e3aa48cd507..000000000000
--- a/graphics/pixmap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pixmap editor based on XPM library
diff --git a/graphics/plasma-kmod/Makefile b/graphics/plasma-kmod/Makefile
index 591e70e394be..535c0ff24ad8 100644
--- a/graphics/plasma-kmod/Makefile
+++ b/graphics/plasma-kmod/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://users.uk.freebsd.org/~greid/
PKGNAMESUFFIX= -kmod
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A plasma-effect screensaver kernel module
.if !exists(/usr/src/sys/dev/syscons/syscons.h)
BROKEN= "Requires kernel source (/usr/src/sys) to build"
diff --git a/graphics/plasma-kmod/pkg-comment b/graphics/plasma-kmod/pkg-comment
deleted file mode 100644
index 3c40d42c44b1..000000000000
--- a/graphics/plasma-kmod/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A plasma-effect screensaver kernel module
diff --git a/graphics/plotutils/Makefile b/graphics/plotutils/Makefile
index 45bb09cc7a38..f0e0240ac60e 100644
--- a/graphics/plotutils/Makefile
+++ b/graphics/plotutils/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= A plotting library and toolkit
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/graphics/plotutils/pkg-comment b/graphics/plotutils/pkg-comment
deleted file mode 100644
index 3b2e8893187d..000000000000
--- a/graphics/plotutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A plotting library and toolkit
diff --git a/graphics/png/Makefile b/graphics/png/Makefile
index 21d38a936114..12cbb3313020 100644
--- a/graphics/png/Makefile
+++ b/graphics/png/Makefile
@@ -19,6 +19,7 @@ DISTNAME= lib${PORTNAME}-${PORTVERSION}
#PATCHFILES=
MAINTAINER= ache@FreeBSD.org
+COMMENT= Library for manipulating PNG images
MAKEFILE= ${WRKSRC}/scripts/makefile.freebsd
INSTALLS_SHLIB= yes
diff --git a/graphics/png/pkg-comment b/graphics/png/pkg-comment
deleted file mode 100644
index ba0ab01003fd..000000000000
--- a/graphics/png/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for manipulating PNG images
diff --git a/graphics/png2html/Makefile b/graphics/png2html/Makefile
index 2fd00a836a4e..9498dbf58ca7 100644
--- a/graphics/png2html/Makefile
+++ b/graphics/png2html/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= http://www.engr.mun.ca/~holden/
MAINTAINER= jedgar@fxp.org
+COMMENT= Takes a PNG image and transforms it into HTML
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
gd.2:${PORTSDIR}/graphics/gd
diff --git a/graphics/png2html/pkg-comment b/graphics/png2html/pkg-comment
deleted file mode 100644
index e14ddd4fe6d0..000000000000
--- a/graphics/png2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Takes a PNG image and transforms it into HTML
diff --git a/graphics/pngcrush/Makefile b/graphics/pngcrush/Makefile
index d4254e337f42..74020e7efc2e 100644
--- a/graphics/pngcrush/Makefile
+++ b/graphics/pngcrush/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= pmt
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= An optimizer for PNG files
MAKEFILE= Makefile.gcc
diff --git a/graphics/pngcrush/pkg-comment b/graphics/pngcrush/pkg-comment
deleted file mode 100644
index 4da19ee88070..000000000000
--- a/graphics/pngcrush/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An optimizer for PNG files
diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile
index 5ff071bee10b..5bb0aa71e568 100644
--- a/graphics/povray/Makefile
+++ b/graphics/povray/Makefile
@@ -20,6 +20,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= povray35
MAINTAINER= maho@FreeBSD.org
+COMMENT= Persistence of Vision Ray Tracer
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/povray/pkg-comment b/graphics/povray/pkg-comment
deleted file mode 100644
index 3de72a33187b..000000000000
--- a/graphics/povray/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Persistence of Vision Ray Tracer
diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile
index 5ff071bee10b..5bb0aa71e568 100644
--- a/graphics/povray36/Makefile
+++ b/graphics/povray36/Makefile
@@ -20,6 +20,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= povray35
MAINTAINER= maho@FreeBSD.org
+COMMENT= Persistence of Vision Ray Tracer
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/povray36/pkg-comment b/graphics/povray36/pkg-comment
deleted file mode 100644
index 3de72a33187b..000000000000
--- a/graphics/povray36/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Persistence of Vision Ray Tracer
diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile
index 5ff071bee10b..5bb0aa71e568 100644
--- a/graphics/povray37/Makefile
+++ b/graphics/povray37/Makefile
@@ -20,6 +20,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= povray35
MAINTAINER= maho@FreeBSD.org
+COMMENT= Persistence of Vision Ray Tracer
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/povray37/pkg-comment b/graphics/povray37/pkg-comment
deleted file mode 100644
index 3de72a33187b..000000000000
--- a/graphics/povray37/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Persistence of Vision Ray Tracer
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index 245622657989..c508b090e26c 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -12,6 +12,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${NADFILES}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Cartographic Projections library
NADFILES= proj-nad27-1.1.tar.gz
diff --git a/graphics/proj/pkg-comment b/graphics/proj/pkg-comment
deleted file mode 100644
index 997f1880d753..000000000000
--- a/graphics/proj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cartographic Projections library
diff --git a/graphics/pstoepsi/Makefile b/graphics/pstoepsi/Makefile
index ab14e2576cf3..889d81c015c8 100644
--- a/graphics/pstoepsi/Makefile
+++ b/graphics/pstoepsi/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= pstoepsi
EXTRACT_ONLY= #empty
MAINTAINER= mita@FreeBSD.org
+COMMENT= Wiliam Chia-Wei Cheng's yet another PS to EPSI converter
RUN_DEPENDS= pbmtoepsi:${PORTSDIR}/graphics/netpbm \
gs:${PORTSDIR}/print/ghostscript-gnu
diff --git a/graphics/pstoepsi/pkg-comment b/graphics/pstoepsi/pkg-comment
deleted file mode 100644
index 8ca6d5d53270..000000000000
--- a/graphics/pstoepsi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wiliam Chia-Wei Cheng's yet another PS to EPSI converter
diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index 90e98ae3238e..8a4d2e324fcb 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-3.1e2
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Distributed rendering package for Persistence of Vision Ray Tracer
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/povray31:configure \
aimk:${PORTSDIR}/net/pvm
diff --git a/graphics/pvmpov/pkg-comment b/graphics/pvmpov/pkg-comment
deleted file mode 100644
index ac71f89c5c47..000000000000
--- a/graphics/pvmpov/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Distributed rendering package for Persistence of Vision Ray Tracer
diff --git a/graphics/py-exif/Makefile b/graphics/py-exif/Makefile
index c099c8a452bc..f2409eb019d5 100644
--- a/graphics/py-exif/Makefile
+++ b/graphics/py-exif/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pyexif-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Python library to extract EXIF metadata from JPEG and TIFF image files
USE_PYTHON= yes
WRKSRC= ${WRKDIR}/pyexif
diff --git a/graphics/py-exif/pkg-comment b/graphics/py-exif/pkg-comment
deleted file mode 100644
index 0d937139826b..000000000000
--- a/graphics/py-exif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python library to extract EXIF metadata from JPEG and TIFF image files
diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile
index d4445215ee84..ab4a38d1e5f2 100644
--- a/graphics/py-imaging/Makefile
+++ b/graphics/py-imaging/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Imaging-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= The Python Imaging Library
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/py-imaging/pkg-comment b/graphics/py-imaging/pkg-comment
deleted file mode 100644
index 6e7e3c34c8a0..000000000000
--- a/graphics/py-imaging/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Python Imaging Library
diff --git a/graphics/py-opengl/Makefile b/graphics/py-opengl/Makefile
index 2d5c52b3ca5d..0810076ca4a0 100644
--- a/graphics/py-opengl/Makefile
+++ b/graphics/py-opengl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= py-
DISTNAME= PyOpenGL-${PORTVERSION:S/.b/b/}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An OpenGL (and related library) interface for Python
BUILD_DEPENDS= ${PYNUMERIC} \
${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
diff --git a/graphics/py-opengl/pkg-comment b/graphics/py-opengl/pkg-comment
deleted file mode 100644
index ee305fbf6d9f..000000000000
--- a/graphics/py-opengl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL (and related library) interface for Python
diff --git a/graphics/qcread/Makefile b/graphics/qcread/Makefile
index f2be0782f6ce..c4393956f511 100644
--- a/graphics/qcread/Makefile
+++ b/graphics/qcread/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://mars.illtel.denver.co.us/pub/qcread/ \
http://mars.illtel.denver.co.us/pub/qcread/
MAINTAINER= billf@FreeBSD.org
+COMMENT= Supports both color and B&W parallel-port Connectix QuickCam for PC
ONLY_FOR_ARCHS= i386
diff --git a/graphics/qcread/pkg-comment b/graphics/qcread/pkg-comment
deleted file mode 100644
index 55cabf72523e..000000000000
--- a/graphics/qcread/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Supports both color and B&W parallel-port Connectix QuickCam for PC
diff --git a/graphics/scr2png/Makefile b/graphics/scr2png/Makefile
index 67d7fde48657..ddfc1c82e170 100644
--- a/graphics/scr2png/Makefile
+++ b/graphics/scr2png/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= nik
NO_WRKSUBDIR= yes
MAINTAINER= nik@freebsd.org
+COMMENT= Converts the output of "vidcontrol -p" to PNG
LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd
diff --git a/graphics/scr2png/pkg-comment b/graphics/scr2png/pkg-comment
deleted file mode 100644
index dd4b84cb7040..000000000000
--- a/graphics/scr2png/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts the output of "vidcontrol -p" to PNG
diff --git a/graphics/scwm-icons/Makefile b/graphics/scwm-icons/Makefile
index 52006effdc79..cc96532075f0 100644
--- a/graphics/scwm-icons/Makefile
+++ b/graphics/scwm-icons/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= An icon collection for the scwm window manager
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
diff --git a/graphics/scwm-icons/pkg-comment b/graphics/scwm-icons/pkg-comment
deleted file mode 100644
index 138020a4af3a..000000000000
--- a/graphics/scwm-icons/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An icon collection for the scwm window manager
diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile
index 786f831d456c..248dee1cf28a 100644
--- a/graphics/sdl_image/Makefile
+++ b/graphics/sdl_image/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/
DISTNAME= SDL_image-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A simple library to load images of various formats as SDL surfaces
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
png.5:${PORTSDIR}/graphics/png \
diff --git a/graphics/sdl_image/pkg-comment b/graphics/sdl_image/pkg-comment
deleted file mode 100644
index 1d3e8c934f99..000000000000
--- a/graphics/sdl_image/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple library to load images of various formats as SDL surfaces
diff --git a/graphics/sdl_ttf/Makefile b/graphics/sdl_ttf/Makefile
index 59d6ed735846..0b8bb61555d4 100644
--- a/graphics/sdl_ttf/Makefile
+++ b/graphics/sdl_ttf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/
DISTNAME= SDL_ttf-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A library to use TrueType fonts to render text in SDL applications
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
diff --git a/graphics/sdl_ttf/pkg-comment b/graphics/sdl_ttf/pkg-comment
deleted file mode 100644
index d0bcdef605dc..000000000000
--- a/graphics/sdl_ttf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library to use TrueType fonts to render text in SDL applications
diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile
index bb00bf36ef58..7ac68db8cea4 100644
--- a/graphics/seejpeg/Makefile
+++ b/graphics/seejpeg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= apps/graphics/viewers/svga
EXTRACT_SUFX= .tgz
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A console graphics viewer using the svga console graphics library
LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
diff --git a/graphics/seejpeg/pkg-comment b/graphics/seejpeg/pkg-comment
deleted file mode 100644
index 0c8cb97d2412..000000000000
--- a/graphics/seejpeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A console graphics viewer using the svga console graphics library
diff --git a/graphics/smpeg-xmms/Makefile b/graphics/smpeg-xmms/Makefile
index e97b57f4fc78..865bf94e75d3 100644
--- a/graphics/smpeg-xmms/Makefile
+++ b/graphics/smpeg-xmms/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A mpeg video plugin for XMMS
LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg \
xmms.3:${PORTSDIR}/multimedia/xmms
diff --git a/graphics/smpeg-xmms/pkg-comment b/graphics/smpeg-xmms/pkg-comment
deleted file mode 100644
index a92c7dbec006..000000000000
--- a/graphics/smpeg-xmms/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mpeg video plugin for XMMS
diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile
index 6a234d03635a..7b230126db5f 100644
--- a/graphics/stamp/Makefile
+++ b/graphics/stamp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= stamp
MAINTAINER= billf@FreeBSD.org
+COMMENT= Adds a graphical, configurable timestamp to a grayscale image
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/graphics/stamp/pkg-comment b/graphics/stamp/pkg-comment
deleted file mode 100644
index 227b127dca6b..000000000000
--- a/graphics/stamp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Adds a graphical, configurable timestamp to a grayscale image
diff --git a/graphics/svgalib/Makefile b/graphics/svgalib/Makefile
index d8552390d8cb..33a6e0bfcc6d 100644
--- a/graphics/svgalib/Makefile
+++ b/graphics/svgalib/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= graphics devel
MASTER_SITES= http://www.svgalib.org/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A low level console graphics library
USE_GMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/graphics/svgalib/pkg-comment b/graphics/svgalib/pkg-comment
deleted file mode 100644
index cc9fe79c6023..000000000000
--- a/graphics/svgalib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A low level console graphics library
diff --git a/graphics/synaesthesia/Makefile b/graphics/synaesthesia/Makefile
index 7707c4443f22..3431c96ae8ca 100644
--- a/graphics/synaesthesia/Makefile
+++ b/graphics/synaesthesia/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://yoyo.cc.monash.edu.au/~pfh/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Graphically represents sound in real time
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/graphics/synaesthesia/pkg-comment b/graphics/synaesthesia/pkg-comment
deleted file mode 100644
index 9968766fe069..000000000000
--- a/graphics/synaesthesia/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphically represents sound in real time
diff --git a/graphics/threeDS/Makefile b/graphics/threeDS/Makefile
index 8c8b7317fbb3..51d3f262a5f0 100644
--- a/graphics/threeDS/Makefile
+++ b/graphics/threeDS/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics python
MASTER_SITES= http://www.demonseed.net/~jp/code/threeDS/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A Python module and viewer for loading and displaying models in 3DS format
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/graphics/threeDS/pkg-comment b/graphics/threeDS/pkg-comment
deleted file mode 100644
index e9145aacf7d6..000000000000
--- a/graphics/threeDS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python module and viewer for loading and displaying models in 3DS format
diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile
index bedbbff1783b..a7e2d996c250 100644
--- a/graphics/tiff/Makefile
+++ b/graphics/tiff/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Tools and library routines for working with TIFF images
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/tiff/pkg-comment b/graphics/tiff/pkg-comment
deleted file mode 100644
index 3682d46df4e0..000000000000
--- a/graphics/tiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tools and library routines for working with TIFF images
diff --git a/graphics/tkxanim/Makefile b/graphics/tkxanim/Makefile
index c62f5f167db5..5cd195b4b140 100644
--- a/graphics/tkxanim/Makefile
+++ b/graphics/tkxanim/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics tk82
MASTER_SITES= http://members.yourlink.net/aaron/software/linux/
MAINTAINER= jedgar@fxp.org
+COMMENT= Tcl/Tk frontend to xanim
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
xanim:${PORTSDIR}/graphics/xanim
diff --git a/graphics/tkxanim/pkg-comment b/graphics/tkxanim/pkg-comment
deleted file mode 100644
index fbdef511dfcb..000000000000
--- a/graphics/tkxanim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcl/Tk frontend to xanim
diff --git a/graphics/txtmerge/Makefile b/graphics/txtmerge/Makefile
index f7fd56d77a15..5b76c034caab 100644
--- a/graphics/txtmerge/Makefile
+++ b/graphics/txtmerge/Makefile
@@ -14,6 +14,7 @@ DISTNAME= txtmerge101
EXTRACT_SUFX= .tar.Z
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Tool for making GIF Animations
WRKSRC= ${WRKDIR}/txtmerge
ALL_TARGET= txtmerge
diff --git a/graphics/txtmerge/pkg-comment b/graphics/txtmerge/pkg-comment
deleted file mode 100644
index a5992b5fd1dc..000000000000
--- a/graphics/txtmerge/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool for making GIF Animations
diff --git a/graphics/utah-glx/Makefile b/graphics/utah-glx/Makefile
index 9bdfeb6092d2..a79094fdb592 100644
--- a/graphics/utah-glx/Makefile
+++ b/graphics/utah-glx/Makefile
@@ -16,6 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MesaDemos-${MESA_VER}${EXTRACT_SUFX}
MAINTAINER= 3d@FreeBSD.org
+COMMENT= A hardware OpenGL support for XFree86 X-Servers
BUILD_DEPENDS= tclsh8.3:${PORTSDIR}/lang/tcl83 \
autoconf:${PORTSDIR}/devel/autoconf
diff --git a/graphics/utah-glx/pkg-comment b/graphics/utah-glx/pkg-comment
deleted file mode 100644
index 72158726adb6..000000000000
--- a/graphics/utah-glx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A hardware OpenGL support for XFree86 X-Servers
diff --git a/graphics/vertex/Makefile b/graphics/vertex/Makefile
index adf61ec25207..c642e67f3603 100644
--- a/graphics/vertex/Makefile
+++ b/graphics/vertex/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= ftp://wolfpack.twu.net/users/wolfpack/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A 3D modeller designed specifically for generating efficient game models
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/graphics/vertex/pkg-comment b/graphics/vertex/pkg-comment
deleted file mode 100644
index 3391d4eb5d44..000000000000
--- a/graphics/vertex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A 3D modeller designed specifically for generating efficient game models
diff --git a/graphics/vid/Makefile b/graphics/vid/Makefile
index cfb5b32b2c8f..9e7c75f57348 100644
--- a/graphics/vid/Makefile
+++ b/graphics/vid/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= http://members.home.com/housel/
MAINTAINER= roger@freebsd.org
+COMMENT= Grab images from USB Cameras using the OV511 and OV511+ chipset
.include <bsd.port.pre.mk>
diff --git a/graphics/vid/pkg-comment b/graphics/vid/pkg-comment
deleted file mode 100644
index 1e809dcd201e..000000000000
--- a/graphics/vid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Grab images from USB Cameras using the OV511 and OV511+ chipset
diff --git a/graphics/view3ds/Makefile b/graphics/view3ds/Makefile
index 26834383c76d..e353dd2472d1 100644
--- a/graphics/view3ds/Makefile
+++ b/graphics/view3ds/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= lib3ds
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A simple realtime 3DS file previewer based on the Lib3ds Library
LIB_DEPENDS= 3ds.1:${PORTSDIR}/graphics/lib3ds
diff --git a/graphics/view3ds/pkg-comment b/graphics/view3ds/pkg-comment
deleted file mode 100644
index d7ffd967e2ee..000000000000
--- a/graphics/view3ds/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple realtime 3DS file previewer based on the Lib3ds Library
diff --git a/graphics/vlc/Makefile b/graphics/vlc/Makefile
index 622d7a16ecfa..16e2a6ad620b 100644
--- a/graphics/vlc/Makefile
+++ b/graphics/vlc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
http://people.FreeBSD.org/~brian/vlc/
MAINTAINER= brian@FreeBSD.org
+COMMENT= An X11 MPEG2 client/server solution
LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
dvdread.3:${PORTSDIR}/multimedia/libdvdread
diff --git a/graphics/vlc/pkg-comment b/graphics/vlc/pkg-comment
deleted file mode 100644
index c0426ee24399..000000000000
--- a/graphics/vlc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 MPEG2 client/server solution
diff --git a/graphics/whirlgif/Makefile b/graphics/whirlgif/Makefile
index f57b4b0978b0..e12126b7fdfa 100644
--- a/graphics/whirlgif/Makefile
+++ b/graphics/whirlgif/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.danbbs.dk/~dino/whirlgif/
DISTNAME= whirlgif304
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A tool for making GIF animations
NO_WRKSUBDIR= yes
diff --git a/graphics/whirlgif/pkg-comment b/graphics/whirlgif/pkg-comment
deleted file mode 100644
index c1040d48916c..000000000000
--- a/graphics/whirlgif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for making GIF animations
diff --git a/graphics/wmicons/Makefile b/graphics/wmicons/Makefile
index 3e7f6ac592d7..631162f8bc71 100644
--- a/graphics/wmicons/Makefile
+++ b/graphics/wmicons/Makefile
@@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR= . contrib/icons beta/srcs
DISTFILES= ${EXTRACT_ONLY} isiconpack4.tgz
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Icons mainly for use in Window Maker
EXTRACT_ONLY= DWiconpack1.tar.gz DWiconpack2.tar.gz IconFest-1.2.tgz \
NeXT_XEmacs_tar.gz wm_icons_png.tar.gz wm_icons_tif.tar.gz \
diff --git a/graphics/wmicons/pkg-comment b/graphics/wmicons/pkg-comment
deleted file mode 100644
index a33b6d8629c3..000000000000
--- a/graphics/wmicons/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Icons mainly for use in Window Maker
diff --git a/graphics/xaos/Makefile b/graphics/xaos/Makefile
index f554209031ed..7c4c34cc776b 100644
--- a/graphics/xaos/Makefile
+++ b/graphics/xaos/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= xaos
DISTNAME= XaoS-${PORTVERSION}
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A real-time fractal browser for X11 and ASCII terminals
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
.if defined(WITH_SVGALIB)
diff --git a/graphics/xaos/pkg-comment b/graphics/xaos/pkg-comment
deleted file mode 100644
index 6578fffa78c9..000000000000
--- a/graphics/xaos/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A real-time fractal browser for X11 and ASCII terminals
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 5fd880f4d3c0..2e52aed09c46 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= utilities
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= View complete directories of X bitmaps and X pixmaps
USE_IMAKE= yes
USE_XPM= yes
diff --git a/graphics/xbmbrowser/pkg-comment b/graphics/xbmbrowser/pkg-comment
deleted file mode 100644
index 7164d2190743..000000000000
--- a/graphics/xbmbrowser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View complete directories of X bitmaps and X pixmaps
diff --git a/graphics/xdgagrab/Makefile b/graphics/xdgagrab/Makefile
index e847e043a48a..2758de9adaf4 100644
--- a/graphics/xdgagrab/Makefile
+++ b/graphics/xdgagrab/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/ports/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Capture an X server screen with a mouse pointer
ALL_TARGET= xdgagrab
USE_X_PREFIX= yes
diff --git a/graphics/xdgagrab/pkg-comment b/graphics/xdgagrab/pkg-comment
deleted file mode 100644
index bdd8bfa30d95..000000000000
--- a/graphics/xdgagrab/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Capture an X server screen with a mouse pointer
diff --git a/graphics/xface.el/Makefile b/graphics/xface.el/Makefile
index 98ff0de6a594..4f88313f1453 100644
--- a/graphics/xface.el/Makefile
+++ b/graphics/xface.el/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}.tar.gz \
EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= X-Face encoder/decoder/viewer for Emacsen
RUN_DEPENDS= compface:${PORTSDIR}/mail/faces
diff --git a/graphics/xface.el/pkg-comment b/graphics/xface.el/pkg-comment
deleted file mode 100644
index cd174b7debd5..000000000000
--- a/graphics/xface.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X-Face encoder/decoder/viewer for Emacsen
diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile
index 998cc1fea070..ded7544de590 100644
--- a/graphics/xli/Makefile
+++ b/graphics/xli/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} \
MASTER_SITE_SUBDIR= applications
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= Xli, xsetbg, xview, xlito - utilities to display images on X11
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/graphics/xli/pkg-comment b/graphics/xli/pkg-comment
deleted file mode 100644
index f11c377bfc4c..000000000000
--- a/graphics/xli/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xli, xsetbg, xview, xlito - utilities to display images on X11
diff --git a/graphics/xmagv/Makefile b/graphics/xmagv/Makefile
index f2d54a6adcab..315e621be311 100644
--- a/graphics/xmagv/Makefile
+++ b/graphics/xmagv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.vector.co.jp/pack/unix/art/graphics/loader/mag/
DISTFILES= xmagv111.tgz
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Viewer for X Window System
WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
diff --git a/graphics/xmagv/pkg-comment b/graphics/xmagv/pkg-comment
deleted file mode 100644
index ae15ee0881c8..000000000000
--- a/graphics/xmagv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Viewer for X Window System
diff --git a/graphics/xmms-gdancer/Makefile b/graphics/xmms-gdancer/Makefile
index 6ff13886b306..e7a3edfe344e 100644
--- a/graphics/xmms-gdancer/Makefile
+++ b/graphics/xmms-gdancer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.figz.com/gdancer/files/
DISTNAME= gdancer-$(PORTVERSION)
MAINTAINER= netchild@FreeBSD.org
+COMMENT= XMMS Visualization plugin, displays dancing figures
LIB_DEPENDS= xmms.3:${PORTSDIR}/multimedia/xmms \
gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
diff --git a/graphics/xmms-gdancer/pkg-comment b/graphics/xmms-gdancer/pkg-comment
deleted file mode 100644
index a65eea38f751..000000000000
--- a/graphics/xmms-gdancer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XMMS Visualization plugin, displays dancing figures
diff --git a/graphics/xmps/Makefile b/graphics/xmps/Makefile
index 0398b7c8e828..a9e4121d2b7a 100644
--- a/graphics/xmps/Makefile
+++ b/graphics/xmps/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= http://xmps.sourceforge.net/sources/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= X MPEG Player System - a media player with a very nice GUI
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/graphics/xmps/pkg-comment b/graphics/xmps/pkg-comment
deleted file mode 100644
index 96525f843919..000000000000
--- a/graphics/xmps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X MPEG Player System - a media player with a very nice GUI
diff --git a/graphics/xpdf/Makefile b/graphics/xpdf/Makefile
index ea27da1b069c..e04dac0afd80 100644
--- a/graphics/xpdf/Makefile
+++ b/graphics/xpdf/Makefile
@@ -19,6 +19,7 @@ PATCH_SITE_SUBDIR= support/xpdf
PATCHFILES= xpdf-2.01-patch1
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Display PDF files, and convert them to other formats
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= t1.4:${PORTSDIR}/devel/t1lib \
diff --git a/graphics/xpdf/pkg-comment b/graphics/xpdf/pkg-comment
deleted file mode 100644
index 6c9fbcd4c4e2..000000000000
--- a/graphics/xpdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display PDF files, and convert them to other formats
diff --git a/graphics/xpx/Makefile b/graphics/xpx/Makefile
index 44ab2ba472f3..5234ab798109 100644
--- a/graphics/xpx/Makefile
+++ b/graphics/xpx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.oersted.co.jp/~yav/soft/xpx/
DISTNAME= xpx141
MAINTAINER= flathill@FreeBSD.org
+COMMENT= A simple pixel editing tool to make datas for KISS
WRKSRC= ${WRKDIR}/xpx
USE_IMAKE= yes
diff --git a/graphics/xpx/pkg-comment b/graphics/xpx/pkg-comment
deleted file mode 100644
index 599c378b5053..000000000000
--- a/graphics/xpx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple pixel editing tool to make datas for KISS
diff --git a/hebrew/kde3-i18n/Makefile b/hebrew/kde3-i18n/Makefile
index 88e0b1b2f862..9a8a1188790b 100644
--- a/hebrew/kde3-i18n/Makefile
+++ b/hebrew/kde3-i18n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= he-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hebrew/kde3-i18n/pkg-comment b/hebrew/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/hebrew/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/hebrew/kde4-l10n/Makefile b/hebrew/kde4-l10n/Makefile
index 88e0b1b2f862..9a8a1188790b 100644
--- a/hebrew/kde4-l10n/Makefile
+++ b/hebrew/kde4-l10n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= he-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hebrew/kde4-l10n/pkg-comment b/hebrew/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/hebrew/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/hungarian/kde3-i18n/Makefile b/hungarian/kde3-i18n/Makefile
index 4cc122ae15a7..6d92c7e3a130 100644
--- a/hungarian/kde3-i18n/Makefile
+++ b/hungarian/kde3-i18n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= hu-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hungarian/kde3-i18n/pkg-comment b/hungarian/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/hungarian/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/hungarian/kde4-l10n/Makefile b/hungarian/kde4-l10n/Makefile
index 4cc122ae15a7..6d92c7e3a130 100644
--- a/hungarian/kde4-l10n/Makefile
+++ b/hungarian/kde4-l10n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= hu-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/hungarian/kde4-l10n/pkg-comment b/hungarian/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/hungarian/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/irc/bnc/Makefile b/irc/bnc/Makefile
index 0acd9e5f52ee..8263ea29f856 100644
--- a/irc/bnc/Makefile
+++ b/irc/bnc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.gotbnc.com/files/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= billf@FreeBSD.org
+COMMENT= A simple IRC relay proxy with support for virtual hosting
GNU_CONFIGURE= YES
diff --git a/irc/bnc/pkg-comment b/irc/bnc/pkg-comment
deleted file mode 100644
index 7b3a3f77b738..000000000000
--- a/irc/bnc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple IRC relay proxy with support for virtual hosting
diff --git a/irc/dcc/Makefile b/irc/dcc/Makefile
index 26bc99852201..bd3822756e16 100644
--- a/irc/dcc/Makefile
+++ b/irc/dcc/Makefile
@@ -18,6 +18,7 @@ PATCHFILES= irchat-pj-${PORTVERSION}pl2.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= DCC support program for irchat-pj
ALL_TARGET= dcc
LDFLAGS= ${PTHREAD_LIBS}
diff --git a/irc/dcc/pkg-comment b/irc/dcc/pkg-comment
deleted file mode 100644
index a1c1dc919aa5..000000000000
--- a/irc/dcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DCC support program for irchat-pj
diff --git a/irc/irchat-pj-emacs20/Makefile b/irc/irchat-pj-emacs20/Makefile
index 72eaab3e9a55..842c4432c3b7 100644
--- a/irc/irchat-pj-emacs20/Makefile
+++ b/irc/irchat-pj-emacs20/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${PORTNAME}-${PORTVERSION}pl2.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= IRC client which runs under Emacsen
BUILD_DEPENDS= ${LOCALBASE}/${LISPDIR:S,${PORTNAME},pure,g}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME}
RUN_DEPENDS= ${LOCALBASE}/${LISPDIR:S,${PORTNAME},pure,g}/pure-make.el:${PORTSDIR}/irc/pure-${EMACS_PORT_NAME} \
diff --git a/irc/irchat-pj-emacs20/pkg-comment b/irc/irchat-pj-emacs20/pkg-comment
deleted file mode 100644
index 041c3158c739..000000000000
--- a/irc/irchat-pj-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IRC client which runs under Emacsen
diff --git a/irc/iroffer/Makefile b/irc/iroffer/Makefile
index e374ecb934a2..a4bb512225ae 100644
--- a/irc/iroffer/Makefile
+++ b/irc/iroffer/Makefile
@@ -13,6 +13,7 @@ DISTNAME= iroffer${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= An IRC "bot" that makes sharing files via DCC extremely easy
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
diff --git a/irc/iroffer/pkg-comment b/irc/iroffer/pkg-comment
deleted file mode 100644
index 2ec9cc75fbf6..000000000000
--- a/irc/iroffer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An IRC "bot" that makes sharing files via DCC extremely easy
diff --git a/irc/irssi-devel/Makefile b/irc/irssi-devel/Makefile
index e74e38339c77..d389e25a4cd8 100644
--- a/irc/irssi-devel/Makefile
+++ b/irc/irssi-devel/Makefile
@@ -12,6 +12,7 @@ CATEGORIES+= irc # `+=' is for slave ports
MASTER_SITES= http://irssi.org/files/
MAINTAINER?= vanilla@FreeBSD.org
+COMMENT?= A modular IRC client with many features
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/irc/irssi-devel/pkg-comment b/irc/irssi-devel/pkg-comment
deleted file mode 100644
index 16346160f0a5..000000000000
--- a/irc/irssi-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A modular IRC client with many features
diff --git a/irc/irssi/Makefile b/irc/irssi/Makefile
index e74e38339c77..d389e25a4cd8 100644
--- a/irc/irssi/Makefile
+++ b/irc/irssi/Makefile
@@ -12,6 +12,7 @@ CATEGORIES+= irc # `+=' is for slave ports
MASTER_SITES= http://irssi.org/files/
MAINTAINER?= vanilla@FreeBSD.org
+COMMENT?= A modular IRC client with many features
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/irc/irssi/pkg-comment b/irc/irssi/pkg-comment
deleted file mode 100644
index 16346160f0a5..000000000000
--- a/irc/irssi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A modular IRC client with many features
diff --git a/irc/liece-dcc/Makefile b/irc/liece-dcc/Makefile
index 16a966c70ced..50f6125ad80f 100644
--- a/irc/liece-dcc/Makefile
+++ b/irc/liece-dcc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
DISTNAME= liece-${PORTVERSION}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= DCC support program for Liece
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/irc/liece-dcc/pkg-comment b/irc/liece-dcc/pkg-comment
deleted file mode 100644
index d86703019cdb..000000000000
--- a/irc/liece-dcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DCC support program for Liece
diff --git a/irc/liece/Makefile b/irc/liece/Makefile
index f4c90762994f..e1960436def1 100644
--- a/irc/liece/Makefile
+++ b/irc/liece/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Yet another IRC client which runs under Emacsen
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
msgfmt:${PORTSDIR}/devel/gettext
diff --git a/irc/liece/pkg-comment b/irc/liece/pkg-comment
deleted file mode 100644
index eeb112edeec2..000000000000
--- a/irc/liece/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another IRC client which runs under Emacsen
diff --git a/irc/muh/Makefile b/irc/muh/Makefile
index 280d998e7bb8..08d3c6867169 100644
--- a/irc/muh/Makefile
+++ b/irc/muh/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=muh
MAINTAINER= billf@FreeBSD.org
+COMMENT= A smart irc-bouncing-tool that remains on IRC all the time
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/irc/muh/pkg-comment b/irc/muh/pkg-comment
deleted file mode 100644
index 44b463136e85..000000000000
--- a/irc/muh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A smart irc-bouncing-tool that remains on IRC all the time
diff --git a/irc/p5-IRC/Makefile b/irc/p5-IRC/Makefile
index c9ad8ec5c5de..a5feda925356 100644
--- a/irc/p5-IRC/Makefile
+++ b/irc/p5-IRC/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= jedgar@fxp.org
+COMMENT= Perl5 modules to implement the IRC protocol (RFC 1459)
PERL_CONFIGURE= yes
diff --git a/irc/p5-IRC/pkg-comment b/irc/p5-IRC/pkg-comment
deleted file mode 100644
index e2dbe7467072..000000000000
--- a/irc/p5-IRC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 modules to implement the IRC protocol (RFC 1459)
diff --git a/irc/p5-POE-Component-IRC-Object/Makefile b/irc/p5-POE-Component-IRC-Object/Makefile
index b889f92b8400..0b5372d257fd 100644
--- a/irc/p5-POE-Component-IRC-Object/Makefile
+++ b/irc/p5-POE-Component-IRC-Object/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= A slightly simpler OO interface to POE::Component::IRC
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE/Component/IRC.pm:${PORTSDIR}/irc/p5-POE-Component-IRC
diff --git a/irc/p5-POE-Component-IRC-Object/pkg-comment b/irc/p5-POE-Component-IRC-Object/pkg-comment
deleted file mode 100644
index 073b5d9beda2..000000000000
--- a/irc/p5-POE-Component-IRC-Object/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A slightly simpler OO interface to POE::Component::IRC
diff --git a/irc/pure-emacs20/Makefile b/irc/pure-emacs20/Makefile
index 55c63c95aa37..39658ed28acf 100644
--- a/irc/pure-emacs20/Makefile
+++ b/irc/pure-emacs20/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${PORTNAME}-${PORTVERSION}pl2.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Primitive Universal Relay-chat Environment
EMACS_PORT_NAME?= emacs20
LISPDIR?= ${EMACS_VERSION_SITE_LISPDIR}/${PORTNAME}
diff --git a/irc/pure-emacs20/pkg-comment b/irc/pure-emacs20/pkg-comment
deleted file mode 100644
index 1f74d77f6ee8..000000000000
--- a/irc/pure-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Primitive Universal Relay-chat Environment
diff --git a/irc/quirc/Makefile b/irc/quirc/Makefile
index 16806d44e36f..f03c0680968e 100644
--- a/irc/quirc/Makefile
+++ b/irc/quirc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= irc tk83
MASTER_SITES= http://quirc.org/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= An irc client for the X Window System that uses TCL/TK
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/irc/quirc/pkg-comment b/irc/quirc/pkg-comment
deleted file mode 100644
index fcb99bdc6f56..000000000000
--- a/irc/quirc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An irc client for the X Window System that uses TCL/TK
diff --git a/irc/riece-emacs21/Makefile b/irc/riece-emacs21/Makefile
index f4c90762994f..e1960436def1 100644
--- a/irc/riece-emacs21/Makefile
+++ b/irc/riece-emacs21/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Yet another IRC client which runs under Emacsen
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
msgfmt:${PORTSDIR}/devel/gettext
diff --git a/irc/riece-emacs21/pkg-comment b/irc/riece-emacs21/pkg-comment
deleted file mode 100644
index eeb112edeec2..000000000000
--- a/irc/riece-emacs21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another IRC client which runs under Emacsen
diff --git a/irc/riece/Makefile b/irc/riece/Makefile
index f4c90762994f..e1960436def1 100644
--- a/irc/riece/Makefile
+++ b/irc/riece/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.unixuser.org/~ueno/liece/dist/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Yet another IRC client which runs under Emacsen
BUILD_DEPENDS+= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/apel/install.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX} \
msgfmt:${PORTSDIR}/devel/gettext
diff --git a/irc/riece/pkg-comment b/irc/riece/pkg-comment
deleted file mode 100644
index eeb112edeec2..000000000000
--- a/irc/riece/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another IRC client which runs under Emacsen
diff --git a/irc/sirc/Makefile b/irc/sirc/Makefile
index 081f4ebd8ccb..128f06b8feb0 100644
--- a/irc/sirc/Makefile
+++ b/irc/sirc/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= http://www.iagora.com/~espel/sirc/ \
http://dougbarton.net/FreeBSD/Downloads/
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Small (150k), fast, perl-based IRC client
USE_PERL5= yes
diff --git a/irc/sirc/pkg-comment b/irc/sirc/pkg-comment
deleted file mode 100644
index bae592e189d7..000000000000
--- a/irc/sirc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small (150k), fast, perl-based IRC client
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index cec2c47c5b47..de725f9ac6e8 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.netsplit.de/pub/tcltk/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= green@FreeBSD.org
+COMMENT= A GUI for the ircII Internet Relay Chat client
RUN_DEPENDS= irc:${PORTSDIR}/irc/ircII \
wish8.3:${PORTSDIR}/x11-toolkits/tk83
diff --git a/irc/tkirc/pkg-comment b/irc/tkirc/pkg-comment
deleted file mode 100644
index 5a67aa32870c..000000000000
--- a/irc/tkirc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI for the ircII Internet Relay Chat client
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index a81325dbe2aa..b30d49a0df7b 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
MAINTAINER?= jim@FreeBSD.org
+COMMENT= An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/irc/xchat/pkg-comment b/irc/xchat/pkg-comment
deleted file mode 100644
index ead8c7eac2b8..000000000000
--- a/irc/xchat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index a81325dbe2aa..b30d49a0df7b 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://xchat.org/files/source/1.8/ \
http://xchat.linuxpower.org/files/source/1.8/
MAINTAINER?= jim@FreeBSD.org
+COMMENT= An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/irc/xchat1/pkg-comment b/irc/xchat1/pkg-comment
deleted file mode 100644
index ead8c7eac2b8..000000000000
--- a/irc/xchat1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
diff --git a/japanese/ASCIIdates98-fpw/Makefile b/japanese/ASCIIdates98-fpw/Makefile
index 56f0398e682d..c05e8adafd9e 100644
--- a/japanese/ASCIIdates98-fpw/Makefile
+++ b/japanese/ASCIIdates98-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/ASCIIdates98/
DISTNAME= ${PORTNAME:S/-fpw//}-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A Japanese dictionary for PC terms in '98 ASCII Dates Book (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/ASCIIdates98-fpw/pkg-comment b/japanese/ASCIIdates98-fpw/pkg-comment
deleted file mode 100644
index ee8b09266527..000000000000
--- a/japanese/ASCIIdates98-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese dictionary for PC terms in '98 ASCII Dates Book (EPWING V1 format)
diff --git a/japanese/CGdic-fpw/Makefile b/japanese/CGdic-fpw/Makefile
index c48813fdd8cf..f42859b7127e 100644
--- a/japanese/CGdic-fpw/Makefile
+++ b/japanese/CGdic-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/CGdic1.5h/
DISTNAME= CGdic1.5h-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A Japanese dictionary for CG (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/CGdic-fpw/pkg-comment b/japanese/CGdic-fpw/pkg-comment
deleted file mode 100644
index c992501ab727..000000000000
--- a/japanese/CGdic-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese dictionary for CG (EPWING V1 format)
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 457f44ee41e4..de90d44542a1 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= max@FreeBSD.org
+COMMENT= Kana-Kanji conversion system
USE_IMAKE= yes
USE_X_PREFIX= no
diff --git a/japanese/Canna/pkg-comment b/japanese/Canna/pkg-comment
deleted file mode 100644
index 1aa218a9dfa2..000000000000
--- a/japanese/Canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kana-Kanji conversion system
diff --git a/japanese/VTPSfont/Makefile b/japanese/VTPSfont/Makefile
index 079f4fdda650..43a01bdc989c 100644
--- a/japanese/VTPSfont/Makefile
+++ b/japanese/VTPSfont/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/
EXTRACT_SUFX= # none
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Create Virtual PostScript fonts produced by VFlib (Truetype fonts)
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash1
diff --git a/japanese/VTPSfont/pkg-comment b/japanese/VTPSfont/pkg-comment
deleted file mode 100644
index 86e9eb311b33..000000000000
--- a/japanese/VTPSfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create Virtual PostScript fonts produced by VFlib (Truetype fonts)
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index 5e6ce8c8a33e..6098756e685b 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
DISTNAME= Wnn6-SDK
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Include files and a library of Wnn6
.include <bsd.port.pre.mk>
diff --git a/japanese/Wnn6-lib/pkg-comment b/japanese/Wnn6-lib/pkg-comment
deleted file mode 100644
index 84b26f29e084..000000000000
--- a/japanese/Wnn6-lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Include files and a library of Wnn6
diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index f6b10bd2f68a..ec245c64eba2 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -12,6 +12,7 @@ DISTNAME= OMRONWnn6
EXTRACT_SUFX= .tgz
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A Japanese input method (this is not free)
IGNOREFILES= ${DISTFILES}
NO_WRKSUBDIR= yes
diff --git a/japanese/Wnn6/pkg-comment b/japanese/Wnn6/pkg-comment
deleted file mode 100644
index 34d5fbf9c624..000000000000
--- a/japanese/Wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese input method (this is not free)
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index 41f6bec2b135..8758da751955 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -13,6 +13,7 @@ DISTNAME= Wnn7SDK
EXTRACT_SUFX= .tgz
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Include files and a library of Wnn7
.include <bsd.port.pre.mk>
diff --git a/japanese/Wnn7-lib/pkg-comment b/japanese/Wnn7-lib/pkg-comment
deleted file mode 100644
index f7990b2517b8..000000000000
--- a/japanese/Wnn7-lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Include files and a library of Wnn7
diff --git a/japanese/addttfont/Makefile b/japanese/addttfont/Makefile
index 8af13e1d749d..e554c69d2c4f 100644
--- a/japanese/addttfont/Makefile
+++ b/japanese/addttfont/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/
EXTRACT_SUFX= # none
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Automatically create a Japanese font environment by TrueType fonts
RUN_DEPENDS= mkres.pl:${PORTSDIR}/japanese/p5-mkres \
${X11BASE}/lib/X11/ja_JP.eucJP/app-defaults/Tgif:${PORTSDIR}/japanese/tgif \
diff --git a/japanese/addttfont/pkg-comment b/japanese/addttfont/pkg-comment
deleted file mode 100644
index 99a42afba88a..000000000000
--- a/japanese/addttfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automatically create a Japanese font environment by TrueType fonts
diff --git a/japanese/anthy/Makefile b/japanese/anthy/Makefile
index 9741e04b1c0e..6f0076805b19 100644
--- a/japanese/anthy/Makefile
+++ b/japanese/anthy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese
MASTER_SITES= http://www.kyoto.trans-nt.com/anthy/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Another kana-kanji conversion system
GNU_CONFIGURE= yes
INSTALL_SHLIBS= yes
diff --git a/japanese/anthy/pkg-comment b/japanese/anthy/pkg-comment
deleted file mode 100644
index 467b683ef1ae..000000000000
--- a/japanese/anthy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another kana-kanji conversion system
diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile
index ddf503de85f0..9bce1bdb1f14 100644
--- a/japanese/aterm/Makefile
+++ b/japanese/aterm/Makefile
@@ -16,6 +16,7 @@ PATCHFILES= ${DISTNAME}-ja.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= A color vt102 terminal emulator with transparency support
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
diff --git a/japanese/aterm/pkg-comment b/japanese/aterm/pkg-comment
deleted file mode 100644
index 51dd2923467d..000000000000
--- a/japanese/aterm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A color vt102 terminal emulator with transparency support
diff --git a/japanese/bible_names-fpw/Makefile b/japanese/bible_names-fpw/Makefile
index 1955e334d8c6..75ebbd40cde5 100644
--- a/japanese/bible_names-fpw/Makefile
+++ b/japanese/bible_names-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/bible_names/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A dictionary for HITCHCOCK'S BIBLE NAMES (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/bible_names-fpw/pkg-comment b/japanese/bible_names-fpw/pkg-comment
deleted file mode 100644
index aebb52498e71..000000000000
--- a/japanese/bible_names-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dictionary for HITCHCOCK'S BIBLE NAMES (EPWING V1 format)
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 457f44ee41e4..de90d44542a1 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= max@FreeBSD.org
+COMMENT= Kana-Kanji conversion system
USE_IMAKE= yes
USE_X_PREFIX= no
diff --git a/japanese/canna-lib/pkg-comment b/japanese/canna-lib/pkg-comment
deleted file mode 100644
index 1aa218a9dfa2..000000000000
--- a/japanese/canna-lib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kana-Kanji conversion system
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 457f44ee41e4..de90d44542a1 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://downloads.sourceforge.jp/canna/2181/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= max@FreeBSD.org
+COMMENT= Kana-Kanji conversion system
USE_IMAKE= yes
USE_X_PREFIX= no
diff --git a/japanese/canna-server/pkg-comment b/japanese/canna-server/pkg-comment
deleted file mode 100644
index 1aa218a9dfa2..000000000000
--- a/japanese/canna-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kana-Kanji conversion system
diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile
index a4c092e93422..0204b6964942 100644
--- a/japanese/cdrom2/Makefile
+++ b/japanese/cdrom2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.nerimadors.or.jp/pub/src/cdrom2/
DISTNAME= euc
MAINTAINER= max@FreeBSD.org
+COMMENT= A tool to lookup CD-ROM dictionaries
WRKSRC= ${WRKDIR}/${PORTNAME}
DIST_SUBDIR= ${PORTNAME}
diff --git a/japanese/cdrom2/pkg-comment b/japanese/cdrom2/pkg-comment
deleted file mode 100644
index 2941f1269895..000000000000
--- a/japanese/cdrom2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to lookup CD-ROM dictionaries
diff --git a/japanese/csrd/Makefile b/japanese/csrd/Makefile
index 95f560336820..5f6d92cabd6e 100644
--- a/japanese/csrd/Makefile
+++ b/japanese/csrd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese
MASTER_SITES= http://openlab.ring.gr.jp/edict/csrd/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Utility for Shogakukan Random House English-Japanese Dictionary
MAKEFILE= makefile.unx
ALL_TARGET= csrd
diff --git a/japanese/csrd/pkg-comment b/japanese/csrd/pkg-comment
deleted file mode 100644
index 87e16518955b..000000000000
--- a/japanese/csrd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility for Shogakukan Random House English-Japanese Dictionary
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index 0deeb55d2829..8d92f32b5fb1 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Simple Kana to Kanji conversion program on Emacsen
BUILD_DEPENDS= ${LOCALBASE}/${EMACS_VERSION_SITE_LISPDIR}/emu/emu.el:${PORTSDIR}/editors/apel${DEPPORT_SUFFIX}
diff --git a/japanese/ddskk/pkg-comment b/japanese/ddskk/pkg-comment
deleted file mode 100644
index eb4088e8a365..000000000000
--- a/japanese/ddskk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple Kana to Kanji conversion program on Emacsen
diff --git a/japanese/devil-fpw/Makefile b/japanese/devil-fpw/Makefile
index fc2a0023702c..f10fe07d2db9 100644
--- a/japanese/devil-fpw/Makefile
+++ b/japanese/devil-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/devil/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Devil's dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/devil-fpw/pkg-comment b/japanese/devil-fpw/pkg-comment
deleted file mode 100644
index fb4634490233..000000000000
--- a/japanese/devil-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Devil's dictionary (EPWING V1 format)
diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile
index 2f05491b186c..c2b55cd56662 100644
--- a/japanese/diclookup-emacs20/Makefile
+++ b/japanese/diclookup-emacs20/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= diclookup-mule-${PORTVERSION}
MAINTAINER= mita@FreeBSD.org
+COMMENT= CDROM dictionary client for emacs. (needs ndtpd or dserver package)
RUN_DEPENDS= ${X11BASE}/share/doc/intlfonts-1.2/README:${PORTSDIR}/x11-fonts/intlfonts
diff --git a/japanese/diclookup-emacs20/pkg-comment b/japanese/diclookup-emacs20/pkg-comment
deleted file mode 100644
index a16bb6ae82b2..000000000000
--- a/japanese/diclookup-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDROM dictionary client for emacs. (needs ndtpd or dserver package)
diff --git a/japanese/diclookup-mule/Makefile b/japanese/diclookup-mule/Makefile
index 5dd675da7b87..5547ec9c02c3 100644
--- a/japanese/diclookup-mule/Makefile
+++ b/japanese/diclookup-mule/Makefile
@@ -14,6 +14,7 @@ PATCH_SITES= ${MASTER_SITES}
PATCHFILES= diclookup-mule-${PORTVERSION}-wave-patch.gz
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= CDROM dictionary client for mule
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/non-cjk/fonts.dir:${PORTSDIR}/x11-fonts/etlfonts
BUILD_DEPENDS= mule:${PORTSDIR}/japanese/mule-freewnn
diff --git a/japanese/diclookup-mule/pkg-comment b/japanese/diclookup-mule/pkg-comment
deleted file mode 100644
index 83867e080821..000000000000
--- a/japanese/diclookup-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDROM dictionary client for mule
diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile
index a22b7db5b8b0..feebad907fab 100644
--- a/japanese/dserver/Makefile
+++ b/japanese/dserver/Makefile
@@ -20,6 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTFILES:Nkenjiro-*}
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= CDROM dictionary server & clients
RUN_DEPENDS= jless:${PORTSDIR}/japanese/less
diff --git a/japanese/dserver/pkg-comment b/japanese/dserver/pkg-comment
deleted file mode 100644
index 4e26e2599c4b..000000000000
--- a/japanese/dserver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDROM dictionary server & clients
diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile
index 9feaecb8b39b..72bbc0180eaa 100644
--- a/japanese/dvi2ps/Makefile
+++ b/japanese/dvi2ps/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.math.s.chiba-u.ac.jp/tex/
DISTNAME= ${PORTNAME}-${PORTVERSION}j
MAINTAINER= mita@FreeBSD.org
+COMMENT= DVI to PostScript converter Japanese version
BUILD_DEPENDS= ${PREFIX}/lib/libkpathsea.a:${PORTSDIR}/japanese/ptex-common
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
diff --git a/japanese/dvi2ps/pkg-comment b/japanese/dvi2ps/pkg-comment
deleted file mode 100644
index 1cfa82b170f1..000000000000
--- a/japanese/dvi2ps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DVI to PostScript converter Japanese version
diff --git a/japanese/dvi2tty/Makefile b/japanese/dvi2tty/Makefile
index a4916a2dfa95..7d3c843f16f6 100644
--- a/japanese/dvi2tty/Makefile
+++ b/japanese/dvi2tty/Makefile
@@ -16,6 +16,7 @@ PATCHFILES= ${PORTNAME}-jtex-patch \
dvi2tty.c-patch
MAINTAINER= max@FreeBSD.org
+COMMENT= Character-based DVI file previewer
RUN_DEPENDS= jless:${PORTSDIR}/japanese/less
diff --git a/japanese/dvi2tty/pkg-comment b/japanese/dvi2tty/pkg-comment
deleted file mode 100644
index 0a019f4460e0..000000000000
--- a/japanese/dvi2tty/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Character-based DVI file previewer
diff --git a/japanese/easypr/Makefile b/japanese/easypr/Makefile
index 448d4dbea3c6..ebbc6cef937f 100644
--- a/japanese/easypr/Makefile
+++ b/japanese/easypr/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.linet.gr.jp/~mituiwa/
DISTNAME= print-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A control panel for printers (with Japanese messages)
RUN_DEPENDS= e2ps:${PORTSDIR}/japanese/e2ps \
wish8.0jp:${PORTSDIR}/japanese/tk80 \
diff --git a/japanese/easypr/pkg-comment b/japanese/easypr/pkg-comment
deleted file mode 100644
index 8b15edefbc88..000000000000
--- a/japanese/easypr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A control panel for printers (with Japanese messages)
diff --git a/japanese/ebd-fpw/Makefile b/japanese/ebd-fpw/Makefile
index f6957a07acd2..dc138b66919a 100644
--- a/japanese/ebd-fpw/Makefile
+++ b/japanese/ebd-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/ebd/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Easton's 1897 Bible Dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/ebd-fpw/pkg-comment b/japanese/ebd-fpw/pkg-comment
deleted file mode 100644
index 8b21fd56bf13..000000000000
--- a/japanese/ebd-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easton's 1897 Bible Dictionary (EPWING V1 format)
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index 08c9ac173c63..f7123fbeacbd 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/eblook/dist/
DIST_SUBDIR= eb
MAINTAINER= shige@FreeBSD.org
+COMMENT= Interactive EB interface command for seraching words in electoric dictionaries
DOCDIR= share/doc/eblook
diff --git a/japanese/eblook/pkg-comment b/japanese/eblook/pkg-comment
deleted file mode 100644
index 1cd9756ad0f7..000000000000
--- a/japanese/eblook/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Interactive EB interface command for seraching words in electoric dictionaries
diff --git a/japanese/edict-fpw/Makefile b/japanese/edict-fpw/Makefile
index 5487bfc6a8e8..7745477dba86 100644
--- a/japanese/edict-fpw/Makefile
+++ b/japanese/edict-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/edict/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A Japanese <-> English Dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/edict-fpw/pkg-comment b/japanese/edict-fpw/pkg-comment
deleted file mode 100644
index 0c8eda6c8abc..000000000000
--- a/japanese/edict-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese <-> English Dictionary (EPWING V1 format)
diff --git a/japanese/edict-sdic/Makefile b/japanese/edict-sdic/Makefile
index aed688fdb1a4..598a2c08f8e1 100644
--- a/japanese/edict-sdic/Makefile
+++ b/japanese/edict-sdic/Makefile
@@ -20,6 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Japanese <-> English Dictionary (SDIC format)
ALL_TARGET= jedict.sdic eedict.sdic
GNU_CONFIGURE= yes
diff --git a/japanese/edict-sdic/pkg-comment b/japanese/edict-sdic/pkg-comment
deleted file mode 100644
index 826f88b5e618..000000000000
--- a/japanese/edict-sdic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese <-> English Dictionary (SDIC format)
diff --git a/japanese/ee/Makefile b/japanese/ee/Makefile
index 80351f4bec11..9a0c8640e45e 100644
--- a/japanese/ee/Makefile
+++ b/japanese/ee/Makefile
@@ -16,6 +16,7 @@ DISTFILES= ${PORTNAME}.tar.gz \
EXTRACT_ONLY= ee-3.0.tar.gz
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A simple, easy to use Japanese terminal-based screen editor
BROKEN= "Does not compile"
diff --git a/japanese/ee/pkg-comment b/japanese/ee/pkg-comment
deleted file mode 100644
index 5121d6046f8b..000000000000
--- a/japanese/ee/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple, easy to use Japanese terminal-based screen editor
diff --git a/japanese/eijiro-fpw/Makefile b/japanese/eijiro-fpw/Makefile
index 37f5222f87ca..c9dbf5fcc92a 100644
--- a/japanese/eijiro-fpw/Makefile
+++ b/japanese/eijiro-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/
DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= taoka@FreeBSD.org
+COMMENT= EIJIRO English - Japanese Dictionary (EPWING V1 format)
BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
diff --git a/japanese/eijiro-fpw/pkg-comment b/japanese/eijiro-fpw/pkg-comment
deleted file mode 100644
index 56800d954391..000000000000
--- a/japanese/eijiro-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-EIJIRO English - Japanese Dictionary (EPWING V1 format)
diff --git a/japanese/elisp-manual/Makefile b/japanese/elisp-manual/Makefile
index 207d1f9a2dbb..db023140bd76 100644
--- a/japanese/elisp-manual/Makefile
+++ b/japanese/elisp-manual/Makefile
@@ -17,6 +17,7 @@ PATCHFILES= elisp-manual-20-2.5-jp.ERRATA.000422.jis \
elisp-manual-20-2.5-jp.ERRATA.000508.jis
MAINTAINER= okazaki@FreeBSD.org
+COMMENT= Japanese translation of the GNU Emacs Lisp Reference Manual
EMACS_PORT_NAME= emacs20
EMACS_NO_RUN_DEPENDS= YES
diff --git a/japanese/elisp-manual/pkg-comment b/japanese/elisp-manual/pkg-comment
deleted file mode 100644
index 91d26b3695ca..000000000000
--- a/japanese/elisp-manual/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese translation of the GNU Emacs Lisp Reference Manual
diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index a19f3e49fbf5..dee156b1a398 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -15,6 +15,7 @@ DISTNAME= emacs-20.6-man-jp
DISTFILES= ${DISTNAME}.tgz ${EMACS_ARC}
MAINTAINER= okazaki@FreeBSD.org
+COMMENT= Japanese translation of the GNU Emacs Manual
EMACS_PORT_NAME= emacs20
EMACS_NO_RUN_DEPENDS= YES
diff --git a/japanese/emacs-manual/pkg-comment b/japanese/emacs-manual/pkg-comment
deleted file mode 100644
index 9ab7922d4672..000000000000
--- a/japanese/emacs-manual/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese translation of the GNU Emacs Manual
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index b797c9ada688..d0152e1f2936 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/dynamic-loading/emacs-canna/ \
DISTNAME= emacs-canna-${PORTVERSION}
MAINTAINER= shige@FreeBSD.org
+COMMENT= Dynamic loading module input method `Canna' on Emacs
LIB_DEPENDS= canna.1:${PORTSDIR}/japanese/Canna
# Building this port requires emacs-dl source tree: ${EMACSDL_DIR}:configure
diff --git a/japanese/emacs20-dl-canna/pkg-comment b/japanese/emacs20-dl-canna/pkg-comment
deleted file mode 100644
index c4c8ba84fb41..000000000000
--- a/japanese/emacs20-dl-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dynamic loading module input method `Canna' on Emacs
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index a2e6359b5913..51514ee4d683 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://tokuda-www.cs.titech.ac.jp/~katsuya/emacs/
DISTNAME= dl-wnn-${PORTVERSION}
MAINTAINER= shige@FreeBSD.org
+COMMENT= Dynamic loading module input method `Wnn' on Emacs
LIB_DEPENDS= wnn6.2:${.CURDIR}/../../japanese/Wnn6-lib
BUILD_DEPENDS= emacs-dl-${EMACS_VER}:${EMACSDL_DIR} \
diff --git a/japanese/emacs20-dl-wnn6/pkg-comment b/japanese/emacs20-dl-wnn6/pkg-comment
deleted file mode 100644
index a20a04018511..000000000000
--- a/japanese/emacs20-dl-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dynamic loading module input method `Wnn' on Emacs
diff --git a/japanese/escpf/Makefile b/japanese/escpf/Makefile
index 2b2a0275756a..3956aac6edea 100644
--- a/japanese/escpf/Makefile
+++ b/japanese/escpf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese print
MASTER_SITES= http://www.flatout.org/~wing/Linux/Escpf/
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= Text filters for ESC/P, ESC/Page and ESC/PS printers
DOCDIR= ${PREFIX}/share/doc/escpf
LINES?= 66
diff --git a/japanese/escpf/pkg-comment b/japanese/escpf/pkg-comment
deleted file mode 100644
index 6cac756891bc..000000000000
--- a/japanese/escpf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text filters for ESC/P, ESC/Page and ESC/PS printers
diff --git a/japanese/flower-fpw/Makefile b/japanese/flower-fpw/Makefile
index 6eee466bf946..bec1d627ee42 100644
--- a/japanese/flower-fpw/Makefile
+++ b/japanese/flower-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/Flower/
DISTNAME= Flower-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A dictionary for flowers (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/flower-fpw/pkg-comment b/japanese/flower-fpw/pkg-comment
deleted file mode 100644
index e8afe7893077..000000000000
--- a/japanese/flower-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dictionary for flowers (EPWING V1 format)
diff --git a/japanese/foldoc-fpw/Makefile b/japanese/foldoc-fpw/Makefile
index d58dbe7ab93d..70e9be88f911 100644
--- a/japanese/foldoc-fpw/Makefile
+++ b/japanese/foldoc-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/foldoc/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= The Free On-line Dictionary of Computing (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/foldoc-fpw/pkg-comment b/japanese/foldoc-fpw/pkg-comment
deleted file mode 100644
index 0d75a1353a40..000000000000
--- a/japanese/foldoc-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Free On-line Dictionary of Computing (EPWING V1 format)
diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile
index 43ec4f4c9c4f..9e9f1eb33aab 100644
--- a/japanese/font-shinonome/Makefile
+++ b/japanese/font-shinonome/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/shinonome/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Japanese 12,14,16 dot fonts
USE_BZIP2= yes
HAS_CONFIGURE= yes
diff --git a/japanese/font-shinonome/pkg-comment b/japanese/font-shinonome/pkg-comment
deleted file mode 100644
index 9e225c566b83..000000000000
--- a/japanese/font-shinonome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese 12,14,16 dot fonts
diff --git a/japanese/freepwing/Makefile b/japanese/freepwing/Makefile
index 03b077f319ec..f6de25bf9468 100644
--- a/japanese/freepwing/Makefile
+++ b/japanese/freepwing/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.sra.co.jp/pub/misc/freepwing/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Free JIS X 4081 (subset of EPWING V1) Formatter
RUN_DEPENDS= gmake:${PORTSDIR}/devel/gmake
diff --git a/japanese/freepwing/pkg-comment b/japanese/freepwing/pkg-comment
deleted file mode 100644
index bbe40805ec9f..000000000000
--- a/japanese/freepwing/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free JIS X 4081 (subset of EPWING V1) Formatter
diff --git a/japanese/fumeikai-fpw/Makefile b/japanese/fumeikai-fpw/Makefile
index 36bb475eab9b..a65a7c5ecba4 100644
--- a/japanese/fumeikai-fpw/Makefile
+++ b/japanese/fumeikai-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/Fumeikai/
DISTNAME= Fumeikai-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= An abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/fumeikai-fpw/pkg-comment b/japanese/fumeikai-fpw/pkg-comment
deleted file mode 100644
index e5d2b14babc0..000000000000
--- a/japanese/fumeikai-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format)
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index d5b8ca4c4311..fba3f5e293f0 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${DISTNAME}ja.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= flathill@FreeBSD.org
+COMMENT= GTK based ICQ program
LIB_DEPENDS= icq.0:${PORTSDIR}/japanese/libicq
diff --git a/japanese/gicq/pkg-comment b/japanese/gicq/pkg-comment
deleted file mode 100644
index 45c82b168069..000000000000
--- a/japanese/gicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK based ICQ program
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index 19e8d528d485..743b8d46f68b 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${DISTNAME}-jgroff-0.0.2.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= okazaki@FreeBSD.org
+COMMENT= Japanese enhancement of GNU xditview
RUN_DEPENDS= ${LOCALBASE}/bin/groff:${PORTSDIR}/japanese/groff
diff --git a/japanese/gxditview/pkg-comment b/japanese/gxditview/pkg-comment
deleted file mode 100644
index 91a5339e46c8..000000000000
--- a/japanese/gxditview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese enhancement of GNU xditview
diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile
index 9ddffd9ea014..b7ee0956a4c4 100644
--- a/japanese/ical/Makefile
+++ b/japanese/ical/Makefile
@@ -20,6 +20,7 @@ PATCHFILES= ical-2.2-jp1.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= tmutoh@mx10.freecom.ne.jp
+COMMENT= A calendar application (Japanese)
LIB_DEPENDS= tk80jp:${PORTSDIR}/japanese/tk80
diff --git a/japanese/ircII/Makefile b/japanese/ircII/Makefile
index bbe4acaaa1b7..02463d100df1 100644
--- a/japanese/ircII/Makefile
+++ b/japanese/ircII/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${DISTNAME}-jp.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= max@FreeBSD.org
+COMMENT= The 'Internet Relay Chat' Client
GNU_CONFIGURE= yes
MAN1= irc.1
diff --git a/japanese/ircII/pkg-comment b/japanese/ircII/pkg-comment
deleted file mode 100644
index d419a164e104..000000000000
--- a/japanese/ircII/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The 'Internet Relay Chat' Client
diff --git a/japanese/japaneseAFM/Makefile b/japanese/japaneseAFM/Makefile
index 07659b2dc256..7d4b49689edf 100644
--- a/japanese/japaneseAFM/Makefile
+++ b/japanese/japaneseAFM/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/
DISTNAME= ${PORTNAME}
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT= Japanese AFM fonts
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/japanese/japaneseAFM/pkg-comment b/japanese/japaneseAFM/pkg-comment
deleted file mode 100644
index 0cf45a31c6e1..000000000000
--- a/japanese/japaneseAFM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese AFM fonts
diff --git a/japanese/jargon-fpw/Makefile b/japanese/jargon-fpw/Makefile
index 74aad3ff78b6..f7f36aec6da1 100644
--- a/japanese/jargon-fpw/Makefile
+++ b/japanese/jargon-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/jargon/
DISTNAME= jarg-fpw${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= The famous jargon file (EPWING V1 format)
USE_ZIP= yes
diff --git a/japanese/jargon-fpw/pkg-comment b/japanese/jargon-fpw/pkg-comment
deleted file mode 100644
index 7cda9c0a9bf3..000000000000
--- a/japanese/jargon-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The famous jargon file (EPWING V1 format)
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index 369facf02469..9fa50b73f21a 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://srekcah.org/jcode/
EXTRACT_SUFX= # none
MAINTAINER= sada@FreeBSD.org
+COMMENT= Perl library for Japanese character code conversion
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/japanese/jcode.pl/pkg-comment b/japanese/jcode.pl/pkg-comment
deleted file mode 100644
index c76600868bfd..000000000000
--- a/japanese/jcode.pl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl library for Japanese character code conversion
diff --git a/japanese/jhd/Makefile b/japanese/jhd/Makefile
index 4e7e39800e7f..244b61aed56b 100644
--- a/japanese/jhd/Makefile
+++ b/japanese/jhd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese
MASTER_SITES= ftp://ftp.iamas.ac.jp/UNIX/File/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Japanese Hexdecimal Dump
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
diff --git a/japanese/jhd/pkg-comment b/japanese/jhd/pkg-comment
deleted file mode 100644
index dbc38ca6939c..000000000000
--- a/japanese/jhd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese Hexdecimal Dump
diff --git a/japanese/jisx0213-fonts/Makefile b/japanese/jisx0213-fonts/Makefile
index 32de430a6a67..93bbf766e562 100644
--- a/japanese/jisx0213-fonts/Makefile
+++ b/japanese/jisx0213-fonts/Makefile
@@ -16,6 +16,7 @@ DISTFILES= jiskan16-2000-1.bdf.gz jiskan16-2000-2.bdf.gz \
jiskan24-2000-1.bdf.gz:yagi jiskan24-2000-2.bdf.gz:yagi
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Japanese jisx0213 fonts
BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \
mkitalic:${PORTSDIR}/x11-fonts/mkitalic
diff --git a/japanese/jisx0213-fonts/pkg-comment b/japanese/jisx0213-fonts/pkg-comment
deleted file mode 100644
index f6819c5e983d..000000000000
--- a/japanese/jisx0213-fonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese jisx0213 fonts
diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile
index 24bd3f5a5460..8a41071e56e1 100644
--- a/japanese/jls/Makefile
+++ b/japanese/jls/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= shige
DISTNAME= j${PORTNAME}-${PORTVERSION}
MAINTAINER= shige@FreeBSD.org
+COMMENT= Japanized ls
MAN1= jls.1
MANCOMPRESSED= yes
diff --git a/japanese/jls/pkg-comment b/japanese/jls/pkg-comment
deleted file mode 100644
index 0511cfcc07e7..000000000000
--- a/japanese/jls/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized ls
diff --git a/japanese/jmode/Makefile b/japanese/jmode/Makefile
index 6211631eb9c3..eb67444b7c4e 100644
--- a/japanese/jmode/Makefile
+++ b/japanese/jmode/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese
MASTER_SITES= http://www.kmc.gr.jp/proj/heke/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= XIM server for Anthy input method
BUILD_DEPENDS= ${LOCALBASE}/include/anthy.h:${PORTSDIR}/japanese/anthy
diff --git a/japanese/jmode/pkg-comment b/japanese/jmode/pkg-comment
deleted file mode 100644
index 2783a0399ad3..000000000000
--- a/japanese/jmode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XIM server for Anthy input method
diff --git a/japanese/jyuroku/Makefile b/japanese/jyuroku/Makefile
index f30e61ac20ce..f1cc21ec9a12 100644
--- a/japanese/jyuroku/Makefile
+++ b/japanese/jyuroku/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Japanese address book
ALL_TARGET=
USE_X_PREFIX= yes
diff --git a/japanese/jyuroku/pkg-comment b/japanese/jyuroku/pkg-comment
deleted file mode 100644
index 83ea3168ce20..000000000000
--- a/japanese/jyuroku/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese address book
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index eaa426bb1d80..975d78148620 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
knm_new_linux.tar.gz
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= X11 12-dot kanji font
USE_X_PREFIX= yes
diff --git a/japanese/k12/pkg-comment b/japanese/k12/pkg-comment
deleted file mode 100644
index 4d2dbfd81b9f..000000000000
--- a/japanese/k12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 12-dot kanji font
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index cc9b86860ab9..39f5ff10befb 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese
MASTER_SITES= ftp://kakasi.namazu.org/pub/kakasi/stable/
MAINTAINER= max@FreeBSD.org
+COMMENT= Kanji-Kana Simple Inverter, language filter for Japanese
GNU_CONFIGURE= yes
diff --git a/japanese/kakasi/pkg-comment b/japanese/kakasi/pkg-comment
deleted file mode 100644
index 5f2cc7b10a81..000000000000
--- a/japanese/kakasi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kanji-Kana Simple Inverter, language filter for Japanese
diff --git a/japanese/kbanner/Makefile b/japanese/kbanner/Makefile
index e9099357b7a1..0d688fe804bd 100644
--- a/japanese/kbanner/Makefile
+++ b/japanese/kbanner/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.sra.co.jp/pub/news/fj.sources/V24/
DISTFILES= 2426.gz 2427.gz 2428.gz 2429.gz 2430.gz 2431.gz
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Displays large japanese letters on the standard output
DIST_SUBDIR= kbanner
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION}
diff --git a/japanese/kbanner/pkg-comment b/japanese/kbanner/pkg-comment
deleted file mode 100644
index c0344951626f..000000000000
--- a/japanese/kbanner/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Displays large japanese letters on the standard output
diff --git a/japanese/kcc/Makefile b/japanese/kcc/Makefile
index 9bfde34dc436..28a51a864a77 100644
--- a/japanese/kcc/Makefile
+++ b/japanese/kcc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PORTS_JP}
DISTNAME= ${PORTNAME}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Kanji code conversion Filter
INSTALL_TARGET= install install.man
MANLANG= ja
diff --git a/japanese/kcc/pkg-comment b/japanese/kcc/pkg-comment
deleted file mode 100644
index efd7f1c0a0ad..000000000000
--- a/japanese/kcc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kanji code conversion Filter
diff --git a/japanese/kde3-i18n/Makefile b/japanese/kde3-i18n/Makefile
index 0aaacd0c932b..db0199067764 100644
--- a/japanese/kde3-i18n/Makefile
+++ b/japanese/kde3-i18n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ja-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/japanese/kde3-i18n/pkg-comment b/japanese/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/japanese/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/japanese/kde4-l10n/Makefile b/japanese/kde4-l10n/Makefile
index 0aaacd0c932b..db0199067764 100644
--- a/japanese/kde4-l10n/Makefile
+++ b/japanese/kde4-l10n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ja-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/japanese/kde4-l10n/pkg-comment b/japanese/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/japanese/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 701aca1f6fbc..3a9700396c4a 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -20,6 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
jiskan16.bdf 8x16rk.bdf
MAINTAINER= shige@FreeBSD.org
+COMMENT= Kanji On Console -- Display kanji characters on your own console
ONLY_FOR_ARCHS= i386
diff --git a/japanese/kon2-16dot/pkg-comment b/japanese/kon2-16dot/pkg-comment
deleted file mode 100644
index 58e556871c6f..000000000000
--- a/japanese/kon2-16dot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Kanji On Console -- Display kanji characters on your own console
diff --git a/japanese/kpcal/Makefile b/japanese/kpcal/Makefile
index b3389bcad19e..ea85dbf40804 100644
--- a/japanese/kpcal/Makefile
+++ b/japanese/kpcal/Makefile
@@ -18,6 +18,7 @@ PATCHFILES= ${PORTNAME}-${PORTVERSION}-HappyMonday2003.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Make Calendar in Postscript format
USE_REINPLACE= yes
ALL_TARGET= kpcal
diff --git a/japanese/kpcal/pkg-comment b/japanese/kpcal/pkg-comment
deleted file mode 100644
index ad48c3f6c10b..000000000000
--- a/japanese/kpcal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Make Calendar in Postscript format
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 905e0f1408cb..91b97cc4e35a 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
README.wallpaper.ja
MAINTAINER= shige@FreeBSD.org
+COMMENT= An xterm that speaks Japanese
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
diff --git a/japanese/kterm/pkg-comment b/japanese/kterm/pkg-comment
deleted file mode 100644
index 0f44662dbffa..000000000000
--- a/japanese/kterm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xterm that speaks Japanese
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index dfebfaca9748..0b2786e58f90 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MASTER_SITE_SUBDIR= applications
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= An xterm that speaks Japanese with 16 colors like on a VGA
BUILD_DEPENDS= nkf:${PORTSDIR}/japanese/nkf
diff --git a/japanese/kterm16c/pkg-comment b/japanese/kterm16c/pkg-comment
deleted file mode 100644
index e95d94235f31..000000000000
--- a/japanese/kterm16c/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xterm that speaks Japanese with 16 colors like on a VGA
diff --git a/japanese/lambdamoo/Makefile b/japanese/lambdamoo/Makefile
index ea05308ad618..716aaf9fc41a 100644
--- a/japanese/lambdamoo/Makefile
+++ b/japanese/lambdamoo/Makefile
@@ -19,6 +19,7 @@ PATCH_SITE_SUBDIR= flathill
PATCHFILES= ja-lambdamoo-19990704.patch.gz
MAINTAINER= flathill@FreeBSD.ORG
+COMMENT= The most commonly used program to run MOOs
WRKSRC= ${WRKDIR}/MOO-${PORTVERSION}
GNU_CONFIGURE= yes
diff --git a/japanese/lambdamoo/pkg-comment b/japanese/lambdamoo/pkg-comment
deleted file mode 100644
index b92f57179e88..000000000000
--- a/japanese/lambdamoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The most commonly used program to run MOOs
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 62c9e5770c62..6a56269e503e 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -19,6 +19,7 @@ PATCHFILES= ${DISTNAME}ja.patch
PATCH_DIST_STRIP= -p1
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Library to add ICQ communication support to your software
USE_GNOMENG= yes
USE_GNOME= glib12
diff --git a/japanese/libicq/pkg-comment b/japanese/libicq/pkg-comment
deleted file mode 100644
index 0a6c793f6854..000000000000
--- a/japanese/libicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library to add ICQ communication support to your software
diff --git a/japanese/libimg/Makefile b/japanese/libimg/Makefile
index 6dfbebfbe07b..401cf6d4b33e 100644
--- a/japanese/libimg/Makefile
+++ b/japanese/libimg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2
DISTNAME= img${PORTVERSION}
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Enhanced Tk, adding support for many other Image formats:BMP,XBM,XPM,...
BUILD_DEPENDS= ${PREFIX}/lib/tcl8.0jp/tclIndex:${PORTSDIR}/japanese/tcl80 \
${PREFIX}/lib/tk8.0jp/tk.tcl:${PORTSDIR}/japanese/tk80
diff --git a/japanese/libimg/pkg-comment b/japanese/libimg/pkg-comment
deleted file mode 100644
index d8ff764c8c24..000000000000
--- a/japanese/libimg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Enhanced Tk, adding support for many other Image formats:BMP,XBM,XPM,...
diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile
index 96dc8ed6c472..01d90cc90fac 100644
--- a/japanese/linux-JM/Makefile
+++ b/japanese/linux-JM/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.linux.or.jp/JM/per-pkg/
DISTFILES= ${DISTFILES_GNU} ${DISTFILES_OTHERS}
MAINTAINER= sada@FreeBSD.org
+COMMENT= Japanese translated man pages by JM Project
DIST_SUBDIR= ${PORTNAME}
MANSECS= 1 3 4 5 8
diff --git a/japanese/linux-JM/pkg-comment b/japanese/linux-JM/pkg-comment
deleted file mode 100644
index 2878fc7876d0..000000000000
--- a/japanese/linux-JM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese translated man pages by JM Project
diff --git a/japanese/lipsf/Makefile b/japanese/lipsf/Makefile
index 18c007202ffc..8d123790a9e2 100644
--- a/japanese/lipsf/Makefile
+++ b/japanese/lipsf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://hp.vector.co.jp/authors/VA012337/soft/lipsf/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= Text to LIPS filter
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//}
diff --git a/japanese/lipsf/pkg-comment b/japanese/lipsf/pkg-comment
deleted file mode 100644
index 305f03f6974d..000000000000
--- a/japanese/lipsf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text to LIPS filter
diff --git a/japanese/lsd-fpw/Makefile b/japanese/lsd-fpw/Makefile
index ee1be8064bfd..ae55049addd7 100644
--- a/japanese/lsd-fpw/Makefile
+++ b/japanese/lsd-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/lsd/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A Japanese - English Dictionary for Life Science (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/lsd-fpw/pkg-comment b/japanese/lsd-fpw/pkg-comment
deleted file mode 100644
index d3b19669ac3a..000000000000
--- a/japanese/lsd-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Japanese - English Dictionary for Life Science (EPWING V1 format)
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index aac21e8390d7..67070d413bdd 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -16,6 +16,7 @@ DISTNAME= ${PORTNAME}${VERSION}${MINOR_VERSION}
MAINTAINER= shige@FreeBSD.org
+COMMENT= A terminal-based World-Wide Web Client with multi-byte modification
WRKSRC= ${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
diff --git a/japanese/lynx-current/pkg-comment b/japanese/lynx-current/pkg-comment
deleted file mode 100644
index 2248c7b27895..000000000000
--- a/japanese/lynx-current/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A terminal-based World-Wide Web Client with multi-byte modification
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index a881138387c9..c9cfdf1f8ab4 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -17,6 +17,7 @@ PATCHFILES= ${PORTNAME}${VERSION}${MINOR_VERSION}a.patch.gz \
PATCH_SITES= http://lynx.isc.org/current/
MAINTAINER= shige@FreeBSD.org
+COMMENT= A terminal-based World-Wide Web Client with multi-byte modification
WRKSRC= ${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
diff --git a/japanese/lynx/pkg-comment b/japanese/lynx/pkg-comment
deleted file mode 100644
index 2248c7b27895..000000000000
--- a/japanese/lynx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A terminal-based World-Wide Web Client with multi-byte modification
diff --git a/japanese/lyx-doc/Makefile b/japanese/lyx-doc/Makefile
index 329ecb820f0e..b2ae6622d7a6 100644
--- a/japanese/lyx-doc/Makefile
+++ b/japanese/lyx-doc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.hiei.kit.ac.jp/~hitomi/lyx/
DISTNAME= ja_LyX_Doc.${PORTVERSION}
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Japanese Lyx documents translated from original ones
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/japanese/lyx-doc/pkg-comment b/japanese/lyx-doc/pkg-comment
deleted file mode 100644
index a4478956aadd..000000000000
--- a/japanese/lyx-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese Lyx documents translated from original ones
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile
index 731dbfc4a158..58e9e9732e3e 100644
--- a/japanese/lyx/Makefile
+++ b/japanese/lyx/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${PORTNAME}-jp-kit0.10b4for${PORTVERSION}.tar.gz
MAINTAINER= flathill@FreeBSD.ORG
+COMMENT= Document processor interfaced with LaTeX (nearly WYSIWYG)
#RUN_DEPENDS= platex:${PORTSDIR}/japanese/platex-euc
#.if defined(WITH_ISPELL)
diff --git a/japanese/lyx/pkg-comment b/japanese/lyx/pkg-comment
deleted file mode 100644
index 2af405a8f9ea..000000000000
--- a/japanese/lyx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Document processor interfaced with LaTeX (nearly WYSIWYG)
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 164b8d956120..71e343c1d4ae 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese
DISTFILES= # none
MAINTAINER= horikawa@FreeBSD.org
+COMMENT= Japanese online manual pages corresponding to /usr/share/man/man*
PREFIX?= /usr
NO_CHECKSUM= yes
diff --git a/japanese/man-doc/pkg-comment b/japanese/man-doc/pkg-comment
deleted file mode 100644
index 066e606e58a8..000000000000
--- a/japanese/man-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese online manual pages corresponding to /usr/share/man/man*
diff --git a/japanese/marumoji-fonts/Makefile b/japanese/marumoji-fonts/Makefile
index 653308d6abfb..39979c0d8928 100644
--- a/japanese/marumoji-fonts/Makefile
+++ b/japanese/marumoji-fonts/Makefile
@@ -21,6 +21,7 @@ DISTFILES= maru14.bdf.v13.gz maru18.bdf.v10.gz \
DIST_SUBDIR= ${PORTNAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Japanese marumoji fonts
BUILD_DEPENDS= mkbold:${PORTSDIR}/x11-fonts/mkbold \
mkitalic:${PORTSDIR}/x11-fonts/mkitalic
diff --git a/japanese/marumoji-fonts/pkg-comment b/japanese/marumoji-fonts/pkg-comment
deleted file mode 100644
index 9010eb6413ad..000000000000
--- a/japanese/marumoji-fonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese marumoji fonts
diff --git a/japanese/mikachan-ttfonts/Makefile b/japanese/mikachan-ttfonts/Makefile
index 513088539229..bb1733e985d4 100644
--- a/japanese/mikachan-ttfonts/Makefile
+++ b/japanese/mikachan-ttfonts/Makefile
@@ -16,6 +16,7 @@ DISTNAME= ver${PORTVERSION}
EXTRACT_SUFX= .lzh
MAINTAINER= sada@FreeBSD.org
+COMMENT= Handwritten Japanese TrueType fonts by Mika-chan
BUILD_DEPENDS= lha:${PORTSDIR}/archivers/lha
diff --git a/japanese/mikachan-ttfonts/pkg-comment b/japanese/mikachan-ttfonts/pkg-comment
deleted file mode 100644
index 236be37fa69d..000000000000
--- a/japanese/mikachan-ttfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Handwritten Japanese TrueType fonts by Mika-chan
diff --git a/japanese/mimekit/Makefile b/japanese/mimekit/Makefile
index 47a4d907d3c4..1271847e5c60 100644
--- a/japanese/mimekit/Makefile
+++ b/japanese/mimekit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.etl.go.jp/pub/DeleGate/
DISTNAME= delegate6.1.19
MAINTAINER= max@FreeBSD.org
+COMMENT= Library to handle messages with MIME-encoded headers
WRKSRC= ${WRKDIR}/${DISTNAME}/mimekit
diff --git a/japanese/mimekit/pkg-comment b/japanese/mimekit/pkg-comment
deleted file mode 100644
index 60d6b8087086..000000000000
--- a/japanese/mimekit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library to handle messages with MIME-encoded headers
diff --git a/japanese/mypaedia-fpw-package/Makefile b/japanese/mypaedia-fpw-package/Makefile
index aaf900367c73..9bd52535a089 100644
--- a/japanese/mypaedia-fpw-package/Makefile
+++ b/japanese/mypaedia-fpw-package/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese elisp
MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A supplement file to use "mypaedia" on lookup
RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \
timidity:${PORTSDIR}/audio/timidity++ \
diff --git a/japanese/mypaedia-fpw-package/pkg-comment b/japanese/mypaedia-fpw-package/pkg-comment
deleted file mode 100644
index 1cf0fe429fab..000000000000
--- a/japanese/mypaedia-fpw-package/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A supplement file to use "mypaedia" on lookup
diff --git a/japanese/mypaedia-fpw/Makefile b/japanese/mypaedia-fpw/Makefile
index 5d6b8a087690..83fef296b7bc 100644
--- a/japanese/mypaedia-fpw/Makefile
+++ b/japanese/mypaedia-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/mypaedia/
DISTNAME= mypaedia-fpw${PORTVERSION}-src
MAINTAINER= taoka@FreeBSD.org
+COMMENT= An encyclopedia "Mypaedia" (EPWING V1 format)
BUILD_DEPENDS= fpwmake:${PORTSDIR}/japanese/freepwing \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
diff --git a/japanese/mypaedia-fpw/pkg-comment b/japanese/mypaedia-fpw/pkg-comment
deleted file mode 100644
index 6a479682f941..000000000000
--- a/japanese/mypaedia-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An encyclopedia "Mypaedia" (EPWING V1 format)
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index b84ce9909512..b40965675865 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.namazu.org/stable/ \
MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Search engine software intended for easy use
BUILD_DEPENDS= kakasi:${PORTSDIR}/japanese/kakasi \
nkf:${PORTSDIR}/japanese/nkf
diff --git a/japanese/namazu/pkg-comment b/japanese/namazu/pkg-comment
deleted file mode 100644
index 3fac7a7b4beb..000000000000
--- a/japanese/namazu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search engine software intended for easy use
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index 36eead4268ef..20892f52f4d7 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -16,6 +16,7 @@ PATCH_SITES= ftp://mitsuko.jaist.ac.jp/pub/nethack/
PATCHFILES= j${PORTNAME}-${PORTVERSION}.gz
MAINTAINER= max@FreeBSD.org
+COMMENT= A dungeon explorin', slashin', hackin' game
NO_LATEST_LINK= yes
diff --git a/japanese/nethack32/pkg-comment b/japanese/nethack32/pkg-comment
deleted file mode 100644
index 70ca7a893988..000000000000
--- a/japanese/nethack32/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dungeon explorin', slashin', hackin' game
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 50b6a5b15bf8..292cf2a0d73b 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES?= ${MASTER_SITE_PORTS_JP} \
DISTNAME= communicator-ja-euc-v475-export.generic-generic-generic
MAINTAINER?= sada@FreeBSD.org
+COMMENT= Netscape web-surfboard with Japanese resources
# ?= for ports that include this Makefile
RUN_DEPENDS?= ${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME}
diff --git a/japanese/netscape48-communicator/pkg-comment b/japanese/netscape48-communicator/pkg-comment
deleted file mode 100644
index 835ee9f82b9f..000000000000
--- a/japanese/netscape48-communicator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape web-surfboard with Japanese resources
diff --git a/japanese/newosaka/Makefile b/japanese/newosaka/Makefile
index dfb9eff5e351..5d62ae8757cb 100644
--- a/japanese/newosaka/Makefile
+++ b/japanese/newosaka/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PORTS_JP}
DISTFILES= new-osaka.tar.gz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Translator of Japanese EUC documents into Osaka language
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/japanese/newosaka/pkg-comment b/japanese/newosaka/pkg-comment
deleted file mode 100644
index 6b8a76cb07f1..000000000000
--- a/japanese/newosaka/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translator of Japanese EUC documents into Osaka language
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 3a2cce3ae198..9804911ab969 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www01.tcp-ip.or.jp/~furukawa/nkf_utf8/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//:S/./-/}
MAINTAINER= max@FreeBSD.org
+COMMENT= Network Kanji code conversion Filter
MAN1= nkf.1
MANLANG= "" ja
diff --git a/japanese/nkf/pkg-comment b/japanese/nkf/pkg-comment
deleted file mode 100644
index 3ea1b6fd6abc..000000000000
--- a/japanese/nkf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network Kanji code conversion Filter
diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile
index 20d3ceb54785..f4ff83adc24a 100644
--- a/japanese/okphone/Makefile
+++ b/japanese/okphone/Makefile
@@ -14,6 +14,7 @@ PATCH_SITES= ftp://ftp.fit.ac.jp/pub/Net/okphone/patch/
PATCHFILES= ${DISTNAME}.FreeBSD-patch.rev2.gz
MAINTAINER= max@FreeBSD.org
+COMMENT= Conference-calling phone with Japanese support
PATCH_DIST_STRIP= -p1
MAN1= phone.1
diff --git a/japanese/okphone/pkg-comment b/japanese/okphone/pkg-comment
deleted file mode 100644
index fff0d6504045..000000000000
--- a/japanese/okphone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Conference-calling phone with Japanese support
diff --git a/japanese/otojiro-fpw/Makefile b/japanese/otojiro-fpw/Makefile
index b328c2d2d4ff..1ebbf48687ba 100644
--- a/japanese/otojiro-fpw/Makefile
+++ b/japanese/otojiro-fpw/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/eijiro/ \
DISTNAME= ${PORTNAME}${PORTVERSION:S/.a/a/}-src
MAINTAINER= taoka@FreeBSD.org
+COMMENT= OTOJIRO English - Japanese Dictionary (EPWING V1 format)
BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
diff --git a/japanese/otojiro-fpw/pkg-comment b/japanese/otojiro-fpw/pkg-comment
deleted file mode 100644
index c15dfadbe9ba..000000000000
--- a/japanese/otojiro-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OTOJIRO English - Japanese Dictionary (EPWING V1 format)
diff --git a/japanese/p5-jcode.pl/Makefile b/japanese/p5-jcode.pl/Makefile
index 469d61a1d8b4..cebc9183525b 100644
--- a/japanese/p5-jcode.pl/Makefile
+++ b/japanese/p5-jcode.pl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
EXTRACT_SUFX= # none
MAINTAINER= sada@FreeBSD.org
+COMMENT= Perl5 library for Japanese character code conversion
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/japanese/p5-jcode.pl/pkg-comment b/japanese/p5-jcode.pl/pkg-comment
deleted file mode 100644
index 777040bafe72..000000000000
--- a/japanese/p5-jcode.pl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 library for Japanese character code conversion
diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile
index c98d46b4996d..d24d6b10de7a 100644
--- a/japanese/p5-manual/Makefile
+++ b/japanese/p5-manual/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sada
DISTNAME= perl${PORTVERSION}${PORTNAME}-j
MAINTAINER= sada@FreeBSD.org
+COMMENT= Perl5 japanese manual
NO_BUILD= yes
MANPREFIX= ${PREFIX}/man/ja
diff --git a/japanese/p5-manual/pkg-comment b/japanese/p5-manual/pkg-comment
deleted file mode 100644
index 81df68848acd..000000000000
--- a/japanese/p5-manual/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 japanese manual
diff --git a/japanese/p5-mkres/Makefile b/japanese/p5-mkres/Makefile
index 57cc796b60ee..6bf2e0f929fd 100644
--- a/japanese/p5-mkres/Makefile
+++ b/japanese/p5-mkres/Makefile
@@ -13,6 +13,7 @@ EXTRACT_SUFX= # none
DISTNAME= ${PORTNAME}.pl-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Create resources for tgif, vfontcap, .., for Japanese TrueType fonts
RUN_DEPENDS= mkttfdir:${PORTSDIR}/print/perlftlib
diff --git a/japanese/p5-mkres/pkg-comment b/japanese/p5-mkres/pkg-comment
deleted file mode 100644
index f10ddff29e58..000000000000
--- a/japanese/p5-mkres/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create resources for tgif, vfontcap, .., for Japanese TrueType fonts
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index a578a50794c0..8cdf1d7332b8 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ja-p5-
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//:S/./-/}
MAINTAINER= max@FreeBSD.org
+COMMENT= A perl extension module to use NKF
PERL_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/NKF.mod
diff --git a/japanese/p5-nkf/pkg-comment b/japanese/p5-nkf/pkg-comment
deleted file mode 100644
index f172aaffd8ec..000000000000
--- a/japanese/p5-nkf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl extension module to use NKF
diff --git a/japanese/paledit/Makefile b/japanese/paledit/Makefile
index d38c4aef5cc9..ffe698c8c42f 100644
--- a/japanese/paledit/Makefile
+++ b/japanese/paledit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese sysutils
MASTER_SITES= http://www.swlab.csce.kyushu-u.ac.jp/~nom/prj/paledit/
MAINTAINER= shige@FreeBSD.org
+COMMENT= NTT DoCoMo PHS Paldio telephone data transfer tool
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/japanese/paledit/pkg-comment b/japanese/paledit/pkg-comment
deleted file mode 100644
index e61f3200d799..000000000000
--- a/japanese/paledit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NTT DoCoMo PHS Paldio telephone data transfer tool
diff --git a/japanese/pejv-fpw/Makefile b/japanese/pejv-fpw/Makefile
index 63279d727135..520218d461bb 100644
--- a/japanese/pejv-fpw/Makefile
+++ b/japanese/pejv-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/pejv/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= An Esperanto-Japanese dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/pejv-fpw/pkg-comment b/japanese/pejv-fpw/pkg-comment
deleted file mode 100644
index bca1bd00fe5f..000000000000
--- a/japanese/pejv-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Esperanto-Japanese dictionary (EPWING V1 format)
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index f286d35a38d3..e75651773f4e 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -39,6 +39,7 @@ PATCHFILES= j${DISTNAME}-20000401.pat.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= shige@FreeBSD.org
+COMMENT= Pattern Extraction and Recognition Language + Japanese patches
.include <bsd.port.pre.mk>
diff --git a/japanese/perl5/pkg-comment b/japanese/perl5/pkg-comment
deleted file mode 100644
index f979ce567da6..000000000000
--- a/japanese/perl5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pattern Extraction and Recognition Language + Japanese patches
diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index 1afd6d69eea3..3500004dbb57 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -9,6 +9,7 @@ PORTNAME= postgresql-tcltk
CATEGORIES= japanese databases
MAINTAINER= saito@a2z.co.jp
+COMMENT= An TCL interface to the database PostgreSQL, including a tk GUI
POSTGRESQL_SUBPORT=YES
.include <${.CURDIR}/../../databases/postgresql7/Makefile>
diff --git a/japanese/postgresql-tcltk/pkg-comment b/japanese/postgresql-tcltk/pkg-comment
deleted file mode 100644
index e9ecbb8442ee..000000000000
--- a/japanese/postgresql-tcltk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An TCL interface to the database PostgreSQL, including a tk GUI
diff --git a/japanese/prn/Makefile b/japanese/prn/Makefile
index 798085c222f2..f797d41b2d63 100644
--- a/japanese/prn/Makefile
+++ b/japanese/prn/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PORTS_JP}
DISTNAME= ${PORTNAME}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A yet another converter from text file to postscript (with Japanese support)
RUN_DEPENDS= kcc:${PORTSDIR}/japanese/kcc
diff --git a/japanese/prn/pkg-comment b/japanese/prn/pkg-comment
deleted file mode 100644
index b19156629490..000000000000
--- a/japanese/prn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A yet another converter from text file to postscript (with Japanese support)
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index c4ff3ed1915a..7fffde10573e 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF} ${DVIPSK_JPATCH}
EXTRACT_ONLY= ${TETEX_SRC} ${DVIPSK_JPATCH}
MAINTAINER= max@FreeBSD.org
+COMMENT= Character code independent files for ASCII Japanese pTeX
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww
diff --git a/japanese/ptex-base/pkg-comment b/japanese/ptex-base/pkg-comment
deleted file mode 100644
index 5752abeb77c4..000000000000
--- a/japanese/ptex-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Character code independent files for ASCII Japanese pTeX
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index c4ff3ed1915a..7fffde10573e 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${TETEX_SRC} ${TETEX_TEXMF} ${PTEX_TEXMF} ${DVIPSK_JPATCH}
EXTRACT_ONLY= ${TETEX_SRC} ${DVIPSK_JPATCH}
MAINTAINER= max@FreeBSD.org
+COMMENT= Character code independent files for ASCII Japanese pTeX
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
wwwcore.1:${PORTSDIR}/www/libwww
diff --git a/japanese/ptex-common/pkg-comment b/japanese/ptex-common/pkg-comment
deleted file mode 100644
index 5752abeb77c4..000000000000
--- a/japanese/ptex-common/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Character code independent files for ASCII Japanese pTeX
diff --git a/japanese/ptex-euc/Makefile b/japanese/ptex-euc/Makefile
index 42a0e38a29df..9e31b30d4831 100644
--- a/japanese/ptex-euc/Makefile
+++ b/japanese/ptex-euc/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ptex-src-2.1.10
DIST_SUBDIR= teTeX/ptex
MAINTAINER= max@FreeBSD.org
+COMMENT= Japanese pTeX files to support EUC character set
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ptex2.1.10-11.patch
diff --git a/japanese/ptex-euc/pkg-comment b/japanese/ptex-euc/pkg-comment
deleted file mode 100644
index ddbf7932dd98..000000000000
--- a/japanese/ptex-euc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese pTeX files to support EUC character set
diff --git a/japanese/ptex-jis/Makefile b/japanese/ptex-jis/Makefile
index 5e5f094fec52..f7b438ff8890 100644
--- a/japanese/ptex-jis/Makefile
+++ b/japanese/ptex-jis/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ptex-src-2.1.10
DIST_SUBDIR= teTeX/ptex
MAINTAINER= max@FreeBSD.org
+COMMENT= Japanese pTeX files to support JIS character set
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ptex2.1.10-11.patch
diff --git a/japanese/ptex-jis/pkg-comment b/japanese/ptex-jis/pkg-comment
deleted file mode 100644
index 1174456c837b..000000000000
--- a/japanese/ptex-jis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese pTeX files to support JIS character set
diff --git a/japanese/ptex-sjis/Makefile b/japanese/ptex-sjis/Makefile
index 6b880ea69ec2..7560ac145b56 100644
--- a/japanese/ptex-sjis/Makefile
+++ b/japanese/ptex-sjis/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ptex-src-2.1.10
DIST_SUBDIR= teTeX/ptex
MAINTAINER= max@FreeBSD.org
+COMMENT= Japanese pTeX files to support Shift-JIS character set
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ptex2.1.10-11.patch
diff --git a/japanese/ptex-sjis/pkg-comment b/japanese/ptex-sjis/pkg-comment
deleted file mode 100644
index a56094d715e0..000000000000
--- a/japanese/ptex-sjis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese pTeX files to support Shift-JIS character set
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 42a0e38a29df..9e31b30d4831 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ptex-src-2.1.10
DIST_SUBDIR= teTeX/ptex
MAINTAINER= max@FreeBSD.org
+COMMENT= Japanese pTeX files to support EUC character set
PATCH_SITES= ${MASTER_SITES}
PATCHFILES= ptex2.1.10-11.patch
diff --git a/japanese/ptex/pkg-comment b/japanese/ptex/pkg-comment
deleted file mode 100644
index ddbf7932dd98..000000000000
--- a/japanese/ptex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese pTeX files to support EUC character set
diff --git a/japanese/qkc/Makefile b/japanese/qkc/Makefile
index ff4a87357dc6..b2d914a9b490 100644
--- a/japanese/qkc/Makefile
+++ b/japanese/qkc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://hp.vector.co.jp/authors/VA000501/
DISTNAME= ${PORTNAME}c100
MAINTAINER= max@FreeBSD.org
+COMMENT= Quick Kanji Code Converter (C version)
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/japanese/qkc/pkg-comment b/japanese/qkc/pkg-comment
deleted file mode 100644
index 6b7ffd9202b2..000000000000
--- a/japanese/qkc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quick Kanji Code Converter (C version)
diff --git a/japanese/recjis/Makefile b/japanese/recjis/Makefile
index 016a321bfcb1..390f17af838b 100644
--- a/japanese/recjis/Makefile
+++ b/japanese/recjis/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.leo.chubu.ac.jp/pub/tools/
DISTFILES= ${PORTNAME}${EXTRACT_SUFX}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Tool for recovery of broken japanese text
NO_WRKSUBDIR= yes
ALL_TARGET= prog
diff --git a/japanese/recjis/pkg-comment b/japanese/recjis/pkg-comment
deleted file mode 100644
index a1df5723dbec..000000000000
--- a/japanese/recjis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool for recovery of broken japanese text
diff --git a/japanese/roget-fpw/Makefile b/japanese/roget-fpw/Makefile
index 920079ceb02c..b6f9b1a2769a 100644
--- a/japanese/roget-fpw/Makefile
+++ b/japanese/roget-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/roget/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Roget's Thesaurus (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/roget-fpw/pkg-comment b/japanese/roget-fpw/pkg-comment
deleted file mode 100644
index 6233d9e8d2c2..000000000000
--- a/japanese/roget-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Roget's Thesaurus (EPWING V1 format)
diff --git a/japanese/ryaku-fpw/Makefile b/japanese/ryaku-fpw/Makefile
index d87604fbd81e..1897877fff9d 100644
--- a/japanese/ryaku-fpw/Makefile
+++ b/japanese/ryaku-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/Ryaku/
DISTNAME= Ryaku-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= An abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/ryaku-fpw/pkg-comment b/japanese/ryaku-fpw/pkg-comment
deleted file mode 100644
index e5d2b14babc0..000000000000
--- a/japanese/ryaku-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An abbreviation (alphabet-->Japanese) dictionary (EPWING V1 format)
diff --git a/japanese/sdic/Makefile b/japanese/sdic/Makefile
index 6793abe2ef71..8e830f999388 100644
--- a/japanese/sdic/Makefile
+++ b/japanese/sdic/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese elisp
MASTER_SITES= http://www-nagao.kuee.kyoto-u.ac.jp/member/tsuchiya/sdic/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A look up mode on Emacsen for a English - Japanese Dictionary
RUN_DEPENDS= ${LOCALBASE}/share/dict/jedict.sdic:${PORTSDIR}/japanese/edict-sdic
diff --git a/japanese/sdic/pkg-comment b/japanese/sdic/pkg-comment
deleted file mode 100644
index 89a4266b9f80..000000000000
--- a/japanese/sdic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A look up mode on Emacsen for a English - Japanese Dictionary
diff --git a/japanese/shinonome/Makefile b/japanese/shinonome/Makefile
index 43ec4f4c9c4f..9e9f1eb33aab 100644
--- a/japanese/shinonome/Makefile
+++ b/japanese/shinonome/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/efont/dist/shinonome/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Japanese 12,14,16 dot fonts
USE_BZIP2= yes
HAS_CONFIGURE= yes
diff --git a/japanese/shinonome/pkg-comment b/japanese/shinonome/pkg-comment
deleted file mode 100644
index 9e225c566b83..000000000000
--- a/japanese/shinonome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese 12,14,16 dot fonts
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index 80c2b1074fc7..b717b29b1d80 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/skk/maintrunk/legacy/
DISTNAME= skk${SKK10_VER}
MAINTAINER?= shige@FreeBSD.org
+COMMENT= Emacs-lisp frontend for the SKK-10 Japanese Input Method
USE_BZIP2= YES
diff --git a/japanese/skk10-elisp-emacs20/pkg-comment b/japanese/skk10-elisp-emacs20/pkg-comment
deleted file mode 100644
index 10bb2360ce6d..000000000000
--- a/japanese/skk10-elisp-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Emacs-lisp frontend for the SKK-10 Japanese Input Method
diff --git a/japanese/srd-fpw-package/Makefile b/japanese/srd-fpw-package/Makefile
index 81f5c4fb2f5f..8df041a2b090 100644
--- a/japanese/srd-fpw-package/Makefile
+++ b/japanese/srd-fpw-package/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= japanese elisp
MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/srd/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A supplement file for lookup to use "Random House"
RUN_DEPENDS= display:${PORTSDIR}/graphics/ImageMagick
# Your PC does not have an audio card always.
diff --git a/japanese/srd-fpw-package/pkg-comment b/japanese/srd-fpw-package/pkg-comment
deleted file mode 100644
index 43cf531fdda3..000000000000
--- a/japanese/srd-fpw-package/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A supplement file for lookup to use "Random House"
diff --git a/japanese/srd-fpw/Makefile b/japanese/srd-fpw/Makefile
index 656dfadb44cb..6d38741350ec 100644
--- a/japanese/srd-fpw/Makefile
+++ b/japanese/srd-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/srd/
DISTNAME= srd-fpw${PORTVERSION}-src
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A English - Japanese Dictionary "Random House" (EPWING V1 format)
BUILD_DEPENDS= fpwmake:${PORTSDIR}/japanese/freepwing \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Jcode.pm:${PORTSDIR}/japanese/p5-Jcode
diff --git a/japanese/srd-fpw/pkg-comment b/japanese/srd-fpw/pkg-comment
deleted file mode 100644
index 35d87e591780..000000000000
--- a/japanese/srd-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A English - Japanese Dictionary "Random House" (EPWING V1 format)
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 027f836cb10d..e05c1893254f 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
DISTNAME= ja-${PORTNAME}-980222
MAINTAINER= mita@FreeBSD.org
+COMMENT= 2-D drawing facility (with Japanese configuration)
RUN_DEPENDS= tgif:${PORTSDIR}/graphics/tgif-nls\
${PREFIX}/lib/X11/fonts/local/knm12p.pcf.gz:${PORTSDIR}/japanese/k12
diff --git a/japanese/tgif/pkg-comment b/japanese/tgif/pkg-comment
deleted file mode 100644
index fc79eb9edc84..000000000000
--- a/japanese/tgif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-2-D drawing facility (with Japanese configuration)
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index 7c82849b8779..a370a91e8fe9 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -16,6 +16,7 @@ PATCH_SITES= ftp://ftp.sra.co.jp/pub/lang/tcl/jp/ \
PATCHFILES= tk${PORTVERSION}jp1.6.patch.gz 2Step-${PORTVERSION}pl1-patch.gz
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= The Tk toolkit with a NeXTSTEP look and more
LIB_DEPENDS= tcl80jp.1:${PORTSDIR}/japanese/tcl80
diff --git a/japanese/tkstep80/pkg-comment b/japanese/tkstep80/pkg-comment
deleted file mode 100644
index 59f59a3e8249..000000000000
--- a/japanese/tkstep80/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Tk toolkit with a NeXTSTEP look and more
diff --git a/japanese/typist/Makefile b/japanese/typist/Makefile
index 518bea20827a..a70e0a812471 100644
--- a/japanese/typist/Makefile
+++ b/japanese/typist/Makefile
@@ -13,6 +13,7 @@ EXTRACT_SUFX= .src.tar.gz
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Typing lessons (Japanese version)
WRKSRC= ${WRKDIR}/${DISTNAME}/src
MAN1= typist.1
diff --git a/japanese/typist/pkg-comment b/japanese/typist/pkg-comment
deleted file mode 100644
index 5e9e06e86c21..000000000000
--- a/japanese/typist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Typing lessons (Japanese version)
diff --git a/japanese/vera-fpw/Makefile b/japanese/vera-fpw/Makefile
index e16da3a8de85..3fa29a8d41e5 100644
--- a/japanese/vera-fpw/Makefile
+++ b/japanese/vera-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/vera/
DISTNAME= vera-${VERA_VER}-fpw${VERAFPW_VER}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Virtual Entity of Relevant Aconyms (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/vera-fpw/pkg-comment b/japanese/vera-fpw/pkg-comment
deleted file mode 100644
index f05472dd0fb4..000000000000
--- a/japanese/vera-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Virtual Entity of Relevant Aconyms (EPWING V1 format)
diff --git a/japanese/vfghostscript/Makefile b/japanese/vfghostscript/Makefile
index 81911006b7fd..d3e992e826f7 100644
--- a/japanese/vfghostscript/Makefile
+++ b/japanese/vfghostscript/Makefile
@@ -26,6 +26,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
DIST_SUBDIR= ghostscript
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= GNU Postscript interpreter + Japanese VFontlib patch
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
diff --git a/japanese/vfghostscript/pkg-comment b/japanese/vfghostscript/pkg-comment
deleted file mode 100644
index 0a894b742668..000000000000
--- a/japanese/vfghostscript/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Postscript interpreter + Japanese VFontlib patch
diff --git a/japanese/vfghostscript5/Makefile b/japanese/vfghostscript5/Makefile
index 9aa94bad0713..97760a382787 100644
--- a/japanese/vfghostscript5/Makefile
+++ b/japanese/vfghostscript5/Makefile
@@ -31,6 +31,7 @@ DIST_SUBDIR= ghostscript
EXTRACT_ONLY= ${GS_SOURCES}
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= GNU Postscript and PDF interpreter with Japanese vector font library
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
diff --git a/japanese/vfghostscript5/pkg-comment b/japanese/vfghostscript5/pkg-comment
deleted file mode 100644
index 4775bdd6c0d1..000000000000
--- a/japanese/vfghostscript5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Postscript and PDF interpreter with Japanese vector font library
diff --git a/japanese/vfghostscript55/Makefile b/japanese/vfghostscript55/Makefile
index 878161851cc1..501eb43a0659 100644
--- a/japanese/vfghostscript55/Makefile
+++ b/japanese/vfghostscript55/Makefile
@@ -29,6 +29,7 @@ DIST_SUBDIR= ghostscript
EXTRACT_ONLY= ${GS_SOURCES}
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= GNU Postscript and PDF interpreter with Japanese vector font library
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
diff --git a/japanese/vfghostscript55/pkg-comment b/japanese/vfghostscript55/pkg-comment
deleted file mode 100644
index 4775bdd6c0d1..000000000000
--- a/japanese/vfghostscript55/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Postscript and PDF interpreter with Japanese vector font library
diff --git a/japanese/vflib/Makefile b/japanese/vflib/Makefile
index 073207f14ca6..e4f1a9f4ce8b 100644
--- a/japanese/vflib/Makefile
+++ b/japanese/vflib/Makefile
@@ -14,6 +14,7 @@ DISTNAME= VFlib2-${PORTVERSION}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mita@FreeBSD.org
+COMMENT= Japanese Vector font library
BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake-4
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/japanese/vflib/pkg-comment b/japanese/vflib/pkg-comment
deleted file mode 100644
index 9c8690d9c7fa..000000000000
--- a/japanese/vflib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese Vector font library
diff --git a/japanese/vftool/Makefile b/japanese/vftool/Makefile
index 727b320dd2c2..33dbf4c64840 100644
--- a/japanese/vftool/Makefile
+++ b/japanese/vftool/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
jtex-1.52.tar.gz
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT= Virtual font kit for using in dvi2ps, dvipsk or dvi2dvi (n2a,a2n,a2bk,p2pn)
BUILD_DEPENDS= ${AFMDIR}/GothicBBB-Medium-H:${PORTSDIR}/japanese/japaneseAFM
diff --git a/japanese/vftool/pkg-comment b/japanese/vftool/pkg-comment
deleted file mode 100644
index 195f3e98241b..000000000000
--- a/japanese/vftool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Virtual font kit for using in dvi2ps, dvipsk or dvi2dvi (n2a,a2n,a2bk,p2pn)
diff --git a/japanese/vfxdvi300/Makefile b/japanese/vfxdvi300/Makefile
index 85c7f9e99e8f..7daca4e561af 100644
--- a/japanese/vfxdvi300/Makefile
+++ b/japanese/vfxdvi300/Makefile
@@ -25,6 +25,7 @@ DIST_SUBDIR= xdvi
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= mita@FreeBSD.org
+COMMENT= DVI Previewer for X. + Japanese patch + vector font support
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
RUN_DEPENDS= ${LOCALBASE}/lib/fonts/pk${RESOLUTION}:${PORTSDIR}/print/pkfonts${RESOLUTION}
diff --git a/japanese/vfxdvi300/pkg-comment b/japanese/vfxdvi300/pkg-comment
deleted file mode 100644
index d664c81329c8..000000000000
--- a/japanese/vfxdvi300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DVI Previewer for X. + Japanese patch + vector font support
diff --git a/japanese/waeijiro-fpw/Makefile b/japanese/waeijiro-fpw/Makefile
index 9f3c772444e0..e828c77c2f34 100644
--- a/japanese/waeijiro-fpw/Makefile
+++ b/japanese/waeijiro-fpw/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.dsl.gr.jp/~tf/
#DISTNAME= ${PORTNAME}${PORTVERSION}-src
MAINTAINER= taoka@FreeBSD.org
+COMMENT= WAEIJIRO English - Japanese Dictionary (EPWING V1 format)
BUILD_DEPENDS= ${LOCALBASE}/libexec/freepwing/catdump:${PORTSDIR}/japanese/freepwing \
${LOCALBASE}/share/doc/freepwing/fpwutils.mk:${PORTSDIR}/japanese/freepwing \
diff --git a/japanese/waeijiro-fpw/pkg-comment b/japanese/waeijiro-fpw/pkg-comment
deleted file mode 100644
index 4658b9d20611..000000000000
--- a/japanese/waeijiro-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WAEIJIRO English - Japanese Dictionary (EPWING V1 format)
diff --git a/japanese/wdic-fpw/Makefile b/japanese/wdic-fpw/Makefile
index 5da938ddbd5f..aba82f39d0b9 100644
--- a/japanese/wdic-fpw/Makefile
+++ b/japanese/wdic-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/wdic/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Wired and Wireless Dictionary in Japanese (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/wdic-fpw/pkg-comment b/japanese/wdic-fpw/pkg-comment
deleted file mode 100644
index 2ed9d4009147..000000000000
--- a/japanese/wdic-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wired and Wireless Dictionary in Japanese (EPWING V1 format)
diff --git a/japanese/weather-emacs20/Makefile b/japanese/weather-emacs20/Makefile
index 5de05c5e7e9f..246d586596e3 100644
--- a/japanese/weather-emacs20/Makefile
+++ b/japanese/weather-emacs20/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.opaopa.org/pub/elisp/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Weather Report in Japanese Regions
EMACS_PORT_NAME?= emacs20
diff --git a/japanese/weather-emacs20/pkg-comment b/japanese/weather-emacs20/pkg-comment
deleted file mode 100644
index b00c6d49d0cf..000000000000
--- a/japanese/weather-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Weather Report in Japanese Regions
diff --git a/japanese/web1913-fpw/Makefile b/japanese/web1913-fpw/Makefile
index ce0a1c38b5e4..b513868e3933 100644
--- a/japanese/web1913-fpw/Makefile
+++ b/japanese/web1913-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/web1913/
DISTNAME= ${PORTNAME}${WEBFPW_VER}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Webster's Revised Unabridged Dictionary (1913) (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/web1913-fpw/pkg-comment b/japanese/web1913-fpw/pkg-comment
deleted file mode 100644
index a04de7f7ecdc..000000000000
--- a/japanese/web1913-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Webster's Revised Unabridged Dictionary (1913) (EPWING V1 format)
diff --git a/japanese/wnn7egg/Makefile b/japanese/wnn7egg/Makefile
index ea05df166063..26d81ed35ff0 100644
--- a/japanese/wnn7egg/Makefile
+++ b/japanese/wnn7egg/Makefile
@@ -14,6 +14,7 @@ DISTNAME= wnn7-elisp-el-1.02-1
EXTRACT_SUFX= .tgz
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A Wnn7 elisp client
EMACSDIR= ${PREFIX}/share/emacs/site-lisp
ELISPDIR= ${EMACSDIR}/wnn7egg
diff --git a/japanese/wnn7egg/pkg-comment b/japanese/wnn7egg/pkg-comment
deleted file mode 100644
index 05f0d2562a3d..000000000000
--- a/japanese/wnn7egg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Wnn7 elisp client
diff --git a/japanese/wordnet-fpw/Makefile b/japanese/wordnet-fpw/Makefile
index 029573904c23..a0cc653cf7fc 100644
--- a/japanese/wordnet-fpw/Makefile
+++ b/japanese/wordnet-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/wordnet/
DISTNAME= wordnet-${WN_VER}-fpw${WNFPW_VER}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A English - English Dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/wordnet-fpw/pkg-comment b/japanese/wordnet-fpw/pkg-comment
deleted file mode 100644
index c89ae7582ae4..000000000000
--- a/japanese/wordnet-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A English - English Dictionary (EPWING V1 format)
diff --git a/japanese/wwasw-fpw/Makefile b/japanese/wwasw-fpw/Makefile
index e1be374e8159..edeeeb119a1d 100644
--- a/japanese/wwasw-fpw/Makefile
+++ b/japanese/wwasw-fpw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://openlab.ring.gr.jp/edict/fpw/dist/wwasw/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A biographical dictionary (EPWING V1 format)
USE_ZIP= yes
NO_BUILD= yes
diff --git a/japanese/wwasw-fpw/pkg-comment b/japanese/wwasw-fpw/pkg-comment
deleted file mode 100644
index e5e4c171fd4d..000000000000
--- a/japanese/wwasw-fpw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A biographical dictionary (EPWING V1 format)
diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile
index 35d0908e0114..2d520398d2c8 100644
--- a/japanese/xjman/Makefile
+++ b/japanese/xjman/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES?= ${MASTER_SITE_PORTS_JP} \
http://xjman.dsl.gr.jp/dist/
MAINTAINER?= sada@FreeBSD.org
+COMMENT= Japanized X manual from "The X Japanese Documentation Project"
RUN_DEPENDS= jman:${PORTSDIR}/japanese/man
diff --git a/japanese/xjman/pkg-comment b/japanese/xjman/pkg-comment
deleted file mode 100644
index b6eb1a2acd45..000000000000
--- a/japanese/xjman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanized X manual from "The X Japanese Documentation Project"
diff --git a/japanese/xjtext/Makefile b/japanese/xjtext/Makefile
index 4c577525bbe2..745ca122ddc0 100644
--- a/japanese/xjtext/Makefile
+++ b/japanese/xjtext/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://plaza.harmonix.ne.jp/~onizuka/
DISTNAME= XJTEXT-${PORTVERSION}
MAINTAINER= sada@FreeBSD.org
+COMMENT= A text viewer for Japanese virtical writings
USE_BISON= yes
USE_GNOMENG= yes
diff --git a/japanese/xjtext/pkg-comment b/japanese/xjtext/pkg-comment
deleted file mode 100644
index 98cc841ad1b2..000000000000
--- a/japanese/xjtext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text viewer for Japanese virtical writings
diff --git a/japanese/xnetmaj/Makefile b/japanese/xnetmaj/Makefile
index eb6f4a743715..98f196859e8e 100644
--- a/japanese/xnetmaj/Makefile
+++ b/japanese/xnetmaj/Makefile
@@ -14,6 +14,7 @@ DISTFILES= netmaj-${PORTVERSION}.tar.gz \
netmaj-xui-${PORTVERSION}.tar.gz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A mahhjong game for X
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/japanese/xnetmaj/pkg-comment b/japanese/xnetmaj/pkg-comment
deleted file mode 100644
index e03a5b23eed1..000000000000
--- a/japanese/xnetmaj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mahhjong game for X
diff --git a/japanese/xpdf/Makefile b/japanese/xpdf/Makefile
index 985204e5b582..b634b134f722 100644
--- a/japanese/xpdf/Makefile
+++ b/japanese/xpdf/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.foolabs.com/pub/xpdf/
DISTNAME= xpdf-japanese
MAINTAINER= mita@FreeBSD.org
+COMMENT= Japanese xpdf font support
RUN_DEPENDS= xpdf:${PORTSDIR}/graphics/xpdf\
${LOCALBASE}/share/ghostscript/Resource/CMap/Adobe-Japan1-0:${PORTSDIR}/print/adobe-cmaps\
diff --git a/japanese/xpdf/pkg-comment b/japanese/xpdf/pkg-comment
deleted file mode 100644
index 835fed1ebfc2..000000000000
--- a/japanese/xpdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Japanese xpdf font support
diff --git a/japanese/xshodo/Makefile b/japanese/xshodo/Makefile
index 272377e9d5eb..c06491dc252e 100644
--- a/japanese/xshodo/Makefile
+++ b/japanese/xshodo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://cclub.tutcc.tut.ac.jp/pub/xwin/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A paint tool for Shodo, the Japanese traditional writing character
USE_IMAKE= yes
MAN1= xshodo.1
diff --git a/japanese/xshodo/pkg-comment b/japanese/xshodo/pkg-comment
deleted file mode 100644
index 42031e865682..000000000000
--- a/japanese/xshodo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A paint tool for Shodo, the Japanese traditional writing character
diff --git a/java/bugseeker-demo/Makefile b/java/bugseeker-demo/Makefile
index 9b8d6633d151..4fcfd561d8f3 100644
--- a/java/bugseeker-demo/Makefile
+++ b/java/bugseeker-demo/Makefile
@@ -15,6 +15,7 @@ PATCH_SITES= http://www.metaverse.nl/~ernst/
PATCHFILES= bugseeker2demo.sh.diff
MAINTAINER= znerd@FreeBSD.org
+COMMENT= A debugger for Java software
RUN_DEPENDS= ${LOCALBASE}/linux-sun-jdk1.3.1/bin/java:${PORTSDIR}/java/linux-sun-jdk13
diff --git a/java/bugseeker-demo/pkg-comment b/java/bugseeker-demo/pkg-comment
deleted file mode 100644
index ad8fb274eeed..000000000000
--- a/java/bugseeker-demo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A debugger for Java software
diff --git a/java/bugseeker/Makefile b/java/bugseeker/Makefile
index cc2f7a824552..935e82142b30 100644
--- a/java/bugseeker/Makefile
+++ b/java/bugseeker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= #
DISTNAME= bugseeker2ee-1_0_2
MAINTAINER= znerd@FreeBSD.org
+COMMENT= BugSeeker for Java 2, a debugger for Java applications
RUN_DEPENDS= ${JAVA_HOME}/bin/java:${PORTSDIR}/java/linux-sun-jdk13
diff --git a/java/bugseeker/pkg-comment b/java/bugseeker/pkg-comment
deleted file mode 100644
index 6bd66fe5adda..000000000000
--- a/java/bugseeker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BugSeeker for Java 2, a debugger for Java applications
diff --git a/java/cryptix-jce/Makefile b/java/cryptix-jce/Makefile
index 1f7cd6879096..cde9ee7d647c 100644
--- a/java/cryptix-jce/Makefile
+++ b/java/cryptix-jce/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= ${PORTNAME}-${PORTVERSION}-snap
MAINTAINER= znerd@FreeBSD.org
+COMMENT= JCE(Java Cryptograph Extension) by Cryptix
USE_JAVA= 1.1+
USE_ZIP= yes
diff --git a/java/cryptix-jce/pkg-comment b/java/cryptix-jce/pkg-comment
deleted file mode 100644
index 2277b78bdbf0..000000000000
--- a/java/cryptix-jce/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JCE(Java Cryptograph Extension) by Cryptix
diff --git a/java/forte/Makefile b/java/forte/Makefile
index ff7456e50fb2..69d8c8f38a50 100644
--- a/java/forte/Makefile
+++ b/java/forte/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= .class
EXTRACT_ONLY=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A Sun's powerful and extensible IDE for Java
USE_JAVA= 1.3+
JAVAVM= ${JAVA_HOME}/bin/java
diff --git a/java/forte/pkg-comment b/java/forte/pkg-comment
deleted file mode 100644
index 04e46a77328d..000000000000
--- a/java/forte/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Sun's powerful and extensible IDE for Java
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index c2b6ae0f7e89..6e167e6c0514 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= java
MASTER_SITES= ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Java compiler and decompiler developed under GPL
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/java/guavac/pkg-comment b/java/guavac/pkg-comment
deleted file mode 100644
index 4eb60a058711..000000000000
--- a/java/guavac/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java compiler and decompiler developed under GPL
diff --git a/java/jad/Makefile b/java/jad/Makefile
index ccc4653e87cc..3eec4ecc2214 100644
--- a/java/jad/Makefile
+++ b/java/jad/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= jadfb158
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Jad, a Java decompiler
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/java/jad/pkg-comment b/java/jad/pkg-comment
deleted file mode 100644
index 6dd12759ec1c..000000000000
--- a/java/jad/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jad, a Java decompiler
diff --git a/java/jaf/Makefile b/java/jaf/Makefile
index 1ac6d0527c81..443d921ab0e0 100644
--- a/java/jaf/Makefile
+++ b/java/jaf/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= #
DISTNAME= ${PORTNAME}-1_0_2
MAINTAINER= java@freebsd.org
+COMMENT= JavaBeansTM Activation Framework
USE_ZIP= YES
USE_JAVA= 1.1+
diff --git a/java/jaf/pkg-comment b/java/jaf/pkg-comment
deleted file mode 100644
index e39f76b0c8f2..000000000000
--- a/java/jaf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JavaBeansTM Activation Framework
diff --git a/java/jakarta-bcel/Makefile b/java/jakarta-bcel/Makefile
index eed216c0ff5f..025719162323 100644
--- a/java/jakarta-bcel/Makefile
+++ b/java/jakarta-bcel/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= http://jakarta.apache.org/builds/${PORTNAME}/release/v${PORTVERSIO
DISTNAME= bcel-${PORTVERSION}
MAINTAINER= des@FreeBSD.org
+COMMENT= A library for generating Java bytecode
NO_BUILD= yes
USE_JAVA= 1.2+
diff --git a/java/jakarta-bcel/pkg-comment b/java/jakarta-bcel/pkg-comment
deleted file mode 100644
index 64511537c6df..000000000000
--- a/java/jakarta-bcel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for generating Java bytecode
diff --git a/java/jakarta-commons-beanutils/Makefile b/java/jakarta-commons-beanutils/Makefile
index f819fae2b428..e0fdbd6a19a1 100644
--- a/java/jakarta-commons-beanutils/Makefile
+++ b/java/jakarta-commons-beanutils/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= JavaBeans utility library
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant \
${LOCALBASE}/share/java/classes/commons-collections.jar:${PORTSDIR}/java/jakarta-commons-collections
diff --git a/java/jakarta-commons-beanutils/pkg-comment b/java/jakarta-commons-beanutils/pkg-comment
deleted file mode 100644
index e5a4d3ef88da..000000000000
--- a/java/jakarta-commons-beanutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JavaBeans utility library
diff --git a/java/jakarta-commons-cli/Makefile b/java/jakarta-commons-cli/Makefile
index 5517d7fc3461..3f600550d547 100644
--- a/java/jakarta-commons-cli/Makefile
+++ b/java/jakarta-commons-cli/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java library for command line arguments and options
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant \
${LOCALBASE}/share/java/classes/commons-lang.jar:${PORTSDIR}/java/jakarta-commons-lang
diff --git a/java/jakarta-commons-cli/pkg-comment b/java/jakarta-commons-cli/pkg-comment
deleted file mode 100644
index 17f203b15a44..000000000000
--- a/java/jakarta-commons-cli/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java library for command line arguments and options
diff --git a/java/jakarta-commons-collections/Makefile b/java/jakarta-commons-collections/Makefile
index 45421f05be80..9fbcffacac43 100644
--- a/java/jakarta-commons-collections/Makefile
+++ b/java/jakarta-commons-collections/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Classes that extend/augment the Java Collections Framework
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/java/jakarta-commons-collections/pkg-comment b/java/jakarta-commons-collections/pkg-comment
deleted file mode 100644
index 1ddee37d463f..000000000000
--- a/java/jakarta-commons-collections/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Classes that extend/augment the Java Collections Framework
diff --git a/java/jakarta-commons-lang/Makefile b/java/jakarta-commons-lang/Makefile
index 86ed04d2e2d1..d43ae69a4f37 100644
--- a/java/jakarta-commons-lang/Makefile
+++ b/java/jakarta-commons-lang/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Jakarta library with helper utilities for the java.lang API
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/java/jakarta-commons-lang/pkg-comment b/java/jakarta-commons-lang/pkg-comment
deleted file mode 100644
index 3f2f31913a52..000000000000
--- a/java/jakarta-commons-lang/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jakarta library with helper utilities for the java.lang API
diff --git a/java/jakarta-commons-logging/Makefile b/java/jakarta-commons-logging/Makefile
index 94a00106cb84..f8b7ae23b282 100644
--- a/java/jakarta-commons-logging/Makefile
+++ b/java/jakarta-commons-logging/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= jakarta-
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Generic Java library for validation of constraints
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant \
${LOCALBASE}/share/java/classes/jakarta-log4j.jar:${PORTSDIR}/java/jakarta-log4j
diff --git a/java/jakarta-commons-logging/pkg-comment b/java/jakarta-commons-logging/pkg-comment
deleted file mode 100644
index ff9458ee72a2..000000000000
--- a/java/jakarta-commons-logging/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic Java library for validation of constraints
diff --git a/java/janosvm/Makefile b/java/janosvm/Makefile
index e037e0a7cab0..1fda9cbd0914 100644
--- a/java/janosvm/Makefile
+++ b/java/janosvm/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= java
MASTER_SITES= http://www.cs.utah.edu/flux/janos/${DISTNAME}/
MAINTAINER= znerd@FreeBSD.org
+COMMENT= A virtual machine for executing Java bytecodes
USE_XLIB= yes
GNU_CONFIGURE= yes
diff --git a/java/janosvm/pkg-comment b/java/janosvm/pkg-comment
deleted file mode 100644
index c5bc1b72f1cb..000000000000
--- a/java/janosvm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual machine for executing Java bytecodes
diff --git a/java/java-tutorial/Makefile b/java/java-tutorial/Makefile
index 08f6b90b415e..c3c282a2857c 100644
--- a/java/java-tutorial/Makefile
+++ b/java/java-tutorial/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.javasoft.com/docs/ \
DISTNAME= tutorial
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Sun's Java Developers Kit tutorial
NO_WRKSUBDIR= yes
RESTRICTED= "This software is under license and export control."
diff --git a/java/java-tutorial/pkg-comment b/java/java-tutorial/pkg-comment
deleted file mode 100644
index 237e16802f23..000000000000
--- a/java/java-tutorial/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sun's Java Developers Kit tutorial
diff --git a/java/javamail/Makefile b/java/javamail/Makefile
index 1d657df75a56..7068ba1cb635 100644
--- a/java/javamail/Makefile
+++ b/java/javamail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= #
DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}
MAINTAINER= java@freebsd.org
+COMMENT= A set of abstract Java classes that model a mail system
RUN_DEPENDS= ${LOCALBASE}/share/java/classes/activation.jar:${PORTSDIR}/java/jaf
diff --git a/java/javamail/pkg-comment b/java/javamail/pkg-comment
deleted file mode 100644
index 923ecee9655b..000000000000
--- a/java/javamail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of abstract Java classes that model a mail system
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 14184c38c60a..be34427d6507 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Wrapper script for various Java Virtual Machines
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/java/javavmwrapper/pkg-comment b/java/javavmwrapper/pkg-comment
deleted file mode 100644
index 6713fedf6164..000000000000
--- a/java/javavmwrapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wrapper script for various Java Virtual Machines
diff --git a/java/javel/Makefile b/java/javel/Makefile
index 5785d7bcf25a..101549999c64 100644
--- a/java/javel/Makefile
+++ b/java/javel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.geocities.com/l.gregoire/
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java disassembler
NO_WRKSUBDIR= yes
USE_REINPLACE= yes
diff --git a/java/javel/pkg-comment b/java/javel/pkg-comment
deleted file mode 100644
index a52e17454f4d..000000000000
--- a/java/javel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java disassembler
diff --git a/java/jboss2/Makefile b/java/jboss2/Makefile
index f377d773c640..abc9c261149e 100644
--- a/java/jboss2/Makefile
+++ b/java/jboss2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${APP_TITLE}-${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= JBoss 2, an open-source J2EE application server
USE_JAVA= 1.2+
diff --git a/java/jboss2/pkg-comment b/java/jboss2/pkg-comment
deleted file mode 100644
index f8eeed5fba1a..000000000000
--- a/java/jboss2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JBoss 2, an open-source J2EE application server
diff --git a/java/jboss3/Makefile b/java/jboss3/Makefile
index b94d93e38c84..c14764480160 100644
--- a/java/jboss3/Makefile
+++ b/java/jboss3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
#DISTNAME= ${APP_TITLE}-${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= JBoss 3, an open-source J2EE application server
USE_JAVA= 1.2+
diff --git a/java/jboss3/pkg-comment b/java/jboss3/pkg-comment
deleted file mode 100644
index f272a3db01d8..000000000000
--- a/java/jboss3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JBoss 3, an open-source J2EE application server
diff --git a/java/jboss4/Makefile b/java/jboss4/Makefile
index b94d93e38c84..c14764480160 100644
--- a/java/jboss4/Makefile
+++ b/java/jboss4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
#DISTNAME= ${APP_TITLE}-${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= JBoss 3, an open-source J2EE application server
USE_JAVA= 1.2+
diff --git a/java/jboss4/pkg-comment b/java/jboss4/pkg-comment
deleted file mode 100644
index f272a3db01d8..000000000000
--- a/java/jboss4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JBoss 3, an open-source J2EE application server
diff --git a/java/jboss5/Makefile b/java/jboss5/Makefile
index b94d93e38c84..c14764480160 100644
--- a/java/jboss5/Makefile
+++ b/java/jboss5/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
#DISTNAME= ${APP_TITLE}-${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= JBoss 3, an open-source J2EE application server
USE_JAVA= 1.2+
diff --git a/java/jboss5/pkg-comment b/java/jboss5/pkg-comment
deleted file mode 100644
index f272a3db01d8..000000000000
--- a/java/jboss5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JBoss 3, an open-source J2EE application server
diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile
index 18f8891f857d..34dd02daf121 100644
--- a/java/jdk11-doc/Makefile
+++ b/java/jdk11-doc/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= jdk-${JDK_VERSION:S/./_/g}-doc
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java Development Kit 1.1 Documentation
TARGET_DIR?= ${PREFIX}/share/doc/jdk${JDK_MAJOR_VER}
diff --git a/java/jdk11-doc/pkg-comment b/java/jdk11-doc/pkg-comment
deleted file mode 100644
index c5b3ba7183ef..000000000000
--- a/java/jdk11-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java Development Kit 1.1 Documentation
diff --git a/java/jdk11/Makefile b/java/jdk11/Makefile
index 2c22f5f1f571..ad02c48c4d4f 100644
--- a/java/jdk11/Makefile
+++ b/java/jdk11/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= nate/JDK1.1
MAINTAINER= java-port@@FreeBSD.org
+COMMENT= Java Development Kit 1.1
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/jdk11/pkg-comment b/java/jdk11/pkg-comment
deleted file mode 100644
index e3b5e0920f8b..000000000000
--- a/java/jdk11/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java Development Kit 1.1
diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile
index ad0612eb5275..5991c5ad4dca 100644
--- a/java/jdk12-doc/Makefile
+++ b/java/jdk12-doc/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= jdk-${JDK_VERSION:S/./_/g}-doc
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java Development Kit 1.2 Documentation
NO_CDROM= "License does not allow distribution with fee."
RESTRICTED= "This software is under license and export control."
diff --git a/java/jdk12-doc/pkg-comment b/java/jdk12-doc/pkg-comment
deleted file mode 100644
index 40147efb1d6c..000000000000
--- a/java/jdk12-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java Development Kit 1.2 Documentation
diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile
index f0096cd07d34..39ceda141ec1 100644
--- a/java/jdk13-doc/Makefile
+++ b/java/jdk13-doc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= #
DISTNAME= j2sdk-${JDK_VERSION:S/./_/g}-doc
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java Development Kit 1.3 Documentation
NO_CDROM= "License does not allow distribution with fee."
RESTRICTED= "This documentation is under license and export control."
diff --git a/java/jdk13-doc/pkg-comment b/java/jdk13-doc/pkg-comment
deleted file mode 100644
index e572c0fc32e8..000000000000
--- a/java/jdk13-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java Development Kit 1.3 Documentation
diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile
index 7a82e46910d8..221b47c77682 100644
--- a/java/jdk14-doc/Makefile
+++ b/java/jdk14-doc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= #
DISTNAME= j2sdk-${JDK_VERSION:S/./_/g}-doc
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java Development Kit 1.4 Documentation
NO_CDROM= "License does not allow distribution with fee."
RESTRICTED= "This documentation is under license and export control."
diff --git a/java/jdk14-doc/pkg-comment b/java/jdk14-doc/pkg-comment
deleted file mode 100644
index 9ef6d1517b7d..000000000000
--- a/java/jdk14-doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java Development Kit 1.4 Documentation
diff --git a/java/jdom/Makefile b/java/jdom/Makefile
index 9069d7a5caf3..a82e67cd88af 100644
--- a/java/jdom/Makefile
+++ b/java/jdom/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= ${PORTNAME}-${PORTVERSION:C/[0-9]*\.[0-9]*//}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java library for accessing and manipulating XML documents
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/java/jdom/pkg-comment b/java/jdom/pkg-comment
deleted file mode 100644
index c2e79d8e0977..000000000000
--- a/java/jdom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java library for accessing and manipulating XML documents
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index eb4e7fa6bd05..770abb8c58be 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= java
MASTER_SITES= http://oss.software.ibm.com/pub/jikes/${PORTVERSION}/
MAINTAINER= archie@freebsd.org
+COMMENT= A very fast Java source to byte-code compiler made available by IBM
MAN1= jikes.1
diff --git a/java/jikes/pkg-comment b/java/jikes/pkg-comment
deleted file mode 100644
index 51e64086b1b3..000000000000
--- a/java/jikes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very fast Java source to byte-code compiler made available by IBM
diff --git a/java/jlint/Makefile b/java/jlint/Makefile
index c9fd07038848..e7dc0142dd5a 100644
--- a/java/jlint/Makefile
+++ b/java/jlint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://artho.com/jlint/ \
http://www.metaverse.nl/~ernst/
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java program analyzer and checker
USE_REINPLACE= YES
diff --git a/java/jlint/pkg-comment b/java/jlint/pkg-comment
deleted file mode 100644
index 691c9d339c12..000000000000
--- a/java/jlint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java program analyzer and checker
diff --git a/java/jre/Makefile b/java/jre/Makefile
index 39465b74def4..2d5624f3ff5c 100644
--- a/java/jre/Makefile
+++ b/java/jre/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.se.freebsd.org/pub/FreeBSD/JDK/ \
MASTER_SITE_SUBDIR= patrick
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Standard Java Platform for running Java programs
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/jre/pkg-comment b/java/jre/pkg-comment
deleted file mode 100644
index 1dca897db1c1..000000000000
--- a/java/jre/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Standard Java Platform for running Java programs
diff --git a/java/jump/Makefile b/java/jump/Makefile
index 020f992b2ad3..a40ab798e691 100644
--- a/java/jump/Makefile
+++ b/java/jump/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= jump-math
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java library for arbitrary precision computations
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/java/jump/pkg-comment b/java/jump/pkg-comment
deleted file mode 100644
index 86a451d30ef5..000000000000
--- a/java/jump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java library for arbitrary precision computations
diff --git a/java/junit/Makefile b/java/junit/Makefile
index ddebc6017052..1a0f8eb3a974 100644
--- a/java/junit/Makefile
+++ b/java/junit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= okazaki@FreeBSD.org
+COMMENT= A regression testing utility for use with the Java(TM) Language
USE_ZIP= yes
USE_JAVA= 1.1+
diff --git a/java/junit/pkg-comment b/java/junit/pkg-comment
deleted file mode 100644
index c2f0dfd83473..000000000000
--- a/java/junit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A regression testing utility for use with the Java(TM) Language
diff --git a/java/linux-blackdown-jdk12/Makefile b/java/linux-blackdown-jdk12/Makefile
index a22561e1522b..70afb636a70d 100644
--- a/java/linux-blackdown-jdk12/Makefile
+++ b/java/linux-blackdown-jdk12/Makefile
@@ -17,6 +17,7 @@ PKGNAMEPREFIX= linux-blackdown-
DISTNAME= j2sdk-${PORTVERSION}-FCS-linux-${ARCH}-glibc-2.1.3
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Blackdown Java Development Kit 1.2 for Linux
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/linux-blackdown-jdk12/pkg-comment b/java/linux-blackdown-jdk12/pkg-comment
deleted file mode 100644
index d3f5c2e07824..000000000000
--- a/java/linux-blackdown-jdk12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Blackdown Java Development Kit 1.2 for Linux
diff --git a/java/linux-blackdown-jdk13/Makefile b/java/linux-blackdown-jdk13/Makefile
index ead75c8433a0..2c0ea909db8a 100644
--- a/java/linux-blackdown-jdk13/Makefile
+++ b/java/linux-blackdown-jdk13/Makefile
@@ -17,6 +17,7 @@ DISTNAME= j2sdk-${JDK_VERSION}${JDK_VER_SUFFIX}-linux-${ARCH}
EXTRACT_SUFX= .bin
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Blackdown Java Development Kit 1.3 for Linux
BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/linux-blackdown-jdk13/pkg-comment b/java/linux-blackdown-jdk13/pkg-comment
deleted file mode 100644
index 88d1685a2546..000000000000
--- a/java/linux-blackdown-jdk13/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Blackdown Java Development Kit 1.3 for Linux
diff --git a/java/linux-blackdown-jdk14/Makefile b/java/linux-blackdown-jdk14/Makefile
index f786b5d7ce12..6714cba56edb 100644
--- a/java/linux-blackdown-jdk14/Makefile
+++ b/java/linux-blackdown-jdk14/Makefile
@@ -16,6 +16,7 @@ DISTNAME= j2sdk-${JDK_VERSION}${JDK_VER_SUFFIX}-linux-i586
EXTRACT_SUFX= .bin
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Blackdown Java Development Kit 1.4 for Linux
BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/linux-blackdown-jdk14/pkg-comment b/java/linux-blackdown-jdk14/pkg-comment
deleted file mode 100644
index 38a7102464cb..000000000000
--- a/java/linux-blackdown-jdk14/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Blackdown Java Development Kit 1.4 for Linux
diff --git a/java/linux-sun-jdk12/Makefile b/java/linux-sun-jdk12/Makefile
index 0b2e7760cd1f..d7dbf3a55a4b 100644
--- a/java/linux-sun-jdk12/Makefile
+++ b/java/linux-sun-jdk12/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= linux-sun-
DISTNAME= ${PORTNAME}-${JDK_VERSION:S/./_/g}-linux-i586
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Sun Java Development Kit 1.2 for Linux
BUILD_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
RUN_DEPENDS= ${LOCALBASE}/bin/javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/linux-sun-jdk12/pkg-comment b/java/linux-sun-jdk12/pkg-comment
deleted file mode 100644
index 7efc4e64a9e2..000000000000
--- a/java/linux-sun-jdk12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sun Java Development Kit 1.2 for Linux
diff --git a/java/linux-sun-jdk13/Makefile b/java/linux-sun-jdk13/Makefile
index a8aec5fc79e0..5bfaad2617d0 100644
--- a/java/linux-sun-jdk13/Makefile
+++ b/java/linux-sun-jdk13/Makefile
@@ -15,6 +15,7 @@ DISTNAME= j2sdk-${JDK_VERSION:S/./_/g}_${JDK_REVISION}-linux-i586
EXTRACT_SUFX= .bin
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Sun Java Development Kit 1.3 for Linux
BUILD_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/linux-sun-jdk13/pkg-comment b/java/linux-sun-jdk13/pkg-comment
deleted file mode 100644
index 91eaab11a0c9..000000000000
--- a/java/linux-sun-jdk13/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sun Java Development Kit 1.3 for Linux
diff --git a/java/linux-sun-jdk14/Makefile b/java/linux-sun-jdk14/Makefile
index 99fce6b64a8b..89ac8a95277e 100644
--- a/java/linux-sun-jdk14/Makefile
+++ b/java/linux-sun-jdk14/Makefile
@@ -15,6 +15,7 @@ DISTNAME= j2sdk-${DL_JDK_VERSION:S/./_/g}-linux-i586
EXTRACT_SUFX= .bin
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Sun Java Development Kit 1.4 for Linux
BUILD_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper
diff --git a/java/linux-sun-jdk14/pkg-comment b/java/linux-sun-jdk14/pkg-comment
deleted file mode 100644
index 1fd141e8a609..000000000000
--- a/java/linux-sun-jdk14/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sun Java Development Kit 1.4 for Linux
diff --git a/java/mmake/Makefile b/java/mmake/Makefile
index ca886caef28c..b808e8236862 100644
--- a/java/mmake/Makefile
+++ b/java/mmake/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= java devel
MASTER_SITES= http://www.tildeslash.com/mmake/dist/
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Create a Makefile for Your Java files, ready to compile
BUILD_DEPENDS= jikes:${PORTSDIR}/java/jikes
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/java/mmake/pkg-comment b/java/mmake/pkg-comment
deleted file mode 100644
index a7dc42e532e9..000000000000
--- a/java/mmake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create a Makefile for Your Java files, ready to compile
diff --git a/java/netcomponents/Makefile b/java/netcomponents/Makefile
index 63be598755f1..c06f9711ed54 100644
--- a/java/netcomponents/Makefile
+++ b/java/netcomponents/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.savarese.org/oro/downloads/download/
DISTNAME= NetComponents-${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java library with common network protocol implementations
USE_JAVA= 1.1+
USE_ZIP= yes
diff --git a/java/netcomponents/pkg-comment b/java/netcomponents/pkg-comment
deleted file mode 100644
index 80c84453a931..000000000000
--- a/java/netcomponents/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java library with common network protocol implementations
diff --git a/java/openjit/Makefile b/java/openjit/Makefile
index 27d8eb207624..ce749312223e 100644
--- a/java/openjit/Makefile
+++ b/java/openjit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.openjit.org/dist/
DISTNAME= OpenJIT-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A high-performance reflective Java Just-In-Time (JIT) bytecode compiler
BUILD_DEPENDS= ${JAVADIR}/bin/java:${PORTSDIR}/java/jdk11
diff --git a/java/openjit/pkg-comment b/java/openjit/pkg-comment
deleted file mode 100644
index 4237b6d9c0dc..000000000000
--- a/java/openjit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A high-performance reflective Java Just-In-Time (JIT) bytecode compiler
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index ec7a85f9ae9c..99691a6694a5 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
${PORTNAME}-native-library-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= archie@freebsd.org
+COMMENT= Java VM created by McGill University's Sable Research Group
BUILD_DEPENDS= jikes:${PORTSDIR}/java/jikes
LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \
diff --git a/java/sablevm/pkg-comment b/java/sablevm/pkg-comment
deleted file mode 100644
index 55cce2bed169..000000000000
--- a/java/sablevm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java VM created by McGill University's Sable Research Group
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index 8c272ad47fba..a0869253d3cc 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= java
MASTER_SITES= http://www.shudo.net/jit/dist/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A Just In Time java bytecode compiler
LIB_DEPENDS= gdbm:${PORTSDIR}/databases/gdbm
diff --git a/java/shujit/pkg-comment b/java/shujit/pkg-comment
deleted file mode 100644
index e7e9344e579d..000000000000
--- a/java/shujit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Just In Time java bytecode compiler
diff --git a/java/tya/Makefile b/java/tya/Makefile
index 057bcf6ef6c8..e7d83b7a2624 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -13,6 +13,7 @@ DISTNAME= tya17v3
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A ``100% unofficial'' JIT-compiler for java
BUILD_DEPENDS= ${JAVADIR}/bin/java:${PORTSDIR}/java/jdk11
diff --git a/java/tya/pkg-comment b/java/tya/pkg-comment
deleted file mode 100644
index 8f6107f93b49..000000000000
--- a/java/tya/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ``100% unofficial'' JIT-compiler for java
diff --git a/java/xalan-j/Makefile b/java/xalan-j/Makefile
index 744104bb5d9b..d397d2bcf2e1 100644
--- a/java/xalan-j/Makefile
+++ b/java/xalan-j/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://xml.apache.org/dist/${PORTNAME}/
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Apache XSLT processor for transforming XML documents
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/java/xalan-j/pkg-comment b/java/xalan-j/pkg-comment
deleted file mode 100644
index ba27758f8b06..000000000000
--- a/java/xalan-j/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache XSLT processor for transforming XML documents
diff --git a/korean/a2ps/Makefile b/korean/a2ps/Makefile
index b87e03acc375..20c747bd8eea 100644
--- a/korean/a2ps/Makefile
+++ b/korean/a2ps/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX= .py
EXTRACT_ONLY=
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Simple a2ps wrapper for Korean text printing
# depends on a2ps-a4. a2ps has several variation, so if I should
# choose one, a2ps-a4 is good because A4-sized paper is default in Korea.
diff --git a/korean/a2ps/pkg-comment b/korean/a2ps/pkg-comment
deleted file mode 100644
index f4771076a2d5..000000000000
--- a/korean/a2ps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple a2ps wrapper for Korean text printing
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index f6c682274f16..4df975a2091c 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${DISTNAME}.tar.gz hanja.dic.gz:hjdic ami.dic:amidic
EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Well-known Korean X11 Input Method
LIB_DEPENDS= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
diff --git a/korean/ami/pkg-comment b/korean/ami/pkg-comment
deleted file mode 100644
index d9cbe27ea7c2..000000000000
--- a/korean/ami/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Well-known Korean X11 Input Method
diff --git a/korean/baekmukfonts-bdf/Makefile b/korean/baekmukfonts-bdf/Makefile
index bae6e8678b8c..6aeb5b4256db 100644
--- a/korean/baekmukfonts-bdf/Makefile
+++ b/korean/baekmukfonts-bdf/Makefile
@@ -20,6 +20,7 @@ DISTFILES= baekmuk-${PORTVERSION}${EXTRACT_SUFX} \
EXTRACT_ONLY= baekmuk-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= cjh@freebsd.org
+COMMENT= Free Hangul fonts for X11(baekmuk)
USE_X_PREFIX= yes
diff --git a/korean/baekmukfonts-bdf/pkg-comment b/korean/baekmukfonts-bdf/pkg-comment
deleted file mode 100644
index 4a879225628d..000000000000
--- a/korean/baekmukfonts-bdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free Hangul fonts for X11(baekmuk)
diff --git a/korean/baekmukfonts-ttf/Makefile b/korean/baekmukfonts-ttf/Makefile
index fd58524548d3..f9c2166ead3a 100644
--- a/korean/baekmukfonts-ttf/Makefile
+++ b/korean/baekmukfonts-ttf/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -ttf
DISTNAME= baekmuk${PKGNAMESUFFIX}-${PORTVERSION}
MAINTAINER= cjh@kr.freebsd.org
+COMMENT= Baekmuk family Korean TrueType Fonts
USE_X_PREFIX= yes
NO_BUILD= yes
diff --git a/korean/baekmukfonts-ttf/pkg-comment b/korean/baekmukfonts-ttf/pkg-comment
deleted file mode 100644
index b5bcc5018d03..000000000000
--- a/korean/baekmukfonts-ttf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Baekmuk family Korean TrueType Fonts
diff --git a/korean/byeoroo/Makefile b/korean/byeoroo/Makefile
index bbc03410de7c..f7ae851c9416 100644
--- a/korean/byeoroo/Makefile
+++ b/korean/byeoroo/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= korean x11
MASTER_SITES= http://master.debian.or.kr/~cwryu/archive/byeoroo/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Korean X11 Input Method
BROKEN= "Does not compile"
diff --git a/korean/byeoroo/pkg-comment b/korean/byeoroo/pkg-comment
deleted file mode 100644
index b24aadaa9793..000000000000
--- a/korean/byeoroo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean X11 Input Method
diff --git a/korean/elm/Makefile b/korean/elm/Makefile
index 495fd199afdb..390f2e080479 100644
--- a/korean/elm/Makefile
+++ b/korean/elm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.kaist.ac.kr/pub/hangul/mail/old/Others/ \
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
+COMMENT= ELM Mail User Agent, patched for Korean E-Mail
MAN1= answer.1 checkalias.1 elm.1 elmalias.1 fastmail.1 filter.1\
frm.1 listalias.1 messages.1 newalias.1 printmail.1 readmsg.1\
diff --git a/korean/elm/pkg-comment b/korean/elm/pkg-comment
deleted file mode 100644
index 128f41ab5958..000000000000
--- a/korean/elm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ELM Mail User Agent, patched for Korean E-Mail
diff --git a/korean/ftghostscript5/Makefile b/korean/ftghostscript5/Makefile
index 977174a08c4d..e6ca43a418a1 100644
--- a/korean/ftghostscript5/Makefile
+++ b/korean/ftghostscript5/Makefile
@@ -31,6 +31,7 @@ DIST_SUBDIR= ghostscript
EXTRACT_ONLY= ${GS_SOURCES} ${PCL3_DRV}
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Aladdin Postscript interpreter with Korean Truetype fonts support
RUN_DEPENDS= $(LOCALBASE)/share/ghostscript/fonts:${PORTSDIR}/print/gsfonts \
$(LOCALBASE)/share/ghostscript/fonts/CMap:${PORTSDIR}/korean/munhwafonts-cid \
diff --git a/korean/ftghostscript5/pkg-comment b/korean/ftghostscript5/pkg-comment
deleted file mode 100644
index d8cac3400874..000000000000
--- a/korean/ftghostscript5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aladdin Postscript interpreter with Korean Truetype fonts support
diff --git a/korean/gau/Makefile b/korean/gau/Makefile
index ea8c059a12ea..a88c793e5a87 100644
--- a/korean/gau/Makefile
+++ b/korean/gau/Makefile
@@ -17,6 +17,7 @@ PATCHFILES= gau-0.4.1.patch gau-0.4.1-rc.patch gau-0.4.1-grim_show.patch \
PATCH_DIST_STRIP= -p1
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Gtk-based Hangul terminal emulator (for modem/tcp)
RUN_DEPENDS= lrz:${PORTSDIR}/comms/lrzsz \
${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
diff --git a/korean/gau/pkg-comment b/korean/gau/pkg-comment
deleted file mode 100644
index f05d9a019cb6..000000000000
--- a/korean/gau/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk-based Hangul terminal emulator (for modem/tcp)
diff --git a/korean/ghostscript55httf/Makefile b/korean/ghostscript55httf/Makefile
index dc9bf32523ea..64d3b0fb54b2 100644
--- a/korean/ghostscript55httf/Makefile
+++ b/korean/ghostscript55httf/Makefile
@@ -22,6 +22,7 @@ PATCHFILES= gs5.50-httf-19990114_1.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Aladdin Postscript interpreter with Korean truetype support
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/graphics/jpeg:extract \
${NONEXISTENT}:${PORTSDIR}/graphics/png:extract \
diff --git a/korean/ghostscript55httf/pkg-comment b/korean/ghostscript55httf/pkg-comment
deleted file mode 100644
index 7c52050864e7..000000000000
--- a/korean/ghostscript55httf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aladdin Postscript interpreter with Korean truetype support
diff --git a/korean/gtkcomm/Makefile b/korean/gtkcomm/Makefile
index 9362e4f2e4ef..7c991dba1bc0 100644
--- a/korean/gtkcomm/Makefile
+++ b/korean/gtkcomm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= korean comms
MASTER_SITES= http://download.kldp.net/gtkcomm/
MAINTAINER= cjh@kr.freebsd.org
+COMMENT= Serial controlling software, with gtk+ widget
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
diff --git a/korean/gtkcomm/pkg-comment b/korean/gtkcomm/pkg-comment
deleted file mode 100644
index c1b23805bc5b..000000000000
--- a/korean/gtkcomm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Serial controlling software, with gtk+ widget
diff --git a/korean/h2ps/Makefile b/korean/h2ps/Makefile
index 4e9f433474af..d82008f208a4 100644
--- a/korean/h2ps/Makefile
+++ b/korean/h2ps/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ \
ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Formats an ascii file for printing on a postscript printer with Korean char
pre-build:
@(cd ${WRKSRC}; make clean)
diff --git a/korean/h2ps/pkg-comment b/korean/h2ps/pkg-comment
deleted file mode 100644
index 4a844fa9e548..000000000000
--- a/korean/h2ps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Formats an ascii file for printing on a postscript printer with Korean char
diff --git a/korean/han/Makefile b/korean/han/Makefile
index 3f5ceb53aec1..15f33fbb6c55 100644
--- a/korean/han/Makefile
+++ b/korean/han/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= korean
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= A hangul console
ONLY_FOR_ARCHS= i386
diff --git a/korean/han/pkg-comment b/korean/han/pkg-comment
deleted file mode 100644
index f181de956550..000000000000
--- a/korean/han/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A hangul console
diff --git a/korean/hanIM/Makefile b/korean/hanIM/Makefile
index 957c890913e7..ad48be0d2a6b 100644
--- a/korean/hanIM/Makefile
+++ b/korean/hanIM/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= korean x11
MASTER_SITES= ftp://ftp.mizi.com/pub/hanIM/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Mizi Research's Korean X11 Input Method
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
diff --git a/korean/hanIM/pkg-comment b/korean/hanIM/pkg-comment
deleted file mode 100644
index 84be41f0ef7e..000000000000
--- a/korean/hanIM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mizi Research's Korean X11 Input Method
diff --git a/korean/hanemacs/Makefile b/korean/hanemacs/Makefile
index ecf97951cdc8..b0df3dbd0d06 100644
--- a/korean/hanemacs/Makefile
+++ b/korean/hanemacs/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/ \
DISTNAME= hanemacs-19.34b-1
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Korean version of GNU editing macros
NOT_FOR_ARCHS= alpha
diff --git a/korean/hanemacs/pkg-comment b/korean/hanemacs/pkg-comment
deleted file mode 100644
index c7986ae7fb4a..000000000000
--- a/korean/hanemacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean version of GNU editing macros
diff --git a/korean/hanmiscutils/Makefile b/korean/hanmiscutils/Makefile
index f25805dff4f0..e7d2b5924d44 100644
--- a/korean/hanmiscutils/Makefile
+++ b/korean/hanmiscutils/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= korean
MASTER_SITES= http://kldp.org/~bangjy/hangul/
MAINTAINER= cjh@FreeBSD.ORG
+COMMENT= Collection of various Hangul-related sources
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/korean/hanmiscutils/pkg-comment b/korean/hanmiscutils/pkg-comment
deleted file mode 100644
index 4506e2adedc6..000000000000
--- a/korean/hanmiscutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of various Hangul-related sources
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index 9e18dd12b326..e9f55b4394ec 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -xf
DISTNAME= hanterm${PKGNAMESUFFIX}-2.0.5-173
MAINTAINER= cjh@FreeBSD.org
+COMMENT= X11R6-based xterm hacked for managing Korean languages
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
diff --git a/korean/hanterm-xf86/pkg-comment b/korean/hanterm-xf86/pkg-comment
deleted file mode 100644
index b2d3c5cfe095..000000000000
--- a/korean/hanterm-xf86/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11R6-based xterm hacked for managing Korean languages
diff --git a/korean/hanterm/Makefile b/korean/hanterm/Makefile
index fc1ac4648c07..3088d79b8cf5 100644
--- a/korean/hanterm/Makefile
+++ b/korean/hanterm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://hanterm.org/download/ \
ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= An xterm hacked for managing Korean languages
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/local/johabm16.pcf.gz:${PORTSDIR}/korean/johabfonts
diff --git a/korean/hanterm/pkg-comment b/korean/hanterm/pkg-comment
deleted file mode 100644
index 9aba69544204..000000000000
--- a/korean/hanterm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xterm hacked for managing Korean languages
diff --git a/korean/hanyangfonts/Makefile b/korean/hanyangfonts/Makefile
index 8a355bd8527f..8bf8849a3df7 100644
--- a/korean/hanyangfonts/Makefile
+++ b/korean/hanyangfonts/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ \
DISTNAME= hanyang-font-pcf
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hanyang Hangul fonts for X11
USE_X_PREFIX= yes
diff --git a/korean/hanyangfonts/pkg-comment b/korean/hanyangfonts/pkg-comment
deleted file mode 100644
index 7da66c9b8b4d..000000000000
--- a/korean/hanyangfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hanyang Hangul fonts for X11
diff --git a/korean/hcode/Makefile b/korean/hcode/Makefile
index 45247e205a99..062a34f20d9b 100644
--- a/korean/hcode/Makefile
+++ b/korean/hcode/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ \
DISTNAME= hcode2.1-mailpatch3
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul code conversion utility
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/hcode ${PREFIX}/bin
diff --git a/korean/hcode/pkg-comment b/korean/hcode/pkg-comment
deleted file mode 100644
index 7c82f3e80122..000000000000
--- a/korean/hcode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul code conversion utility
diff --git a/korean/helvis/Makefile b/korean/helvis/Makefile
index 53ac863bb508..7a6f23885293 100644
--- a/korean/helvis/Makefile
+++ b/korean/helvis/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.kr.FreeBSD.org/pub/FreeBSD-kr/distfiles/ \
DISTNAME= helvis-1.8h2-
MAINTAINER= cjh@FreeBSD.org
+COMMENT= A clone of vi/ex, the standard UNIX editor, supporting Hangul
MAN1= ctags.1 elvis.1 elvprsv.1 elvrec.1 fmt.1 ref.1
diff --git a/korean/helvis/pkg-comment b/korean/helvis/pkg-comment
deleted file mode 100644
index dcb48eeccef8..000000000000
--- a/korean/helvis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, the standard UNIX editor, supporting Hangul
diff --git a/korean/hlatex-psfonts-uhc-extra/Makefile b/korean/hlatex-psfonts-uhc-extra/Makefile
index c5b1d80da3b8..07293c43d1db 100644
--- a/korean/hlatex-psfonts-uhc-extra/Makefile
+++ b/korean/hlatex-psfonts-uhc-extra/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= hlatex
EXTRACT_ONLY=
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Extra Korean PostScript font collection for HLaTeX(UHC encoding)
RUN_DEPENDS= ${LOCALBASE}/share/texmf/doc/latex/hlatex/uhc.ks:${PORTSDIR}/korean/hlatex
diff --git a/korean/hlatex-psfonts-uhc-extra/pkg-comment b/korean/hlatex-psfonts-uhc-extra/pkg-comment
deleted file mode 100644
index d85a49364b42..000000000000
--- a/korean/hlatex-psfonts-uhc-extra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extra Korean PostScript font collection for HLaTeX(UHC encoding)
diff --git a/korean/hlatex-wansung/Makefile b/korean/hlatex-wansung/Makefile
index 3a58d74ddb71..159a909d5153 100644
--- a/korean/hlatex-wansung/Makefile
+++ b/korean/hlatex-wansung/Makefile
@@ -13,6 +13,7 @@ DISTNAME= wansung
DIST_SUBDIR= hlatex
MAINTAINER= cjh@FreeBSD.org
+COMMENT= HLaTeX extension to use Wansung(KSX1001) fonts
# it depends on HLaTeX(uhc)
RUN_DEPENDS= ${LOCALBASE}/share/texmf/doc/latex/hlatex/uhc.ks:${PORTSDIR}/korean/hlatex
diff --git a/korean/hlatex-wansung/pkg-comment b/korean/hlatex-wansung/pkg-comment
deleted file mode 100644
index 3fca4d183611..000000000000
--- a/korean/hlatex-wansung/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HLaTeX extension to use Wansung(KSX1001) fonts
diff --git a/korean/hlatex/Makefile b/korean/hlatex/Makefile
index aebe1499a250..24d48047bb43 100644
--- a/korean/hlatex/Makefile
+++ b/korean/hlatex/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= hlatex
EXTRACT_ONLY= HLaTeX-0.991.tar.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= LaTeX package to use Hangul(UHC/KSX1001)
# it depends on teTeX(lambda)
BUILD_DEPENDS= texhash:${PORTSDIR}/print/teTeX
diff --git a/korean/hlatex/pkg-comment b/korean/hlatex/pkg-comment
deleted file mode 100644
index 46c533972a35..000000000000
--- a/korean/hlatex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-LaTeX package to use Hangul(UHC/KSX1001)
diff --git a/korean/hlatexfonts-ocf/Makefile b/korean/hlatexfonts-ocf/Makefile
index 9b9f36d3fe6a..b07f75624ad4 100644
--- a/korean/hlatexfonts-ocf/Makefile
+++ b/korean/hlatexfonts-ocf/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
DISTFILES= HLaTeX-Myoungjo-OCF-PS.tar.gz HLaTeX-Gothic-OCF-PS.tar.gz
MAINTAINER= cjh@kr.freebsd.org
+COMMENT= HLaTeX(OCF format) fonts collection
BUILD_DEPENDS= $(LOCALBASE)/share/ghostscript/fonts/Fontmap:${PORTSDIR}/print/gsfonts
diff --git a/korean/hlatexfonts-ocf/pkg-comment b/korean/hlatexfonts-ocf/pkg-comment
deleted file mode 100644
index 428bab0f593e..000000000000
--- a/korean/hlatexfonts-ocf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HLaTeX(OCF format) fonts collection
diff --git a/korean/hlatexp/Makefile b/korean/hlatexp/Makefile
index b30798453daa..b0ddd8f8da00 100644
--- a/korean/hlatexp/Makefile
+++ b/korean/hlatexp/Makefile
@@ -14,6 +14,7 @@ DISTFILES= unpacked.tar.gz htex.tfm.tar.gz
DIST_SUBDIR= htex
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul (Korean) LaTeX2e system
# it depends teTeX.
RUN_DEPENDS= virtex:${PORTSDIR}/print/teTeX
diff --git a/korean/hlatexp/pkg-comment b/korean/hlatexp/pkg-comment
deleted file mode 100644
index f63657e9c6a4..000000000000
--- a/korean/hlatexp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul (Korean) LaTeX2e system
diff --git a/korean/hmconv/Makefile b/korean/hmconv/Makefile
index 744ea11705d8..ca507e58802e 100644
--- a/korean/hmconv/Makefile
+++ b/korean/hmconv/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.kaist.ac.kr/pub/hangul/code/hmconv/ \
DISTNAME= hmconv1.0pl3
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul code conversion utility for E-mail
WRKSRC= ${WRKDIR}/hmconv
diff --git a/korean/hmconv/pkg-comment b/korean/hmconv/pkg-comment
deleted file mode 100644
index 8ddf35ee0d85..000000000000
--- a/korean/hmconv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul code conversion utility for E-mail
diff --git a/korean/hpscat/Makefile b/korean/hpscat/Makefile
index ce15c8026b9a..1fde8b3c86b5 100644
--- a/korean/hpscat/Makefile
+++ b/korean/hpscat/Makefile
@@ -17,6 +17,7 @@ DISTNAME= hpscat-jshin
DISTFILES= hpscat-jshin.tar.gz ked.tar.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul Text Printing Utility
RUN_DEPENDS= hcode:${PORTSDIR}/korean/hcode
diff --git a/korean/hpscat/pkg-comment b/korean/hpscat/pkg-comment
deleted file mode 100644
index 5ced9fa54250..000000000000
--- a/korean/hpscat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul Text Printing Utility
diff --git a/korean/htexp/Makefile b/korean/htexp/Makefile
index 6282c8ed263b..45f116689118 100644
--- a/korean/htexp/Makefile
+++ b/korean/htexp/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR= htex
EXTRACT_ONLY= unpacked.tar.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= An implementation of TeX for Hangul
# it depends teTeX.
RUN_DEPENDS= virtex:${PORTSDIR}/print/teTeX
diff --git a/korean/htexp/pkg-comment b/korean/htexp/pkg-comment
deleted file mode 100644
index 507d02b2d257..000000000000
--- a/korean/htexp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of TeX for Hangul
diff --git a/korean/johabfonts/Makefile b/korean/johabfonts/Makefile
index 90768009a19b..96b01e0ceb09 100644
--- a/korean/johabfonts/Makefile
+++ b/korean/johabfonts/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://hanterm.org/download/font/
DISTNAME= hanterm-font-${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul fonts for X11(johab) used in many hangul-related programs
USE_IMAKE= yes
diff --git a/korean/johabfonts/pkg-comment b/korean/johabfonts/pkg-comment
deleted file mode 100644
index 6c4762d5b1e2..000000000000
--- a/korean/johabfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul fonts for X11(johab) used in many hangul-related programs
diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile
index 72bad29a6b0e..4e0d90be08ba 100644
--- a/korean/kaistfonts/Makefile
+++ b/korean/kaistfonts/Makefile
@@ -14,6 +14,7 @@ DISTFILES= kaist-newmj18.bdf.gz ks_philgi16.bdf.gz \
kaist-newmj16.bdf.gz ks_iyagi16.bdf.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= X11 KAIST font(ksc5601.1987-0 encoding) collection
USE_X_PREFIX= yes
diff --git a/korean/kaistfonts/pkg-comment b/korean/kaistfonts/pkg-comment
deleted file mode 100644
index 2b939eb92ea4..000000000000
--- a/korean/kaistfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 KAIST font(ksc5601.1987-0 encoding) collection
diff --git a/korean/kde3-i18n/Makefile b/korean/kde3-i18n/Makefile
index b6c8b5a1e236..f49acfbdb9cc 100644
--- a/korean/kde3-i18n/Makefile
+++ b/korean/kde3-i18n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ko-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/korean/kde3-i18n/pkg-comment b/korean/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/korean/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/korean/kde4-l10n/Makefile b/korean/kde4-l10n/Makefile
index b6c8b5a1e236..f49acfbdb9cc 100644
--- a/korean/kde4-l10n/Makefile
+++ b/korean/kde4-l10n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ko-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/korean/kde4-l10n/pkg-comment b/korean/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/korean/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/korean/linux_locale/Makefile b/korean/linux_locale/Makefile
index 11252a9a225d..0f1a672dd48a 100644
--- a/korean/linux_locale/Makefile
+++ b/korean/linux_locale/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
DISTNAME= ${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}
MAINTAINER= cjh@kr.freebsd.org
+COMMENT= Glibc 2.0 Korean locale for linux compatibility
BUILD_DEPENDS= ${PREFIX}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base
RUN_DEPENDS= ${PREFIX}/usr/share/locale/ko:${PORTSDIR}/emulators/linux_base
diff --git a/korean/linux_locale/pkg-comment b/korean/linux_locale/pkg-comment
deleted file mode 100644
index 72b1bcc7ff50..000000000000
--- a/korean/linux_locale/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Glibc 2.0 Korean locale for linux compatibility
diff --git a/korean/linuxdoc-sgml/Makefile b/korean/linuxdoc-sgml/Makefile
index e1d36dced0a0..74ba2f6b3b58 100644
--- a/korean/linuxdoc-sgml/Makefile
+++ b/korean/linuxdoc-sgml/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= korean textproc
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/users/cjh/sgml-tools-ko/old/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Korean patch version of Linuxdoc-SGML
USE_PERL5= yes
MAN1= sgml2html.1 sgml2latex.1 sgml2rtf.1 sgmls.1 \
diff --git a/korean/linuxdoc-sgml/pkg-comment b/korean/linuxdoc-sgml/pkg-comment
deleted file mode 100644
index 065db5c6919d..000000000000
--- a/korean/linuxdoc-sgml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean patch version of Linuxdoc-SGML
diff --git a/korean/mizifont/Makefile b/korean/mizifont/Makefile
index 7e0b0ceedbbb..db7b33a60deb 100644
--- a/korean/mizifont/Makefile
+++ b/korean/mizifont/Makefile
@@ -13,6 +13,7 @@ DISTNAME= xfntmizi-1.1-2.noarch
EXTRACT_SUFX= .rpm
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Mizi Research's Korean X11 Font(ksc5601.1987-[01] encoding)
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm
diff --git a/korean/mizifont/pkg-comment b/korean/mizifont/pkg-comment
deleted file mode 100644
index 8b7ad32f02c4..000000000000
--- a/korean/mizifont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mizi Research's Korean X11 Font(ksc5601.1987-[01] encoding)
diff --git a/korean/mkisofs/Makefile b/korean/mkisofs/Makefile
index a4bd30e81f50..8c0d54bb6a6b 100644
--- a/korean/mkisofs/Makefile
+++ b/korean/mkisofs/Makefile
@@ -17,6 +17,7 @@ PATCHFILES= mkisofs-1.13-cp949.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Create iso9660/Rock Ridge/Joliet filesystems supporting Korean
MAN8= apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
USE_GMAKE= yes
diff --git a/korean/mkisofs/pkg-comment b/korean/mkisofs/pkg-comment
deleted file mode 100644
index 2f575388e578..000000000000
--- a/korean/mkisofs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create iso9660/Rock Ridge/Joliet filesystems supporting Korean
diff --git a/korean/mozilla-klp/Makefile b/korean/mozilla-klp/Makefile
index 2faa43a0ded1..b1617071e8af 100644
--- a/korean/mozilla-klp/Makefile
+++ b/korean/mozilla-klp/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR= mozilla-klp
EXTRACT_SUFX= .xpi
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Mozilla Korean Language Pack (KLP)
BUILD_DEPENDS= ${X11BASE}/lib/mozilla/regxpcom:${PORTSDIR}/www/mozilla
RUN_DEPENDS= mozilla:${PORTSDIR}/www/mozilla
diff --git a/korean/mozilla-klp/pkg-comment b/korean/mozilla-klp/pkg-comment
deleted file mode 100644
index 193d60503ecd..000000000000
--- a/korean/mozilla-klp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mozilla Korean Language Pack (KLP)
diff --git a/korean/msdosfs/Makefile b/korean/msdosfs/Makefile
index bf1ec6c88275..885561a0dece 100644
--- a/korean/msdosfs/Makefile
+++ b/korean/msdosfs/Makefile
@@ -19,6 +19,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
mount_msdos-20000701.tar.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Mount a Microsoft FAT Korean file system
WRKSRC= ${WRKDIR}/${DISTNAME}/msdosfs.ko
diff --git a/korean/msdosfs/pkg-comment b/korean/msdosfs/pkg-comment
deleted file mode 100644
index d0cc13dd96d4..000000000000
--- a/korean/msdosfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mount a Microsoft FAT Korean file system
diff --git a/korean/munhwafonts-cid/Makefile b/korean/munhwafonts-cid/Makefile
index 6de8a3f15114..6b9525a51409 100644
--- a/korean/munhwafonts-cid/Makefile
+++ b/korean/munhwafonts-cid/Makefile
@@ -16,6 +16,7 @@ DISTFILES= ${CID_FONTS_KO} ${CID_CMAP_KO}
EXTRACT_ONLY= ${CID_CMAP_KO}
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Munhwa CID fonts collection(Basic set)
# sample fonts(cid, free Korean fonts is just only one.. :< )
CID_FONTS_KO= Munhwa-Regular Munhwa-Bold \
diff --git a/korean/munhwafonts-cid/pkg-comment b/korean/munhwafonts-cid/pkg-comment
deleted file mode 100644
index 62005b116422..000000000000
--- a/korean/munhwafonts-cid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Munhwa CID fonts collection(Basic set)
diff --git a/korean/netscape48-communicator/Makefile b/korean/netscape48-communicator/Makefile
index 4849f5e6defc..755261c16590 100644
--- a/korean/netscape48-communicator/Makefile
+++ b/korean/netscape48-communicator/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/users/cjh/netscape-ko/ \
DISTNAME= ${KOREAN_KIT}
MAINTAINER?= cjh@FreeBSD.org
+COMMENT= Netscape web-surfboard with Korean resources
# ?= for ports that include this Makefile
RUN_DEPENDS?= ${LOCALBASE}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER_NAME}
diff --git a/korean/netscape48-communicator/pkg-comment b/korean/netscape48-communicator/pkg-comment
deleted file mode 100644
index a8d8d4df27d0..000000000000
--- a/korean/netscape48-communicator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape web-surfboard with Korean resources
diff --git a/korean/nh2ps/Makefile b/korean/nh2ps/Makefile
index 8975cc1159b8..4dc1fd6ee0a3 100644
--- a/korean/nh2ps/Makefile
+++ b/korean/nh2ps/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= korean print
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/users/cjh/nh2ps/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Formats an Korean text file for printing on a postscript printer
USE_PERL5_BUILD=yes
diff --git a/korean/nh2ps/pkg-comment b/korean/nh2ps/pkg-comment
deleted file mode 100644
index de732ff63458..000000000000
--- a/korean/nh2ps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Formats an Korean text file for printing on a postscript printer
diff --git a/korean/nhpf/Makefile b/korean/nhpf/Makefile
index c9310f7ce2a5..13e6d16c694b 100644
--- a/korean/nhpf/Makefile
+++ b/korean/nhpf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ \
ftp://ftp.kr.freebsd.org/pub/FreeBSD-kr/distfiles/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul Printing Filter for Netscape with embedded font
do-install:
${MKDIR} ${PREFIX}/bin
diff --git a/korean/nhpf/pkg-comment b/korean/nhpf/pkg-comment
deleted file mode 100644
index 17e8afa2ca54..000000000000
--- a/korean/nhpf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul Printing Filter for Netscape with embedded font
diff --git a/korean/nhppf/Makefile b/korean/nhppf/Makefile
index 06c5fd5a33c4..36acfe63b0e0 100644
--- a/korean/nhppf/Makefile
+++ b/korean/nhppf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= korean
MASTER_SITES= ftp://ftp.kr.freebsd.org/pub/users/cjh/nhppf/
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul printing filter for Netscape 3.0 and above
RUN_DEPENDS= ${PREFIX}/share/texmf/fonts/type1/korean/pkmj/pkmjm0.pfb:$(PORTSDIR)/korean/hlatex-psfonts-wansung
diff --git a/korean/nhppf/pkg-comment b/korean/nhppf/pkg-comment
deleted file mode 100644
index ecfe71cae57f..000000000000
--- a/korean/nhppf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul printing filter for Netscape 3.0 and above
diff --git a/korean/pgp.language/Makefile b/korean/pgp.language/Makefile
index feb36d18f50e..4d835a6d4d95 100644
--- a/korean/pgp.language/Makefile
+++ b/korean/pgp.language/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://sparcs.kaist.ac.kr/~firiel/Works/ \
DISTNAME= pgp263i-${PGP_LANGUAGE}
MAINTAINER= cjh@kr.freebsd.org
+COMMENT= Korean language module for PGP
RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp
diff --git a/korean/pgp.language/pkg-comment b/korean/pgp.language/pkg-comment
deleted file mode 100644
index 80f85a665e07..000000000000
--- a/korean/pgp.language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean language module for PGP
diff --git a/korean/pinetreefonts/Makefile b/korean/pinetreefonts/Makefile
index ff12bbc48c27..57c607c50387 100644
--- a/korean/pinetreefonts/Makefile
+++ b/korean/pinetreefonts/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://cglab.snu.ac.kr/pub/hangul/n3f/tar/ \
DISTNAME= pinetree.precomposed-${PORTVERSION}-bdf
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding)
USE_X_PREFIX= yes
diff --git a/korean/pinetreefonts/pkg-comment b/korean/pinetreefonts/pkg-comment
deleted file mode 100644
index 59fe534aadce..000000000000
--- a/korean/pinetreefonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hangul fonts for X11(pinetree, KSC5601-1987-0 encoding)
diff --git a/korean/texinfo/Makefile b/korean/texinfo/Makefile
index 40920b9e02e4..34a470fa238d 100644
--- a/korean/texinfo/Makefile
+++ b/korean/texinfo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://master.debian.or.kr/~cwryu/archive/texinfo-ko/
DISTNAME= ${PORTNAME}-ko-${PORTVERSION}
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Korean enabled Texinfo formatter
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
RUN_DEPENDS= ${LOCALBASE}/share/texmf/doc/latex/hlatex/uhc.ks:${PORTSDIR}/korean/hlatex
diff --git a/korean/texinfo/pkg-comment b/korean/texinfo/pkg-comment
deleted file mode 100644
index 6c3cdfbb8400..000000000000
--- a/korean/texinfo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Korean enabled Texinfo formatter
diff --git a/korean/uniksc/Makefile b/korean/uniksc/Makefile
index ef66d3fe2a35..e2f518d5f891 100644
--- a/korean/uniksc/Makefile
+++ b/korean/uniksc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= korean converters
MASTER_SITES= http://kldp.org/~bangjy/hangul/
MAINTAINER= cjh@freebsd.org
+COMMENT= Converts data between Korean KSC-5601 and Unicode 3.0 UTF-16
INSTALLS_SHLIB= YES
diff --git a/korean/uniksc/pkg-comment b/korean/uniksc/pkg-comment
deleted file mode 100644
index 41a4962068e6..000000000000
--- a/korean/uniksc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts data between Korean KSC-5601 and Unicode 3.0 UTF-16
diff --git a/lang/afnix/Makefile b/lang/afnix/Makefile
index 0b02a42f6e90..f4ae2d931713 100644
--- a/lang/afnix/Makefile
+++ b/lang/afnix/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION:S,.,-,g}
DISTNAME= ${PORTNAME}-src-${PORTVERSION:S,.,-,g}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Aleph is a multi-threaded functional programming language
USE_GMAKE= yes
MAKE_ARGS= CC="${CXX}" LD="${CXX}" LK="${CXX}" OPTCCFLAGS="${CXXFLAGS}" \
diff --git a/lang/afnix/pkg-comment b/lang/afnix/pkg-comment
deleted file mode 100644
index 1d103f3c012a..000000000000
--- a/lang/afnix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aleph is a multi-threaded functional programming language
diff --git a/lang/aleph/Makefile b/lang/aleph/Makefile
index 0b02a42f6e90..f4ae2d931713 100644
--- a/lang/aleph/Makefile
+++ b/lang/aleph/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION:S,.,-,g}
DISTNAME= ${PORTNAME}-src-${PORTVERSION:S,.,-,g}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Aleph is a multi-threaded functional programming language
USE_GMAKE= yes
MAKE_ARGS= CC="${CXX}" LD="${CXX}" LK="${CXX}" OPTCCFLAGS="${CXXFLAGS}" \
diff --git a/lang/aleph/pkg-comment b/lang/aleph/pkg-comment
deleted file mode 100644
index 1d103f3c012a..000000000000
--- a/lang/aleph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Aleph is a multi-threaded functional programming language
diff --git a/lang/bwbasic/Makefile b/lang/bwbasic/Makefile
index 0ee00fdfde14..b8d32a9312bb 100644
--- a/lang/bwbasic/Makefile
+++ b/lang/bwbasic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.rahul.net/pub2/rhn/www/files/
EXTRACT_SUFX= .tar.Z
MAINTAINER= msmith@FreeBSD.org
+COMMENT= The Bywater Basic interpreter
GNU_CONFIGURE= yes
WRKTOP= ${WRKDIR}/${DISTNAME}
diff --git a/lang/bwbasic/pkg-comment b/lang/bwbasic/pkg-comment
deleted file mode 100644
index 2aeed10015dd..000000000000
--- a/lang/bwbasic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Bywater Basic interpreter
diff --git a/lang/caml-light/Makefile b/lang/caml-light/Makefile
index 4d54a01fc3c0..08fd8651bec2 100644
--- a/lang/caml-light/Makefile
+++ b/lang/caml-light/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.inria.fr/lang/caml-light/ \
DISTNAME= cl74unix
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A strongly typed functional language belonging to the ML family
USE_XLIB= yes
WRKSRC= ${WRKDIR}/cl74
diff --git a/lang/caml-light/pkg-comment b/lang/caml-light/pkg-comment
deleted file mode 100644
index 9f4cd57b9771..000000000000
--- a/lang/caml-light/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A strongly typed functional language belonging to the ML family
diff --git a/lang/cel/Makefile b/lang/cel/Makefile
index 296b1787b279..c26a0186b37f 100644
--- a/lang/cel/Makefile
+++ b/lang/cel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.redwoodsoft.com/cel/
EXTRACT_SUFX= .tgz
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A small, simple prototype-based OO language
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/lang/cel/pkg-comment b/lang/cel/pkg-comment
deleted file mode 100644
index 0d0b66e39ab6..000000000000
--- a/lang/cel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small, simple prototype-based OO language
diff --git a/lang/cli/Makefile b/lang/cli/Makefile
index de792c2e4074..42b4e85f7055 100644
--- a/lang/cli/Makefile
+++ b/lang/cli/Makefile
@@ -16,6 +16,7 @@ DISTNAME= sscli_${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An implementation of the ECMA CLI and the ECMA C\# language
WRKSRC= ${WRKDIR}/sscli
diff --git a/lang/cli/pkg-comment b/lang/cli/pkg-comment
deleted file mode 100644
index cea3dc98dd85..000000000000
--- a/lang/cli/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the ECMA CLI and the ECMA C# language
diff --git a/lang/dice/Makefile b/lang/dice/Makefile
index 33d0c2d8b9a3..2f31d11a2a1e 100644
--- a/lang/dice/Makefile
+++ b/lang/dice/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-rel-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= adamw@FreeBSD.org
+COMMENT= DICE - The Amiga/embedded/generic 68000 C compiler
USE_REINPLACE= yes
diff --git a/lang/dice/pkg-comment b/lang/dice/pkg-comment
deleted file mode 100644
index af9f6146ce79..000000000000
--- a/lang/dice/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DICE - The Amiga/embedded/generic 68000 C compiler
diff --git a/lang/diveintopython/Makefile b/lang/diveintopython/Makefile
index f50a18183e1a..3815aa3677db 100644
--- a/lang/diveintopython/Makefile
+++ b/lang/diveintopython/Makefile
@@ -23,6 +23,7 @@ DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}-html-${VERSIONSTR}${EXTRACT_SUFX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A free Python tutorial book that is "not For Dummies(tm)"
NO_BUILD= YES
USE_REINPLACE= YES
diff --git a/lang/diveintopython/pkg-comment b/lang/diveintopython/pkg-comment
deleted file mode 100644
index 2ea709a47f7b..000000000000
--- a/lang/diveintopython/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free Python tutorial book that is "not For Dummies(tm)"
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 012a8d81fc65..b9337691789c 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \
DISTNAME= plt.src.x
MAINTAINER= jkoshy@freebsd.org
+COMMENT= An interactive, integrated, graphical Scheme programming environment
DIST_SUBDIR= drscheme/${PORTVERSION}
HAS_CONFIGURE= yes
diff --git a/lang/drscheme/pkg-comment b/lang/drscheme/pkg-comment
deleted file mode 100644
index fda85639f32e..000000000000
--- a/lang/drscheme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interactive, integrated, graphical Scheme programming environment
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index 662a07ebc468..73130625d022 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${BOOTSTRAP} \
ezm3-${PORTVERSION}-src.tar.bz2
MAINTAINER= jdp@FreeBSD.org
+COMMENT= Easier, more portable Modula-3 distribution for building CVSup
DIST_SUBDIR= ezm3
INSTALL_TARGET= all
diff --git a/lang/ezm3/pkg-comment b/lang/ezm3/pkg-comment
deleted file mode 100644
index c841810d8aad..000000000000
--- a/lang/ezm3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easier, more portable Modula-3 distribution for building CVSup
diff --git a/lang/forth/Makefile b/lang/forth/Makefile
index 2d0472728cae..2adc738a4d03 100644
--- a/lang/forth/Makefile
+++ b/lang/forth/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= patrick@FreeBSD.org
+COMMENT= Implementation of ANSI Forth
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/lang/forth/pkg-comment b/lang/forth/pkg-comment
deleted file mode 100644
index b944377cd2cf..000000000000
--- a/lang/forth/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Implementation of ANSI Forth
diff --git a/lang/gawk/Makefile b/lang/gawk/Makefile
index be3ebfc6dfb4..7bdf34aa3c02 100644
--- a/lang/gawk/Makefile
+++ b/lang/gawk/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= gawk
MAINTAINER= dd@FreeBSD.org
+COMMENT= The GNU version of Awk
BUILD_DEPENDS= ${LOCALBASE}/lib/libintl.a:${PORTSDIR}/devel/gettext
diff --git a/lang/gawk/pkg-comment b/lang/gawk/pkg-comment
deleted file mode 100644
index c7713a798285..000000000000
--- a/lang/gawk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU version of Awk
diff --git a/lang/gnomebasic/Makefile b/lang/gnomebasic/Makefile
index 105ab413c2af..1269438d1535 100644
--- a/lang/gnomebasic/Makefile
+++ b/lang/gnomebasic/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gb/0.0
DISTNAME= gb-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Provide Visual Basic compatible functionality for GNOME, especially VBA
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/lang/gnomebasic/pkg-comment b/lang/gnomebasic/pkg-comment
deleted file mode 100644
index 90d758ab0054..000000000000
--- a/lang/gnomebasic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provide Visual Basic compatible functionality for GNOME, especially VBA
diff --git a/lang/icc/Makefile b/lang/icc/Makefile
index ff7d2dc6e087..e128fbcb167a 100644
--- a/lang/icc/Makefile
+++ b/lang/icc/Makefile
@@ -13,6 +13,7 @@ DISTNAME= l_cc_pu_${PORTVERSION}
EXTRACT_SUFX= .tar
MAINTAINER= netchild@FreeBSD.org
+COMMENT= Intels C/C++ compiler, set up to produce native FreeBSD objects
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/lang/icc/pkg-comment b/lang/icc/pkg-comment
deleted file mode 100644
index 0a6fb00e6e37..000000000000
--- a/lang/icc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intels C/C++ compiler, set up to produce native FreeBSD objects
diff --git a/lang/icc7/Makefile b/lang/icc7/Makefile
index ff7d2dc6e087..e128fbcb167a 100644
--- a/lang/icc7/Makefile
+++ b/lang/icc7/Makefile
@@ -13,6 +13,7 @@ DISTNAME= l_cc_pu_${PORTVERSION}
EXTRACT_SUFX= .tar
MAINTAINER= netchild@FreeBSD.org
+COMMENT= Intels C/C++ compiler, set up to produce native FreeBSD objects
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/lang/icc7/pkg-comment b/lang/icc7/pkg-comment
deleted file mode 100644
index 0a6fb00e6e37..000000000000
--- a/lang/icc7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intels C/C++ compiler, set up to produce native FreeBSD objects
diff --git a/lang/ifc/Makefile b/lang/ifc/Makefile
index cbca5030cd78..9b38dda56f8f 100644
--- a/lang/ifc/Makefile
+++ b/lang/ifc/Makefile
@@ -14,6 +14,7 @@ DISTNAME= l_fc_p_6.0.1.304
EXTRACT_SUFX= .tar
MAINTAINER= maho@FreeBSD.org
+COMMENT= Intel's Fortran compiler, set up to produce native FreeBSD objects
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/lang/ifc/pkg-comment b/lang/ifc/pkg-comment
deleted file mode 100644
index 0ac63f4d87ec..000000000000
--- a/lang/ifc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intel's Fortran compiler, set up to produce native FreeBSD objects
diff --git a/lang/ifc7/Makefile b/lang/ifc7/Makefile
index cbca5030cd78..9b38dda56f8f 100644
--- a/lang/ifc7/Makefile
+++ b/lang/ifc7/Makefile
@@ -14,6 +14,7 @@ DISTNAME= l_fc_p_6.0.1.304
EXTRACT_SUFX= .tar
MAINTAINER= maho@FreeBSD.org
+COMMENT= Intel's Fortran compiler, set up to produce native FreeBSD objects
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
diff --git a/lang/ifc7/pkg-comment b/lang/ifc7/pkg-comment
deleted file mode 100644
index 0ac63f4d87ec..000000000000
--- a/lang/ifc7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intel's Fortran compiler, set up to produce native FreeBSD objects
diff --git a/lang/intercal/Makefile b/lang/intercal/Makefile
index 49718da43038..ce5538e93053 100644
--- a/lang/intercal/Makefile
+++ b/lang/intercal/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
MASTER_SITES= http://www.catb.org/~esr/intercal/
MAINTAINER= mph@freebsd.org
+COMMENT= The C-INTERCAL compiler, ick, and supporting libraries
WRKSRC= $(WRKDIR)/$(DISTNAME)/src
diff --git a/lang/intercal/pkg-comment b/lang/intercal/pkg-comment
deleted file mode 100644
index 66786e15cade..000000000000
--- a/lang/intercal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The C-INTERCAL compiler, ick, and supporting libraries
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index ca822a0a6eb5..6b4692399f5a 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= librep
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An Emacs Lisp like runtime library
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm \
intl.4:${PORTSDIR}/devel/gettext
diff --git a/lang/librep/pkg-comment b/lang/librep/pkg-comment
deleted file mode 100644
index b7ca996ee492..000000000000
--- a/lang/librep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Emacs Lisp like runtime library
diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile
index 2b6d5f1f158f..20fda8bb76b7 100644
--- a/lang/m3gdb/Makefile
+++ b/lang/m3gdb/Makefile
@@ -14,6 +14,7 @@ DISTFILES= m3gdb-4.17.tar.gz \
m3gdb-fbsd-4.17.tar.gz
MAINTAINER= jdp@FreeBSD.org
+COMMENT= The GNU debugger with support for Modula-3
MAN1= m3gdb.1
MANCOMPRESSED= yes
diff --git a/lang/m3gdb/pkg-comment b/lang/m3gdb/pkg-comment
deleted file mode 100644
index 35a5944c98ee..000000000000
--- a/lang/m3gdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU debugger with support for Modula-3
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index ff5bbf34715b..0664b57453f8 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_GNU} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= MIX Development Kit offers an emulation of MIX and MIXAL
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/lang/mdk/pkg-comment b/lang/mdk/pkg-comment
deleted file mode 100644
index 0da39a6ea9e4..000000000000
--- a/lang/mdk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MIX Development Kit offers an emulation of MIX and MIXAL
diff --git a/lang/mmix/Makefile b/lang/mmix/Makefile
index aafdfb01f44e..18b610767b33 100644
--- a/lang/mmix/Makefile
+++ b/lang/mmix/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
MASTER_SITES= http://www-cs-faculty.stanford.edu/~knuth/programs/
MAINTAINER= keith@FreeBSD.org
+COMMENT= MMIX is a RISC computer designed by Donald E. Knuth
BUILD_DEPENDS= ctangle:${PORTSDIR}/devel/cweb
diff --git a/lang/mmix/pkg-comment b/lang/mmix/pkg-comment
deleted file mode 100644
index fcfaeb448be1..000000000000
--- a/lang/mmix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MMIX is a RISC computer designed by Donald E. Knuth
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index 3323d7827bdf..e701cd5c0437 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.dina.kvl.dk/pub/mosml/ \
DISTNAME= mos20src
MAINTAINER= chuckr@freefall.FreeBSD.org
+COMMENT= Moscow ML, a lightweight implementation of Standard ML
LIB_DEPENDS= gmp.6:${PORTSDIR}/math/libgmp4
diff --git a/lang/moscow_ml/pkg-comment b/lang/moscow_ml/pkg-comment
deleted file mode 100644
index 1e31abc9c861..000000000000
--- a/lang/moscow_ml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Moscow ML, a lightweight implementation of Standard ML
diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index 6a98b12cf648..8d26949aca2c 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://users.pandora.be/stes/
DISTFILES= objc-bootstrap-${PORTVERSION}.tar.gz objc-${PORTVERSION}.tar.gz
MAINTAINER= chuckr@freebsd.org
+COMMENT= Portable Object Compiler
HAS_CONFIGURE= yes
diff --git a/lang/objc/pkg-comment b/lang/objc/pkg-comment
deleted file mode 100644
index 3199aa7f0515..000000000000
--- a/lang/objc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Portable Object Compiler
diff --git a/lang/ocaml-mode.el/Makefile b/lang/ocaml-mode.el/Makefile
index d787daf52f38..28d0d00316f8 100644
--- a/lang/ocaml-mode.el/Makefile
+++ b/lang/ocaml-mode.el/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= jkoshy
DISTNAME= ocaml-mode-3.01
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= An EMACS mode for editing OCaml programs
BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs21
RUN_DEPENDS= emacs:${PORTSDIR}/editors/emacs21
diff --git a/lang/ocaml-mode.el/pkg-comment b/lang/ocaml-mode.el/pkg-comment
deleted file mode 100644
index d30ccfdaada2..000000000000
--- a/lang/ocaml-mode.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An EMACS mode for editing OCaml programs
diff --git a/lang/p2c/Makefile b/lang/p2c/Makefile
index 1ed87f9338c7..1014d72d850c 100644
--- a/lang/p2c/Makefile
+++ b/lang/p2c/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.clara.net/pub/mirrors/gnu/hurd/ \
DISTFILES= p2c-1.21alpha2.tar.gz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Pascal to C translator
WRKSRC= ${WRKDIR}/p2c-1.21alpha-07.Dec.93
MAN1= p2c.1 p2cc.1
diff --git a/lang/p2c/pkg-comment b/lang/p2c/pkg-comment
deleted file mode 100644
index 4b13bac6df10..000000000000
--- a/lang/p2c/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Pascal to C translator
diff --git a/lang/p5-Data-JavaScript/Makefile b/lang/p5-Data-JavaScript/Makefile
index d60e23525f2f..41449c803f92 100644
--- a/lang/p5-Data-JavaScript/Makefile
+++ b/lang/p5-Data-JavaScript/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Data::JavaScript - Dump perl structures to JavaScript code
PERL_CONFIGURE= yes
diff --git a/lang/p5-Data-JavaScript/pkg-comment b/lang/p5-Data-JavaScript/pkg-comment
deleted file mode 100644
index 626438a0671e..000000000000
--- a/lang/p5-Data-JavaScript/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Data::JavaScript - Dump perl structures to JavaScript code
diff --git a/lang/p5-ExtUtils-F77/Makefile b/lang/p5-ExtUtils-F77/Makefile
index b1300ecd0375..f1ccbeb2cbca 100644
--- a/lang/p5-ExtUtils-F77/Makefile
+++ b/lang/p5-ExtUtils-F77/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ExtUtils
PKGNAMEPREFIX= p5-
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Helps link C programs with Fortran subroutines
PERL_CONFIGURE= yes
diff --git a/lang/p5-ExtUtils-F77/pkg-comment b/lang/p5-ExtUtils-F77/pkg-comment
deleted file mode 100644
index 963bf36681f0..000000000000
--- a/lang/p5-ExtUtils-F77/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Helps link C programs with Fortran subroutines
diff --git a/lang/p5-F77/Makefile b/lang/p5-F77/Makefile
index b1300ecd0375..f1ccbeb2cbca 100644
--- a/lang/p5-F77/Makefile
+++ b/lang/p5-F77/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ExtUtils
PKGNAMEPREFIX= p5-
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Helps link C programs with Fortran subroutines
PERL_CONFIGURE= yes
diff --git a/lang/p5-F77/pkg-comment b/lang/p5-F77/pkg-comment
deleted file mode 100644
index 963bf36681f0..000000000000
--- a/lang/p5-F77/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Helps link C programs with Fortran subroutines
diff --git a/lang/p5-Switch/Makefile b/lang/p5-Switch/Makefile
index c8570687f4af..9a7e05ccda23 100644
--- a/lang/p5-Switch/Makefile
+++ b/lang/p5-Switch/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ../by-authors/id/DCONWAY
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Switch - A switch statement for Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/devel/p5-Parse-RecDescent
diff --git a/lang/p5-Switch/pkg-comment b/lang/p5-Switch/pkg-comment
deleted file mode 100644
index d80fcf71ae53..000000000000
--- a/lang/p5-Switch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Switch - A switch statement for Perl
diff --git a/lang/pbasic/Makefile b/lang/pbasic/Makefile
index 8b4cabf37ab1..2a137da73056 100644
--- a/lang/pbasic/Makefile
+++ b/lang/pbasic/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTNAME= ${PORTNAME}-${PORTVERSION}-950813
MAINTAINER= asami@FreeBSD.org
+COMMENT= Phil Cockroft's Basic Interpreter (previously Rabbit Basic)
# Ask jhs@freebsd.org if you want newer sources or author's latest e-mail
# (which is currently "phil@gmrs.isar.de" but changes a lot)
diff --git a/lang/pbasic/pkg-comment b/lang/pbasic/pkg-comment
deleted file mode 100644
index 7335d11e5838..000000000000
--- a/lang/pbasic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phil Cockroft's Basic Interpreter (previously Rabbit Basic)
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index fbcaae51529d..ec6a3d6cd0bc 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.8.0
PERL_ARCH= mach
diff --git a/lang/perl5.10/pkg-comment b/lang/perl5.10/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5.10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index fbcaae51529d..ec6a3d6cd0bc 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.8.0
PERL_ARCH= mach
diff --git a/lang/perl5.12/pkg-comment b/lang/perl5.12/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5.12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index fbcaae51529d..ec6a3d6cd0bc 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.8.0
PERL_ARCH= mach
diff --git a/lang/perl5.14/pkg-comment b/lang/perl5.14/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5.14/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index fbcaae51529d..ec6a3d6cd0bc 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.8.0
PERL_ARCH= mach
diff --git a/lang/perl5.16/pkg-comment b/lang/perl5.16/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5.16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/perl5.6/Makefile b/lang/perl5.6/Makefile
index 8a981246d501..306c9439b08c 100644
--- a/lang/perl5.6/Makefile
+++ b/lang/perl5.6/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.6.1
PERL_ARCH= mach
diff --git a/lang/perl5.6/pkg-comment b/lang/perl5.6/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5.6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/perl5.8/Makefile b/lang/perl5.8/Makefile
index fbcaae51529d..ec6a3d6cd0bc 100644
--- a/lang/perl5.8/Makefile
+++ b/lang/perl5.8/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.8.0
PERL_ARCH= mach
diff --git a/lang/perl5.8/pkg-comment b/lang/perl5.8/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5.8/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 8a981246d501..306c9439b08c 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
BSDPAN-${PORTVERSION}_${BSDPAN_REVISION}${EXTRACT_SUFX}:local
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Practical Extraction and Report Language
PERL_VER= 5.6.1
PERL_ARCH= mach
diff --git a/lang/perl5/pkg-comment b/lang/perl5/pkg-comment
deleted file mode 100644
index 8c9f31132ea5..000000000000
--- a/lang/perl5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Practical Extraction and Report Language
diff --git a/lang/pfe-devel/Makefile b/lang/pfe-devel/Makefile
index aeec431ec983..4032eef24f53 100644
--- a/lang/pfe-devel/Makefile
+++ b/lang/pfe-devel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= patrick@FreeBSD.org
+COMMENT= Implementation of ANSI Forth
GNU_CONFIGURE= yes
CONFIGURE_TARGET= #
diff --git a/lang/pfe-devel/pkg-comment b/lang/pfe-devel/pkg-comment
deleted file mode 100644
index b944377cd2cf..000000000000
--- a/lang/pfe-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Implementation of ANSI Forth
diff --git a/lang/pfe/Makefile b/lang/pfe/Makefile
index aeec431ec983..4032eef24f53 100644
--- a/lang/pfe/Makefile
+++ b/lang/pfe/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= patrick@FreeBSD.org
+COMMENT= Implementation of ANSI Forth
GNU_CONFIGURE= yes
CONFIGURE_TARGET= #
diff --git a/lang/pfe/pkg-comment b/lang/pfe/pkg-comment
deleted file mode 100644
index b944377cd2cf..000000000000
--- a/lang/pfe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Implementation of ANSI Forth
diff --git a/lang/php_doc/Makefile b/lang/php_doc/Makefile
index 57dc62ce5f6b..85947aa7e9f3 100644
--- a/lang/php_doc/Makefile
+++ b/lang/php_doc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= dirk
DISTNAME= php_manual_${PHP_LANG}
MAINTAINER= dirk@FreeBSD.org
+COMMENT= PHP documentation in HTML
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/lang/php_doc/pkg-comment b/lang/php_doc/pkg-comment
deleted file mode 100644
index eabe400a1bcd..000000000000
--- a/lang/php_doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PHP documentation in HTML
diff --git a/lang/pm3-base/Makefile b/lang/pm3-base/Makefile
index 3fca0ff39365..011c7fe3a89c 100644
--- a/lang/pm3-base/Makefile
+++ b/lang/pm3-base/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${BOOTSTRAP} \
pm3-${PORTVERSION}-src.tar.bz2
MAINTAINER= jdp@FreeBSD.org
+COMMENT= Compiler and base libraries of the Polytechnique Montreal Modula-3 distribution
DIST_SUBDIR= pm3
WRKSRC= ${WRKDIR}/pm3-base-${PORTVERSION}
diff --git a/lang/pm3-base/pkg-comment b/lang/pm3-base/pkg-comment
deleted file mode 100644
index 589670c606d5..000000000000
--- a/lang/pm3-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Compiler and base libraries of the Polytechnique Montreal Modula-3 distribution
diff --git a/lang/pm3-forms/Makefile b/lang/pm3-forms/Makefile
index 54b2722cc9ef..c9399fe6b69c 100644
--- a/lang/pm3-forms/Makefile
+++ b/lang/pm3-forms/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= High-level GUI libraries and tools for the PM3 Modula-3 distribution
BUILD_DEPENDS= ${L1}libm3vbtkit${L2}:${PORTSDIR}/lang/pm3-gui
RUN_DEPENDS= ${L1}libm3vbtkit${L2}:${PORTSDIR}/lang/pm3-gui
diff --git a/lang/pm3-forms/pkg-comment b/lang/pm3-forms/pkg-comment
deleted file mode 100644
index 51fb8e527f47..000000000000
--- a/lang/pm3-forms/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-level GUI libraries and tools for the PM3 Modula-3 distribution
diff --git a/lang/pm3-gui/Makefile b/lang/pm3-gui/Makefile
index 719299033efb..45ba85d0af6d 100644
--- a/lang/pm3-gui/Makefile
+++ b/lang/pm3-gui/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= Low-level GUI libraries for the PM3 Modula-3 distribution
BUILD_DEPENDS= ${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net
RUN_DEPENDS= ${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net
diff --git a/lang/pm3-gui/pkg-comment b/lang/pm3-gui/pkg-comment
deleted file mode 100644
index 4a3085f1fbd2..000000000000
--- a/lang/pm3-gui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Low-level GUI libraries for the PM3 Modula-3 distribution
diff --git a/lang/pm3-m3tk/Makefile b/lang/pm3-m3tk/Makefile
index c6b0346f2d77..35a05f810b88 100644
--- a/lang/pm3-m3tk/Makefile
+++ b/lang/pm3-m3tk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= Modula-3 source code analysis and transformation toolkit (PM3 distribution)
BUILD_DEPENDS= ${L1}libm3${L2}:${PORTSDIR}/lang/pm3-base
RUN_DEPENDS= ${L1}libm3${L2}:${PORTSDIR}/lang/pm3-base
diff --git a/lang/pm3-m3tk/pkg-comment b/lang/pm3-m3tk/pkg-comment
deleted file mode 100644
index 91fb7a6b6262..000000000000
--- a/lang/pm3-m3tk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modula-3 source code analysis and transformation toolkit (PM3 distribution)
diff --git a/lang/pm3-net/Makefile b/lang/pm3-net/Makefile
index 23ba00823924..e09059428bb4 100644
--- a/lang/pm3-net/Makefile
+++ b/lang/pm3-net/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= Low-level networking libraries for the PM3 Modula-3 distribution
BUILD_DEPENDS= ${L1}libm3${L2}:${PORTSDIR}/lang/pm3-base
RUN_DEPENDS= ${L1}libm3${L2}:${PORTSDIR}/lang/pm3-base
diff --git a/lang/pm3-net/pkg-comment b/lang/pm3-net/pkg-comment
deleted file mode 100644
index 8dd86c4995b5..000000000000
--- a/lang/pm3-net/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Low-level networking libraries for the PM3 Modula-3 distribution
diff --git a/lang/pm3-netobj/Makefile b/lang/pm3-netobj/Makefile
index d24ebcfdc9c8..c8a5f08e600c 100644
--- a/lang/pm3-netobj/Makefile
+++ b/lang/pm3-netobj/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= PM3 distributed objects package supporting robust distributed applications
BUILD_DEPENDS= ${L1}libm3tcp${L2}:${PORTSDIR}/lang/pm3-net \
${L1}libm3tk${L2}:${PORTSDIR}/lang/pm3-m3tk
diff --git a/lang/pm3-netobj/pkg-comment b/lang/pm3-netobj/pkg-comment
deleted file mode 100644
index dd2c39256778..000000000000
--- a/lang/pm3-netobj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PM3 distributed objects package supporting robust distributed applications
diff --git a/lang/py-compiler/Makefile b/lang/py-compiler/Makefile
index 03ea4d1d91d1..9a544be90514 100644
--- a/lang/py-compiler/Makefile
+++ b/lang/py-compiler/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A Python source to bytecode compiler
DIST_SUBDIR= python
USE_PYTHON= yes
diff --git a/lang/py-compiler/pkg-comment b/lang/py-compiler/pkg-comment
deleted file mode 100644
index ecbaef7f73c2..000000000000
--- a/lang/py-compiler/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python source to bytecode compiler
diff --git a/lang/py-mx-base/Makefile b/lang/py-mx-base/Makefile
index 1650b429cff6..ff26879cd606 100644
--- a/lang/py-mx-base/Makefile
+++ b/lang/py-mx-base/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= egenix-${PORTNAME}-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= The eGenix mx-Extension Series for Python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/lang/py-mx-base/pkg-comment b/lang/py-mx-base/pkg-comment
deleted file mode 100644
index 8cbca3ebea01..000000000000
--- a/lang/py-mx-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The eGenix mx-Extension Series for Python
diff --git a/lang/python-doc-html/Makefile b/lang/python-doc-html/Makefile
index 34239d40e138..64cf7f8f0884 100644
--- a/lang/python-doc-html/Makefile
+++ b/lang/python-doc-html/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.python.org/ftp/python/doc/${PORTVERSION}/ \
DISTNAME= ${DOCFORMAT}-${PORTVERSION}
MAINTAINER= alane@FreeBSD.org
+COMMENT= Documentation for the Python programming language
DIST_SUBDIR= python
USE_PYTHON= yes
diff --git a/lang/python-doc-html/pkg-comment b/lang/python-doc-html/pkg-comment
deleted file mode 100644
index 5905ab261a48..000000000000
--- a/lang/python-doc-html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Documentation for the Python programming language
diff --git a/lang/python15/Makefile b/lang/python15/Makefile
index 98453c70b8b3..10cd4163024f 100644
--- a/lang/python15/Makefile
+++ b/lang/python15/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://www.python.org/pub/python/src/ \
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= alane@FreeBSD.org
+COMMENT= An interpreted object-oriented programming language
DIST_SUBDIR= python
WRKSRC= ${WRKDIR}/Python-1.5.2
diff --git a/lang/python15/pkg-comment b/lang/python15/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python15/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python20/Makefile b/lang/python20/Makefile
index daba6d2fe8a0..5812bb825bb0 100644
--- a/lang/python20/Makefile
+++ b/lang/python20/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= python
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER?= alane@FreeBSD.org
+COMMENT= An interpreted object-oriented programming language
DIST_SUBDIR= python
WRKSRC= ${PYTHON_WRKSRC}
diff --git a/lang/python20/pkg-comment b/lang/python20/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python21/Makefile b/lang/python21/Makefile
index 1a6ea2914b8e..0c3b95f14e5c 100644
--- a/lang/python21/Makefile
+++ b/lang/python21/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= python
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER?= alane@FreeBSD.org
+COMMENT= An interpreted object-oriented programming language
DIST_SUBDIR= python
WRKSRC= ${PYTHON_WRKSRC}
diff --git a/lang/python21/pkg-comment b/lang/python21/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python21/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/ratfor/Makefile b/lang/ratfor/Makefile
index dbeeaadd035a..d5e9ed6585b4 100644
--- a/lang/ratfor/Makefile
+++ b/lang/ratfor/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= obrien
DISTFILES= ratfor.shar.2 local.ratfor77.shar
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Ratfor -- the Rational FORTRAN compiler
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CAT}
diff --git a/lang/ratfor/pkg-comment b/lang/ratfor/pkg-comment
deleted file mode 100644
index 9f34cf711449..000000000000
--- a/lang/ratfor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ratfor -- the Rational FORTRAN compiler
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index c6a1fc7008d9..452134bb0d1f 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -16,6 +16,7 @@ DISTFILES+= ${DISTNAME}-html${EXTRACT_SUFX}
.endif
MAINTAINER= des@FreeBSD.org
+COMMENT= A Common Lisp development system derived from the CMU CL system
# If you have a previous version of SBCL installed, you can use it
# instead of CMUCL to build the port, then deinstall it before
diff --git a/lang/sbcl/pkg-comment b/lang/sbcl/pkg-comment
deleted file mode 100644
index 1a86be7e8dfa..000000000000
--- a/lang/sbcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Common Lisp development system derived from the CMU CL system
diff --git a/lang/scriba/Makefile b/lang/scriba/Makefile
index 9cdd8cc7f6c3..fde23814ba23 100644
--- a/lang/scriba/Makefile
+++ b/lang/scriba/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.scriptbasic.com/
DISTNAME= ${PORTNAME}-v${PORTVERSION}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A scripting implementation of the BASIC language
PRFXFILES= variations/standard/basiccmd.c \
variations/standalone/basicc.c \
diff --git a/lang/scriba/pkg-comment b/lang/scriba/pkg-comment
deleted file mode 100644
index c0bd9131b360..000000000000
--- a/lang/scriba/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A scripting implementation of the BASIC language
diff --git a/lang/scsh/Makefile b/lang/scsh/Makefile
index d5c78ec361c9..b265c72d106d 100644
--- a/lang/scsh/Makefile
+++ b/lang/scsh/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
MASTER_SITES= ftp://ftp.scsh.net/pub/scsh/0.6/
MAINTAINER= alex@FreeBSD.org
+COMMENT= A Unix shell embedded into Scheme, with access to all Posix calls
CONFIGURE_ENV+= LDFLAGS="-Wl,-E"
diff --git a/lang/scsh/pkg-comment b/lang/scsh/pkg-comment
deleted file mode 100644
index 304523714789..000000000000
--- a/lang/scsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Unix shell embedded into Scheme, with access to all Posix calls
diff --git a/lang/siod/Makefile b/lang/siod/Makefile
index 47c4d488afb5..ccc166b872eb 100644
--- a/lang/siod/Makefile
+++ b/lang/siod/Makefile
@@ -14,6 +14,7 @@ DISTNAME= siod
EXTRACT_SUFX= .tgz
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= A small footprint implementation of the Scheme programming language
INSTALLS_SHLIB= yes
diff --git a/lang/siod/pkg-comment b/lang/siod/pkg-comment
deleted file mode 100644
index 804ed230a73f..000000000000
--- a/lang/siod/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small footprint implementation of the Scheme programming language
diff --git a/lang/slib/Makefile b/lang/slib/Makefile
index 23cb00c7bb05..802f5671aeb9 100644
--- a/lang/slib/Makefile
+++ b/lang/slib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://swissnet.ai.mit.edu/ftpdir/scm/
DISTNAME= slib2d1
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A portable scheme library for all standard scheme implementation
RUN_DEPENDS= guile:${PORTSDIR}/lang/guile
diff --git a/lang/slib/pkg-comment b/lang/slib/pkg-comment
deleted file mode 100644
index 94d83cd3de94..000000000000
--- a/lang/slib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable scheme library for all standard scheme implementation
diff --git a/lang/slisp/Makefile b/lang/slisp/Makefile
index 2b924d720f18..4f50718478fa 100644
--- a/lang/slisp/Makefile
+++ b/lang/slisp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= lang
MASTER_SITES= http://www.sigala.it/sandro/files/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A simple Lisp interpreter
GNU_CONFIGURE= yes
diff --git a/lang/slisp/pkg-comment b/lang/slisp/pkg-comment
deleted file mode 100644
index ecce185b5445..000000000000
--- a/lang/slisp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple Lisp interpreter
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index c485dc4218ac..2f6ecde90d3d 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= jkoshy
EXTRACT_SUFX= .tar.Z
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= An EMACS mode for editing Standard ML programs
NO_BUILD= yes
diff --git a/lang/sml-mode.el/pkg-comment b/lang/sml-mode.el/pkg-comment
deleted file mode 100644
index 32d4f5d7f1d8..000000000000
--- a/lang/sml-mode.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An EMACS mode for editing Standard ML programs
diff --git a/lang/sml-nj/Makefile b/lang/sml-nj/Makefile
index e31f31cdf59e..a5820da3364a 100644
--- a/lang/sml-nj/Makefile
+++ b/lang/sml-nj/Makefile
@@ -19,6 +19,7 @@ DISTFILES= bin.x86-unix.tar.Z cm.tar.Z cml.tar.Z \
EXTRACT_ONLY= config.tar.Z
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A popular functional language from Bell Labs
# Other mirror sites that generally carry only released versions of SML
# ftp://rodin.stanford.edu/pub/smlnj/release/
diff --git a/lang/sml-nj/pkg-comment b/lang/sml-nj/pkg-comment
deleted file mode 100644
index b609878dcf24..000000000000
--- a/lang/sml-nj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A popular functional language from Bell Labs
diff --git a/lang/snobol/Makefile b/lang/snobol/Makefile
index f8cde66c97ea..1e4878a4b877 100644
--- a/lang/snobol/Makefile
+++ b/lang/snobol/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= lang
MASTER_SITES= ftp://ftp.snobol4.com/
MAINTAINER= wes@FreeBSD.org
+COMMENT= 0.99.4 release of ``The Macro Implementation of SNOBOL4 in C''
MAN1= snobol4.1
diff --git a/lang/snobol/pkg-comment b/lang/snobol/pkg-comment
deleted file mode 100644
index c272ee75f841..000000000000
--- a/lang/snobol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-0.99.4 release of ``The Macro Implementation of SNOBOL4 in C''
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index 0f9a0844a755..37469cc6d72d 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://education.mit.edu/starlogo/download/
DISTNAME= ${PORTNAME}-2.0
MAINTAINER= java@freebsd.org
+COMMENT= StarLogo is a specialized version of the Logo programming language written in Java
USE_JAVA= 1.2+
diff --git a/lang/starlogo/pkg-comment b/lang/starlogo/pkg-comment
deleted file mode 100644
index ca839e411060..000000000000
--- a/lang/starlogo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-StarLogo is a specialized version of the Logo programming language written in Java
diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile
index 5e35eb11305e..7cb1ac654b40 100644
--- a/lang/swi-pl/Makefile
+++ b/lang/swi-pl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.swi.psy.uva.nl/pub/SWI-Prolog/
DISTNAME= pl-${PORTVERSION}
MAINTAINER= max@FreeBSD.org
+COMMENT= Edinburgh-style Prolog compiler
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/lang/swi-pl/pkg-comment b/lang/swi-pl/pkg-comment
deleted file mode 100644
index ca6484e279fa..000000000000
--- a/lang/swi-pl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Edinburgh-style Prolog compiler
diff --git a/lang/tcl81-thread/Makefile b/lang/tcl81-thread/Makefile
index 93f66f1955e9..58583cc868ec 100644
--- a/lang/tcl81-thread/Makefile
+++ b/lang/tcl81-thread/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
DISTNAME= tcl8.1b1
MAINTAINER= ejc@FreeBSD.org
+COMMENT= Tcl81 with threads support
FILE_DEPENDS= ${PORTSDIR}/lang/tcl80
diff --git a/lang/tcl81-thread/pkg-comment b/lang/tcl81-thread/pkg-comment
deleted file mode 100644
index 40c6babec4c3..000000000000
--- a/lang/tcl81-thread/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcl81 with threads support
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index c98b4823b42a..a11c2481f0e8 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://tcl.activestate.com/pub/tcl/tclx/
DISTNAME= tclx${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Extended TCL
.ifdef WITHOUT_X11
LIB_DEPENDS= tcl${TCL_DVER}.1:${PORTSDIR}/lang/tcl${TCL_DVER}
diff --git a/lang/tclX/pkg-comment b/lang/tclX/pkg-comment
deleted file mode 100644
index 5162ae79122f..000000000000
--- a/lang/tclX/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extended TCL
diff --git a/lang/tclX82/Makefile b/lang/tclX82/Makefile
index c98b4823b42a..a11c2481f0e8 100644
--- a/lang/tclX82/Makefile
+++ b/lang/tclX82/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://tcl.activestate.com/pub/tcl/tclx/
DISTNAME= tclx${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Extended TCL
.ifdef WITHOUT_X11
LIB_DEPENDS= tcl${TCL_DVER}.1:${PORTSDIR}/lang/tcl${TCL_DVER}
diff --git a/lang/tclX82/pkg-comment b/lang/tclX82/pkg-comment
deleted file mode 100644
index 5162ae79122f..000000000000
--- a/lang/tclX82/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extended TCL
diff --git a/lang/tinycobol/Makefile b/lang/tinycobol/Makefile
index 3ab560effde5..9388d95814d8 100644
--- a/lang/tinycobol/Makefile
+++ b/lang/tinycobol/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= tiny-cobol
MAINTAINER= patrick@freebsd.org
+COMMENT= A tiny COBOL compiler for IA32 platforms
LIB_DEPENDS= db2.0:${PORTSDIR}/databases/db2 \
gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/lang/tinycobol/pkg-comment b/lang/tinycobol/pkg-comment
deleted file mode 100644
index af4eb946979f..000000000000
--- a/lang/tinycobol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tiny COBOL compiler for IA32 platforms
diff --git a/mail/abook/Makefile b/mail/abook/Makefile
index 097b6af51357..d4137adec110 100644
--- a/mail/abook/Makefile
+++ b/mail/abook/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= leeym@FreeBSD.org
+COMMENT= An addressbook program with mutt mail client support
.include <bsd.port.pre.mk>
diff --git a/mail/abook/pkg-comment b/mail/abook/pkg-comment
deleted file mode 100644
index 822bc288f3df..000000000000
--- a/mail/abook/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An addressbook program with mutt mail client support
diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index ca3f1860920b..9c8a67297e4c 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}.pl
EXTRACT_SUFX= .uu
MAINTAINER= ache@FreeBSD.org
+COMMENT= Complain about inappropriate commercial use (f.e. SPAM) of usenet/e-mail
USE_PERL5= yes
diff --git a/mail/adcomplain/pkg-comment b/mail/adcomplain/pkg-comment
deleted file mode 100644
index 3be37035de97..000000000000
--- a/mail/adcomplain/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Complain about inappropriate commercial use (f.e. SPAM) of usenet/e-mail
diff --git a/mail/autosig/Makefile b/mail/autosig/Makefile
index 11d6782ff09b..a7ca6a6c8341 100644
--- a/mail/autosig/Makefile
+++ b/mail/autosig/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.irendi.com/
MAINTAINER= leeym@FreeBSD.org
+COMMENT= A random .signature generator with header file included
MAKEFILE= makefile
ALL_TARGET= ${PORTNAME}
diff --git a/mail/autosig/pkg-comment b/mail/autosig/pkg-comment
deleted file mode 100644
index 532a12a41288..000000000000
--- a/mail/autosig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A random .signature generator with header file included
diff --git a/mail/biabam/Makefile b/mail/biabam/Makefile
index c82179440869..ebbd4ca68708 100644
--- a/mail/biabam/Makefile
+++ b/mail/biabam/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://mmj.dk/biabam/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A command-line attachment mailer
NO_BUILD= yes
diff --git a/mail/biabam/pkg-comment b/mail/biabam/pkg-comment
deleted file mode 100644
index c35fb23700b3..000000000000
--- a/mail/biabam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line attachment mailer
diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile
index 3022e0e7aa04..eeee38f6a30c 100644
--- a/mail/cclient/Makefile
+++ b/mail/cclient/Makefile
@@ -17,6 +17,7 @@ DISTNAME= imap-${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= anders@FreeBSD.org
+COMMENT= Mark Crispin's C-client mail access routines
INSTALLS_SHLIB= yes
ALL_TARGET= bsf
diff --git a/mail/cclient/pkg-comment b/mail/cclient/pkg-comment
deleted file mode 100644
index 9aa67750e2d7..000000000000
--- a/mail/cclient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mark Crispin's C-client mail access routines
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index a4c64ccac470..a5f7bd8e79cc 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
MAINTAINER= nbm@FreeBSD.org
+COMMENT= IMAP (and POP3) server that provides access to Maildir mailboxes
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/mail/courier-imap/pkg-comment b/mail/courier-imap/pkg-comment
deleted file mode 100644
index ec04bc3c1ca0..000000000000
--- a/mail/courier-imap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IMAP (and POP3) server that provides access to Maildir mailboxes
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index e002baa8c8aa..b7ac02397440 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -26,6 +26,7 @@ PATCH_DIST_STRIP= -p1
#BUILD_DEPENDS= ${PREFIX}/include/db2/db.h:${PORTSDIR}/databases/db2
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Cubic Circle's POP3 daemon (fully RFC1939 compliant)
MAN8= cucipop.8 #makevpopdb.8
diff --git a/mail/cucipop/pkg-comment b/mail/cucipop/pkg-comment
deleted file mode 100644
index 39613636e550..000000000000
--- a/mail/cucipop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cubic Circle's POP3 daemon (fully RFC1939 compliant)
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 13ab06f023e4..6c5652aebb96 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://scifi.squawk.com/
DISTFILES= ${PORTNAME}.stable demime_junkmail.cf
MAINTAINER= petef@FreeBSD.org
+COMMENT= A tool to scrub mime from mailing lists
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/mail/demime/pkg-comment b/mail/demime/pkg-comment
deleted file mode 100644
index ef81cbbcd92b..000000000000
--- a/mail/demime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to scrub mime from mailing lists
diff --git a/mail/drbl/Makefile b/mail/drbl/Makefile
index 8c520571bd24..8c2386186037 100644
--- a/mail/drbl/Makefile
+++ b/mail/drbl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.drbl.ofisp.org/drbl/
EXTRACT_SUFX= .tgz
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Distributed Realtime Black List
NO_BUILD= yes
diff --git a/mail/drbl/pkg-comment b/mail/drbl/pkg-comment
deleted file mode 100644
index 6e923560d9fe..000000000000
--- a/mail/drbl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Distributed Realtime Black List
diff --git a/mail/emh/Makefile b/mail/emh/Makefile
index 9405b6173db0..fe70b26b8859 100644
--- a/mail/emh/Makefile
+++ b/mail/emh/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/emh/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= MIME extension of mh-e.el
BUILD_DEPENDS+= ${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
RUN_DEPENDS+= ${LOCALBASE}/share/semi/${SEMI_COOKIE}:${PORTSDIR}/editors/semi${DEPPORT_SUFFIX}
diff --git a/mail/emh/pkg-comment b/mail/emh/pkg-comment
deleted file mode 100644
index 397605f847b9..000000000000
--- a/mail/emh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MIME extension of mh-e.el
diff --git a/mail/exim-doc-html/Makefile b/mail/exim-doc-html/Makefile
index e3d6fda6187c..28be7284396c 100644
--- a/mail/exim-doc-html/Makefile
+++ b/mail/exim-doc-html/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
DISTNAME= exim-${DOCFORMAT}-${PORTVERSION}
MAINTAINER= sheldonh@FreeBSD.org
+COMMENT= Documentation for the Exim MTA in multiple formats
USE_BZIP2= yes
NO_BUILD= yes
diff --git a/mail/exim-doc-html/pkg-comment b/mail/exim-doc-html/pkg-comment
deleted file mode 100644
index 225d02e0ad65..000000000000
--- a/mail/exim-doc-html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Documentation for the Exim MTA in multiple formats
diff --git a/mail/exim-monitor/Makefile b/mail/exim-monitor/Makefile
index 6ffc36948af1..1b700626e610 100644
--- a/mail/exim-monitor/Makefile
+++ b/mail/exim-monitor/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \
DISTNAME= exim-${PORTVERSION}
MAINTAINER= sheldonh@FreeBSD.org
+COMMENT= The Exim monitor for the Exim MTA
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/mail/exim-monitor/pkg-comment b/mail/exim-monitor/pkg-comment
deleted file mode 100644
index 05ad4798d2a5..000000000000
--- a/mail/exim-monitor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Exim monitor for the Exim MTA
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index fbe542309173..7cd3fd074e3e 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim3/ \
DISTFILES= exim-3.36.tar.bz2 exim-texinfo-3.30.tar.bz2
MAINTAINER= sheldonh@FreeBSD.org
+COMMENT= High performance MTA for Unix systems on the Internet
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/mail/exim-old/pkg-comment b/mail/exim-old/pkg-comment
deleted file mode 100644
index a862bdff5618..000000000000
--- a/mail/exim-old/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High performance MTA for Unix systems on the Internet
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9f0e11183697..d74d951dd1bf 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -22,6 +22,7 @@ DISTFILES+= exiscan-${EXISCAN_VERSION}.tar.bz2
.endif
MAINTAINER= sheldonh@FreeBSD.org
+COMMENT= High performance MTA for Unix systems on the Internet
USE_BZIP2= yes
USE_PERL5= yes
diff --git a/mail/exim/pkg-comment b/mail/exim/pkg-comment
deleted file mode 100644
index a862bdff5618..000000000000
--- a/mail/exim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High performance MTA for Unix systems on the Internet
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index abef80c6f074..482381102e2f 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -20,6 +20,7 @@ PATCHFILES= ezmlm-cgi.patch
PATCH_SITES= ${MASTER_SITES}
MAINTAINER= tom@FreeBSD.org
+COMMENT= Improved version of the ezmlm-0.53 mailing list management software
# QMAIL_DIR is the directory where qmail is installed
QMAIL_DIR?= /var/qmail
diff --git a/mail/ezmlm-idx/pkg-comment b/mail/ezmlm-idx/pkg-comment
deleted file mode 100644
index e86e472d6a8e..000000000000
--- a/mail/ezmlm-idx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Improved version of the ezmlm-0.53 mailing list management software
diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile
index 9a660391f541..a26ab91f9294 100644
--- a/mail/ezmlm/Makefile
+++ b/mail/ezmlm/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ezmlm.org/pub/qmail/ \
ftp://ftp.mira.net.au/unix/mail/qmail/
MAINTAINER= tom@FreeBSD.org
+COMMENT= An easy-to-use, high-speed mailing list manager for qmail
# QMAIL_DIR is the directory where qmail is installed
.if !defined(QMAIL_DIR)
diff --git a/mail/ezmlm/pkg-comment b/mail/ezmlm/pkg-comment
deleted file mode 100644
index 49b3f5be18da..000000000000
--- a/mail/ezmlm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy-to-use, high-speed mailing list manager for qmail
diff --git a/mail/gbiff/Makefile b/mail/gbiff/Makefile
index 30718fbf2da2..69a4d1e20a77 100644
--- a/mail/gbiff/Makefile
+++ b/mail/gbiff/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A GNOME/GTK biff with Unix mailfile, MH, qmail, and POP3 support
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/mail/gbiff/pkg-comment b/mail/gbiff/pkg-comment
deleted file mode 100644
index f5f54292c8f2..000000000000
--- a/mail/gbiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME/GTK biff with Unix mailfile, MH, qmail, and POP3 support
diff --git a/mail/glbiff/Makefile b/mail/glbiff/Makefile
index 88b7f125aeba..8ffbe5c2a750 100644
--- a/mail/glbiff/Makefile
+++ b/mail/glbiff/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.dgp.utoronto.ca/~mac/projects/
EXTRACT_SUFX= .tgz
MAINTAINER= petef@FreeBSD.org
+COMMENT= Xbiff-like program for X Window System with nice 3D output
USE_X_PREFIX= yes
USE_MESA= yes
diff --git a/mail/glbiff/pkg-comment b/mail/glbiff/pkg-comment
deleted file mode 100644
index a166f28435d0..000000000000
--- a/mail/glbiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xbiff-like program for X Window System with nice 3D output
diff --git a/mail/grepmail/Makefile b/mail/grepmail/Makefile
index 66a2f927ac7f..3823e5751ef6 100644
--- a/mail/grepmail/Makefile
+++ b/mail/grepmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Search mailboxes for a given regexp and display matching emails
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate
diff --git a/mail/grepmail/pkg-comment b/mail/grepmail/pkg-comment
deleted file mode 100644
index d051995c0e62..000000000000
--- a/mail/grepmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Search mailboxes for a given regexp and display matching emails
diff --git a/mail/hbiff/Makefile b/mail/hbiff/Makefile
index 563016095a9d..e35f976cf170 100644
--- a/mail/hbiff/Makefile
+++ b/mail/hbiff/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
+COMMENT= A replacement for xbiff that handles popup window with mail headers
USE_XLIB= yes
MAN1= hbiff.1
diff --git a/mail/hbiff/pkg-comment b/mail/hbiff/pkg-comment
deleted file mode 100644
index 99e32dcece3e..000000000000
--- a/mail/hbiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement for xbiff that handles popup window with mail headers
diff --git a/mail/im/Makefile b/mail/im/Makefile
index 9aebe7553532..fdd7cf75bd03 100644
--- a/mail/im/Makefile
+++ b/mail/im/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.mew.org/pub/Mew/ \
${MASTER_SITE_PORTS_JP}
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT= Set of user interfaces of Email and NetNews
USE_PERL5= yes
USE_AUTOCONF= yes
diff --git a/mail/im/pkg-comment b/mail/im/pkg-comment
deleted file mode 100644
index 8d75b50ec11e..000000000000
--- a/mail/im/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Set of user interfaces of Email and NetNews
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index b3618c3aa1db..50303df349b3 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -19,6 +19,7 @@ DISTNAME= imap-${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= anders@FreeBSD.org
+COMMENT= University of Washington IMAP4rev1/POP2/POP3 mail servers
LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient
.if defined(WITH_DRAC)
diff --git a/mail/imap-uw/pkg-comment b/mail/imap-uw/pkg-comment
deleted file mode 100644
index f644776e13aa..000000000000
--- a/mail/imap-uw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-University of Washington IMAP4rev1/POP2/POP3 mail servers
diff --git a/mail/isync/Makefile b/mail/isync/Makefile
index ffb6ebd684de..a605a9dccb8c 100644
--- a/mail/isync/Makefile
+++ b/mail/isync/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.cs.hmc.edu/~me/isync/
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
MAINTAINER= eivind@FreeBSD.org
+COMMENT= Maintain local copies of remote IMAP folders w/synchronized flags
GNU_CONFIGURE= yes
USE_OPENSSL= yes
diff --git a/mail/isync/pkg-comment b/mail/isync/pkg-comment
deleted file mode 100644
index 3fa7e9b9da62..000000000000
--- a/mail/isync/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Maintain local copies of remote IMAP folders w/synchronized flags
diff --git a/mail/liamail/Makefile b/mail/liamail/Makefile
index 2524a30bed5f..ea373a4f666e 100644
--- a/mail/liamail/Makefile
+++ b/mail/liamail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kde@freebsd.org
+COMMENT= A graphical mail client
LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
diff --git a/mail/liamail/pkg-comment b/mail/liamail/pkg-comment
deleted file mode 100644
index 9abb613110c9..000000000000
--- a/mail/liamail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical mail client
diff --git a/mail/liboe/Makefile b/mail/liboe/Makefile
index ec8f764c90f1..e1bde2d3abc6 100644
--- a/mail/liboe/Makefile
+++ b/mail/liboe/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.gpl.no/liboe/download/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Convert Outlook Express messages to the Unix mailbox format
USE_REINPLACE= yes
MAKEFILE= makefile
diff --git a/mail/liboe/pkg-comment b/mail/liboe/pkg-comment
deleted file mode 100644
index 9fdabb400400..000000000000
--- a/mail/liboe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert Outlook Express messages to the Unix mailbox format
diff --git a/mail/listmanager/Makefile b/mail/listmanager/Makefile
index 4a836ac8b7e5..a38ce5ac66fb 100644
--- a/mail/listmanager/Makefile
+++ b/mail/listmanager/Makefile
@@ -23,6 +23,7 @@ EXTRACT_SUFX= .freebsd35
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} INSTALL help.tar.gz listmanager.8 ack
MAINTAINER= gshapiro@FreeBSD.org
+COMMENT= Fully-featured mailing list manager
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/mail/listmanager/pkg-comment b/mail/listmanager/pkg-comment
deleted file mode 100644
index c0495cf43986..000000000000
--- a/mail/listmanager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fully-featured mailing list manager
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 3eccf3ee17b3..0c7ddc43e3bc 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../authors/id/RAM
MAINTAINER= max@FreeBSD.org
+COMMENT= A sophisticated automatic mail-processing tool
USE_PERL5= yes
NO_PACKAGE= "Correct FQDN needs to be hardcoded"
diff --git a/mail/mailagent/pkg-comment b/mail/mailagent/pkg-comment
deleted file mode 100644
index 6e78780acc7f..000000000000
--- a/mail/mailagent/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sophisticated automatic mail-processing tool
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index a9db461f48d5..191ce4f8fa95 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
MAINTAINER= petef@FreeBSD.org
+COMMENT= Replacement local mail delivery agent, similar to procmail
# Maildrop is usually installed with gdbm extensions. If you do not
# want these extensions installed, define WITHOUT_GDBM.
diff --git a/mail/maildrop/pkg-comment b/mail/maildrop/pkg-comment
deleted file mode 100644
index e9ce41a3f927..000000000000
--- a/mail/maildrop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Replacement local mail delivery agent, similar to procmail
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index b2554d446352..5c00ebc68f7b 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= mailman
EXTRACT_SUFX= .tgz
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A mailing list manager (MLM) with a user-friendly web front-end
RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx
.if defined(WITH_CHINESE)
diff --git a/mail/mailman/pkg-comment b/mail/mailman/pkg-comment
deleted file mode 100644
index 7de33bc9a017..000000000000
--- a/mail/mailman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mailing list manager (MLM) with a user-friendly web front-end
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index fece3f312c6f..31d55b72fe88 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.greatcircle.com/pub/majordomo/1.94.5/ \
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= A mailing list manager
.if defined(WITH_SHA1_COOKIES)
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/SHA1.pm:${PORTSDIR}/security/p5-Digest-SHA1
diff --git a/mail/majordomo/pkg-comment b/mail/majordomo/pkg-comment
deleted file mode 100644
index 96043882e773..000000000000
--- a/mail/majordomo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mailing list manager
diff --git a/mail/mboxgrep/Makefile b/mail/mboxgrep/Makefile
index 02afee38625c..6bc064195414 100644
--- a/mail/mboxgrep/Makefile
+++ b/mail/mboxgrep/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= anders@FreeBSD.org
+COMMENT= Utility to scan mailboxes for messages matching a regular expression
.if defined(WITH_PCRE)
LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
diff --git a/mail/mboxgrep/pkg-comment b/mail/mboxgrep/pkg-comment
deleted file mode 100644
index d57295338f40..000000000000
--- a/mail/mboxgrep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to scan mailboxes for messages matching a regular expression
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index ced15f6d5a24..7f4c099e6d3c 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -14,6 +14,7 @@ DISTNAME= mm${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= torstenb@FreeBSD.org
+COMMENT= Implementation of MIME, the Multipurpose Internet Mail Extensions
RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage
diff --git a/mail/metamail/pkg-comment b/mail/metamail/pkg-comment
deleted file mode 100644
index 9944ee460806..000000000000
--- a/mail/metamail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Implementation of MIME, the Multipurpose Internet Mail Extensions
diff --git a/mail/mmc/Makefile b/mail/mmc/Makefile
index 2e1a47e12a61..3277e9c771a7 100644
--- a/mail/mmc/Makefile
+++ b/mail/mmc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/-1/}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A tiny mail client for Gnome Desktop
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//}
diff --git a/mail/mmc/pkg-comment b/mail/mmc/pkg-comment
deleted file mode 100644
index c1a42b7a0cd9..000000000000
--- a/mail/mmc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tiny mail client for Gnome Desktop
diff --git a/mail/namg/Makefile b/mail/namg/Makefile
index 9c10d42e43a4..2db9f3619a9e 100644
--- a/mail/namg/Makefile
+++ b/mail/namg/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.zip.com.au/~gsymonds/NAMG/
DISTNAME= NAMG-${PORTVERSION}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A program to download mail from a NetAddress web account
GNU_CONFIGURE= yes
diff --git a/mail/namg/pkg-comment b/mail/namg/pkg-comment
deleted file mode 100644
index 24ddabd64adc..000000000000
--- a/mail/namg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to download mail from a NetAddress web account
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 8571e04f4f46..37b345654ced 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -17,6 +17,7 @@ MASTER_SITE_SUBDIR= 1.00RC5
DISTNAME= ${PORTNAME}-1.00RC5
MAINTAINER= clive@FreeBSD.org
+COMMENT= MTA for hosts which relay to a fixed set of smart relays
HAS_CONFIGURE= yes
diff --git a/mail/nullmailer/pkg-comment b/mail/nullmailer/pkg-comment
deleted file mode 100644
index 2ea52ee2ee76..000000000000
--- a/mail/nullmailer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MTA for hosts which relay to a fixed set of smart relays
diff --git a/mail/openwebmail/Makefile b/mail/openwebmail/Makefile
index 5e7b5518afab..cf6c89d7419a 100644
--- a/mail/openwebmail/Makefile
+++ b/mail/openwebmail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://openwebmail.org/openwebmail/download/ \
EXTRACT_SUFX= .tgz
MAINTAINER= leeym@FreeBSD.org
+COMMENT= A webmail system designed to manage very big mail folder files in a memory efficient way
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net \
diff --git a/mail/openwebmail/pkg-comment b/mail/openwebmail/pkg-comment
deleted file mode 100644
index 50dbb1781788..000000000000
--- a/mail/openwebmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A webmail system designed to manage very big mail folder files in a memory efficient way
diff --git a/mail/p5-Email-Find/Makefile b/mail/p5-Email-Find/Makefile
index 74b83c6ea773..c1d835c186a4 100644
--- a/mail/p5-Email-Find/Makefile
+++ b/mail/p5-Email-Find/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Email
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Find RFC 822 email addresses in plain text
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/mail/p5-Email-Find/pkg-comment b/mail/p5-Email-Find/pkg-comment
deleted file mode 100644
index a0906b1250fd..000000000000
--- a/mail/p5-Email-Find/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find RFC 822 email addresses in plain text
diff --git a/mail/p5-Email-Valid/Makefile b/mail/p5-Email-Valid/Makefile
index b15d5f706c1b..df9d8abe3c34 100644
--- a/mail/p5-Email-Valid/Makefile
+++ b/mail/p5-Email-Valid/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Email
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Check validity of Internet email addresses
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools
diff --git a/mail/p5-Email-Valid/pkg-comment b/mail/p5-Email-Valid/pkg-comment
deleted file mode 100644
index d1a115fc1147..000000000000
--- a/mail/p5-Email-Valid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Check validity of Internet email addresses
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index bca2dda2a8ed..571cb32d46ca 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module for creating easy mail filters
BUILD_DEPENDS= ${SITE_PERL}/Net/Config.pm:${PORTSDIR}/net/p5-Net \
${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
diff --git a/mail/p5-Mail-Audit/pkg-comment b/mail/p5-Mail-Audit/pkg-comment
deleted file mode 100644
index 5b61bde23738..000000000000
--- a/mail/p5-Mail-Audit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for creating easy mail filters
diff --git a/mail/p5-Mail-Box1/Makefile b/mail/p5-Mail-Box1/Makefile
index dff9ecc5e149..f9d0626d7f32 100644
--- a/mail/p5-Mail-Box1/Makefile
+++ b/mail/p5-Mail-Box1/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module implementing a modern mail-folder managerat
BUILD_DEPENDS= ${SITE_PERL}/File/Spec.pm:${PORTSDIR}/devel/p5-File-Spec \
${SITE_PERL}/MIME/Entity.pm:${PORTSDIR}/mail/p5-MIME-Tools \
diff --git a/mail/p5-Mail-Box1/pkg-comment b/mail/p5-Mail-Box1/pkg-comment
deleted file mode 100644
index 41f112d42206..000000000000
--- a/mail/p5-Mail-Box1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module implementing a modern mail-folder managerat
diff --git a/mail/p5-Mail-CClient/Makefile b/mail/p5-Mail-CClient/Makefile
index 354c04dde6c9..1449e2dc434e 100644
--- a/mail/p5-Mail-CClient/Makefile
+++ b/mail/p5-Mail-CClient/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Mail-Cclient-${PORTVERSION}
MAINTAINER= kbyanc@posi.net
+COMMENT= Perl interface to the c-client mailbox API
LIB_DEPENDS= c-client4.8:${PORTSDIR}/mail/cclient
diff --git a/mail/p5-Mail-CClient/pkg-comment b/mail/p5-Mail-CClient/pkg-comment
deleted file mode 100644
index dc198846257c..000000000000
--- a/mail/p5-Mail-CClient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to the c-client mailbox API
diff --git a/mail/p5-Mail-IMAPClient/Makefile b/mail/p5-Mail-IMAPClient/Makefile
index f9d6d2662ce4..f68c172fadbf 100644
--- a/mail/p5-Mail-IMAPClient/Makefile
+++ b/mail/p5-Mail-IMAPClient/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Perl5 module to talk to a IMAP4rev1 (RFC2060) server
PERL_CONFIGURE= yes
diff --git a/mail/p5-Mail-IMAPClient/pkg-comment b/mail/p5-Mail-IMAPClient/pkg-comment
deleted file mode 100644
index 32f01808a80b..000000000000
--- a/mail/p5-Mail-IMAPClient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to talk to a IMAP4rev1 (RFC2060) server
diff --git a/mail/p5-Mail-ListDetector/Makefile b/mail/p5-Mail-ListDetector/Makefile
index 0ffda953c86e..e97ec65ed181 100644
--- a/mail/p5-Mail-ListDetector/Makefile
+++ b/mail/p5-Mail-ListDetector/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module for detecting mailing list messages
BUILD_DEPENDS= ${SITE_PERL}/Email/Valid.pm:${PORTSDIR}/mail/p5-Email-Valid \
${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
diff --git a/mail/p5-Mail-ListDetector/pkg-comment b/mail/p5-Mail-ListDetector/pkg-comment
deleted file mode 100644
index 49d6f529018c..000000000000
--- a/mail/p5-Mail-ListDetector/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for detecting mailing list messages
diff --git a/mail/p5-Mail-POP3Client/Makefile b/mail/p5-Mail-POP3Client/Makefile
index 9f7808ba5e9e..aaedf2486e2c 100644
--- a/mail/p5-Mail-POP3Client/Makefile
+++ b/mail/p5-Mail-POP3Client/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= POP3Client-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module to talk to a POP3 (RFC1081) server
PERL_CONFIGURE= YES
diff --git a/mail/p5-Mail-POP3Client/pkg-comment b/mail/p5-Mail-POP3Client/pkg-comment
deleted file mode 100644
index f14f1f929828..000000000000
--- a/mail/p5-Mail-POP3Client/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to talk to a POP3 (RFC1081) server
diff --git a/mail/p5-Mail-QuoteWrap/Makefile b/mail/p5-Mail-QuoteWrap/Makefile
index a8b67cf6cbf7..ec1fe7108831 100644
--- a/mail/p5-Mail-QuoteWrap/Makefile
+++ b/mail/p5-Mail-QuoteWrap/Makefile
@@ -15,6 +15,7 @@ DISTNAME= MailQuoteWrap${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Provides wrapping functionality for quoted Email and Usenet messages
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Format.pm:${PORTSDIR}/textproc/p5-Text-Format
diff --git a/mail/p5-Mail-QuoteWrap/pkg-comment b/mail/p5-Mail-QuoteWrap/pkg-comment
deleted file mode 100644
index d39eb0f3c3bc..000000000000
--- a/mail/p5-Mail-QuoteWrap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provides wrapping functionality for quoted Email and Usenet messages
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/Makefile b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
index 67ab0a39a902..e0cae764519a 100644
--- a/mail/p5-Mail-SpamAssassin-snapshot/Makefile
+++ b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= DougB@FreeBSD.org
+COMMENT= A mail filter for identifying SPAM
BROKEN= "mail/p5-Mail-SpamAssassin has been updated to 2.50"
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-comment b/mail/p5-Mail-SpamAssassin-snapshot/pkg-comment
deleted file mode 100644
index c8bcf6aae117..000000000000
--- a/mail/p5-Mail-SpamAssassin-snapshot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mail filter for identifying SPAM
diff --git a/mail/p5-Mail-Verify/Makefile b/mail/p5-Mail-Verify/Makefile
index 3b2c598be5a6..94880497dd60 100644
--- a/mail/p5-Mail-Verify/Makefile
+++ b/mail/p5-Mail-Verify/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Mail
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module to verify email addresses
BUILD_DEPENDS= ${SITE_PERL}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/mail/p5-Mail-Verify/pkg-comment b/mail/p5-Mail-Verify/pkg-comment
deleted file mode 100644
index 10a5f9710d7c..000000000000
--- a/mail/p5-Mail-Verify/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to verify email addresses
diff --git a/mail/p5-POE-Component-Client-POP3/Makefile b/mail/p5-POE-Component-Client-POP3/Makefile
index b62ad9e90686..30c1e7e23624 100644
--- a/mail/p5-POE-Component-Client-POP3/Makefile
+++ b/mail/p5-POE-Component-Client-POP3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Impliment a POP3 client POE component
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/mail/p5-POE-Component-Client-POP3/pkg-comment b/mail/p5-POE-Component-Client-POP3/pkg-comment
deleted file mode 100644
index e053ffd9104e..000000000000
--- a/mail/p5-POE-Component-Client-POP3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Impliment a POP3 client POE component
diff --git a/mail/pgen/Makefile b/mail/pgen/Makefile
index bf33cb6bd5b0..68aa9ea9e6d5 100644
--- a/mail/pgen/Makefile
+++ b/mail/pgen/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.myrddin.demon.co.uk/dist/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool to generate a procmailrc file with m4 macros
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/mail/pgen/pkg-comment b/mail/pgen/pkg-comment
deleted file mode 100644
index ba09745f765a..000000000000
--- a/mail/pgen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to generate a procmailrc file with m4 macros
diff --git a/mail/pgpsendmail/Makefile b/mail/pgpsendmail/Makefile
index 79eb307bcf04..8014d5fb121f 100644
--- a/mail/pgpsendmail/Makefile
+++ b/mail/pgpsendmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.dhp.com/pub/crypto/pgp/PGPsendmail/
DISTNAME= PGPsendmail-v${PORTVERSION}
MAINTAINER= ache@FreeBSD.org
+COMMENT= PGP sign/encrypt/decrypt messages automatically
BUILD_DEPENDS+= pgp:${PORTSDIR}/security/pgp
diff --git a/mail/pgpsendmail/pkg-comment b/mail/pgpsendmail/pkg-comment
deleted file mode 100644
index a87b473cb5df..000000000000
--- a/mail/pgpsendmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PGP sign/encrypt/decrypt messages automatically
diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile
index 55e82e5f76aa..0ad5da904401 100644
--- a/mail/pine-pgp-filters/Makefile
+++ b/mail/pine-pgp-filters/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://dougbarton.net/FreeBSD/Downloads/ \
MASTER_SITE_SUBDIR= dougb
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Simple, fast, sh-based filters to integrate Pine with gnupg, or pgp6
do-build:
cd ${WRKSRC} && ./configure --prefix=${PREFIX}
diff --git a/mail/pine-pgp-filters/pkg-comment b/mail/pine-pgp-filters/pkg-comment
deleted file mode 100644
index 0db76e3f6ffa..000000000000
--- a/mail/pine-pgp-filters/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple, fast, sh-based filters to integrate Pine with gnupg, or pgp6
diff --git a/mail/pmail/Makefile b/mail/pmail/Makefile
index 4e58f42961a5..1f64f0e124e0 100644
--- a/mail/pmail/Makefile
+++ b/mail/pmail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.toad.net/~sbender/pmail/ \
http://www.harmony-ds.com/download/pmail/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GNOME/python email client
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
diff --git a/mail/pmail/pkg-comment b/mail/pmail/pkg-comment
deleted file mode 100644
index 34f1139c377d..000000000000
--- a/mail/pmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME/python email client
diff --git a/mail/popper/Makefile b/mail/popper/Makefile
index 6a9256fdff3e..504c347fcaae 100644
--- a/mail/popper/Makefile
+++ b/mail/popper/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@freebsd.org
+COMMENT= Berkeley POP 3 server (now maintained by Qualcomm)
# Set WITH_POPPER_YOUBIN_SUPPORT variable in the environment to enable
# youbin support.
diff --git a/mail/popper/pkg-comment b/mail/popper/pkg-comment
deleted file mode 100644
index d398cefb33a4..000000000000
--- a/mail/popper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Berkeley POP 3 server (now maintained by Qualcomm)
diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile
index e6d7b80cfc9b..a828b62e0f35 100644
--- a/mail/poppy/Makefile
+++ b/mail/poppy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://home.sprynet.com/~cbagwell/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A client to perform simple tasks with a POP3/IMAP server
NO_BUILD= yes
diff --git a/mail/poppy/pkg-comment b/mail/poppy/pkg-comment
deleted file mode 100644
index 58211495633c..000000000000
--- a/mail/poppy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A client to perform simple tasks with a POP3/IMAP server
diff --git a/mail/premail/Makefile b/mail/premail/Makefile
index f33f9188b1b8..37597e8f90a7 100644
--- a/mail/premail/Makefile
+++ b/mail/premail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.jpunix.com/pub/remailer-tools/ \
ftp://ftp.kiarchive.ru/pub/unix/crypto/
MAINTAINER= ache@FreeBSD.org
+COMMENT= E-mail privacy package, support anon remailers, PGP, nyms
BUILD_DEPENDS+= pgp:${PORTSDIR}/security/pgp
diff --git a/mail/premail/pkg-comment b/mail/premail/pkg-comment
deleted file mode 100644
index a68b271f2500..000000000000
--- a/mail/premail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-E-mail privacy package, support anon remailers, PGP, nyms
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile
index 39d4b2d07720..d2e670c8c999 100644
--- a/mail/procmail/Makefile
+++ b/mail/procmail/Makefile
@@ -31,6 +31,7 @@ MASTER_SITES= ftp://ftp.procmail.org/pub/procmail/ \
ftp://ftp.mirror.ac.uk/sites/ftp.procmail.org/pub/procmail/
MAINTAINER= ache@FreeBSD.org
+COMMENT= A local mail delivery agent
# Global variables
#
diff --git a/mail/procmail/pkg-comment b/mail/procmail/pkg-comment
deleted file mode 100644
index 144be9e04593..000000000000
--- a/mail/procmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A local mail delivery agent
diff --git a/mail/prom-mew/Makefile b/mail/prom-mew/Makefile
index 594783ab8d96..2bceace99d82 100644
--- a/mail/prom-mew/Makefile
+++ b/mail/prom-mew/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mail elisp
MASTER_SITES= http://www02.so-net.ne.jp/~murata/software/pub/
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Procmail reader for Mew on GNU Emacs
# This port requires Mew. But we can't decide which mew to depends, there is
# NO RUN_DEPENDS mail/mew*.
diff --git a/mail/prom-mew/pkg-comment b/mail/prom-mew/pkg-comment
deleted file mode 100644
index 1c86dd04ecaa..000000000000
--- a/mail/prom-mew/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Procmail reader for Mew on GNU Emacs
diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile
index 04d34dedf2d9..9445e1956a3f 100644
--- a/mail/prom-wl/Makefile
+++ b/mail/prom-wl/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mail elisp
MASTER_SITES= http://www02.so-net.ne.jp/~murata/software/pub/
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= Procmail reader for Wanderlust on GNU Emacs
# This port requires Wanderlust. But we can't decide which Wanderlust to
# depends, there is NO RUN_DEPENDS mail/wanderlust-*.
diff --git a/mail/prom-wl/pkg-comment b/mail/prom-wl/pkg-comment
deleted file mode 100644
index 9191681293bc..000000000000
--- a/mail/prom-wl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Procmail reader for Wanderlust on GNU Emacs
diff --git a/mail/pygmy/Makefile b/mail/pygmy/Makefile
index f95610ac53b1..4cd1e516dc23 100644
--- a/mail/pygmy/Makefile
+++ b/mail/pygmy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail python gnome
MASTER_SITES= http://pygmy.sourceforge.net/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A tiny GNOME mail client written in the Python programming language
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome \
diff --git a/mail/pygmy/pkg-comment b/mail/pygmy/pkg-comment
deleted file mode 100644
index 80023d01b5f1..000000000000
--- a/mail/pygmy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tiny GNOME mail client written in the Python programming language
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index cc618a1fbbb4..a404765d7892 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.italpro.net/mb/soft/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool to view and manage a qmail queue
RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
diff --git a/mail/qmHandle/pkg-comment b/mail/qmHandle/pkg-comment
deleted file mode 100644
index c002ee0c8f68..000000000000
--- a/mail/qmHandle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to view and manage a qmail queue
diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile
index 2be4e7db933e..2b2a9910610e 100644
--- a/mail/qmail-contrib/Makefile
+++ b/mail/qmail-contrib/Makefile
@@ -14,6 +14,7 @@ DISTFILES= dot-forward-${DF_VER}.tar.gz \
fastforward-${FF_VER}.tar.gz
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Contributed programs for qmail
RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
diff --git a/mail/qmail-contrib/pkg-comment b/mail/qmail-contrib/pkg-comment
deleted file mode 100644
index a79f40a42b50..000000000000
--- a/mail/qmail-contrib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Contributed programs for qmail
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index 396af1c4d9cc..465904d51067 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= ftp://cr.yp.to/software/
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A collection of tools to analyze qmail-send's activity
RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
diff --git a/mail/qmailanalog/pkg-comment b/mail/qmailanalog/pkg-comment
deleted file mode 100644
index 35f600519aef..000000000000
--- a/mail/qmailanalog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of tools to analyze qmail-send's activity
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
index cc618a1fbbb4..a404765d7892 100644
--- a/mail/qmhandle/Makefile
+++ b/mail/qmhandle/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.italpro.net/mb/soft/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool to view and manage a qmail queue
RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail
diff --git a/mail/qmhandle/pkg-comment b/mail/qmhandle/pkg-comment
deleted file mode 100644
index c002ee0c8f68..000000000000
--- a/mail/qmhandle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to view and manage a qmail queue
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index 1dc333632364..9350a2ee7788 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.superscript.com/qtools/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Several utilities for use with qmail
RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail
diff --git a/mail/qtools/pkg-comment b/mail/qtools/pkg-comment
deleted file mode 100644
index 70795d1b2c4b..000000000000
--- a/mail/qtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Several utilities for use with qmail
diff --git a/mail/razor-agents/Makefile b/mail/razor-agents/Makefile
index 46074ab1470d..4c56228fc959 100644
--- a/mail/razor-agents/Makefile
+++ b/mail/razor-agents/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= razor
MAINTAINER= leeym@FreeBSD.org
+COMMENT= A distributed, collaborative, spam detection and filtering network
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
diff --git a/mail/razor-agents/pkg-comment b/mail/razor-agents/pkg-comment
deleted file mode 100644
index f87849c29195..000000000000
--- a/mail/razor-agents/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A distributed, collaborative, spam detection and filtering network
diff --git a/mail/regm/Makefile b/mail/regm/Makefile
index cb1006a522cd..ce6e9e77c0dd 100644
--- a/mail/regm/Makefile
+++ b/mail/regm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail python
MASTER_SITES= http://perso.linuxfr.org/jdumont/regm/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Extract messages from a mailbox using regular expressions
USE_REINPLACE= yes
NO_BUILD= yes
diff --git a/mail/regm/pkg-comment b/mail/regm/pkg-comment
deleted file mode 100644
index 9cb2a303d906..000000000000
--- a/mail/regm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extract messages from a mailbox using regular expressions
diff --git a/mail/ricochet/Makefile b/mail/ricochet/Makefile
index 8699eac79623..a059cb561e37 100644
--- a/mail/ricochet/Makefile
+++ b/mail/ricochet/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mail
MASTER_SITES= http://vipul.net/perl/sources/spamcontrol/ricochet/
MAINTAINER= leeym@FreeBSD.org
+COMMENT= An automated agent for tracing and reporting internet junk mail
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
diff --git a/mail/ricochet/pkg-comment b/mail/ricochet/pkg-comment
deleted file mode 100644
index 89805a3a9045..000000000000
--- a/mail/ricochet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automated agent for tracing and reporting internet junk mail
diff --git a/mail/rmime/Makefile b/mail/rmime/Makefile
index 8e731b3b294b..f60b10da973b 100644
--- a/mail/rmime/Makefile
+++ b/mail/rmime/Makefile
@@ -17,6 +17,7 @@ EXTRACT_SUFX= # empty
EXTRACT_ONLY= # empty
MAINTAINER= dd@FreeBSD.org
+COMMENT= Decode MIME messages inside Emacs (works with RMAIL, VM, and mh-e)
BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs20
RUN_DEPENDS= metamail:${PORTSDIR}/mail/metamail
diff --git a/mail/rmime/pkg-comment b/mail/rmime/pkg-comment
deleted file mode 100644
index dd0e38d579a1..000000000000
--- a/mail/rmime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Decode MIME messages inside Emacs (works with RMAIL, VM, and mh-e)
diff --git a/mail/rmoldmail/Makefile b/mail/rmoldmail/Makefile
index ce4aa1f8b748..88adc0571d6d 100644
--- a/mail/rmoldmail/Makefile
+++ b/mail/rmoldmail/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://probiers.net/projects/rmoldmail/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Prune a mailbox of messages older than a set number of days
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Date/Calc.pm:${PORTSDIR}/devel/p5-Date-Calc
diff --git a/mail/rmoldmail/pkg-comment b/mail/rmoldmail/pkg-comment
deleted file mode 100644
index f4f966a825c7..000000000000
--- a/mail/rmoldmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Prune a mailbox of messages older than a set number of days
diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile
index f6949adba793..f2b7970aeee5 100644
--- a/mail/serialmail/Makefile
+++ b/mail/serialmail/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://cr.yp.to/software/ \
ftp://ftp.iway.fr/pub/unix/mail/qmail/
MAINTAINER= tom@FreeBSD.org
+COMMENT= Tools for passing mail across serial links
MAN1= maildirqmtp.1 maildirserial.1 maildirsmtp.1 serialqmtp.1 serialsmtp.1 setlock.1
diff --git a/mail/serialmail/pkg-comment b/mail/serialmail/pkg-comment
deleted file mode 100644
index b8d1316e9893..000000000000
--- a/mail/serialmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tools for passing mail across serial links
diff --git a/mail/sigit/Makefile b/mail/sigit/Makefile
index f91f1cf9cbc4..785b2b37c8c4 100644
--- a/mail/sigit/Makefile
+++ b/mail/sigit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.redhead.dk/download/stable/
DISTNAME= Sigit-${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
+COMMENT= A tool to create random signatures
USE_REINPLACE= yes
USE_PERL5= yes
diff --git a/mail/sigit/pkg-comment b/mail/sigit/pkg-comment
deleted file mode 100644
index 6338e2ef7957..000000000000
--- a/mail/sigit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to create random signatures
diff --git a/mail/sonicmail/Makefile b/mail/sonicmail/Makefile
index 7d60d2d82786..b172a23e3994 100644
--- a/mail/sonicmail/Makefile
+++ b/mail/sonicmail/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://download.sourceforge.net/sonicmail/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A POP3 email notifier GNOME applet
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/mail/sonicmail/pkg-comment b/mail/sonicmail/pkg-comment
deleted file mode 100644
index 986a9a766777..000000000000
--- a/mail/sonicmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A POP3 email notifier GNOME applet
diff --git a/mail/spambnc/Makefile b/mail/spambnc/Makefile
index 800c9f8c459c..1613570fae6f 100644
--- a/mail/spambnc/Makefile
+++ b/mail/spambnc/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= spambnc-${PORTVERSION}
EXTRACT_ONLY= sb.tar.Z
MAINTAINER= greid@FreeBSD.org
+COMMENT= A set of procmail recipies which handle known/suspected spam
IGNOREFILES= index.shtml
NO_WRKSUBDIR= yes
diff --git a/mail/spambnc/pkg-comment b/mail/spambnc/pkg-comment
deleted file mode 100644
index bd7908b53d2a..000000000000
--- a/mail/spambnc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of procmail recipies which handle known/suspected spam
diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile
index 63c96da5ad02..8b6b72c3dd91 100644
--- a/mail/spamprobe/Makefile
+++ b/mail/spamprobe/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=${PORTNAME}
LIB_DEPENDS= db3.3:${PORTSDIR}/databases/db3
MAINTAINER= mdodd@freebsd.org
+COMMENT= Spam detector using Bayesian analysis of word counts
MAKEFILE= ${FILESDIR}/Makefile
MAKE_ENV+= FILESDIR="${FILESDIR}"
diff --git a/mail/spamprobe/pkg-comment b/mail/spamprobe/pkg-comment
deleted file mode 100644
index dfd8ee247392..000000000000
--- a/mail/spamprobe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Spam detector using Bayesian analysis of word counts
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 3d89a8a26e73..0f8083cff6c1 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= courier
MAINTAINER= nbm@FreeBSD.org
+COMMENT= CGI Webmail client for Maildirs
#
# User-serviceable variables
diff --git a/mail/sqwebmail/pkg-comment b/mail/sqwebmail/pkg-comment
deleted file mode 100644
index 0e6bbcd20b14..000000000000
--- a/mail/sqwebmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CGI Webmail client for Maildirs
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index 34b71fb7590d..d66267b175c5 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/tlb/ \
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= The List Batcher, a general purpose mail list delivery engine
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Address.pm:${PORTSDIR}/mail/p5-Mail-Tools \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Format.pm:${PORTSDIR}/devel/p5-TimeDate \
diff --git a/mail/tlb/pkg-comment b/mail/tlb/pkg-comment
deleted file mode 100644
index ce2e32a0ec0b..000000000000
--- a/mail/tlb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The List Batcher, a general purpose mail list delivery engine
diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile
index ab841bf75a5d..1212068f4d00 100644
--- a/mail/vqadmin/Makefile
+++ b/mail/vqadmin/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail
MASTER_SITES= http://www.inter7.com/vqadmin/
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A cgi-based Virtual Qmail Domains Administrator
BUILD_DEPENDS= \
${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail
diff --git a/mail/vqadmin/pkg-comment b/mail/vqadmin/pkg-comment
deleted file mode 100644
index 06d64735e76f..000000000000
--- a/mail/vqadmin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cgi-based Virtual Qmail Domains Administrator
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index a8e0b471c960..b9f80fc014b8 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jim@FreeBSD.org
+COMMENT= An xbiff-like Window Maker dock app
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/mail/wmbiff/pkg-comment b/mail/wmbiff/pkg-comment
deleted file mode 100644
index 957f66834899..000000000000
--- a/mail/wmbiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xbiff-like Window Maker dock app
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index c6dd28d12610..bcffb86a9655 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.eecg.utoronto.ca/~chanb/WMMail.app/
DISTNAME= WMMail.app-${PORTVERSION}
MAINTAINER= jim@FreeBSD.org
+COMMENT= A little mail notifier for the Window Maker dock
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList
diff --git a/mail/wmmail/pkg-comment b/mail/wmmail/pkg-comment
deleted file mode 100644
index defa4605a654..000000000000
--- a/mail/wmmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A little mail notifier for the Window Maker dock
diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index 3b8d642bac72..6fc7612cc47b 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mail windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Incoming mail monitor dockapp with a similar look to wmcpuload
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/mail/wmmaiload/pkg-comment b/mail/wmmaiload/pkg-comment
deleted file mode 100644
index 09cf995d1c9b..000000000000
--- a/mail/wmmaiload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Incoming mail monitor dockapp with a similar look to wmcpuload
diff --git a/mail/wmmultipop3/Makefile b/mail/wmmultipop3/Makefile
index b4f33a5352fc..9b8e0524cfa2 100644
--- a/mail/wmmultipop3/Makefile
+++ b/mail/wmmultipop3/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://bart.sm.luth.se/~dansun-8/software/wmMultiPop3/
DISTNAME= wmMultiPop3-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A WindowMaker dockapp that checks multiple pop3 accounts for new mail
BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/${PORTNAME}
USE_X_PREFIX= yes
diff --git a/mail/wmmultipop3/pkg-comment b/mail/wmmultipop3/pkg-comment
deleted file mode 100644
index 93a262036dfd..000000000000
--- a/mail/wmmultipop3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WindowMaker dockapp that checks multiple pop3 accounts for new mail
diff --git a/mail/wmpop3/Makefile b/mail/wmpop3/Makefile
index c082e5a60bc2..bfa377650eb5 100644
--- a/mail/wmpop3/Makefile
+++ b/mail/wmpop3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.cs.mun.ca/~scotth/download/
DISTFILES= WMPop3-${PORTVERSION}.tar.gz
MAINTAINER= jim@FreeBSD.org
+COMMENT= A POP3 mail check for the Window Maker dock
WRKSRC= ${WRKDIR}/${DISTNAME}/wmpop3
diff --git a/mail/wmpop3/pkg-comment b/mail/wmpop3/pkg-comment
deleted file mode 100644
index a44ac7f9296b..000000000000
--- a/mail/wmpop3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A POP3 mail check for the Window Maker dock
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile
index b530ed7a7047..c7489a0b2d49 100644
--- a/mail/xfmail/Makefile
+++ b/mail/xfmail/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTVERSION}rc1/source/
DISTNAME= ${PORTNAME}-${PORTVERSION}-rc1
MAINTAINER= mikeh@FreeBSD.org
+COMMENT= An X Window System application for receiving electronic mail
BUILD_DEPENDS+= autoconf:${PORTSDIR}/devel/autoconf
diff --git a/mail/xfmail/pkg-comment b/mail/xfmail/pkg-comment
deleted file mode 100644
index a89880ab4e60..000000000000
--- a/mail/xfmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X Window System application for receiving electronic mail
diff --git a/mail/xlbiff/Makefile b/mail/xlbiff/Makefile
index 8b8f1289bf70..fe944d159377 100644
--- a/mail/xlbiff/Makefile
+++ b/mail/xlbiff/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.x.org/R5contrib/
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= The X Literate Biff - displays the from and subject from incoming mails
USE_IMAKE= yes
MAN1= xlbiff.1
diff --git a/mail/xlbiff/pkg-comment b/mail/xlbiff/pkg-comment
deleted file mode 100644
index ef1e74b238ed..000000000000
--- a/mail/xlbiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The X Literate Biff - displays the from and subject from incoming mails
diff --git a/mail/youbin/Makefile b/mail/youbin/Makefile
index e8c2efb28df0..5d7cd7e85247 100644
--- a/mail/youbin/Makefile
+++ b/mail/youbin/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.agusa.nuie.nagoya-u.ac.jp/software/agusalab/youbin/arch
DISTNAME= ${PORTNAME}${PORTVERSION}-unix
MAINTAINER= max@FreeBSD.org
+COMMENT= Mail arrival notification service package
USE_IMAKE= yes
USE_X_PREFIX= no
diff --git a/mail/youbin/pkg-comment b/mail/youbin/pkg-comment
deleted file mode 100644
index fee6ad64b45a..000000000000
--- a/mail/youbin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mail arrival notification service package
diff --git a/math/calc/Makefile b/math/calc/Makefile
index ddff309ccfa1..9f4d46a6ab48 100644
--- a/math/calc/Makefile
+++ b/math/calc/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.uu.net/pub/calc/ \
DISTNAME= calc-2.11.5t4.5
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Arbitrary precision calculator
MAN1= calc.1
diff --git a/math/calc/pkg-comment b/math/calc/pkg-comment
deleted file mode 100644
index a79f06dbcd4c..000000000000
--- a/math/calc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Arbitrary precision calculator
diff --git a/math/ccmath/Makefile b/math/ccmath/Makefile
index 77ad7ca65dcc..ac6a77f6ab50 100644
--- a/math/ccmath/Makefile
+++ b/math/ccmath/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= libs
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A mathematics library with many different functions
INSTALLS_SHLIB= yes
diff --git a/math/ccmath/pkg-comment b/math/ccmath/pkg-comment
deleted file mode 100644
index 774c011f0284..000000000000
--- a/math/ccmath/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mathematics library with many different functions
diff --git a/math/dcdflib/Makefile b/math/dcdflib/Makefile
index 8e858109bb5e..d00fd3331669 100644
--- a/math/dcdflib/Makefile
+++ b/math/dcdflib/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= math
MASTER_SITES= ftp://odin.mda.uth.tmc.edu/pub/source/
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Library of C Routines for Cumulative Distribution Functions
WRKSRC= ${WRKDIR}/dcdflib.c/src
diff --git a/math/dcdflib/pkg-comment b/math/dcdflib/pkg-comment
deleted file mode 100644
index afbd536eb878..000000000000
--- a/math/dcdflib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library of C Routines for Cumulative Distribution Functions
diff --git a/math/diehard/Makefile b/math/diehard/Makefile
index 2f20ce37ec1e..d70601f2d2cb 100644
--- a/math/diehard/Makefile
+++ b/math/diehard/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://stat.fsu.edu/pub/diehard/
DISTNAME= die.c
MAINTAINER= skv@FreeBSD.org
+COMMENT= Marsaglia's Diehard Battery of Tests of Randomness
ALL_TARGET= diehard
USE_REINPLACE= YES
diff --git a/math/diehard/pkg-comment b/math/diehard/pkg-comment
deleted file mode 100644
index 3d6592b8a1a6..000000000000
--- a/math/diehard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Marsaglia's Diehard Battery of Tests of Randomness
diff --git a/math/fudgit/Makefile b/math/fudgit/Makefile
index 240b4e1ff651..6cd631f1ccc2 100644
--- a/math/fudgit/Makefile
+++ b/math/fudgit/Makefile
@@ -13,6 +13,7 @@ DISTNAME= Fudgit_${PORTVERSION}
DISTFILES= fudgit_${PORTVERSION}.tar.gz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Multi-purpose data-processing and fitting program
USE_GMAKE= yes
MAN1= fudgit.1
diff --git a/math/fudgit/pkg-comment b/math/fudgit/pkg-comment
deleted file mode 100644
index cdf7928f08d3..000000000000
--- a/math/fudgit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-purpose data-processing and fitting program
diff --git a/math/gap/Makefile b/math/gap/Makefile
index 05509dd9fafa..bc57998f7e93 100644
--- a/math/gap/Makefile
+++ b/math/gap/Makefile
@@ -15,6 +15,7 @@ DISTFILES= gap4r3.tar.gz \
DIST_SUBDIR= gap
MAINTAINER= keith@FreeBSD.org
+COMMENT= GAP is a system for computational discrete algebra
NO_CDROM= "Don't sell for profit."
diff --git a/math/gap/pkg-comment b/math/gap/pkg-comment
deleted file mode 100644
index 9fc942c2ca4a..000000000000
--- a/math/gap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GAP is a system for computational discrete algebra
diff --git a/math/gexpr/Makefile b/math/gexpr/Makefile
index fad9c484a7a4..8241d26cc26f 100644
--- a/math/gexpr/Makefile
+++ b/math/gexpr/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/math/calc
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A shell calculator
LIB_DEPENDS= gnugetopt:${PORTSDIR}/devel/libgnugetopt
diff --git a/math/gexpr/pkg-comment b/math/gexpr/pkg-comment
deleted file mode 100644
index 23a6028cafeb..000000000000
--- a/math/gexpr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A shell calculator
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index a94b0b6530ae..45736ee8e7e2 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= The GNOME spreadsheet
LIB_DEPENDS= gnomeole2.0:${PORTSDIR}/devel/libole2 \
gbrun.0:${PORTSDIR}/lang/gnomebasic \
diff --git a/math/gnumeric/pkg-comment b/math/gnumeric/pkg-comment
deleted file mode 100644
index d8c5dca69649..000000000000
--- a/math/gnumeric/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNOME spreadsheet
diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile
index 5a83dd5fa647..73585559342a 100644
--- a/math/gnumeric2/Makefile
+++ b/math/gnumeric2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The GNOME 2 spreadsheet
LIB_DEPENDS= gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui \
gal-2.0.0:${PORTSDIR}/x11-toolkits/gal2 \
diff --git a/math/gnumeric2/pkg-comment b/math/gnumeric2/pkg-comment
deleted file mode 100644
index 9996a2bf692a..000000000000
--- a/math/gnumeric2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNOME 2 spreadsheet
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index 393972587fd1..9d6d139bc4ac 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= A command-driven interactive function plotting program
LIB_DPEENDS=
.if !defined(WITHOUT_PNG)
diff --git a/math/gnuplot/pkg-comment b/math/gnuplot/pkg-comment
deleted file mode 100644
index c6bf7253e077..000000000000
--- a/math/gnuplot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-driven interactive function plotting program
diff --git a/math/grpn/Makefile b/math/grpn/Makefile
index 27e8761bec32..f864cd69ba47 100644
--- a/math/grpn/Makefile
+++ b/math/grpn/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= math
MASTER_SITES= http://lashwhip.com/grpn/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= GTK+-based reverse polish notation (RPN) calculator
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/math/grpn/pkg-comment b/math/grpn/pkg-comment
deleted file mode 100644
index 55010a94bbf3..000000000000
--- a/math/grpn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+-based reverse polish notation (RPN) calculator
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index ad10eda4755b..4eac7ed58b03 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/Guppi/0.40
DISTNAME= Guppi-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A ploting program for GNOME
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
diff --git a/math/guppi/pkg-comment b/math/guppi/pkg-comment
deleted file mode 100644
index fc271ebf2e3d..000000000000
--- a/math/guppi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ploting program for GNOME
diff --git a/math/jacal/Makefile b/math/jacal/Makefile
index da04f777c32d..0eba59de917a 100644
--- a/math/jacal/Makefile
+++ b/math/jacal/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://swissnet.ai.mit.edu/ftpdir/scm/
DISTNAME= jacal1b2
MAINTAINER= markm@FreeBSD.org
+COMMENT= Symbolic mathematics program written in Scheme
RUN_DEPENDS= scm:${PORTSDIR}/lang/scm
diff --git a/math/jacal/pkg-comment b/math/jacal/pkg-comment
deleted file mode 100644
index 7925b08751f8..000000000000
--- a/math/jacal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Symbolic mathematics program written in Scheme
diff --git a/math/javanns/Makefile b/math/javanns/Makefile
index 0b327db39db5..4da6e973ea1f 100644
--- a/math/javanns/Makefile
+++ b/math/javanns/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www-ra.informatik.uni-tuebingen.de/downloads/JavaNNS/
DISTNAME= JavaNNS-LinuxIntel
MAINTAINER= des@FreeBSD.org
+COMMENT= Fully featured neural network simulator
RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper
diff --git a/math/javanns/pkg-comment b/math/javanns/pkg-comment
deleted file mode 100644
index 52241a4f78a8..000000000000
--- a/math/javanns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fully featured neural network simulator
diff --git a/math/kcalc/Makefile b/math/kcalc/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/math/kcalc/Makefile
+++ b/math/kcalc/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/math/kcalc/pkg-comment b/math/kcalc/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/math/kcalc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/math/lapack++/Makefile b/math/lapack++/Makefile
index 1594bb2028c2..d7e01f1f3003 100644
--- a/math/lapack++/Makefile
+++ b/math/lapack++/Makefile
@@ -19,6 +19,7 @@ DIST_SUBDIR= lapack++
EXTRACT_ONLY= Lapackpp1_1a.tgz
MAINTAINER= maho@FreeBSD.org
+COMMENT= Linear Algebra PACKage in C++, a wrapper for LAPACK
LIB_DEPENDS= lapack:${PORTSDIR}/math/lapack \
atlas:${PORTSDIR}/math/atlas
diff --git a/math/lapack++/pkg-comment b/math/lapack++/pkg-comment
deleted file mode 100644
index 40fa71523dd0..000000000000
--- a/math/lapack++/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linear Algebra PACKage in C++, a wrapper for LAPACK
diff --git a/math/lapack/Makefile b/math/lapack/Makefile
index fab1a1a9ee02..3418c31bb573 100644
--- a/math/lapack/Makefile
+++ b/math/lapack/Makefile
@@ -13,6 +13,7 @@ DISTNAME= LAPACK
DISTFILES= lapack.tgz manpages.tgz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A library of Fortran 77 subroutines for linear algebra
DIST_SUBDIR= lapack
diff --git a/math/lapack/pkg-comment b/math/lapack/pkg-comment
deleted file mode 100644
index 0c6bff494b40..000000000000
--- a/math/lapack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library of Fortran 77 subroutines for linear algebra
diff --git a/math/librandlib/Makefile b/math/librandlib/Makefile
index f168d39d268d..bb888416f71d 100644
--- a/math/librandlib/Makefile
+++ b/math/librandlib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.netlib.org/random/
DISTNAME= ranlib.c
MAINTAINER= tg@FreeBSD.org
+COMMENT= Library of Routines for Random Number Generation
INSTALLS_SHLIB= yes
MAKE_ENV= NOPROFILE=true
diff --git a/math/librandlib/pkg-comment b/math/librandlib/pkg-comment
deleted file mode 100644
index 49c4cb80d006..000000000000
--- a/math/librandlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library of Routines for Random Number Generation
diff --git a/math/libranlib/Makefile b/math/libranlib/Makefile
index f168d39d268d..bb888416f71d 100644
--- a/math/libranlib/Makefile
+++ b/math/libranlib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.netlib.org/random/
DISTNAME= ranlib.c
MAINTAINER= tg@FreeBSD.org
+COMMENT= Library of Routines for Random Number Generation
INSTALLS_SHLIB= yes
MAKE_ENV= NOPROFILE=true
diff --git a/math/libranlib/pkg-comment b/math/libranlib/pkg-comment
deleted file mode 100644
index 49c4cb80d006..000000000000
--- a/math/libranlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library of Routines for Random Number Generation
diff --git a/math/mtrxmath/Makefile b/math/mtrxmath/Makefile
index e93a6f9b79e9..1c7bec009a47 100644
--- a/math/mtrxmath/Makefile
+++ b/math/mtrxmath/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= math
MASTER_SITES= http://www.angelfire.com/linux/linuxjeff/mtrxmath/files/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A small tool for matrix mathemetics
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/math/mtrxmath/pkg-comment b/math/mtrxmath/pkg-comment
deleted file mode 100644
index c2ed0d33404a..000000000000
--- a/math/mtrxmath/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small tool for matrix mathemetics
diff --git a/math/mupad/Makefile b/math/mupad/Makefile
index 5a9a65f88119..5ec9bf112e4a 100644
--- a/math/mupad/Makefile
+++ b/math/mupad/Makefile
@@ -15,6 +15,7 @@ DISTFILES= bin_linux_scilab_251.tgz share_251.tgz
DIST_SUBDIR= mupad
MAINTAINER= maho@FreeBSD.org
+COMMENT= A sophisticated computer algebra system
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
${LINUXBASE}/usr/lib/libImlib.so.1:${PORTSDIR}/graphics/linux-imlib \
diff --git a/math/mupad/pkg-comment b/math/mupad/pkg-comment
deleted file mode 100644
index b8f5609e0f14..000000000000
--- a/math/mupad/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sophisticated computer algebra system
diff --git a/math/octave-devel/Makefile b/math/octave-devel/Makefile
index 236df6c49382..95ae83a621f1 100644
--- a/math/octave-devel/Makefile
+++ b/math/octave-devel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= High-level interactive language for numerical computations
USE_BZIP2= yes
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/math/octave-devel/pkg-comment b/math/octave-devel/pkg-comment
deleted file mode 100644
index bf69360caa8f..000000000000
--- a/math/octave-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-level interactive language for numerical computations
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 236df6c49382..95ae83a621f1 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.che.wisc.edu/pub/octave/bleeding-edge/ \
ftp://ftp.eos.hokudai.ac.jp/pub/GNU/misc/octave/bleeding-edge/
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= High-level interactive language for numerical computations
USE_BZIP2= yes
BUILD_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/math/octave/pkg-comment b/math/octave/pkg-comment
deleted file mode 100644
index bf69360caa8f..000000000000
--- a/math/octave/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-level interactive language for numerical computations
diff --git a/math/p5-Bit-Vector/Makefile b/math/p5-Bit-Vector/Makefile
index 9c3dec7d40c1..4538dfdd9d0d 100644
--- a/math/p5-Bit-Vector/Makefile
+++ b/math/p5-Bit-Vector/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Bit
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Library of advanced math functions that includes a Perl OO module
PERL_CONFIGURE= yes
diff --git a/math/p5-Bit-Vector/pkg-comment b/math/p5-Bit-Vector/pkg-comment
deleted file mode 100644
index 06873270423b..000000000000
--- a/math/p5-Bit-Vector/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library of advanced math functions that includes a Perl OO module
diff --git a/math/p5-Graph/Makefile b/math/p5-Graph/Makefile
index dbf70424016f..63a34f061383 100644
--- a/math/p5-Graph/Makefile
+++ b/math/p5-Graph/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Graph
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Graph, the Perl module for graph operations
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Heap.pm:${PORTSDIR}/devel/p5-Heap
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/math/p5-Graph/pkg-comment b/math/p5-Graph/pkg-comment
deleted file mode 100644
index db62b6d974e4..000000000000
--- a/math/p5-Graph/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graph, the Perl module for graph operations
diff --git a/math/p5-Math-Base85/Makefile b/math/p5-Math-Base85/Makefile
index 2f80094c5f3c..454466154cbd 100644
--- a/math/p5-Math-Base85/Makefile
+++ b/math/p5-Math-Base85/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension for base 85 numbers, as referenced by RFC 1924
PERL_CONFIGURE= yes
diff --git a/math/p5-Math-Base85/pkg-comment b/math/p5-Math-Base85/pkg-comment
deleted file mode 100644
index 16ac1dc49e07..000000000000
--- a/math/p5-Math-Base85/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for base 85 numbers, as referenced by RFC 1924
diff --git a/math/p5-Math-BigInt/Makefile b/math/p5-Math-BigInt/Makefile
index 4de9e09f917b..2398a51804b8 100644
--- a/math/p5-Math-BigInt/Makefile
+++ b/math/p5-Math-BigInt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Math::BigInt - Arbitrary size integer math package
PERL_CONFIGURE= yes
CONFIGURE_ARGS+= INSTALLDIRS='site'
diff --git a/math/p5-Math-BigInt/pkg-comment b/math/p5-Math-BigInt/pkg-comment
deleted file mode 100644
index 85e01ff3f5ff..000000000000
--- a/math/p5-Math-BigInt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Math::BigInt - Arbitrary size integer math package
diff --git a/math/p5-Math-LinearCombination/Makefile b/math/p5-Math-LinearCombination/Makefile
index 34e2287aa3c8..b87e6a0cb555 100644
--- a/math/p5-Math-LinearCombination/Makefile
+++ b/math/p5-Math-LinearCombination/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Sum of variables with a numerical coefficient
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/fields.pm:${PORTSDIR}/devel/p5-Class-Fields \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Math/SimpleVariable.pm:${PORTSDIR}/math/p5-Math-SimpleVariable
diff --git a/math/p5-Math-LinearCombination/pkg-comment b/math/p5-Math-LinearCombination/pkg-comment
deleted file mode 100644
index 7d6c1226789b..000000000000
--- a/math/p5-Math-LinearCombination/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sum of variables with a numerical coefficient
diff --git a/math/p5-Math-Pari/Makefile b/math/p5-Math-Pari/Makefile
index 20127541bad3..4992e7bd53da 100644
--- a/math/p5-Math-Pari/Makefile
+++ b/math/p5-Math-Pari/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= PARI - numerical/scientific/number-theoretic calculations
BUILD_DEPENDS= pari:${PORTSDIR}/math/pari:configure
diff --git a/math/p5-Math-Pari/pkg-comment b/math/p5-Math-Pari/pkg-comment
deleted file mode 100644
index 4a6d74be433d..000000000000
--- a/math/p5-Math-Pari/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PARI - numerical/scientific/number-theoretic calculations
diff --git a/math/p5-Math-Random-MT/Makefile b/math/p5-Math-Random-MT/Makefile
index bd63e02c3df6..4e9ad6aa79da 100644
--- a/math/p5-Math-Random-MT/Makefile
+++ b/math/p5-Math-Random-MT/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= The Mersenne Twister PRNG
PERL_CONFIGURE= yes
diff --git a/math/p5-Math-Random-MT/pkg-comment b/math/p5-Math-Random-MT/pkg-comment
deleted file mode 100644
index 8bfe04aac539..000000000000
--- a/math/p5-Math-Random-MT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Mersenne Twister PRNG
diff --git a/math/p5-Math-Random/Makefile b/math/p5-Math-Random/Makefile
index 59d1049e222e..fa8cbc762f97 100644
--- a/math/p5-Math-Random/Makefile
+++ b/math/p5-Math-Random/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Random number generators
PERL_CONFIGURE= yes
diff --git a/math/p5-Math-Random/pkg-comment b/math/p5-Math-Random/pkg-comment
deleted file mode 100644
index 4fdec8d70c28..000000000000
--- a/math/p5-Math-Random/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Random number generators
diff --git a/math/p5-Math-SimpleVariable/Makefile b/math/p5-Math-SimpleVariable/Makefile
index 8a5be9b956f7..398736431e9b 100644
--- a/math/p5-Math-SimpleVariable/Makefile
+++ b/math/p5-Math-SimpleVariable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Simple representation of mathematical variables
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/fields.pm:${PORTSDIR}/devel/p5-Class-Fields
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/math/p5-Math-SimpleVariable/pkg-comment b/math/p5-Math-SimpleVariable/pkg-comment
deleted file mode 100644
index 860f2b6e4f3a..000000000000
--- a/math/p5-Math-SimpleVariable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple representation of mathematical variables
diff --git a/math/p5-Math-TrulyRandom/Makefile b/math/p5-Math-TrulyRandom/Makefile
index 18349f4c1210..33b3f3b919b5 100644
--- a/math/p5-Math-TrulyRandom/Makefile
+++ b/math/p5-Math-TrulyRandom/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Math
PKGNAMEPREFIX= p5-
MAINTAINER= anders@FreeBSD.org
+COMMENT= Perl interface to a truly random number generator function
PERL_CONFIGURE= yes
diff --git a/math/p5-Math-TrulyRandom/pkg-comment b/math/p5-Math-TrulyRandom/pkg-comment
deleted file mode 100644
index 7deb38d95527..000000000000
--- a/math/p5-Math-TrulyRandom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to a truly random number generator function
diff --git a/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index c0607a00173b..40d6dc1331b5 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Set
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to manage an interval on the integer line
PERL_CONFIGURE= yes
diff --git a/math/p5-Set-Window/pkg-comment b/math/p5-Set-Window/pkg-comment
deleted file mode 100644
index 8c781dd21285..000000000000
--- a/math/p5-Set-Window/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to manage an interval on the integer line
diff --git a/math/p5-Statistics-ChiSquare/Makefile b/math/p5-Statistics-ChiSquare/Makefile
index 1c2164ec7dde..5ba8b39f1015 100644
--- a/math/p5-Statistics-ChiSquare/Makefile
+++ b/math/p5-Statistics-ChiSquare/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= How random is your data?
PERL_CONFIGURE= yes
diff --git a/math/p5-Statistics-ChiSquare/pkg-comment b/math/p5-Statistics-ChiSquare/pkg-comment
deleted file mode 100644
index 14daca9891a6..000000000000
--- a/math/p5-Statistics-ChiSquare/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-How random is your data?
diff --git a/math/p5-Statistics-Descriptive/Makefile b/math/p5-Statistics-Descriptive/Makefile
index e4f458f0ced7..dbcd3c128eb2 100644
--- a/math/p5-Statistics-Descriptive/Makefile
+++ b/math/p5-Statistics-Descriptive/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module that supplies statistical methods for perl5
PERL_CONFIGURE= yes
diff --git a/math/p5-Statistics-Descriptive/pkg-comment b/math/p5-Statistics-Descriptive/pkg-comment
deleted file mode 100644
index 9f52aa316a18..000000000000
--- a/math/p5-Statistics-Descriptive/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that supplies statistical methods for perl5
diff --git a/math/p5-Statistics-Distributions/Makefile b/math/p5-Statistics-Distributions/Makefile
index 2d587ebf2561..05810dbfb5a6 100644
--- a/math/p5-Statistics-Distributions/Makefile
+++ b/math/p5-Statistics-Distributions/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module that calculates critical values of common statistical distributions
PERL_CONFIGURE= yes
diff --git a/math/p5-Statistics-Distributions/pkg-comment b/math/p5-Statistics-Distributions/pkg-comment
deleted file mode 100644
index d70c1a23a0c3..000000000000
--- a/math/p5-Statistics-Distributions/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module that calculates critical values of common statistical distributions
diff --git a/math/p5-Statistics-LTU/Makefile b/math/p5-Statistics-LTU/Makefile
index 7d4f47623c2a..0df95dd458e4 100644
--- a/math/p5-Statistics-LTU/Makefile
+++ b/math/p5-Statistics-LTU/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl implementation of Linear Threshold Units
PERL_CONFIGURE= yes
diff --git a/math/p5-Statistics-LTU/pkg-comment b/math/p5-Statistics-LTU/pkg-comment
deleted file mode 100644
index bcb5bdc776dd..000000000000
--- a/math/p5-Statistics-LTU/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl implementation of Linear Threshold Units
diff --git a/math/p5-Statistics-OLS/Makefile b/math/p5-Statistics-OLS/Makefile
index 16d07ff9c495..28a51d0e0321 100644
--- a/math/p5-Statistics-OLS/Makefile
+++ b/math/p5-Statistics-OLS/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to perform ordinary least squares and other bivariate statistics
PERL_CONFIGURE= yes
diff --git a/math/p5-Statistics-OLS/pkg-comment b/math/p5-Statistics-OLS/pkg-comment
deleted file mode 100644
index 23fd4431ab63..000000000000
--- a/math/p5-Statistics-OLS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to perform ordinary least squares and other bivariate statistics
diff --git a/math/p5-Statistics-Table-F/Makefile b/math/p5-Statistics-Table-F/Makefile
index 4120e9254098..b3b2e5c7607b 100644
--- a/math/p5-Statistics-Table-F/Makefile
+++ b/math/p5-Statistics-Table-F/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Statistics
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for computing the statistical F-ratio
PERL_CONFIGURE= yes
diff --git a/math/p5-Statistics-Table-F/pkg-comment b/math/p5-Statistics-Table-F/pkg-comment
deleted file mode 100644
index 2fc4a818c8c4..000000000000
--- a/math/p5-Statistics-Table-F/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for computing the statistical F-ratio
diff --git a/math/py-gato/Makefile b/math/py-gato/Makefile
index 6872c8f65224..533f2b108bd0 100644
--- a/math/py-gato/Makefile
+++ b/math/py-gato/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Gato-${PORTVERSION:U:C|\.([^.]*)$|\1|}
EXTRACT_SUFX= .tar
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A Python-based toolbox to visualise algorithms on graphs
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
diff --git a/math/py-gato/pkg-comment b/math/py-gato/pkg-comment
deleted file mode 100644
index c741ebb9a96c..000000000000
--- a/math/py-gato/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python-based toolbox to visualise algorithms on graphs
diff --git a/math/py-gnuplot/Makefile b/math/py-gnuplot/Makefile
index 92ca39ccea79..1b640ce7e059 100644
--- a/math/py-gnuplot/Makefile
+++ b/math/py-gnuplot/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gnuplot-py
DISTNAME= Gnuplot-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Python interface to gnuplot plotting program
BUILD_DEPENDS= ${PYNUMERIC}
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot \
diff --git a/math/py-gnuplot/pkg-comment b/math/py-gnuplot/pkg-comment
deleted file mode 100644
index ce0db2bd14f9..000000000000
--- a/math/py-gnuplot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python interface to gnuplot plotting program
diff --git a/math/py-mpz/Makefile b/math/py-mpz/Makefile
index 2af84cac3249..0ce7a678b7e9 100644
--- a/math/py-mpz/Makefile
+++ b/math/py-mpz/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= tg@FreeBSD.org
+COMMENT= Python bindings to the GNU Multiple Precision library
LIB_DEPENDS= gmp.3:${PORTSDIR}/math/libgmp-freebsd
diff --git a/math/py-mpz/pkg-comment b/math/py-mpz/pkg-comment
deleted file mode 100644
index 22ef626b0eed..000000000000
--- a/math/py-mpz/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings to the GNU Multiple Precision library
diff --git a/math/py-numeric/Makefile b/math/py-numeric/Makefile
index 27ca74800b02..73b0656ff930 100644
--- a/math/py-numeric/Makefile
+++ b/math/py-numeric/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Numeric-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= The Numeric Extension to Python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/math/py-numeric/pkg-comment b/math/py-numeric/pkg-comment
deleted file mode 100644
index 29f5536121ee..000000000000
--- a/math/py-numeric/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Numeric Extension to Python
diff --git a/math/py-numeric17/Makefile b/math/py-numeric17/Makefile
index f0ae024c7e0c..968f8b248a19 100644
--- a/math/py-numeric17/Makefile
+++ b/math/py-numeric17/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Numeric-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= The Numeric Extension to Python
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/math/py-numeric17/pkg-comment b/math/py-numeric17/pkg-comment
deleted file mode 100644
index 29f5536121ee..000000000000
--- a/math/py-numeric17/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Numeric Extension to Python
diff --git a/math/py-scientific/Makefile b/math/py-scientific/Makefile
index db9f23426fdc..668a0e7df1b7 100644
--- a/math/py-scientific/Makefile
+++ b/math/py-scientific/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ScientificPython-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= Collection of Python modules for scientific computing
BUILD_DEPENDS= ${PYNUMERIC}
LIB_DEPENDS= netcdf.1:${PORTSDIR}/math/netcdf
diff --git a/math/py-scientific/pkg-comment b/math/py-scientific/pkg-comment
deleted file mode 100644
index 518a14ceb790..000000000000
--- a/math/py-scientific/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of Python modules for scientific computing
diff --git a/math/qscanplot/Makefile b/math/qscanplot/Makefile
index a5128f9293ea..e736d863661d 100644
--- a/math/qscanplot/Makefile
+++ b/math/qscanplot/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= math
MASTER_SITES= http://www.gae.ucm.es/~gonzalez/qscanplot/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A program to extract data from scanned plots, graphs and figures
BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake
diff --git a/math/qscanplot/pkg-comment b/math/qscanplot/pkg-comment
deleted file mode 100644
index f3ba0414a032..000000000000
--- a/math/qscanplot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to extract data from scanned plots, graphs and figures
diff --git a/math/randlib/Makefile b/math/randlib/Makefile
index f168d39d268d..bb888416f71d 100644
--- a/math/randlib/Makefile
+++ b/math/randlib/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.netlib.org/random/
DISTNAME= ranlib.c
MAINTAINER= tg@FreeBSD.org
+COMMENT= Library of Routines for Random Number Generation
INSTALLS_SHLIB= yes
MAKE_ENV= NOPROFILE=true
diff --git a/math/randlib/pkg-comment b/math/randlib/pkg-comment
deleted file mode 100644
index 49c4cb80d006..000000000000
--- a/math/randlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library of Routines for Random Number Generation
diff --git a/math/rcalc/Makefile b/math/rcalc/Makefile
index a10d44da8d98..a5ccbdb17617 100644
--- a/math/rcalc/Makefile
+++ b/math/rcalc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= rCalc-${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Symbolic calculator for GNOME
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/math/rcalc/pkg-comment b/math/rcalc/pkg-comment
deleted file mode 100644
index 402a0ccec14e..000000000000
--- a/math/rcalc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Symbolic calculator for GNOME
diff --git a/math/scigraphica/Makefile b/math/scigraphica/Makefile
index 6318f117d9ae..38e342d3828c 100644
--- a/math/scigraphica/Makefile
+++ b/math/scigraphica/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://scigraphica.sourceforge.net/src/ \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A scientific application for data analysis and technical graphics
BUILD_DEPENDS= ${PYNUMERIC}
LIB_DEPENDS= gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra
diff --git a/math/scigraphica/pkg-comment b/math/scigraphica/pkg-comment
deleted file mode 100644
index 79ce0d5b3855..000000000000
--- a/math/scigraphica/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A scientific application for data analysis and technical graphics
diff --git a/math/siag/Makefile b/math/siag/Makefile
index c0381ecbad23..75f043fa9e01 100644
--- a/math/siag/Makefile
+++ b/math/siag/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://siag.nu/pub/siag/ \
ftp://ftp.edu.stockholm.se/pub/siag/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Scheme-based "office" for X and curses. Sexy interface using Xaw3d
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \
sdb:${PORTSDIR}/databases/libsdb \
diff --git a/math/siag/pkg-comment b/math/siag/pkg-comment
deleted file mode 100644
index c34fa4d6d06a..000000000000
--- a/math/siag/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scheme-based "office" for X and curses. Sexy interface using Xaw3d
diff --git a/math/snns/Makefile b/math/snns/Makefile
index c05b80b8b2ce..bf1e1eabd184 100644
--- a/math/snns/Makefile
+++ b/math/snns/Makefile
@@ -14,6 +14,7 @@ DISTNAME= SNNSv${PORTVERSION}
DISTNAME= SNNSv${PORTVERSION}
MAINTAINER= des@FreeBSD.org
+COMMENT= Fully featured neural network simulator
USE_XLIB= yes
HAS_CONFIGURE= yes
diff --git a/math/snns/pkg-comment b/math/snns/pkg-comment
deleted file mode 100644
index 52241a4f78a8..000000000000
--- a/math/snns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fully featured neural network simulator
diff --git a/math/solitaire/Makefile b/math/solitaire/Makefile
index 7ff2dce21996..790d7273badd 100644
--- a/math/solitaire/Makefile
+++ b/math/solitaire/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= dd
DISTFILES= sol.pl sol-test.txt
MAINTAINER= dd@FreeBSD.org
+COMMENT= The reference implementation of the Solitaire encryption algorithm
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/math/solitaire/pkg-comment b/math/solitaire/pkg-comment
deleted file mode 100644
index a26a9ec2fbc5..000000000000
--- a/math/solitaire/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The reference implementation of the Solitaire encryption algorithm
diff --git a/math/wingz3/Makefile b/math/wingz3/Makefile
index 6ea08e660801..d9accd503250 100644
--- a/math/wingz3/Makefile
+++ b/math/wingz3/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= netu
EXTRACT_ONLY=
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A Commercial Spreadsheet
NO_PACKAGE= "nothing to build. commercial software"
diff --git a/math/wingz3/pkg-comment b/math/wingz3/pkg-comment
deleted file mode 100644
index 7f30f379a6eb..000000000000
--- a/math/wingz3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Commercial Spreadsheet
diff --git a/math/wmcalc/Makefile b/math/wmcalc/Makefile
index 612c0d8df592..5643e290019d 100644
--- a/math/wmcalc/Makefile
+++ b/math/wmcalc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jedgar
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Simple dockable calculator
ALL_TARGET= clean wmcalc
USE_X_PREFIX= yes
diff --git a/math/wmcalc/pkg-comment b/math/wmcalc/pkg-comment
deleted file mode 100644
index a87388cd7702..000000000000
--- a/math/wmcalc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple dockable calculator
diff --git a/math/xgfe/Makefile b/math/xgfe/Makefile
index 7ce80a21b125..4c1856458a54 100644
--- a/math/xgfe/Makefile
+++ b/math/xgfe/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mph
MAINTAINER= mph@freebsd.org
+COMMENT= An X11 front-end for Gnuplot
RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
diff --git a/math/xgfe/pkg-comment b/math/xgfe/pkg-comment
deleted file mode 100644
index 02bd0dd0db06..000000000000
--- a/math/xgfe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 front-end for Gnuplot
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index be75d762ca47..1f71b704473c 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= fenner
MAINTAINER= fenner@FreeBSD.org
+COMMENT= X11 plotting package
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/math/xplot/pkg-comment b/math/xplot/pkg-comment
deleted file mode 100644
index 455b9018be6e..000000000000
--- a/math/xplot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 plotting package
diff --git a/mbone/imm/Makefile b/mbone/imm/Makefile
index 4ca41dd5f326..4c071b20e263 100644
--- a/mbone/imm/Makefile
+++ b/mbone/imm/Makefile
@@ -13,6 +13,7 @@ DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@freebsd.org
+COMMENT= Internet Image(or other data) Multicaster (and receiver)
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/mbone/imm/pkg-comment b/mbone/imm/pkg-comment
deleted file mode 100644
index 3b8b83a184f7..000000000000
--- a/mbone/imm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Internet Image(or other data) Multicaster (and receiver)
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index e8c41831e19c..7386a1867d00 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone tk80
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/nte/1.5a29/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= Multicast Network Text Editor
LIB_DEPENDS= tk80.1:${PORTSDIR}/x11-toolkits/tk80
diff --git a/mbone/nte/pkg-comment b/mbone/nte/pkg-comment
deleted file mode 100644
index c0db014bdd8a..000000000000
--- a/mbone/nte/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multicast Network Text Editor
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index 3313ef9c5305..903757fd1cf1 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= \
http://www.icir.org/hodson/ucl-mirror/
MAINTAINER= orion@freebsd.org
+COMMENT= IPv4/v6 Multicast and unicast audio conferencing tool
TCLTK_VERSION= 8.2
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/mbone/rat/pkg-comment b/mbone/rat/pkg-comment
deleted file mode 100644
index abcb956e03eb..000000000000
--- a/mbone/rat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IPv4/v6 Multicast and unicast audio conferencing tool
diff --git a/mbone/rqm/Makefile b/mbone/rqm/Makefile
index b3bf4bda8cb3..efe5b65ccd47 100644
--- a/mbone/rqm/Makefile
+++ b/mbone/rqm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= A graphical RTP quality monitor
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
diff --git a/mbone/rqm/pkg-comment b/mbone/rqm/pkg-comment
deleted file mode 100644
index e33c64e88137..000000000000
--- a/mbone/rqm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical RTP quality monitor
diff --git a/mbone/rtpmon/Makefile b/mbone/rtpmon/Makefile
index 373068a8c944..7e7ce3d46470 100644
--- a/mbone/rtpmon/Makefile
+++ b/mbone/rtpmon/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= mbone tk83
MASTER_SITES= ftp://mm-ftp.cs.berkeley.edu/pub/rtpmon/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A program to montior loss in multicast sessions
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
diff --git a/mbone/rtpmon/pkg-comment b/mbone/rtpmon/pkg-comment
deleted file mode 100644
index 535d0d11114d..000000000000
--- a/mbone/rtpmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to montior loss in multicast sessions
diff --git a/mbone/rtptools/Makefile b/mbone/rtptools/Makefile
index 5a9b88f761bf..a4f8ef3f5c17 100644
--- a/mbone/rtptools/Makefile
+++ b/mbone/rtptools/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone
MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A set of tools to record, playback and monitor RTPv2 data streams
GNU_CONFIGURE= yes
diff --git a/mbone/rtptools/pkg-comment b/mbone/rtptools/pkg-comment
deleted file mode 100644
index 4e0d5f964364..000000000000
--- a/mbone/rtptools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of tools to record, playback and monitor RTPv2 data streams
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index a63085f4173b..d7943ba088b3 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone tk82
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= Multicast Session Directory
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
diff --git a/mbone/sdr/pkg-comment b/mbone/sdr/pkg-comment
deleted file mode 100644
index 9b614924d614..000000000000
--- a/mbone/sdr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multicast Session Directory
diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile
index ed6fdd84684e..a8a81d499bce 100644
--- a/mbone/vat/Makefile
+++ b/mbone/vat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/vat/alpha-test/
DISTFILES= vatsrc-4.0b2.tar.gz
MAINTAINER= fenner@FreeBSD.org
+COMMENT= The Visual Audio Tool - multicast audioconferencing
GSM_DIR= ${.CURDIR}/../../audio/gsm
GSM_WORK= ${WRKDIRPREFIX}${GSM_DIR}/work/gsm-1.0-pl10
diff --git a/mbone/vat/pkg-comment b/mbone/vat/pkg-comment
deleted file mode 100644
index e16ddfdfa5eb..000000000000
--- a/mbone/vat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Visual Audio Tool - multicast audioconferencing
diff --git a/mbone/vic/Makefile b/mbone/vic/Makefile
index b6a562e4e9a0..e805190a0f59 100644
--- a/mbone/vic/Makefile
+++ b/mbone/vic/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl-1.1.3/
DISTNAME= ${PORTNAME}-2.8ucl-1.1.3
MAINTAINER= fenner@FreeBSD.org
+COMMENT= MBONE video tool
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
diff --git a/mbone/vic/pkg-comment b/mbone/vic/pkg-comment
deleted file mode 100644
index d02447964f50..000000000000
--- a/mbone/vic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MBONE video tool
diff --git a/mbone/wb/Makefile b/mbone/wb/Makefile
index 7fbb109f2605..ed7e8f45cd98 100644
--- a/mbone/wb/Makefile
+++ b/mbone/wb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A shared drawing (whiteboard) tool using multicast
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/mbone/wb/pkg-comment b/mbone/wb/pkg-comment
deleted file mode 100644
index 8bd2e20b0482..000000000000
--- a/mbone/wb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A shared drawing (whiteboard) tool using multicast
diff --git a/misc/44bsd-more/Makefile b/misc/44bsd-more/Makefile
index 6e1de6cf9edb..f286f3e7de16 100644
--- a/misc/44bsd-more/Makefile
+++ b/misc/44bsd-more/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hoek
MAINTAINER= hoek@FreeBSD.org
+COMMENT= The pager installed with FreeBSD before less(1) was imported
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/misc/44bsd-more/pkg-comment b/misc/44bsd-more/pkg-comment
deleted file mode 100644
index fffddd0b71a9..000000000000
--- a/misc/44bsd-more/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The pager installed with FreeBSD before less(1) was imported
diff --git a/misc/achievo/Makefile b/misc/achievo/Makefile
index ca6b6760e027..32459652928c 100644
--- a/misc/achievo/Makefile
+++ b/misc/achievo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ftp.achievo.org/pub/achievo/
DISTNAME= ${PORTNAME}-stable-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A flexible web-based resource management tool
RUN_DEPENDS= ${LOCALBASE}/libexec/apache/libphp4.so:${PORTSDIR}/www/mod_php4
diff --git a/misc/achievo/pkg-comment b/misc/achievo/pkg-comment
deleted file mode 100644
index 8fd3db06d8d9..000000000000
--- a/misc/achievo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A flexible web-based resource management tool
diff --git a/misc/airoflash/Makefile b/misc/airoflash/Makefile
index 06f547855a79..6d4b2b714444 100644
--- a/misc/airoflash/Makefile
+++ b/misc/airoflash/Makefile
@@ -13,6 +13,7 @@ DISTNAME= airoflash.c
EXTRACT_SUFX=
MAINTAINER= ambrisko@freebsd.org
+COMMENT= Flash utiltity for Cisco/Aironet 802.11 wireless cards
AF_VERSION= 1.3
diff --git a/misc/airoflash/pkg-comment b/misc/airoflash/pkg-comment
deleted file mode 100644
index d8f047fc4572..000000000000
--- a/misc/airoflash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Flash utiltity for Cisco/Aironet 802.11 wireless cards
diff --git a/misc/alevt/Makefile b/misc/alevt/Makefile
index 6fe98e1ccde7..fd8656cf4b6f 100644
--- a/misc/alevt/Makefile
+++ b/misc/alevt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE} \
MASTER_SITE_SUBDIR= apps/video
MAINTAINER= roger@freebsd.org
+COMMENT= X11 Teletext decoding and display program. (reads from /dev/vbi)
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/misc/alevt/pkg-comment b/misc/alevt/pkg-comment
deleted file mode 100644
index f28ddc92eeab..000000000000
--- a/misc/alevt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 Teletext decoding and display program. (reads from /dev/vbi)
diff --git a/misc/asbutton/Makefile b/misc/asbutton/Makefile
index 4dd688d6c30b..22129c66cf37 100644
--- a/misc/asbutton/Makefile
+++ b/misc/asbutton/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc windowmaker afterstep
MASTER_SITES= http://www.tigr.net/afterstep/download/asbutton/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A dockapp that displays 4 or 9 buttons to run apps of your choice
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/misc/asbutton/pkg-comment b/misc/asbutton/pkg-comment
deleted file mode 100644
index abbd581550b4..000000000000
--- a/misc/asbutton/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockapp that displays 4 or 9 buttons to run apps of your choice
diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile
index 74a7db5ed5a6..e4929a6503f2 100644
--- a/misc/astrolog/Makefile
+++ b/misc/astrolog/Makefile
@@ -20,6 +20,7 @@ EPHEM= LRZ5_24 CHI_24 CPJV_24
DISTFILES= ${EXTRACT_ONLY} ${EPHEM}
MAINTAINER= ache@FreeBSD.org
+COMMENT= An astrology program for X11 and alpha-numeric terminals
USE_XLIB= yes
EXTRACT_CMD= ${SH}
diff --git a/misc/astrolog/pkg-comment b/misc/astrolog/pkg-comment
deleted file mode 100644
index 7902813bb857..000000000000
--- a/misc/astrolog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An astrology program for X11 and alpha-numeric terminals
diff --git a/misc/bbjd/Makefile b/misc/bbjd/Makefile
index 13112959eecb..47152ec7be32 100644
--- a/misc/bbjd/Makefile
+++ b/misc/bbjd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= games/strategy
MAINTAINER= demon@FreeBSD.org
+COMMENT= Beat the blackjack dealer
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/bbjd
diff --git a/misc/bbjd/pkg-comment b/misc/bbjd/pkg-comment
deleted file mode 100644
index 9bfd670cfa4c..000000000000
--- a/misc/bbjd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Beat the blackjack dealer
diff --git a/misc/bidwatcher/Makefile b/misc/bidwatcher/Makefile
index e88894f91bdc..3269c9a2c304 100644
--- a/misc/bidwatcher/Makefile
+++ b/misc/bidwatcher/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= mph@FreeBSD.org
+COMMENT= Bid monitor for eBay
USE_GNOMENG= yes
USE_GNOME= gtk12
diff --git a/misc/bidwatcher/pkg-comment b/misc/bidwatcher/pkg-comment
deleted file mode 100644
index ca4b34030c4a..000000000000
--- a/misc/bidwatcher/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bid monitor for eBay
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index 4a6f080d2606..275197707a18 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://mlug.missouri.edu/~tymm/
MAINTAINER= msmith@freebsd.org
+COMMENT= Home Automation Software for the X10 FireCracker kit
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/bottlerocket/pkg-comment b/misc/bottlerocket/pkg-comment
deleted file mode 100644
index a18a4d9cf8a5..000000000000
--- a/misc/bottlerocket/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Home Automation Software for the X10 FireCracker kit
diff --git a/misc/cassowary/Makefile b/misc/cassowary/Makefile
index d0e28ae9bc7e..f5a9f8515fed 100644
--- a/misc/cassowary/Makefile
+++ b/misc/cassowary/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.cs.washington.edu/research/constraints/cassowary/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Constraint solving toolkit
BROKEN= "Does not build"
diff --git a/misc/cassowary/pkg-comment b/misc/cassowary/pkg-comment
deleted file mode 100644
index 57050918e0e7..000000000000
--- a/misc/cassowary/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Constraint solving toolkit
diff --git a/misc/chef/Makefile b/misc/chef/Makefile
index e29249e1b333..8e7cf909c437 100644
--- a/misc/chef/Makefile
+++ b/misc/chef/Makefile
@@ -13,6 +13,7 @@ DISTNAME= bork
EXTRACT_SUFX= .tar.Z
MAINTAINER= brooks@FreeBSD.org
+COMMENT= Feelter thet cunferts Ingleesh text tu Muck Cheenese-a
WRKSRC= ${WRKDIR}/bork
diff --git a/misc/chef/pkg-comment b/misc/chef/pkg-comment
deleted file mode 100644
index 0674b80c51ac..000000000000
--- a/misc/chef/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Feelter thet cunferts Ingleesh text tu Muck Cheenese-a
diff --git a/misc/cmatrix/Makefile b/misc/cmatrix/Makefile
index b8b39198a5cc..fe585b5c9c1d 100644
--- a/misc/cmatrix/Makefile
+++ b/misc/cmatrix/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Show a scrolling 'Matrix' like screen
MAN1= cmatrix.1
diff --git a/misc/cmatrix/pkg-comment b/misc/cmatrix/pkg-comment
deleted file mode 100644
index e0cf37b73a6e..000000000000
--- a/misc/cmatrix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Show a scrolling 'Matrix' like screen
diff --git a/misc/deco/Makefile b/misc/deco/Makefile
index 129ffba78919..719e1b0da458 100644
--- a/misc/deco/Makefile
+++ b/misc/deco/Makefile
@@ -14,6 +14,7 @@ DISTNAME= deco383
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= Demos Commander, a free Norton Commander clone
WRKSRC= ${WRKDIR}/deco383
GNU_CONFIGURE= yes
diff --git a/misc/deco/pkg-comment b/misc/deco/pkg-comment
deleted file mode 100644
index a246303e3403..000000000000
--- a/misc/deco/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Demos Commander, a free Norton Commander clone
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index 7360f61b1f7e..edc2c7350c6e 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -32,6 +32,7 @@ BROKEN= "rc5des/dnetc conflict: Please deinstall all rc5des ports/packages firs
.endif
MAINTAINER= dbaker@FreeBSD.org
+COMMENT= Distributed.net distributed computing project client (modules: rc5-72/ogr)
WRKSRC= ${WRKDIR}/dnetc-freebsd-x86-elf
NO_BUILD= yes
diff --git a/misc/dnetc/pkg-comment b/misc/dnetc/pkg-comment
deleted file mode 100644
index 5dd9299dd9a3..000000000000
--- a/misc/dnetc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Distributed.net distributed computing project client (modules: rc5-72/ogr)
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index 669af40c8254..8f673ef503b5 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.morishima.net/pub/morishima.net/naoto/ElScreen/%SUBDIR%/
MASTER_SITE_SUBDIR= . old
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= GNU screen like utility on Emacsen
EMACS_PORT_NAME?= emacs21
.if (${EMACS_PORT_NAME} == "emacs21")
diff --git a/misc/elscreen/pkg-comment b/misc/elscreen/pkg-comment
deleted file mode 100644
index 1fe027a922ba..000000000000
--- a/misc/elscreen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU screen like utility on Emacsen
diff --git a/misc/emma/Makefile b/misc/emma/Makefile
index 69055e2c333d..76a495309cb7 100644
--- a/misc/emma/Makefile
+++ b/misc/emma/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://rainbow.mimuw.edu.pl/~la181249/emma/packages/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1/-1/}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A personal finance manager for Gnome
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/DateTime/DateTime.py:${PORTSDIR}/lang/py-mx-base
diff --git a/misc/emma/pkg-comment b/misc/emma/pkg-comment
deleted file mode 100644
index da3da484c47d..000000000000
--- a/misc/emma/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A personal finance manager for Gnome
diff --git a/misc/estic/Makefile b/misc/estic/Makefile
index 9ca5118b8b80..2c783abce3a5 100644
--- a/misc/estic/Makefile
+++ b/misc/estic/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://linux01.gwdg.de/pub/isdn/estic/old-versions/v1.40/
DISTNAME= estic-${PORTVERSION}-sources
MAINTAINER= jhs@FreeBSD.org
+COMMENT= Controller for ISDN TK-Anlage (PBX) made by Istec
USE_XLIB= yes
USE_ZIP= yes
diff --git a/misc/estic/pkg-comment b/misc/estic/pkg-comment
deleted file mode 100644
index bea9efd2721c..000000000000
--- a/misc/estic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Controller for ISDN TK-Anlage (PBX) made by Istec
diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile
index 6eb4f32c1c1b..37d9bc8ccd30 100644
--- a/misc/explosions/Makefile
+++ b/misc/explosions/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.sonic.net/pub/users/nbs/unix/x/explosions/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0.//}
MAINTAINER= petef@FreeBSD.org
+COMMENT= 3D objects flying around resembling explosions with various effects
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
SDL_image.10:${PORTSDIR}/graphics/sdl_image
diff --git a/misc/explosions/pkg-comment b/misc/explosions/pkg-comment
deleted file mode 100644
index d1d9d065bfbc..000000000000
--- a/misc/explosions/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3D objects flying around resembling explosions with various effects
diff --git a/misc/ezload/Makefile b/misc/ezload/Makefile
index ff5c6fe1db47..e65de343d45f 100644
--- a/misc/ezload/Makefile
+++ b/misc/ezload/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.etla.net/~n_hibma/usb/
MAINTAINER= n_hibma@FreeBSD.ORG
+COMMENT= Down-/uploader for AnchorChip's EZ-USB chip
MAN1= ezupload.1 ezdownload.1 aw.1
MANCOMPRESSED= yes
diff --git a/misc/ezload/pkg-comment b/misc/ezload/pkg-comment
deleted file mode 100644
index da9524afb5ba..000000000000
--- a/misc/ezload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Down-/uploader for AnchorChip's EZ-USB chip
diff --git a/misc/figlet-fonts/Makefile b/misc/figlet-fonts/Makefile
index a0f8e63f7bf6..aa8468365653 100644
--- a/misc/figlet-fonts/Makefile
+++ b/misc/figlet-fonts/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.figlet.org/pub/figlet/fonts/
DISTFILES= contributed.tar.gz international.tar.gz
MAINTAINER= dd@FreeBSD.org
+COMMENT= Assorted fonts for the figlet(6) program
RUN_DEPENDS= figlet:${PORTSDIR}/misc/figlet
diff --git a/misc/figlet-fonts/pkg-comment b/misc/figlet-fonts/pkg-comment
deleted file mode 100644
index 02ef8d58b601..000000000000
--- a/misc/figlet-fonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Assorted fonts for the figlet(6) program
diff --git a/misc/figlet/Makefile b/misc/figlet/Makefile
index 062da9f43fc1..910319dd161f 100644
--- a/misc/figlet/Makefile
+++ b/misc/figlet/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://ftp.plig.org/pub/figlet/program/unix/ \
DISTNAME= figlet221
MAINTAINER= obrien@FreeBSD.org
+COMMENT= SysV banner-like program prints strings in large fancy ASCII art
MAN6= figlet.6
diff --git a/misc/figlet/pkg-comment b/misc/figlet/pkg-comment
deleted file mode 100644
index 29a8a28e9b10..000000000000
--- a/misc/figlet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SysV banner-like program prints strings in large fancy ASCII art
diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile
index b2024649519e..cb6c2b810cdf 100644
--- a/misc/flyway/Makefile
+++ b/misc/flyway/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= misc python
MASTER_SITES= http://www.bellz.org/flyway/
MAINTAINER= kde@freebsd.org
+COMMENT= A VFR/IFR Route Planner for Pilots
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/qt.py:${PORTSDIR}/x11-toolkits/py-qt
diff --git a/misc/flyway/pkg-comment b/misc/flyway/pkg-comment
deleted file mode 100644
index ede433474087..000000000000
--- a/misc/flyway/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A VFR/IFR Route Planner for Pilots
diff --git a/misc/gkrellm-reminder/Makefile b/misc/gkrellm-reminder/Makefile
index cf699da354ac..f92ba50e3e2b 100644
--- a/misc/gkrellm-reminder/Makefile
+++ b/misc/gkrellm-reminder/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://web.wt.net/~billw/gkrellm/
PKGNAMEPREFIX= gkrellm-
MAINTAINER= pat@FreeBSD.org
+COMMENT= GKrellM plugin that reminds you of important events
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/misc/gkrellm-reminder/pkg-comment b/misc/gkrellm-reminder/pkg-comment
deleted file mode 100644
index 2d4ca33b27b5..000000000000
--- a/misc/gkrellm-reminder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GKrellM plugin that reminds you of important events
diff --git a/misc/gkrellmaflag/Makefile b/misc/gkrellmaflag/Makefile
index 4a78b58c0cdc..7aca01e67093 100644
--- a/misc/gkrellmaflag/Makefile
+++ b/misc/gkrellmaflag/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= gkrellm
DISTNAME= ${PORTNAME}_anim-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A GKrellM Plugin that displays a waving American flag
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/misc/gkrellmaflag/pkg-comment b/misc/gkrellmaflag/pkg-comment
deleted file mode 100644
index 9c06a175db45..000000000000
--- a/misc/gkrellmaflag/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GKrellM Plugin that displays a waving American flag
diff --git a/misc/gkrellmlaunch/Makefile b/misc/gkrellmlaunch/Makefile
index bd09802160b7..8b6f08adfbef 100644
--- a/misc/gkrellmlaunch/Makefile
+++ b/misc/gkrellmlaunch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= An application launcher plugin for GKrellM
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/misc/gkrellmlaunch/pkg-comment b/misc/gkrellmlaunch/pkg-comment
deleted file mode 100644
index a716a74effc7..000000000000
--- a/misc/gkrellmlaunch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An application launcher plugin for GKrellM
diff --git a/misc/gkrellmlaunch2/Makefile b/misc/gkrellmlaunch2/Makefile
index bd09802160b7..8b6f08adfbef 100644
--- a/misc/gkrellmlaunch2/Makefile
+++ b/misc/gkrellmlaunch2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= An application launcher plugin for GKrellM
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/misc/gkrellmlaunch2/pkg-comment b/misc/gkrellmlaunch2/pkg-comment
deleted file mode 100644
index a716a74effc7..000000000000
--- a/misc/gkrellmlaunch2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An application launcher plugin for GKrellM
diff --git a/misc/gkrellscore/Makefile b/misc/gkrellscore/Makefile
index 16b5d6473e23..c0a51bf1e251 100644
--- a/misc/gkrellscore/Makefile
+++ b/misc/gkrellscore/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ssl.usu.edu/paul/gkrellscore/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Plugin to GKrellM that displays current sports scores
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \
diff --git a/misc/gkrellscore/pkg-comment b/misc/gkrellscore/pkg-comment
deleted file mode 100644
index 6e3961a0ed06..000000000000
--- a/misc/gkrellscore/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Plugin to GKrellM that displays current sports scores
diff --git a/misc/gkrellweather/Makefile b/misc/gkrellweather/Makefile
index 6f7118386a24..7fe6fa8c6ee8 100644
--- a/misc/gkrellweather/Makefile
+++ b/misc/gkrellweather/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.cse.unsw.edu.au/~flam/repository/c/gkrellm/
MAINTAINER= pat@FreeBSD.org
+COMMENT= GKrellWeather is a weather plugin for GKrellM
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \
diff --git a/misc/gkrellweather/pkg-comment b/misc/gkrellweather/pkg-comment
deleted file mode 100644
index 2fef15951816..000000000000
--- a/misc/gkrellweather/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GKrellWeather is a weather plugin for GKrellM
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 34bd73d61967..5ecee0893826 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A collection of icons for the GNOME 2 desktop
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/misc/gnome-icon-theme/pkg-comment b/misc/gnome-icon-theme/pkg-comment
deleted file mode 100644
index a1f058481760..000000000000
--- a/misc/gnome-icon-theme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of icons for the GNOME 2 desktop
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 2236e7538b65..bebdb81ca0e1 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A MIME and Application database for GNOME
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/misc/gnome-mime-data/pkg-comment b/misc/gnome-mime-data/pkg-comment
deleted file mode 100644
index 60c3aece7ff2..000000000000
--- a/misc/gnome-mime-data/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A MIME and Application database for GNOME
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index d5cd984e99fc..bc2eac6fa194 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome2-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 users guide
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/misc/gnome-user-docs/pkg-comment b/misc/gnome-user-docs/pkg-comment
deleted file mode 100644
index 2abe7e3c5dc5..000000000000
--- a/misc/gnome-user-docs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 users guide
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 03e401bc3443..e5542ca6cbd3 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An utility port, installing hierarchy of common GNOME directories
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/misc/gnomehier/pkg-comment b/misc/gnomehier/pkg-comment
deleted file mode 100644
index d630aa4356e7..000000000000
--- a/misc/gnomehier/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility port, installing hierarchy of common GNOME directories
diff --git a/misc/gnomemimedata/Makefile b/misc/gnomemimedata/Makefile
index 2236e7538b65..bebdb81ca0e1 100644
--- a/misc/gnomemimedata/Makefile
+++ b/misc/gnomemimedata/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-mime-data-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A MIME and Application database for GNOME
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/misc/gnomemimedata/pkg-comment b/misc/gnomemimedata/pkg-comment
deleted file mode 100644
index 60c3aece7ff2..000000000000
--- a/misc/gnomemimedata/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A MIME and Application database for GNOME
diff --git a/misc/gnomepm/Makefile b/misc/gnomepm/Makefile
index a02496aae5af..9221a950d749 100644
--- a/misc/gnomepm/Makefile
+++ b/misc/gnomepm/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sobomax
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A small GNOME app that collects stock information from Yahoo!(c) Finance
USE_X_PREFIX= yes
USE_GNOME= yes
diff --git a/misc/gnomepm/pkg-comment b/misc/gnomepm/pkg-comment
deleted file mode 100644
index 5c61f393a268..000000000000
--- a/misc/gnomepm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small GNOME app that collects stock information from Yahoo!(c) Finance
diff --git a/misc/gnomeuserdocs/Makefile b/misc/gnomeuserdocs/Makefile
index f483ef09196e..725500c29360 100644
--- a/misc/gnomeuserdocs/Makefile
+++ b/misc/gnomeuserdocs/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-user-docs/1.4
DISTNAME= gnome-user-docs-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME users guide
BUILD_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
RUN_DEPENDS= scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
diff --git a/misc/gnomeuserdocs/pkg-comment b/misc/gnomeuserdocs/pkg-comment
deleted file mode 100644
index 72ae1cfcdfee..000000000000
--- a/misc/gnomeuserdocs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME users guide
diff --git a/misc/gnomeuserdocs2/Makefile b/misc/gnomeuserdocs2/Makefile
index d5cd984e99fc..bc2eac6fa194 100644
--- a/misc/gnomeuserdocs2/Makefile
+++ b/misc/gnomeuserdocs2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome2-user-docs-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 users guide
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/misc/gnomeuserdocs2/pkg-comment b/misc/gnomeuserdocs2/pkg-comment
deleted file mode 100644
index 2abe7e3c5dc5..000000000000
--- a/misc/gnomeuserdocs2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 users guide
diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile
index 5eaada69c6b8..e329f48efb11 100644
--- a/misc/gnomeutils/Makefile
+++ b/misc/gnomeutils/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/gnome-utils/1.4
DISTNAME= gnome-utils-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME support utilities
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
diff --git a/misc/gnomeutils/pkg-comment b/misc/gnomeutils/pkg-comment
deleted file mode 100644
index 2fbe3addfdac..000000000000
--- a/misc/gnomeutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME support utilities
diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile
index 94b107947b2e..50e4bbb0850c 100644
--- a/misc/gnomeutils2/Makefile
+++ b/misc/gnomeutils2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-utils-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 support utilities
LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel
diff --git a/misc/gnomeutils2/pkg-comment b/misc/gnomeutils2/pkg-comment
deleted file mode 100644
index 14a9b8e02998..000000000000
--- a/misc/gnomeutils2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 support utilities
diff --git a/misc/gplbp/Makefile b/misc/gplbp/Makefile
index 8c3f0d8c8b56..38a558d3f2ac 100644
--- a/misc/gplbp/Makefile
+++ b/misc/gplbp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ftp://ftp.stampede.org/skibum/gplbp/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= GNOME Pilot Logbook application
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/misc/gplbp/pkg-comment b/misc/gplbp/pkg-comment
deleted file mode 100644
index b5034b097543..000000000000
--- a/misc/gplbp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME Pilot Logbook application
diff --git a/misc/gtkfind/Makefile b/misc/gtkfind/Makefile
index be6bc2f810d9..e3cec33a4dfe 100644
--- a/misc/gtkfind/Makefile
+++ b/misc/gtkfind/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_BACKUP}
MAINTAINER= billf@FreeBSD.org
+COMMENT= The program to use to have to remember all the options to find(1)
BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/misc/gtkfind/pkg-comment b/misc/gtkfind/pkg-comment
deleted file mode 100644
index 5e735990dc4a..000000000000
--- a/misc/gtkfind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The program to use to have to remember all the options to find(1)
diff --git a/misc/gtl/Makefile b/misc/gtl/Makefile
index a4605c293f47..b90643b9b22a 100644
--- a/misc/gtl/Makefile
+++ b/misc/gtl/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= #
DISTNAME= GTL-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= C++ STL-based support for graphs and graph algorithms
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
diff --git a/misc/gtl/pkg-comment b/misc/gtl/pkg-comment
deleted file mode 100644
index 3598db70ecb7..000000000000
--- a/misc/gtl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ STL-based support for graphs and graph algorithms
diff --git a/misc/icemc/Makefile b/misc/icemc/Makefile
index 965665d2a43a..ca2d11a4a715 100644
--- a/misc/icemc/Makefile
+++ b/misc/icemc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www.algorithm.at/comp/icemc/
MAINTAINER= adamw@FreeBSD.org
+COMMENT= QT-based menu editor for IceWM
USE_X_PREFIX= yes
USE_QT_VER= 3
diff --git a/misc/icemc/pkg-comment b/misc/icemc/pkg-comment
deleted file mode 100644
index d3475f8f72ac..000000000000
--- a/misc/icemc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QT-based menu editor for IceWM
diff --git a/misc/instant-server/Makefile b/misc/instant-server/Makefile
index 55438b85ba9c..bd6f1bd73a7f 100644
--- a/misc/instant-server/Makefile
+++ b/misc/instant-server/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.lemis.com/pub/
MASTER_SITE_SUBDIR= pub/instant-server
MAINTAINER= grog@lemis.com
+COMMENT= Instant server installs a typical set of ports for a server
RUN_DEPENDS= ${LOCALBASE}/sbin/postfix:${PORTSDIR}/mail/postfix \
${LOCALBASE}/sbin/cvsupd:${PORTSDIR}/net/cvsup \
diff --git a/misc/instant-server/pkg-comment b/misc/instant-server/pkg-comment
deleted file mode 100644
index 3ce49aa835e4..000000000000
--- a/misc/instant-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Instant server installs a typical set of ports for a server
diff --git a/misc/instant-workstation/Makefile b/misc/instant-workstation/Makefile
index 721069007f3e..61f6b6bf22cc 100644
--- a/misc/instant-workstation/Makefile
+++ b/misc/instant-workstation/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= misc
MASTER_SITES= ftp://ftp.lemis.com/pub/
MAINTAINER= grog@lemis.com
+COMMENT= Instant workstation installs a typical set of ports for a workstation
RUN_DEPENDS= acroread:${PORTSDIR}/print/acroread4 \
bash:${PORTSDIR}/shells/bash2 \
diff --git a/misc/instant-workstation/pkg-comment b/misc/instant-workstation/pkg-comment
deleted file mode 100644
index 0f040f741035..000000000000
--- a/misc/instant-workstation/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Instant workstation installs a typical set of ports for a workstation
diff --git a/misc/jive/Makefile b/misc/jive/Makefile
index b173d5145cff..a01f83ffa1f8 100644
--- a/misc/jive/Makefile
+++ b/misc/jive/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Filter that converts English text to Jive
WRKSRC= ${WRKDIR}/jive
MAN1= jive.1
diff --git a/misc/jive/pkg-comment b/misc/jive/pkg-comment
deleted file mode 100644
index f7c37f7a8d6c..000000000000
--- a/misc/jive/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Filter that converts English text to Jive
diff --git a/misc/kde3-i18n-af/Makefile b/misc/kde3-i18n-af/Makefile
index ade50652251c..8e6c1ce36123 100644
--- a/misc/kde3-i18n-af/Makefile
+++ b/misc/kde3-i18n-af/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= af-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-af/pkg-comment b/misc/kde3-i18n-af/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-af/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-ar/Makefile b/misc/kde3-i18n-ar/Makefile
index 6aa3a4ea8524..ae0b4323ca49 100644
--- a/misc/kde3-i18n-ar/Makefile
+++ b/misc/kde3-i18n-ar/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ar-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ar/pkg-comment b/misc/kde3-i18n-ar/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-ar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-az/Makefile b/misc/kde3-i18n-az/Makefile
index 2a0be68f829f..5b20d19fded6 100644
--- a/misc/kde3-i18n-az/Makefile
+++ b/misc/kde3-i18n-az/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= az-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-az/pkg-comment b/misc/kde3-i18n-az/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-az/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-bg/Makefile b/misc/kde3-i18n-bg/Makefile
index 2febcd73a5ba..6b27c08c3fac 100644
--- a/misc/kde3-i18n-bg/Makefile
+++ b/misc/kde3-i18n-bg/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= bg-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-bg/pkg-comment b/misc/kde3-i18n-bg/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-bg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-bs/Makefile b/misc/kde3-i18n-bs/Makefile
index ce7ea8ddb564..f1ac57e4445e 100644
--- a/misc/kde3-i18n-bs/Makefile
+++ b/misc/kde3-i18n-bs/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= bs-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-bs/pkg-comment b/misc/kde3-i18n-bs/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-bs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-ca/Makefile b/misc/kde3-i18n-ca/Makefile
index 1dabfed25642..1d5b3639c6a9 100644
--- a/misc/kde3-i18n-ca/Makefile
+++ b/misc/kde3-i18n-ca/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ca-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ca/pkg-comment b/misc/kde3-i18n-ca/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-ca/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-cs/Makefile b/misc/kde3-i18n-cs/Makefile
index 4acd750bfdc0..44d432595d5a 100644
--- a/misc/kde3-i18n-cs/Makefile
+++ b/misc/kde3-i18n-cs/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= cs-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-cs/pkg-comment b/misc/kde3-i18n-cs/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-cs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-da/Makefile b/misc/kde3-i18n-da/Makefile
index 5057d7dac573..23604627c5fe 100644
--- a/misc/kde3-i18n-da/Makefile
+++ b/misc/kde3-i18n-da/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= da-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-da/pkg-comment b/misc/kde3-i18n-da/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-da/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-el/Makefile b/misc/kde3-i18n-el/Makefile
index b8a7d4ec0af4..ae5fdb0e1eca 100644
--- a/misc/kde3-i18n-el/Makefile
+++ b/misc/kde3-i18n-el/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= el-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-el/pkg-comment b/misc/kde3-i18n-el/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-en_GB/Makefile b/misc/kde3-i18n-en_GB/Makefile
index 74309c8448db..d161ad7058c8 100644
--- a/misc/kde3-i18n-en_GB/Makefile
+++ b/misc/kde3-i18n-en_GB/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= en_GB-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-en_GB/pkg-comment b/misc/kde3-i18n-en_GB/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-en_GB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-eo/Makefile b/misc/kde3-i18n-eo/Makefile
index d50d2763e157..ab61f55c729c 100644
--- a/misc/kde3-i18n-eo/Makefile
+++ b/misc/kde3-i18n-eo/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= eo-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-eo/pkg-comment b/misc/kde3-i18n-eo/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-eo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-es/Makefile b/misc/kde3-i18n-es/Makefile
index ced895c71678..0046d02abc6b 100644
--- a/misc/kde3-i18n-es/Makefile
+++ b/misc/kde3-i18n-es/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= es-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-es/pkg-comment b/misc/kde3-i18n-es/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-es/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-et/Makefile b/misc/kde3-i18n-et/Makefile
index ae3a039ba061..d6768c47dfbd 100644
--- a/misc/kde3-i18n-et/Makefile
+++ b/misc/kde3-i18n-et/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= et-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-et/pkg-comment b/misc/kde3-i18n-et/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-et/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-fi/Makefile b/misc/kde3-i18n-fi/Makefile
index 738aa079929c..60512fdad268 100644
--- a/misc/kde3-i18n-fi/Makefile
+++ b/misc/kde3-i18n-fi/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= fi-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-fi/pkg-comment b/misc/kde3-i18n-fi/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-fi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-he/Makefile b/misc/kde3-i18n-he/Makefile
index 88e0b1b2f862..9a8a1188790b 100644
--- a/misc/kde3-i18n-he/Makefile
+++ b/misc/kde3-i18n-he/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= he-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-he/pkg-comment b/misc/kde3-i18n-he/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-he/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-hr/Makefile b/misc/kde3-i18n-hr/Makefile
index a70417a456c5..de0c5b105ede 100644
--- a/misc/kde3-i18n-hr/Makefile
+++ b/misc/kde3-i18n-hr/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= hr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-hr/pkg-comment b/misc/kde3-i18n-hr/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-hr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-hu/Makefile b/misc/kde3-i18n-hu/Makefile
index 4cc122ae15a7..6d92c7e3a130 100644
--- a/misc/kde3-i18n-hu/Makefile
+++ b/misc/kde3-i18n-hu/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= hu-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-hu/pkg-comment b/misc/kde3-i18n-hu/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-hu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-id/Makefile b/misc/kde3-i18n-id/Makefile
index ced1a7d6e508..c589b94315f1 100644
--- a/misc/kde3-i18n-id/Makefile
+++ b/misc/kde3-i18n-id/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= id-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-id/pkg-comment b/misc/kde3-i18n-id/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-id/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-is/Makefile b/misc/kde3-i18n-is/Makefile
index 368a7d6084a4..675a9e3aa61b 100644
--- a/misc/kde3-i18n-is/Makefile
+++ b/misc/kde3-i18n-is/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= is-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-is/pkg-comment b/misc/kde3-i18n-is/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-is/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-it/Makefile b/misc/kde3-i18n-it/Makefile
index dc2989cab76c..a269a71a0755 100644
--- a/misc/kde3-i18n-it/Makefile
+++ b/misc/kde3-i18n-it/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= it-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-it/pkg-comment b/misc/kde3-i18n-it/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-it/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-lt/Makefile b/misc/kde3-i18n-lt/Makefile
index bef7f80bdc51..6f9fb0f08f65 100644
--- a/misc/kde3-i18n-lt/Makefile
+++ b/misc/kde3-i18n-lt/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= lt-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-lt/pkg-comment b/misc/kde3-i18n-lt/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-lt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-lv/Makefile b/misc/kde3-i18n-lv/Makefile
index d42929cfc114..5bbb07e571e1 100644
--- a/misc/kde3-i18n-lv/Makefile
+++ b/misc/kde3-i18n-lv/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= lv-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-lv/pkg-comment b/misc/kde3-i18n-lv/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-lv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-mt/Makefile b/misc/kde3-i18n-mt/Makefile
index 1eefd8c0095a..efc6d9b8c72d 100644
--- a/misc/kde3-i18n-mt/Makefile
+++ b/misc/kde3-i18n-mt/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= mt-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-mt/pkg-comment b/misc/kde3-i18n-mt/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-mt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-nb/Makefile b/misc/kde3-i18n-nb/Makefile
index d51676d84c66..16deb853d15c 100644
--- a/misc/kde3-i18n-nb/Makefile
+++ b/misc/kde3-i18n-nb/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= nb-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-nb/pkg-comment b/misc/kde3-i18n-nb/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-nb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-nl/Makefile b/misc/kde3-i18n-nl/Makefile
index 5465c83b6f65..1fe003ff4a68 100644
--- a/misc/kde3-i18n-nl/Makefile
+++ b/misc/kde3-i18n-nl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= nl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-nl/pkg-comment b/misc/kde3-i18n-nl/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-nl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-nn/Makefile b/misc/kde3-i18n-nn/Makefile
index 1a95260f442c..f673edb15c41 100644
--- a/misc/kde3-i18n-nn/Makefile
+++ b/misc/kde3-i18n-nn/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= nn-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-nn/pkg-comment b/misc/kde3-i18n-nn/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-nn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-pl/Makefile b/misc/kde3-i18n-pl/Makefile
index b2345e6aca4f..7cf5bd533b4e 100644
--- a/misc/kde3-i18n-pl/Makefile
+++ b/misc/kde3-i18n-pl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-pl/pkg-comment b/misc/kde3-i18n-pl/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-pl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-ro/Makefile b/misc/kde3-i18n-ro/Makefile
index 2f9dae3b3fc1..9a5cbee8ae93 100644
--- a/misc/kde3-i18n-ro/Makefile
+++ b/misc/kde3-i18n-ro/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ro-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ro/pkg-comment b/misc/kde3-i18n-ro/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-ro/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-sk/Makefile b/misc/kde3-i18n-sk/Makefile
index 4f25ed009570..8c99a58498f3 100644
--- a/misc/kde3-i18n-sk/Makefile
+++ b/misc/kde3-i18n-sk/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sk-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sk/pkg-comment b/misc/kde3-i18n-sk/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-sk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-sl/Makefile b/misc/kde3-i18n-sl/Makefile
index 5f660ee73a3d..ba74d8090bfb 100644
--- a/misc/kde3-i18n-sl/Makefile
+++ b/misc/kde3-i18n-sl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sl/pkg-comment b/misc/kde3-i18n-sl/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-sl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-sr/Makefile b/misc/kde3-i18n-sr/Makefile
index 2bf98de42828..80b7d358ba78 100644
--- a/misc/kde3-i18n-sr/Makefile
+++ b/misc/kde3-i18n-sr/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sr/pkg-comment b/misc/kde3-i18n-sr/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-sr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-sv/Makefile b/misc/kde3-i18n-sv/Makefile
index 5ac7aa1de371..a4662eca34a7 100644
--- a/misc/kde3-i18n-sv/Makefile
+++ b/misc/kde3-i18n-sv/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sv-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-sv/pkg-comment b/misc/kde3-i18n-sv/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-sv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-ta/Makefile b/misc/kde3-i18n-ta/Makefile
index 30f13223e426..ea58cb9e24dd 100644
--- a/misc/kde3-i18n-ta/Makefile
+++ b/misc/kde3-i18n-ta/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ta-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ta/pkg-comment b/misc/kde3-i18n-ta/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-ta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-th/Makefile b/misc/kde3-i18n-th/Makefile
index e557618080fc..2de621a146a9 100644
--- a/misc/kde3-i18n-th/Makefile
+++ b/misc/kde3-i18n-th/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= th-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-th/pkg-comment b/misc/kde3-i18n-th/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-th/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-tr/Makefile b/misc/kde3-i18n-tr/Makefile
index 1d50e4f12e7b..3b627c5e3725 100644
--- a/misc/kde3-i18n-tr/Makefile
+++ b/misc/kde3-i18n-tr/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= tr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-tr/pkg-comment b/misc/kde3-i18n-tr/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-tr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-ven/Makefile b/misc/kde3-i18n-ven/Makefile
index 5dfe8ad6e713..49c2c64b8f6b 100644
--- a/misc/kde3-i18n-ven/Makefile
+++ b/misc/kde3-i18n-ven/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ven-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-ven/pkg-comment b/misc/kde3-i18n-ven/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-ven/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-vi/Makefile b/misc/kde3-i18n-vi/Makefile
index c12d48e30da9..0ea237456a7c 100644
--- a/misc/kde3-i18n-vi/Makefile
+++ b/misc/kde3-i18n-vi/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= vi-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-vi/pkg-comment b/misc/kde3-i18n-vi/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-vi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-xh/Makefile b/misc/kde3-i18n-xh/Makefile
index bafc1cdf1860..7d2c0fd491d1 100644
--- a/misc/kde3-i18n-xh/Makefile
+++ b/misc/kde3-i18n-xh/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= xh-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-xh/pkg-comment b/misc/kde3-i18n-xh/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-xh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n-zu/Makefile b/misc/kde3-i18n-zu/Makefile
index 534102c1d87c..2bbeded6ad31 100644
--- a/misc/kde3-i18n-zu/Makefile
+++ b/misc/kde3-i18n-zu/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= zu-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde3-i18n-zu/pkg-comment b/misc/kde3-i18n-zu/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde3-i18n-zu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde3-i18n/Makefile b/misc/kde3-i18n/Makefile
index 57000155b0e8..7077427813f1 100644
--- a/misc/kde3-i18n/Makefile
+++ b/misc/kde3-i18n/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # none
EXTRACT_ONLY= # none
MAINTAINER= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE
RUN_DEPENDS+=\
${PREFIX}/share/locale/ja/entry.desktop:${PORTSDIR}/japanese/kde3-i18n \
diff --git a/misc/kde3-i18n/pkg-comment b/misc/kde3-i18n/pkg-comment
deleted file mode 100644
index b6c98f1b6763..000000000000
--- a/misc/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE
diff --git a/misc/kde4-i18n-is/Makefile b/misc/kde4-i18n-is/Makefile
index 368a7d6084a4..675a9e3aa61b 100644
--- a/misc/kde4-i18n-is/Makefile
+++ b/misc/kde4-i18n-is/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= is-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-i18n-is/pkg-comment b/misc/kde4-i18n-is/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-i18n-is/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-bg/Makefile b/misc/kde4-l10n-bg/Makefile
index 2febcd73a5ba..6b27c08c3fac 100644
--- a/misc/kde4-l10n-bg/Makefile
+++ b/misc/kde4-l10n-bg/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= bg-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-bg/pkg-comment b/misc/kde4-l10n-bg/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-bg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-ca/Makefile b/misc/kde4-l10n-ca/Makefile
index 1dabfed25642..1d5b3639c6a9 100644
--- a/misc/kde4-l10n-ca/Makefile
+++ b/misc/kde4-l10n-ca/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ca-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-ca/pkg-comment b/misc/kde4-l10n-ca/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-ca/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-cs/Makefile b/misc/kde4-l10n-cs/Makefile
index 4acd750bfdc0..44d432595d5a 100644
--- a/misc/kde4-l10n-cs/Makefile
+++ b/misc/kde4-l10n-cs/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= cs-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-cs/pkg-comment b/misc/kde4-l10n-cs/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-cs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-da/Makefile b/misc/kde4-l10n-da/Makefile
index 5057d7dac573..23604627c5fe 100644
--- a/misc/kde4-l10n-da/Makefile
+++ b/misc/kde4-l10n-da/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= da-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-da/pkg-comment b/misc/kde4-l10n-da/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-da/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-el/Makefile b/misc/kde4-l10n-el/Makefile
index b8a7d4ec0af4..ae5fdb0e1eca 100644
--- a/misc/kde4-l10n-el/Makefile
+++ b/misc/kde4-l10n-el/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= el-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-el/pkg-comment b/misc/kde4-l10n-el/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-en_GB/Makefile b/misc/kde4-l10n-en_GB/Makefile
index 74309c8448db..d161ad7058c8 100644
--- a/misc/kde4-l10n-en_GB/Makefile
+++ b/misc/kde4-l10n-en_GB/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= en_GB-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-en_GB/pkg-comment b/misc/kde4-l10n-en_GB/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-en_GB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-eo/Makefile b/misc/kde4-l10n-eo/Makefile
index d50d2763e157..ab61f55c729c 100644
--- a/misc/kde4-l10n-eo/Makefile
+++ b/misc/kde4-l10n-eo/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= eo-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-eo/pkg-comment b/misc/kde4-l10n-eo/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-eo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-es/Makefile b/misc/kde4-l10n-es/Makefile
index ced895c71678..0046d02abc6b 100644
--- a/misc/kde4-l10n-es/Makefile
+++ b/misc/kde4-l10n-es/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= es-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-es/pkg-comment b/misc/kde4-l10n-es/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-es/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-et/Makefile b/misc/kde4-l10n-et/Makefile
index ae3a039ba061..d6768c47dfbd 100644
--- a/misc/kde4-l10n-et/Makefile
+++ b/misc/kde4-l10n-et/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= et-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-et/pkg-comment b/misc/kde4-l10n-et/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-et/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-fi/Makefile b/misc/kde4-l10n-fi/Makefile
index 738aa079929c..60512fdad268 100644
--- a/misc/kde4-l10n-fi/Makefile
+++ b/misc/kde4-l10n-fi/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= fi-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-fi/pkg-comment b/misc/kde4-l10n-fi/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-fi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-is/Makefile b/misc/kde4-l10n-is/Makefile
index 368a7d6084a4..675a9e3aa61b 100644
--- a/misc/kde4-l10n-is/Makefile
+++ b/misc/kde4-l10n-is/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= is-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-is/pkg-comment b/misc/kde4-l10n-is/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-is/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-it/Makefile b/misc/kde4-l10n-it/Makefile
index dc2989cab76c..a269a71a0755 100644
--- a/misc/kde4-l10n-it/Makefile
+++ b/misc/kde4-l10n-it/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= it-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-it/pkg-comment b/misc/kde4-l10n-it/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-it/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-lt/Makefile b/misc/kde4-l10n-lt/Makefile
index bef7f80bdc51..6f9fb0f08f65 100644
--- a/misc/kde4-l10n-lt/Makefile
+++ b/misc/kde4-l10n-lt/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= lt-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-lt/pkg-comment b/misc/kde4-l10n-lt/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-lt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-lv/Makefile b/misc/kde4-l10n-lv/Makefile
index d42929cfc114..5bbb07e571e1 100644
--- a/misc/kde4-l10n-lv/Makefile
+++ b/misc/kde4-l10n-lv/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= lv-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-lv/pkg-comment b/misc/kde4-l10n-lv/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-lv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-nb/Makefile b/misc/kde4-l10n-nb/Makefile
index d51676d84c66..16deb853d15c 100644
--- a/misc/kde4-l10n-nb/Makefile
+++ b/misc/kde4-l10n-nb/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= nb-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nb/pkg-comment b/misc/kde4-l10n-nb/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-nb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-nl/Makefile b/misc/kde4-l10n-nl/Makefile
index 5465c83b6f65..1fe003ff4a68 100644
--- a/misc/kde4-l10n-nl/Makefile
+++ b/misc/kde4-l10n-nl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= nl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nl/pkg-comment b/misc/kde4-l10n-nl/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-nl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-nn/Makefile b/misc/kde4-l10n-nn/Makefile
index 1a95260f442c..f673edb15c41 100644
--- a/misc/kde4-l10n-nn/Makefile
+++ b/misc/kde4-l10n-nn/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= nn-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-nn/pkg-comment b/misc/kde4-l10n-nn/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-nn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-ro/Makefile b/misc/kde4-l10n-ro/Makefile
index 2f9dae3b3fc1..9a5cbee8ae93 100644
--- a/misc/kde4-l10n-ro/Makefile
+++ b/misc/kde4-l10n-ro/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ro-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-ro/pkg-comment b/misc/kde4-l10n-ro/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-ro/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-sk/Makefile b/misc/kde4-l10n-sk/Makefile
index 4f25ed009570..8c99a58498f3 100644
--- a/misc/kde4-l10n-sk/Makefile
+++ b/misc/kde4-l10n-sk/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sk-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sk/pkg-comment b/misc/kde4-l10n-sk/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-sk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-sl/Makefile b/misc/kde4-l10n-sl/Makefile
index 5f660ee73a3d..ba74d8090bfb 100644
--- a/misc/kde4-l10n-sl/Makefile
+++ b/misc/kde4-l10n-sl/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sl/pkg-comment b/misc/kde4-l10n-sl/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-sl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-sr/Makefile b/misc/kde4-l10n-sr/Makefile
index 2bf98de42828..80b7d358ba78 100644
--- a/misc/kde4-l10n-sr/Makefile
+++ b/misc/kde4-l10n-sr/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sr/pkg-comment b/misc/kde4-l10n-sr/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-sr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-sv/Makefile b/misc/kde4-l10n-sv/Makefile
index 5ac7aa1de371..a4662eca34a7 100644
--- a/misc/kde4-l10n-sv/Makefile
+++ b/misc/kde4-l10n-sv/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= sv-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-sv/pkg-comment b/misc/kde4-l10n-sv/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-sv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-ta/Makefile b/misc/kde4-l10n-ta/Makefile
index 30f13223e426..ea58cb9e24dd 100644
--- a/misc/kde4-l10n-ta/Makefile
+++ b/misc/kde4-l10n-ta/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ta-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-ta/pkg-comment b/misc/kde4-l10n-ta/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-ta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-th/Makefile b/misc/kde4-l10n-th/Makefile
index e557618080fc..2de621a146a9 100644
--- a/misc/kde4-l10n-th/Makefile
+++ b/misc/kde4-l10n-th/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= th-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-th/pkg-comment b/misc/kde4-l10n-th/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-th/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n-tr/Makefile b/misc/kde4-l10n-tr/Makefile
index 1d50e4f12e7b..3b627c5e3725 100644
--- a/misc/kde4-l10n-tr/Makefile
+++ b/misc/kde4-l10n-tr/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= tr-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/misc/kde4-l10n-tr/pkg-comment b/misc/kde4-l10n-tr/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/misc/kde4-l10n-tr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/misc/kde4-l10n/Makefile b/misc/kde4-l10n/Makefile
index 57000155b0e8..7077427813f1 100644
--- a/misc/kde4-l10n/Makefile
+++ b/misc/kde4-l10n/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # none
EXTRACT_ONLY= # none
MAINTAINER= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE
RUN_DEPENDS+=\
${PREFIX}/share/locale/ja/entry.desktop:${PORTSDIR}/japanese/kde3-i18n \
diff --git a/misc/kde4-l10n/pkg-comment b/misc/kde4-l10n/pkg-comment
deleted file mode 100644
index b6c98f1b6763..000000000000
--- a/misc/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE
diff --git a/misc/kdeaddons3/Makefile b/misc/kdeaddons3/Makefile
index 702a1b03ebb1..4b837b6deabe 100644
--- a/misc/kdeaddons3/Makefile
+++ b/misc/kdeaddons3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Additional plugins and scripts for some KDE applications
LIB_DEPENDS+= noatun.0:${PORTSDIR}/multimedia/kdemultimedia3 \
kdegames:${PORTSDIR}/games/kdegames3 \
diff --git a/misc/kdeaddons3/pkg-comment b/misc/kdeaddons3/pkg-comment
deleted file mode 100644
index 1cf8754fefc5..000000000000
--- a/misc/kdeaddons3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional plugins and scripts for some KDE applications
diff --git a/misc/kdeedu3/Makefile b/misc/kdeedu3/Makefile
index b4b1067c0caf..fec4a998c936 100644
--- a/misc/kdeedu3/Makefile
+++ b/misc/kdeedu3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Collection of entertaining, educational programs for KDE
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/misc/kdeedu3/pkg-comment b/misc/kdeedu3/pkg-comment
deleted file mode 100644
index 12f6737425c1..000000000000
--- a/misc/kdeedu3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of entertaining, educational programs for KDE
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index b4b1067c0caf..fec4a998c936 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Collection of entertaining, educational programs for KDE
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/misc/kdeedu4/pkg-comment b/misc/kdeedu4/pkg-comment
deleted file mode 100644
index 12f6737425c1..000000000000
--- a/misc/kdeedu4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of entertaining, educational programs for KDE
diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/misc/kdeutils3/pkg-comment b/misc/kdeutils3/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/misc/kdeutils3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/misc/kdeutils4/Makefile b/misc/kdeutils4/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/misc/kdeutils4/Makefile
+++ b/misc/kdeutils4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/misc/kdeutils4/pkg-comment b/misc/kdeutils4/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/misc/kdeutils4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/misc/kp/Makefile b/misc/kp/Makefile
index 8690dbf6a9bd..a0e8b11beb6c 100644
--- a/misc/kp/Makefile
+++ b/misc/kp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= asami/kp
MAINTAINER= asami@FreeBSD.org
+COMMENT= The Keyboard Practicer, touch-type training program
USE_MOTIF= yes
USE_IMAKE= yes
diff --git a/misc/kp/pkg-comment b/misc/kp/pkg-comment
deleted file mode 100644
index 1353e610000e..000000000000
--- a/misc/kp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Keyboard Practicer, touch-type training program
diff --git a/misc/kwatch/Makefile b/misc/kwatch/Makefile
index ba7d5c8e1ae1..5c919cef9e47 100644
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.m-j-s.net/pub/kde/ \
MASTER_SITE_SUBDIR= stable/apps/KDE3.x/admin/
MAINTAINER= kde@freebsd.org
+COMMENT= KDE/Qt log file viewer
BUILD_DEPENDS= msgfmt:${PORTSDIR}/devel/gettext
diff --git a/misc/kwatch/pkg-comment b/misc/kwatch/pkg-comment
deleted file mode 100644
index af267536c28a..000000000000
--- a/misc/kwatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE/Qt log file viewer
diff --git a/misc/libelysium/Makefile b/misc/libelysium/Makefile
index ffe36a2dcaff..83032e38db43 100644
--- a/misc/libelysium/Makefile
+++ b/misc/libelysium/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= misc gnome
MASTER_SITES= http://elysium-project.sourceforge.net/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A library of utility functions used by several Elysium projects
USE_GNOMENG= yes
USE_GNOME= glib12
diff --git a/misc/libelysium/pkg-comment b/misc/libelysium/pkg-comment
deleted file mode 100644
index 963dd42c8ab5..000000000000
--- a/misc/libelysium/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library of utility functions used by several Elysium projects
diff --git a/misc/lile/Makefile b/misc/lile/Makefile
index ea4d93a456a6..d1519e78099c 100644
--- a/misc/lile/Makefile
+++ b/misc/lile/Makefile
@@ -14,6 +14,7 @@ DISTNAME= lile-2.0
EXTRACT_SUFX= .tar.z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= An Input Line Editor that wraps itself around programs
MAN1= ile.1
diff --git a/misc/lile/pkg-comment b/misc/lile/pkg-comment
deleted file mode 100644
index 0a5833c7877e..000000000000
--- a/misc/lile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Input Line Editor that wraps itself around programs
diff --git a/misc/man.el/Makefile b/misc/man.el/Makefile
index c318e746ea34..55f0861427e7 100644
--- a/misc/man.el/Makefile
+++ b/misc/man.el/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc elisp
MASTER_SITES= ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT= Browse I18N capable UNIX manual pages with Mule, Emacs and XEmacs
# If you use Japanese manuals, install japanese/man as well.
diff --git a/misc/man.el/pkg-comment b/misc/man.el/pkg-comment
deleted file mode 100644
index d2526986b3b9..000000000000
--- a/misc/man.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Browse I18N capable UNIX manual pages with Mule, Emacs and XEmacs
diff --git a/misc/menushki/Makefile b/misc/menushki/Makefile
index 073cde3003cf..c6c7b05ad301 100644
--- a/misc/menushki/Makefile
+++ b/misc/menushki/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Menu converter between varieties of Window Managers
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/misc/menushki/pkg-comment b/misc/menushki/pkg-comment
deleted file mode 100644
index 53fd46e80bcc..000000000000
--- a/misc/menushki/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Menu converter between varieties of Window Managers
diff --git a/misc/metatheme2/Makefile b/misc/metatheme2/Makefile
index 756fb2008de0..7b666213ced2 100644
--- a/misc/metatheme2/Makefile
+++ b/misc/metatheme2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= metatheme-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An utility for managing "theme sets" that accomodate gtk, window manager, etc
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/misc/metatheme2/pkg-comment b/misc/metatheme2/pkg-comment
deleted file mode 100644
index 3d1d2280ba8f..000000000000
--- a/misc/metatheme2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility for managing "theme sets" that accomodate gtk, window manager, etc
diff --git a/misc/mgp-mode.el/Makefile b/misc/mgp-mode.el/Makefile
index 93d9723fb6e6..af219052fb87 100644
--- a/misc/mgp-mode.el/Makefile
+++ b/misc/mgp-mode.el/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://TypeHack.aial.hiroshima-u.ac.jp/pub/Emacs/MagicPoint/
DISTFILES= ${PORTNAME}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A mode of Emacs for editing MagicPoint files
RUN_DEPENDS= mgp:${PORTSDIR}/misc/magicpoint
diff --git a/misc/mgp-mode.el/pkg-comment b/misc/mgp-mode.el/pkg-comment
deleted file mode 100644
index fbd6a3000035..000000000000
--- a/misc/mgp-mode.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mode of Emacs for editing MagicPoint files
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index dc5b66205f93..0c1be64489f2 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GNOME application designed to manage cyclic tasks
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/misc/misterproper/pkg-comment b/misc/misterproper/pkg-comment
deleted file mode 100644
index b2286a7c5996..000000000000
--- a/misc/misterproper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME application designed to manage cyclic tasks
diff --git a/misc/mmv/Makefile b/misc/mmv/Makefile
index 84c76c4d9c96..134576ffac80 100644
--- a/misc/mmv/Makefile
+++ b/misc/mmv/Makefile
@@ -13,6 +13,7 @@ DISTNAME= mmv
EXTRACT_SUFX= .tar.Z
MAINTAINER= me@FreeBSD.org
+COMMENT= Move/copy/append/link multiple files with sophisticated wildcard matching
NO_CDROM= "No redistribution for charge"
NO_PACKAGE= "No modification"
diff --git a/misc/mmv/pkg-comment b/misc/mmv/pkg-comment
deleted file mode 100644
index facecf5bc447..000000000000
--- a/misc/mmv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Move/copy/append/link multiple files with sophisticated wildcard matching
diff --git a/misc/mshell/Makefile b/misc/mshell/Makefile
index a7986e99ff3c..921c2149067a 100644
--- a/misc/mshell/Makefile
+++ b/misc/mshell/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= jmz
DISTFILES= 7432.Z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A Unix menuing shell
NO_WRKSUBDIR= yes
MAN1= mshell.1
diff --git a/misc/mshell/pkg-comment b/misc/mshell/pkg-comment
deleted file mode 100644
index 43df26155be0..000000000000
--- a/misc/mshell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Unix menuing shell
diff --git a/misc/mtx/Makefile b/misc/mtx/Makefile
index 745974419f50..15cc329dd614 100644
--- a/misc/mtx/Makefile
+++ b/misc/mtx/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= mtx
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Control SCSI media changer devices
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/mtx/pkg-comment b/misc/mtx/pkg-comment
deleted file mode 100644
index fd21c27d697e..000000000000
--- a/misc/mtx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Control SCSI media changer devices
diff --git a/misc/p5-Business-CreditCard/Makefile b/misc/p5-Business-CreditCard/Makefile
index 94770cb1fd2e..45a56ddf644b 100644
--- a/misc/p5-Business-CreditCard/Makefile
+++ b/misc/p5-Business-CreditCard/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Business
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl5 module to validate/generate credit card checksums/names
PERL_CONFIGURE= YES
diff --git a/misc/p5-Business-CreditCard/pkg-comment b/misc/p5-Business-CreditCard/pkg-comment
deleted file mode 100644
index 5621ce297f69..000000000000
--- a/misc/p5-Business-CreditCard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to validate/generate credit card checksums/names
diff --git a/misc/p5-Data-Buffer/Makefile b/misc/p5-Data-Buffer/Makefile
index 5d1355f40b3d..c8135f7ea7f0 100644
--- a/misc/p5-Data-Buffer/Makefile
+++ b/misc/p5-Data-Buffer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Data
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Read/write buffer class
PERL_CONFIGURE= yes
diff --git a/misc/p5-Data-Buffer/pkg-comment b/misc/p5-Data-Buffer/pkg-comment
deleted file mode 100644
index 4643bab37aab..000000000000
--- a/misc/p5-Data-Buffer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Read/write buffer class
diff --git a/misc/p5-Finance-Quote/Makefile b/misc/p5-Finance-Quote/Makefile
index 002e5f70697a..202cf52c706d 100644
--- a/misc/p5-Finance-Quote/Makefile
+++ b/misc/p5-Finance-Quote/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Finance
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Get stock and mutual fund quotes from various exchanges
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TableExtract.pm:${PORTSDIR}/www/p5-HTML-TableExtract \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
diff --git a/misc/p5-Finance-Quote/pkg-comment b/misc/p5-Finance-Quote/pkg-comment
deleted file mode 100644
index c588c5667f0e..000000000000
--- a/misc/p5-Finance-Quote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Get stock and mutual fund quotes from various exchanges
diff --git a/misc/p5-Geo-Weather/Makefile b/misc/p5-Geo-Weather/Makefile
index 53574b352417..b7f31ab5a57f 100644
--- a/misc/p5-Geo-Weather/Makefile
+++ b/misc/p5-Geo-Weather/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Geo
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module to retrieve weather information from weather.com
RUN_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
diff --git a/misc/p5-Geo-Weather/pkg-comment b/misc/p5-Geo-Weather/pkg-comment
deleted file mode 100644
index c1b6faabc810..000000000000
--- a/misc/p5-Geo-Weather/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to retrieve weather information from weather.com
diff --git a/misc/p5-I18N-Charset/Makefile b/misc/p5-I18N-Charset/Makefile
index b37ba1820afa..97fdda621c3a 100644
--- a/misc/p5-I18N-Charset/Makefile
+++ b/misc/p5-I18N-Charset/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= I18N
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Module which maps CharSet names to the names registered with IANA
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/IO/String.pm:${PORTSDIR}/devel/p5-IO-String \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/Simple.pm:${PORTSDIR}/devel/p5-Test-Simple \
diff --git a/misc/p5-I18N-Charset/pkg-comment b/misc/p5-I18N-Charset/pkg-comment
deleted file mode 100644
index fe27977f5a6f..000000000000
--- a/misc/p5-I18N-Charset/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Module which maps CharSet names to the names registered with IANA
diff --git a/misc/p5-LEGO-RCX/Makefile b/misc/p5-LEGO-RCX/Makefile
index 88c1552945bc..b0ecfcebe7dd 100644
--- a/misc/p5-LEGO-RCX/Makefile
+++ b/misc/p5-LEGO-RCX/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= LEGO
PKGNAMEPREFIX= p5-
MAINTAINER= kbyanc@FreeBSD.org
+COMMENT= Perl module for communicating with the Lego RCX brick via the IR tower
PERL_CONFIGURE= yes
diff --git a/misc/p5-LEGO-RCX/pkg-comment b/misc/p5-LEGO-RCX/pkg-comment
deleted file mode 100644
index 8c5759944f40..000000000000
--- a/misc/p5-LEGO-RCX/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for communicating with the Lego RCX brick via the IR tower
diff --git a/misc/p5-Locale-Codes/Makefile b/misc/p5-Locale-Codes/Makefile
index 3bcd0a3a1ae0..a69d088931d0 100644
--- a/misc/p5-Locale-Codes/Makefile
+++ b/misc/p5-Locale-Codes/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Locale
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module providing access to ISO3166 and ISO639 Country Codes
PERL_CONFIGURE= YES
diff --git a/misc/p5-Locale-Codes/pkg-comment b/misc/p5-Locale-Codes/pkg-comment
deleted file mode 100644
index cc00e0be10c5..000000000000
--- a/misc/p5-Locale-Codes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module providing access to ISO3166 and ISO639 Country Codes
diff --git a/misc/p5-Locale-Msgcat/Makefile b/misc/p5-Locale-Msgcat/Makefile
index 899c4e9793ed..35a6ebd53609 100644
--- a/misc/p5-Locale-Msgcat/Makefile
+++ b/misc/p5-Locale-Msgcat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Locale
PKGNAMEPREFIX= p5-
MAINTAINER= gioria@FreeBSD.org
+COMMENT= Msgcat, a small Perl module for systems to support the XPG4 message catalog functions
PERL_CONFIGURE= YES
diff --git a/misc/p5-Locale-Msgcat/pkg-comment b/misc/p5-Locale-Msgcat/pkg-comment
deleted file mode 100644
index ce9246db8b5e..000000000000
--- a/misc/p5-Locale-Msgcat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Msgcat, a small Perl module for systems to support the XPG4 message catalog functions
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index b60319c36fec..78ccf641d4e9 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://kitenet.net/programs/code/pdmenu/
DISTNAME= pdmenu_${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A simple console menu program
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang
diff --git a/misc/pdmenu/pkg-comment b/misc/pdmenu/pkg-comment
deleted file mode 100644
index 704a5b310882..000000000000
--- a/misc/pdmenu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple console menu program
diff --git a/misc/pg/Makefile b/misc/pg/Makefile
index 0c01948d278d..c207a5116c96 100644
--- a/misc/pg/Makefile
+++ b/misc/pg/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://omnibus.ruf.uni-freiburg.de/~gritter/archive/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= An implementation of System V's pg pager
MAKEFILE= makefile
diff --git a/misc/pg/pkg-comment b/misc/pg/pkg-comment
deleted file mode 100644
index 5d08c7b1ed12..000000000000
--- a/misc/pg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of System V's pg pager
diff --git a/misc/porteasy/Makefile b/misc/porteasy/Makefile
index 36deea7d384a..bd24dc02d3fc 100644
--- a/misc/porteasy/Makefile
+++ b/misc/porteasy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= des@FreeBSD.org
+COMMENT= A tool for fetching and building ports
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/misc/porteasy/pkg-comment b/misc/porteasy/pkg-comment
deleted file mode 100644
index b0b24b7f52b0..000000000000
--- a/misc/porteasy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for fetching and building ports
diff --git a/misc/proxyper/Makefile b/misc/proxyper/Makefile
index a53f4ee67cd4..45b47f372255 100644
--- a/misc/proxyper/Makefile
+++ b/misc/proxyper/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/proxyper-rc5des/ \
DISTNAME= proxyper${PORTVERSION}-freebsd-x86
MAINTAINER= dbaker@FreeBSD.org
+COMMENT= The official distributed.net v2 personal proxy
.include <bsd.port.pre.mk>
diff --git a/misc/proxyper/pkg-comment b/misc/proxyper/pkg-comment
deleted file mode 100644
index 38ec15a82b16..000000000000
--- a/misc/proxyper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The official distributed.net v2 personal proxy
diff --git a/misc/py-distutils/Makefile b/misc/py-distutils/Makefile
index 451c9f1760fd..0d3899b69796 100644
--- a/misc/py-distutils/Makefile
+++ b/misc/py-distutils/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Distutils-${PORTVERSION}
MAINTAINER= tg@FreeBSD.org
+COMMENT= Python Module Distribution Utilities
USE_PYTHON= yes
diff --git a/misc/py-distutils/pkg-comment b/misc/py-distutils/pkg-comment
deleted file mode 100644
index d701f82ab1e0..000000000000
--- a/misc/py-distutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python Module Distribution Utilities
diff --git a/misc/pypanda/Makefile b/misc/pypanda/Makefile
index f71c402b4219..98e8c64b1655 100644
--- a/misc/pypanda/Makefile
+++ b/misc/pypanda/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www3.telus.net/futility/futility/warez/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Viewer for San Diego Zoo Pandacam written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game
diff --git a/misc/pypanda/pkg-comment b/misc/pypanda/pkg-comment
deleted file mode 100644
index 6211cd749abc..000000000000
--- a/misc/pypanda/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Viewer for San Diego Zoo Pandacam written in Python
diff --git a/misc/quotes/Makefile b/misc/quotes/Makefile
index a6b161add5ed..6eb0679bb5d6 100644
--- a/misc/quotes/Makefile
+++ b/misc/quotes/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.coralys.com/pub/free/
DISTNAME= ${PORTNAME}-1.7-2
MAINTAINER= demon@FreeBSD.org
+COMMENT= Quote, currency, and Slashdot headline fetcher based on Perl
NO_BUILD= yes
USE_PERL5= yes
diff --git a/misc/quotes/pkg-comment b/misc/quotes/pkg-comment
deleted file mode 100644
index 579ec46dafb1..000000000000
--- a/misc/quotes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quote, currency, and Slashdot headline fetcher based on Perl
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index 86ec933eeea3..f0adad1f7264 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.sacredchao.net/software/reed/
MAINTAINER= petef@FreeBSD.org
+COMMENT= A text pager with autoscrolling and more
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/misc/reed/pkg-comment b/misc/reed/pkg-comment
deleted file mode 100644
index d1ab88c2c51c..000000000000
--- a/misc/reed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text pager with autoscrolling and more
diff --git a/misc/rfc/Makefile b/misc/rfc/Makefile
index 6d9ed3c530c6..9b9385e66fa8 100644
--- a/misc/rfc/Makefile
+++ b/misc/rfc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.dewn.com/rfc/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Perl script to search for RFC's
RUN_DEPENDS= w3m:${PORTSDIR}/www/w3m
diff --git a/misc/rfc/pkg-comment b/misc/rfc/pkg-comment
deleted file mode 100644
index fcee376e1fa8..000000000000
--- a/misc/rfc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script to search for RFC's
diff --git a/misc/rtfm/Makefile b/misc/rtfm/Makefile
index eb5216124c87..99aa925f9d8d 100644
--- a/misc/rtfm/Makefile
+++ b/misc/rtfm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= chris
MAINTAINER= chris@FreeBSD.org
+COMMENT= A FreeBSD documentation search mechanism
MAN1= rtfm.1
diff --git a/misc/rtfm/pkg-comment b/misc/rtfm/pkg-comment
deleted file mode 100644
index 9fb66a557ab8..000000000000
--- a/misc/rtfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A FreeBSD documentation search mechanism
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index a341874d8ba9..944e234a6b75 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
MASTER_SITE_SUBDIR= screen
MAINTAINER= cy@FreeBSD.org
+COMMENT= A multi-screen window manager
GNU_CONFIGURE= yes
MAN1= screen.1
diff --git a/misc/screen/pkg-comment b/misc/screen/pkg-comment
deleted file mode 100644
index 88a160b5b6fd..000000000000
--- a/misc/screen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-screen window manager
diff --git a/misc/seizedesktop/Makefile b/misc/seizedesktop/Makefile
index 3e64e0dec2a6..7651eda6657d 100644
--- a/misc/seizedesktop/Makefile
+++ b/misc/seizedesktop/Makefile
@@ -13,6 +13,7 @@ DISTNAME= SeizeDesktop-${PORTVERSION}
EXTRACT_ONLY= # extracted directly in install target
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A customizer of desktop screen environment
RUN_DEPENDS= ${RUN_DEP_LIST}
LIB_DEPENDS= ${LIB_DEP_LIST}
diff --git a/misc/seizedesktop/pkg-comment b/misc/seizedesktop/pkg-comment
deleted file mode 100644
index f0c341d52c51..000000000000
--- a/misc/seizedesktop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A customizer of desktop screen environment
diff --git a/misc/shuffle/Makefile b/misc/shuffle/Makefile
index 69cf29ca742e..108fdf81fb86 100644
--- a/misc/shuffle/Makefile
+++ b/misc/shuffle/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
+COMMENT= Produce random permutations
MANSECTS= 1
MAN1= shuffle.1
diff --git a/misc/shuffle/pkg-comment b/misc/shuffle/pkg-comment
deleted file mode 100644
index f70d9b392989..000000000000
--- a/misc/shuffle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Produce random permutations
diff --git a/misc/since/Makefile b/misc/since/Makefile
index 6a66be6634c8..e323c8cfc10a 100644
--- a/misc/since/Makefile
+++ b/misc/since/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= ftp://jade.cs.uct.ac.za/pub/
MAINTAINER= wjv@FreeBSD.org
+COMMENT= View the end of a file like tail(1), but save state between sessions
MAN1= since.1
diff --git a/misc/since/pkg-comment b/misc/since/pkg-comment
deleted file mode 100644
index 195cdb34ed99..000000000000
--- a/misc/since/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View the end of a file like tail(1), but save state between sessions
diff --git a/misc/snowflake/Makefile b/misc/snowflake/Makefile
index fd0ad73f26b4..c13605b1867f 100644
--- a/misc/snowflake/Makefile
+++ b/misc/snowflake/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.infomatch.com/~donaldj/
DISTNAME= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A snowflake image generator
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/misc/snowflake/pkg-comment b/misc/snowflake/pkg-comment
deleted file mode 100644
index 9c91680c111f..000000000000
--- a/misc/snowflake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A snowflake image generator
diff --git a/misc/team/Makefile b/misc/team/Makefile
index 37b839ec69e8..a08237a4ee30 100644
--- a/misc/team/Makefile
+++ b/misc/team/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Portable multi-buffered tape streaming utility
MAN1= team.1
MANCOMPRESSED= maybe
diff --git a/misc/team/pkg-comment b/misc/team/pkg-comment
deleted file mode 100644
index 6b9e3cebec1f..000000000000
--- a/misc/team/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Portable multi-buffered tape streaming utility
diff --git a/misc/tet/Makefile b/misc/tet/Makefile
index 7ca314cf8bb5..48276fc0cf4c 100644
--- a/misc/tet/Makefile
+++ b/misc/tet/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= jkoshy
DISTFILES= ${PORTNAME}${PORTVERSION}-unsup.src.tgz
MAINTAINER= jkoshy@freebsd.org
+COMMENT= An test execution framework from the Open Group
NO_WRKSUBDIR= yes
NO_PACKAGE= TET_ROOT needs to be set at compile time
diff --git a/misc/tet/pkg-comment b/misc/tet/pkg-comment
deleted file mode 100644
index a11a0eb6c9a9..000000000000
--- a/misc/tet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An test execution framework from the Open Group
diff --git a/misc/tkman/Makefile b/misc/tkman/Makefile
index c1ad5e667c1f..dcb6a376105d 100644
--- a/misc/tkman/Makefile
+++ b/misc/tkman/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= tg@FreeBSD.org
+COMMENT= A Tcl/Tk based manual browser
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
RUN_DEPENDS= rman:${PORTSDIR}/textproc/rman \
diff --git a/misc/tkman/pkg-comment b/misc/tkman/pkg-comment
deleted file mode 100644
index 6c55dd8496df..000000000000
--- a/misc/tkman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tcl/Tk based manual browser
diff --git a/misc/tvguide/Makefile b/misc/tvguide/Makefile
index 12476cbaede1..6b77c3a47700 100644
--- a/misc/tvguide/Makefile
+++ b/misc/tvguide/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.cherrynebula.net/downloads/
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= Perl script to pretty-print TV Guide listings from www.tvguide.com
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/misc/tvguide/pkg-comment b/misc/tvguide/pkg-comment
deleted file mode 100644
index e3a3c7239bbe..000000000000
--- a/misc/tvguide/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script to pretty-print TV Guide listings from www.tvguide.com
diff --git a/misc/uk-phone/Makefile b/misc/uk-phone/Makefile
index ebd2b1065f56..870396da948a 100644
--- a/misc/uk-phone/Makefile
+++ b/misc/uk-phone/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.Awfulhak.org/pub/uk-phone/ \
EXTRACT_SUFX= .gz
MAINTAINER= brian@FreeBSD.org
+COMMENT= United Kingdom phone codes
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${GZCAT}
diff --git a/misc/uk-phone/pkg-comment b/misc/uk-phone/pkg-comment
deleted file mode 100644
index 264777dd9773..000000000000
--- a/misc/uk-phone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-United Kingdom phone codes
diff --git a/misc/uk-postcodes/Makefile b/misc/uk-postcodes/Makefile
index 2ddf837e720b..a8d8f2ccc928 100644
--- a/misc/uk-postcodes/Makefile
+++ b/misc/uk-postcodes/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.Awfulhak.org/pub/uk-postcodes/ \
EXTRACT_SUFX= .gz
MAINTAINER= brian@FreeBSD.org
+COMMENT= United Kingdom post codes
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${GZCAT}
diff --git a/misc/uk-postcodes/pkg-comment b/misc/uk-postcodes/pkg-comment
deleted file mode 100644
index 04f84bc8f26a..000000000000
--- a/misc/uk-postcodes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-United Kingdom post codes
diff --git a/misc/vbidecode/Makefile b/misc/vbidecode/Makefile
index 458e7faf4479..52083ecb6871 100644
--- a/misc/vbidecode/Makefile
+++ b/misc/vbidecode/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= roger
DISTNAME= bttv-0.6.4
MAINTAINER= roger@freebsd.org
+COMMENT= Get Videotext/Teletext (.vtx) and other VBI data from TV channels
WRKSRC= ${WRKDIR}/bttv/apps/vbidecode
diff --git a/misc/vbidecode/pkg-comment b/misc/vbidecode/pkg-comment
deleted file mode 100644
index f65b2c95fe3f..000000000000
--- a/misc/vbidecode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Get Videotext/Teletext (.vtx) and other VBI data from TV channels
diff --git a/misc/vera/Makefile b/misc/vera/Makefile
index e34b841bb3b2..f79908809a05 100644
--- a/misc/vera/Makefile
+++ b/misc/vera/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= vera
MAINTAINER= demon@FreeBSD.org
+COMMENT= Virtual Entity of Relevant Acronyms
do-build:
@ cd ${WRKSRC} && makeinfo --no-split vera.texi
diff --git a/misc/vera/pkg-comment b/misc/vera/pkg-comment
deleted file mode 100644
index 46a0f5217607..000000000000
--- a/misc/vera/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Virtual Entity of Relevant Acronyms
diff --git a/misc/videotext/Makefile b/misc/videotext/Makefile
index 10deea202779..aca1cb2bbc89 100644
--- a/misc/videotext/Makefile
+++ b/misc/videotext/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://elektra.e-technik.uni-ulm.de/~mbuck/download/
MAINTAINER= roger@FreeBSD.org
+COMMENT= X11/Xview TV Videotext/Teletext page viewer (.vtx files)
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
diff --git a/misc/videotext/pkg-comment b/misc/videotext/pkg-comment
deleted file mode 100644
index 04f595f41f4b..000000000000
--- a/misc/videotext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11/Xview TV Videotext/Teletext page viewer (.vtx files)
diff --git a/misc/wmScoreBoard/Makefile b/misc/wmScoreBoard/Makefile
index fd24087e7f6d..8b78566368e1 100644
--- a/misc/wmScoreBoard/Makefile
+++ b/misc/wmScoreBoard/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= pat
MAINTAINER= pat@FreeBSD.org
+COMMENT= Window Maker dockapp that display game scores from excite
RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
diff --git a/misc/wmScoreBoard/pkg-comment b/misc/wmScoreBoard/pkg-comment
deleted file mode 100644
index ab125748f306..000000000000
--- a/misc/wmScoreBoard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window Maker dockapp that display game scores from excite
diff --git a/misc/wmcp/Makefile b/misc/wmcp/Makefile
index 8716e7c8d922..070e12b47d04 100644
--- a/misc/wmcp/Makefile
+++ b/misc/wmcp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc windowmaker
MASTER_SITES= http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A dockable pager for Window Maker
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/misc/wmcp/pkg-comment b/misc/wmcp/pkg-comment
deleted file mode 100644
index 9ae513d0f161..000000000000
--- a/misc/wmcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable pager for Window Maker
diff --git a/misc/wmessage/Makefile b/misc/wmessage/Makefile
index cb3a7b2c4881..8b57f59b70c1 100644
--- a/misc/wmessage/Makefile
+++ b/misc/wmessage/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc windowmaker
MASTER_SITES= http://members.ozemail.com.au/~crn/wmessage/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A WINGs based message viewer similar to xmessage
BUILD_DEPENDS= get-wraster-flags:${PORTSDIR}/x11-wm/windowmaker
diff --git a/misc/wmessage/pkg-comment b/misc/wmessage/pkg-comment
deleted file mode 100644
index fa9a56c8d7b2..000000000000
--- a/misc/wmessage/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WINGs based message viewer similar to xmessage
diff --git a/misc/wmtunlo/Makefile b/misc/wmtunlo/Makefile
index 5874d35db122..203fbb5dea16 100644
--- a/misc/wmtunlo/Makefile
+++ b/misc/wmtunlo/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc windowmaker
MASTER_SITES= http://clay.ll.pl/download/
MAINTAINER= adamw@FreeBSD.org
+COMMENT= A bo(O)oooring 2d tunnel in wmaker dock
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/misc/wmtunlo/pkg-comment b/misc/wmtunlo/pkg-comment
deleted file mode 100644
index d07b6b69ff46..000000000000
--- a/misc/wmtunlo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A bo(O)oooring 2d tunnel in wmaker dock
diff --git a/misc/wmweather/Makefile b/misc/wmweather/Makefile
index f4b7b24919d5..6e078e0d2c9f 100644
--- a/misc/wmweather/Makefile
+++ b/misc/wmweather/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= misc windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
MAINTAINER= kris@FreeBSD.org
+COMMENT= A WMaker dockapp which displays meteorological data for your city
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
diff --git a/misc/wmweather/pkg-comment b/misc/wmweather/pkg-comment
deleted file mode 100644
index b77b3a84178b..000000000000
--- a/misc/wmweather/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WMaker dockapp which displays meteorological data for your city
diff --git a/misc/xd/Makefile b/misc/xd/Makefile
index 718c59991a32..5468b8ebea98 100644
--- a/misc/xd/Makefile
+++ b/misc/xd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.bsddiary.net/xd/
DISTNAME= xd-8087
MAINTAINER= kiri@kiri.toba-cmt.ac.jp
+COMMENT= Yet another dump utility
MAN1= xd.1
MANCOMPRESSED= maybe
diff --git a/misc/xd/pkg-comment b/misc/xd/pkg-comment
deleted file mode 100644
index d16732f42420..000000000000
--- a/misc/xd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another dump utility
diff --git a/misc/xgas/Makefile b/misc/xgas/Makefile
index 98a82cd1606d..a742f27bc6ba 100644
--- a/misc/xgas/Makefile
+++ b/misc/xgas/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= X11/demos
DISTNAME= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= The animated simulation of an ideal gas
USE_IMAKE= yes
MAN1= xgas.1
diff --git a/misc/xgas/pkg-comment b/misc/xgas/pkg-comment
deleted file mode 100644
index 848ac355c75e..000000000000
--- a/misc/xgas/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The animated simulation of an ideal gas
diff --git a/misc/xquote/Makefile b/misc/xquote/Makefile
index 1ca48419d80c..09838e7b0dd3 100644
--- a/misc/xquote/Makefile
+++ b/misc/xquote/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://sunsite.dk/xinvest/ \
MASTER_SITE_SUBDIR= applications
MAINTAINER= mph@freebsd.org
+COMMENT= A quote retrieval tool for X
USE_MOTIF= yes
USE_IMAKE= yes
diff --git a/misc/xquote/pkg-comment b/misc/xquote/pkg-comment
deleted file mode 100644
index ea9eb7ef535e..000000000000
--- a/misc/xquote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A quote retrieval tool for X
diff --git a/multimedia/acme/Makefile b/multimedia/acme/Makefile
index a772d1e9d275..7066a26b5516 100644
--- a/multimedia/acme/Makefile
+++ b/multimedia/acme/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Tool to make multimedia keys work on laptops
BUILD_DEPENDS= gob2:${PORTSDIR}/devel/gob2
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
diff --git a/multimedia/acme/pkg-comment b/multimedia/acme/pkg-comment
deleted file mode 100644
index a3d97b1692db..000000000000
--- a/multimedia/acme/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to make multimedia keys work on laptops
diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile
index 03756c9df790..9fb463299565 100644
--- a/multimedia/camserv/Makefile
+++ b/multimedia/camserv/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics
MASTER_SITES= http://cserv.sourceforge.net/old/
MAINTAINER= chein@freebsd.org
+COMMENT= Camserv is a free program to do streaming video via the web
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/multimedia/camserv/pkg-comment b/multimedia/camserv/pkg-comment
deleted file mode 100644
index 0af656ee3a91..000000000000
--- a/multimedia/camserv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Camserv is a free program to do streaming video via the web
diff --git a/multimedia/dumpmpeg/Makefile b/multimedia/dumpmpeg/Makefile
index 5bb1e079ac7f..345de3db980c 100644
--- a/multimedia/dumpmpeg/Makefile
+++ b/multimedia/dumpmpeg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Dump frames from mpeg movies
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
smpeg:${PORTSDIR}/graphics/smpeg
diff --git a/multimedia/dumpmpeg/pkg-comment b/multimedia/dumpmpeg/pkg-comment
deleted file mode 100644
index 309b17751e32..000000000000
--- a/multimedia/dumpmpeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dump frames from mpeg movies
diff --git a/multimedia/enjoympeg/Makefile b/multimedia/enjoympeg/Makefile
index 3df20f79f687..5c4f8de2a774 100644
--- a/multimedia/enjoympeg/Makefile
+++ b/multimedia/enjoympeg/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= graphics
MASTER_SITES= http://people.freenet.de/for_Ki/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= An MPEG-1 video player
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
smpeg:${PORTSDIR}/graphics/smpeg
diff --git a/multimedia/enjoympeg/pkg-comment b/multimedia/enjoympeg/pkg-comment
deleted file mode 100644
index a2ea77ddd04f..000000000000
--- a/multimedia/enjoympeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An MPEG-1 video player
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index fd643659507e..1dfa43c1432e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Multimedia utilities for the KDE integrated X11 desktop
RUN_DEPENDS+= xanim:${PORTSDIR}/graphics/xanim
LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg \
diff --git a/multimedia/kdemultimedia3/pkg-comment b/multimedia/kdemultimedia3/pkg-comment
deleted file mode 100644
index d53b912ab5d9..000000000000
--- a/multimedia/kdemultimedia3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multimedia utilities for the KDE integrated X11 desktop
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index fd643659507e..1dfa43c1432e 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Multimedia utilities for the KDE integrated X11 desktop
RUN_DEPENDS+= xanim:${PORTSDIR}/graphics/xanim
LIB_DEPENDS+= ogg.4:${PORTSDIR}/audio/libogg \
diff --git a/multimedia/kdemultimedia4/pkg-comment b/multimedia/kdemultimedia4/pkg-comment
deleted file mode 100644
index d53b912ab5d9..000000000000
--- a/multimedia/kdemultimedia4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multimedia utilities for the KDE integrated X11 desktop
diff --git a/multimedia/mtv/Makefile b/multimedia/mtv/Makefile
index 98dca8ca5ad4..ebe1769c1d66 100644
--- a/multimedia/mtv/Makefile
+++ b/multimedia/mtv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.mpegtv.com/pub/mpeg/mpegtv/player/x86-unknown-linux-glib
DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz libSDLx11.so.tar.gz
MAINTAINER= kris@FreeBSD.org
+COMMENT= High-performance MPEG video player (shareware)
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/multimedia/mtv/pkg-comment b/multimedia/mtv/pkg-comment
deleted file mode 100644
index b231e92867b1..000000000000
--- a/multimedia/mtv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-performance MPEG video player (shareware)
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index f7a7a55be407..bee82fa24771 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GStreamer-based multimedia views for Nautilus
LIB_DEPENDS= nautilus.2:${PORTSDIR}/x11-fm/nautilus2 \
gstplay-0.6.0:${PORTSDIR}/multimedia/gstreamer-plugins
diff --git a/multimedia/nautilus-media/pkg-comment b/multimedia/nautilus-media/pkg-comment
deleted file mode 100644
index 9921a4b4c385..000000000000
--- a/multimedia/nautilus-media/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GStreamer-based multimedia views for Nautilus
diff --git a/multimedia/netshow/Makefile b/multimedia/netshow/Makefile
index a2676b19cbc5..b0574f667aa3 100644
--- a/multimedia/netshow/Makefile
+++ b/multimedia/netshow/Makefile
@@ -13,6 +13,7 @@ DISTNAME= netshow_linux
EXTRACT_SUFX= .gz
MAINTAINER= dburr@FreeBSD.org
+COMMENT= Microsoft NetShow video stream player
RESTRICTED= "Commercial software"
NO_CDROM= ${RESTRICTED}
diff --git a/multimedia/netshow/pkg-comment b/multimedia/netshow/pkg-comment
deleted file mode 100644
index 03cbea42c178..000000000000
--- a/multimedia/netshow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Microsoft NetShow video stream player
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index e97b57f4fc78..865bf94e75d3 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= ftp://ftp.xmms.org/xmms/plugins/smpeg-xmms/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A mpeg video plugin for XMMS
LIB_DEPENDS= smpeg.1:${PORTSDIR}/graphics/smpeg \
xmms.3:${PORTSDIR}/multimedia/xmms
diff --git a/multimedia/smpeg-xmms/pkg-comment b/multimedia/smpeg-xmms/pkg-comment
deleted file mode 100644
index a92c7dbec006..000000000000
--- a/multimedia/smpeg-xmms/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mpeg video plugin for XMMS
diff --git a/multimedia/tkxanim/Makefile b/multimedia/tkxanim/Makefile
index c62f5f167db5..5cd195b4b140 100644
--- a/multimedia/tkxanim/Makefile
+++ b/multimedia/tkxanim/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics tk82
MASTER_SITES= http://members.yourlink.net/aaron/software/linux/
MAINTAINER= jedgar@fxp.org
+COMMENT= Tcl/Tk frontend to xanim
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82 \
xanim:${PORTSDIR}/graphics/xanim
diff --git a/multimedia/tkxanim/pkg-comment b/multimedia/tkxanim/pkg-comment
deleted file mode 100644
index fbdef511dfcb..000000000000
--- a/multimedia/tkxanim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcl/Tk frontend to xanim
diff --git a/multimedia/vcdpad/Makefile b/multimedia/vcdpad/Makefile
index dceae2a02f3a..964c0ff9659d 100644
--- a/multimedia/vcdpad/Makefile
+++ b/multimedia/vcdpad/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= multimedia
MASTER_SITES= http://www.nocrew.org/software/vcdpad/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A program to pad vcd mpegs
USE_GMAKE= yes
diff --git a/multimedia/vcdpad/pkg-comment b/multimedia/vcdpad/pkg-comment
deleted file mode 100644
index 5ac74860fc7f..000000000000
--- a/multimedia/vcdpad/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to pad vcd mpegs
diff --git a/multimedia/vic/Makefile b/multimedia/vic/Makefile
index b6a562e4e9a0..e805190a0f59 100644
--- a/multimedia/vic/Makefile
+++ b/multimedia/vic/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/vic/2.8ucl-1.1.3/
DISTNAME= ${PORTNAME}-2.8ucl-1.1.3
MAINTAINER= fenner@FreeBSD.org
+COMMENT= MBONE video tool
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
diff --git a/multimedia/vic/pkg-comment b/multimedia/vic/pkg-comment
deleted file mode 100644
index d02447964f50..000000000000
--- a/multimedia/vic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MBONE video tool
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 622d7a16ecfa..16e2a6ad620b 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
http://people.FreeBSD.org/~brian/vlc/
MAINTAINER= brian@FreeBSD.org
+COMMENT= An X11 MPEG2 client/server solution
LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
dvdread.3:${PORTSDIR}/multimedia/libdvdread
diff --git a/multimedia/vlc-devel/pkg-comment b/multimedia/vlc-devel/pkg-comment
deleted file mode 100644
index c0426ee24399..000000000000
--- a/multimedia/vlc-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 MPEG2 client/server solution
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 622d7a16ecfa..16e2a6ad620b 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.videolan.org/pub/videolan/vlc/${PORTVERSION}/ \
http://people.FreeBSD.org/~brian/vlc/
MAINTAINER= brian@FreeBSD.org
+COMMENT= An X11 MPEG2 client/server solution
LIB_DEPENDS= dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
dvdread.3:${PORTSDIR}/multimedia/libdvdread
diff --git a/multimedia/vlc/pkg-comment b/multimedia/vlc/pkg-comment
deleted file mode 100644
index c0426ee24399..000000000000
--- a/multimedia/vlc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11 MPEG2 client/server solution
diff --git a/multimedia/xmps/Makefile b/multimedia/xmps/Makefile
index 0398b7c8e828..a9e4121d2b7a 100644
--- a/multimedia/xmps/Makefile
+++ b/multimedia/xmps/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= graphics gnome
MASTER_SITES= http://xmps.sourceforge.net/sources/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= X MPEG Player System - a media player with a very nice GUI
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12
diff --git a/multimedia/xmps/pkg-comment b/multimedia/xmps/pkg-comment
deleted file mode 100644
index 96525f843919..000000000000
--- a/multimedia/xmps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X MPEG Player System - a media player with a very nice GUI
diff --git a/net-im/ari-yahoo/Makefile b/net-im/ari-yahoo/Makefile
index 3490b5590abe..3b9eec3047d9 100644
--- a/net-im/ari-yahoo/Makefile
+++ b/net-im/ari-yahoo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A console Yahoo! messenger client
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-im/ari-yahoo/pkg-comment b/net-im/ari-yahoo/pkg-comment
deleted file mode 100644
index 0e25f1e7706d..000000000000
--- a/net-im/ari-yahoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A console Yahoo! messenger client
diff --git a/net-im/ayttm/Makefile b/net-im/ayttm/Makefile
index 6672b81e01cc..620986e2803c 100644
--- a/net-im/ayttm/Makefile
+++ b/net-im/ayttm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.everybuddy.com/files/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/net-im/ayttm/pkg-comment b/net-im/ayttm/pkg-comment
deleted file mode 100644
index 008ed1484b41..000000000000
--- a/net-im/ayttm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 171e72c22271..c742a50d1d0f 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A ncurses based interface for ICQ, Yahoo!, AIM, MSN and IRC
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
iconv.3:${PORTSDIR}/converters/libiconv \
diff --git a/net-im/centericq/pkg-comment b/net-im/centericq/pkg-comment
deleted file mode 100644
index 662f1e679193..000000000000
--- a/net-im/centericq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ncurses based interface for ICQ, Yahoo!, AIM, MSN and IRC
diff --git a/net-im/firetalk/Makefile b/net-im/firetalk/Makefile
index 1824efec85fc..018e5147ab9a 100644
--- a/net-im/firetalk/Makefile
+++ b/net-im/firetalk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.penguinhosting.net/~ian/firetalk/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A multi-protocol chat/instant messaging library
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net-im/firetalk/pkg-comment b/net-im/firetalk/pkg-comment
deleted file mode 100644
index c6f75e0558fa..000000000000
--- a/net-im/firetalk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-protocol chat/instant messaging library
diff --git a/net-im/gicq/Makefile b/net-im/gicq/Makefile
index 72833022b56e..d0f3b9d74e04 100644
--- a/net-im/gicq/Makefile
+++ b/net-im/gicq/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
+COMMENT= GTK based ICQ program
LIB_DEPENDS= icq.0:${PORTSDIR}/net/libicq
diff --git a/net-im/gicq/pkg-comment b/net-im/gicq/pkg-comment
deleted file mode 100644
index 45c82b168069..000000000000
--- a/net-im/gicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK based ICQ program
diff --git a/net-im/jabber-aim/Makefile b/net-im/jabber-aim/Makefile
index ebe21d516a63..4b331bedbf04 100644
--- a/net-im/jabber-aim/Makefile
+++ b/net-im/jabber-aim/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Jabber User Directory module
BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
diff --git a/net-im/jabber-aim/pkg-comment b/net-im/jabber-aim/pkg-comment
deleted file mode 100644
index 247740c3b84f..000000000000
--- a/net-im/jabber-aim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jabber User Directory module
diff --git a/net-im/jabber-conference/Makefile b/net-im/jabber-conference/Makefile
index 4cf78346e705..47baf0b25db0 100644
--- a/net-im/jabber-conference/Makefile
+++ b/net-im/jabber-conference/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Jabber Conferencing module
BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
diff --git a/net-im/jabber-conference/pkg-comment b/net-im/jabber-conference/pkg-comment
deleted file mode 100644
index 6421b6f8c423..000000000000
--- a/net-im/jabber-conference/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jabber Conferencing module
diff --git a/net-im/jabber-jud/Makefile b/net-im/jabber-jud/Makefile
index 167e28ffd37e..24dd97011293 100644
--- a/net-im/jabber-jud/Makefile
+++ b/net-im/jabber-jud/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Jabber User Directory module
BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
diff --git a/net-im/jabber-jud/pkg-comment b/net-im/jabber-jud/pkg-comment
deleted file mode 100644
index 247740c3b84f..000000000000
--- a/net-im/jabber-jud/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jabber User Directory module
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 811439600711..363f48200c13 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Online presence and instant messaging server
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-im/jabber/pkg-comment b/net-im/jabber/pkg-comment
deleted file mode 100644
index d056377943d4..000000000000
--- a/net-im/jabber/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Online presence and instant messaging server
diff --git a/net-im/libicq/Makefile b/net-im/libicq/Makefile
index a5d3bd4eedfc..a1efc01ff006 100644
--- a/net-im/libicq/Makefile
+++ b/net-im/libicq/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Library to add ICQ communication support to your software
USE_GNOMENG= yes
USE_GNOME= glib12
diff --git a/net-im/libicq/pkg-comment b/net-im/libicq/pkg-comment
deleted file mode 100644
index 0a6c793f6854..000000000000
--- a/net-im/libicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library to add ICQ communication support to your software
diff --git a/net-im/p5-Net-AIM/Makefile b/net-im/p5-Net-AIM/Makefile
index 766f1b0530ec..ed7be7accb4b 100644
--- a/net-im/p5-Net-AIM/Makefile
+++ b/net-im/p5-Net-AIM/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl extension for the AOL Instant Messenger TOC protocol
PERL_CONFIGURE= yes
diff --git a/net-im/p5-Net-AIM/pkg-comment b/net-im/p5-Net-AIM/pkg-comment
deleted file mode 100644
index a21e5ac22016..000000000000
--- a/net-im/p5-Net-AIM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for the AOL Instant Messenger TOC protocol
diff --git a/net-im/p5-Net-ICQ2000/Makefile b/net-im/p5-Net-ICQ2000/Makefile
index e59fa9a069b2..880b7cffddd6 100644
--- a/net-im/p5-Net-ICQ2000/Makefile
+++ b/net-im/p5-Net-ICQ2000/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://gonzo.kiev.ua/projects/vicq/
PKGNAMEPREFIX= p5-
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A perl5 module for ICQv7 protocol realisation
PERL_CONFIGURE= yes
diff --git a/net-im/p5-Net-ICQ2000/pkg-comment b/net-im/p5-Net-ICQ2000/pkg-comment
deleted file mode 100644
index 2d8015733c9c..000000000000
--- a/net-im/p5-Net-ICQ2000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module for ICQv7 protocol realisation
diff --git a/net-im/vicq/Makefile b/net-im/vicq/Makefile
index da8b105ee8b4..5ef7fcfac345 100644
--- a/net-im/vicq/Makefile
+++ b/net-im/vicq/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://gonzo.kiev.ua/projects/vicq/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A text-based ICQ implementation
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
diff --git a/net-im/vicq/pkg-comment b/net-im/vicq/pkg-comment
deleted file mode 100644
index 43c4495981a1..000000000000
--- a/net-im/vicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text-based ICQ implementation
diff --git a/net-im/xicq/Makefile b/net-im/xicq/Makefile
index 40bc02653fec..520a5e479475 100644
--- a/net-im/xicq/Makefile
+++ b/net-im/xicq/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.xtrophy.dk/xicq/
DISTNAME= xicq-071298-snapshot.src
MAINTAINER= scrappy@FreeBSD.org
+COMMENT= Xtropy's ICQ Client
WRKSRC= ${WRKDIR}/xicq-071298
diff --git a/net-im/xicq/pkg-comment b/net-im/xicq/pkg-comment
deleted file mode 100644
index e1315e3ced8e..000000000000
--- a/net-im/xicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xtropy's ICQ Client
diff --git a/net-mgmt/argus/Makefile b/net-mgmt/argus/Makefile
index bcdd8fc8f77b..873531151c65 100644
--- a/net-mgmt/argus/Makefile
+++ b/net-mgmt/argus/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://qosient.com/argus/src/ \
ftp://qosient.com/pub/argus/src/
MAINTAINER= se@freebsd.org
+COMMENT= A generic IP network transaction auditing tool
.if !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/net-mgmt/argus/pkg-comment b/net-mgmt/argus/pkg-comment
deleted file mode 100644
index 658890340d2b..000000000000
--- a/net-mgmt/argus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic IP network transaction auditing tool
diff --git a/net-mgmt/arpwatch-devel/Makefile b/net-mgmt/arpwatch-devel/Makefile
index 74f25956d9a1..72948ec96c80 100644
--- a/net-mgmt/arpwatch-devel/Makefile
+++ b/net-mgmt/arpwatch-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
DISTNAME= arpwatch-2.1a11
MAINTAINER= brian@FreeBSD.org
+COMMENT= Monitor arp & rarp requests
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
diff --git a/net-mgmt/arpwatch-devel/pkg-comment b/net-mgmt/arpwatch-devel/pkg-comment
deleted file mode 100644
index 73ccdb9c117c..000000000000
--- a/net-mgmt/arpwatch-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Monitor arp & rarp requests
diff --git a/net-mgmt/arpwatch/Makefile b/net-mgmt/arpwatch/Makefile
index 74f25956d9a1..72948ec96c80 100644
--- a/net-mgmt/arpwatch/Makefile
+++ b/net-mgmt/arpwatch/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
DISTNAME= arpwatch-2.1a11
MAINTAINER= brian@FreeBSD.org
+COMMENT= Monitor arp & rarp requests
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
diff --git a/net-mgmt/arpwatch/pkg-comment b/net-mgmt/arpwatch/pkg-comment
deleted file mode 100644
index 73ccdb9c117c..000000000000
--- a/net-mgmt/arpwatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Monitor arp & rarp requests
diff --git a/net-mgmt/bsd-airtools/Makefile b/net-mgmt/bsd-airtools/Makefile
index f4424317aa64..fecd41cc9060 100644
--- a/net-mgmt/bsd-airtools/Makefile
+++ b/net-mgmt/bsd-airtools/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= seanc@FreeBSD.org
+COMMENT= BSD Wireless Scanning Tools
CONF_AIRTOOLS= dstumbler
MAKE_AIRTOOLS= dweputils/dwepcrack dweputils/dwepdump \
diff --git a/net-mgmt/bsd-airtools/pkg-comment b/net-mgmt/bsd-airtools/pkg-comment
deleted file mode 100644
index d60ee30cec1c..000000000000
--- a/net-mgmt/bsd-airtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BSD Wireless Scanning Tools
diff --git a/net-mgmt/clog/Makefile b/net-mgmt/clog/Makefile
index 9c025813bdfd..ea6c5b126d34 100644
--- a/net-mgmt/clog/Makefile
+++ b/net-mgmt/clog/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
${MASTER_SITE_LOCAL}
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Tcp connection logger daemon
WRKSRC= ${WRKDIR}/clog
ALL_TARGET= freebsd
diff --git a/net-mgmt/clog/pkg-comment b/net-mgmt/clog/pkg-comment
deleted file mode 100644
index 3b949f50d368..000000000000
--- a/net-mgmt/clog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcp connection logger daemon
diff --git a/net-mgmt/etherape/Makefile b/net-mgmt/etherape/Makefile
index 2373dd82fb47..8fc91d13efe2 100644
--- a/net-mgmt/etherape/Makefile
+++ b/net-mgmt/etherape/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= A graphical network traffic visualization tool for gnome
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/net-mgmt/etherape/pkg-comment b/net-mgmt/etherape/pkg-comment
deleted file mode 100644
index c6d63a3b5129..000000000000
--- a/net-mgmt/etherape/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical network traffic visualization tool for gnome
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index ffed31d2049a..dea3f5c97b1e 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= greid@FreeBSD.org
+COMMENT= A network sniffer/interceptor/injector/logger for switched LANs
GNU_CONFIGURE= yes
diff --git a/net-mgmt/ettercap/pkg-comment b/net-mgmt/ettercap/pkg-comment
deleted file mode 100644
index a3e009bbc485..000000000000
--- a/net-mgmt/ettercap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A network sniffer/interceptor/injector/logger for switched LANs
diff --git a/net-mgmt/icmpmonitor/Makefile b/net-mgmt/icmpmonitor/Makefile
index a3917d77da36..a60a4213b7ba 100644
--- a/net-mgmt/icmpmonitor/Makefile
+++ b/net-mgmt/icmpmonitor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= icmpmonitor
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A multiple host icmp monitoring tool
GNU_CONFIGURE= YES
diff --git a/net-mgmt/icmpmonitor/pkg-comment b/net-mgmt/icmpmonitor/pkg-comment
deleted file mode 100644
index 33df4a660529..000000000000
--- a/net-mgmt/icmpmonitor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiple host icmp monitoring tool
diff --git a/net-mgmt/ipcalc/Makefile b/net-mgmt/ipcalc/Makefile
index 6b556c2e4e24..1ba3e5a44726 100644
--- a/net-mgmt/ipcalc/Makefile
+++ b/net-mgmt/ipcalc/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= # empty
EXTRACT_ONLY= # empty
MAINTAINER= petef@FreeBSD.org
+COMMENT= IP Calculator
NO_BUILD= yes
USE_PERL5= yes
diff --git a/net-mgmt/ipcalc/pkg-comment b/net-mgmt/ipcalc/pkg-comment
deleted file mode 100644
index 51af2d016308..000000000000
--- a/net-mgmt/ipcalc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IP Calculator
diff --git a/net-mgmt/nbtscan/Makefile b/net-mgmt/nbtscan/Makefile
index 0b4af447c825..ea5cc0fb77c1 100644
--- a/net-mgmt/nbtscan/Makefile
+++ b/net-mgmt/nbtscan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=kris
MAINTAINER= kris@FreeBSD.org
+COMMENT= NetBIOS name network scanner
GNU_CONFIGURE= yes
diff --git a/net-mgmt/nbtscan/pkg-comment b/net-mgmt/nbtscan/pkg-comment
deleted file mode 100644
index a0d0c1421c54..000000000000
--- a/net-mgmt/nbtscan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NetBIOS name network scanner
diff --git a/net-mgmt/nsc/Makefile b/net-mgmt/nsc/Makefile
index ab40d5d8b4f0..597411d2f587 100644
--- a/net-mgmt/nsc/Makefile
+++ b/net-mgmt/nsc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dirk
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Netsaint Console monitor
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
diff --git a/net-mgmt/nsc/pkg-comment b/net-mgmt/nsc/pkg-comment
deleted file mode 100644
index a4c5a26a06f5..000000000000
--- a/net-mgmt/nsc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netsaint Console monitor
diff --git a/net-mgmt/p5-JUNOScript/Makefile b/net-mgmt/p5-JUNOScript/Makefile
index b2b70e60f804..e25502cd08d2 100644
--- a/net-mgmt/p5-JUNOScript/Makefile
+++ b/net-mgmt/p5-JUNOScript/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= junoscript-perl-${PORTVERSION}-domestic
MAINTAINER= jesper@FreeBSD.org
+COMMENT= API to exchange information with Juniper Networks routers
PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
diff --git a/net-mgmt/p5-JUNOScript/pkg-comment b/net-mgmt/p5-JUNOScript/pkg-comment
deleted file mode 100644
index dcb6dbb2f93b..000000000000
--- a/net-mgmt/p5-JUNOScript/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-API to exchange information with Juniper Networks routers
diff --git a/net-mgmt/p5-NetAddr-IP/Makefile b/net-mgmt/p5-NetAddr-IP/Makefile
index 140bb7b7b12d..a9f654cf2744 100644
--- a/net-mgmt/p5-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-NetAddr-IP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= NetAddr
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for working with IP addresses and blocks thereof
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net-mgmt/p5-NetAddr-IP/pkg-comment b/net-mgmt/p5-NetAddr-IP/pkg-comment
deleted file mode 100644
index 59f71b01edd5..000000000000
--- a/net-mgmt/p5-NetAddr-IP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for working with IP addresses and blocks thereof
diff --git a/net-mgmt/p5-SNMP-Util/Makefile b/net-mgmt/p5-SNMP-Util/Makefile
index 9fac043b72c0..4072c6530360 100644
--- a/net-mgmt/p5-SNMP-Util/Makefile
+++ b/net-mgmt/p5-SNMP-Util/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= SNMP
PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.org
+COMMENT= Perl modules to perform SNMP set,get,walk,next,walk_hash etc
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
diff --git a/net-mgmt/p5-SNMP-Util/pkg-comment b/net-mgmt/p5-SNMP-Util/pkg-comment
deleted file mode 100644
index 94b7a9342c00..000000000000
--- a/net-mgmt/p5-SNMP-Util/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules to perform SNMP set,get,walk,next,walk_hash etc
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index f4fb649baa1e..da16d108b03f 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= . old
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A perl5 module providing rudimentary access to SNMPv1 and v2 agents
PERL_CONFIGURE= yes
diff --git a/net-mgmt/p5-SNMP_Session/pkg-comment b/net-mgmt/p5-SNMP_Session/pkg-comment
deleted file mode 100644
index 382d3f9bcee1..000000000000
--- a/net-mgmt/p5-SNMP_Session/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module providing rudimentary access to SNMPv1 and v2 agents
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/Makefile b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
index 922e03f65c44..ce16babef13b 100644
--- a/net-mgmt/p5-Tie-NetAddr-IP/Makefile
+++ b/net-mgmt/p5-Tie-NetAddr-IP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Tie::NetAddr::IP - Implements a Hash where the key is a subnet
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net-mgmt/p5-Tie-NetAddr-IP/pkg-comment b/net-mgmt/p5-Tie-NetAddr-IP/pkg-comment
deleted file mode 100644
index 0b23d2661afb..000000000000
--- a/net-mgmt/p5-Tie-NetAddr-IP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tie::NetAddr::IP - Implements a Hash where the key is a subnet
diff --git a/net-mgmt/ruby-snmp/Makefile b/net-mgmt/ruby-snmp/Makefile
index b2510ffe2187..04229aefb1b2 100644
--- a/net-mgmt/ruby-snmp/Makefile
+++ b/net-mgmt/ruby-snmp/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Ruby interface to UCD-SNMP library
LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp4
diff --git a/net-mgmt/ruby-snmp/pkg-comment b/net-mgmt/ruby-snmp/pkg-comment
deleted file mode 100644
index 273e18db69f3..000000000000
--- a/net-mgmt/ruby-snmp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ruby interface to UCD-SNMP library
diff --git a/net-mgmt/sting/Makefile b/net-mgmt/sting/Makefile
index 3f70effc3bc7..b1258a0b3569 100644
--- a/net-mgmt/sting/Makefile
+++ b/net-mgmt/sting/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cs.washington.edu/homes/savage/sting/
DISTNAME= sting
MAINTAINER= kbyanc@posi.net
+COMMENT= A tool that measures end-to-end TCP connection characteristics
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/sting/pkg-comment b/net-mgmt/sting/pkg-comment
deleted file mode 100644
index d1050a3c894e..000000000000
--- a/net-mgmt/sting/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool that measures end-to-end TCP connection characteristics
diff --git a/net-mgmt/tcpreplay/Makefile b/net-mgmt/tcpreplay/Makefile
index 4e3fc93cd7d1..8c5d0495c663 100644
--- a/net-mgmt/tcpreplay/Makefile
+++ b/net-mgmt/tcpreplay/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= smace@FreeBSD.org
+COMMENT= A tool to replay saved packet capture files
BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
diff --git a/net-mgmt/tcpreplay/pkg-comment b/net-mgmt/tcpreplay/pkg-comment
deleted file mode 100644
index a7b977ea87e2..000000000000
--- a/net-mgmt/tcpreplay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to replay saved packet capture files
diff --git a/net-p2p/napshare/Makefile b/net-p2p/napshare/Makefile
index 8841dce0c2b2..3afe9947dd04 100644
--- a/net-p2p/napshare/Makefile
+++ b/net-p2p/napshare/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= napshare
MAINTAINER= mikeh@FreeBSD.org
+COMMENT= A GTK based Gnutella client
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/net-p2p/napshare/pkg-comment b/net-p2p/napshare/pkg-comment
deleted file mode 100644
index 93e0ec231fd9..000000000000
--- a/net-p2p/napshare/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK based Gnutella client
diff --git a/net-p2p/opennap/Makefile b/net-p2p/opennap/Makefile
index f86eedab437f..bc8af4b8e9f3 100644
--- a/net-p2p/opennap/Makefile
+++ b/net-p2p/opennap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= The OpenNAP open-source Napster server
USE_GMAKE= YES
GNU_CONFIGURE= YES
diff --git a/net-p2p/opennap/pkg-comment b/net-p2p/opennap/pkg-comment
deleted file mode 100644
index 7d1ebf6f0af1..000000000000
--- a/net-p2p/opennap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The OpenNAP open-source Napster server
diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile
index 65b77dbf4de1..0bba3f472ccd 100644
--- a/net/GeoIP/Makefile
+++ b/net/GeoIP/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net
MASTER_SITES= http://www.maxmind.com/download/geoip/api/c/
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Find the country that any IP address or hostname originates from
USE_LIBTOOL= yes
CONFIGURE_ARGS= --with-gnu-ld=yes
diff --git a/net/GeoIP/pkg-comment b/net/GeoIP/pkg-comment
deleted file mode 100644
index 15f274e738a3..000000000000
--- a/net/GeoIP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find the country that any IP address or hostname originates from
diff --git a/net/archie.el/Makefile b/net/archie.el/Makefile
index 459883e3a8c9..ea3305c1372f 100644
--- a/net/archie.el/Makefile
+++ b/net/archie.el/Makefile
@@ -15,6 +15,7 @@ DISTNAME= archie.el
EXTRACT_SUFX= .Z
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A mock-interface to Archie for Emacs
RUN_DEPENDS= archie:${PORTSDIR}/net/archie
diff --git a/net/archie.el/pkg-comment b/net/archie.el/pkg-comment
deleted file mode 100644
index 80b6052fb123..000000000000
--- a/net/archie.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mock-interface to Archie for Emacs
diff --git a/net/argus/Makefile b/net/argus/Makefile
index bcdd8fc8f77b..873531151c65 100644
--- a/net/argus/Makefile
+++ b/net/argus/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://qosient.com/argus/src/ \
ftp://qosient.com/pub/argus/src/
MAINTAINER= se@freebsd.org
+COMMENT= A generic IP network transaction auditing tool
.if !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
diff --git a/net/argus/pkg-comment b/net/argus/pkg-comment
deleted file mode 100644
index 658890340d2b..000000000000
--- a/net/argus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A generic IP network transaction auditing tool
diff --git a/net/ari-yahoo/Makefile b/net/ari-yahoo/Makefile
index 3490b5590abe..3b9eec3047d9 100644
--- a/net/ari-yahoo/Makefile
+++ b/net/ari-yahoo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A console Yahoo! messenger client
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/ari-yahoo/pkg-comment b/net/ari-yahoo/pkg-comment
deleted file mode 100644
index 0e25f1e7706d..000000000000
--- a/net/ari-yahoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A console Yahoo! messenger client
diff --git a/net/arla/Makefile b/net/arla/Makefile
index e623198d46fc..26938f069db5 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.stacken.kth.se/pub/arla/
MAINTAINER= assar@freebsd.org
+COMMENT= A free AFS client implementation
BROKEN= "Does not build"
diff --git a/net/arla/pkg-comment b/net/arla/pkg-comment
deleted file mode 100644
index c8f90199cfb3..000000000000
--- a/net/arla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free AFS client implementation
diff --git a/net/arprelease/Makefile b/net/arprelease/Makefile
index 53a8d2be6303..8bcb010dca6c 100644
--- a/net/arprelease/Makefile
+++ b/net/arprelease/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= arprelease
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Libnet tool to flush arp cache entries from devices (eg. routers)
BUILD_DEPENDS= libnet-config:${PORTSDIR}/net/libnet
diff --git a/net/arprelease/pkg-comment b/net/arprelease/pkg-comment
deleted file mode 100644
index c699b4db3812..000000000000
--- a/net/arprelease/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libnet tool to flush arp cache entries from devices (eg. routers)
diff --git a/net/arpwatch-devel/Makefile b/net/arpwatch-devel/Makefile
index 74f25956d9a1..72948ec96c80 100644
--- a/net/arpwatch-devel/Makefile
+++ b/net/arpwatch-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
DISTNAME= arpwatch-2.1a11
MAINTAINER= brian@FreeBSD.org
+COMMENT= Monitor arp & rarp requests
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
diff --git a/net/arpwatch-devel/pkg-comment b/net/arpwatch-devel/pkg-comment
deleted file mode 100644
index 73ccdb9c117c..000000000000
--- a/net/arpwatch-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Monitor arp & rarp requests
diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile
index 74f25956d9a1..72948ec96c80 100644
--- a/net/arpwatch/Makefile
+++ b/net/arpwatch/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.Awfulhak.org/arpwatch/ \
DISTNAME= arpwatch-2.1a11
MAINTAINER= brian@FreeBSD.org
+COMMENT= Monitor arp & rarp requests
GNU_CONFIGURE= yes
HAS_CONFIGURE= yes
diff --git a/net/arpwatch/pkg-comment b/net/arpwatch/pkg-comment
deleted file mode 100644
index 73ccdb9c117c..000000000000
--- a/net/arpwatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Monitor arp & rarp requests
diff --git a/net/ayttm/Makefile b/net/ayttm/Makefile
index 6672b81e01cc..620986e2803c 100644
--- a/net/ayttm/Makefile
+++ b/net/ayttm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.everybuddy.com/files/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/net/ayttm/pkg-comment b/net/ayttm/pkg-comment
deleted file mode 100644
index 008ed1484b41..000000000000
--- a/net/ayttm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
diff --git a/net/b2bua/Makefile b/net/b2bua/Makefile
index 5d83032a857a..9d8527bce6c2 100644
--- a/net/b2bua/Makefile
+++ b/net/b2bua/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net
MASTER_SITES= http://www.vovida.org/downloads/b2bua/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A back-to-back (B2B) SIP user agent
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/net/b2bua/pkg-comment b/net/b2bua/pkg-comment
deleted file mode 100644
index be3482e4250d..000000000000
--- a/net/b2bua/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A back-to-back (B2B) SIP user agent
diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 62cbc9e3be87..4e616d0e67d8 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -20,6 +20,7 @@ DISTFILES= bind-src.tar.gz bind-doc.tar.gz
DIST_SUBDIR= bind-${PORTVERSION}
MAINTAINER= DougB@FreeBSD.org
+COMMENT= The Berkeley Internet Name Daemon, an implementation of DNS
.if defined(PORT_REPLACES_BASE_BIND8)
PKGNAMESUFFIX= -base
diff --git a/net/bind8/pkg-comment b/net/bind8/pkg-comment
deleted file mode 100644
index aeebc91bec8c..000000000000
--- a/net/bind8/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Berkeley Internet Name Daemon, an implementation of DNS
diff --git a/net/bing/Makefile b/net/bing/Makefile
index d991d7a96de1..01d332971b12 100644
--- a/net/bing/Makefile
+++ b/net/bing/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.lip6.fr/pub/networking/
MAINTAINER= jseger@freebsd.org
+COMMENT= A point-to-point bandwith measurement tool
MAN8= bing.8
diff --git a/net/bing/pkg-comment b/net/bing/pkg-comment
deleted file mode 100644
index 78f1c490bb06..000000000000
--- a/net/bing/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A point-to-point bandwith measurement tool
diff --git a/net/bsd-airtools/Makefile b/net/bsd-airtools/Makefile
index f4424317aa64..fecd41cc9060 100644
--- a/net/bsd-airtools/Makefile
+++ b/net/bsd-airtools/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= seanc@FreeBSD.org
+COMMENT= BSD Wireless Scanning Tools
CONF_AIRTOOLS= dstumbler
MAKE_AIRTOOLS= dweputils/dwepcrack dweputils/dwepdump \
diff --git a/net/bsd-airtools/pkg-comment b/net/bsd-airtools/pkg-comment
deleted file mode 100644
index d60ee30cec1c..000000000000
--- a/net/bsd-airtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BSD Wireless Scanning Tools
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index 171e72c22271..c742a50d1d0f 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= net
MASTER_SITES= http://konst.org.ua/download/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A ncurses based interface for ICQ, Yahoo!, AIM, MSN and IRC
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext \
iconv.3:${PORTSDIR}/converters/libiconv \
diff --git a/net/centericq/pkg-comment b/net/centericq/pkg-comment
deleted file mode 100644
index 662f1e679193..000000000000
--- a/net/centericq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ncurses based interface for ICQ, Yahoo!, AIM, MSN and IRC
diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile
index a2e3b03b5828..386471899170 100644
--- a/net/citrix_ica/Makefile
+++ b/net/citrix_ica/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=
DISTNAME= ${PORTNAME}-linuxx86
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/net/citrix_ica/pkg-comment b/net/citrix_ica/pkg-comment
deleted file mode 100644
index 70d23f88a95f..000000000000
--- a/net/citrix_ica/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Citrix(R) client for the Microsoft Windows Terminal Server
diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile
index a2e3b03b5828..386471899170 100644
--- a/net/citrix_xenapp/Makefile
+++ b/net/citrix_xenapp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=
DISTNAME= ${PORTNAME}-linuxx86
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Citrix(R) client for the Microsoft Windows Terminal Server
RUN_DEPENDS= /compat/linux/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/net/citrix_xenapp/pkg-comment b/net/citrix_xenapp/pkg-comment
deleted file mode 100644
index 70d23f88a95f..000000000000
--- a/net/citrix_xenapp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Citrix(R) client for the Microsoft Windows Terminal Server
diff --git a/net/clog/Makefile b/net/clog/Makefile
index 9c025813bdfd..ea6c5b126d34 100644
--- a/net/clog/Makefile
+++ b/net/clog/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://nuxi.ucdavis.edu/pub/misc/ \
${MASTER_SITE_LOCAL}
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Tcp connection logger daemon
WRKSRC= ${WRKDIR}/clog
ALL_TARGET= freebsd
diff --git a/net/clog/pkg-comment b/net/clog/pkg-comment
deleted file mode 100644
index 3b949f50d368..000000000000
--- a/net/clog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tcp connection logger daemon
diff --git a/net/clusterit/Makefile b/net/clusterit/Makefile
index d3d6f323f4cb..1709c7d8e563 100644
--- a/net/clusterit/Makefile
+++ b/net/clusterit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.garbled.net/download/ \
ftp://ftp.chg.ru/pub/prog/parallel/tools/clusterit/
MAINTAINER= demon@FreeBSD.org
+COMMENT= A collection of clustering tools
MAN1= barrier.1 barrierd.1 dsh.1 jsh.1 jsd.1 \
clustersed.1 run.1 seq.1 dshbak.1 pcp.1 pdf.1 prm.1
diff --git a/net/clusterit/pkg-comment b/net/clusterit/pkg-comment
deleted file mode 100644
index 7a8659fc4b6d..000000000000
--- a/net/clusterit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of clustering tools
diff --git a/net/coda5_doc/Makefile b/net/coda5_doc/Makefile
index a27ddff2b56a..f12683c6b827 100644
--- a/net/coda5_doc/Makefile
+++ b/net/coda5_doc/Makefile
@@ -13,6 +13,7 @@ DISTNAME= coda-doc-5.2.0-1
EXTRACT_SUFX= .tgz
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= An experimental, replicated, high-performance network file system
WRKSRC= ${WRKDIR}/usr
diff --git a/net/coda5_doc/pkg-comment b/net/coda5_doc/pkg-comment
deleted file mode 100644
index 94c2a5a0fd65..000000000000
--- a/net/coda5_doc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An experimental, replicated, high-performance network file system
diff --git a/net/cphone/Makefile b/net/cphone/Makefile
index 4e7b1843a2c9..8f0cf5554b64 100644
--- a/net/cphone/Makefile
+++ b/net/cphone/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://download.sourceforge.net/cphone/
DISTNAME= cphone_0.1.0
MAINTAINER= roger@FreeBSD.org
+COMMENT= H323 Video Conferencing Program which uses QT
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/cphone/pkg-comment b/net/cphone/pkg-comment
deleted file mode 100644
index dc118f77edba..000000000000
--- a/net/cphone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-H323 Video Conferencing Program which uses QT
diff --git a/net/ctrace/Makefile b/net/ctrace/Makefile
index fd1cd08fa622..bb5a5ea9b1d7 100644
--- a/net/ctrace/Makefile
+++ b/net/ctrace/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.pratyeka.org/ctrace/download/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Multiprotocol traceroute tool
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/RawIP.pm:${PORTSDIR}/net/p5-Net-RawIP
diff --git a/net/ctrace/pkg-comment b/net/ctrace/pkg-comment
deleted file mode 100644
index 223202c36750..000000000000
--- a/net/ctrace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multiprotocol traceroute tool
diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile
index 6dda767eb8ec..ce35e7b595fa 100644
--- a/net/cvsup-mirror/Makefile
+++ b/net/cvsup-mirror/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= A kit for easily setting up a FreeBSD mirror site using CVSup
RUN_DEPENDS= ${LOCALBASE}/sbin/cvsupd:${PORTSDIR}/net/cvsup-without-gui
diff --git a/net/cvsup-mirror/pkg-comment b/net/cvsup-mirror/pkg-comment
deleted file mode 100644
index 4b742f0b297f..000000000000
--- a/net/cvsup-mirror/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A kit for easily setting up a FreeBSD mirror site using CVSup
diff --git a/net/cvsupit/Makefile b/net/cvsupit/Makefile
index 3d87fc3794be..533003515e96 100644
--- a/net/cvsupit/Makefile
+++ b/net/cvsupit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
DISTFILES= #empty
MAINTAINER= jkh@FreeBSD.org
+COMMENT= CVSup installation and setup front-end package (16.1 / GUI V3)
.if !defined(PACKAGE_BUILDING)
IS_INTERACTIVE= 'Must configure cvsup server information'
diff --git a/net/cvsupit/pkg-comment b/net/cvsupit/pkg-comment
deleted file mode 100644
index 74e5c8944055..000000000000
--- a/net/cvsupit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CVSup installation and setup front-end package (16.1 / GUI V3)
diff --git a/net/dante/Makefile b/net/dante/Makefile
index b1625e21240d..cef4e60b77c4 100644
--- a/net/dante/Makefile
+++ b/net/dante/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.inet.no/pub/socks/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= A circuit-level firewall/proxy
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-socks-conf=${PREFIX}/etc/socks.conf \
diff --git a/net/dante/pkg-comment b/net/dante/pkg-comment
deleted file mode 100644
index ddb6306215fb..000000000000
--- a/net/dante/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A circuit-level firewall/proxy
diff --git a/net/datapipe/Makefile b/net/datapipe/Makefile
index 9901d33c859d..88567a1bb2e7 100644
--- a/net/datapipe/Makefile
+++ b/net/datapipe/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.distributed.net/pub/dcti/unsupported/ \
http://http.distributed.net/pub/dcti/unsupported/
MAINTAINER= dbaker@FreeBSD.org
+COMMENT= A simple program to bind a local port and connect it to a remote socket
do-build:
${CC} ${CFLAGS} -o ${WRKDIR}/${DISTNAME}/datapipe ${WRKDIR}/${DISTNAME}/datapipe.c
diff --git a/net/datapipe/pkg-comment b/net/datapipe/pkg-comment
deleted file mode 100644
index fe4e6ccb35d6..000000000000
--- a/net/datapipe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple program to bind a local port and connect it to a remote socket
diff --git a/net/ddclient/Makefile b/net/ddclient/Makefile
index bc5a2ad64739..bac69ef95120 100644
--- a/net/ddclient/Makefile
+++ b/net/ddclient/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://burry.ca:4141/ddclient/
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Update dynamic DNS entries
USE_PERL5= yes
NO_BUILD= yes
diff --git a/net/ddclient/pkg-comment b/net/ddclient/pkg-comment
deleted file mode 100644
index 4461f5b763e4..000000000000
--- a/net/ddclient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Update dynamic DNS entries
diff --git a/net/delegate/Makefile b/net/delegate/Makefile
index 4f4727060118..eb2e7baf9741 100644
--- a/net/delegate/Makefile
+++ b/net/delegate/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://www.delegate.org/pub/DeleGate/ \
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= max@FreeBSD.org
+COMMENT= General purpose TCP/IP proxy system
USE_BZIP2= YES
NO_PACKAGE= "Insecure program."
diff --git a/net/delegate/pkg-comment b/net/delegate/pkg-comment
deleted file mode 100644
index 473aefa4fdfc..000000000000
--- a/net/delegate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-General purpose TCP/IP proxy system
diff --git a/net/dictd/Makefile b/net/dictd/Makefile
index bba218941d5e..52f539464924 100644
--- a/net/dictd/Makefile
+++ b/net/dictd/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.dict.org/pub/dict/ \
MASTER_SITE_SUBDIR= dict
MAINTAINER?= dd@FreeBSD.org
+COMMENT= Dict protocol (RFC 2229) server
MAN1= dictzip.1
MAN8= dictd.8
diff --git a/net/dictd/pkg-comment b/net/dictd/pkg-comment
deleted file mode 100644
index ddada704bd89..000000000000
--- a/net/dictd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dict protocol (RFC 2229) server
diff --git a/net/dnrd/Makefile b/net/dnrd/Makefile
index e6da2990897d..eb0a726ae40d 100644
--- a/net/dnrd/Makefile
+++ b/net/dnrd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://members.home.com/garsh/dnrd/archive/
MAINTAINER= greid@FreeBSD.org
+COMMENT= A proxy DNS daemon
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/net/dnrd/pkg-comment b/net/dnrd/pkg-comment
deleted file mode 100644
index 3c09965e0672..000000000000
--- a/net/dnrd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A proxy DNS daemon
diff --git a/net/dnstop/Makefile b/net/dnstop/Makefile
index 6328c9724ac9..9dcd296d44fc 100644
--- a/net/dnstop/Makefile
+++ b/net/dnstop/Makefile
@@ -10,6 +10,7 @@ CATEGORIES= net
MASTER_SITES= http://dnstop.measurement-factory.com/src/
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= Captures and analyzes DNS traffic (or analyzes libpcap dump)
NO_WRKSUBDIR= true
diff --git a/net/dnstop/pkg-comment b/net/dnstop/pkg-comment
deleted file mode 100644
index fdc7e34782dd..000000000000
--- a/net/dnstop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Captures and analyzes DNS traffic (or analyzes libpcap dump)
diff --git a/net/dnswalk/Makefile b/net/dnswalk/Makefile
index eb04a3c3b048..25b5fa765d62 100644
--- a/net/dnswalk/Makefile
+++ b/net/dnswalk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.visi.com/~barr/dnswalk/
MAINTAINER= mph@freebsd.org
+COMMENT= DNS debugger - requests a zone transfer and analyzes the result
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
diff --git a/net/dnswalk/pkg-comment b/net/dnswalk/pkg-comment
deleted file mode 100644
index 8564bc9f11a3..000000000000
--- a/net/dnswalk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DNS debugger - requests a zone transfer and analyzes the result
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 51732282c340..951d3892e5ce 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.internatif.org/pub/unix/echoping/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= A ping-like program that uses tcp and/or http
USE_OPENSSL= yes
GNU_CONFIGURE= yes
diff --git a/net/echoping/pkg-comment b/net/echoping/pkg-comment
deleted file mode 100644
index 076a61a5ea0a..000000000000
--- a/net/echoping/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ping-like program that uses tcp and/or http
diff --git a/net/ekiga/Makefile b/net/ekiga/Makefile
index 71b5e2897b07..2618b3bb7fd5 100644
--- a/net/ekiga/Makefile
+++ b/net/ekiga/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net gnome
MASTER_SITES= http://www.gnomemeeting.org/downloads/0.96.0/sources/
MAINTAINER= roger@FreeBSD.org
+COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting
LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
diff --git a/net/ekiga/pkg-comment b/net/ekiga/pkg-comment
deleted file mode 100644
index bec41f50ea5b..000000000000
--- a/net/ekiga/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME H323 Video Conferencing program, similar to NetMeeting
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 2373dd82fb47..8fc91d13efe2 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= A graphical network traffic visualization tool for gnome
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/net/etherape/pkg-comment b/net/etherape/pkg-comment
deleted file mode 100644
index c6d63a3b5129..000000000000
--- a/net/etherape/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical network traffic visualization tool for gnome
diff --git a/net/etherboot/Makefile b/net/etherboot/Makefile
index b08135b92494..1b42326b12a7 100644
--- a/net/etherboot/Makefile
+++ b/net/etherboot/Makefile
@@ -14,6 +14,7 @@ CATEGORIES= net
MASTER_SITES= http://etherboot.sourceforge.net/
MAINTAINER= ambrisko@freebsd.org
+COMMENT= Network boot of FreeBSD a.out/ELF kernels. Replaces/improves netboot.
NO_PACKAGE= lots of configuration necessary
USE_BZIP2=1
diff --git a/net/etherboot/pkg-comment b/net/etherboot/pkg-comment
deleted file mode 100644
index 117e93a729bc..000000000000
--- a/net/etherboot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network boot of FreeBSD a.out/ELF kernels. Replaces/improves netboot.
diff --git a/net/ettercap/Makefile b/net/ettercap/Makefile
index ffed31d2049a..dea3f5c97b1e 100644
--- a/net/ettercap/Makefile
+++ b/net/ettercap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= greid@FreeBSD.org
+COMMENT= A network sniffer/interceptor/injector/logger for switched LANs
GNU_CONFIGURE= yes
diff --git a/net/ettercap/pkg-comment b/net/ettercap/pkg-comment
deleted file mode 100644
index a3e009bbc485..000000000000
--- a/net/ettercap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A network sniffer/interceptor/injector/logger for switched LANs
diff --git a/net/everybuddy/Makefile b/net/everybuddy/Makefile
index 6672b81e01cc..620986e2803c 100644
--- a/net/everybuddy/Makefile
+++ b/net/everybuddy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.everybuddy.com/files/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \
iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/net/everybuddy/pkg-comment b/net/everybuddy/pkg-comment
deleted file mode 100644
index 008ed1484b41..000000000000
--- a/net/everybuddy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A "chat" program that combines AIM, ICQ, and Yahoo! Chat into one
diff --git a/net/ez-ipupdate/Makefile b/net/ez-ipupdate/Makefile
index 0b30b781dee4..58d999a3c63b 100644
--- a/net/ez-ipupdate/Makefile
+++ b/net/ez-ipupdate/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://gusnet.cx/proj/ez-ipupdate/dist/
MAINTAINER= se@FreeBSD.org
+COMMENT= Update your host name on any dynamic DNS service
GNU_CONFIGURE= yes
diff --git a/net/ez-ipupdate/pkg-comment b/net/ez-ipupdate/pkg-comment
deleted file mode 100644
index 8f18e608cc5c..000000000000
--- a/net/ez-ipupdate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Update your host name on any dynamic DNS service
diff --git a/net/firetalk/Makefile b/net/firetalk/Makefile
index 1824efec85fc..018e5147ab9a 100644
--- a/net/firetalk/Makefile
+++ b/net/firetalk/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.penguinhosting.net/~ian/firetalk/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A multi-protocol chat/instant messaging library
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/net/firetalk/pkg-comment b/net/firetalk/pkg-comment
deleted file mode 100644
index c6f75e0558fa..000000000000
--- a/net/firetalk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-protocol chat/instant messaging library
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index accb5c9defbd..e179d6d01cdc 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.Awfulhak.org/pub/radius/
MAINTAINER= brian@FreeBSD.org
+COMMENT= A free RADIUS server implementation
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/net/freeradius/pkg-comment b/net/freeradius/pkg-comment
deleted file mode 100644
index 1ce3a58caae8..000000000000
--- a/net/freeradius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free RADIUS server implementation
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index accb5c9defbd..e179d6d01cdc 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.freeradius.org/pub/radius/ \
ftp://ftp.Awfulhak.org/pub/radius/
MAINTAINER= brian@FreeBSD.org
+COMMENT= A free RADIUS server implementation
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/net/freeradius2/pkg-comment b/net/freeradius2/pkg-comment
deleted file mode 100644
index 1ce3a58caae8..000000000000
--- a/net/freeradius2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free RADIUS server implementation
diff --git a/net/gatekeeper/Makefile b/net/gatekeeper/Makefile
index 46f660f4be93..b866b9eeac49 100644
--- a/net/gatekeeper/Makefile
+++ b/net/gatekeeper/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gk-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= roger@FreeBSD.org
+COMMENT= GnuGK is GPL Gate Keeper for OhPhone, GnomeMeeting, NetMeeting and H323
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/gatekeeper/pkg-comment b/net/gatekeeper/pkg-comment
deleted file mode 100644
index 18d67004fb10..000000000000
--- a/net/gatekeeper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GnuGK is GPL Gate Keeper for OhPhone, GnomeMeeting, NetMeeting and H323
diff --git a/net/geotrace/Makefile b/net/geotrace/Makefile
index b9b6f6a2108d..396a9b856afd 100644
--- a/net/geotrace/Makefile
+++ b/net/geotrace/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Graphical traceroute utility
USE_REINPLACE= yes
USE_GNOMENG= yes
diff --git a/net/geotrace/pkg-comment b/net/geotrace/pkg-comment
deleted file mode 100644
index b5c3df10bf6b..000000000000
--- a/net/geotrace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical traceroute utility
diff --git a/net/geta/Makefile b/net/geta/Makefile
index 5da5fdb2c725..b599e08c4fd5 100644
--- a/net/geta/Makefile
+++ b/net/geta/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
DISTNAME= pping-${PORTVERSION}
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Geta(GET Address) - Simple IPv4/IPv6 address resolving tool
WRKSRC= ${WRKDIR}/pping
GNU_CONFIGURE= yes
diff --git a/net/geta/pkg-comment b/net/geta/pkg-comment
deleted file mode 100644
index 91ede309f27c..000000000000
--- a/net/geta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Geta(GET Address) - Simple IPv4/IPv6 address resolving tool
diff --git a/net/ggsd/Makefile b/net/ggsd/Makefile
index fc83cb77382d..ec7781fbe931 100644
--- a/net/ggsd/Makefile
+++ b/net/ggsd/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ggsd
EXTRACT_SUFX= .tar
MAINTAINER= demon@FreeBSD.org
+COMMENT= Start a network server to execute scripts
EXTRACT_CMD= ${TAR}
EXTRACT_BEFORE_ARGS= -xf
diff --git a/net/ggsd/pkg-comment b/net/ggsd/pkg-comment
deleted file mode 100644
index 7e3ac5cd68a9..000000000000
--- a/net/ggsd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Start a network server to execute scripts
diff --git a/net/gicq/Makefile b/net/gicq/Makefile
index 72833022b56e..d0f3b9d74e04 100644
--- a/net/gicq/Makefile
+++ b/net/gicq/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
+COMMENT= GTK based ICQ program
LIB_DEPENDS= icq.0:${PORTSDIR}/net/libicq
diff --git a/net/gicq/pkg-comment b/net/gicq/pkg-comment
deleted file mode 100644
index 45c82b168069..000000000000
--- a/net/gicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK based ICQ program
diff --git a/net/gkrellmqst/Makefile b/net/gkrellmqst/Makefile
index 4cac37b48438..b22ae2c02311 100644
--- a/net/gkrellmqst/Makefile
+++ b/net/gkrellmqst/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://tadpol.org/unxware/
DISTNAME= gkrellm_qst-${PORTVERSION:S/.p/pre_/}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Plugin for Gkrellm that displays updated info on several game servers
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm \
diff --git a/net/gkrellmqst/pkg-comment b/net/gkrellmqst/pkg-comment
deleted file mode 100644
index c288eab189d0..000000000000
--- a/net/gkrellmqst/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Plugin for Gkrellm that displays updated info on several game servers
diff --git a/net/gkrellmwireless/Makefile b/net/gkrellmwireless/Makefile
index ea37d797dd69..5970d4d84ab7 100644
--- a/net/gkrellmwireless/Makefile
+++ b/net/gkrellmwireless/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net
MASTER_SITES= http://gkrellm.luon.net/files/
MAINTAINER= jim@FreeBSD.org
+COMMENT= GKrellM wireless plugin
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/net/gkrellmwireless/pkg-comment b/net/gkrellmwireless/pkg-comment
deleted file mode 100644
index c5ba9e25ec57..000000000000
--- a/net/gkrellmwireless/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GKrellM wireless plugin
diff --git a/net/gnet/Makefile b/net/gnet/Makefile
index ad79ea436ec5..b325252d835f 100644
--- a/net/gnet/Makefile
+++ b/net/gnet/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.gnetlibrary.org/src/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A simple network library built upon Glib
USE_REINPLACE= yes
USE_GNOMENG= yes
diff --git a/net/gnet/pkg-comment b/net/gnet/pkg-comment
deleted file mode 100644
index 4a87a43a43d2..000000000000
--- a/net/gnet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple network library built upon Glib
diff --git a/net/gnomba/Makefile b/net/gnomba/Makefile
index df4ead238077..adea6fcdcea3 100644
--- a/net/gnomba/Makefile
+++ b/net/gnomba/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomba
MAINTAINER= demon@FreeBSD.org
+COMMENT= GNOME compliant browser of SMB shares
USE_GMAKE= yes
USE_GNOMENG= yes
diff --git a/net/gnomba/pkg-comment b/net/gnomba/pkg-comment
deleted file mode 100644
index d52d7d5fb520..000000000000
--- a/net/gnomba/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME compliant browser of SMB shares
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index 36076e407407..3ee8314ab600 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gnomeicu
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME ICQ client
LIB_DEPENDS+= gnet.1:${PORTSDIR}/net/gnet
diff --git a/net/gnomeicu/pkg-comment b/net/gnomeicu/pkg-comment
deleted file mode 100644
index bb39546ca3ca..000000000000
--- a/net/gnomeicu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME ICQ client
diff --git a/net/gnomemeeting/Makefile b/net/gnomemeeting/Makefile
index 71b5e2897b07..2618b3bb7fd5 100644
--- a/net/gnomemeeting/Makefile
+++ b/net/gnomemeeting/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net gnome
MASTER_SITES= http://www.gnomemeeting.org/downloads/0.96.0/sources/
MAINTAINER= roger@FreeBSD.org
+COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting
LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
diff --git a/net/gnomemeeting/pkg-comment b/net/gnomemeeting/pkg-comment
deleted file mode 100644
index bec41f50ea5b..000000000000
--- a/net/gnomemeeting/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME H323 Video Conferencing program, similar to NetMeeting
diff --git a/net/gnomemeeting2/Makefile b/net/gnomemeeting2/Makefile
index 71b5e2897b07..2618b3bb7fd5 100644
--- a/net/gnomemeeting2/Makefile
+++ b/net/gnomemeeting2/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net gnome
MASTER_SITES= http://www.gnomemeeting.org/downloads/0.96.0/sources/
MAINTAINER= roger@FreeBSD.org
+COMMENT= GNOME H323 Video Conferencing program, similar to NetMeeting
LIB_DEPENDS= ldap.2:${PORTSDIR}/net/openldap20 \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
diff --git a/net/gnomemeeting2/pkg-comment b/net/gnomemeeting2/pkg-comment
deleted file mode 100644
index bec41f50ea5b..000000000000
--- a/net/gnomemeeting2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME H323 Video Conferencing program, similar to NetMeeting
diff --git a/net/gnometelnet/Makefile b/net/gnometelnet/Makefile
index be244d8e6c6c..fd31777adcc2 100644
--- a/net/gnometelnet/Makefile
+++ b/net/gnometelnet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cyest.org/downloads/
DISTNAME= ${PORTNAME:S/gnome/gnome-/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A nice frontend to the telnet, ssh, and rlogin clients for GNOME
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake
diff --git a/net/gnometelnet/pkg-comment b/net/gnometelnet/pkg-comment
deleted file mode 100644
index d34a5ff1496e..000000000000
--- a/net/gnometelnet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nice frontend to the telnet, ssh, and rlogin clients for GNOME
diff --git a/net/gnut/Makefile b/net/gnut/Makefile
index ae61c6dcd216..262772b6de9b 100644
--- a/net/gnut/Makefile
+++ b/net/gnut/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net audio
MASTER_SITES= http://www.gnutelliums.com/linux_unix/gnut/tars/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Text-mode client for connecting to the Gnutella distributed network
FORBIDDEN= "The distfile appears to have been withdrawn due to a vulnerability allowing injection of HTML code into the web front-end: http://www.der-keiler.de/Mailing-Lists/Securiteam/2001-09/0021.html"
diff --git a/net/gnut/pkg-comment b/net/gnut/pkg-comment
deleted file mode 100644
index cc36d573615a..000000000000
--- a/net/gnut/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text-mode client for connecting to the Gnutella distributed network
diff --git a/net/h2n/Makefile b/net/h2n/Makefile
index de8bb03f9e8e..823f76e590a3 100644
--- a/net/h2n/Makefile
+++ b/net/h2n/Makefile
@@ -14,6 +14,7 @@ DISTNAME= dns
EXTRACT_SUFX= .tar.Z
MAINTAINER= sada@FreeBSD.org
+COMMENT= Translate host table to name server file format
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/net/h2n/pkg-comment b/net/h2n/pkg-comment
deleted file mode 100644
index 247f8b8528bf..000000000000
--- a/net/h2n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translate host table to name server file format
diff --git a/net/hlmaster/Makefile b/net/hlmaster/Makefile
index cb54b6fea56b..4c6fa0340161 100644
--- a/net/hlmaster/Makefile
+++ b/net/hlmaster/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A Half-Life game master server daemon
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/net/hlmaster/pkg-comment b/net/hlmaster/pkg-comment
deleted file mode 100644
index 7d0ef7bbb728..000000000000
--- a/net/hlmaster/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Half-Life game master server daemon
diff --git a/net/host/Makefile b/net/host/Makefile
index 1c19daad9fd5..926f28d53b4e 100644
--- a/net/host/Makefile
+++ b/net/host/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An utility to query DNS servers
NO_WRKSUBDIR= yes
diff --git a/net/host/pkg-comment b/net/host/pkg-comment
deleted file mode 100644
index 818ac9c70f49..000000000000
--- a/net/host/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An utility to query DNS servers
diff --git a/net/http_ping/Makefile b/net/http_ping/Makefile
index d32458176384..b9cec807c097 100644
--- a/net/http_ping/Makefile
+++ b/net/http_ping/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.acme.com/software/http_ping/
DISTNAME= ${PORTNAME}_09jul2001
MAINTAINER= dd@FreeBSD.org
+COMMENT= Sends HTTP requests every few seconds and times how long they take
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN1= http_ping.1
diff --git a/net/http_ping/pkg-comment b/net/http_ping/pkg-comment
deleted file mode 100644
index 22a37c3d685e..000000000000
--- a/net/http_ping/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sends HTTP requests every few seconds and times how long they take
diff --git a/net/icmpmonitor/Makefile b/net/icmpmonitor/Makefile
index a3917d77da36..a60a4213b7ba 100644
--- a/net/icmpmonitor/Makefile
+++ b/net/icmpmonitor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= icmpmonitor
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A multiple host icmp monitoring tool
GNU_CONFIGURE= YES
diff --git a/net/icmpmonitor/pkg-comment b/net/icmpmonitor/pkg-comment
deleted file mode 100644
index 33df4a660529..000000000000
--- a/net/icmpmonitor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multiple host icmp monitoring tool
diff --git a/net/imm/Makefile b/net/imm/Makefile
index 4ca41dd5f326..4c071b20e263 100644
--- a/net/imm/Makefile
+++ b/net/imm/Makefile
@@ -13,6 +13,7 @@ DISTNAME= imm.source
EXTRACT_SUFX= .tar.Z
MAINTAINER= fenner@freebsd.org
+COMMENT= Internet Image(or other data) Multicaster (and receiver)
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/net/imm/pkg-comment b/net/imm/pkg-comment
deleted file mode 100644
index 3b8b83a184f7..000000000000
--- a/net/imm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Internet Image(or other data) Multicaster (and receiver)
diff --git a/net/ipcalc/Makefile b/net/ipcalc/Makefile
index 6b556c2e4e24..1ba3e5a44726 100644
--- a/net/ipcalc/Makefile
+++ b/net/ipcalc/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= # empty
EXTRACT_ONLY= # empty
MAINTAINER= petef@FreeBSD.org
+COMMENT= IP Calculator
NO_BUILD= yes
USE_PERL5= yes
diff --git a/net/ipcalc/pkg-comment b/net/ipcalc/pkg-comment
deleted file mode 100644
index 51af2d016308..000000000000
--- a/net/ipcalc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IP Calculator
diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 140779f93a15..f45d8aed8afe 100644
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://dast.nlanr.net/Projects/Iperf/
DISTNAME= iperf-1.6.5-source
MAINTAINER= smace@FreeBSD.org
+COMMENT= A tool to measure maximum TCP and UDP bandwidth
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net/iperf/pkg-comment b/net/iperf/pkg-comment
deleted file mode 100644
index 5d78b5a2f384..000000000000
--- a/net/iperf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to measure maximum TCP and UDP bandwidth
diff --git a/net/jabber-aim/Makefile b/net/jabber-aim/Makefile
index ebe21d516a63..4b331bedbf04 100644
--- a/net/jabber-aim/Makefile
+++ b/net/jabber-aim/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Jabber User Directory module
BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
diff --git a/net/jabber-aim/pkg-comment b/net/jabber-aim/pkg-comment
deleted file mode 100644
index 247740c3b84f..000000000000
--- a/net/jabber-aim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jabber User Directory module
diff --git a/net/jabber-conference/Makefile b/net/jabber-conference/Makefile
index 4cf78346e705..47baf0b25db0 100644
--- a/net/jabber-conference/Makefile
+++ b/net/jabber-conference/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Jabber Conferencing module
BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
diff --git a/net/jabber-conference/pkg-comment b/net/jabber-conference/pkg-comment
deleted file mode 100644
index 6421b6f8c423..000000000000
--- a/net/jabber-conference/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jabber Conferencing module
diff --git a/net/jabber-jud/Makefile b/net/jabber-jud/Makefile
index 167e28ffd37e..24dd97011293 100644
--- a/net/jabber-jud/Makefile
+++ b/net/jabber-jud/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= jabber-
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Jabber User Directory module
BUILD_DEPENDS= ${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
diff --git a/net/jabber-jud/pkg-comment b/net/jabber-jud/pkg-comment
deleted file mode 100644
index 247740c3b84f..000000000000
--- a/net/jabber-jud/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jabber User Directory module
diff --git a/net/jabber/Makefile b/net/jabber/Makefile
index 811439600711..363f48200c13 100644
--- a/net/jabber/Makefile
+++ b/net/jabber/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= jabber
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Online presence and instant messaging server
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/jabber/pkg-comment b/net/jabber/pkg-comment
deleted file mode 100644
index d056377943d4..000000000000
--- a/net/jabber/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Online presence and instant messaging server
diff --git a/net/jags/Makefile b/net/jags/Makefile
index 194610db4123..adaf7a674a8c 100644
--- a/net/jags/Makefile
+++ b/net/jags/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= JAGS - Just Another GTK+ Samba Client
USE_GMAKE= yes
USE_XPM= yes
diff --git a/net/jags/pkg-comment b/net/jags/pkg-comment
deleted file mode 100644
index 87587e3a83e2..000000000000
--- a/net/jags/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-JAGS - Just Another GTK+ Samba Client
diff --git a/net/jumpgate/Makefile b/net/jumpgate/Makefile
index 7dcf693d7935..70a795a7cfe5 100644
--- a/net/jumpgate/Makefile
+++ b/net/jumpgate/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://jumpgate.sourceforge.net/
MAINTAINER= leeym@FreeBSD.org
+COMMENT= TCP connection forwarder
GNU_CONFIGURE= yes
diff --git a/net/jumpgate/pkg-comment b/net/jumpgate/pkg-comment
deleted file mode 100644
index 22d07fb36bc4..000000000000
--- a/net/jumpgate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TCP connection forwarder
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile
index 893cb0b92070..433813f18c7f 100644
--- a/net/kdenetwork3/Makefile
+++ b/net/kdenetwork3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Network-related programs and modules for KDE
LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib
diff --git a/net/kdenetwork3/pkg-comment b/net/kdenetwork3/pkg-comment
deleted file mode 100644
index 1a0ea4eea7d1..000000000000
--- a/net/kdenetwork3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network-related programs and modules for KDE
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 893cb0b92070..433813f18c7f 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Network-related programs and modules for KDE
LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib
diff --git a/net/kdenetwork4/pkg-comment b/net/kdenetwork4/pkg-comment
deleted file mode 100644
index 1a0ea4eea7d1..000000000000
--- a/net/kdenetwork4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network-related programs and modules for KDE
diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile
index fde644e78a23..c9641e8b379e 100644
--- a/net/kxicq-devel/Makefile
+++ b/net/kxicq-devel/Makefile
@@ -13,6 +13,7 @@ PKGNAMESUFFIX= -devel
DISTNAME= ${PORTNAME}-cvs-kde3-${PORTVERSION}
MAINTAINER= kde@FreeBSD.org
+COMMENT= Development snapshot of an ICQ client for KDE3
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake \
autoconf:${PORTSDIR}/devel/autoconf
diff --git a/net/kxicq-devel/pkg-comment b/net/kxicq-devel/pkg-comment
deleted file mode 100644
index c4e05a761eca..000000000000
--- a/net/kxicq-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Development snapshot of an ICQ client for KDE3
diff --git a/net/l2tpd/Makefile b/net/l2tpd/Makefile
index 7b0b36f93413..2f46028f17b7 100644
--- a/net/l2tpd/Makefile
+++ b/net/l2tpd/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net
MASTER_SITES= http://www.l2tpd.org/downloads/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An implementation of the layer two tunneling protocol
USE_REINPLACE= yes
diff --git a/net/l2tpd/pkg-comment b/net/l2tpd/pkg-comment
deleted file mode 100644
index 88017ac36100..000000000000
--- a/net/l2tpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the layer two tunneling protocol
diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile
index 2c8bceef1254..c8ab51c3acaf 100644
--- a/net/lambdamoo/Makefile
+++ b/net/lambdamoo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.place.org/pub/moo/
DISTNAME= LambdaMOO-${PORTVERSION}
MAINTAINER= flathill@FreeBSD.ORG
+COMMENT= The most commonly used program to run MOOs
WRKSRC= ${WRKDIR}/MOO-${PORTVERSION}
GNU_CONFIGURE= yes
diff --git a/net/lambdamoo/pkg-comment b/net/lambdamoo/pkg-comment
deleted file mode 100644
index b92f57179e88..000000000000
--- a/net/lambdamoo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The most commonly used program to run MOOs
diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index 428dd9be4c3b..72571d246c13 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= directory/c-sdk/ldap
DISTNAME= ldapsdk_12311998
MAINTAINER= paul@FreeBSD.org
+COMMENT= Mozilla LDAP sdk
WRKSRC= ${WRKDIR}/mozilla
MAKEFILE= ${WRKSRC}/directory/ldapsdk.mk
diff --git a/net/ldapsdk/pkg-comment b/net/ldapsdk/pkg-comment
deleted file mode 100644
index 0f4a49b0032d..000000000000
--- a/net/ldapsdk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mozilla LDAP sdk
diff --git a/net/libicq/Makefile b/net/libicq/Makefile
index a5d3bd4eedfc..a1efc01ff006 100644
--- a/net/libicq/Makefile
+++ b/net/libicq/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= flathill
MAINTAINER= flathill@FreeBSD.org
+COMMENT= Library to add ICQ communication support to your software
USE_GNOMENG= yes
USE_GNOME= glib12
diff --git a/net/libicq/pkg-comment b/net/libicq/pkg-comment
deleted file mode 100644
index 0a6c793f6854..000000000000
--- a/net/libicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library to add ICQ communication support to your software
diff --git a/net/libnet-devel/Makefile b/net/libnet-devel/Makefile
index 69e3529e01f8..712e8963f49a 100644
--- a/net/libnet-devel/Makefile
+++ b/net/libnet-devel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.packetfactory.net/libnet/dist/
DISTNAME= ${PORTNAME:S/-devel$//}-${PORTVERSION}
MAINTAINER= smace@freebsd.org
+COMMENT= A C library for creating IP packets (development version)
WRKSRC= ${WRKDIR}/Libnet-latest
diff --git a/net/libnet-devel/pkg-comment b/net/libnet-devel/pkg-comment
deleted file mode 100644
index becda862b939..000000000000
--- a/net/libnet-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C library for creating IP packets (development version)
diff --git a/net/linc/Makefile b/net/linc/Makefile
index d8cdf751424d..3336c2b78713 100644
--- a/net/linc/Makefile
+++ b/net/linc/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A library for writing networked servers & clients
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20
diff --git a/net/linc/pkg-comment b/net/linc/pkg-comment
deleted file mode 100644
index ad56f28e2fee..000000000000
--- a/net/linc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for writing networked servers & clients
diff --git a/net/linphone-base/Makefile b/net/linphone-base/Makefile
index c4bc3a669ba7..b99467d2f0d5 100644
--- a/net/linphone-base/Makefile
+++ b/net/linphone-base/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://savannah.gnu.org/download/linphone/${PORTVERSION}/sources/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A web phone that supports SIP protocol
LIB_DEPENDS= osip.0:${PORTSDIR}/net/libosip \
panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
diff --git a/net/linphone-base/pkg-comment b/net/linphone-base/pkg-comment
deleted file mode 100644
index bbba22ca44fc..000000000000
--- a/net/linphone-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web phone that supports SIP protocol
diff --git a/net/linphone/Makefile b/net/linphone/Makefile
index c4bc3a669ba7..b99467d2f0d5 100644
--- a/net/linphone/Makefile
+++ b/net/linphone/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://savannah.gnu.org/download/linphone/${PORTVERSION}/sources/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A web phone that supports SIP protocol
LIB_DEPENDS= osip.0:${PORTSDIR}/net/libosip \
panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
diff --git a/net/linphone/pkg-comment b/net/linphone/pkg-comment
deleted file mode 100644
index bbba22ca44fc..000000000000
--- a/net/linphone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web phone that supports SIP protocol
diff --git a/net/linuxigd/Makefile b/net/linuxigd/Makefile
index 347056f0d8f1..68e48b73b666 100644
--- a/net/linuxigd/Makefile
+++ b/net/linuxigd/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= linux-igd
EXTRACT_SUFX= .tgz
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Linux UPnP Internet Gateway Device
LIB_DEPENDS= upnp.1:${PORTSDIR}/devel/upnp
diff --git a/net/linuxigd/pkg-comment b/net/linuxigd/pkg-comment
deleted file mode 100644
index d57f740711ad..000000000000
--- a/net/linuxigd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux UPnP Internet Gateway Device
diff --git a/net/mars_nwe/Makefile b/net/mars_nwe/Makefile
index 2045611a7ad7..271587cdf3f1 100644
--- a/net/mars_nwe/Makefile
+++ b/net/mars_nwe/Makefile
@@ -16,6 +16,7 @@ DISTNAME= mars_nwe-0.99.pl19
EXTRACT_SUFX= .tgz
MAINTAINER= bp@FreeBSD.org
+COMMENT= Netware server emulator for Un*x systems
WRKSRC= ${WRKDIR}/mars_nwe
MAKE_ENV= CC="${CC}"
diff --git a/net/mars_nwe/pkg-comment b/net/mars_nwe/pkg-comment
deleted file mode 100644
index 340ebbd1655a..000000000000
--- a/net/mars_nwe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netware server emulator for Un*x systems
diff --git a/net/mopd/Makefile b/net/mopd/Makefile
index 7696d0811364..34a72a428f0d 100644
--- a/net/mopd/Makefile
+++ b/net/mopd/Makefile
@@ -19,6 +19,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
.endif
MAINTAINER= obrien@FreeBSD.org
+COMMENT= MOP Loader Daemon for netbooting DEC machines
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
# MANDIR is concetenated to DESTDIR which all forms the man install dir...
diff --git a/net/mopd/pkg-comment b/net/mopd/pkg-comment
deleted file mode 100644
index fd7311d814e3..000000000000
--- a/net/mopd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MOP Loader Daemon for netbooting DEC machines
diff --git a/net/mpd/Makefile b/net/mpd/Makefile
index 0a082f582262..a2f0766e6cae 100644
--- a/net/mpd/Makefile
+++ b/net/mpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= archie
MAINTAINER= archie@freebsd.org
+COMMENT= Multi-link PPP daemon based on netgraph(4)
MTREE_FILE= ${FILESDIR}/mpd.mtree
MAN8= mpd.8
diff --git a/net/mpd/pkg-comment b/net/mpd/pkg-comment
deleted file mode 100644
index 34af82d1d1c2..000000000000
--- a/net/mpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-link PPP daemon based on netgraph(4)
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index 4b36b6c72348..ae4531ed95e9 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.bitwizard.nl/mtr/ \
ftp://ftp.gw.com/mirrors/pub/unix/mtr/
MAINTAINER= billf@FreeBSD.org
+COMMENT= Traceroute and ping in a single graphical network diagnostic tool
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/mtr/pkg-comment b/net/mtr/pkg-comment
deleted file mode 100644
index b0012cdef630..000000000000
--- a/net/mtr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Traceroute and ping in a single graphical network diagnostic tool
diff --git a/net/napshare/Makefile b/net/napshare/Makefile
index 8841dce0c2b2..3afe9947dd04 100644
--- a/net/napshare/Makefile
+++ b/net/napshare/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= napshare
MAINTAINER= mikeh@FreeBSD.org
+COMMENT= A GTK based Gnutella client
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/net/napshare/pkg-comment b/net/napshare/pkg-comment
deleted file mode 100644
index 93e0ec231fd9..000000000000
--- a/net/napshare/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK based Gnutella client
diff --git a/net/nbtscan/Makefile b/net/nbtscan/Makefile
index 0b4af447c825..ea5cc0fb77c1 100644
--- a/net/nbtscan/Makefile
+++ b/net/nbtscan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=kris
MAINTAINER= kris@FreeBSD.org
+COMMENT= NetBIOS name network scanner
GNU_CONFIGURE= yes
diff --git a/net/nbtscan/pkg-comment b/net/nbtscan/pkg-comment
deleted file mode 100644
index a0d0c1421c54..000000000000
--- a/net/nbtscan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NetBIOS name network scanner
diff --git a/net/netcat/Makefile b/net/netcat/Makefile
index 8e35108f123b..ec41fff0648d 100644
--- a/net/netcat/Makefile
+++ b/net/netcat/Makefile
@@ -21,6 +21,7 @@ PATCHFILES= nc-v6-20000918.patch.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Simple utility which reads and writes data across network connections
NO_WRKSUBDIR= yes
ALL_TARGET= freebsd
diff --git a/net/netcat/pkg-comment b/net/netcat/pkg-comment
deleted file mode 100644
index a8dd37a73cad..000000000000
--- a/net/netcat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple utility which reads and writes data across network connections
diff --git a/net/netspeed_applet/Makefile b/net/netspeed_applet/Makefile
index 4e868fe78296..1a533d2d73e5 100644
--- a/net/netspeed_applet/Makefile
+++ b/net/netspeed_applet/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net gnome
MASTER_SITES= http://mfcn.ilo.de/netspeed_applet/
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Applet that shows how much network traffic occurs on an interface
LIB_DEPENDS= panel-applet-2.0:${PORTSDIR}/x11/gnomepanel \
gtop-2.0:${PORTSDIR}/devel/libgtop2
diff --git a/net/netspeed_applet/pkg-comment b/net/netspeed_applet/pkg-comment
deleted file mode 100644
index 02a558bb2f47..000000000000
--- a/net/netspeed_applet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Applet that shows how much network traffic occurs on an interface
diff --git a/net/nsc/Makefile b/net/nsc/Makefile
index ab40d5d8b4f0..597411d2f587 100644
--- a/net/nsc/Makefile
+++ b/net/nsc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dirk
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Netsaint Console monitor
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Curses.pm:${PORTSDIR}/devel/p5-Curses
diff --git a/net/nsc/pkg-comment b/net/nsc/pkg-comment
deleted file mode 100644
index a4c5a26a06f5..000000000000
--- a/net/nsc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netsaint Console monitor
diff --git a/net/nslint/Makefile b/net/nslint/Makefile
index 0d04a2a3e28f..55b2a99406ba 100644
--- a/net/nslint/Makefile
+++ b/net/nslint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.a/a/}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perform consistency checks on DNS zone files
GNU_CONFIGURE= yes
ALL_TARGET= nslint
diff --git a/net/nslint/pkg-comment b/net/nslint/pkg-comment
deleted file mode 100644
index 32f06b220550..000000000000
--- a/net/nslint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perform consistency checks on DNS zone files
diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 2e72169ec72e..03a3c2a035ff 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
MAINTAINER= cy@FreeBSD.org
+COMMENT= The Network Time Protocol Distribution
# ntp's configure script created by autoconf 2.14.1 doesn't work
# if GNU_CONFIGURE is defined
diff --git a/net/ntp-devel/pkg-comment b/net/ntp-devel/pkg-comment
deleted file mode 100644
index 28e419a84d98..000000000000
--- a/net/ntp-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Network Time Protocol Distribution
diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
index d7d9cd9d47d7..98c60fe7cd80 100644
--- a/net/ntp-stable/Makefile
+++ b/net/ntp-stable/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
MAINTAINER= cy@FreeBSD.org
+COMMENT= The Network Time Protocol Distribution
# ntp's configure script created by autoconf 2.14.1 doesn't work
# if GNU_CONFIGURE is defined
diff --git a/net/ntp-stable/pkg-comment b/net/ntp-stable/pkg-comment
deleted file mode 100644
index 28e419a84d98..000000000000
--- a/net/ntp-stable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Network Time Protocol Distribution
diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index d7d9cd9d47d7..98c60fe7cd80 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.udel.edu/pub/ntp/ntp4/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/}
MAINTAINER= cy@FreeBSD.org
+COMMENT= The Network Time Protocol Distribution
# ntp's configure script created by autoconf 2.14.1 doesn't work
# if GNU_CONFIGURE is defined
diff --git a/net/ntp/pkg-comment b/net/ntp/pkg-comment
deleted file mode 100644
index 28e419a84d98..000000000000
--- a/net/ntp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Network Time Protocol Distribution
diff --git a/net/nttcp/Makefile b/net/nttcp/Makefile
index 11caf18dda60..3b5ee3b308ef 100644
--- a/net/nttcp/Makefile
+++ b/net/nttcp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.leo.org/~bartel/nttcp/ \
MASTER_SITE_SUBDIR= billf
MAINTAINER= billf@FreeBSD.org
+COMMENT= A client/server program for testing network performance
ALL_TARGET= nttcp
MAN1= nttcp.1
diff --git a/net/nttcp/pkg-comment b/net/nttcp/pkg-comment
deleted file mode 100644
index 24a2539e003c..000000000000
--- a/net/nttcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A client/server program for testing network performance
diff --git a/net/obnc/Makefile b/net/obnc/Makefile
index c73124a8ed04..dd43c6cbc120 100644
--- a/net/obnc/Makefile
+++ b/net/obnc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
+COMMENT= OpenBSD's netcat: cleaner code, familiar interface, IPv6 support
MANSECTS= 1
MAN1= nc.1
diff --git a/net/obnc/pkg-comment b/net/obnc/pkg-comment
deleted file mode 100644
index a18fef9f8de1..000000000000
--- a/net/obnc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenBSD's netcat: cleaner code, familiar interface, IPv6 support
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index b9e9152c552e..dae07e501018 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.openh323.org/bin/ \
DISTNAME= ohphone_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
+COMMENT= H323 Video Conferencing Program, compatible with NetMeeting
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/ohphone/pkg-comment b/net/ohphone/pkg-comment
deleted file mode 100644
index 1b66c062a97b..000000000000
--- a/net/ohphone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-H323 Video Conferencing Program, compatible with NetMeeting
diff --git a/net/opal/Makefile b/net/opal/Makefile
index c0809c24d7c8..e16e71a4781c 100644
--- a/net/opal/Makefile
+++ b/net/opal/Makefile
@@ -16,6 +16,7 @@ DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
MAINTAINER= roger@freebsd.org
+COMMENT= A H323 Video Conferencing library, used with OhPhone
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/net/opal/pkg-comment b/net/opal/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/opal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/opal3/Makefile b/net/opal3/Makefile
index c0809c24d7c8..e16e71a4781c 100644
--- a/net/opal3/Makefile
+++ b/net/opal3/Makefile
@@ -16,6 +16,7 @@ DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
MAINTAINER= roger@freebsd.org
+COMMENT= A H323 Video Conferencing library, used with OhPhone
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/net/opal3/pkg-comment b/net/opal3/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/opal3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/openam/Makefile b/net/openam/Makefile
index 14e1191abc21..1a45ed43c998 100644
--- a/net/openam/Makefile
+++ b/net/openam/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.openh323.org/bin/ \
DISTNAME= openam_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
+COMMENT= H323 Answer Machine
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/openam/pkg-comment b/net/openam/pkg-comment
deleted file mode 100644
index 561962bddfa6..000000000000
--- a/net/openam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-H323 Answer Machine
diff --git a/net/opengatekeeper/Makefile b/net/opengatekeeper/Makefile
index 5537ff1d7270..66171ecb824a 100644
--- a/net/opengatekeeper/Makefile
+++ b/net/opengatekeeper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://download.sourceforge.net/OpenGatekeeper/
DISTNAME= opengate_0.9alpha4
MAINTAINER= roger@FreeBSD.org
+COMMENT= H323 GateKeeper (MPL Licence) for OpenH323 OhPhone and NetMeeting
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/opengatekeeper/pkg-comment b/net/opengatekeeper/pkg-comment
deleted file mode 100644
index 42d4d0aedb45..000000000000
--- a/net/opengatekeeper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-H323 GateKeeper (MPL Licence) for OpenH323 OhPhone and NetMeeting
diff --git a/net/opengk/Makefile b/net/opengk/Makefile
index 15e567fc37f2..66ca17912ed9 100644
--- a/net/opengk/Makefile
+++ b/net/opengk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.openh323.org/bin/ \
DISTNAME= opengk_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
+COMMENT= Equivalence's H323 GateKeeper for OpenH323 OhPhone and NetMeeting
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/opengk/pkg-comment b/net/opengk/pkg-comment
deleted file mode 100644
index a0734749b9db..000000000000
--- a/net/opengk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Equivalence's H323 GateKeeper for OpenH323 OhPhone and NetMeeting
diff --git a/net/openh323-112/Makefile b/net/openh323-112/Makefile
index c0809c24d7c8..e16e71a4781c 100644
--- a/net/openh323-112/Makefile
+++ b/net/openh323-112/Makefile
@@ -16,6 +16,7 @@ DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
MAINTAINER= roger@freebsd.org
+COMMENT= A H323 Video Conferencing library, used with OhPhone
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/net/openh323-112/pkg-comment b/net/openh323-112/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/openh323-112/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index c0809c24d7c8..e16e71a4781c 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -16,6 +16,7 @@ DISTFILES= openh323_1.11.2.tar.gz \
pwlib_1.4.7.tar.gz
MAINTAINER= roger@freebsd.org
+COMMENT= A H323 Video Conferencing library, used with OhPhone
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/net/openh323/pkg-comment b/net/openh323/pkg-comment
deleted file mode 100644
index cef461a24fb2..000000000000
--- a/net/openh323/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A H323 Video Conferencing library, used with OhPhone
diff --git a/net/openh323proxy/Makefile b/net/openh323proxy/Makefile
index da319175ba67..15078bc71942 100644
--- a/net/openh323proxy/Makefile
+++ b/net/openh323proxy/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= roger@FreeBSD.org
+COMMENT= Proxy for H323 Videoconferencing app (OhPhone,GnomeMeeting,NetMeeting)
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/openh323proxy/pkg-comment b/net/openh323proxy/pkg-comment
deleted file mode 100644
index 5e3073a2aea3..000000000000
--- a/net/openh323proxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Proxy for H323 Videoconferencing app (OhPhone,GnomeMeeting,NetMeeting)
diff --git a/net/openmcu/Makefile b/net/openmcu/Makefile
index 681740d9b345..9efb66ab7256 100644
--- a/net/openmcu/Makefile
+++ b/net/openmcu/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.openh323.org/bin/ \
DISTNAME= openmcu_${PORTVERSION}
MAINTAINER= roger@FreeBSD.org
+COMMENT= OpenMCU hosts a conference call for H323 Video Conferencing users
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/net/openh323:build
diff --git a/net/openmcu/pkg-comment b/net/openmcu/pkg-comment
deleted file mode 100644
index 6a3368dddf95..000000000000
--- a/net/openmcu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenMCU hosts a conference call for H323 Video Conferencing users
diff --git a/net/ossp-sa/Makefile b/net/ossp-sa/Makefile
index 1b8089b297af..f36defcc0403 100644
--- a/net/ossp-sa/Makefile
+++ b/net/ossp-sa/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.ossp.org/pkg/lib/sa/
PKGNAMEPREFIX= ossp-
MAINTAINER= alane@FreeBSD.org
+COMMENT= An abstraction library for the Unix socket API
USE_GNAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/ossp-sa/pkg-comment b/net/ossp-sa/pkg-comment
deleted file mode 100644
index 7dee5ee1842b..000000000000
--- a/net/ossp-sa/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An abstraction library for the Unix socket API
diff --git a/net/p5-File-Rsync/Makefile b/net/p5-File-Rsync/Makefile
index 6b9d0ad1680c..95fde83b1f49 100644
--- a/net/p5-File-Rsync/Makefile
+++ b/net/p5-File-Rsync/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl convenience wrapper for the rsync(1) program
RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
diff --git a/net/p5-File-Rsync/pkg-comment b/net/p5-File-Rsync/pkg-comment
deleted file mode 100644
index 48cf5dd71426..000000000000
--- a/net/p5-File-Rsync/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl convenience wrapper for the rsync(1) program
diff --git a/net/p5-Frontier-RPC/Makefile b/net/p5-Frontier-RPC/Makefile
index b3d7a14dc67f..bc541c6169b8 100644
--- a/net/p5-Frontier-RPC/Makefile
+++ b/net/p5-Frontier-RPC/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= Frontier
PKGNAMEPREFIX= p5-
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Frontier::RPC implements UserLand Software's XML RPC
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww
diff --git a/net/p5-Frontier-RPC/pkg-comment b/net/p5-Frontier-RPC/pkg-comment
deleted file mode 100644
index e303535ae1fd..000000000000
--- a/net/p5-Frontier-RPC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Frontier::RPC implements UserLand Software's XML RPC
diff --git a/net/p5-Geo-IP/Makefile b/net/p5-Geo-IP/Makefile
index eb67e237e323..4ea72748ae25 100644
--- a/net/p5-Geo-IP/Makefile
+++ b/net/p5-Geo-IP/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Geo
PKGNAMEPREFIX= p5-
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Gets country name by IP or hostname
LIB_DEPENDS= GeoIP.2:${PORTSDIR}/net/GeoIP
diff --git a/net/p5-Geo-IP/pkg-comment b/net/p5-Geo-IP/pkg-comment
deleted file mode 100644
index c0ffc2f8436a..000000000000
--- a/net/p5-Geo-IP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gets country name by IP or hostname
diff --git a/net/p5-IO-Interface/Makefile b/net/p5-IO-Interface/Makefile
index 7f65b400cc4f..981b4f427ead 100644
--- a/net/p5-IO-Interface/Makefile
+++ b/net/p5-IO-Interface/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension for access to network card configuration information
PERL_CONFIGURE= yes
diff --git a/net/p5-IO-Interface/pkg-comment b/net/p5-IO-Interface/pkg-comment
deleted file mode 100644
index f66ee23f69b2..000000000000
--- a/net/p5-IO-Interface/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for access to network card configuration information
diff --git a/net/p5-JUNOScript/Makefile b/net/p5-JUNOScript/Makefile
index b2b70e60f804..e25502cd08d2 100644
--- a/net/p5-JUNOScript/Makefile
+++ b/net/p5-JUNOScript/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= junoscript-perl-${PORTVERSION}-domestic
MAINTAINER= jesper@FreeBSD.org
+COMMENT= API to exchange information with Juniper Networks routers
PERL_BASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2 \
diff --git a/net/p5-JUNOScript/pkg-comment b/net/p5-JUNOScript/pkg-comment
deleted file mode 100644
index dcb6dbb2f93b..000000000000
--- a/net/p5-JUNOScript/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-API to exchange information with Juniper Networks routers
diff --git a/net/p5-Net-AIM/Makefile b/net/p5-Net-AIM/Makefile
index 766f1b0530ec..ed7be7accb4b 100644
--- a/net/p5-Net-AIM/Makefile
+++ b/net/p5-Net-AIM/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl extension for the AOL Instant Messenger TOC protocol
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-AIM/pkg-comment b/net/p5-Net-AIM/pkg-comment
deleted file mode 100644
index a21e5ac22016..000000000000
--- a/net/p5-Net-AIM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for the AOL Instant Messenger TOC protocol
diff --git a/net/p5-Net-BGP/Makefile b/net/p5-Net-BGP/Makefile
index 16b82d90ec98..18687cce4ea3 100644
--- a/net/p5-Net-BGP/Makefile
+++ b/net/p5-Net-BGP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Border Gateway Protocol version 4 speaker/listener library
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-BGP/pkg-comment b/net/p5-Net-BGP/pkg-comment
deleted file mode 100644
index 634e66e4f15f..000000000000
--- a/net/p5-Net-BGP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Border Gateway Protocol version 4 speaker/listener library
diff --git a/net/p5-Net-BGP4/Makefile b/net/p5-Net-BGP4/Makefile
index 16b82d90ec98..18687cce4ea3 100644
--- a/net/p5-Net-BGP4/Makefile
+++ b/net/p5-Net-BGP4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Border Gateway Protocol version 4 speaker/listener library
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-BGP4/pkg-comment b/net/p5-Net-BGP4/pkg-comment
deleted file mode 100644
index 634e66e4f15f..000000000000
--- a/net/p5-Net-BGP4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Border Gateway Protocol version 4 speaker/listener library
diff --git a/net/p5-Net-DNS-ZoneFile/Makefile b/net/p5-Net-DNS-ZoneFile/Makefile
index d254bdb045b4..37911b11b556 100644
--- a/net/p5-Net-DNS-ZoneFile/Makefile
+++ b/net/p5-Net-DNS-ZoneFile/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension to convert a zone file to a collection of RRs
BUILD_DEPENDS= ${SITE_PERL}/Net/DNS/RR.pm:${PORTSDIR}/net/p5-Net-DNS \
${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple \
diff --git a/net/p5-Net-DNS-ZoneFile/pkg-comment b/net/p5-Net-DNS-ZoneFile/pkg-comment
deleted file mode 100644
index 55832711cb08..000000000000
--- a/net/p5-Net-DNS-ZoneFile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension to convert a zone file to a collection of RRs
diff --git a/net/p5-Net-DNS/Makefile b/net/p5-Net-DNS/Makefile
index ab79a0a6c31b..19f02b700006 100644
--- a/net/p5-Net-DNS/Makefile
+++ b/net/p5-Net-DNS/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Perl5 interface to the DNS resolver, and dymanic updates
# Warnings during build are harmless, the port does not need these to build
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Digest/HMAC_MD5.pm:${PORTSDIR}/security/p5-Digest-HMAC
diff --git a/net/p5-Net-DNS/pkg-comment b/net/p5-Net-DNS/pkg-comment
deleted file mode 100644
index f26aa35b1375..000000000000
--- a/net/p5-Net-DNS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to the DNS resolver, and dymanic updates
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index e6c31ce12c9a..c6a3877009ee 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.ORG
+COMMENT= Perl5 extension for portable daemons
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-Daemon/pkg-comment b/net/p5-Net-Daemon/pkg-comment
deleted file mode 100644
index 67f09acb0266..000000000000
--- a/net/p5-Net-Daemon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 extension for portable daemons
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index c24215e58743..7d556aa10588 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= simple OOP-ish interface to the Google SOAP API
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/SOAP/Lite.pm:${PORTSDIR}/net/p5-SOAP-Lite
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-Net-Google/pkg-comment b/net/p5-Net-Google/pkg-comment
deleted file mode 100644
index a67065585b63..000000000000
--- a/net/p5-Net-Google/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-simple OOP-ish interface to the Google SOAP API
diff --git a/net/p5-Net-ICQ2000/Makefile b/net/p5-Net-ICQ2000/Makefile
index e59fa9a069b2..880b7cffddd6 100644
--- a/net/p5-Net-ICQ2000/Makefile
+++ b/net/p5-Net-ICQ2000/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://gonzo.kiev.ua/projects/vicq/
PKGNAMEPREFIX= p5-
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A perl5 module for ICQv7 protocol realisation
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-ICQ2000/pkg-comment b/net/p5-Net-ICQ2000/pkg-comment
deleted file mode 100644
index 2d8015733c9c..000000000000
--- a/net/p5-Net-ICQ2000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module for ICQv7 protocol realisation
diff --git a/net/p5-Net-Radius/Makefile b/net/p5-Net-Radius/Makefile
index 8429becfc811..16688a073f2a 100644
--- a/net/p5-Net-Radius/Makefile
+++ b/net/p5-Net-Radius/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= kbyanc@FreeBSD.org
+COMMENT= A perl module to manipulate RADIUS packets
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-Net-Radius/pkg-comment b/net/p5-Net-Radius/pkg-comment
deleted file mode 100644
index 1fc9eda7a727..000000000000
--- a/net/p5-Net-Radius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module to manipulate RADIUS packets
diff --git a/net/p5-Net-SMPP/Makefile b/net/p5-Net-SMPP/Makefile
index f07da4229a71..9961211e9179 100644
--- a/net/p5-Net-SMPP/Makefile
+++ b/net/p5-Net-SMPP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= jhay@FreeBSD.org
+COMMENT= Net::SMPP - pure Perl implementation of SMPP 3.4 over TCP
PERL_CONFIGURE= yes
diff --git a/net/p5-Net-SMPP/pkg-comment b/net/p5-Net-SMPP/pkg-comment
deleted file mode 100644
index 9714e82ee048..000000000000
--- a/net/p5-Net-SMPP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Net::SMPP - pure Perl implementation of SMPP 3.4 over TCP
diff --git a/net/p5-Net-SSH-Perl/Makefile b/net/p5-Net-SSH-Perl/Makefile
index 16c53c214ccb..cf1ea6564333 100644
--- a/net/p5-Net-SSH-Perl/Makefile
+++ b/net/p5-Net-SSH-Perl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= jesper@FreeBSD.org
+COMMENT= Perl5 module implements both the SSH1 and SSH2 protocols
NO_PACKAGE= "Runaway package build"
diff --git a/net/p5-Net-SSH-Perl/pkg-comment b/net/p5-Net-SSH-Perl/pkg-comment
deleted file mode 100644
index 18f06d1fe636..000000000000
--- a/net/p5-Net-SSH-Perl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module implements both the SSH1 and SSH2 protocols
diff --git a/net/p5-Net-Traceroute6/Makefile b/net/p5-Net-Traceroute6/Makefile
index 05307307bd7c..d309c18bac09 100644
--- a/net/p5-Net-Traceroute6/Makefile
+++ b/net/p5-Net-Traceroute6/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module to parse traceroute6(8) output
PERL_CONFIGURE= YES
diff --git a/net/p5-Net-Traceroute6/pkg-comment b/net/p5-Net-Traceroute6/pkg-comment
deleted file mode 100644
index b95eecfa50dd..000000000000
--- a/net/p5-Net-Traceroute6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to parse traceroute6(8) output
diff --git a/net/p5-Net-Whois-Raw/Makefile b/net/p5-Net-Whois-Raw/Makefile
index 509407025bf1..598e3e3bdcef 100644
--- a/net/p5-Net-Whois-Raw/Makefile
+++ b/net/p5-Net-Whois-Raw/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
+COMMENT= Very simple Perl interface to query raw whois data
PERL_CONFIGURE= yes
INSTALL_TARGET= pure_install
diff --git a/net/p5-Net-Whois-Raw/pkg-comment b/net/p5-Net-Whois-Raw/pkg-comment
deleted file mode 100644
index 67d970512634..000000000000
--- a/net/p5-Net-Whois-Raw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Very simple Perl interface to query raw whois data
diff --git a/net/p5-Net-Whois/Makefile b/net/p5-Net-Whois/Makefile
index 4038e355f74e..f751423b5966 100644
--- a/net/p5-Net-Whois/Makefile
+++ b/net/p5-Net-Whois/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= A perl5 module to get information using the Whois protocol
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Locale/Country.pm:${PORTSDIR}/misc/p5-Locale-Codes
diff --git a/net/p5-Net-Whois/pkg-comment b/net/p5-Net-Whois/pkg-comment
deleted file mode 100644
index 7308a61a9ba5..000000000000
--- a/net/p5-Net-Whois/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module to get information using the Whois protocol
diff --git a/net/p5-Net-XWhois/Makefile b/net/p5-Net-XWhois/Makefile
index b8a95a9956df..0188796eae18 100644
--- a/net/p5-Net-XWhois/Makefile
+++ b/net/p5-Net-XWhois/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Whois Client Interface for Perl5
PERL_CONFIGURE= YES
diff --git a/net/p5-Net-XWhois/pkg-comment b/net/p5-Net-XWhois/pkg-comment
deleted file mode 100644
index 414230d8b6da..000000000000
--- a/net/p5-Net-XWhois/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Whois Client Interface for Perl5
diff --git a/net/p5-Net-Z3950-SimpleServer/Makefile b/net/p5-Net-Z3950-SimpleServer/Makefile
index 8a68067d761b..d29b3087f59a 100644
--- a/net/p5-Net-Z3950-SimpleServer/Makefile
+++ b/net/p5-Net-Z3950-SimpleServer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ftp.indexdata.dk/pub/simpleserver/
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= A Perl module for developing Z39.50 servers
LIB_DEPENDS= yaz.2:${PORTSDIR}/net/yaz
diff --git a/net/p5-Net-Z3950-SimpleServer/pkg-comment b/net/p5-Net-Z3950-SimpleServer/pkg-comment
deleted file mode 100644
index bd01436c415d..000000000000
--- a/net/p5-Net-Z3950-SimpleServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl module for developing Z39.50 servers
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 240760e8067e..ec0b4cda9325 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= Net
DISTNAME= libnet-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 modules to access and use network protocols
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/Authen/SASL.pm:${PORTSDIR}/security/p5-Authen-SASL \
${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
diff --git a/net/p5-Net/pkg-comment b/net/p5-Net/pkg-comment
deleted file mode 100644
index c50a4b89717d..000000000000
--- a/net/p5-Net/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 modules to access and use network protocols
diff --git a/net/p5-NetAddr-IP-Count/Makefile b/net/p5-NetAddr-IP-Count/Makefile
index e44bfc59fc66..d8006e19dbc1 100644
--- a/net/p5-NetAddr-IP-Count/Makefile
+++ b/net/p5-NetAddr-IP-Count/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= NetAddr
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= NetAddr::IP::Count - Count hosts in named subnets
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-NetAddr-IP-Count/pkg-comment b/net/p5-NetAddr-IP-Count/pkg-comment
deleted file mode 100644
index 220a9d580018..000000000000
--- a/net/p5-NetAddr-IP-Count/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NetAddr::IP::Count - Count hosts in named subnets
diff --git a/net/p5-NetAddr-IP/Makefile b/net/p5-NetAddr-IP/Makefile
index 140bb7b7b12d..a9f654cf2744 100644
--- a/net/p5-NetAddr-IP/Makefile
+++ b/net/p5-NetAddr-IP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= NetAddr
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for working with IP addresses and blocks thereof
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-NetAddr-IP/pkg-comment b/net/p5-NetAddr-IP/pkg-comment
deleted file mode 100644
index 59f71b01edd5..000000000000
--- a/net/p5-NetAddr-IP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for working with IP addresses and blocks thereof
diff --git a/net/p5-POE-Component-RRDTool/Makefile b/net/p5-POE-Component-RRDTool/Makefile
index c383cf859b56..837deba5e469 100644
--- a/net/p5-POE-Component-RRDTool/Makefile
+++ b/net/p5-POE-Component-RRDTool/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE interface to Round Robin Database Tools
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/bin/rrdtool:${PORTSDIR}/net/rrdtool
diff --git a/net/p5-POE-Component-RRDTool/pkg-comment b/net/p5-POE-Component-RRDTool/pkg-comment
deleted file mode 100644
index f3231ec1d92f..000000000000
--- a/net/p5-POE-Component-RRDTool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE interface to Round Robin Database Tools
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index 430ea4dbc1de..0bbf0e053f3d 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= RPC
PKGNAMEPREFIX= p5-
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Perl module for writing RPC servers and clients
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/Daemon.pm:${PORTSDIR}/net/p5-Net-Daemon
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-PlRPC/pkg-comment b/net/p5-PlRPC/pkg-comment
deleted file mode 100644
index f730afde2f33..000000000000
--- a/net/p5-PlRPC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for writing RPC servers and clients
diff --git a/net/p5-SNMP-Util/Makefile b/net/p5-SNMP-Util/Makefile
index 9fac043b72c0..4072c6530360 100644
--- a/net/p5-SNMP-Util/Makefile
+++ b/net/p5-SNMP-Util/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= SNMP
PKGNAMEPREFIX= p5-
MAINTAINER= fenner@FreeBSD.org
+COMMENT= Perl modules to perform SNMP set,get,walk,next,walk_hash etc
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/SNMP.pm:${PORTSDIR}/net/p5-SNMP
diff --git a/net/p5-SNMP-Util/pkg-comment b/net/p5-SNMP-Util/pkg-comment
deleted file mode 100644
index 94b7a9342c00..000000000000
--- a/net/p5-SNMP-Util/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules to perform SNMP set,get,walk,next,walk_hash etc
diff --git a/net/p5-SNMP_Session/Makefile b/net/p5-SNMP_Session/Makefile
index f4fb649baa1e..da16d108b03f 100644
--- a/net/p5-SNMP_Session/Makefile
+++ b/net/p5-SNMP_Session/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= . old
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A perl5 module providing rudimentary access to SNMPv1 and v2 agents
PERL_CONFIGURE= yes
diff --git a/net/p5-SNMP_Session/pkg-comment b/net/p5-SNMP_Session/pkg-comment
deleted file mode 100644
index 382d3f9bcee1..000000000000
--- a/net/p5-SNMP_Session/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module providing rudimentary access to SNMPv1 and v2 agents
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 2acd3a6a20a8..b49ce9229f28 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= SOAP
PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
+COMMENT= SOAP::Lite - Client and server side SOAP implementation
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Lite.pm:${PORTSDIR}/mail/p5-MIME-Lite \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/MIME/Tools.pm:${PORTSDIR}/mail/p5-MIME-Tools \
diff --git a/net/p5-SOAP-Lite/pkg-comment b/net/p5-SOAP-Lite/pkg-comment
deleted file mode 100644
index 8d408093e769..000000000000
--- a/net/p5-SOAP-Lite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SOAP::Lite - Client and server side SOAP implementation
diff --git a/net/p5-Socks/Makefile b/net/p5-Socks/Makefile
index 0bdf5955a8aa..3b4162bb6076 100644
--- a/net/p5-Socks/Makefile
+++ b/net/p5-Socks/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Perl5 module to communicate with socks v4 and v5 servers
PERL_CONFIGURE= yes
diff --git a/net/p5-Socks/pkg-comment b/net/p5-Socks/pkg-comment
deleted file mode 100644
index 55146b52b81d..000000000000
--- a/net/p5-Socks/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to communicate with socks v4 and v5 servers
diff --git a/net/p5-Tie-NetAddr-IP/Makefile b/net/p5-Tie-NetAddr-IP/Makefile
index 922e03f65c44..ce16babef13b 100644
--- a/net/p5-Tie-NetAddr-IP/Makefile
+++ b/net/p5-Tie-NetAddr-IP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Tie::NetAddr::IP - Implements a Hash where the key is a subnet
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/net/p5-Tie-NetAddr-IP/pkg-comment b/net/p5-Tie-NetAddr-IP/pkg-comment
deleted file mode 100644
index 0b23d2661afb..000000000000
--- a/net/p5-Tie-NetAddr-IP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tie::NetAddr::IP - Implements a Hash where the key is a subnet
diff --git a/net/p5-perl-ldap/Makefile b/net/p5-perl-ldap/Makefile
index 73c38e17e792..7cfba50b6f82 100644
--- a/net/p5-perl-ldap/Makefile
+++ b/net/p5-perl-ldap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Net
PKGNAMEPREFIX= p5-
MAINTAINER= scrappy@FreeBSD.org
+COMMENT= A Client interface to LDAP servers
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Convert/ASN1.pm:${PORTSDIR}/converters/p5-Convert-ASN1 \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI/ldap.pm:${PORTSDIR}/net/p5-URI \
diff --git a/net/p5-perl-ldap/pkg-comment b/net/p5-perl-ldap/pkg-comment
deleted file mode 100644
index febf62e7a0bd..000000000000
--- a/net/p5-perl-ldap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Client interface to LDAP servers
diff --git a/net/passlogd/Makefile b/net/passlogd/Makefile
index dd79e334d791..41d3294c5180 100644
--- a/net/passlogd/Makefile
+++ b/net/passlogd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.morphine.com/src/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Intercept and dump syslog remote log packets
USE_REINPLACE= yes
diff --git a/net/passlogd/pkg-comment b/net/passlogd/pkg-comment
deleted file mode 100644
index c49a0bc1a1e2..000000000000
--- a/net/passlogd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Intercept and dump syslog remote log packets
diff --git a/net/perldap/Makefile b/net/perldap/Makefile
index 50815198ecc0..91c458430f19 100644
--- a/net/perldap/Makefile
+++ b/net/perldap/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= directory/perldap
EXTRACT_SUFX= .tar.gz
MAINTAINER= paul@FreeBSD.org
+COMMENT= Perl interface to LDAP
LIB_DEPENDS= mozldap.1:${PORTSDIR}/net/ldapsdk
diff --git a/net/perldap/pkg-comment b/net/perldap/pkg-comment
deleted file mode 100644
index df262b0095a7..000000000000
--- a/net/perldap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to LDAP
diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile
index c53b63b95796..d8d91729d4a1 100644
--- a/net/pim6dd/Makefile
+++ b/net/pim6dd/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
MAINTAINER= suz@FreeBSD.org
+COMMENT= PIM for IPv6 dense mode daemon
NO_CDROM= "Cannot be sold for profit"
diff --git a/net/pim6dd/pkg-comment b/net/pim6dd/pkg-comment
deleted file mode 100644
index 8bdd06bbc9fc..000000000000
--- a/net/pim6dd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PIM for IPv6 dense mode daemon
diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index c22427aebbc4..bd0b6cfcf132 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= net ipv6
MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
MAINTAINER= suz@FreeBSD.org
+COMMENT= PIM for IPv6 sparse mode daemon
NO_CDROM= "Cannot be sold for profit"
diff --git a/net/pim6sd/pkg-comment b/net/pim6sd/pkg-comment
deleted file mode 100644
index f99ebb8379e1..000000000000
--- a/net/pim6sd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PIM for IPv6 sparse mode daemon
diff --git a/net/pipsecd/Makefile b/net/pipsecd/Makefile
index 27a45fac0a64..c72b99fa5322 100644
--- a/net/pipsecd/Makefile
+++ b/net/pipsecd/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.enst.fr/~beyssac/pipsec/ \
DISTNAME= pipsec-19991014
MAINTAINER= cy@FreeBSD.org
+COMMENT= Simple IPSEC tunnel tool from Pierre Beyssac
USE_OPENSSL= YES
diff --git a/net/pipsecd/pkg-comment b/net/pipsecd/pkg-comment
deleted file mode 100644
index 6e54dba314f5..000000000000
--- a/net/pipsecd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple IPSEC tunnel tool from Pierre Beyssac
diff --git a/net/pppoa/Makefile b/net/pppoa/Makefile
index 2d41471db35f..916454ccd28e 100644
--- a/net/pppoa/Makefile
+++ b/net/pppoa/Makefile
@@ -17,6 +17,7 @@ MASTER_SITE_SUBDIR= speedtouch
DISTFILES= ${SPEEDTOUCH}.tar.gz ${ALCATELDRIVER}
MAINTAINER= brian@FreeBSD.org
+COMMENT= Run PPP over Alcatel's USB Speedtouch device
HAS_CONFIGURE= yes
SPEEDTOUCH= speedtouch-1.1b
diff --git a/net/pppoa/pkg-comment b/net/pppoa/pkg-comment
deleted file mode 100644
index ee5fbb570cd8..000000000000
--- a/net/pppoa/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Run PPP over Alcatel's USB Speedtouch device
diff --git a/net/pvm/Makefile b/net/pvm/Makefile
index 5ac6ff7e50bf..1a3e8fd19f3c 100644
--- a/net/pvm/Makefile
+++ b/net/pvm/Makefile
@@ -14,6 +14,7 @@ DISTNAME= pvm${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= Parallel Virtual Machine libraries and environment
.if defined(WITHOUT_X11)
PKGNAMESUFFIX= -nox11
diff --git a/net/pvm/pkg-comment b/net/pvm/pkg-comment
deleted file mode 100644
index 4d614c2a876b..000000000000
--- a/net/pvm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Parallel Virtual Machine libraries and environment
diff --git a/net/pxe/Makefile b/net/pxe/Makefile
index 111ebe1893af..b16a751ef508 100644
--- a/net/pxe/Makefile
+++ b/net/pxe/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.kano.org.uk/projects/pxe/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= anders@FreeBSD.org
+COMMENT= PXE daemon, set up a boot menu for netbooting PXE enabled clients
GNU_CONFIGURE= yes
USE_REINPLACE= yes
diff --git a/net/pxe/pkg-comment b/net/pxe/pkg-comment
deleted file mode 100644
index c957071780a8..000000000000
--- a/net/pxe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PXE daemon, set up a boot menu for netbooting PXE enabled clients
diff --git a/net/py-soapy/Makefile b/net/py-soapy/Makefile
index c132616555e9..69769ab294a0 100644
--- a/net/py-soapy/Makefile
+++ b/net/py-soapy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= SOAP/XML schema library for Python
RUN_DEPENDS= ${PYXML}
diff --git a/net/py-soapy/pkg-comment b/net/py-soapy/pkg-comment
deleted file mode 100644
index 5be081ad2d92..000000000000
--- a/net/py-soapy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SOAP/XML schema library for Python
diff --git a/net/py-xmlrpclib/Makefile b/net/py-xmlrpclib/Makefile
index ba216931ebb2..5a6a8ce37384 100644
--- a/net/py-xmlrpclib/Makefile
+++ b/net/py-xmlrpclib/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= xmlrpc-${PORTVERSION}-010226
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A Python implementation of the XML-RPC protocol
USE_PYTHON= yes
USE_ZIP= yes
diff --git a/net/py-xmlrpclib/pkg-comment b/net/py-xmlrpclib/pkg-comment
deleted file mode 100644
index 24926faafa7a..000000000000
--- a/net/py-xmlrpclib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python implementation of the XML-RPC protocol
diff --git a/net/py-zsi-devel/Makefile b/net/py-zsi-devel/Makefile
index fe6dea929410..26191c37a11a 100644
--- a/net/py-zsi-devel/Makefile
+++ b/net/py-zsi-devel/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME:U}-${PORTVERSION:C|\.([^.]*)$|-\1|}
EXTRACT_SUFX= .tgz
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A pure Python module that provides an implementation of SOAP 1.1
RUN_DEPENDS= ${PYXML}
diff --git a/net/py-zsi-devel/pkg-comment b/net/py-zsi-devel/pkg-comment
deleted file mode 100644
index 5a6b2fb86eda..000000000000
--- a/net/py-zsi-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pure Python module that provides an implementation of SOAP 1.1
diff --git a/net/py-zsi/Makefile b/net/py-zsi/Makefile
index fe6dea929410..26191c37a11a 100644
--- a/net/py-zsi/Makefile
+++ b/net/py-zsi/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME:U}-${PORTVERSION:C|\.([^.]*)$|-\1|}
EXTRACT_SUFX= .tgz
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A pure Python module that provides an implementation of SOAP 1.1
RUN_DEPENDS= ${PYXML}
diff --git a/net/py-zsi/pkg-comment b/net/py-zsi/pkg-comment
deleted file mode 100644
index 5a6b2fb86eda..000000000000
--- a/net/py-zsi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pure Python module that provides an implementation of SOAP 1.1
diff --git a/net/radreport/Makefile b/net/radreport/Makefile
index 548eec3b5006..c54f5f44c1a2 100644
--- a/net/radreport/Makefile
+++ b/net/radreport/Makefile
@@ -14,6 +14,7 @@ DISTNAME= radreport
EXTRACT_SUFX=
MAINTAINER= kbyanc@FreeBSD.org
+COMMENT= Perl script for processing radius logs
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/net/radreport/pkg-comment b/net/radreport/pkg-comment
deleted file mode 100644
index 994928bee7a8..000000000000
--- a/net/radreport/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script for processing radius logs
diff --git a/net/radvd/Makefile b/net/radvd/Makefile
index b70431487c3b..05202787fdf8 100644
--- a/net/radvd/Makefile
+++ b/net/radvd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://v6web.litech.org/radvd/dist/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p4/pl4/}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A Linux/BSD IPv6 router advertisement daemon
GNU_CONFIGURE= yes
diff --git a/net/radvd/pkg-comment b/net/radvd/pkg-comment
deleted file mode 100644
index cf5c838d1e3b..000000000000
--- a/net/radvd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Linux/BSD IPv6 router advertisement daemon
diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index a13a1ef72116..b63f9f00e5fb 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.magnicomp.com/download/rdist/ \
ftp://ftp.sunet.se/pub/unix/admin/mirror-magnicomp/download/rdist/
MAINTAINER= ports@FreeBSD.org
+COMMENT= A network file distribution/synchronisation utility
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 400000
diff --git a/net/rdist6/pkg-comment b/net/rdist6/pkg-comment
deleted file mode 100644
index 9bc4ff5e0051..000000000000
--- a/net/rdist6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A network file distribution/synchronisation utility
diff --git a/net/ripetools/Makefile b/net/ripetools/Makefile
index dcb4cc59c709..8e156554edd5 100644
--- a/net/ripetools/Makefile
+++ b/net/ripetools/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ripe.net/tools/
DISTNAME= ripe-whois-tools-2.4
MAINTAINER= joe@uk.freebsd.org
+COMMENT= RIPE's own version of whois, and a RIPE database tool
NO_WRKSUBDIR= yes
diff --git a/net/ripetools/pkg-comment b/net/ripetools/pkg-comment
deleted file mode 100644
index 5c752b4f8bc0..000000000000
--- a/net/ripetools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RIPE's own version of whois, and a RIPE database tool
diff --git a/net/rqm/Makefile b/net/rqm/Makefile
index b3bf4bda8cb3..efe5b65ccd47 100644
--- a/net/rqm/Makefile
+++ b/net/rqm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/rqm/1.0.0/
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= A graphical RTP quality monitor
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
diff --git a/net/rqm/pkg-comment b/net/rqm/pkg-comment
deleted file mode 100644
index e33c64e88137..000000000000
--- a/net/rqm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical RTP quality monitor
diff --git a/net/rtptools/Makefile b/net/rtptools/Makefile
index 5a9b88f761bf..a4f8ef3f5c17 100644
--- a/net/rtptools/Makefile
+++ b/net/rtptools/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone
MASTER_SITES= http://www.cs.columbia.edu/IRT/software/rtptools/download/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A set of tools to record, playback and monitor RTPv2 data streams
GNU_CONFIGURE= yes
diff --git a/net/rtptools/pkg-comment b/net/rtptools/pkg-comment
deleted file mode 100644
index 4e0d5f964364..000000000000
--- a/net/rtptools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of tools to record, playback and monitor RTPv2 data streams
diff --git a/net/ruby-net-geoip/Makefile b/net/ruby-net-geoip/Makefile
index 58e8b73e5d0e..8dbf24b4170b 100644
--- a/net/ruby-net-geoip/Makefile
+++ b/net/ruby-net-geoip/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= A Ruby extension that wraps around libGeoIP
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
GeoIP.2:${PORTSDIR}/net/GeoIP
diff --git a/net/ruby-net-geoip/pkg-comment b/net/ruby-net-geoip/pkg-comment
deleted file mode 100644
index 5a6e5fbd1072..000000000000
--- a/net/ruby-net-geoip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Ruby extension that wraps around libGeoIP
diff --git a/net/ruby-snmp/Makefile b/net/ruby-snmp/Makefile
index b2510ffe2187..04229aefb1b2 100644
--- a/net/ruby-snmp/Makefile
+++ b/net/ruby-snmp/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Ruby interface to UCD-SNMP library
LIB_DEPENDS= snmp.4:${PORTSDIR}/net/net-snmp4
diff --git a/net/ruby-snmp/pkg-comment b/net/ruby-snmp/pkg-comment
deleted file mode 100644
index 273e18db69f3..000000000000
--- a/net/ruby-snmp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ruby interface to UCD-SNMP library
diff --git a/net/ruby-spread/Makefile b/net/ruby-spread/Makefile
index b54cc1f7d505..272e1f88fa55 100644
--- a/net/ruby-spread/Makefile
+++ b/net/ruby-spread/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Ruby interface to the Spread library
LIB_DEPENDS= tspread.1:${PORTSDIR}/net/spread
diff --git a/net/ruby-spread/pkg-comment b/net/ruby-spread/pkg-comment
deleted file mode 100644
index e67c21e37313..000000000000
--- a/net/ruby-spread/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ruby interface to the Spread library
diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile
index b0b042a69f14..6b3c8bc686bc 100644
--- a/net/samba-devel/Makefile
+++ b/net/samba-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= alpha old
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/alpha/}
MAINTAINER= dwcjr@FreeBSD.org
+COMMENT= A free SMB and CIFS client and server for UNIX
USE_BZIP2="YES"
diff --git a/net/samba-devel/pkg-comment b/net/samba-devel/pkg-comment
deleted file mode 100644
index 21f25f97e695..000000000000
--- a/net/samba-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free SMB and CIFS client and server for UNIX
diff --git a/net/samba-tng/Makefile b/net/samba-tng/Makefile
index a789351eddda..79e20a56732d 100644
--- a/net/samba-tng/Makefile
+++ b/net/samba-tng/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.samba-tng.org/download/tng/ \
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}_0.${PORTVERSION:S,c,cvs,}
MAINTAINER= dwcjr@FreeBSD.org
+COMMENT= A free SMB and CIFS client and server for UNIX
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/net/samba-tng/pkg-comment b/net/samba-tng/pkg-comment
deleted file mode 100644
index 21f25f97e695..000000000000
--- a/net/samba-tng/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free SMB and CIFS client and server for UNIX
diff --git a/net/samba/Makefile b/net/samba/Makefile
index 3ae07da8824f..b55b01fcf799 100644
--- a/net/samba/Makefile
+++ b/net/samba/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= . old-versions
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/}
MAINTAINER= dwcjr@FreeBSD.org
+COMMENT= A free SMB and CIFS client and server for UNIX
USE_BZIP2= YES
USE_SUBMAKE= YES
diff --git a/net/samba/pkg-comment b/net/samba/pkg-comment
deleted file mode 100644
index 21f25f97e695..000000000000
--- a/net/samba/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free SMB and CIFS client and server for UNIX
diff --git a/net/samba3/Makefile b/net/samba3/Makefile
index b0b042a69f14..6b3c8bc686bc 100644
--- a/net/samba3/Makefile
+++ b/net/samba3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= alpha old
DISTNAME= ${PORTNAME}-${PORTVERSION:S/a/alpha/}
MAINTAINER= dwcjr@FreeBSD.org
+COMMENT= A free SMB and CIFS client and server for UNIX
USE_BZIP2="YES"
diff --git a/net/samba3/pkg-comment b/net/samba3/pkg-comment
deleted file mode 100644
index 21f25f97e695..000000000000
--- a/net/samba3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free SMB and CIFS client and server for UNIX
diff --git a/net/sambasentinel/Makefile b/net/sambasentinel/Makefile
index 5eb518ed1aa4..ffbb48c36e89 100644
--- a/net/sambasentinel/Makefile
+++ b/net/sambasentinel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://kling.mine.nu/kling/files/
DISTNAME= SambaSentinel-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= SambaSentinel is a gtk-frontend to smbstatus with additional features
RUN_DEPENDS= jags:${PORTSDIR}/net/jags
diff --git a/net/sambasentinel/pkg-comment b/net/sambasentinel/pkg-comment
deleted file mode 100644
index e12281a383f7..000000000000
--- a/net/sambasentinel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SambaSentinel is a gtk-frontend to smbstatus with additional features
diff --git a/net/sdl_net/Makefile b/net/sdl_net/Makefile
index 8482babae668..17bd675efa81 100644
--- a/net/sdl_net/Makefile
+++ b/net/sdl_net/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/
DISTNAME= SDL_net-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A small sample cross-platform networking library
LIB_DEPENDS= SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
GUI.0:${PORTSDIR}/graphics/guilib
diff --git a/net/sdl_net/pkg-comment b/net/sdl_net/pkg-comment
deleted file mode 100644
index ae0ab999e085..000000000000
--- a/net/sdl_net/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small sample cross-platform networking library
diff --git a/net/sdr/Makefile b/net/sdr/Makefile
index a63085f4173b..d7943ba088b3 100644
--- a/net/sdr/Makefile
+++ b/net/sdr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= mbone tk82
MASTER_SITES= http://www-mice.cs.ucl.ac.uk/multimedia/software/sdr/2.9/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= Multicast Session Directory
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
BUILD_DEPENDS= ${LOCALBASE}/lib/libuclmmbase.a:${PORTSDIR}/devel/uclmmbase
diff --git a/net/sdr/pkg-comment b/net/sdr/pkg-comment
deleted file mode 100644
index 9b614924d614..000000000000
--- a/net/sdr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multicast Session Directory
diff --git a/net/slirp/Makefile b/net/slirp/Makefile
index 61f35387cc3c..9e36f77163e3 100644
--- a/net/slirp/Makefile
+++ b/net/slirp/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-1.0.14pre1
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= A (C)SLIP/PPP emulator for users with shell accounts
# serious LP64 issues
ONLY_FOR_ARCHS= i386
diff --git a/net/slirp/pkg-comment b/net/slirp/pkg-comment
deleted file mode 100644
index 94351882cb86..000000000000
--- a/net/slirp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A (C)SLIP/PPP emulator for users with shell accounts
diff --git a/net/smbfs/Makefile b/net/smbfs/Makefile
index 9e295b01cb38..eb10311bbfda 100644
--- a/net/smbfs/Makefile
+++ b/net/smbfs/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.butya.kz/pub/smbfs/
MAINTAINER= bp@freebsd.org
+COMMENT= SMB/CIFS protocol and SMB/CIFS file system implementation
NO_PACKAGE= "Depends on kernel"
diff --git a/net/smbfs/pkg-comment b/net/smbfs/pkg-comment
deleted file mode 100644
index 2a6946341523..000000000000
--- a/net/smbfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SMB/CIFS protocol and SMB/CIFS file system implementation
diff --git a/net/ssldump/Makefile b/net/ssldump/Makefile
index 8f2aec38be14..2454b33f6329 100644
--- a/net/ssldump/Makefile
+++ b/net/ssldump/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net security
MASTER_SITES= http://www.rtfm.com/ssldump/
MAINTAINER= kris@FreeBSD.org
+COMMENT= SSLv3/TLS network protocol analyzer
USE_OPENSSL= YES
diff --git a/net/ssldump/pkg-comment b/net/ssldump/pkg-comment
deleted file mode 100644
index 18934d94b3b9..000000000000
--- a/net/ssldump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SSLv3/TLS network protocol analyzer
diff --git a/net/sting/Makefile b/net/sting/Makefile
index 3f70effc3bc7..b1258a0b3569 100644
--- a/net/sting/Makefile
+++ b/net/sting/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cs.washington.edu/homes/savage/sting/
DISTNAME= sting
MAINTAINER= kbyanc@posi.net
+COMMENT= A tool that measures end-to-end TCP connection characteristics
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net/sting/pkg-comment b/net/sting/pkg-comment
deleted file mode 100644
index d1050a3c894e..000000000000
--- a/net/sting/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool that measures end-to-end TCP connection characteristics
diff --git a/net/suckblow/Makefile b/net/suckblow/Makefile
index 5e30e12a4228..642df5f97b30 100644
--- a/net/suckblow/Makefile
+++ b/net/suckblow/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= archie
MAINTAINER= archie@freebsd.org
+COMMENT= Two companion utilities for transferring data over a TCP socket
MAN1= suck.1
MLINKS= suck.1 blow.1
diff --git a/net/suckblow/pkg-comment b/net/suckblow/pkg-comment
deleted file mode 100644
index 333836b1700e..000000000000
--- a/net/suckblow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Two companion utilities for transferring data over a TCP socket
diff --git a/net/tcpmssd/Makefile b/net/tcpmssd/Makefile
index 7ca49dc687c6..2e0f429637be 100644
--- a/net/tcpmssd/Makefile
+++ b/net/tcpmssd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=ru
MAINTAINER= ru@FreeBSD.org
+COMMENT= A divert(4) daemon to correct requested receive segment size for TCP traffic
MAN8= tcpmssd.8
MANCOMPRESSED= maybe
diff --git a/net/tcpmssd/pkg-comment b/net/tcpmssd/pkg-comment
deleted file mode 100644
index 4d2baefd31f6..000000000000
--- a/net/tcpmssd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A divert(4) daemon to correct requested receive segment size for TCP traffic
diff --git a/net/tcpreplay/Makefile b/net/tcpreplay/Makefile
index 4e3fc93cd7d1..8c5d0495c663 100644
--- a/net/tcpreplay/Makefile
+++ b/net/tcpreplay/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= smace@FreeBSD.org
+COMMENT= A tool to replay saved packet capture files
BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
diff --git a/net/tcpreplay/pkg-comment b/net/tcpreplay/pkg-comment
deleted file mode 100644
index a7b977ea87e2..000000000000
--- a/net/tcpreplay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to replay saved packet capture files
diff --git a/net/tcpshow/Makefile b/net/tcpshow/Makefile
index 04594eab6f4a..9da531bf1614 100644
--- a/net/tcpshow/Makefile
+++ b/net/tcpshow/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= obrien
DISTFILES= tcpshow.c tcpshow.1
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Decode tcpdump(1) output
NO_WRKSUBDIR= yes
MAN1= tcpshow.1
diff --git a/net/tcpshow/pkg-comment b/net/tcpshow/pkg-comment
deleted file mode 100644
index 71d05b65f396..000000000000
--- a/net/tcpshow/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Decode tcpdump(1) output
diff --git a/net/tcpslice/Makefile b/net/tcpslice/Makefile
index a85409693c13..8262fb7be22f 100644
--- a/net/tcpslice/Makefile
+++ b/net/tcpslice/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tcpdump.org/weekly/ \
http://www.jp.tcpdump.org/weekly/
MAINTAINER= smace@freebsd.org
+COMMENT= A tool for extracting portions of pcap files
MAN1= tcpslice.1
diff --git a/net/tcpslice/pkg-comment b/net/tcpslice/pkg-comment
deleted file mode 100644
index c846c238ec8a..000000000000
--- a/net/tcpslice/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for extracting portions of pcap files
diff --git a/net/tcpstat/Makefile b/net/tcpstat/Makefile
index 68b37ecf7404..0c1b6c1b9898 100644
--- a/net/tcpstat/Makefile
+++ b/net/tcpstat/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.frenchfries.net/paul/tcpstat/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A program to report various network statistics
GNU_CONFIGURE= yes
diff --git a/net/tcpstat/pkg-comment b/net/tcpstat/pkg-comment
deleted file mode 100644
index c84cc48ee3b4..000000000000
--- a/net/tcpstat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to report various network statistics
diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile
index bddfd793875c..14a43d6ea481 100644
--- a/net/tcptrace/Makefile
+++ b/net/tcptrace/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net ipv6
MASTER_SITES= http://www.tcptrace.org/download/
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A TCP dump file analysis tool
GNU_CONFIGURE= yes
ALL_TARGET= tcptrace
diff --git a/net/tcptrace/pkg-comment b/net/tcptrace/pkg-comment
deleted file mode 100644
index 515967979b8e..000000000000
--- a/net/tcptrace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A TCP dump file analysis tool
diff --git a/net/telnetx/Makefile b/net/telnetx/Makefile
index 3980c50344fb..61bcb91fce0e 100644
--- a/net/telnetx/Makefile
+++ b/net/telnetx/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= asami/LOCAL_PORTS
DISTNAME= telnetx+transit.src.940401
MAINTAINER= max@FreeBSD.org
+COMMENT= Telnet client with binary transfer protocols support
RUN_DEPENDS+= bp:${PORTSDIR}/comms/bpl+
RUN_DEPENDS+= kermit:${PORTSDIR}/comms/kermit
diff --git a/net/telnetx/pkg-comment b/net/telnetx/pkg-comment
deleted file mode 100644
index 2c3508dc59be..000000000000
--- a/net/telnetx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Telnet client with binary transfer protocols support
diff --git a/net/thcrut/Makefile b/net/thcrut/Makefile
index 0ba4fb5f99c4..6d5b9bfb3fe9 100644
--- a/net/thcrut/Makefile
+++ b/net/thcrut/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.thehackerschoice.com/releases/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Local network discovery tool
BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
diff --git a/net/thcrut/pkg-comment b/net/thcrut/pkg-comment
deleted file mode 100644
index c390f8bc6ae2..000000000000
--- a/net/thcrut/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Local network discovery tool
diff --git a/net/tn3270/Makefile b/net/tn3270/Makefile
index bb39f1685b40..42ed3b6bb1f8 100644
--- a/net/tn3270/Makefile
+++ b/net/tn3270/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://people.freebsd.org/~markm/ \
DISTNAME= tn3270
MAINTAINER= markm@FreeBSD.ORG
+COMMENT= Full-screen remote login to IBM VM/CMS
MAN1= tn3270.1 mset.1
MAN5= map3270.5
diff --git a/net/tn3270/pkg-comment b/net/tn3270/pkg-comment
deleted file mode 100644
index 1a3eb53fda96..000000000000
--- a/net/tn3270/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Full-screen remote login to IBM VM/CMS
diff --git a/net/traceroute/Makefile b/net/traceroute/Makefile
index eb322477eed3..2b5a8e1a3c57 100644
--- a/net/traceroute/Makefile
+++ b/net/traceroute/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= demon@FreeBSD.org
+COMMENT= Version of 'traceroute' that shows the AS network number of each hop
RELEASEDATE= 991603
NO_WRKSUBDIR= yes
diff --git a/net/traceroute/pkg-comment b/net/traceroute/pkg-comment
deleted file mode 100644
index 60f23423b234..000000000000
--- a/net/traceroute/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Version of 'traceroute' that shows the AS network number of each hop
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index e55fdf887bfc..de4035c0a7c4 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://savannah.nongnu.org/download/tramp/
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Transparent remote file access tool for emacsen
EMACS_PORT_NAME?= emacs21
diff --git a/net/tramp/pkg-comment b/net/tramp/pkg-comment
deleted file mode 100644
index b14a18b02dbe..000000000000
--- a/net/tramp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transparent remote file access tool for emacsen
diff --git a/net/ttcp/Makefile b/net/ttcp/Makefile
index 9557a832240e..a8819a3a0840 100644
--- a/net/ttcp/Makefile
+++ b/net/ttcp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.sgi.com/sgi/src/ttcp/
DISTFILES= ttcp.c ttcp.1 README
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Benchmarking tool for analysing TCP and UDP performance
EXTRACT_ONLY= #none
NO_WRKSUBDIR= yes
diff --git a/net/ttcp/pkg-comment b/net/ttcp/pkg-comment
deleted file mode 100644
index 764ed03d460c..000000000000
--- a/net/ttcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Benchmarking tool for analysing TCP and UDP performance
diff --git a/net/udptunnel/Makefile b/net/udptunnel/Makefile
index 57b2c2dcfc86..eb2218c483d9 100644
--- a/net/udptunnel/Makefile
+++ b/net/udptunnel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= ftp://ftp.cs.columbia.edu/pub/lennox/udptunnel/
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Tunnel UDP packets over a TCP connection
GNU_CONFIGURE= yes
diff --git a/net/udptunnel/pkg-comment b/net/udptunnel/pkg-comment
deleted file mode 100644
index bdaf272618f4..000000000000
--- a/net/udptunnel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tunnel UDP packets over a TCP connection
diff --git a/net/utftpd/Makefile b/net/utftpd/Makefile
index 5a453284425b..64cc6b6a0a67 100644
--- a/net/utftpd/Makefile
+++ b/net/utftpd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://www.ohse.de/uwe/releases/
MAINTAINER= andreas@FreeBSD.org
+COMMENT= secure tftpd server with fine grained access and revision control
GNU_CONFIGURE= YES
USE_GMAKE= YES
diff --git a/net/utftpd/pkg-comment b/net/utftpd/pkg-comment
deleted file mode 100644
index 678900ce8a10..000000000000
--- a/net/utftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-secure tftpd server with fine grained access and revision control
diff --git a/net/vicq/Makefile b/net/vicq/Makefile
index da8b105ee8b4..5ef7fcfac345 100644
--- a/net/vicq/Makefile
+++ b/net/vicq/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://gonzo.kiev.ua/projects/vicq/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A text-based ICQ implementation
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadLine/Gnu.pm:${PORTSDIR}/devel/p5-ReadLine-Gnu
diff --git a/net/vicq/pkg-comment b/net/vicq/pkg-comment
deleted file mode 100644
index 43c4495981a1..000000000000
--- a/net/vicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text-based ICQ implementation
diff --git a/net/vtun/Makefile b/net/vtun/Makefile
index 37d46d39c1ca..9a62caba8002 100644
--- a/net/vtun/Makefile
+++ b/net/vtun/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net
MASTER_SITES= http://vtun.sourceforge.net/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= Virtual Tunnels over TCP/IP networks with traffic shaping
LIB_DEPENDS= lzo.1:${PORTSDIR}/archivers/lzo
diff --git a/net/vtun/pkg-comment b/net/vtun/pkg-comment
deleted file mode 100644
index 1d262e240076..000000000000
--- a/net/vtun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Virtual Tunnels over TCP/IP networks with traffic shaping
diff --git a/net/wb/Makefile b/net/wb/Makefile
index 7fbb109f2605..ed7e8f45cd98 100644
--- a/net/wb/Makefile
+++ b/net/wb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ee.lbl.gov/conferencing/wb/
DISTFILES= i386-wb-1.59.tar.Z
MAINTAINER= fenner@FreeBSD.org
+COMMENT= A shared drawing (whiteboard) tool using multicast
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/net/wb/pkg-comment b/net/wb/pkg-comment
deleted file mode 100644
index 8bd2e20b0482..000000000000
--- a/net/wb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A shared drawing (whiteboard) tool using multicast
diff --git a/net/wmq3/Makefile b/net/wmq3/Makefile
index bcdc4ca352d7..89688db12fa4 100644
--- a/net/wmq3/Makefile
+++ b/net/wmq3/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net windowmaker games
MASTER_SITES= http://www.soberart.de/down/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Dockapp that query and display information on Quake 3 servers
RUN_DEPENDS= qstat:${PORTSDIR}/games/qstat
diff --git a/net/wmq3/pkg-comment b/net/wmq3/pkg-comment
deleted file mode 100644
index 123d32435dce..000000000000
--- a/net/wmq3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dockapp that query and display information on Quake 3 servers
diff --git a/net/xferstats/Makefile b/net/xferstats/Makefile
index 24e2a43596e7..c9f7cca72ae6 100644
--- a/net/xferstats/Makefile
+++ b/net/xferstats/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.wu-ftpd.org/pub/support/ \
ftp://ftp.gpad.ac.ru/pub/FreeBSD/distfiles/
MAINTAINER= demon@FreeBSD.org
+COMMENT= Compiles information about file transfers from logfiles
USE_GNOMENG= yes
USE_GNOME= glib12
diff --git a/net/xferstats/pkg-comment b/net/xferstats/pkg-comment
deleted file mode 100644
index cabc2e465d07..000000000000
--- a/net/xferstats/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Compiles information about file transfers from logfiles
diff --git a/net/xicq/Makefile b/net/xicq/Makefile
index 40bc02653fec..520a5e479475 100644
--- a/net/xicq/Makefile
+++ b/net/xicq/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.xtrophy.dk/xicq/
DISTNAME= xicq-071298-snapshot.src
MAINTAINER= scrappy@FreeBSD.org
+COMMENT= Xtropy's ICQ Client
WRKSRC= ${WRKDIR}/xicq-071298
diff --git a/net/xicq/pkg-comment b/net/xicq/pkg-comment
deleted file mode 100644
index e1315e3ced8e..000000000000
--- a/net/xicq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xtropy's ICQ Client
diff --git a/net/xprobe/Makefile b/net/xprobe/Makefile
index 7633e4b7a5d1..9f3eb5b6989f 100644
--- a/net/xprobe/Makefile
+++ b/net/xprobe/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= net security
MASTER_SITES= http://www.sys-security.com/archive/tools/X/
MAINTAINER= kris@FreeBSD.org
+COMMENT= ICMP active OS fingerprint scanner
GNU_CONFIGURE= yes
diff --git a/net/xprobe/pkg-comment b/net/xprobe/pkg-comment
deleted file mode 100644
index 8f95e563aa59..000000000000
--- a/net/xprobe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ICMP active OS fingerprint scanner
diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile
index 250f5aa6fee4..aa980c411ce0 100644
--- a/net/xtraceroute/Makefile
+++ b/net/xtraceroute/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.dtek.chalmers.se/~d3august/xt/dl/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= 3D graphical version of the traceroute program
BUILD_DEPENDS= ${LOCALBASE}/bin/host:${PORTSDIR}/net/host
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
diff --git a/net/xtraceroute/pkg-comment b/net/xtraceroute/pkg-comment
deleted file mode 100644
index 4ba447b52466..000000000000
--- a/net/xtraceroute/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3D graphical version of the traceroute program
diff --git a/net/xwhois/Makefile b/net/xwhois/Makefile
index 741f371c5a02..aee19b7260ec 100644
--- a/net/xwhois/Makefile
+++ b/net/xwhois/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://c64.org/~nr/xwhois/dist/ \
ftp://sangis.kalix.net/pub/nr/xwhois/
MAINTAINER= billf@FreeBSD.org
+COMMENT= A GTK-based frontend to the whois service (RFC954)
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/net/xwhois/pkg-comment b/net/xwhois/pkg-comment
deleted file mode 100644
index 2dea0a4fc93c..000000000000
--- a/net/xwhois/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK-based frontend to the whois service (RFC954)
diff --git a/net/zebra-devel/Makefile b/net/zebra-devel/Makefile
index deaeb1ed0728..13d5e4787c14 100644
--- a/net/zebra-devel/Makefile
+++ b/net/zebra-devel/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ \
ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
USE_SUBMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/zebra-devel/pkg-comment b/net/zebra-devel/pkg-comment
deleted file mode 100644
index df7c38434b5c..000000000000
--- a/net/zebra-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
diff --git a/net/zebra-pj/Makefile b/net/zebra-pj/Makefile
index deaeb1ed0728..13d5e4787c14 100644
--- a/net/zebra-pj/Makefile
+++ b/net/zebra-pj/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ \
ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
USE_SUBMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/zebra-pj/pkg-comment b/net/zebra-pj/pkg-comment
deleted file mode 100644
index df7c38434b5c..000000000000
--- a/net/zebra-pj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index deaeb1ed0728..13d5e4787c14 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= ftp://ftp.zebra.org/pub/zebra/ \
ftp://ftp.pop-pr.rnp.br/pub/GNU/ftp.zebra.org/zebra/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
USE_SUBMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net/zebra/pkg-comment b/net/zebra/pkg-comment
deleted file mode 100644
index df7c38434b5c..000000000000
--- a/net/zebra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free RIPv1, RIPv2, OSPFv2, BGP4 route software (server/reflector)
diff --git a/net/ztelnet/Makefile b/net/ztelnet/Makefile
index ed00c071bff9..7864573e4fe0 100644
--- a/net/ztelnet/Makefile
+++ b/net/ztelnet/Makefile
@@ -19,6 +19,7 @@ DISTFILES= ztelnet-linux.tar.gz ztelnet-patch.tar.gz \
ztelnet-patch-cmascott.tar.gz
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Telnet program with zmodem transfer
RESTRICTED= "zmodem code has restrictive copyright"
diff --git a/net/ztelnet/pkg-comment b/net/ztelnet/pkg-comment
deleted file mode 100644
index 224b8ac31c84..000000000000
--- a/net/ztelnet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Telnet program with zmodem transfer
diff --git a/news/PicMonger/Makefile b/news/PicMonger/Makefile
index 6eca8f0eca60..356021e69989 100644
--- a/news/PicMonger/Makefile
+++ b/news/PicMonger/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= news graphics
MASTER_SITES= http://download.sourceforge.net/PicMonger/
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= An automated USENET (NNT) picture decoding client
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
RUN_DEPENDS= mpack:${PORTSDIR}/converters/mpack
diff --git a/news/PicMonger/pkg-comment b/news/PicMonger/pkg-comment
deleted file mode 100644
index e4719d190bbf..000000000000
--- a/news/PicMonger/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automated USENET (NNT) picture decoding client
diff --git a/news/atp/Makefile b/news/atp/Makefile
index 82c08197f854..aaafaad962ca 100644
--- a/news/atp/Makefile
+++ b/news/atp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= system/bbs/mail
DISTFILES= ${DISTNAME}-src.tar.gz
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A QWK message packet reader and composer for FreeBSD
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
unzip:${PORTSDIR}/archivers/unzip
diff --git a/news/atp/pkg-comment b/news/atp/pkg-comment
deleted file mode 100644
index 7cab74fad101..000000000000
--- a/news/atp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QWK message packet reader and composer for FreeBSD
diff --git a/news/aub/Makefile b/news/aub/Makefile
index fbc171178353..bb95a602186a 100644
--- a/news/aub/Makefile
+++ b/news/aub/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= news
MASTER_SITES= http://yukidoke.org/~mako/projects/aub/download/
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Assemble usenet binaries
NO_BUILD= yes
MAN1= aub.1 aubconf.1
diff --git a/news/aub/pkg-comment b/news/aub/pkg-comment
deleted file mode 100644
index ecb1fb2d3f24..000000000000
--- a/news/aub/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Assemble usenet binaries
diff --git a/news/bgrab/Makefile b/news/bgrab/Makefile
index cf6b57322404..30210291f7f4 100644
--- a/news/bgrab/Makefile
+++ b/news/bgrab/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.student.dtu.dk/~c960941/bgrab/
EXTRACT_SUFX= .tgz
MAINTAINER= kbyanc@posi.net
+COMMENT= Binary Grabber - downloads binaries from newsgroups
RUN_DEPENDS= mmencode:${PORTSDIR}/converters/mmencode
diff --git a/news/bgrab/pkg-comment b/news/bgrab/pkg-comment
deleted file mode 100644
index 1a0fe25039aa..000000000000
--- a/news/bgrab/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Binary Grabber - downloads binaries from newsgroups
diff --git a/news/cleanfeed/Makefile b/news/cleanfeed/Makefile
index 2ea5e233259f..53504ba99aa7 100644
--- a/news/cleanfeed/Makefile
+++ b/news/cleanfeed/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.bofh.it/~md/cleanfeed/
EXTRACT_SUFX= .tgz
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Spam filter for Usenet news servers
RUN_DEPENDS= ${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
diff --git a/news/cleanfeed/pkg-comment b/news/cleanfeed/pkg-comment
deleted file mode 100644
index 0e0f61055765..000000000000
--- a/news/cleanfeed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Spam filter for Usenet news servers
diff --git a/news/grn/Makefile b/news/grn/Makefile
index 851aba83c2ec..6a77a11fca80 100644
--- a/news/grn/Makefile
+++ b/news/grn/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A NNTP client for Gnome
USE_X_PREFIX= yes
USE_BZIP2= yes
diff --git a/news/grn/pkg-comment b/news/grn/pkg-comment
deleted file mode 100644
index 4939e15cca65..000000000000
--- a/news/grn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A NNTP client for Gnome
diff --git a/news/inn-current/Makefile b/news/inn-current/Makefile
index b159bd73b3f7..df9b48755dbd 100644
--- a/news/inn-current/Makefile
+++ b/news/inn-current/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= inn
NO_LATEST_LINK= yes
MAINTAINER= des@FreeBSD.org
+COMMENT= InterNetNews -- the Internet meets Netnews
USE_GMAKE=YES
USE_PERL5= yes
diff --git a/news/inn-current/pkg-comment b/news/inn-current/pkg-comment
deleted file mode 100644
index 011fbdd45b5f..000000000000
--- a/news/inn-current/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-InterNetNews -- the Internet meets Netnews
diff --git a/news/inn-stable/Makefile b/news/inn-stable/Makefile
index 644cea3ae052..0b49ecc8e593 100644
--- a/news/inn-stable/Makefile
+++ b/news/inn-stable/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= inn/snapshots
DISTNAME= inn-STABLE-${SNAPSHOT}
MAINTAINER= des@FreeBSD.org
+COMMENT= InterNetNews Version 2 -- the Internet meets Netnews
USE_GMAKE=YES
USE_PERL5= yes
diff --git a/news/inn-stable/pkg-comment b/news/inn-stable/pkg-comment
deleted file mode 100644
index ea2b671716e0..000000000000
--- a/news/inn-stable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-InterNetNews Version 2 -- the Internet meets Netnews
diff --git a/news/inn/Makefile b/news/inn/Makefile
index b159bd73b3f7..df9b48755dbd 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= inn
NO_LATEST_LINK= yes
MAINTAINER= des@FreeBSD.org
+COMMENT= InterNetNews -- the Internet meets Netnews
USE_GMAKE=YES
USE_PERL5= yes
diff --git a/news/inn/pkg-comment b/news/inn/pkg-comment
deleted file mode 100644
index 011fbdd45b5f..000000000000
--- a/news/inn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-InterNetNews -- the Internet meets Netnews
diff --git a/news/leafnode+/Makefile b/news/leafnode+/Makefile
index 81fffbd489ff..18a9cb681363 100644
--- a/news/leafnode+/Makefile
+++ b/news/leafnode+/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.io.com/~kazushi/leafnode+/ \
ftp://ftp.io.com/pub/usr/kazushi/leafnode+/
MAINTAINER= tom@FreeBSD.org
+COMMENT= Multi-user offline Usenet news package for small sites
MAN8= checkgroups.8 fetchnews.8 leafnode.8 texpire.8
PKGINSTALL= ${WRKDIR}/INSTALL
diff --git a/news/leafnode+/pkg-comment b/news/leafnode+/pkg-comment
deleted file mode 100644
index 6f421543823b..000000000000
--- a/news/leafnode+/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-user offline Usenet news package for small sites
diff --git a/news/newsgrab/Makefile b/news/newsgrab/Makefile
index 7699195f8b4b..cd706dad8bed 100644
--- a/news/newsgrab/Makefile
+++ b/news/newsgrab/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= newsgrab
MAINTAINER= petef@FreeBSD.org
+COMMENT= Download and uudecode binary files from USENET using regexps
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/News/NNTPClient.pm:${PORTSDIR}/news/p5-NNTPClient \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Term/ReadKey.pm:${PORTSDIR}/devel/p5-Term-ReadKey \
diff --git a/news/newsgrab/pkg-comment b/news/newsgrab/pkg-comment
deleted file mode 100644
index 2dbe8cade8f6..000000000000
--- a/news/newsgrab/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Download and uudecode binary files from USENET using regexps
diff --git a/news/p5-NNTPClient/Makefile b/news/p5-NNTPClient/Makefile
index 278cf94db89d..6de962b1ba8c 100644
--- a/news/p5-NNTPClient/Makefile
+++ b/news/p5-NNTPClient/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= News
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Client interface to NNTP (RFC977)
PERL_CONFIGURE= yes
diff --git a/news/p5-NNTPClient/pkg-comment b/news/p5-NNTPClient/pkg-comment
deleted file mode 100644
index 966ebd84e7fc..000000000000
--- a/news/p5-NNTPClient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Client interface to NNTP (RFC977)
diff --git a/news/pan/Makefile b/news/pan/Makefile
index 9213060262cf..3a24e3f0b6c3 100644
--- a/news/pan/Makefile
+++ b/news/pan/Makefile
@@ -17,6 +17,7 @@ MASTER_SITE_SUBDIR= sources/pan/0.11
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Threaded GNOME newsreader based on Agent for Windows
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/news/pan/pkg-comment b/news/pan/pkg-comment
deleted file mode 100644
index d7ef68242140..000000000000
--- a/news/pan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Threaded GNOME newsreader based on Agent for Windows
diff --git a/news/plor/Makefile b/news/plor/Makefile
index a34f5513583c..2e3845c3b710 100644
--- a/news/plor/Makefile
+++ b/news/plor/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/bbs/mail
MAINTAINER= hoek@FreeBSD.org
+COMMENT= An alpha-release reader for reading SOUP and QWK packets
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/news/plor/pkg-comment b/news/plor/pkg-comment
deleted file mode 100644
index 4a3231f9d6bc..000000000000
--- a/news/plor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An alpha-release reader for reading SOUP and QWK packets
diff --git a/news/slnr/Makefile b/news/slnr/Makefile
index b4a11829653d..2e9924127240 100644
--- a/news/slnr/Makefile
+++ b/news/slnr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= news
MASTER_SITES= http://www3.sympatico.ca/john.vanderhoek/tim/src/slnr/
MAINTAINER= hoek@FreeBSD.org
+COMMENT= A simplistic reader for SOUP (HDPF) mail and news packets
RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip
diff --git a/news/slnr/pkg-comment b/news/slnr/pkg-comment
deleted file mode 100644
index 0b12699d5cf1..000000000000
--- a/news/slnr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simplistic reader for SOUP (HDPF) mail and news packets
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 60341774e3eb..3fb93800c547 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= petef@FreeBSD.org
+COMMENT= SLang-based newsreader
LIB_DEPENDS= slang.1:${PORTSDIR}/devel/libslang \
intl.4:${PORTSDIR}/devel/gettext \
diff --git a/news/slrn/pkg-comment b/news/slrn/pkg-comment
deleted file mode 100644
index dcb026108539..000000000000
--- a/news/slrn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SLang-based newsreader
diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile
index e0f34dbe3ea7..1f72e10480a3 100644
--- a/news/t-gnus/Makefile
+++ b/news/t-gnus/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= ${PORTNAME}-${TGNUSVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= I18N Gnus using SEMI, which provides MIME capabilities
BUILD_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
RUN_DEPENDS= ${LOCALBASE}/share/semi/${MIMEUI_COOKIE}:${PORTSDIR}/editors/${MIMEUI_PORT_NAME}
diff --git a/news/t-gnus/pkg-comment b/news/t-gnus/pkg-comment
deleted file mode 100644
index 67b82effe5d9..000000000000
--- a/news/t-gnus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-I18N Gnus using SEMI, which provides MIME capabilities
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 40d4a0965156..b6158bde8ba3 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://mirrors.rcn.net/pub/news/tin/v1.5/ \
ftp://ftp.sunet.se/pub/news/readers/tin/v1.5/
MAINTAINER?= ache@FreeBSD.org
+COMMENT= Easy-to-use threaded newsreader with NOV/NNTP support
LIB_DEPENDS= uu.2:${PORTSDIR}/converters/uulib \
iconv.3:${PORTSDIR}/converters/libiconv \
diff --git a/news/tin/pkg-comment b/news/tin/pkg-comment
deleted file mode 100644
index 7a8bff79c349..000000000000
--- a/news/tin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easy-to-use threaded newsreader with NOV/NNTP support
diff --git a/news/trn4/Makefile b/news/trn4/Makefile
index fb85d0706705..a05fed3a4046 100644
--- a/news/trn4/Makefile
+++ b/news/trn4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= trn-4.0-test76
MAINTAINER= mph@freebsd.org
+COMMENT= Version 4.0 of the threaded readnews newsreader
NO_LATEST_LINK= yes
NO_PACKAGE= "Too many questions"
diff --git a/news/trn4/pkg-comment b/news/trn4/pkg-comment
deleted file mode 100644
index 7aeaaecc259e..000000000000
--- a/news/trn4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Version 4.0 of the threaded readnews newsreader
diff --git a/news/xmitbin/Makefile b/news/xmitbin/Makefile
index b2934f93d21f..c5419d26f6c3 100644
--- a/news/xmitbin/Makefile
+++ b/news/xmitbin/Makefile
@@ -13,6 +13,7 @@ DISTNAME= xmitBin-1.9
EXTRACT_SUFX= .tar.Z
MAINTAINER= dburr@FreeBSD.org
+COMMENT= Posts or mails binary and sourcecode files intelligently
MAN1= xmitBin.1
NO_WRKSUBDIR= YES
diff --git a/news/xmitbin/pkg-comment b/news/xmitbin/pkg-comment
deleted file mode 100644
index 7990dd0f6ba8..000000000000
--- a/news/xmitbin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Posts or mails binary and sourcecode files intelligently
diff --git a/palm/bibelot/Makefile b/palm/bibelot/Makefile
index 3373168fe53e..2cb56d6e8e88 100644
--- a/palm/bibelot/Makefile
+++ b/palm/bibelot/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Formats and converts text documents into compressed PalmDoc .pdb files
USE_PERL5= yes
diff --git a/palm/bibelot/pkg-comment b/palm/bibelot/pkg-comment
deleted file mode 100644
index d4b5f3e56c37..000000000000
--- a/palm/bibelot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Formats and converts text documents into compressed PalmDoc .pdb files
diff --git a/palm/gnome-pilot-conduits/Makefile b/palm/gnome-pilot-conduits/Makefile
index cc3e2f5ba38f..b66cc07b7ea6 100644
--- a/palm/gnome-pilot-conduits/Makefile
+++ b/palm/gnome-pilot-conduits/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Additional conduits for gnome-pilot
LIB_DEPENDS= gpilotd.1:${PORTSDIR}/palm/gnomepilot
diff --git a/palm/gnome-pilot-conduits/pkg-comment b/palm/gnome-pilot-conduits/pkg-comment
deleted file mode 100644
index 5c4d80df47e0..000000000000
--- a/palm/gnome-pilot-conduits/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional conduits for gnome-pilot
diff --git a/palm/gnome-pilot/Makefile b/palm/gnome-pilot/Makefile
index dded0660c808..dccff7e837ea 100644
--- a/palm/gnome-pilot/Makefile
+++ b/palm/gnome-pilot/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-pilot-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= 3Com PalmPilot conduit system for GNOME
BUILD_DEPENDS= gob:${PORTSDIR}/x11-toolkits/gob
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
diff --git a/palm/gnome-pilot/pkg-comment b/palm/gnome-pilot/pkg-comment
deleted file mode 100644
index c53d1ee51797..000000000000
--- a/palm/gnome-pilot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3Com PalmPilot conduit system for GNOME
diff --git a/palm/gnomepilot-conduits/Makefile b/palm/gnomepilot-conduits/Makefile
index cc3e2f5ba38f..b66cc07b7ea6 100644
--- a/palm/gnomepilot-conduits/Makefile
+++ b/palm/gnomepilot-conduits/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Additional conduits for gnome-pilot
LIB_DEPENDS= gpilotd.1:${PORTSDIR}/palm/gnomepilot
diff --git a/palm/gnomepilot-conduits/pkg-comment b/palm/gnomepilot-conduits/pkg-comment
deleted file mode 100644
index 5c4d80df47e0..000000000000
--- a/palm/gnomepilot-conduits/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional conduits for gnome-pilot
diff --git a/palm/gnomepilot-conduits2/Makefile b/palm/gnomepilot-conduits2/Makefile
index cc3e2f5ba38f..b66cc07b7ea6 100644
--- a/palm/gnomepilot-conduits2/Makefile
+++ b/palm/gnomepilot-conduits2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-pilot-conduits-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Additional conduits for gnome-pilot
LIB_DEPENDS= gpilotd.1:${PORTSDIR}/palm/gnomepilot
diff --git a/palm/gnomepilot-conduits2/pkg-comment b/palm/gnomepilot-conduits2/pkg-comment
deleted file mode 100644
index 5c4d80df47e0..000000000000
--- a/palm/gnomepilot-conduits2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional conduits for gnome-pilot
diff --git a/palm/gnomepilot/Makefile b/palm/gnomepilot/Makefile
index dded0660c808..dccff7e837ea 100644
--- a/palm/gnomepilot/Makefile
+++ b/palm/gnomepilot/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-pilot-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= 3Com PalmPilot conduit system for GNOME
BUILD_DEPENDS= gob:${PORTSDIR}/x11-toolkits/gob
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
diff --git a/palm/gnomepilot/pkg-comment b/palm/gnomepilot/pkg-comment
deleted file mode 100644
index c53d1ee51797..000000000000
--- a/palm/gnomepilot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3Com PalmPilot conduit system for GNOME
diff --git a/palm/gnomepilot2/Makefile b/palm/gnomepilot2/Makefile
index dded0660c808..dccff7e837ea 100644
--- a/palm/gnomepilot2/Makefile
+++ b/palm/gnomepilot2/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-pilot-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= 3Com PalmPilot conduit system for GNOME
BUILD_DEPENDS= gob:${PORTSDIR}/x11-toolkits/gob
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
diff --git a/palm/gnomepilot2/pkg-comment b/palm/gnomepilot2/pkg-comment
deleted file mode 100644
index c53d1ee51797..000000000000
--- a/palm/gnomepilot2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3Com PalmPilot conduit system for GNOME
diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile
index ea11c926b4f3..f25c37fd004c 100644
--- a/palm/imgvtopgm/Makefile
+++ b/palm/imgvtopgm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= palm graphics
MASTER_SITES= http://www.trends.net/~mu/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Palm Pilot Image Viewer to PGM Converter
LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm
diff --git a/palm/imgvtopgm/pkg-comment b/palm/imgvtopgm/pkg-comment
deleted file mode 100644
index acac9289a624..000000000000
--- a/palm/imgvtopgm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Palm Pilot Image Viewer to PGM Converter
diff --git a/palm/isilo/Makefile b/palm/isilo/Makefile
index 2409b2221d86..973e46933866 100644
--- a/palm/isilo/Makefile
+++ b/palm/isilo/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.iSilo.com/pub/
DISTNAME= iSiloBSD
MAINTAINER= nik@FreeBSD.org
+COMMENT= Converts documents from text/HTML to iSilo format
USE_ZIP= yes
NO_BUILD= yes
diff --git a/palm/isilo/pkg-comment b/palm/isilo/pkg-comment
deleted file mode 100644
index 7e377b856c5e..000000000000
--- a/palm/isilo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts documents from text/HTML to iSilo format
diff --git a/palm/malsync/Makefile b/palm/malsync/Makefile
index b63030875c74..a39509e6e56d 100644
--- a/palm/malsync/Makefile
+++ b/palm/malsync/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= dirk
DISTNAME= malsync_2.1.0.src
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Sync to Mobile Application Link (MAL) compliant servers
LIB_DEPENDS= pisock.8:${PORTSDIR}/palm/pilot-link
diff --git a/palm/malsync/pkg-comment b/palm/malsync/pkg-comment
deleted file mode 100644
index 93acc4d6973f..000000000000
--- a/palm/malsync/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sync to Mobile Application Link (MAL) compliant servers
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index fdc952a56517..192572c92762 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= palm comms tk83
MASTER_SITES= http://www.pilot-link.org/source/
MAINTAINER= dima@FreeBSD.org
+COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...)
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
tk83:${PORTSDIR}/x11-toolkits/tk83 \
diff --git a/palm/pilot-link-devel/pkg-comment b/palm/pilot-link-devel/pkg-comment
deleted file mode 100644
index 1207e4820ba5..000000000000
--- a/palm/pilot-link-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PalmPilot communications utilities (backup/restore/install/debug/...)
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index fdc952a56517..192572c92762 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= palm comms tk83
MASTER_SITES= http://www.pilot-link.org/source/
MAINTAINER= dima@FreeBSD.org
+COMMENT= PalmPilot communications utilities (backup/restore/install/debug/...)
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
tk83:${PORTSDIR}/x11-toolkits/tk83 \
diff --git a/palm/pilot-link/pkg-comment b/palm/pilot-link/pkg-comment
deleted file mode 100644
index 1207e4820ba5..000000000000
--- a/palm/pilot-link/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PalmPilot communications utilities (backup/restore/install/debug/...)
diff --git a/palm/romeo/Makefile b/palm/romeo/Makefile
index 8fb5ef8d1e71..68a5f9184fd7 100644
--- a/palm/romeo/Makefile
+++ b/palm/romeo/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= The Palm ROM Discombobulator
USE_GMAKE= yes
diff --git a/palm/romeo/pkg-comment b/palm/romeo/pkg-comment
deleted file mode 100644
index 7591f1137081..000000000000
--- a/palm/romeo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Palm ROM Discombobulator
diff --git a/palm/syncmal/Makefile b/palm/syncmal/Makefile
index 93162414d7af..f46b284f0b63 100644
--- a/palm/syncmal/Makefile
+++ b/palm/syncmal/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://jasonday.home.att.net/code/syncmal/
DISTNAME= jpilot-${PORTNAME}_${PORTVERSION}${EXTRACTSUFX}
MAINTAINER= fenner@FreeBSD.Org
+COMMENT= A MAL plugin for jpilot, to synchronize with services like AvantGo
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/palm/jpilot:patch \
${NONEXISTENT}:${PORTSDIR}/palm/malsync:patch
diff --git a/palm/syncmal/pkg-comment b/palm/syncmal/pkg-comment
deleted file mode 100644
index ee5f0c68528b..000000000000
--- a/palm/syncmal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A MAL plugin for jpilot, to synchronize with services like AvantGo
diff --git a/picobsd/ssh-picobsd/Makefile b/picobsd/ssh-picobsd/Makefile
index 7602a6cf6373..b4e72eff528c 100644
--- a/picobsd/ssh-picobsd/Makefile
+++ b/picobsd/ssh-picobsd/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= \
ftp://ftp.nsysu.edu.tw/Unix/Security/ssh/old/
MAINTAINER= luigi@FreeBSD.org
+COMMENT= Secure shell client, server and remote copy (for picobsd)
NO_CDROM= "Picobsd only"
NO_PACKAGE= "This is only useful to build picobsd images"
diff --git a/picobsd/ssh-picobsd/pkg-comment b/picobsd/ssh-picobsd/pkg-comment
deleted file mode 100644
index 5bdd6e93c317..000000000000
--- a/picobsd/ssh-picobsd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Secure shell client, server and remote copy (for picobsd)
diff --git a/polish/kde3-i18n/Makefile b/polish/kde3-i18n/Makefile
index b2345e6aca4f..7cf5bd533b4e 100644
--- a/polish/kde3-i18n/Makefile
+++ b/polish/kde3-i18n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/polish/kde3-i18n/pkg-comment b/polish/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/polish/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/polish/kde4-l10n/Makefile b/polish/kde4-l10n/Makefile
index b2345e6aca4f..7cf5bd533b4e 100644
--- a/polish/kde4-l10n/Makefile
+++ b/polish/kde4-l10n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pl-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/polish/kde4-l10n/pkg-comment b/polish/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/polish/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/ports-mgmt/p5-FreeBSD-Ports/Makefile b/ports-mgmt/p5-FreeBSD-Ports/Makefile
index 5e51cc112720..7799fc077646 100644
--- a/ports-mgmt/p5-FreeBSD-Ports/Makefile
+++ b/ports-mgmt/p5-FreeBSD-Ports/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://people.FreeBSD.org/~tom/portpm/
PKGNAMEPREFIX= p5-
MAINTAINER= tom@FreeBSD.org
+COMMENT= Perl modules for parsing FreeBSD's Ports INDEX file
USE_BZIP2= yes
diff --git a/ports-mgmt/p5-FreeBSD-Ports/pkg-comment b/ports-mgmt/p5-FreeBSD-Ports/pkg-comment
deleted file mode 100644
index 4ace9e196f0f..000000000000
--- a/ports-mgmt/p5-FreeBSD-Ports/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules for parsing FreeBSD's Ports INDEX file
diff --git a/ports-mgmt/porteasy/Makefile b/ports-mgmt/porteasy/Makefile
index 36deea7d384a..bd24dc02d3fc 100644
--- a/ports-mgmt/porteasy/Makefile
+++ b/ports-mgmt/porteasy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= des@FreeBSD.org
+COMMENT= A tool for fetching and building ports
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/ports-mgmt/porteasy/pkg-comment b/ports-mgmt/porteasy/pkg-comment
deleted file mode 100644
index b0b24b7f52b0..000000000000
--- a/ports-mgmt/porteasy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for fetching and building ports
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index d91f648dc25f..3a6b09f4c26d 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= mharo@FreeBSD.org
+COMMENT= A verifier for FreeBSD port directory
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/ports-mgmt/portlint/pkg-comment b/ports-mgmt/portlint/pkg-comment
deleted file mode 100644
index 01f338f767e7..000000000000
--- a/ports-mgmt/portlint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A verifier for FreeBSD port directory
diff --git a/portuguese/kde3-i18n-pt_BR/Makefile b/portuguese/kde3-i18n-pt_BR/Makefile
index aeb8cda72234..6a7e533902a3 100644
--- a/portuguese/kde3-i18n-pt_BR/Makefile
+++ b/portuguese/kde3-i18n-pt_BR/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pt_BR-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde3-i18n-pt_BR/pkg-comment b/portuguese/kde3-i18n-pt_BR/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/portuguese/kde3-i18n-pt_BR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/portuguese/kde3-i18n/Makefile b/portuguese/kde3-i18n/Makefile
index bc6f00653a6e..e1bbaf4c962a 100644
--- a/portuguese/kde3-i18n/Makefile
+++ b/portuguese/kde3-i18n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pt-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde3-i18n/pkg-comment b/portuguese/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/portuguese/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile b/portuguese/kde4-l10n-pt_BR/Makefile
index aeb8cda72234..6a7e533902a3 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile
+++ b/portuguese/kde4-l10n-pt_BR/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pt_BR-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde4-l10n-pt_BR/pkg-comment b/portuguese/kde4-l10n-pt_BR/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/portuguese/kde4-l10n-pt_BR/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/portuguese/kde4-l10n/Makefile b/portuguese/kde4-l10n/Makefile
index bc6f00653a6e..e1bbaf4c962a 100644
--- a/portuguese/kde4-l10n/Makefile
+++ b/portuguese/kde4-l10n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= pt-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/portuguese/kde4-l10n/pkg-comment b/portuguese/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/portuguese/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/portuguese/staroffice52/Makefile b/portuguese/staroffice52/Makefile
index 80c78d4e99a3..92c8124fec3b 100644
--- a/portuguese/staroffice52/Makefile
+++ b/portuguese/staroffice52/Makefile
@@ -25,6 +25,7 @@ DISTFILES+= soa-5_2-ga-bin-linux-pt.bin
EXTRACT_ONLY= 109939-03.tar.Z
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Sistema integrado de processador de texto/planilha/e muito mais
FETCH_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base
diff --git a/portuguese/staroffice52/pkg-comment b/portuguese/staroffice52/pkg-comment
deleted file mode 100644
index 74fb06912640..000000000000
--- a/portuguese/staroffice52/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sistema integrado de processador de texto/planilha/e muito mais
diff --git a/print/a2ps-letter/Makefile b/print/a2ps-letter/Makefile
index f9d0c097e917..63b126cda307 100644
--- a/print/a2ps-letter/Makefile
+++ b/print/a2ps-letter/Makefile
@@ -17,6 +17,7 @@ DISTFILES= a2ps-${PORTVERSION}${EXTRACT_SUFX} sheets.map
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= Formats an ascii file for printing on a postscript printer
BROKEN= "Installs files in /"
diff --git a/print/a2ps-letter/pkg-comment b/print/a2ps-letter/pkg-comment
deleted file mode 100644
index ec44d846c31e..000000000000
--- a/print/a2ps-letter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Formats an ascii file for printing on a postscript printer
diff --git a/print/abc2mtex/Makefile b/print/abc2mtex/Makefile
index 58eacbb7d9b7..6c9ccfa74edf 100644
--- a/print/abc2mtex/Makefile
+++ b/print/abc2mtex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= support/abc2mtex
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= joerg@freebsd.org
+COMMENT= Music TeX converter from "abc" to MusiXTeX format
RUN_DEPENDS= musixtex:${PORTSDIR}/print/musixtex
diff --git a/print/abc2mtex/pkg-comment b/print/abc2mtex/pkg-comment
deleted file mode 100644
index 63935ef4fa6a..000000000000
--- a/print/abc2mtex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Music TeX converter from "abc" to MusiXTeX format
diff --git a/print/acrobatviewer/Makefile b/print/acrobatviewer/Makefile
index f3cffed0a6b7..a4cf5e969d92 100644
--- a/print/acrobatviewer/Makefile
+++ b/print/acrobatviewer/Makefile
@@ -13,6 +13,7 @@ DISTNAME= viewer.bin
EXTRACT_SUFX=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Viewer for the PDF files written in Java(TM)
RUN_DEPENDS= ${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre
diff --git a/print/acrobatviewer/pkg-comment b/print/acrobatviewer/pkg-comment
deleted file mode 100644
index d68bff61e1a8..000000000000
--- a/print/acrobatviewer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Viewer for the PDF files written in Java(TM)
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index a24a45d0a876..f318ff3f85d0 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -20,6 +20,7 @@ EXTRACT_SUFX= .tar.Z
LATEST_LINK= acroread3
MAINTAINER= tg@FreeBSD.org
+COMMENT= View, distribute and print PDF documents
.if ${ARCH} == "i386"
USE_LINUX= yes
diff --git a/print/acroread/pkg-comment b/print/acroread/pkg-comment
deleted file mode 100644
index 4f31de055120..000000000000
--- a/print/acroread/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View, distribute and print PDF documents
diff --git a/print/acroread4/Makefile b/print/acroread4/Makefile
index c8649f1e08f9..edd0178c929a 100644
--- a/print/acroread4/Makefile
+++ b/print/acroread4/Makefile
@@ -17,6 +17,7 @@ DISTNAME= fdec-rs-405
.endif
MAINTAINER= dima@FreeBSD.org
+COMMENT= View, distribute and print PDF documents
.if ${ARCH} == "i386"
USE_LINUX= yes
diff --git a/print/acroread4/pkg-comment b/print/acroread4/pkg-comment
deleted file mode 100644
index 4f31de055120..000000000000
--- a/print/acroread4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-View, distribute and print PDF documents
diff --git a/print/adobe-cmaps/Makefile b/print/adobe-cmaps/Makefile
index 8c395bb5c4f2..75636c4ef407 100644
--- a/print/adobe-cmaps/Makefile
+++ b/print/adobe-cmaps/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.gyve.org/pub/gs-cjk/ \
DIST_SUBDIR= ghostscript
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= Adobe CMap collection
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/print/adobe-cmaps/pkg-comment b/print/adobe-cmaps/pkg-comment
deleted file mode 100644
index 577ab9f8075a..000000000000
--- a/print/adobe-cmaps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Adobe CMap collection
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 9c12eec584ce..151c2c82cf0b 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
MAINTAINER= andreas@FreeBSD.org
+COMMENT= Magic print filter with file type recognition, print preview, duplex printing
DIST_SUBDIR= apsfilter
diff --git a/print/apsfilter/pkg-comment b/print/apsfilter/pkg-comment
deleted file mode 100644
index 2da44d738326..000000000000
--- a/print/apsfilter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Magic print filter with file type recognition, print preview, duplex printing
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index fd32cd075de3..0a5db4c8c6b5 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= print elisp
MASTER_SITES= http://savannah.nongnu.org/download/auctex/stable.pkg/${PORTVERSION}/
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= Integrated environment for writing LaTeX using GNU Emacs
RUN_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/print/auctex/pkg-comment b/print/auctex/pkg-comment
deleted file mode 100644
index ef57cd5a8346..000000000000
--- a/print/auctex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Integrated environment for writing LaTeX using GNU Emacs
diff --git a/print/c2ps-letter/Makefile b/print/c2ps-letter/Makefile
index 6809e622aa62..6fb0353c8b41 100644
--- a/print/c2ps-letter/Makefile
+++ b/print/c2ps-letter/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cs.technion.ac.il/users/c2ps/
DISTNAME= c2ps-${PORTVERSION}
MAINTAINER= mph@freebsd.org
+COMMENT= A PostScript pretty-printer for C source
MAN1= c2ps.1
MAKE_ENV= DEFAULT_PAPER_TYPE=${PS}
diff --git a/print/c2ps-letter/pkg-comment b/print/c2ps-letter/pkg-comment
deleted file mode 100644
index ad0cdcb90234..000000000000
--- a/print/c2ps-letter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PostScript pretty-printer for C source
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index 7ef5dcfe3a25..a6ea4b769c3f 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= cjk-
DISTNAME= CJK-LyX-${PORTVERSION}-src
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Document processor interfaced with LaTeX, with CJK support
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
latex:${PORTSDIR}/print/teTeX
diff --git a/print/cjk-lyx/pkg-comment b/print/cjk-lyx/pkg-comment
deleted file mode 100644
index d9e4053972d2..000000000000
--- a/print/cjk-lyx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Document processor interfaced with LaTeX, with CJK support
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index a0492240ff31..11fd3e3995e1 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= print
MASTER_SITES= ${CUPS_MASTER_SITES}
MAINTAINER= alane@FreeBSD.org
+COMMENT= The Common UNIX Printing System: headers, libs, & daemons
INSTALLS_SHLIB= yes
diff --git a/print/cups-base/pkg-comment b/print/cups-base/pkg-comment
deleted file mode 100644
index b0a86cc24c7a..000000000000
--- a/print/cups-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Common UNIX Printing System: headers, libs, & daemons
diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 1d0a6da7014f..ffccd4eb6dcb 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -15,6 +15,7 @@ CATEGORIES= print
MASTER_SITES= ${CUPS_MASTER_SITES}
MAINTAINER= alane@FreeBSD.org
+COMMENT= The CUPS BSD and system V compatibility binaries (lp* commands)
post-install:
${FIND} ${PREFIX}/man/cat* -type l -name '*.0' -delete
diff --git a/print/cups-lpr/pkg-comment b/print/cups-lpr/pkg-comment
deleted file mode 100644
index c3cdc3535006..000000000000
--- a/print/cups-lpr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The CUPS BSD and system V compatibility binaries (lp* commands)
diff --git a/print/cups-pstoraster/Makefile b/print/cups-pstoraster/Makefile
index f95ebdaf838f..4bd2c6f20f8b 100644
--- a/print/cups-pstoraster/Makefile
+++ b/print/cups-pstoraster/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= espgs
DISTNAME= espgs-${PORTVERSION}-source
MAINTAINER= alane@FreeBSD.org
+COMMENT= GNU Postscript interpreter for CUPS printing to non-PS printers
LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base
RUN_DEPENDS+= ${LOCALBASE}/share/ghostscript/fonts/fonts.scale:${PORTSDIR}/print/ghostscript-gnu
diff --git a/print/cups-pstoraster/pkg-comment b/print/cups-pstoraster/pkg-comment
deleted file mode 100644
index 8750b08a14ec..000000000000
--- a/print/cups-pstoraster/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU Postscript interpreter for CUPS printing to non-PS printers
diff --git a/print/cups/Makefile b/print/cups/Makefile
index f1d2afdfb156..88b63eee0cb7 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -17,6 +17,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= alane@FreeBSD.org
+COMMENT= The Common UNIX Printing System: Metaport to install complete system
LIB_DEPENDS+= cups.2:${.CURDIR}/../../print/cups-base
RUN_DEPENDS+= espgs:${.CURDIR}/../../print/cups-pstoraster \
diff --git a/print/cups/pkg-comment b/print/cups/pkg-comment
deleted file mode 100644
index b035e44e685c..000000000000
--- a/print/cups/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Common UNIX Printing System: Metaport to install complete system
diff --git a/print/dvi2xx/Makefile b/print/dvi2xx/Makefile
index 7758babe2864..9279d667a9f9 100644
--- a/print/dvi2xx/Makefile
+++ b/print/dvi2xx/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= dviware
DISTNAME= dvi2xx
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Convert dvi files to HP LaserJet or IBM 3812 format
MAN1= dvi2xx.1
IGNOREFILES= ${DISTFILES}
diff --git a/print/dvi2xx/pkg-comment b/print/dvi2xx/pkg-comment
deleted file mode 100644
index 91b6928761ef..000000000000
--- a/print/dvi2xx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert dvi files to HP LaserJet or IBM 3812 format
diff --git a/print/dvips/Makefile b/print/dvips/Makefile
index 202f0bbca821..c4dace9ab755 100644
--- a/print/dvips/Makefile
+++ b/print/dvips/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= jmz
DISTNAME= dvips576
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Convert a TeX DVI file to PostScript
WRKSRC= ${WRKDIR}/dvips576/dvips
IS_INTERACTIVE= yes
diff --git a/print/dvips/pkg-comment b/print/dvips/pkg-comment
deleted file mode 100644
index 2318ee8c5706..000000000000
--- a/print/dvips/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert a TeX DVI file to PostScript
diff --git a/print/dviselect/Makefile b/print/dviselect/Makefile
index c88ef3acf017..2a0ec75851ec 100644
--- a/print/dviselect/Makefile
+++ b/print/dviselect/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= jmz
DISTNAME= ${PORTNAME}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Extract pages from DVI files
SCRIPTS_ENV= CFLAGS="${CFLAGS}"
diff --git a/print/dviselect/pkg-comment b/print/dviselect/pkg-comment
deleted file mode 100644
index 9e7f8495f181..000000000000
--- a/print/dviselect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extract pages from DVI files
diff --git a/print/freetype2/Makefile b/print/freetype2/Makefile
index fcab163e18e8..baed1ac69f91 100644
--- a/print/freetype2/Makefile
+++ b/print/freetype2/Makefile
@@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME:S/2//}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A free and portable TrueType font rendering engine
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/print/freetype2/pkg-comment b/print/freetype2/pkg-comment
deleted file mode 100644
index 303f1e3cabaf..000000000000
--- a/print/freetype2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free and portable TrueType font rendering engine
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index c5dbf6825baf..a5e8b3e8d62a 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/ggv/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME ghostscript viewer
RUN_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
diff --git a/print/ggv/pkg-comment b/print/ggv/pkg-comment
deleted file mode 100644
index 4104aa4014ae..000000000000
--- a/print/ggv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME ghostscript viewer
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 97af30edf9e5..54a1e8545907 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ggv-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 ghostscript viewer
BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript-gnu
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/print/ggv2/pkg-comment b/print/ggv2/pkg-comment
deleted file mode 100644
index 3ba11e5d0bbd..000000000000
--- a/print/ggv2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 ghostscript viewer
diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 6dcd3c610ae3..326e8315431e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-print-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome print support library
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
diff --git a/print/gnome-print/pkg-comment b/print/gnome-print/pkg-comment
deleted file mode 100644
index 7ab03ca6b3e7..000000000000
--- a/print/gnome-print/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome print support library
diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile
index 6dcd3c610ae3..326e8315431e 100644
--- a/print/gnomeprint/Makefile
+++ b/print/gnomeprint/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-print-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome print support library
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
diff --git a/print/gnomeprint/pkg-comment b/print/gnomeprint/pkg-comment
deleted file mode 100644
index 7ab03ca6b3e7..000000000000
--- a/print/gnomeprint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome print support library
diff --git a/print/html2latex/Makefile b/print/html2latex/Makefile
index 20209c4076d3..23802acc99e6 100644
--- a/print/html2latex/Makefile
+++ b/print/html2latex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
EXTRACT_SUFX= .tar.Z
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Convert HTML document into LaTeX
MAN1= html2latex.1
MANCOMPRESSED= yes
diff --git a/print/html2latex/pkg-comment b/print/html2latex/pkg-comment
deleted file mode 100644
index f49728ca4df8..000000000000
--- a/print/html2latex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert HTML document into LaTeX
diff --git a/print/hugelatex/Makefile b/print/hugelatex/Makefile
index d9db052fd083..3f5dbaa7bca1 100644
--- a/print/hugelatex/Makefile
+++ b/print/hugelatex/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= murray@FreeBSD.org
+COMMENT= LaTeX format files with large limits
BUILD_DEPENDS= tex:${PORTSDIR}/print/teTeX
diff --git a/print/hugelatex/pkg-comment b/print/hugelatex/pkg-comment
deleted file mode 100644
index 10e41fcfa7ac..000000000000
--- a/print/hugelatex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-LaTeX format files with large limits
diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile
index 05c2ad75ecb3..e8b38725b9c2 100644
--- a/print/jadetex/Makefile
+++ b/print/jadetex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= jadetex
MAINTAINER= nik@FreeBSD.org
+COMMENT= A TeX backend for Jade, for typesetting SGML documents
BUILD_DEPENDS= hugelatex:${PORTSDIR}/print/hugelatex
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/print/jadetex/pkg-comment b/print/jadetex/pkg-comment
deleted file mode 100644
index 5923e7f38424..000000000000
--- a/print/jadetex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A TeX backend for Jade, for typesetting SGML documents
diff --git a/print/latex/Makefile b/print/latex/Makefile
index a6012e0a2c66..e5e3c3da7350 100644
--- a/print/latex/Makefile
+++ b/print/latex/Makefile
@@ -15,6 +15,7 @@ DISTFILES= latex_mf-${PORTVERSION}.tar.gz latex_tfm-${PORTVERSION}.tar.gz \
latex_graphics-${PORTVERSION}.tar.gz latex_psnfss-${PORTVERSION}.tar.gz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= TeX macro package
BUILD_DEPENDS= tex:${PORTSDIR}/print/tex
RUN_DEPENDS= tex:${PORTSDIR}/print/tex
diff --git a/print/latex/pkg-comment b/print/latex/pkg-comment
deleted file mode 100644
index 394a727ded4a..000000000000
--- a/print/latex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TeX macro package
diff --git a/print/latex2rtf/Makefile b/print/latex2rtf/Makefile
index 67d22a83ab0e..c58f7abb247d 100644
--- a/print/latex2rtf/Makefile
+++ b/print/latex2rtf/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME} support/latex2rtf
MAINTAINER= joerg@FreeBSD.org
+COMMENT= Translator from LaTeX to RTF
MAN1= latex2rtf.1
diff --git a/print/latex2rtf/pkg-comment b/print/latex2rtf/pkg-comment
deleted file mode 100644
index 501fde8dc75f..000000000000
--- a/print/latex2rtf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Translator from LaTeX to RTF
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 7618cc15344b..816b889f8a33 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome print support library
LIB_DEPENDS= bonobo-2.0:${PORTSDIR}/devel/libbonobo \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
diff --git a/print/libgnomeprint/pkg-comment b/print/libgnomeprint/pkg-comment
deleted file mode 100644
index 7ab03ca6b3e7..000000000000
--- a/print/libgnomeprint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome print support library
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 1a60062f85c4..5577231efe1a 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/printing
MAINTAINER= cjh@FreeBSD.org
+COMMENT= Customizable, extensible automatic printer filter
# at least, gs must exist in many case
BUILD_DEPENDS= ${PREFIX}/bin/gs:${PORTSDIR}/print/ghostscript-gnu
diff --git a/print/magicfilter/pkg-comment b/print/magicfilter/pkg-comment
deleted file mode 100644
index e0e3b184f29c..000000000000
--- a/print/magicfilter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Customizable, extensible automatic printer filter
diff --git a/print/makeindex/Makefile b/print/makeindex/Makefile
index 57fa25c5ab25..a2838bda2ca1 100644
--- a/print/makeindex/Makefile
+++ b/print/makeindex/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.th-darmstadt.de/pub/tex/src/makeindex/BETA/
EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A general purpose, formatter-independent index processor
WRKSRC= ${WRKDIR}/makeindex
MAN1= makeindex.1
diff --git a/print/makeindex/pkg-comment b/print/makeindex/pkg-comment
deleted file mode 100644
index 0bfeb6eb971b..000000000000
--- a/print/makeindex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A general purpose, formatter-independent index processor
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile
index 251a6d775c05..4322bbfe4133 100644
--- a/print/mp-letter/Makefile
+++ b/print/mp-letter/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://relay.NUXI.org/pub/misc/ \
DISTNAME= mp-3.0.1
MAINTAINER= obrien@FreeBSD.org
+COMMENT= A PostScript printing util for ASCII files, email, USENET news articles, etc
WRKSRC= ${WRKDIR}/mp
MAN1= mp.1
diff --git a/print/mp-letter/pkg-comment b/print/mp-letter/pkg-comment
deleted file mode 100644
index 7bff9fae7643..000000000000
--- a/print/mp-letter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PostScript printing util for ASCII files, email, USENET news articles, etc
diff --git a/print/musixtex/Makefile b/print/musixtex/Makefile
index 2d9a86ca54eb..7d843b55cf29 100644
--- a/print/musixtex/Makefile
+++ b/print/musixtex/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.tex.ac.uk/tex-archive/macros/musixtex/taupin/
DISTFILES= musixtex-T98.tar.gz musixexa-T90.tar.gz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A set of TeX macros to typeset music
BUILD_DEPENDS= tex:${PORTSDIR}/print/tex
RUN_DEPENDS= tex:${PORTSDIR}/print/tex
diff --git a/print/musixtex/pkg-comment b/print/musixtex/pkg-comment
deleted file mode 100644
index 9e8b2170e8ab..000000000000
--- a/print/musixtex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of TeX macros to typeset music
diff --git a/print/p5-GnomePrint/Makefile b/print/p5-GnomePrint/Makefile
index aa955ba4c775..7993ace28084 100644
--- a/print/p5-GnomePrint/Makefile
+++ b/print/p5-GnomePrint/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Gnome Print module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk/Pixbuf.pm:${PORTSDIR}/x11-toolkits/p5-GdkPixbuf \
diff --git a/print/p5-GnomePrint/pkg-comment b/print/p5-GnomePrint/pkg-comment
deleted file mode 100644
index b68330515b20..000000000000
--- a/print/p5-GnomePrint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Gnome Print module of Gtk-Perl
diff --git a/print/p5-PostScript-Simple/Makefile b/print/p5-PostScript-Simple/Makefile
index c07f7f8cb90b..83037398bd00 100644
--- a/print/p5-PostScript-Simple/Makefile
+++ b/print/p5-PostScript-Simple/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= PostScript
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= PostScript::Simple - Produce PostScript files from Perl
PERL_CONFIGURE= yes
diff --git a/print/p5-PostScript-Simple/pkg-comment b/print/p5-PostScript-Simple/pkg-comment
deleted file mode 100644
index 364f28eba82d..000000000000
--- a/print/p5-PostScript-Simple/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PostScript::Simple - Produce PostScript files from Perl
diff --git a/print/p5-Text-PDF/Makefile b/print/p5-Text-PDF/Makefile
index 4c1b0b80338c..d87dd0157414 100644
--- a/print/p5-Text-PDF/Makefile
+++ b/print/p5-Text-PDF/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A PDF manipulation module
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/print/p5-Text-PDF/pkg-comment b/print/p5-Text-PDF/pkg-comment
deleted file mode 100644
index 6327e28a17a2..000000000000
--- a/print/p5-Text-PDF/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PDF manipulation module
diff --git a/print/passivetex/Makefile b/print/passivetex/Makefile
index cb0f25c5016d..7464c5cb0272 100644
--- a/print/passivetex/Makefile
+++ b/print/passivetex/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.tei-c.org.uk/Software/passivetex/
DISTFILES= passivetex.zip
MAINTAINER= nik@FreeBSD.org
+COMMENT= XSL FO processor, written in TeX
BUILD_DEPENDS= ${LOCALBASE}/share/texmf/web2c/xmltex.fmt:${PORTSDIR}/print/xmltex
diff --git a/print/passivetex/pkg-comment b/print/passivetex/pkg-comment
deleted file mode 100644
index 00a8801651c2..000000000000
--- a/print/passivetex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSL FO processor, written in TeX
diff --git a/print/pdflib3/Makefile b/print/pdflib3/Makefile
index fcd2efe70023..84cb4d4851c2 100644
--- a/print/pdflib3/Makefile
+++ b/print/pdflib3/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= print
MASTER_SITES= http://www.pdflib.com/pdflib/download/
MAINTAINER= billf@FreeBSD.org
+COMMENT= A C library for dynamically generating PDF
BROKEN= "Distfile has disappeared"
diff --git a/print/pdflib3/pkg-comment b/print/pdflib3/pkg-comment
deleted file mode 100644
index 374fc0a251f4..000000000000
--- a/print/pdflib3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C library for dynamically generating PDF
diff --git a/print/perlftlib/Makefile b/print/perlftlib/Makefile
index 4e6d928c4789..0c1ca9dd1496 100644
--- a/print/perlftlib/Makefile
+++ b/print/perlftlib/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.io.com/~kazushi/xtt/ \
MASTER_SITE_SUBDIR= sada
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Libraries to use the FreeType library from the perl language
RUN_DEPENDS= ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/jcode.pl:${PORTSDIR}/japanese/jcode.pl
diff --git a/print/perlftlib/pkg-comment b/print/perlftlib/pkg-comment
deleted file mode 100644
index 4ae13f8908fe..000000000000
--- a/print/perlftlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libraries to use the FreeType library from the perl language
diff --git a/print/preview-latex/Makefile b/print/preview-latex/Makefile
index 2c96f2ed9857..f43c93459343 100644
--- a/print/preview-latex/Makefile
+++ b/print/preview-latex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER= yoichi@FreeBSD.org
+COMMENT= LaTeX previewer on Emacs
BUILD_DEPENDS= ${LOCALBASE}/${EMACS_SITE_LISPDIR}/auctex/latex.el:${PORTSDIR}/print/auctex \
gs:${PORTSDIR}/print/ghostscript-gnu
diff --git a/print/preview-latex/pkg-comment b/print/preview-latex/pkg-comment
deleted file mode 100644
index 1b0cdcd6295a..000000000000
--- a/print/preview-latex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-LaTeX previewer on Emacs
diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile
index 7c78436e2065..5198954fd0f9 100644
--- a/print/psutils-letter/Makefile
+++ b/print/psutils-letter/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.dcs.ed.ac.uk/pub/ajcd/ \
DISTNAME= psutils-p17
MAINTAINER= jmz@FreeBSD.org
+COMMENT= Utilities for manipulating PostScript documents
USE_PERL5= yes
WRKSRC= ${WRKDIR}/psutils
diff --git a/print/psutils-letter/pkg-comment b/print/psutils-letter/pkg-comment
deleted file mode 100644
index 760591f3c055..000000000000
--- a/print/psutils-letter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for manipulating PostScript documents
diff --git a/print/py-freetype/Makefile b/print/py-freetype/Makefile
index 3891ff56184e..37dc13dacb21 100644
--- a/print/py-freetype/Makefile
+++ b/print/py-freetype/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://starship.python.net/crew/kernr/source/
DISTNAME= PyFT-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A Python wrapping of the FreeType 1.2 fonts rendering engine
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/print/py-freetype/pkg-comment b/print/py-freetype/pkg-comment
deleted file mode 100644
index 97a03f018919..000000000000
--- a/print/py-freetype/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python wrapping of the FreeType 1.2 fonts rendering engine
diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile
index b334ace5f73c..15bfc0d88583 100644
--- a/print/rlpr/Makefile
+++ b/print/rlpr/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/printing
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Send print jobs to lpd servers anywhere on a network
#LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/print/rlpr/pkg-comment b/print/rlpr/pkg-comment
deleted file mode 100644
index 63ced39cd030..000000000000
--- a/print/rlpr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Send print jobs to lpd servers anywhere on a network
diff --git a/print/tex/Makefile b/print/tex/Makefile
index 2c78bffebbb3..7831ed4b647f 100644
--- a/print/tex/Makefile
+++ b/print/tex/Makefile
@@ -17,6 +17,7 @@ EXTRACT_ONLY= web2c-7.2b.tar.gz web-7.2a.tar.gz tex_base.tar.gz cm_tfm.tar.gz \
mf_lib.tar.gz cm_mf.tar.gz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= TeX and METAFONT
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/tex/pkg-comment b/print/tex/pkg-comment
deleted file mode 100644
index 4fd123f9f952..000000000000
--- a/print/tex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TeX and METAFONT
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index e1a658a8971f..33e2b408af1a 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= . previous_versions
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= Tools to convert Xfig's .fig files
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
diff --git a/print/transfig/pkg-comment b/print/transfig/pkg-comment
deleted file mode 100644
index 8a2e5169027a..000000000000
--- a/print/transfig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tools to convert Xfig's .fig files
diff --git a/print/trueprint/Makefile b/print/trueprint/Makefile
index 817a98b16622..3be6c351310a 100644
--- a/print/trueprint/Makefile
+++ b/print/trueprint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= trueprint
MAINTAINER= demon@FreeBSD.org
+COMMENT= Print program listings on postscript printer
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/print/trueprint/pkg-comment b/print/trueprint/pkg-comment
deleted file mode 100644
index 02a65cc4c9f2..000000000000
--- a/print/trueprint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print program listings on postscript printer
diff --git a/print/ttftot42/Makefile b/print/ttftot42/Makefile
index d5b19f96eca8..fc4dd0e3a6db 100644
--- a/print/ttftot42/Makefile
+++ b/print/ttftot42/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= print
MASTER_SITES= http://www.giga.or.at/pub/nih/ttftot42/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= TrueType to Type42 font converter
USE_FREETYPE= yes
GNU_CONFIGURE= yes
diff --git a/print/ttftot42/pkg-comment b/print/ttftot42/pkg-comment
deleted file mode 100644
index e69925d9a226..000000000000
--- a/print/ttftot42/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-TrueType to Type42 font converter
diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile
index 47c3aa4e3c6d..fa9916e858eb 100644
--- a/print/virtualpaper/Makefile
+++ b/print/virtualpaper/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= print
DISTFILES=
MAINTAINER= jdp@FreeBSD.org
+COMMENT= Virtual Paper document storage and viewing software
BUILD_DEPENDS= ${L1}libm3vbtkit${L2}:${PORTSDIR}/lang/pm3-forms
RUN_DEPENDS= ${L1}libm3vbtkit${L2}:${PORTSDIR}/lang/pm3-forms
diff --git a/print/virtualpaper/pkg-comment b/print/virtualpaper/pkg-comment
deleted file mode 100644
index 300ba661f382..000000000000
--- a/print/virtualpaper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Virtual Paper document storage and viewing software
diff --git a/print/wmlpq/Makefile b/print/wmlpq/Makefile
index 2da14b6a1988..177ac9ccd195 100644
--- a/print/wmlpq/Makefile
+++ b/print/wmlpq/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.ur.uklinux.net/wmlpq/dl/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Print queue monitoring dockapp for Window Maker
LIB_DEPENDS= dockapp.1:${PORTSDIR}/x11-wm/libdockapp
diff --git a/print/wmlpq/pkg-comment b/print/wmlpq/pkg-comment
deleted file mode 100644
index 08624f3130a4..000000000000
--- a/print/wmlpq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print queue monitoring dockapp for Window Maker
diff --git a/print/xdvi/Makefile b/print/xdvi/Makefile
index e35f64cabb1b..bbe20f7edf37 100644
--- a/print/xdvi/Makefile
+++ b/print/xdvi/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-20
EXTRACT_SUFX= .tar.Z
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A DVI Previewer for the X Window System
DIST_SUBDIR= xdvi # to share distfiles with japanese/xdvi
USE_IMAKE= yes
diff --git a/print/xdvi/pkg-comment b/print/xdvi/pkg-comment
deleted file mode 100644
index 82d37f8fac7c..000000000000
--- a/print/xdvi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A DVI Previewer for the X Window System
diff --git a/print/xmltex/Makefile b/print/xmltex/Makefile
index c5ea1748a400..bbf87781299d 100644
--- a/print/xmltex/Makefile
+++ b/print/xmltex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= macros/xmltex/
DISTFILES= base.zip
MAINTAINER= nik@FreeBSD.org
+COMMENT= A non-validating XML parser, written in TeX
BUILD_DEPENDS= hugelatex:${PORTSDIR}/print/hugelatex
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/print/xmltex/pkg-comment b/print/xmltex/pkg-comment
deleted file mode 100644
index 970170d20325..000000000000
--- a/print/xmltex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A non-validating XML parser, written in TeX
diff --git a/russian/X.language/Makefile b/russian/X.language/Makefile
index 07b4c69c30b6..b5a4d0dbc96f 100644
--- a/russian/X.language/Makefile
+++ b/russian/X.language/Makefile
@@ -19,6 +19,7 @@ DISTFILES+= Type1.koi8-r.free.tgz:kiae
.endif
MAINTAINER= ache@FreeBSD.org
+COMMENT= Setup X locale/nls/keyboard/fonts for russian language (koi8-r)
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/russian/X.language/pkg-comment b/russian/X.language/pkg-comment
deleted file mode 100644
index a7c65eee9b6f..000000000000
--- a/russian/X.language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Setup X locale/nls/keyboard/fonts for russian language (koi8-r)
diff --git a/russian/d1489/Makefile b/russian/d1489/Makefile
index 7a3c6f0efa70..83e2b7ac5738 100644
--- a/russian/d1489/Makefile
+++ b/russian/d1489/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES= http://koi8.pp.ru/dist/
EXTRACT_SUFX= .tgz
MAINTAINER= ache@FreeBSD.org
+COMMENT= Cp866<->koi8-r and cp1251<->koi8-r decoders and font converter acc. to RFC1489
.include <bsd.port.mk>
diff --git a/russian/d1489/pkg-comment b/russian/d1489/pkg-comment
deleted file mode 100644
index 90d958f288e1..000000000000
--- a/russian/d1489/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cp866<->koi8-r and cp1251<->koi8-r decoders and font converter acc. to RFC1489
diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile
index a7992db46ae4..64dda67f0904 100644
--- a/russian/elm.language/Makefile
+++ b/russian/elm.language/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= russian mail
EXTRACT_ONLY= # empty
MAINTAINER= ache@FreeBSD.org
+COMMENT= Tune Elm with MIME for KOI8-R defaults
RUN_DEPENDS+= elm:${PORTSDIR}/mail/elm+ME
diff --git a/russian/elm.language/pkg-comment b/russian/elm.language/pkg-comment
deleted file mode 100644
index cf86f2feae1a..000000000000
--- a/russian/elm.language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tune Elm with MIME for KOI8-R defaults
diff --git a/russian/kde3-i18n/Makefile b/russian/kde3-i18n/Makefile
index 179ab9ffe16b..d76560e3be98 100644
--- a/russian/kde3-i18n/Makefile
+++ b/russian/kde3-i18n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ru-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/russian/kde3-i18n/pkg-comment b/russian/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/russian/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/russian/kde4-l10n/Makefile b/russian/kde4-l10n/Makefile
index 179ab9ffe16b..d76560e3be98 100644
--- a/russian/kde4-l10n/Makefile
+++ b/russian/kde4-l10n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ru-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/russian/kde4-l10n/pkg-comment b/russian/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/russian/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile
index e73244d12484..eb5441ffc554 100644
--- a/russian/koi8r-ps/Makefile
+++ b/russian/koi8r-ps/Makefile
@@ -14,6 +14,7 @@ DISTFILES= gs-type1_koi8_fonts.tgz gs-type1_koi8_afm.tgz \
XFree86-Type1_fonts.dir.scale.gz
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Add Russian (KOI8) fonts to your PostScript fonts collection
EXTRACT_ONLY=
diff --git a/russian/koi8r-ps/pkg-comment b/russian/koi8r-ps/pkg-comment
deleted file mode 100644
index aa413041781d..000000000000
--- a/russian/koi8r-ps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Add Russian (KOI8) fonts to your PostScript fonts collection
diff --git a/russian/p5-XML-Parser-encodings/Makefile b/russian/p5-XML-Parser-encodings/Makefile
index 6df93a83c02b..80f1961fb230 100644
--- a/russian/p5-XML-Parser-encodings/Makefile
+++ b/russian/p5-XML-Parser-encodings/Makefile
@@ -12,6 +12,7 @@ PKGNAMEPREFIX= p5-
DISTFILES=
MAINTAINER= skv@FreeBSD.org
+COMMENT= Additional russian encodings for XML::Parser
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
BUILD_DEPENDS= ${RUN_DEPENDS} \
diff --git a/russian/p5-XML-Parser-encodings/pkg-comment b/russian/p5-XML-Parser-encodings/pkg-comment
deleted file mode 100644
index f2bdfef07030..000000000000
--- a/russian/p5-XML-Parser-encodings/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional russian encodings for XML::Parser
diff --git a/russian/pgp.language/Makefile b/russian/pgp.language/Makefile
index 17fc2fa4c533..52c3fcaee3b2 100644
--- a/russian/pgp.language/Makefile
+++ b/russian/pgp.language/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.kiarchive.ru/pub/unix/crypto/pgp/
DISTNAME= pgp26ru
MAINTAINER= ache@FreeBSD.org
+COMMENT= Russian language module for PGP
RUN_DEPENDS+= ${LOCALBASE}/lib/pgp/config.txt:${PORTSDIR}/security/pgp
diff --git a/russian/pgp.language/pkg-comment b/russian/pgp.language/pkg-comment
deleted file mode 100644
index 2f22b29958cf..000000000000
--- a/russian/pgp.language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Russian language module for PGP
diff --git a/russian/pine.language/Makefile b/russian/pine.language/Makefile
index 617b7333d1f6..1a17f82a9cdb 100644
--- a/russian/pine.language/Makefile
+++ b/russian/pine.language/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= russian mail
EXTRACT_ONLY= # empty
MAINTAINER= ache@FreeBSD.org
+COMMENT= Tune Pine for Russian (KOI8-R) defaults
RUN_DEPENDS= pine:${PORTSDIR}/mail/pine4
diff --git a/russian/pine.language/pkg-comment b/russian/pine.language/pkg-comment
deleted file mode 100644
index 47610fbd6c8f..000000000000
--- a/russian/pine.language/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tune Pine for Russian (KOI8-R) defaults
diff --git a/russian/pscyr/Makefile b/russian/pscyr/Makefile
index 400cea69865d..e9f8c6b1caab 100644
--- a/russian/pscyr/Makefile
+++ b/russian/pscyr/Makefile
@@ -15,6 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION:S/${PATCH_LEVEL}$/-patch&/}-tex.tar.gz \
${PORTNAME}-${PORTVERSION:S/${PATCH_LEVEL}$/-patch&/}-type1.tar.gz
MAINTAINER= kappa@freebsd.org.ua
+COMMENT= Cyrillic PostScript Type1 fonts for use with TeX
RUN_DEPENDS= mktexlsr:${PORTSDIR}/print/teTeX
# no other TeX is sufficient
diff --git a/russian/pscyr/pkg-comment b/russian/pscyr/pkg-comment
deleted file mode 100644
index f9e8954f0fae..000000000000
--- a/russian/pscyr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cyrillic PostScript Type1 fonts for use with TeX
diff --git a/russian/rus-ispell/Makefile b/russian/rus-ispell/Makefile
index c170cf5a0b23..3ba8671989ce 100644
--- a/russian/rus-ispell/Makefile
+++ b/russian/rus-ispell/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= russian textproc
MASTER_SITES= ftp://scon155.phys.msu.su/pub/russian/ispell/
MAINTAINER= ache@FreeBSD.org
+COMMENT= New Russian dictionaries for ispell
BUILD_DEPENDS= ispell:${PORTSDIR}/textproc/ispell
diff --git a/russian/rus-ispell/pkg-comment b/russian/rus-ispell/pkg-comment
deleted file mode 100644
index 227c6e8ed90a..000000000000
--- a/russian/rus-ispell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-New Russian dictionaries for ispell
diff --git a/science/hdf/Makefile b/science/hdf/Makefile
index d2be7566329f..9339a6559700 100644
--- a/science/hdf/Makefile
+++ b/science/hdf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ncsa.uiuc.edu/HDF/HDF/HDF${PORTVERSION}/tar/
DISTNAME= HDF${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Hierarchical Data Format library (from NCSA)
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/science/hdf/pkg-comment b/science/hdf/pkg-comment
deleted file mode 100644
index 2f8affd569f0..000000000000
--- a/science/hdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hierarchical Data Format library (from NCSA)
diff --git a/science/mpqc/Makefile b/science/mpqc/Makefile
index a3e76c4cdbeb..05c960ce2a4e 100644
--- a/science/mpqc/Makefile
+++ b/science/mpqc/Makefile
@@ -15,6 +15,7 @@ DISTFILES+= mpqc-man-${PORTVERSION}.tar.gz mpqc-html-${PORTVERSION}.tar.gz
.endif
MAINTAINER= maho@FreeBSD.org
+COMMENT= The massively parallel quantum computing library and program
LIB_DEPENDS= lapack:${PORTSDIR}/math/lapack \
atlas:${PORTSDIR}/math/atlas
diff --git a/science/mpqc/pkg-comment b/science/mpqc/pkg-comment
deleted file mode 100644
index 4465ccd8eefc..000000000000
--- a/science/mpqc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The massively parallel quantum computing library and program
diff --git a/security/aafid2/Makefile b/security/aafid2/Makefile
index 90b947ff0b45..cb8eb46e5aad 100644
--- a/security/aafid2/Makefile
+++ b/security/aafid2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.rge.com/pub/security/cerias/tools/unix/ids/AAFID/ \
EXTRACT_ONLY=
MAINTAINER= se@FreeBSD.org
+COMMENT= A distributed monitoring and intrusion detection system
RUN_DEPENDS= ptksh:${PORTSDIR}/x11-toolkits/p5-Tk
diff --git a/security/aafid2/pkg-comment b/security/aafid2/pkg-comment
deleted file mode 100644
index 33583d5b120b..000000000000
--- a/security/aafid2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A distributed monitoring and intrusion detection system
diff --git a/security/aide/Makefile b/security/aide/Makefile
index cf4f7ee596a5..05ee34ea8807 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cs.tut.fi/~rammer/ \
ftp://ftp.cs.tut.fi/pub/src/gnu/
MAINTAINER= cy@FreeBSD.org
+COMMENT= A replacement and extension for Tripwire
LIB_DEPENDS= mhash.2:${PORTSDIR}/security/mhash
diff --git a/security/aide/pkg-comment b/security/aide/pkg-comment
deleted file mode 100644
index e11f1ff52629..000000000000
--- a/security/aide/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A replacement and extension for Tripwire
diff --git a/security/audit/Makefile b/security/audit/Makefile
index 373159f1c374..3cc3d73124d0 100644
--- a/security/audit/Makefile
+++ b/security/audit/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://community.corest.com/pub/audit/ \
DISTNAME= ${PORTNAME}-v${PORTVERSION}beta-src
MAINTAINER= anders@FreeBSD.org
+COMMENT= Tools for remote and centralized audit data collection
.if defined(WITH_MYSQL)
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/security/audit/pkg-comment b/security/audit/pkg-comment
deleted file mode 100644
index 5cfadb100c2d..000000000000
--- a/security/audit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tools for remote and centralized audit data collection
diff --git a/security/authforce/Makefile b/security/authforce/Makefile
index 296781ef64f0..0a85f7f8066c 100644
--- a/security/authforce/Makefile
+++ b/security/authforce/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security www
MASTER_SITES= http://kapheine.hypa.net/authforce/
MAINTAINER= ache@FreeBSD.org
+COMMENT= HTTP authentication brute forcer
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
curl.2:${PORTSDIR}/ftp/curl \
diff --git a/security/authforce/pkg-comment b/security/authforce/pkg-comment
deleted file mode 100644
index 5645b38a9f6e..000000000000
--- a/security/authforce/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTTP authentication brute forcer
diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 24b47394af3c..19cf386b6d91 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= BeeCrypt is an open source cryptography library
GNU_CONFIGURE= yes
diff --git a/security/beecrypt/pkg-comment b/security/beecrypt/pkg-comment
deleted file mode 100644
index 83226423093f..000000000000
--- a/security/beecrypt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-BeeCrypt is an open source cryptography library
diff --git a/security/bfbtester/Makefile b/security/bfbtester/Makefile
index 9d6df15f60c4..74846f4fd496 100644
--- a/security/bfbtester/Makefile
+++ b/security/bfbtester/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= bfbtester
MAINTAINER= mikeh@FreeBSD.org
+COMMENT= A security tool for testing binaries for overflows
HAS_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/security/bfbtester/pkg-comment b/security/bfbtester/pkg-comment
deleted file mode 100644
index 166e9d930703..000000000000
--- a/security/bfbtester/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A security tool for testing binaries for overflows
diff --git a/security/calife-devel/Makefile b/security/calife-devel/Makefile
index a8902e79443e..dea0defeefe4 100644
--- a/security/calife-devel/Makefile
+++ b/security/calife-devel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= ftp://postfix.eu.org/pub/calife/
MAINTAINER= thomas@FreeBSD.org
+COMMENT= A lightweight alternative to sudo
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--with-etcdir=$(PREFIX)/etc"
diff --git a/security/calife-devel/pkg-comment b/security/calife-devel/pkg-comment
deleted file mode 100644
index e77274450e6f..000000000000
--- a/security/calife-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight alternative to sudo
diff --git a/security/calife/Makefile b/security/calife/Makefile
index a8902e79443e..dea0defeefe4 100644
--- a/security/calife/Makefile
+++ b/security/calife/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= ftp://postfix.eu.org/pub/calife/
MAINTAINER= thomas@FreeBSD.org
+COMMENT= A lightweight alternative to sudo
GNU_CONFIGURE= yes
CONFIGURE_ARGS= "--with-etcdir=$(PREFIX)/etc"
diff --git a/security/calife/pkg-comment b/security/calife/pkg-comment
deleted file mode 100644
index e77274450e6f..000000000000
--- a/security/calife/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight alternative to sudo
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 86948e40f3d0..cc13db23ddfe 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.crypto.com/software/
MAINTAINER= green@FreeBSD.org
+COMMENT= A cryptographic file system implemented as a user-space NFS server
ALL_TARGET= cfs
MAN1= cattach.1 cdetach.1 cmkdir.1 cpasswd.1 cfssh.1
diff --git a/security/cfs/pkg-comment b/security/cfs/pkg-comment
deleted file mode 100644
index 76374f73ad41..000000000000
--- a/security/cfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A cryptographic file system implemented as a user-space NFS server
diff --git a/security/checkpassword/Makefile b/security/checkpassword/Makefile
index 0db4a321b8ee..21c1adcd7cd6 100644
--- a/security/checkpassword/Makefile
+++ b/security/checkpassword/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://cr.yp.to/checkpwd/
MAINTAINER= sada@FreeBSD.org
+COMMENT= A simple password-checking interface
ALL_TARGET= it
INSTALL_TARGET= setup
diff --git a/security/checkpassword/pkg-comment b/security/checkpassword/pkg-comment
deleted file mode 100644
index 7df3c85b4e76..000000000000
--- a/security/checkpassword/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple password-checking interface
diff --git a/security/chrootuid/Makefile b/security/chrootuid/Makefile
index 22074809b1d3..33e4327620b7 100644
--- a/security/chrootuid/Makefile
+++ b/security/chrootuid/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.porcupine.org/pub/security/ \
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= truckman@FreeBSD.org
+COMMENT= A simple wrapper that combines chroot(8) and su(1) into one program
MAN8= chrootuid.8
diff --git a/security/chrootuid/pkg-comment b/security/chrootuid/pkg-comment
deleted file mode 100644
index 49da61e47457..000000000000
--- a/security/chrootuid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple wrapper that combines chroot(8) and su(1) into one program
diff --git a/security/cksfv/Makefile b/security/cksfv/Makefile
index 5cdcaff47936..bd19c7895f5b 100644
--- a/security/cksfv/Makefile
+++ b/security/cksfv/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.fodder.org/cksfv/
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Create or manipulate Simple File Verification (SFV) checksum files
BUILD_WRKSRC= ${WRKSRC}/src
INSTALL_WRKSRC= ${BUILD_WRKSRC}
diff --git a/security/cksfv/pkg-comment b/security/cksfv/pkg-comment
deleted file mode 100644
index 9dc5537bb429..000000000000
--- a/security/cksfv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create or manipulate Simple File Verification (SFV) checksum files
diff --git a/security/cryptopp/Makefile b/security/cryptopp/Makefile
index 40f162aff3c2..2214e25290f0 100644
--- a/security/cryptopp/Makefile
+++ b/security/cryptopp/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= crypto${PORTVERSION:S/.//g}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A free C++ class library of cryptographic schemes
NO_WRKSUBDIR= yes
USE_ZIP= yes
diff --git a/security/cryptopp/pkg-comment b/security/cryptopp/pkg-comment
deleted file mode 100644
index 30a6d34561ed..000000000000
--- a/security/cryptopp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free C++ class library of cryptographic schemes
diff --git a/security/donkey/Makefile b/security/donkey/Makefile
index c5dfd9c662ec..b2bc09c851ed 100644
--- a/security/donkey/Makefile
+++ b/security/donkey/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= ftp://ftp.aist-nara.ac.jp/pub/Security/tool/donkey/
MAINTAINER= max@FreeBSD.org
+COMMENT= An alternative for S/KEY's key command
GNU_CONFIGURE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/obj/FreeBSD
diff --git a/security/donkey/pkg-comment b/security/donkey/pkg-comment
deleted file mode 100644
index f018c17c9da7..000000000000
--- a/security/donkey/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An alternative for S/KEY's key command
diff --git a/security/drwebd/Makefile b/security/drwebd/Makefile
index 698793c087c8..4dc7c440d868 100644
--- a/security/drwebd/Makefile
+++ b/security/drwebd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
EXTRACT_ONLY=
MAINTAINER= ache@FreeBSD.org
+COMMENT= Satellite port to activate DrWeb daemon
DESCR= ${PORTSDIR}/security/drweb/pkg-descr
diff --git a/security/drwebd/pkg-comment b/security/drwebd/pkg-comment
deleted file mode 100644
index 99cf2fbc45db..000000000000
--- a/security/drwebd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Satellite port to activate DrWeb daemon
diff --git a/security/dsniff/Makefile b/security/dsniff/Makefile
index 1424f39e8abf..fe1f92c6f6b3 100644
--- a/security/dsniff/Makefile
+++ b/security/dsniff/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://naughty.monkey.org/~dugsong/dsniff/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Various sniffing utilities for penetration testing
BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet \
${LOCALBASE}/lib/libnids.a:${PORTSDIR}/net/libnids
diff --git a/security/dsniff/pkg-comment b/security/dsniff/pkg-comment
deleted file mode 100644
index ea6ef3639136..000000000000
--- a/security/dsniff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Various sniffing utilities for penetration testing
diff --git a/security/fakebo/Makefile b/security/fakebo/Makefile
index 184054d07b86..6f7d37127848 100644
--- a/security/fakebo/Makefile
+++ b/security/fakebo/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://the.ausmac.net/wd2a/security/port-loggers/ \
ftp://ftp.linux.hr/pub/fakebo/
MAINTAINER= kris@FreeBSD.org
+COMMENT= A fake BackOrifice client emulator
GNU_CONFIGURE= yes
diff --git a/security/fakebo/pkg-comment b/security/fakebo/pkg-comment
deleted file mode 100644
index 443f4e7755d9..000000000000
--- a/security/fakebo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fake BackOrifice client emulator
diff --git a/security/fpm/Makefile b/security/fpm/Makefile
index 2da30bf0e195..40066ff208f0 100644
--- a/security/fpm/Makefile
+++ b/security/fpm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= anders@FreeBSD.org
+COMMENT= Figaro's Password Manager, an app to securely store your passwords
USE_GNOME= yes
USE_X_PREFIX= yes
diff --git a/security/fpm/pkg-comment b/security/fpm/pkg-comment
deleted file mode 100644
index 59710a81721b..000000000000
--- a/security/fpm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Figaro's Password Manager, an app to securely store your passwords
diff --git a/security/fragrouter/Makefile b/security/fragrouter/Makefile
index 8494b103ab01..8a4a9395c884 100644
--- a/security/fragrouter/Makefile
+++ b/security/fragrouter/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.anzen.com/research/nidsbench/ \
MASTER_SITE_SUBDIR=kris
MAINTAINER= kris@FreeBSD.ORG
+COMMENT= Tool for testing network IDS implementations
GNU_CONFIGURE= yes
diff --git a/security/fragrouter/pkg-comment b/security/fragrouter/pkg-comment
deleted file mode 100644
index 5a9f148951c6..000000000000
--- a/security/fragrouter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool for testing network IDS implementations
diff --git a/security/fsh/Makefile b/security/fsh/Makefile
index 64b2cde5830b..b5415b59de4f 100644
--- a/security/fsh/Makefile
+++ b/security/fsh/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.lysator.liu.se/fsh/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Fast remote command execution
BUILD_DEPENDS= python:${PORTSDIR}/lang/python
diff --git a/security/fsh/pkg-comment b/security/fsh/pkg-comment
deleted file mode 100644
index 142d9389e0ef..000000000000
--- a/security/fsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fast remote command execution
diff --git a/security/fwanalog/Makefile b/security/fwanalog/Makefile
index 195bf5f5e38d..369468d59f4a 100644
--- a/security/fwanalog/Makefile
+++ b/security/fwanalog/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://tud.at/programm/fwanalog/
MAINTAINER= cy@FreeBSD.org
+COMMENT= A firewall log summarizer that uses Analog
RUN_DEPENDS= analog:${PORTSDIR}/www/analog
diff --git a/security/fwanalog/pkg-comment b/security/fwanalog/pkg-comment
deleted file mode 100644
index 6c6a7ac1a4bd..000000000000
--- a/security/fwanalog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A firewall log summarizer that uses Analog
diff --git a/security/gringotts/Makefile b/security/gringotts/Makefile
index a80cfcbb5af4..3b15d1f20c5c 100644
--- a/security/gringotts/Makefile
+++ b/security/gringotts/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://devel.pluto.linux.it/projects/Gringotts/current/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= anders@FreeBSD.org
+COMMENT= GTK application to securely store sensitive data
LIB_DEPENDS= gringotts.2:${PORTSDIR}/security/libgringotts \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
diff --git a/security/gringotts/pkg-comment b/security/gringotts/pkg-comment
deleted file mode 100644
index d600cdd6154a..000000000000
--- a/security/gringotts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK application to securely store sensitive data
diff --git a/security/gtk-knocker/Makefile b/security/gtk-knocker/Makefile
index cdbbb4bb3012..59e3ffe44586 100644
--- a/security/gtk-knocker/Makefile
+++ b/security/gtk-knocker/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= gtk-
DISTNAME= gtk-${PORTNAME}-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A simple and easy to use TCP only port scanner (GTK+ version)
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/security/gtk-knocker/pkg-comment b/security/gtk-knocker/pkg-comment
deleted file mode 100644
index 5bb89fc6996c..000000000000
--- a/security/gtk-knocker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple and easy to use TCP only port scanner (GTK+ version)
diff --git a/security/ipfmeta/Makefile b/security/ipfmeta/Makefile
index 1a4acf059e80..db56136b2748 100644
--- a/security/ipfmeta/Makefile
+++ b/security/ipfmeta/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= security
MASTER_SITES= http://www.sentia.org/downloads/
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= ipfmeta - use objects in IPfilter files
USE_PERL5= yes
diff --git a/security/ipfmeta/pkg-comment b/security/ipfmeta/pkg-comment
deleted file mode 100644
index 085cd7b78962..000000000000
--- a/security/ipfmeta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ipfmeta - use objects in IPfilter files
diff --git a/security/its4/Makefile b/security/its4/Makefile
index 53cb4997b9fc..62e40a822aaf 100644
--- a/security/its4/Makefile
+++ b/security/its4/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=
EXTRACT_SUFX= .tgz
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Tool to scan C/C++ source for potential vulnerabilities
WRKSRC= ${WRKDIR}/${PORTNAME}
HAS_CONFIGURE= yes
diff --git a/security/its4/pkg-comment b/security/its4/pkg-comment
deleted file mode 100644
index 179157c291f1..000000000000
--- a/security/its4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to scan C/C++ source for potential vulnerabilities
diff --git a/security/keynote/Makefile b/security/keynote/Makefile
index 33de81e41f3d..a1adddad7e07 100644
--- a/security/keynote/Makefile
+++ b/security/keynote/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= security
MASTER_SITES= http://www.cis.upenn.edu/~angelos/Code/
MAINTAINER= kris@FreeBSD.org
+COMMENT= A Trust-Management System
USE_OPENSSL= YES
GNU_CONFIGURE= yes
diff --git a/security/keynote/pkg-comment b/security/keynote/pkg-comment
deleted file mode 100644
index 7c696d035fa8..000000000000
--- a/security/keynote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Trust-Management System
diff --git a/security/keyprint/Makefile b/security/keyprint/Makefile
index 8dbcf0039105..54bae7d02f44 100644
--- a/security/keyprint/Makefile
+++ b/security/keyprint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mharo
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Print S/Key keys on a piece of paper, twice the size of a credit card
NO_BUILD= yes
USE_REINPLACE= yes
diff --git a/security/keyprint/pkg-comment b/security/keyprint/pkg-comment
deleted file mode 100644
index d9644e1fe249..000000000000
--- a/security/keyprint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print S/Key keys on a piece of paper, twice the size of a credit card
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/security/kgpg-kde4/Makefile
+++ b/security/kgpg-kde4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/security/kgpg-kde4/pkg-comment b/security/kgpg-kde4/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/security/kgpg-kde4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/security/knocker/Makefile b/security/knocker/Makefile
index 8c0400988676..a7979b187dcf 100644
--- a/security/knocker/Makefile
+++ b/security/knocker/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A simple and easy to use TCP only port scanner (Console version)
GNU_CONFIGURE= yes
diff --git a/security/knocker/pkg-comment b/security/knocker/pkg-comment
deleted file mode 100644
index 48c0fcdc26e1..000000000000
--- a/security/knocker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple and easy to use TCP only port scanner (Console version)
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index cbea4313af7a..cff9b3b0bc9a 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -22,6 +22,7 @@ EXTRACT_SUFX= .tar
.endif
MAINTAINER= cy@FreeBSD.org
+COMMENT= An authentication system developed at MIT, successor to Kerberos IV
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5-16/pkg-comment b/security/krb5-16/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index cbea4313af7a..cff9b3b0bc9a 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -22,6 +22,7 @@ EXTRACT_SUFX= .tar
.endif
MAINTAINER= cy@FreeBSD.org
+COMMENT= An authentication system developed at MIT, successor to Kerberos IV
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5-17/pkg-comment b/security/krb5-17/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-17/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index cbea4313af7a..cff9b3b0bc9a 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -22,6 +22,7 @@ EXTRACT_SUFX= .tar
.endif
MAINTAINER= cy@FreeBSD.org
+COMMENT= An authentication system developed at MIT, successor to Kerberos IV
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5-appl/pkg-comment b/security/krb5-appl/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-appl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5-beta/Makefile b/security/krb5-beta/Makefile
index 0f8cd7eafa43..9285fd2de940 100644
--- a/security/krb5-beta/Makefile
+++ b/security/krb5-beta/Makefile
@@ -13,6 +13,7 @@ DISTNAME= krb5-1.2.7-beta2
EXTRACT_SUFX= .tar
MAINTAINER= cy@FreeBSD.org
+COMMENT= An authentication system developed at MIT, successor to Kerberos IV
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5-beta/pkg-comment b/security/krb5-beta/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5-beta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index cbea4313af7a..cff9b3b0bc9a 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -22,6 +22,7 @@ EXTRACT_SUFX= .tar
.endif
MAINTAINER= cy@FreeBSD.org
+COMMENT= An authentication system developed at MIT, successor to Kerberos IV
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/security/krb5/pkg-comment b/security/krb5/pkg-comment
deleted file mode 100644
index 339cc4cd5571..000000000000
--- a/security/krb5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An authentication system developed at MIT, successor to Kerberos IV
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 3b7096cd9ada..aae65233a741 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= KDE frontend to ssh
USE_KDELIBS_VER=3
GNU_CONFIGURE= yes
diff --git a/security/kssh/pkg-comment b/security/kssh/pkg-comment
deleted file mode 100644
index 0e8cc5aa3328..000000000000
--- a/security/kssh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE frontend to ssh
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/security/kwallet/Makefile
+++ b/security/kwallet/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/security/kwallet/pkg-comment b/security/kwallet/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/security/kwallet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/security/libgringotts/Makefile b/security/libgringotts/Makefile
index 9ceda39aee8c..9c996739ce9f 100644
--- a/security/libgringotts/Makefile
+++ b/security/libgringotts/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://devel.pluto.linux.it/projects/libGringotts/current/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= anders@FreeBSD.org
+COMMENT= Library for encapsulating/safekeeping data in encrypted/compressed form
LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt \
mhash.2:${PORTSDIR}/security/mhash
diff --git a/security/libgringotts/pkg-comment b/security/libgringotts/pkg-comment
deleted file mode 100644
index b324b4bad0f7..000000000000
--- a/security/libgringotts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library for encapsulating/safekeeping data in encrypted/compressed form
diff --git a/security/liedentd/Makefile b/security/liedentd/Makefile
index b010beb5d81b..4e7fe163be43 100644
--- a/security/liedentd/Makefile
+++ b/security/liedentd/Makefile
@@ -14,5 +14,6 @@ MASTER_SITE_SUBDIR= wes
MAINTAINER= wes@freebsd.org
+COMMENT= An ident server which refuses to divulge security information
.include <bsd.port.mk>
diff --git a/security/liedentd/pkg-comment b/security/liedentd/pkg-comment
deleted file mode 100644
index 944221bd3848..000000000000
--- a/security/liedentd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An ident server which refuses to divulge security information
diff --git a/security/lxnb/Makefile b/security/lxnb/Makefile
index 6c54e1a9ae3b..1b1b0b08914c 100644
--- a/security/lxnb/Makefile
+++ b/security/lxnb/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ns2.crw.se/~tm/projects/lxnb/
DISTFILES= linux-netbus-client-v${PORTVERSION}.tgz
MAINTAINER= kris@FreeBSD.org
+COMMENT= NetBus client
pre-build:
rm -f ${WRKSRC}/lxnetbus
diff --git a/security/lxnb/pkg-comment b/security/lxnb/pkg-comment
deleted file mode 100644
index 9aa1830cff33..000000000000
--- a/security/lxnb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-NetBus client
diff --git a/security/mussh/Makefile b/security/mussh/Makefile
index 8c60a8e08826..f7d0a1718676 100644
--- a/security/mussh/Makefile
+++ b/security/mussh/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= leeym@FreeBSD.org
+COMMENT= A tool for easily running the same commands on multiple hosts
RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2
diff --git a/security/mussh/pkg-comment b/security/mussh/pkg-comment
deleted file mode 100644
index 20d52a9134ee..000000000000
--- a/security/mussh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool for easily running the same commands on multiple hosts
diff --git a/security/nss/Makefile b/security/nss/Makefile
index e080aedefc73..10b6cafe7021 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_MOZILLA}
MASTER_SITE_SUBDIR= security/nss/releases/NSS_${PORTVERSION:S/./_/g}_RTM/src
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A set of libraries to support development of security-enabled applications
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip
LIB_DEPENDS= nspr4.1:${PORTSDIR}/devel/nspr
diff --git a/security/nss/pkg-comment b/security/nss/pkg-comment
deleted file mode 100644
index 1d6c985e1f83..000000000000
--- a/security/nss/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of libraries to support development of security-enabled applications
diff --git a/security/openssh-askpass/Makefile b/security/openssh-askpass/Makefile
index 7652bae0a82a..b0d525f4b110 100644
--- a/security/openssh-askpass/Makefile
+++ b/security/openssh-askpass/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= kris
MAINTAINER= kris@FreeBSD.org
+COMMENT= Graphical password applet for entering SSH passphrase
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/X11/xc/programs/ssh-askpass
USE_IMAKE= yes
diff --git a/security/openssh-askpass/pkg-comment b/security/openssh-askpass/pkg-comment
deleted file mode 100644
index eae0c3f6e82a..000000000000
--- a/security/openssh-askpass/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical password applet for entering SSH passphrase
diff --git a/security/opieprint/Makefile b/security/opieprint/Makefile
index 8dbcf0039105..54bae7d02f44 100644
--- a/security/opieprint/Makefile
+++ b/security/opieprint/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= mharo
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Print S/Key keys on a piece of paper, twice the size of a credit card
NO_BUILD= yes
USE_REINPLACE= yes
diff --git a/security/opieprint/pkg-comment b/security/opieprint/pkg-comment
deleted file mode 100644
index d9644e1fe249..000000000000
--- a/security/opieprint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print S/Key keys on a piece of paper, twice the size of a credit card
diff --git a/security/p5-Authen-PAM/Makefile b/security/p5-Authen-PAM/Makefile
index f8bfb6906cda..87c94cef8200 100644
--- a/security/p5-Authen-PAM/Makefile
+++ b/security/p5-Authen-PAM/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Authen
PKGNAMEPREFIX= p5-
MAINTAINER= des@FreeBSD.org
+COMMENT= A Perl interface to the PAM library
PERL_CONFIGURE= yes
CONFIGURE_ARGS= -DPAM_STRERROR_NEEDS_PAMH
diff --git a/security/p5-Authen-PAM/pkg-comment b/security/p5-Authen-PAM/pkg-comment
deleted file mode 100644
index d6fe5624f7cc..000000000000
--- a/security/p5-Authen-PAM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl interface to the PAM library
diff --git a/security/p5-Crypt-Cryptix/Makefile b/security/p5-Crypt-Cryptix/Makefile
index 57e42345e730..a984af011835 100644
--- a/security/p5-Crypt-Cryptix/Makefile
+++ b/security/p5-Crypt-Cryptix/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.cryptix.org/dist/
PKGNAMEPREFIX= p5-
MAINTAINER= markm@FreeBSD.org
+COMMENT= Perl5 interface to the Cryptix Crypto Library (Blowfish, DES and IDEA)
PERL_CONFIGURE= yes
diff --git a/security/p5-Crypt-Cryptix/pkg-comment b/security/p5-Crypt-Cryptix/pkg-comment
deleted file mode 100644
index 0b3017833858..000000000000
--- a/security/p5-Crypt-Cryptix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to the Cryptix Crypto Library (Blowfish, DES and IDEA)
diff --git a/security/p5-Crypt-DES_EDE3/Makefile b/security/p5-Crypt-DES_EDE3/Makefile
index 624cc61dc220..c3e15f838bc1 100644
--- a/security/p5-Crypt-DES_EDE3/Makefile
+++ b/security/p5-Crypt-DES_EDE3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= jesper@FreeBSD.org
+COMMENT= Perl5 interface to a implementing 3-DES EDE encryption and decryption
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/DES.pm:${PORTSDIR}/security/p5-Crypt-DES
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/security/p5-Crypt-DES_EDE3/pkg-comment b/security/p5-Crypt-DES_EDE3/pkg-comment
deleted file mode 100644
index 37f565322504..000000000000
--- a/security/p5-Crypt-DES_EDE3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to a implementing 3-DES EDE encryption and decryption
diff --git a/security/p5-Crypt-DH/Makefile b/security/p5-Crypt-DH/Makefile
index 86afeda93bee..8fe8d281975e 100644
--- a/security/p5-Crypt-DH/Makefile
+++ b/security/p5-Crypt-DH/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= jesper@FreeBSD.org
+COMMENT= Perl5 interface to a Diffie-Hellman key exchange system
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Math/Pari.pm:${PORTSDIR}/math/p5-Math-Pari \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Crypt/Random.pm:${PORTSDIR}/security/p5-Crypt-Random
diff --git a/security/p5-Crypt-DH/pkg-comment b/security/p5-Crypt-DH/pkg-comment
deleted file mode 100644
index 8c493b85f709..000000000000
--- a/security/p5-Crypt-DH/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to a Diffie-Hellman key exchange system
diff --git a/security/p5-Crypt-DSA/Makefile b/security/p5-Crypt-DSA/Makefile
index 56f6612db2e2..583f4518c685 100644
--- a/security/p5-Crypt-DSA/Makefile
+++ b/security/p5-Crypt-DSA/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= DSA signature and key generation
PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/security/p5-Crypt-DSA/pkg-comment b/security/p5-Crypt-DSA/pkg-comment
deleted file mode 100644
index ab364d2c2337..000000000000
--- a/security/p5-Crypt-DSA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DSA signature and key generation
diff --git a/security/p5-Crypt-ECB/Makefile b/security/p5-Crypt-ECB/Makefile
index 3d235394517b..26baad4ec6fb 100644
--- a/security/p5-Crypt-ECB/Makefile
+++ b/security/p5-Crypt-ECB/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/-/}
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module implementing the ECB encryption algorithm
WRKSRC= ${WRKDIR}/${DISTNAME:S/-2//}
diff --git a/security/p5-Crypt-ECB/pkg-comment b/security/p5-Crypt-ECB/pkg-comment
deleted file mode 100644
index 102ae078dbda..000000000000
--- a/security/p5-Crypt-ECB/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module implementing the ECB encryption algorithm
diff --git a/security/p5-Crypt-PassGen/Makefile b/security/p5-Crypt-PassGen/Makefile
index 2fe3d8541667..ae823dd622ad 100644
--- a/security/p5-Crypt-PassGen/Makefile
+++ b/security/p5-Crypt-PassGen/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Crypt::PassGen - Generate a random password that looks like a real word
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/security/p5-Crypt-PassGen/pkg-comment b/security/p5-Crypt-PassGen/pkg-comment
deleted file mode 100644
index d593121ad1e9..000000000000
--- a/security/p5-Crypt-PassGen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Crypt::PassGen - Generate a random password that looks like a real word
diff --git a/security/p5-Crypt-Primes/Makefile b/security/p5-Crypt-Primes/Makefile
index 6ecfb8cb48d4..c7fa2cf60997 100644
--- a/security/p5-Crypt-Primes/Makefile
+++ b/security/p5-Crypt-Primes/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Provable Prime Number Generator suitable for Cryptographic Applications
PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/security/p5-Crypt-Primes/pkg-comment b/security/p5-Crypt-Primes/pkg-comment
deleted file mode 100644
index 1e9174b87f1e..000000000000
--- a/security/p5-Crypt-Primes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Provable Prime Number Generator suitable for Cryptographic Applications
diff --git a/security/p5-Crypt-RIPEMD160/Makefile b/security/p5-Crypt-RIPEMD160/Makefile
index c9ab9645942f..6e76df513b4e 100644
--- a/security/p5-Crypt-RIPEMD160/Makefile
+++ b/security/p5-Crypt-RIPEMD160/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= RIPEMD-160 message digest algorithm
PERL_CONFIGURE= yes
diff --git a/security/p5-Crypt-RIPEMD160/pkg-comment b/security/p5-Crypt-RIPEMD160/pkg-comment
deleted file mode 100644
index 27fc39d36694..000000000000
--- a/security/p5-Crypt-RIPEMD160/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RIPEMD-160 message digest algorithm
diff --git a/security/p5-Crypt-RSA/Makefile b/security/p5-Crypt-RSA/Makefile
index 0d566c813b8b..4a4efbcae007 100644
--- a/security/p5-Crypt-RSA/Makefile
+++ b/security/p5-Crypt-RSA/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= RSA public-key cryptosystem
PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/security/p5-Crypt-RSA/pkg-comment b/security/p5-Crypt-RSA/pkg-comment
deleted file mode 100644
index 4b7d85307047..000000000000
--- a/security/p5-Crypt-RSA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RSA public-key cryptosystem
diff --git a/security/p5-Crypt-Random/Makefile b/security/p5-Crypt-Random/Makefile
index 9bf3004431fc..ba3054526bbc 100644
--- a/security/p5-Crypt-Random/Makefile
+++ b/security/p5-Crypt-Random/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Crypt
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Cryptographically Secure, True Random Number Generator
PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/security/p5-Crypt-Random/pkg-comment b/security/p5-Crypt-Random/pkg-comment
deleted file mode 100644
index 05a2b47d8715..000000000000
--- a/security/p5-Crypt-Random/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cryptographically Secure, True Random Number Generator
diff --git a/security/p5-Digest-BubbleBabble/Makefile b/security/p5-Digest-BubbleBabble/Makefile
index 46e1a9692386..2e0e90a43e9f 100644
--- a/security/p5-Digest-BubbleBabble/Makefile
+++ b/security/p5-Digest-BubbleBabble/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Digest
PKGNAMEPREFIX= p5-
MAINTAINER= jesper@FreeBSD.org
+COMMENT= Perl5 interface to a fingerprint in "bubble babble" format
PERL_CONFIGURE= yes
diff --git a/security/p5-Digest-BubbleBabble/pkg-comment b/security/p5-Digest-BubbleBabble/pkg-comment
deleted file mode 100644
index 7c8a397a99e9..000000000000
--- a/security/p5-Digest-BubbleBabble/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to a fingerprint in "bubble babble" format
diff --git a/security/p5-Digest-MD2/Makefile b/security/p5-Digest-MD2/Makefile
index 452788bbad72..22eba3a6edd4 100644
--- a/security/p5-Digest-MD2/Makefile
+++ b/security/p5-Digest-MD2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Digest
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl5 interface to the MD2 message digest algorithm
PERL_CONFIGURE= yes
diff --git a/security/p5-Digest-MD2/pkg-comment b/security/p5-Digest-MD2/pkg-comment
deleted file mode 100644
index 15cb99caf70c..000000000000
--- a/security/p5-Digest-MD2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to the MD2 message digest algorithm
diff --git a/security/p5-Digest-MD5/Makefile b/security/p5-Digest-MD5/Makefile
index b56760a6566a..3b0206711842 100644
--- a/security/p5-Digest-MD5/Makefile
+++ b/security/p5-Digest-MD5/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Digest
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl5 interface to the MD5 algorithm
PERL_CONFIGURE= yes
diff --git a/security/p5-Digest-MD5/pkg-comment b/security/p5-Digest-MD5/pkg-comment
deleted file mode 100644
index 9c59863daef1..000000000000
--- a/security/p5-Digest-MD5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to the MD5 algorithm
diff --git a/security/p5-Digest-Nilsimsa/Makefile b/security/p5-Digest-Nilsimsa/Makefile
index 1c0f6bc8a0ab..7cffc0acb6f2 100644
--- a/security/p5-Digest-Nilsimsa/Makefile
+++ b/security/p5-Digest-Nilsimsa/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Digest
PKGNAMEPREFIX= p5-
MAINTAINER= leeym@FreeBSD.org
+COMMENT= Perl version of Nilsimsa code
PERL_CONFIGURE= yes
diff --git a/security/p5-Digest-Nilsimsa/pkg-comment b/security/p5-Digest-Nilsimsa/pkg-comment
deleted file mode 100644
index d9d0c5a1df8f..000000000000
--- a/security/p5-Digest-Nilsimsa/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl version of Nilsimsa code
diff --git a/security/p5-Digest/Makefile b/security/p5-Digest/Makefile
index 32136979ed68..4c7aa2ca7df0 100644
--- a/security/p5-Digest/Makefile
+++ b/security/p5-Digest/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Digest
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Modules that calculate message digests
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/security/p5-Digest/pkg-comment b/security/p5-Digest/pkg-comment
deleted file mode 100644
index a1b9d0a2c6f0..000000000000
--- a/security/p5-Digest/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules that calculate message digests
diff --git a/security/p5-Filter-CBC/Makefile b/security/p5-Filter-CBC/Makefile
index a34527ad657e..1537265e215a 100644
--- a/security/p5-Filter-CBC/Makefile
+++ b/security/p5-Filter-CBC/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Filter
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Source filter for Cipher Block Chaining
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Filter/Util/Call.pm:${PORTSDIR}/devel/p5-Filter \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/Rijndael.pm:${PORTSDIR}/security/p5-Crypt-Rijndael \
diff --git a/security/p5-Filter-CBC/pkg-comment b/security/p5-Filter-CBC/pkg-comment
deleted file mode 100644
index f4bb2c9572ca..000000000000
--- a/security/p5-Filter-CBC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Source filter for Cipher Block Chaining
diff --git a/security/p5-IO-Socket-SSL/Makefile b/security/p5-IO-Socket-SSL/Makefile
index 5aeded5341a6..d1af5a14ab4d 100644
--- a/security/p5-IO-Socket-SSL/Makefile
+++ b/security/p5-IO-Socket-SSL/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= IO
PKGNAMEPREFIX= p5-
MAINTAINER= scrappy@FreeBSD.org
+COMMENT= Perl5 interface to SSL sockets
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/SSLeay.pm:${PORTSDIR}/security/p5-Net-SSLeay
diff --git a/security/p5-IO-Socket-SSL/pkg-comment b/security/p5-IO-Socket-SSL/pkg-comment
deleted file mode 100644
index 2c90f3e8bb98..000000000000
--- a/security/p5-IO-Socket-SSL/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 interface to SSL sockets
diff --git a/security/p5-Tie-EncryptedHash/Makefile b/security/p5-Tie-EncryptedHash/Makefile
index ebcdc5d94930..aa6289393296 100644
--- a/security/p5-Tie-EncryptedHash/Makefile
+++ b/security/p5-Tie-EncryptedHash/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Tie
PKGNAMEPREFIX= p5-
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Hashes (and objects based on hashes) with encrypting fields
PERLBASE= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
diff --git a/security/p5-Tie-EncryptedHash/pkg-comment b/security/p5-Tie-EncryptedHash/pkg-comment
deleted file mode 100644
index 75a2e427e8b1..000000000000
--- a/security/p5-Tie-EncryptedHash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Hashes (and objects based on hashes) with encrypting fields
diff --git a/security/pam-mysql/Makefile b/security/pam-mysql/Makefile
index ea0fe1a64fae..48e34258af69 100644
--- a/security/pam-mysql/Makefile
+++ b/security/pam-mysql/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://download.sourceforge.net/pam-mysql/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= A pam module for authenticating with MySQL
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/security/pam-mysql/pkg-comment b/security/pam-mysql/pkg-comment
deleted file mode 100644
index da728ddad337..000000000000
--- a/security/pam-mysql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pam module for authenticating with MySQL
diff --git a/security/pam_alreadyloggedin/Makefile b/security/pam_alreadyloggedin/Makefile
index 437f1bbf8ccf..5422c1af2e0a 100644
--- a/security/pam_alreadyloggedin/Makefile
+++ b/security/pam_alreadyloggedin/Makefile
@@ -20,6 +20,7 @@ MANCOMPRESSED= yes
BROKEN= "only works on systems with OpenPAM (5.0-CURRENT)"
.endif
MAINTAINER= green@FreeBSD.org
+COMMENT= PAM module based on whether a user is already logged in
.if defined(NOPROFILE)
PLIST_SUB+= PROFILE="@comment "
diff --git a/security/pam_alreadyloggedin/pkg-comment b/security/pam_alreadyloggedin/pkg-comment
deleted file mode 100644
index 7bb99e668860..000000000000
--- a/security/pam_alreadyloggedin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PAM module based on whether a user is already logged in
diff --git a/security/pam_krb5/Makefile b/security/pam_krb5/Makefile
index a2a9c08e7963..7a20ec6d6688 100644
--- a/security/pam_krb5/Makefile
+++ b/security/pam_krb5/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.komquats.com/distfiles/
MAINTAINER= cy@FreeBSD.org
+COMMENT= A Pluggable Authentication Module for Kerberos 5
MAN8= pam_krb5.8
diff --git a/security/pam_krb5/pkg-comment b/security/pam_krb5/pkg-comment
deleted file mode 100644
index 7e718e8bbb10..000000000000
--- a/security/pam_krb5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Pluggable Authentication Module for Kerberos 5
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index ee2c86fc4a9b..855285c2a325 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
DISTNAME= pgp263is
MAINTAINER= ache@FreeBSD.org
+COMMENT= PGP MIT or International version - Public-Key encryption for the masses
WRKSRC= ${WRKDIR}/src
diff --git a/security/pgp/pkg-comment b/security/pgp/pkg-comment
deleted file mode 100644
index 76960df3574b..000000000000
--- a/security/pgp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PGP MIT or International version - Public-Key encryption for the masses
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 020b4b57a541..8f6ad483179e 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -15,6 +15,7 @@ DISTNAME= pgp50i
EXTRACT_SUFX= -unix-src.tar.gz
MAINTAINER= markm@FreeBSD.org
+COMMENT= Public-Key encryption for the masses
WRKSRC= ${WRKDIR}/${DISTNAME}/src
GNU_CONFIGURE= yes
diff --git a/security/pgp5/pkg-comment b/security/pgp5/pkg-comment
deleted file mode 100644
index 3a41939785b3..000000000000
--- a/security/pgp5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Public-Key encryption for the masses
diff --git a/security/portscanner/Makefile b/security/portscanner/Makefile
index 12b7ec12ce57..7d5ff50d1a64 100644
--- a/security/portscanner/Makefile
+++ b/security/portscanner/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.ameth.org/~veilleux/PortScan/
DISTNAME= PortScanner-${PORTVERSION}
MAINTAINER= billf@FreeBSD.org
+COMMENT= A simple and easy to use TCP port scanner
do-build:
@ ${CC} -o ${WRKSRC}/portscanner ${CFLAGS} ${WRKSRC}/portscanner.c
diff --git a/security/portscanner/pkg-comment b/security/portscanner/pkg-comment
deleted file mode 100644
index 351abd69a401..000000000000
--- a/security/portscanner/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple and easy to use TCP port scanner
diff --git a/security/ppgen/Makefile b/security/ppgen/Makefile
index 4aed1ea82492..bc7d4bbc0199 100644
--- a/security/ppgen/Makefile
+++ b/security/ppgen/Makefile
@@ -13,6 +13,7 @@ DISTFILES= ${DISTNAME}.tar.gz en.gz
EXTRACT_ONLY= ${DISTNAME}.tar.gz
MAINTAINER= kris@FreeBSD.org
+COMMENT= Secure passphrase generator
GNU_CONFIGURE= yes
diff --git a/security/ppgen/pkg-comment b/security/ppgen/pkg-comment
deleted file mode 100644
index e6c745e33b12..000000000000
--- a/security/ppgen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Secure passphrase generator
diff --git a/security/pscan/Makefile b/security/pscan/Makefile
index ea9e3e8a8ec6..9740ad2f9578 100644
--- a/security/pscan/Makefile
+++ b/security/pscan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.striker.ottawa.on.ca/~aland/pscan/
DISTNAME= ${PORTNAME}
MAINTAINER= kris@FreeBSD.org
+COMMENT= Security C code scanner for misuse of format strings
ALL_TARGET= #empty
diff --git a/security/pscan/pkg-comment b/security/pscan/pkg-comment
deleted file mode 100644
index 6ba9b2d69ebf..000000000000
--- a/security/pscan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Security C code scanner for misuse of format strings
diff --git a/security/pwman/Makefile b/security/pwman/Makefile
index 442ea1dc17fc..d519e20738c4 100644
--- a/security/pwman/Makefile
+++ b/security/pwman/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= anders@FreeBSD.org
+COMMENT= Console password management application based on gpg(me)
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
diff --git a/security/pwman/pkg-comment b/security/pwman/pkg-comment
deleted file mode 100644
index 124745a3cdb9..000000000000
--- a/security/pwman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Console password management application based on gpg(me)
diff --git a/security/py-pycrypto/Makefile b/security/py-pycrypto/Makefile
index 39abcced90a4..16c67ed00395 100644
--- a/security/py-pycrypto/Makefile
+++ b/security/py-pycrypto/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pycrypto-1.9a4
MAINTAINER= nbm@FreeBSD.org
+COMMENT= The Python Cryptography Toolkit
USE_PYTHON= yes
USE_PYDISTUTILS=yes
diff --git a/security/py-pycrypto/pkg-comment b/security/py-pycrypto/pkg-comment
deleted file mode 100644
index ffe7c7fae83d..000000000000
--- a/security/py-pycrypto/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Python Cryptography Toolkit
diff --git a/security/qident/Makefile b/security/qident/Makefile
index 5d965958b070..37f71d1cfd9e 100644
--- a/security/qident/Makefile
+++ b/security/qident/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.netbsd.org/~ad/qident/
MAINTAINER= dd@FreeBSD.org
+COMMENT= Query a remote IDENT (RFC 1413) server
BUILD_DEPENDS= ${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
diff --git a/security/qident/pkg-comment b/security/qident/pkg-comment
deleted file mode 100644
index d366ce8fc172..000000000000
--- a/security/qident/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Query a remote IDENT (RFC 1413) server
diff --git a/security/qtfw/Makefile b/security/qtfw/Makefile
index 954c4d0c86d3..e5301837e0da 100644
--- a/security/qtfw/Makefile
+++ b/security/qtfw/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A GUI frontend for ipfw utility in FreeBSD
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/${PORTNAME}
USE_GMAKE= yes
diff --git a/security/qtfw/pkg-comment b/security/qtfw/pkg-comment
deleted file mode 100644
index 9f7d9b2f6466..000000000000
--- a/security/qtfw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GUI frontend for ipfw utility in FreeBSD
diff --git a/security/racoon/Makefile b/security/racoon/Makefile
index 9ce8bf88fc38..d5fcd1659e66 100644
--- a/security/racoon/Makefile
+++ b/security/racoon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security net
MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= KAME racoon IKE daemon
.if !exists(/usr/lib/libipsec.so.1)
BROKEN= "You must upgrade the OS"
diff --git a/security/racoon/pkg-comment b/security/racoon/pkg-comment
deleted file mode 100644
index 252204b81ad6..000000000000
--- a/security/racoon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KAME racoon IKE daemon
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 9ce8bf88fc38..d5fcd1659e66 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security net
MASTER_SITES= ftp://ftp.kame.net/pub/kame/misc/
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= KAME racoon IKE daemon
.if !exists(/usr/lib/libipsec.so.1)
BROKEN= "You must upgrade the OS"
diff --git a/security/racoon2/pkg-comment b/security/racoon2/pkg-comment
deleted file mode 100644
index 252204b81ad6..000000000000
--- a/security/racoon2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KAME racoon IKE daemon
diff --git a/security/radiusniff/Makefile b/security/radiusniff/Makefile
index cd117e1d1525..4be44354eec4 100644
--- a/security/radiusniff/Makefile
+++ b/security/radiusniff/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://adm.freelsd.net/ADM/
EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
+COMMENT= Sniffer for RADIUS traffic
WRKSRC= ${WRKDIR}/radiusniff-0.2
diff --git a/security/radiusniff/pkg-comment b/security/radiusniff/pkg-comment
deleted file mode 100644
index 334904a44928..000000000000
--- a/security/radiusniff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sniffer for RADIUS traffic
diff --git a/security/rain/Makefile b/security/rain/Makefile
index 938bc014b938..8b42c153fe0f 100644
--- a/security/rain/Makefile
+++ b/security/rain/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.mirrors.wiretapped.net/security/packet-construction/rai
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/beta/}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Rain is a packeting tool used for testing system stability
GNU_CONFIGURE= yes
diff --git a/security/rain/pkg-comment b/security/rain/pkg-comment
deleted file mode 100644
index a1d9d2d3d294..000000000000
--- a/security/rain/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Rain is a packeting tool used for testing system stability
diff --git a/security/rats/Makefile b/security/rats/Makefile
index 553cc6d6a55c..adf27ac906b4 100644
--- a/security/rats/Makefile
+++ b/security/rats/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_PACKETSTORM} \
MASTER_SITE_SUBDIR= UNIX/security
MAINTAINER= kris@FreeBSD.org
+COMMENT= Source code auditing tool
LIB_DEPENDS= expat.4:${PORTSDIR}/textproc/expat2
diff --git a/security/rats/pkg-comment b/security/rats/pkg-comment
deleted file mode 100644
index c01d93cfaf98..000000000000
--- a/security/rats/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Source code auditing tool
diff --git a/security/rsaref/Makefile b/security/rsaref/Makefile
index b33cb4b7b73b..fddfe26acaad 100644
--- a/security/rsaref/Makefile
+++ b/security/rsaref/Makefile
@@ -19,6 +19,7 @@ DISTNAME= rsaref20.1996
EXTRACT_SUFX= .tar.Z
MAINTAINER= kris@FreeBSD.ORG
+COMMENT= Encryption/authentication library, RSA/MDX/DES
WRKSRC= ${WRKDIR}/source
diff --git a/security/rsaref/pkg-comment b/security/rsaref/pkg-comment
deleted file mode 100644
index 0f0a8e152436..000000000000
--- a/security/rsaref/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Encryption/authentication library, RSA/MDX/DES
diff --git a/security/saferpay/Makefile b/security/saferpay/Makefile
index 325416c614c1..2b713f7b7bee 100644
--- a/security/saferpay/Makefile
+++ b/security/saferpay/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.saferpay.com/download/
DISTFILES= ${PORTNAME}_${PORTVERSION}_linux-g++_src.tar.gz
MAINTAINER= mbr@FreeBSD.org
+COMMENT= A command line tool for online payment
MAKEFILE= ${WRKSRC}/saferpay/Makefile
diff --git a/security/saferpay/pkg-comment b/security/saferpay/pkg-comment
deleted file mode 100644
index 7bd189d0207e..000000000000
--- a/security/saferpay/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command line tool for online payment
diff --git a/security/safesh/Makefile b/security/safesh/Makefile
index bc110262ef64..b3c68817ecb6 100644
--- a/security/safesh/Makefile
+++ b/security/safesh/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= eivind@FreeBSD.org
+COMMENT= Authentication manager for OpenSSH (making secure auth easier)
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/security/safesh/pkg-comment b/security/safesh/pkg-comment
deleted file mode 100644
index 5ed9a85de926..000000000000
--- a/security/safesh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Authentication manager for OpenSSH (making secure auth easier)
diff --git a/security/scanssh/Makefile b/security/scanssh/Makefile
index f02f06c34222..2bfa0e530cac 100644
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.monkey.org/~provos/
DISTNAME= ${PORTNAME}-1.6b
MAINTAINER= kris@FreeBSD.org
+COMMENT= Scanssh scans a subnet and reports the version of SSH installed
GNU_CONFIGURE= YES
diff --git a/security/scanssh/pkg-comment b/security/scanssh/pkg-comment
deleted file mode 100644
index 6546ce62f680..000000000000
--- a/security/scanssh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scanssh scans a subnet and reports the version of SSH installed
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index d646889d9fc7..158d3e5c3381 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.pingx.net/secpanel/
MAINTAINER= petef@FreeBSD.org
+COMMENT= GUI for managing and running ssh and related utilities
RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
ssh-askpass:${PORTSDIR}/security/openssh-askpass
diff --git a/security/secpanel/pkg-comment b/security/secpanel/pkg-comment
deleted file mode 100644
index b2751f466b64..000000000000
--- a/security/secpanel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI for managing and running ssh and related utilities
diff --git a/security/siphon/Makefile b/security/siphon/Makefile
index a7f663db8827..9ccb7f836c40 100644
--- a/security/siphon/Makefile
+++ b/security/siphon/Makefile
@@ -15,6 +15,7 @@ DISTFILES= siphon-v.666.tar.gz siphon-report.pl
EXTRACT_ONLY= siphon-v.666.tar.gz
MAINTAINER= kris@FreeBSD.org
+COMMENT= Passive host OS identifier using characteristics of sniffed traffic
WRKSRC= ${WRKDIR}/siphon-v.666
diff --git a/security/siphon/pkg-comment b/security/siphon/pkg-comment
deleted file mode 100644
index 744af7d0be18..000000000000
--- a/security/siphon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Passive host OS identifier using characteristics of sniffed traffic
diff --git a/security/skip/Makefile b/security/skip/Makefile
index 1b16c21f6713..49dad581c95f 100644
--- a/security/skip/Makefile
+++ b/security/skip/Makefile
@@ -18,6 +18,7 @@ DISTNAME= skipsrc-1.0
EXTRACT_SUFX= .tar.Z
MAINTAINER= archie@freebsd.org
+COMMENT= Stateless IP layer security and encryption from Sun Microsystems
BUILD_DEPENDS= ${X11BASE}/lib/libxview.a:${PORTSDIR}/x11-toolkits/xview \
${X11BASE}/lib/X11/config/XView.cf:${PORTSDIR}/x11-toolkits/xview
diff --git a/security/skip/pkg-comment b/security/skip/pkg-comment
deleted file mode 100644
index 02f7ac1e21d0..000000000000
--- a/security/skip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Stateless IP layer security and encryption from Sun Microsystems
diff --git a/security/snort/Makefile b/security/snort/Makefile
index 12c72859a2ed..3970e97a3d45 100644
--- a/security/snort/Makefile
+++ b/security/snort/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.snort.org/dl/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Lightweight network intrusion detection system
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-mysql=no --with-odbc=no --with-postgresql=no
diff --git a/security/snort/pkg-comment b/security/snort/pkg-comment
deleted file mode 100644
index 2ed409a612f5..000000000000
--- a/security/snort/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight network intrusion detection system
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 980f6fa7ed21..8d8dcbc8e0dc 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.silicondefense.com/software/snortsnarf/
DISTNAME= SnortSnarf-${PORTVERSION}.1
MAINTAINER= kris@FreeBSD.org
+COMMENT= Generate HTML report summaries from snort incident alerts
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/JulianDay.pm:${PORTSDIR}/devel/p5-Time
diff --git a/security/snortsnarf/pkg-comment b/security/snortsnarf/pkg-comment
deleted file mode 100644
index d7db98ad4fd2..000000000000
--- a/security/snortsnarf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generate HTML report summaries from snort incident alerts
diff --git a/security/ssh-multiadd/Makefile b/security/ssh-multiadd/Makefile
index c54809e436f4..6410accafc08 100644
--- a/security/ssh-multiadd/Makefile
+++ b/security/ssh-multiadd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
MASTER_SITES= http://www.azstarnet.com/~donut/programs/ssh-multiadd/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Tool to add multiple ssh keys to the authentication agent
USE_PYTHON= yes
USE_REINPLACE= yes
diff --git a/security/ssh-multiadd/pkg-comment b/security/ssh-multiadd/pkg-comment
deleted file mode 100644
index f3aa878afc4a..000000000000
--- a/security/ssh-multiadd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tool to add multiple ssh keys to the authentication agent
diff --git a/security/sst/Makefile b/security/sst/Makefile
index d23cbd3ec3fd..a16b13c49f7c 100644
--- a/security/sst/Makefile
+++ b/security/sst/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://utcc.utoronto.ca/~pkern/stuff/sst/
DISTNAME= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A simple SSL tunneling tool (uses netcat)
RUN_DEPENDS= nc:${PORTSDIR}/net/netcat
diff --git a/security/sst/pkg-comment b/security/sst/pkg-comment
deleted file mode 100644
index b6c7a8349800..000000000000
--- a/security/sst/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple SSL tunneling tool (uses netcat)
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 0603a7f6ac66..d75a873c36ef 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://www.sudo.ws/sudo/dist/ \
DISTNAME= ${PORTNAME}-1.6.6
MAINTAINER= mharo@FreeBSD.org
+COMMENT= Allow others to run commands as root
USE_REINPLACE= yes
GNU_CONFIGURE= yes
diff --git a/security/sudo/pkg-comment b/security/sudo/pkg-comment
deleted file mode 100644
index 7e660f8137c4..000000000000
--- a/security/sudo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allow others to run commands as root
diff --git a/security/super/Makefile b/security/super/Makefile
index ba179cd043b6..f7948b2b7b5c 100644
--- a/security/super/Makefile
+++ b/security/super/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ucolick.org/pub/users/will/
EXTRACT_SUFX= -tar.gz
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Allow others to run commands as root
.include <bsd.port.pre.mk>
diff --git a/security/super/pkg-comment b/security/super/pkg-comment
deleted file mode 100644
index 7e660f8137c4..000000000000
--- a/security/super/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allow others to run commands as root
diff --git a/security/tripwire-131/Makefile b/security/tripwire-131/Makefile
index 75b0e281f8b8..a2579e8dca9f 100644
--- a/security/tripwire-131/Makefile
+++ b/security/tripwire-131/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= security
DISTNAME= Tripwire-${PORTVERSION}-1
MAINTAINER= cy@FreeBSD.org
+COMMENT= File system security and verification program
MAN5= tw.config.5
MAN8= siggen.8 tripwire.8
diff --git a/security/tripwire-131/pkg-comment b/security/tripwire-131/pkg-comment
deleted file mode 100644
index e72f9d2604a3..000000000000
--- a/security/tripwire-131/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File system security and verification program
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index 4341434c2d87..6aec93f4b5c5 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://download.sourceforge.net/tripwire/
DISTNAME= tripwire-2.3.1-2
MAINTAINER= cy@FreeBSD.org
+COMMENT= File system security and verification program
MAN5= twfiles.5 twconfig.5 twpolicy.5
MAN8= siggen.8 tripwire.8 twadmin.8 twintro.8 twprint.8
diff --git a/security/tripwire/pkg-comment b/security/tripwire/pkg-comment
deleted file mode 100644
index e72f9d2604a3..000000000000
--- a/security/tripwire/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File system security and verification program
diff --git a/security/vlock/Makefile b/security/vlock/Makefile
index 5a337b5a5704..027baba6d830 100644
--- a/security/vlock/Makefile
+++ b/security/vlock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/console
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= Locks a terminal
MAN1= vlock.1
diff --git a/security/vlock/pkg-comment b/security/vlock/pkg-comment
deleted file mode 100644
index 10b7d1ea646c..000000000000
--- a/security/vlock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Locks a terminal
diff --git a/security/vncrypt/Makefile b/security/vncrypt/Makefile
index 4a97f530423e..31204b064904 100644
--- a/security/vncrypt/Makefile
+++ b/security/vncrypt/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= skv@FreeBSD.org
+COMMENT= Cryptographic disk driver for FreeBSD
NO_PACKAGE= "Depends on kernel"
PLIST_SUB= KMODDIR=${KMODDIR} DOCSDIR="share/doc/${PORTNAME}"
diff --git a/security/vncrypt/pkg-comment b/security/vncrypt/pkg-comment
deleted file mode 100644
index e78790c40b85..000000000000
--- a/security/vncrypt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cryptographic disk driver for FreeBSD
diff --git a/security/vpnd/Makefile b/security/vpnd/Makefile
index 2b50143eb034..14c50273bfb1 100644
--- a/security/vpnd/Makefile
+++ b/security/vpnd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://sunsite.dk/vpnd/archive/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= VPN daemon offering transparent blowfish encryption between networks
WRKSRC= ${WRKDIR}/${PORTNAME}
HAS_CONFIGURE= yes
diff --git a/security/vpnd/pkg-comment b/security/vpnd/pkg-comment
deleted file mode 100644
index 37c507cc2921..000000000000
--- a/security/vpnd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-VPN daemon offering transparent blowfish encryption between networks
diff --git a/security/vscan/Makefile b/security/vscan/Makefile
index bbdcd12a5c26..71b4120e27ae 100644
--- a/security/vscan/Makefile
+++ b/security/vscan/Makefile
@@ -14,6 +14,7 @@ DISTNAME= vbsd416e
EXTRACT_SUFX= .tar.Z
MAINTAINER= jeh@FreeBSD.org
+COMMENT= Evaluation version of a DOS/Windows/Linux file virus scanner
RUN_DEPENDS+= ${LOCALBASE}/sbin/update_dat:${PORTSDIR}/security/uvscan-dat
LIB_DEPENDS+= c.3:${PORTSDIR}/misc/compat3x
diff --git a/security/vscan/pkg-comment b/security/vscan/pkg-comment
deleted file mode 100644
index a1a88b4da330..000000000000
--- a/security/vscan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Evaluation version of a DOS/Windows/Linux file virus scanner
diff --git a/security/whisker/Makefile b/security/whisker/Makefile
index 0c548a1043d8..7f6deb2c2175 100644
--- a/security/whisker/Makefile
+++ b/security/whisker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.wiretrip.net/rfp/bins/whisker/
DISTNAME= ${PORTNAME}
MAINTAINER= kris@FreeBSD.ORG
+COMMENT= A sophisticated CGI (in)security scanner
WRKSRC= ${WRKDIR}/v${PORTVERSION}
NO_BUILD= yes
diff --git a/security/whisker/pkg-comment b/security/whisker/pkg-comment
deleted file mode 100644
index 273e7415fefb..000000000000
--- a/security/whisker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A sophisticated CGI (in)security scanner
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index f74fcf3bf7be..b1e33b92305d 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= security ipv6
MASTER_SITES= http://www.xinetd.org/
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Replacement for inetd with better control and logging
USE_REINPLACE= yes
USE_GMAKE= yes
diff --git a/security/xinetd/pkg-comment b/security/xinetd/pkg-comment
deleted file mode 100644
index 3fc2d1f94449..000000000000
--- a/security/xinetd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Replacement for inetd with better control and logging
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 0808da9fdb6d..9ffdd87f3520 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR= obrien
PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004
MAINTAINER= obrien@FreeBSD.org
+COMMENT= The GNU Bourne Again Shell
.include <bsd.port.pre.mk>
diff --git a/shells/bash/pkg-comment b/shells/bash/pkg-comment
deleted file mode 100644
index 0f4244ddda46..000000000000
--- a/shells/bash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index 0808da9fdb6d..9ffdd87f3520 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR= obrien
PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004
MAINTAINER= obrien@FreeBSD.org
+COMMENT= The GNU Bourne Again Shell
.include <bsd.port.pre.mk>
diff --git a/shells/bash2/pkg-comment b/shells/bash2/pkg-comment
deleted file mode 100644
index 0f4244ddda46..000000000000
--- a/shells/bash2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile
index 0808da9fdb6d..9ffdd87f3520 100644
--- a/shells/bash3/Makefile
+++ b/shells/bash3/Makefile
@@ -24,6 +24,7 @@ PATCH_SITE_SUBDIR= obrien
PATCHFILES= bash205b-001 bash205b-002 bash205b-003 bash205b-004
MAINTAINER= obrien@FreeBSD.org
+COMMENT= The GNU Bourne Again Shell
.include <bsd.port.pre.mk>
diff --git a/shells/bash3/pkg-comment b/shells/bash3/pkg-comment
deleted file mode 100644
index 0f4244ddda46..000000000000
--- a/shells/bash3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The GNU Bourne Again Shell
diff --git a/shells/mudsh/Makefile b/shells/mudsh/Makefile
index 5cf8e2398836..05b91b348b1d 100644
--- a/shells/mudsh/Makefile
+++ b/shells/mudsh/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=
EXTRACT_ONLY=
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= An "intelligent" game-like shell
NO_WRKSUBDIR= yes
diff --git a/shells/mudsh/pkg-comment b/shells/mudsh/pkg-comment
deleted file mode 100644
index b8fbdb72afd0..000000000000
--- a/shells/mudsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An "intelligent" game-like shell
diff --git a/shells/osh/Makefile b/shells/osh/Makefile
index 81ffac9ff10d..b1eded7bf981 100644
--- a/shells/osh/Makefile
+++ b/shells/osh/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= shells
MASTER_SITES= http://omnibus.ruf.uni-freiburg.de/~gritter/archive/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= An implementation of the UNIX 6th Edition shell.
MAKEFILE= makefile
diff --git a/shells/osh/pkg-comment b/shells/osh/pkg-comment
deleted file mode 100644
index 4183f972a01a..000000000000
--- a/shells/osh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the UNIX 6th Edition shell.
diff --git a/shells/pash/Makefile b/shells/pash/Makefile
index 81b1ed3decac..8d51cfb8ccee 100644
--- a/shells/pash/Makefile
+++ b/shells/pash/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.chez-pierre.com/pash/Archives/
DISTNAME= pash.sources
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A full-screen shell (commander GUI) for *nix.
NO_WRKSUBDIR= yes
diff --git a/shells/pash/pkg-comment b/shells/pash/pkg-comment
deleted file mode 100644
index a576175c6c94..000000000000
--- a/shells/pash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full-screen shell (commander GUI) for *nix.
diff --git a/shells/pdksh/Makefile b/shells/pdksh/Makefile
index 6951edce675e..374d8870ddfc 100644
--- a/shells/pdksh/Makefile
+++ b/shells/pdksh/Makefile
@@ -20,6 +20,7 @@ PATCHFILES= ${DISTNAME}-patches.1 ${DISTNAME}-patches.2
PATCH_DIST_STRIP= -p2
MAINTAINER= tg@FreeBSD.org
+COMMENT= The Public Domain Korn Shell
GNU_CONFIGURE= yes
CONFIGURE_ENV= LDSTATIC=-static
diff --git a/shells/pdksh/pkg-comment b/shells/pdksh/pkg-comment
deleted file mode 100644
index 81dea2e5eceb..000000000000
--- a/shells/pdksh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Public Domain Korn Shell
diff --git a/shells/sash/Makefile b/shells/sash/Makefile
index 748ed00d383f..79f61e85a95d 100644
--- a/shells/sash/Makefile
+++ b/shells/sash/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.pcug.org.au/~dbell/programs/ \
MASTER_SITE_SUBDIR= patrick
MAINTAINER= patrick@freebsd.org
+COMMENT= A Stand-Alone shell combining many common utilities
MAN1= sash.1
diff --git a/shells/sash/pkg-comment b/shells/sash/pkg-comment
deleted file mode 100644
index 532f16db8298..000000000000
--- a/shells/sash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Stand-Alone shell combining many common utilities
diff --git a/shells/wapsh/Makefile b/shells/wapsh/Makefile
index 026106cbc99a..3da577109096 100644
--- a/shells/wapsh/Makefile
+++ b/shells/wapsh/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.exolution.de/wapsh/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= greid@FreeBSD.org
+COMMENT= A system to allow remote shell logins via a WAP phone or web browser
#RUN_DEPENDS= ${LOCALBASE}/sbin/httpd:${PORTSDIR}/www/apache13 \
# ${LOCALBASE}/libexec/apache/libphp3.so:${PORTSDIR}/www/mod_php3
diff --git a/shells/wapsh/pkg-comment b/shells/wapsh/pkg-comment
deleted file mode 100644
index 7f873392cb87..000000000000
--- a/shells/wapsh/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A system to allow remote shell logins via a WAP phone or web browser
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index cc7490c391fc..0df38aa85777 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -19,6 +19,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}/development
DISTNAME= ${PORTNAME}-${ZSH_VER}-dev-${ZSH_DEV_REV}
MAINTAINER= shige@FreeBSD.org
+COMMENT= The Z shell (development version)
USE_AUTOCONF= yes
USE_REINPLACE= yes
diff --git a/shells/zsh-devel/pkg-comment b/shells/zsh-devel/pkg-comment
deleted file mode 100644
index a1eadea141a1..000000000000
--- a/shells/zsh-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Z shell (development version)
diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index 5ce08abc92bb..8f24b9f60ec0 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.procplace.com/pub/contrib/3ware/3dm/ \
DISTNAME= 3dm-bsd-${PORTVERSION}
MAINTAINER= dbaker@FreeBSD.org
+COMMENT= 3ware ATA RAID monitoring daemon and web server
.include <bsd.port.pre.mk>
diff --git a/sysutils/3dm/pkg-comment b/sysutils/3dm/pkg-comment
deleted file mode 100644
index 2db2f908c85f..000000000000
--- a/sysutils/3dm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-3ware ATA RAID monitoring daemon and web server
diff --git a/sysutils/44bsd-more/Makefile b/sysutils/44bsd-more/Makefile
index 6e1de6cf9edb..f286f3e7de16 100644
--- a/sysutils/44bsd-more/Makefile
+++ b/sysutils/44bsd-more/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= hoek
MAINTAINER= hoek@FreeBSD.org
+COMMENT= The pager installed with FreeBSD before less(1) was imported
USE_BZIP2= yes
USE_REINPLACE= yes
diff --git a/sysutils/44bsd-more/pkg-comment b/sysutils/44bsd-more/pkg-comment
deleted file mode 100644
index fffddd0b71a9..000000000000
--- a/sysutils/44bsd-more/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The pager installed with FreeBSD before less(1) was imported
diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile
index f2c199565864..5b80f1548a1a 100644
--- a/sysutils/ascpu/Makefile
+++ b/sysutils/ascpu/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils afterstep
MASTER_SITES= http://www.tigr.net/afterstep/download/ascpu/
MAINTAINER= demon@FreeBSD.org
+COMMENT= CPU statistics monitor utility for XFree86
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg
diff --git a/sysutils/ascpu/pkg-comment b/sysutils/ascpu/pkg-comment
deleted file mode 100644
index df127107e51d..000000000000
--- a/sysutils/ascpu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CPU statistics monitor utility for XFree86
diff --git a/sysutils/bbapm/Makefile b/sysutils/bbapm/Makefile
index 32d7b81cf495..9a9896ec322c 100644
--- a/sysutils/bbapm/Makefile
+++ b/sysutils/bbapm/Makefile
@@ -15,6 +15,7 @@ PATCHFILES= bbapm-0.0.1-freebsd-patch-2.diff
PATCH_DIST_STRIP= -p1
MAINTAINER= adamw@FreeBSD.org
+COMMENT= APM monitor for the Blackbox slit
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/sysutils/bbapm/pkg-comment b/sysutils/bbapm/pkg-comment
deleted file mode 100644
index d2ac28951ef0..000000000000
--- a/sysutils/bbapm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-APM monitor for the Blackbox slit
diff --git a/sysutils/cd-write/Makefile b/sysutils/cd-write/Makefile
index a8016a81f99d..61b1c2551606 100644
--- a/sysutils/cd-write/Makefile
+++ b/sysutils/cd-write/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jmz
MAINTAINER= jmz@FreeBSD.org
+COMMENT= A X11 based CD-burner
LIB_DEPENDS= tixsam4182.1:${PORTSDIR}/x11-toolkits/tix
USE_PERL5_BUILD= yes
diff --git a/sysutils/cd-write/pkg-comment b/sysutils/cd-write/pkg-comment
deleted file mode 100644
index 603a1dcc07fa..000000000000
--- a/sysutils/cd-write/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A X11 based CD-burner
diff --git a/sysutils/cd9660_unicode/Makefile b/sysutils/cd9660_unicode/Makefile
index 439716522c8d..e006d65e912a 100644
--- a/sysutils/cd9660_unicode/Makefile
+++ b/sysutils/cd9660_unicode/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= sobomax
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A kernel driver for reading CD disks with non-English filenames
NO_PACKAGE= Should be in sync with the kernel to work correctly
diff --git a/sysutils/cd9660_unicode/pkg-comment b/sysutils/cd9660_unicode/pkg-comment
deleted file mode 100644
index 9633b3e9a39e..000000000000
--- a/sysutils/cd9660_unicode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A kernel driver for reading CD disks with non-English filenames
diff --git a/sysutils/cdroot/Makefile b/sysutils/cdroot/Makefile
index 72e216c4cc8e..b796efdb266b 100644
--- a/sysutils/cdroot/Makefile
+++ b/sysutils/cdroot/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= bsd
MAINTAINER= bsd@FreeBSD.org
+COMMENT= Scripts to automate setting up a bootable CD-ROM based FreeBSD system
.include <bsd.port.mk>
diff --git a/sysutils/cdroot/pkg-comment b/sysutils/cdroot/pkg-comment
deleted file mode 100644
index f787d3bbaa9d..000000000000
--- a/sysutils/cdroot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scripts to automate setting up a bootable CD-ROM based FreeBSD system
diff --git a/sysutils/cfengine/Makefile b/sysutils/cfengine/Makefile
index 81c044333557..1e17c1a2364b 100644
--- a/sysutils/cfengine/Makefile
+++ b/sysutils/cfengine/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordon@FreeBSD.org
+COMMENT= GNU cfengine - a systems administration tool for networks
.if defined(PACKAGE_BUILDING)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/sysutils/cfengine/pkg-comment b/sysutils/cfengine/pkg-comment
deleted file mode 100644
index 1e26973ca336..000000000000
--- a/sysutils/cfengine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU cfengine - a systems administration tool for networks
diff --git a/sysutils/cfengine2/Makefile b/sysutils/cfengine2/Makefile
index a18fa0ea6763..0d7390376e25 100644
--- a/sysutils/cfengine2/Makefile
+++ b/sysutils/cfengine2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= cfengine-${PORTVERSION}
MAINTAINER= fanf@FreeBSD.org
+COMMENT= GNU cfengine - a systems administration tool for networks
LIB_DEPENDS= db4:${PORTSDIR}/databases/db4
diff --git a/sysutils/cfengine2/pkg-comment b/sysutils/cfengine2/pkg-comment
deleted file mode 100644
index 1e26973ca336..000000000000
--- a/sysutils/cfengine2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU cfengine - a systems administration tool for networks
diff --git a/sysutils/cfengine3-legacy/Makefile b/sysutils/cfengine3-legacy/Makefile
index 81c044333557..1e17c1a2364b 100644
--- a/sysutils/cfengine3-legacy/Makefile
+++ b/sysutils/cfengine3-legacy/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordon@FreeBSD.org
+COMMENT= GNU cfengine - a systems administration tool for networks
.if defined(PACKAGE_BUILDING)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/sysutils/cfengine3-legacy/pkg-comment b/sysutils/cfengine3-legacy/pkg-comment
deleted file mode 100644
index 1e26973ca336..000000000000
--- a/sysutils/cfengine3-legacy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU cfengine - a systems administration tool for networks
diff --git a/sysutils/cfengine3/Makefile b/sysutils/cfengine3/Makefile
index 81c044333557..1e17c1a2364b 100644
--- a/sysutils/cfengine3/Makefile
+++ b/sysutils/cfengine3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.iu.hio.no/pub/cfengine/ \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordon@FreeBSD.org
+COMMENT= GNU cfengine - a systems administration tool for networks
.if defined(PACKAGE_BUILDING)
BUILD_DEPENDS= latex:${PORTSDIR}/print/teTeX
diff --git a/sysutils/cfengine3/pkg-comment b/sysutils/cfengine3/pkg-comment
deleted file mode 100644
index 1e26973ca336..000000000000
--- a/sysutils/cfengine3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNU cfengine - a systems administration tool for networks
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index 8f6c815502af..b3191a935194 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= petef
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
+COMMENT= A robust log colorizer
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Term/ANSIColor.pm:${PORTSDIR}/devel/p5-Term-ANSIColor
diff --git a/sysutils/colorize/pkg-comment b/sysutils/colorize/pkg-comment
deleted file mode 100644
index 3be081ed3898..000000000000
--- a/sysutils/colorize/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A robust log colorizer
diff --git a/sysutils/comconsole/Makefile b/sysutils/comconsole/Makefile
index e90a4f4b3b44..be30bedb936c 100644
--- a/sysutils/comconsole/Makefile
+++ b/sysutils/comconsole/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= #
DISTFILES=
MAINTAINER= sada@FreeBSD.org
+COMMENT= Setup your PC to use serial port COM1 as its console device
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/sysutils/comconsole/pkg-comment b/sysutils/comconsole/pkg-comment
deleted file mode 100644
index 9bb8871b3b85..000000000000
--- a/sysutils/comconsole/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Setup your PC to use serial port COM1 as its console device
diff --git a/sysutils/cpdup/Makefile b/sysutils/cpdup/Makefile
index 615fa5c76d91..8b20b7349c59 100644
--- a/sysutils/cpdup/Makefile
+++ b/sysutils/cpdup/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://apollo.backplane.com/FreeBSDPorts/
#MASTER_SITE_SUBDIR= cp
MAINTAINER= dillon@FreeBSD.ORG
+COMMENT= A comprehensive filesystem mirroring program
MAN1= cpdup.1
MANCOMPRESSED= yes
diff --git a/sysutils/cpdup/pkg-comment b/sysutils/cpdup/pkg-comment
deleted file mode 100644
index 213fc2fe0d1c..000000000000
--- a/sysutils/cpdup/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A comprehensive filesystem mirroring program
diff --git a/sysutils/dirdiff/Makefile b/sysutils/dirdiff/Makefile
index d49f2c715884..6ac3f3c6186f 100644
--- a/sysutils/dirdiff/Makefile
+++ b/sysutils/dirdiff/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ftp://samba.org/pub/paulus/
MAINTAINER= grog@FreeBSD.Org
+COMMENT= A graphical diff tool
BUILD_DEPENDS= tclsh8.2:${PORTSDIR}/lang/tcl82
RUN_DEPENDS= wish8.2:${PORTSDIR}/x11-toolkits/tk82
diff --git a/sysutils/dirdiff/pkg-comment b/sysutils/dirdiff/pkg-comment
deleted file mode 100644
index d785be03ecc3..000000000000
--- a/sysutils/dirdiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical diff tool
diff --git a/sysutils/eject/Makefile b/sysutils/eject/Makefile
index d3611d476746..105d60fdab95 100644
--- a/sysutils/eject/Makefile
+++ b/sysutils/eject/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/OD/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/FreeBSD-jp/OD/
MAINTAINER= shige@FreeBSD.org
+COMMENT= Utility for ejecting media from CD or optical disk drive
DOCDIR= share/doc/eject
PLIST_SUB= DOCDIR=${DOCDIR}
diff --git a/sysutils/eject/pkg-comment b/sysutils/eject/pkg-comment
deleted file mode 100644
index c797bd0e4207..000000000000
--- a/sysutils/eject/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility for ejecting media from CD or optical disk drive
diff --git a/sysutils/fortunelock/Makefile b/sysutils/fortunelock/Makefile
index 430bde0d9799..7a4cfdd0063f 100644
--- a/sysutils/fortunelock/Makefile
+++ b/sysutils/fortunelock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= dannyboy
MAINTAINER= dannyboy@FreeBSD.org
+COMMENT= Locks a terminal while showing fortunes
USE_BZIP2= yes
diff --git a/sysutils/fortunelock/pkg-comment b/sysutils/fortunelock/pkg-comment
deleted file mode 100644
index 24abcbd6a9bd..000000000000
--- a/sysutils/fortunelock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Locks a terminal while showing fortunes
diff --git a/sysutils/ftrace/Makefile b/sysutils/ftrace/Makefile
index af0c57e391ca..17bfee4ad76f 100644
--- a/sysutils/ftrace/Makefile
+++ b/sysutils/ftrace/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://software.senko.net/pub/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A file modification/creation watcher
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
diff --git a/sysutils/ftrace/pkg-comment b/sysutils/ftrace/pkg-comment
deleted file mode 100644
index ba8ddec8955f..000000000000
--- a/sysutils/ftrace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file modification/creation watcher
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index bb42196df93e..cdfa53b974a5 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.4
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A gconf database editor for the GNOME 2.0 environment
LIB_DEPENDS= gconf-2.5:${PORTSDIR}/devel/gconf2
diff --git a/sysutils/gconf-editor/pkg-comment b/sysutils/gconf-editor/pkg-comment
deleted file mode 100644
index 781bc9fa449e..000000000000
--- a/sysutils/gconf-editor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A gconf database editor for the GNOME 2.0 environment
diff --git a/sysutils/gkrellflynn/Makefile b/sysutils/gkrellflynn/Makefile
index 8c645b1f05d9..9c19a9074e45 100644
--- a/sysutils/gkrellflynn/Makefile
+++ b/sysutils/gkrellflynn/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://horus.comlab.uni-rostock.de/flynn/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Flynn is a tiny system load meter for gkrellm
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/sysutils/gkrellflynn/pkg-comment b/sysutils/gkrellflynn/pkg-comment
deleted file mode 100644
index 436fc0e0c6be..000000000000
--- a/sysutils/gkrellflynn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Flynn is a tiny system load meter for gkrellm
diff --git a/sysutils/gkrellmouse/Makefile b/sysutils/gkrellmouse/Makefile
index a2be3d03468b..d2473e68e2e9 100644
--- a/sysutils/gkrellmouse/Makefile
+++ b/sysutils/gkrellmouse/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://ssl.usu.edu/paul/gkrellmouse/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Mouse odometer plugin for GKrellM
BUILD_DEPENDS= ${X11BASE}/include/gkrellm/gkrellm.h:${PORTSDIR}/sysutils/gkrellm
RUN_DEPENDS= gkrellm:${PORTSDIR}/sysutils/gkrellm
diff --git a/sysutils/gkrellmouse/pkg-comment b/sysutils/gkrellmouse/pkg-comment
deleted file mode 100644
index db5550dc3444..000000000000
--- a/sysutils/gkrellmouse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mouse odometer plugin for GKrellM
diff --git a/sysutils/glload/Makefile b/sysutils/glload/Makefile
index 99f448b22e7d..346c9ea3949b 100644
--- a/sysutils/glload/Makefile
+++ b/sysutils/glload/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://glload.netpedia.net/source/ \
MASTER_SITE_SUBDIR= vanilla
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Gl base load monitor
USE_X_PREFIX= yes
USE_MESA= yes
diff --git a/sysutils/glload/pkg-comment b/sysutils/glload/pkg-comment
deleted file mode 100644
index de448cbc192f..000000000000
--- a/sysutils/glload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gl base load monitor
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index f5eb57557fa4..ee529056f949 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -14,6 +14,7 @@ DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Control center for GNOME 2.0 project
LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
metacity-private.0:${PORTSDIR}/x11-wm/metacity
diff --git a/sysutils/gnome-control-center/pkg-comment b/sysutils/gnome-control-center/pkg-comment
deleted file mode 100644
index 7d382af367b0..000000000000
--- a/sysutils/gnome-control-center/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Control center for GNOME 2.0 project
diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile
index f5ddc98225ac..a219e549d312 100644
--- a/sysutils/gnome-control-center1/Makefile
+++ b/sysutils/gnome-control-center1/Makefile
@@ -15,6 +15,7 @@ DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Control center for GNOME project
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/gnome-control-center1/pkg-comment b/sysutils/gnome-control-center1/pkg-comment
deleted file mode 100644
index f907c341be26..000000000000
--- a/sysutils/gnome-control-center1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Control center for GNOME project
diff --git a/sysutils/gnome-pkgview/Makefile b/sysutils/gnome-pkgview/Makefile
index 5845eb2d971a..4f31ce8ee2b4 100644
--- a/sysutils/gnome-pkgview/Makefile
+++ b/sysutils/gnome-pkgview/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= http://www.gtnorthern.demon.co.uk/packages/gnome-pkgview/
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Displays the version of GNOME 2 components installed
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/sysutils/gnome-pkgview/pkg-comment b/sysutils/gnome-pkgview/pkg-comment
deleted file mode 100644
index 09a399813ca2..000000000000
--- a/sysutils/gnome-pkgview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Displays the version of GNOME 2 components installed
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 83c2ec20a84e..17690f2ce04a 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 system monitor program
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
diff --git a/sysutils/gnome-system-monitor/pkg-comment b/sysutils/gnome-system-monitor/pkg-comment
deleted file mode 100644
index 097ce268b0f8..000000000000
--- a/sysutils/gnome-system-monitor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 system monitor program
diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile
index f5ddc98225ac..a219e549d312 100644
--- a/sysutils/gnomecontrolcenter/Makefile
+++ b/sysutils/gnomecontrolcenter/Makefile
@@ -15,6 +15,7 @@ DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Control center for GNOME project
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/gnomecontrolcenter/pkg-comment b/sysutils/gnomecontrolcenter/pkg-comment
deleted file mode 100644
index f907c341be26..000000000000
--- a/sysutils/gnomecontrolcenter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Control center for GNOME project
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index f5eb57557fa4..ee529056f949 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= control-center-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Control center for GNOME 2.0 project
LIB_DEPENDS= gnome-desktop-2.3:${PORTSDIR}/x11/gnomedesktop \
metacity-private.0:${PORTSDIR}/x11-wm/metacity
diff --git a/sysutils/gnomecontrolcenter2/pkg-comment b/sysutils/gnomecontrolcenter2/pkg-comment
deleted file mode 100644
index 7d382af367b0..000000000000
--- a/sysutils/gnomecontrolcenter2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Control center for GNOME 2.0 project
diff --git a/sysutils/gnomefind/Makefile b/sysutils/gnomefind/Makefile
index 1cd51b35baf1..ee5a4cae9e2b 100644
--- a/sysutils/gnomefind/Makefile
+++ b/sysutils/gnomefind/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= gnome-find
DISTNAME= gnome-find-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Graphical version of the GNU "find" utility
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/sysutils/gnomefind/pkg-comment b/sysutils/gnomefind/pkg-comment
deleted file mode 100644
index 0de826604c0a..000000000000
--- a/sysutils/gnomefind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphical version of the GNU "find" utility
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 83c2ec20a84e..17690f2ce04a 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-system-monitor-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME 2.0 system monitor program
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
gtop-2.0.2:${PORTSDIR}/devel/libgtop2 \
diff --git a/sysutils/gnomesystemmonitor/pkg-comment b/sysutils/gnomesystemmonitor/pkg-comment
deleted file mode 100644
index 097ce268b0f8..000000000000
--- a/sysutils/gnomesystemmonitor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME 2.0 system monitor program
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index d6995a4ed9f3..586822ac7d3b 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.gnu.org/software/grub/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= GRand Unified Bootloader
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/sysutils/grub/pkg-comment b/sysutils/grub/pkg-comment
deleted file mode 100644
index 3c393075402e..000000000000
--- a/sysutils/grub/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GRand Unified Bootloader
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index a998d5606da0..0d9a1ab00833 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtop/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME system moniter program
LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop
diff --git a/sysutils/gtop/pkg-comment b/sysutils/gtop/pkg-comment
deleted file mode 100644
index f08d391b296f..000000000000
--- a/sysutils/gtop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME system moniter program
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 7da74e434a37..aaf782708de7 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= sysutils gnome
MASTER_SITES= http://www.stud.ifi.uio.no/~hennikul/gupsc/download/
MAINTAINER= demon@FreeBSD.org
+COMMENT= A free Gnome client for the Network UPS Tools
USE_X_PREFIX= yes
USE_BZIP2= yes
diff --git a/sysutils/gupsc/pkg-comment b/sysutils/gupsc/pkg-comment
deleted file mode 100644
index a53c3cc36008..000000000000
--- a/sysutils/gupsc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free Gnome client for the Network UPS Tools
diff --git a/sysutils/installwatch/Makefile b/sysutils/installwatch/Makefile
index c7640f5e70f1..0b5a7e976cde 100644
--- a/sysutils/installwatch/Makefile
+++ b/sysutils/installwatch/Makefile
@@ -12,5 +12,6 @@ MASTER_SITES= http://mayams.net/~izto/
EXTRACT_SUFX= .tgz
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A file creation/modification logger
.include <bsd.port.mk>
diff --git a/sysutils/installwatch/pkg-comment b/sysutils/installwatch/pkg-comment
deleted file mode 100644
index 6bebe48e5f88..000000000000
--- a/sysutils/installwatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file creation/modification logger
diff --git a/sysutils/jailer/Makefile b/sysutils/jailer/Makefile
index 9dfe8219f8f8..6ff6f25b1b5e 100644
--- a/sysutils/jailer/Makefile
+++ b/sysutils/jailer/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://memberwebs.com/nielsen/freebsd/jails/jailer/
MAINTAINER= skv@FreeBSD.org
+COMMENT= Manage FreeBSD jail startup, shutdown and console
GNU_CONFIGURE= YES
diff --git a/sysutils/jailer/pkg-comment b/sysutils/jailer/pkg-comment
deleted file mode 100644
index 53f63987ae04..000000000000
--- a/sysutils/jailer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Manage FreeBSD jail startup, shutdown and console
diff --git a/sysutils/jailutils/Makefile b/sysutils/jailutils/Makefile
index 860d30c556c1..dcbed041674b 100644
--- a/sysutils/jailutils/Makefile
+++ b/sysutils/jailutils/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://memberwebs.com/nielsen/freebsd/jails/jailutils/
MAINTAINER= skv@FreeBSD.org
+COMMENT= Several utilies for managing jails
GNU_CONFIGURE= YES
diff --git a/sysutils/jailutils/pkg-comment b/sysutils/jailutils/pkg-comment
deleted file mode 100644
index 188f35f257a8..000000000000
--- a/sysutils/jailutils/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Several utilies for managing jails
diff --git a/sysutils/kdeadmin3/Makefile b/sysutils/kdeadmin3/Makefile
index c3829671850e..ce6cd2033253 100644
--- a/sysutils/kdeadmin3/Makefile
+++ b/sysutils/kdeadmin3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= KDE applications related to system administration
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/sysutils/kdeadmin3/pkg-comment b/sysutils/kdeadmin3/pkg-comment
deleted file mode 100644
index b0b81b513332..000000000000
--- a/sysutils/kdeadmin3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE applications related to system administration
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index c3829671850e..ce6cd2033253 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= KDE applications related to system administration
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/sysutils/kdeadmin4/pkg-comment b/sysutils/kdeadmin4/pkg-comment
deleted file mode 100644
index b0b81b513332..000000000000
--- a/sysutils/kdeadmin4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-KDE applications related to system administration
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/sysutils/kdf/pkg-comment b/sysutils/kdf/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/sysutils/kdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/sysutils/kfloppy/pkg-comment b/sysutils/kfloppy/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/sysutils/kfloppy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 6df8285e38c2..65ee86c1da14 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A lava lamp of currently running processes
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/sysutils/lavaps/pkg-comment b/sysutils/lavaps/pkg-comment
deleted file mode 100644
index cb6eee4af9a5..000000000000
--- a/sysutils/lavaps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lava lamp of currently running processes
diff --git a/sysutils/libretto-config/Makefile b/sysutils/libretto-config/Makefile
index 453dff266d9f..332a0e190001 100644
--- a/sysutils/libretto-config/Makefile
+++ b/sysutils/libretto-config/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://club.pep.ne.jp/~ishioka/Software/Linux/libapm/
DISTNAME= libapm-linux-1.0beta5
MAINTAINER= shige@FreeBSD.org
+COMMENT= Libretto BIOS Setting Program
ONLY_FOR_ARCHS= i386
diff --git a/sysutils/libretto-config/pkg-comment b/sysutils/libretto-config/pkg-comment
deleted file mode 100644
index 632fd5ab4c6a..000000000000
--- a/sysutils/libretto-config/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libretto BIOS Setting Program
diff --git a/sysutils/lmmon/Makefile b/sysutils/lmmon/Makefile
index 37d731dbea99..60a53ec69aa5 100644
--- a/sysutils/lmmon/Makefile
+++ b/sysutils/lmmon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.fxp.org/~jedgar/lmmon/
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Display information gathered from MB power management controller
GNU_CONFIGURE= yes
MAN8= lmmon.8
diff --git a/sysutils/lmmon/pkg-comment b/sysutils/lmmon/pkg-comment
deleted file mode 100644
index 53d6768653d0..000000000000
--- a/sysutils/lmmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display information gathered from MB power management controller
diff --git a/sysutils/log_analysis/Makefile b/sysutils/log_analysis/Makefile
index 7771505ec023..241646e53afc 100644
--- a/sysutils/log_analysis/Makefile
+++ b/sysutils/log_analysis/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://lug.umbc.edu/~mabzug1/
MAINTAINER= petef@FreeBSD.org
+COMMENT= A utility that extracts a summary of useful data from logs
USE_PERL5= yes
diff --git a/sysutils/log_analysis/pkg-comment b/sysutils/log_analysis/pkg-comment
deleted file mode 100644
index ed7bec2d8e05..000000000000
--- a/sysutils/log_analysis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility that extracts a summary of useful data from logs
diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile
index 08923dcddeb4..57ed576b6d03 100644
--- a/sysutils/lsof/Makefile
+++ b/sysutils/lsof/Makefile
@@ -26,6 +26,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
.endif
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Lists information about open files (similar to fstat(1))
.if defined(FIXUP_RELEASE)
WRKSRC= ${WRKDIR}/${DISTNAME}
diff --git a/sysutils/lsof/pkg-comment b/sysutils/lsof/pkg-comment
deleted file mode 100644
index 7abb3dbc6df8..000000000000
--- a/sysutils/lsof/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lists information about open files (similar to fstat(1))
diff --git a/sysutils/medusa/Makefile b/sysutils/medusa/Makefile
index 1bad382bf41e..a8f6e581d58d 100644
--- a/sysutils/medusa/Makefile
+++ b/sysutils/medusa/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/medusa/0.5
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME filesystem indexer
USE_BZIP2= yes
USE_GMAKE= yes
diff --git a/sysutils/medusa/pkg-comment b/sysutils/medusa/pkg-comment
deleted file mode 100644
index fa995db9cb4e..000000000000
--- a/sysutils/medusa/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME filesystem indexer
diff --git a/sysutils/mgeupsd/Makefile b/sysutils/mgeupsd/Makefile
index 5e8d85fb637b..85283635a195 100644
--- a/sysutils/mgeupsd/Makefile
+++ b/sysutils/mgeupsd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= system/ups
MAINTAINER= dburr@FreeBSD.ORG
+COMMENT= monitor a state of MGE Pulsar UPS connected to RS-232 port
USE_GMAKE= YES
WRKSRC= ${WRKDIR}/MGE
diff --git a/sysutils/mgeupsd/pkg-comment b/sysutils/mgeupsd/pkg-comment
deleted file mode 100644
index a3686d0fbd50..000000000000
--- a/sysutils/mgeupsd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-monitor a state of MGE Pulsar UPS connected to RS-232 port
diff --git a/sysutils/msyslog/Makefile b/sysutils/msyslog/Makefile
index 8ad278b64185..15b2ac83385e 100644
--- a/sysutils/msyslog/Makefile
+++ b/sysutils/msyslog/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-v${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= Flexible and easy to integrate syslog daemon
.if defined(WITH_MYSQL)
LIB_DEPENDS+= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/sysutils/msyslog/pkg-comment b/sysutils/msyslog/pkg-comment
deleted file mode 100644
index 5bd0f8dd651d..000000000000
--- a/sysutils/msyslog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Flexible and easy to integrate syslog daemon
diff --git a/sysutils/no-login/Makefile b/sysutils/no-login/Makefile
index ba36a13422dc..afc88453f390 100644
--- a/sysutils/no-login/Makefile
+++ b/sysutils/no-login/Makefile
@@ -14,5 +14,6 @@ MASTER_SITE_SUBDIR= wes
MAINTAINER= wes@FreeBSD.org
+COMMENT= Refuse a login to a user, and make a note of it in syslog
.include <bsd.port.mk>
diff --git a/sysutils/no-login/pkg-comment b/sysutils/no-login/pkg-comment
deleted file mode 100644
index 82abfd8b43ed..000000000000
--- a/sysutils/no-login/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Refuse a login to a user, and make a note of it in syslog
diff --git a/sysutils/nut/Makefile b/sysutils/nut/Makefile
index 0f2a447c3535..914958ba37ce 100644
--- a/sysutils/nut/Makefile
+++ b/sysutils/nut/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/${PORTVERSION:R}/
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Network UPS Tools
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
diff --git a/sysutils/nut/pkg-comment b/sysutils/nut/pkg-comment
deleted file mode 100644
index 83ab91a03e2d..000000000000
--- a/sysutils/nut/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network UPS Tools
diff --git a/sysutils/nut22/Makefile b/sysutils/nut22/Makefile
index 0f2a447c3535..914958ba37ce 100644
--- a/sysutils/nut22/Makefile
+++ b/sysutils/nut22/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.exploits.org/nut/release/${PORTVERSION:R}/
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Network UPS Tools
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/nut \
diff --git a/sysutils/nut22/pkg-comment b/sysutils/nut22/pkg-comment
deleted file mode 100644
index 83ab91a03e2d..000000000000
--- a/sysutils/nut22/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network UPS Tools
diff --git a/sysutils/nwclient/Makefile b/sysutils/nwclient/Makefile
index 3db394d5c525..e986ce3bf41a 100644
--- a/sysutils/nwclient/Makefile
+++ b/sysutils/nwclient/Makefile
@@ -14,6 +14,7 @@ DISTNAME= nwclient-${PORTVERSION}-freebsd-${ARCH}
EXTRACT_SUFX= .tgz
MAINTAINER= mjacob@freebsd.org
+COMMENT= Network backup client to NetWorker servers
NO_BUILD= yes
diff --git a/sysutils/nwclient/pkg-comment b/sysutils/nwclient/pkg-comment
deleted file mode 100644
index afce0033adf2..000000000000
--- a/sysutils/nwclient/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network backup client to NetWorker servers
diff --git a/sysutils/nwclient602/Makefile b/sysutils/nwclient602/Makefile
index 69bf14460cd0..4d04eb8b3a10 100644
--- a/sysutils/nwclient602/Makefile
+++ b/sysutils/nwclient602/Makefile
@@ -14,6 +14,7 @@ DISTNAME= nwclient-${PORTVERSION}-freebsd-${ARCH}
EXTRACT_SUFX= .tgz
MAINTAINER= mjacob@freebsd.org
+COMMENT= Network backup client to NetWorker servers
.include <bsd.port.pre.mk>
diff --git a/sysutils/nwclient602/pkg-comment b/sysutils/nwclient602/pkg-comment
deleted file mode 100644
index afce0033adf2..000000000000
--- a/sysutils/nwclient602/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network backup client to NetWorker servers
diff --git a/sysutils/p5-File-Which/Makefile b/sysutils/p5-File-Which/Makefile
index 96cf13a67048..9ed2ff3d0488 100644
--- a/sysutils/p5-File-Which/Makefile
+++ b/sysutils/p5-File-Which/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Portable implementation of `which' in Perl
PERL_CONFIGURE= yes
diff --git a/sysutils/p5-File-Which/pkg-comment b/sysutils/p5-File-Which/pkg-comment
deleted file mode 100644
index 5827dc9bdba1..000000000000
--- a/sysutils/p5-File-Which/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Portable implementation of `which' in Perl
diff --git a/sysutils/p5-Filesys-DiskSpace/Makefile b/sysutils/p5-Filesys-DiskSpace/Makefile
index 3fe012a7e891..f3187bfd5523 100644
--- a/sysutils/p5-Filesys-DiskSpace/Makefile
+++ b/sysutils/p5-Filesys-DiskSpace/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Filesys
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl equivalent of statfs(2)
PERL_CONFIGURE= yes
diff --git a/sysutils/p5-Filesys-DiskSpace/pkg-comment b/sysutils/p5-Filesys-DiskSpace/pkg-comment
deleted file mode 100644
index 69e1fe60cc1c..000000000000
--- a/sysutils/p5-Filesys-DiskSpace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl equivalent of statfs(2)
diff --git a/sysutils/p5-Schedule-Cron/Makefile b/sysutils/p5-Schedule-Cron/Makefile
index 173113ada42e..80aff6944918 100644
--- a/sysutils/p5-Schedule-Cron/Makefile
+++ b/sysutils/p5-Schedule-Cron/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Schedule
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Schedule::Cron - cron-like scheduler for Perl subroutines
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Time/ParseDate.pm:${PORTSDIR}/devel/p5-Time
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/sysutils/p5-Schedule-Cron/pkg-comment b/sysutils/p5-Schedule-Cron/pkg-comment
deleted file mode 100644
index 94351b06f22a..000000000000
--- a/sysutils/p5-Schedule-Cron/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Schedule::Cron - cron-like scheduler for Perl subroutines
diff --git a/sysutils/p5-Schedule-Match/Makefile b/sysutils/p5-Schedule-Match/Makefile
index caf09063e099..f64c65de3fed 100644
--- a/sysutils/p5-Schedule-Match/Makefile
+++ b/sysutils/p5-Schedule-Match/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Schedule
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Handles and detects clash between pattern-based schedules
PERL_CONFIGURE= yes
diff --git a/sysutils/p5-Schedule-Match/pkg-comment b/sysutils/p5-Schedule-Match/pkg-comment
deleted file mode 100644
index af3e0317cc56..000000000000
--- a/sysutils/p5-Schedule-Match/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Handles and detects clash between pattern-based schedules
diff --git a/sysutils/p5-Stat-lsMode/Makefile b/sysutils/p5-Stat-lsMode/Makefile
index d7932001ed47..4b48cd0b987a 100644
--- a/sysutils/p5-Stat-lsMode/Makefile
+++ b/sysutils/p5-Stat-lsMode/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Stat
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Stat::lsMode - format file modes like the ls -l command does
PERL_CONFIGURE= yes
diff --git a/sysutils/p5-Stat-lsMode/pkg-comment b/sysutils/p5-Stat-lsMode/pkg-comment
deleted file mode 100644
index aaf73f69173e..000000000000
--- a/sysutils/p5-Stat-lsMode/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Stat::lsMode - format file modes like the ls -l command does
diff --git a/sysutils/p5-SyslogScan/Makefile b/sysutils/p5-SyslogScan/Makefile
index 3cfdb92a286b..6766867a41f1 100644
--- a/sysutils/p5-SyslogScan/Makefile
+++ b/sysutils/p5-SyslogScan/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= SyslogScan
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 routines to parse system logs
PERL_CONFIGURE= YES
diff --git a/sysutils/p5-SyslogScan/pkg-comment b/sysutils/p5-SyslogScan/pkg-comment
deleted file mode 100644
index 675707db3da9..000000000000
--- a/sysutils/p5-SyslogScan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 routines to parse system logs
diff --git a/sysutils/paicc/Makefile b/sysutils/paicc/Makefile
index 3628011cc0f0..a1ef3b4b385f 100644
--- a/sysutils/paicc/Makefile
+++ b/sysutils/paicc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= utils/shell
MAINTAINER= peter@FreeBSD.org
+COMMENT= Paint Changed Characters
MAKE_ENV= BIN=${PREFIX}/bin MAN=${PREFIX}/man DATA=${PREFIX}/libdata
MAN1= paicc.1
diff --git a/sysutils/paicc/pkg-comment b/sysutils/paicc/pkg-comment
deleted file mode 100644
index 78328403bdd8..000000000000
--- a/sysutils/paicc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Paint Changed Characters
diff --git a/sysutils/pmap/Makefile b/sysutils/pmap/Makefile
index 57fd15d66763..62bd152e6524 100644
--- a/sysutils/pmap/Makefile
+++ b/sysutils/pmap/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.wuppy.net.ru/pub/FreeBSD/local/pmap/
MAINTAINER= skv@FreeBSD.org
+COMMENT= Detailed process memory display
PLIST_SUB= KMODDIR=${KMODDIR}
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/sysutils/pmap/pkg-comment b/sysutils/pmap/pkg-comment
deleted file mode 100644
index 7c62d3aea0d4..000000000000
--- a/sysutils/pmap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Detailed process memory display
diff --git a/sysutils/procmap/Makefile b/sysutils/procmap/Makefile
index d77b7db6c2fe..cc985cd33eb6 100644
--- a/sysutils/procmap/Makefile
+++ b/sysutils/procmap/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
DISTFILES= #empty
MAINTAINER= jasone@freebsd.org
+COMMENT= Print the contents of a procfs map file
WRKSRC= ${WRKDIR}
MAKE_ENV= MAKEOBJDIRPREFIX=${WRKSRC} MAKEOBJDIR=${WRKSRC}
diff --git a/sysutils/procmap/pkg-comment b/sysutils/procmap/pkg-comment
deleted file mode 100644
index 1a9c172cb8f5..000000000000
--- a/sysutils/procmap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print the contents of a procfs map file
diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile
index 4c7bace2f166..522b54f5df35 100644
--- a/sysutils/pstree/Makefile
+++ b/sysutils/pstree/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.go.dlr.de/fresh/unix/src/misc/
MAINTAINER= kris@FreeBSD.org
+COMMENT= List processes as a tree
do-build:
cd ${WRKDIR} && ${CC} ${CFLAGS} -o pstree pstree.c
diff --git a/sysutils/pstree/pkg-comment b/sysutils/pstree/pkg-comment
deleted file mode 100644
index 03209a25afa8..000000000000
--- a/sysutils/pstree/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-List processes as a tree
diff --git a/sysutils/pyfind/Makefile b/sysutils/pyfind/Makefile
index f540a9b343f1..178a12d2aa0f 100644
--- a/sysutils/pyfind/Makefile
+++ b/sysutils/pyfind/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.anti-particle.com/downloads/
DISTNAME= ${PORTNAME:S/f/F/}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A file-find utility for Gnome loosely modeled after the Windoze utility
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolkits/py-gnome
diff --git a/sysutils/pyfind/pkg-comment b/sysutils/pyfind/pkg-comment
deleted file mode 100644
index 130a791bb33e..000000000000
--- a/sysutils/pyfind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file-find utility for Gnome loosely modeled after the Windoze utility
diff --git a/sysutils/readlink/Makefile b/sysutils/readlink/Makefile
index deff82107970..47c4afcbf312 100644
--- a/sysutils/readlink/Makefile
+++ b/sysutils/readlink/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= dd
MAINTAINER= dd@FreeBSD.org
+COMMENT= Dereference a symbolic link and print the name of the target
MANSECTS= 1
MAN1= readlink.1
diff --git a/sysutils/readlink/pkg-comment b/sysutils/readlink/pkg-comment
deleted file mode 100644
index 0fb897731028..000000000000
--- a/sysutils/readlink/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dereference a symbolic link and print the name of the target
diff --git a/sysutils/reed/Makefile b/sysutils/reed/Makefile
index 86ec933eeea3..f0adad1f7264 100644
--- a/sysutils/reed/Makefile
+++ b/sysutils/reed/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc
MASTER_SITES= http://www.sacredchao.net/software/reed/
MAINTAINER= petef@FreeBSD.org
+COMMENT= A text pager with autoscrolling and more
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/sysutils/reed/pkg-comment b/sysutils/reed/pkg-comment
deleted file mode 100644
index d1ab88c2c51c..000000000000
--- a/sysutils/reed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text pager with autoscrolling and more
diff --git a/sysutils/roottail/Makefile b/sysutils/roottail/Makefile
index ff60608e83ab..2a55e64e3e2f 100644
--- a/sysutils/roottail/Makefile
+++ b/sysutils/roottail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.goof.com/pcg/marc/data/ \
DISTNAME= root-tail-${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Simple utility to tail files/logs to a root X window
MAN1= root-tail.1
USE_IMAKE= yes
diff --git a/sysutils/roottail/pkg-comment b/sysutils/roottail/pkg-comment
deleted file mode 100644
index 9a022a2e28ab..000000000000
--- a/sysutils/roottail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple utility to tail files/logs to a root X window
diff --git a/sysutils/samefile/Makefile b/sysutils/samefile/Makefile
index 5ecf549819fc..5c1593d866b1 100644
--- a/sysutils/samefile/Makefile
+++ b/sysutils/samefile/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.schweikhardt.net/
MAINTAINER= schweikh@FreeBSD.org
+COMMENT= Find files with identical contents
MAN1= samefile.1
GNU_CONFIGURE= yes
diff --git a/sysutils/samefile/pkg-comment b/sysutils/samefile/pkg-comment
deleted file mode 100644
index 61c9a0146464..000000000000
--- a/sysutils/samefile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Find files with identical contents
diff --git a/sysutils/screen/Makefile b/sysutils/screen/Makefile
index a341874d8ba9..944e234a6b75 100644
--- a/sysutils/screen/Makefile
+++ b/sysutils/screen/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.uni-erlangen.de/pub/utilities/screen/ \
MASTER_SITE_SUBDIR= screen
MAINTAINER= cy@FreeBSD.org
+COMMENT= A multi-screen window manager
GNU_CONFIGURE= yes
MAN1= screen.1
diff --git a/sysutils/screen/pkg-comment b/sysutils/screen/pkg-comment
deleted file mode 100644
index 88a160b5b6fd..000000000000
--- a/sysutils/screen/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-screen window manager
diff --git a/sysutils/service-config/Makefile b/sysutils/service-config/Makefile
index 7999900245ca..948df8e0eccd 100644
--- a/sysutils/service-config/Makefile
+++ b/sysutils/service-config/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.superscript.com/service-config/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Utility to create and configure svscan service directories
RUN_DEPENDS= supervise:${PORTSDIR}/sysutils/daemontools
diff --git a/sysutils/service-config/pkg-comment b/sysutils/service-config/pkg-comment
deleted file mode 100644
index 84ebe7a7a444..000000000000
--- a/sysutils/service-config/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to create and configure svscan service directories
diff --git a/sysutils/shlock/Makefile b/sysutils/shlock/Makefile
index 23eb6b5f1f06..afa1b360b49f 100644
--- a/sysutils/shlock/Makefile
+++ b/sysutils/shlock/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=inn
DISTFILES= inn-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= DougB@FreeBSD.org
+COMMENT= Create lock files for use in shell scripts
HAS_CONFIGURE= yes
diff --git a/sysutils/shlock/pkg-comment b/sysutils/shlock/pkg-comment
deleted file mode 100644
index 066a9af2ce3b..000000000000
--- a/sysutils/shlock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create lock files for use in shell scripts
diff --git a/sysutils/su2/Makefile b/sysutils/su2/Makefile
index ca879a8372fc..388f810ea95e 100644
--- a/sysutils/su2/Makefile
+++ b/sysutils/su2/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils security
MASTER_SITES= ftp://ftp.ccs.neu.edu/pub/sysadmin/
MAINTAINER= jmg@freebsd.org
+COMMENT= An enhanced su, allows users to su with own password + more
NO_CDROM= "Don't sell for profit"
USE_REINPLACE= yes
diff --git a/sysutils/su2/pkg-comment b/sysutils/su2/pkg-comment
deleted file mode 100644
index aa1b7e0d6e9c..000000000000
--- a/sysutils/su2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An enhanced su, allows users to su with own password + more
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 572a4a02eefc..6667a23a3320 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Utilities for the KDE integrated X11 desktop
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/sysutils/sweeper/pkg-comment b/sysutils/sweeper/pkg-comment
deleted file mode 100644
index 186230f9287d..000000000000
--- a/sysutils/sweeper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities for the KDE integrated X11 desktop
diff --git a/sysutils/ticker.app/Makefile b/sysutils/ticker.app/Makefile
index 03cd3a24d6f0..05ef856355d8 100644
--- a/sysutils/ticker.app/Makefile
+++ b/sysutils/ticker.app/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.sh.rim.or.jp/~ssato/src/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Ticker dockapp for Window Maker
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/ticker.app/pkg-comment b/sysutils/ticker.app/pkg-comment
deleted file mode 100644
index b2d616d89f27..000000000000
--- a/sysutils/ticker.app/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ticker dockapp for Window Maker
diff --git a/sysutils/tmpwatch/Makefile b/sysutils/tmpwatch/Makefile
index 70188cfa7663..167e32c4dfb2 100644
--- a/sysutils/tmpwatch/Makefile
+++ b/sysutils/tmpwatch/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= updates/7.2/en/os/SRPMS
EXTRACT_SUFX= -1.src.rpm
MAINTAINER= markp@FreeBSD.org
+COMMENT= A utility for removing files based on when they were last accessed
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/sysutils/tmpwatch/pkg-comment b/sysutils/tmpwatch/pkg-comment
deleted file mode 100644
index 6ea0db66c3bd..000000000000
--- a/sysutils/tmpwatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility for removing files based on when they were last accessed
diff --git a/sysutils/whowatch/Makefile b/sysutils/whowatch/Makefile
index f01b8e8aeb0d..41fa270bdf87 100644
--- a/sysutils/whowatch/Makefile
+++ b/sysutils/whowatch/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/
MAINTAINER= dannyboy@FreeBSD.org
+COMMENT= Displays information in real time about users currently logged on
USE_REINPLACE= yes
diff --git a/sysutils/whowatch/pkg-comment b/sysutils/whowatch/pkg-comment
deleted file mode 100644
index 33a11e243b82..000000000000
--- a/sysutils/whowatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Displays information in real time about users currently logged on
diff --git a/sysutils/wmapm/Makefile b/sysutils/wmapm/Makefile
index d6a2758a1267..b7560b1ca19d 100644
--- a/sysutils/wmapm/Makefile
+++ b/sysutils/wmapm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Laptop battery status display for WindowMaker
ONLY_FOR_ARCHS= i386
diff --git a/sysutils/wmapm/pkg-comment b/sysutils/wmapm/pkg-comment
deleted file mode 100644
index b48b9c06b9b3..000000000000
--- a/sysutils/wmapm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Laptop battery status display for WindowMaker
diff --git a/sysutils/wmapmload/Makefile b/sysutils/wmapmload/Makefile
index 3301b386a7d5..70c02724cb34 100644
--- a/sysutils/wmapmload/Makefile
+++ b/sysutils/wmapmload/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= pat@FreeBSD.org
+COMMENT= APM battery status monitor dockapp with a similar look to wmcpuload
ONLY_FOR_ARCHS= i386
USE_X_PREFIX= yes
diff --git a/sysutils/wmapmload/pkg-comment b/sysutils/wmapmload/pkg-comment
deleted file mode 100644
index e230e12eff53..000000000000
--- a/sysutils/wmapmload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-APM battery status monitor dockapp with a similar look to wmcpuload
diff --git a/sysutils/wmbattery/Makefile b/sysutils/wmbattery/Makefile
index a9fd22a21066..4ec05198e582 100644
--- a/sysutils/wmbattery/Makefile
+++ b/sysutils/wmbattery/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://kitenet.net/programs/wmbattery/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= Window Maker dockapp that displays info about your battery
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/sysutils/wmbattery/pkg-comment b/sysutils/wmbattery/pkg-comment
deleted file mode 100644
index bd0e14fec38a..000000000000
--- a/sysutils/wmbattery/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window Maker dockapp that displays info about your battery
diff --git a/sysutils/wmcpuload/Makefile b/sysutils/wmcpuload/Makefile
index 089001dc93dc..47018c226099 100644
--- a/sysutils/wmcpuload/Makefile
+++ b/sysutils/wmcpuload/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.sh.rim.or.jp/~ssato/src/
MAINTAINER= pat@FreeBSD.org
+COMMENT= An "lcd" dockapp for windowmaker, which displays the current cpuload
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/wmcpuload/pkg-comment b/sysutils/wmcpuload/pkg-comment
deleted file mode 100644
index 6aa14838585a..000000000000
--- a/sysutils/wmcpuload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An "lcd" dockapp for windowmaker, which displays the current cpuload
diff --git a/sysutils/wmcube-gdk/Makefile b/sysutils/wmcube-gdk/Makefile
index 886f5fbece5f..66e241aefb69 100644
--- a/sysutils/wmcube-gdk/Makefile
+++ b/sysutils/wmcube-gdk/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX= -gdk
DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= wmcube-gdk is a modified version of the dockapp wmCube
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/sysutils/wmcube-gdk/pkg-comment b/sysutils/wmcube-gdk/pkg-comment
deleted file mode 100644
index 4dd1ef38f2a7..000000000000
--- a/sysutils/wmcube-gdk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-wmcube-gdk is a modified version of the dockapp wmCube
diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index f32fcc505e97..f6f663131f9c 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://kling.mine.nu/kling/files/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Window Maker dockapp that displays cpu load and a realtime 3d object
WRKSRC= ${WRKDIR}/${PORTNAME}/${PORTNAME}
USE_X_PREFIX= yes
diff --git a/sysutils/wmcube/pkg-comment b/sysutils/wmcube/pkg-comment
deleted file mode 100644
index fa53b7555daf..000000000000
--- a/sysutils/wmcube/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window Maker dockapp that displays cpu load and a realtime 3d object
diff --git a/sysutils/wmfire/Makefile b/sysutils/wmfire/Makefile
index 954316c5a157..279d1252bbc1 100644
--- a/sysutils/wmfire/Makefile
+++ b/sysutils/wmfire/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= jedgar
DISTNAME= wmfire-0.0.3.9pre4
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Window Maker dock app showing load average as a flame
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/sysutils/wmfire/pkg-comment b/sysutils/wmfire/pkg-comment
deleted file mode 100644
index 8ee123794733..000000000000
--- a/sysutils/wmfire/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window Maker dock app showing load average as a flame
diff --git a/sysutils/wmlmmon/Makefile b/sysutils/wmlmmon/Makefile
index 9097e78af792..d11cb0834258 100644
--- a/sysutils/wmlmmon/Makefile
+++ b/sysutils/wmlmmon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.fxp.org/~jedgar/wmlmmon/
MAINTAINER= jedgar@fxp.org
+COMMENT= WM dock app to display info from MB power management controllers
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/sysutils/wmlmmon/pkg-comment b/sysutils/wmlmmon/pkg-comment
deleted file mode 100644
index 9313e615d574..000000000000
--- a/sysutils/wmlmmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WM dock app to display info from MB power management controllers
diff --git a/sysutils/wmlongrun/Makefile b/sysutils/wmlongrun/Makefile
index 9eebbb663511..8d0689dce565 100644
--- a/sysutils/wmlongrun/Makefile
+++ b/sysutils/wmlongrun/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.sh.rim.or.jp/~ssato/src/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A dockapp to monitor the LongRun(tm) status on Crusoe
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/wmlongrun/pkg-comment b/sysutils/wmlongrun/pkg-comment
deleted file mode 100644
index aef64bfcf625..000000000000
--- a/sysutils/wmlongrun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockapp to monitor the LongRun(tm) status on Crusoe
diff --git a/sysutils/wmmemload/Makefile b/sysutils/wmmemload/Makefile
index ddd3cb5d3b3e..5c6a74b05bd3 100644
--- a/sysutils/wmmemload/Makefile
+++ b/sysutils/wmmemload/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.markstaggs.net/wmmemload/
MAINTAINER= pat@FreeBSD.org
+COMMENT= An dockapp for windowmaker, which displays the current mem/swap usage
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/wmmemload/pkg-comment b/sysutils/wmmemload/pkg-comment
deleted file mode 100644
index b33c629061b9..000000000000
--- a/sysutils/wmmemload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An dockapp for windowmaker, which displays the current mem/swap usage
diff --git a/sysutils/wmmemmon/Makefile b/sysutils/wmmemmon/Makefile
index 1263f2ed3ed8..92779c3b1ac1 100644
--- a/sysutils/wmmemmon/Makefile
+++ b/sysutils/wmmemmon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://www.sh.rim.or.jp/~ssato/src/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Mem/Swap monitoring dockapp for WindowMaker
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/sysutils/wmmemmon/pkg-comment b/sysutils/wmmemmon/pkg-comment
deleted file mode 100644
index c0fd8924c247..000000000000
--- a/sysutils/wmmemmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Mem/Swap monitoring dockapp for WindowMaker
diff --git a/sysutils/wmpccard/Makefile b/sysutils/wmpccard/Makefile
index 180efdc8e1d9..38c24a09ebbe 100644
--- a/sysutils/wmpccard/Makefile
+++ b/sysutils/wmpccard/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils misc windowmaker
MASTER_SITES= http://www.sra.co.jp/people/m-kasahr/wmpccard/src/
MAINTAINER= taoka@FreeBSD.org
+COMMENT= PCcard monitor for FreeBSD + PAO
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/sysutils/wmpccard/pkg-comment b/sysutils/wmpccard/pkg-comment
deleted file mode 100644
index 42284254acd7..000000000000
--- a/sysutils/wmpccard/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PCcard monitor for FreeBSD + PAO
diff --git a/sysutils/wmzazof/Makefile b/sysutils/wmzazof/Makefile
index 1f0cd1f7f4c2..77e6d00d3efe 100644
--- a/sysutils/wmzazof/Makefile
+++ b/sysutils/wmzazof/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils windowmaker
MASTER_SITES= http://users.chello.be/cr49940//wmzazof/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A simple dockapp that displays the uptime, free and used memory
LIB_DEPENDS= dockapp.1:${PORTSDIR}/x11-wm/libdockapp
diff --git a/sysutils/wmzazof/pkg-comment b/sysutils/wmzazof/pkg-comment
deleted file mode 100644
index f97f17f7e868..000000000000
--- a/sysutils/wmzazof/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple dockapp that displays the uptime, free and used memory
diff --git a/sysutils/xbattbar/Makefile b/sysutils/xbattbar/Makefile
index 437651a15a05..89c0da688373 100644
--- a/sysutils/xbattbar/Makefile
+++ b/sysutils/xbattbar/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://iplab.aist-nara.ac.jp/member/suguru/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Simple battery meter
USE_IMAKE= yes
USE_X_PREFIX= yes
diff --git a/sysutils/xbattbar/pkg-comment b/sysutils/xbattbar/pkg-comment
deleted file mode 100644
index 31837ec66404..000000000000
--- a/sysutils/xbattbar/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple battery meter
diff --git a/sysutils/xfsm/Makefile b/sysutils/xfsm/Makefile
index 082e057632b2..52cb8344c981 100644
--- a/sysutils/xfsm/Makefile
+++ b/sysutils/xfsm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= system/status/xstatus
EXTRACT_SUFX= .tgz
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= X File System Monitor
USE_IMAKE= yes
MAN1= xfsm.1
diff --git a/sysutils/xfsm/pkg-comment b/sysutils/xfsm/pkg-comment
deleted file mode 100644
index 1c9e174319ca..000000000000
--- a/sysutils/xfsm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X File System Monitor
diff --git a/sysutils/xwatch/Makefile b/sysutils/xwatch/Makefile
index 616bb336acba..8b24002f9972 100644
--- a/sysutils/xwatch/Makefile
+++ b/sysutils/xwatch/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://www.student.lu.se/~nbi98oli/src/obsolete/
MAINTAINER= mph@freebsd.org
+COMMENT= A Gtk-based program for watching files (e.g. logs) in a window
USE_XLIB= yes
USE_GNOMENG= yes
diff --git a/sysutils/xwatch/pkg-comment b/sysutils/xwatch/pkg-comment
deleted file mode 100644
index c21c25455364..000000000000
--- a/sysutils/xwatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Gtk-based program for watching files (e.g. logs) in a window
diff --git a/sysutils/xwipower/Makefile b/sysutils/xwipower/Makefile
index 6fe87cfa7419..1384f53ca4d8 100644
--- a/sysutils/xwipower/Makefile
+++ b/sysutils/xwipower/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://iplab.aist-nara.ac.jp/member/masafu-o/xwipower/
EXTRACT_SUFX= .tgz
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= Wave power level meter for wi(4)
WRKSRC= ${WRKDIR}/xwipower
USE_IMAKE= yes
diff --git a/sysutils/xwipower/pkg-comment b/sysutils/xwipower/pkg-comment
deleted file mode 100644
index 073bb04e795a..000000000000
--- a/sysutils/xwipower/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Wave power level meter for wi(4)
diff --git a/sysutils/yawho/Makefile b/sysutils/yawho/Makefile
index d7f0994cb67f..ae8de1e749d2 100644
--- a/sysutils/yawho/Makefile
+++ b/sysutils/yawho/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= sysutils
MASTER_SITES= http://wizard.ae.krakow.pl/~mike/download/
MAINTAINER= dannyboy@FreeBSD.org
+COMMENT= Simple 'w'-like program; displays connection type and login shell PID
USE_REINPLACE= yes
diff --git a/sysutils/yawho/pkg-comment b/sysutils/yawho/pkg-comment
deleted file mode 100644
index 3fbaee2c5de5..000000000000
--- a/sysutils/yawho/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple 'w'-like program; displays connection type and login shell PID
diff --git a/textproc/ant-xinclude-task/Makefile b/textproc/ant-xinclude-task/Makefile
index ff6b122657ac..31989cffec97 100644
--- a/textproc/ant-xinclude-task/Makefile
+++ b/textproc/ant-xinclude-task/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://people.freebsd.org/~znerd/xinclude-task/
PKGNAMEPREFIX= ant-
MAINTAINER= znerd@FreeBSD.org
+COMMENT= XInclude task for Jakarta Ant
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant \
${JAVASHAREDIR}/classes/xincluder.jar:${PORTSDIR}/textproc/xincluder
diff --git a/textproc/ant-xinclude-task/pkg-comment b/textproc/ant-xinclude-task/pkg-comment
deleted file mode 100644
index b6bc0d87e0e0..000000000000
--- a/textproc/ant-xinclude-task/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XInclude task for Jakarta Ant
diff --git a/textproc/antiword/Makefile b/textproc/antiword/Makefile
index b1b33031237a..c8904a60b816 100644
--- a/textproc/antiword/Makefile
+++ b/textproc/antiword/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.winfield.demon.nl/linux/
MAINTAINER= leeym@FreeBSD.org
+COMMENT= An application to display Microsoft(tm) Word files
USE_REINPLACE= yes
INSTALL_TARGET= global_install
diff --git a/textproc/antiword/pkg-comment b/textproc/antiword/pkg-comment
deleted file mode 100644
index 3af92085a6b8..000000000000
--- a/textproc/antiword/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An application to display Microsoft(tm) Word files
diff --git a/textproc/ascii2pdf/Makefile b/textproc/ascii2pdf/Makefile
index 432004ec2924..9114492a4178 100644
--- a/textproc/ascii2pdf/Makefile
+++ b/textproc/ascii2pdf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://bulldog.tzo.org/ascii2pdf/
DISTNAME= ${PORTNAME}-0.9.1
MAINTAINER= petef@FreeBSD.org
+COMMENT= A perl script to convert text files to PDF files
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/PDF/Create.pm:${PORTSDIR}/textproc/p5-PDF-Create
diff --git a/textproc/ascii2pdf/pkg-comment b/textproc/ascii2pdf/pkg-comment
deleted file mode 100644
index 413e2a657645..000000000000
--- a/textproc/ascii2pdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl script to convert text files to PDF files
diff --git a/textproc/bibtex2html/Makefile b/textproc/bibtex2html/Makefile
index 119a11deeed2..8e52595fbc1f 100644
--- a/textproc/bibtex2html/Makefile
+++ b/textproc/bibtex2html/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc print
MASTER_SITES= http://www.lri.fr/~filliatr/ftp/bibtex2html/
MAINTAINER= gerald@FreeBSD.org
+COMMENT= A collection of tools for searching BibTeX and translating from BibTeX to HTML
BUILD_DEPENDS= ocaml:${PORTSDIR}/lang/ocaml
diff --git a/textproc/bibtex2html/pkg-comment b/textproc/bibtex2html/pkg-comment
deleted file mode 100644
index f1c49b9462ae..000000000000
--- a/textproc/bibtex2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of tools for searching BibTeX and translating from BibTeX to HTML
diff --git a/textproc/cdiff/Makefile b/textproc/cdiff/Makefile
index ec80ff9d54b6..d409963a2c37 100644
--- a/textproc/cdiff/Makefile
+++ b/textproc/cdiff/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= eivind@FreeBSD.org
+COMMENT= Diff readability enhancher for color terminals
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/textproc/cdiff/pkg-comment b/textproc/cdiff/pkg-comment
deleted file mode 100644
index 8865bd2b0878..000000000000
--- a/textproc/cdiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Diff readability enhancher for color terminals
diff --git a/textproc/code2html/Makefile b/textproc/code2html/Makefile
index 826499bd3443..fb3b8cc69b82 100644
--- a/textproc/code2html/Makefile
+++ b/textproc/code2html/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Sourcecode to HTML converter
.if !exists(/usr/bin/bzip2)
RUN_DEPENDS= bzip2:${PORTSDIR}/archivers/bzip2
diff --git a/textproc/code2html/pkg-comment b/textproc/code2html/pkg-comment
deleted file mode 100644
index 4c40a20a60c9..000000000000
--- a/textproc/code2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sourcecode to HTML converter
diff --git a/textproc/cole/Makefile b/textproc/cole/Makefile
index c37182cd515f..369b7e383206 100644
--- a/textproc/cole/Makefile
+++ b/textproc/cole/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= sobomax
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A free C OLE library
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/cole/pkg-comment b/textproc/cole/pkg-comment
deleted file mode 100644
index 50acdb65b038..000000000000
--- a/textproc/cole/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A free C OLE library
diff --git a/textproc/dict/Makefile b/textproc/dict/Makefile
index fe80eed21568..9baba213ebef 100644
--- a/textproc/dict/Makefile
+++ b/textproc/dict/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.dict.org/pub/dict/
DISTNAME= ${PORTNAME}d-${PORTVERSION}
MAINTAINER= dd@FreeBSD.org
+COMMENT= Dictionary Server Protocol (RFC2229) client
USE_BISON= yes
USE_REINPLACE= yes
diff --git a/textproc/dict/pkg-comment b/textproc/dict/pkg-comment
deleted file mode 100644
index 95074ad6da46..000000000000
--- a/textproc/dict/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dictionary Server Protocol (RFC2229) client
diff --git a/textproc/diff-mode.el/Makefile b/textproc/diff-mode.el/Makefile
index 64ad290993d9..79ddc30fc52b 100644
--- a/textproc/diff-mode.el/Makefile
+++ b/textproc/diff-mode.el/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX= # empty
EXTRACT_ONLY= # empty
MAINTAINER= okazaki@FreeBSD.org
+COMMENT= A mode for viewing/editing context diffs in Emacsen
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/textproc/diff-mode.el/pkg-comment b/textproc/diff-mode.el/pkg-comment
deleted file mode 100644
index 6c0d530ece58..000000000000
--- a/textproc/diff-mode.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mode for viewing/editing context diffs in Emacsen
diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
index 88b3aca881db..49c809072fdc 100644
--- a/textproc/docbook-241/Makefile
+++ b/textproc/docbook-241/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.ora.com/pub/davenport/
DISTFILES= docbk241.tar.Z
MAINTAINER= nik@FreeBSD.org
+COMMENT= V2.4.1 of the DocBook DTD, designed for technical documentation
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
diff --git a/textproc/docbook-241/pkg-comment b/textproc/docbook-241/pkg-comment
deleted file mode 100644
index 3ad0891d318f..000000000000
--- a/textproc/docbook-241/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-V2.4.1 of the DocBook DTD, designed for technical documentation
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 1614e21ffd6a..4a82fe2f0342 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ftp://ftp.ora.com/pub/davenport/
DISTFILES= docbk30.tar.Z
MAINTAINER= nik@FreeBSD.org
+COMMENT= V3.0 of the DocBook DTD, designed for technical documentation
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
diff --git a/textproc/docbook-300/pkg-comment b/textproc/docbook-300/pkg-comment
deleted file mode 100644
index cbdae0c9a49b..000000000000
--- a/textproc/docbook-300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-V3.0 of the DocBook DTD, designed for technical documentation
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index ca3d4ca4162e..e830888be061 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.docbook.org/sgml/3.1/
DISTNAME= docbk31
MAINTAINER= nik@FreeBSD.org
+COMMENT= V3.1 of the DocBook DTD, designed for technical documentation
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
diff --git a/textproc/docbook-310/pkg-comment b/textproc/docbook-310/pkg-comment
deleted file mode 100644
index f4999047584f..000000000000
--- a/textproc/docbook-310/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-V3.1 of the DocBook DTD, designed for technical documentation
diff --git a/textproc/docbook-400/Makefile b/textproc/docbook-400/Makefile
index 6f015e568c19..f221d8a7c366 100644
--- a/textproc/docbook-400/Makefile
+++ b/textproc/docbook-400/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.oasis-open.org/docbook/sgml/4.0/
DISTNAME= docbk40
MAINTAINER= asmodai@FreeBSD.org
+COMMENT= V4.0 of the DocBook DTD, designed for technical documentation
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
diff --git a/textproc/docbook-400/pkg-comment b/textproc/docbook-400/pkg-comment
deleted file mode 100644
index 215089fbdab8..000000000000
--- a/textproc/docbook-400/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-V4.0 of the DocBook DTD, designed for technical documentation
diff --git a/textproc/docbook-410/Makefile b/textproc/docbook-410/Makefile
index 9935c298f60a..54902e119a7b 100644
--- a/textproc/docbook-410/Makefile
+++ b/textproc/docbook-410/Makefile
@@ -15,6 +15,7 @@ DISTNAME= docbk41
EXTRACT_ONLY= # empty
MAINTAINER= murray@freebsd.org
+COMMENT= V4.1 of the DocBook DTD, designed for technical documentation
RUN_DEPENDS= ${ISOCAT}:${PORTSDIR}/textproc/iso8879 \
${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
diff --git a/textproc/docbook-410/pkg-comment b/textproc/docbook-410/pkg-comment
deleted file mode 100644
index 46e44614142d..000000000000
--- a/textproc/docbook-410/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-V4.1 of the DocBook DTD, designed for technical documentation
diff --git a/textproc/docbook-sk/Makefile b/textproc/docbook-sk/Makefile
index d19946a402cc..ccdc74eed1e0 100644
--- a/textproc/docbook-sk/Makefile
+++ b/textproc/docbook-sk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.docbook.org/xml/${PORTVERSION}/ \
DISTNAME= docbkx${PORTVERSION:S/.//g}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= XML version of the DocBook DTD version controlled for ScrollKeeper
USE_ZIP= yes
NO_BUILD= yes
diff --git a/textproc/docbook-sk/pkg-comment b/textproc/docbook-sk/pkg-comment
deleted file mode 100644
index 1a223ef20245..000000000000
--- a/textproc/docbook-sk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML version of the DocBook DTD version controlled for ScrollKeeper
diff --git a/textproc/docbook-tdg/Makefile b/textproc/docbook-tdg/Makefile
index dfdf37afd3f2..46da74ad49df 100644
--- a/textproc/docbook-tdg/Makefile
+++ b/textproc/docbook-tdg/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.docbook.org/tdg/en/
DISTNAME= tdg-en-html-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Norman Walsh's book "DocBook: The Definitive Guide"
USE_REINPLACE= yes
USE_ZIP= yes
diff --git a/textproc/docbook-tdg/pkg-comment b/textproc/docbook-tdg/pkg-comment
deleted file mode 100644
index 7c9a7b4a4197..000000000000
--- a/textproc/docbook-tdg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Norman Walsh's book "DocBook: The Definitive Guide"
diff --git a/textproc/docbook-xsl/Makefile b/textproc/docbook-xsl/Makefile
index b8c32dc3e133..2b4de3a01600 100644
--- a/textproc/docbook-xsl/Makefile
+++ b/textproc/docbook-xsl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= docbook
MAINTAINER= des@freebsd.org
+COMMENT= XSL DocBook stylesheets
RUN_DEPENDS= ${XMLDIR}/docbook/catalog:${PORTSDIR}/textproc/docbook-xml \
${XMLDIR}/sdocbook/catalog:${PORTSDIR}/textproc/sdocbook-xml
diff --git a/textproc/docbook-xsl/pkg-comment b/textproc/docbook-xsl/pkg-comment
deleted file mode 100644
index dc5eb61239a8..000000000000
--- a/textproc/docbook-xsl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSL DocBook stylesheets
diff --git a/textproc/docbook/Makefile b/textproc/docbook/Makefile
index fea6c04eb6b9..61e69616f901 100644
--- a/textproc/docbook/Makefile
+++ b/textproc/docbook/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= nik@freebsd.org
+COMMENT= Meta-port for the different versions of the DocBook DTD
RUN_DEPENDS= ${PREFIX}/share/sgml/iso8879:${PORTSDIR}/textproc/iso8879 \
${PREFIX}/share/sgml/docbook/2.4.1:${PORTSDIR}/textproc/docbook-241 \
diff --git a/textproc/docbook/pkg-comment b/textproc/docbook/pkg-comment
deleted file mode 100644
index ac90fe47e207..000000000000
--- a/textproc/docbook/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Meta-port for the different versions of the DocBook DTD
diff --git a/textproc/docbookide.el/Makefile b/textproc/docbookide.el/Makefile
index a35f0cb64f92..c2d595e87f6f 100644
--- a/textproc/docbookide.el/Makefile
+++ b/textproc/docbookide.el/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://nwalsh.com/emacs/docbookide/
DISTNAME= docbookide01
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Emacs lisp modules for editing DocBook documents
USE_ZIP= yes
WRKSRC= ${WRKDIR}/docbookide
diff --git a/textproc/docbookide.el/pkg-comment b/textproc/docbookide.el/pkg-comment
deleted file mode 100644
index 8fccd3f1abc3..000000000000
--- a/textproc/docbookide.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Emacs lisp modules for editing DocBook documents
diff --git a/textproc/docproj/Makefile b/textproc/docproj/Makefile
index 982985d48ab4..c47d7719b80e 100644
--- a/textproc/docproj/Makefile
+++ b/textproc/docproj/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= nik@freebsd.org
+COMMENT= The "meta-port" for the FreeBSD Documentation Project
# This dependency list should be kept in sync with the list of
# required ports in src/release/Makefile.inc.docports.
diff --git a/textproc/docproj/pkg-comment b/textproc/docproj/pkg-comment
deleted file mode 100644
index c43aff76fce4..000000000000
--- a/textproc/docproj/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the FreeBSD Documentation Project
diff --git a/textproc/dsssl-docbook-cygnus/Makefile b/textproc/dsssl-docbook-cygnus/Makefile
index 67ed05733929..9c23108411f6 100644
--- a/textproc/dsssl-docbook-cygnus/Makefile
+++ b/textproc/dsssl-docbook-cygnus/Makefile
@@ -13,6 +13,7 @@ DISTNAME= stylesheets
EXTRACT_SUFX= .tgz
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= DocBook DSSSL stylesheets of Cygnus Slution
RUN_DEPENDS= ${LOCALBASE}/share/sgml/docbook/dsssl/modular/frames/navbar.htm:${PORTSDIR}/textproc/dsssl-docbook-modular \
jade:${PORTSDIR}/textproc/jade
diff --git a/textproc/dsssl-docbook-cygnus/pkg-comment b/textproc/dsssl-docbook-cygnus/pkg-comment
deleted file mode 100644
index d3360550a0f0..000000000000
--- a/textproc/dsssl-docbook-cygnus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DocBook DSSSL stylesheets of Cygnus Slution
diff --git a/textproc/dtd-catalogs/Makefile b/textproc/dtd-catalogs/Makefile
index cf5b65eae075..0ce4ff345570 100644
--- a/textproc/dtd-catalogs/Makefile
+++ b/textproc/dtd-catalogs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= # empty
DISTFILES= # empty
MAINTAINER= shige@FreeBSD.org
+COMMENT= SGML DTDs catalogs
RUN_DEPENDS= ${ISO8879_CAT}:${PORTSDIR}/textproc/iso8879 \
${ISO12083_CAT}:${PORTSDIR}/textproc/iso12083 \
diff --git a/textproc/dtd-catalogs/pkg-comment b/textproc/dtd-catalogs/pkg-comment
deleted file mode 100644
index a060b6072ebe..000000000000
--- a/textproc/dtd-catalogs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SGML DTDs catalogs
diff --git a/textproc/fdp-tools/Makefile b/textproc/fdp-tools/Makefile
index 17a88837a616..1deea040e062 100644
--- a/textproc/fdp-tools/Makefile
+++ b/textproc/fdp-tools/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://www.ruhr.de/home/nathan/FreeBSD/
MAINTAINER= ue@FreeBSD.org
+COMMENT= A set of small utilities for the FreeBSD Documentation Projekt
NO_BUILD= yes
NO_WRKSUBDIR= yes
diff --git a/textproc/fdp-tools/pkg-comment b/textproc/fdp-tools/pkg-comment
deleted file mode 100644
index 0677c4af57f5..000000000000
--- a/textproc/fdp-tools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of small utilities for the FreeBSD Documentation Projekt
diff --git a/textproc/fop/Makefile b/textproc/fop/Makefile
index 88459e083406..e13599ce333e 100644
--- a/textproc/fop/Makefile
+++ b/textproc/fop/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://xml.apache.org/dist/fop/ \
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
MAINTAINER= kiri@FreeBSD.org
+COMMENT= Print formatter driven by XSL formatting
WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//}
NO_BUILD= yes
diff --git a/textproc/fop/pkg-comment b/textproc/fop/pkg-comment
deleted file mode 100644
index e34c61226b50..000000000000
--- a/textproc/fop/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Print formatter driven by XSL formatting
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 917acba02f43..17a5c8536c68 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc databases
MASTER_SITES= ftp://ftp.polito.it/pub/tools/unix/harvest/
MAINTAINER= chuckr@freebsd.org
+COMMENT= Text search engine
NO_CDROM= "Restrictive copyright (don't sell for profit)"
GNU_CONFIGURE= yes
diff --git a/textproc/glimpse/pkg-comment b/textproc/glimpse/pkg-comment
deleted file mode 100644
index eb535074229d..000000000000
--- a/textproc/glimpse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text search engine
diff --git a/textproc/gmat/Makefile b/textproc/gmat/Makefile
index 0aa5944ed6f7..8259ea58137d 100644
--- a/textproc/gmat/Makefile
+++ b/textproc/gmat/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.ora.com/pub/gmat/
MAINTAINER= grog@FreeBSD.Org
+COMMENT= O'Reilly's SGML formatting package.
RUN_DEPENDS= ${LOCALBASE}/bin/nsgmls:${PORTSDIR}/textproc/sp \
${LOCALBASE}/bin/procmail:${PORTSDIR}/mail/procmail \
diff --git a/textproc/gmat/pkg-comment b/textproc/gmat/pkg-comment
deleted file mode 100644
index 9d54c6716407..000000000000
--- a/textproc/gmat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-O'Reilly's SGML formatting package.
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index ecac3ec99a50..5731fbb101da 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-spell-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME/Bonobo component for spell checking
LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell
diff --git a/textproc/gnome-spell/pkg-comment b/textproc/gnome-spell/pkg-comment
deleted file mode 100644
index 00c3f27bdda0..000000000000
--- a/textproc/gnome-spell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME/Bonobo component for spell checking
diff --git a/textproc/gnomespell-devel/Makefile b/textproc/gnomespell-devel/Makefile
index ecac3ec99a50..5731fbb101da 100644
--- a/textproc/gnomespell-devel/Makefile
+++ b/textproc/gnomespell-devel/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-spell-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME/Bonobo component for spell checking
LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell
diff --git a/textproc/gnomespell-devel/pkg-comment b/textproc/gnomespell-devel/pkg-comment
deleted file mode 100644
index 00c3f27bdda0..000000000000
--- a/textproc/gnomespell-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME/Bonobo component for spell checking
diff --git a/textproc/gnomespell/Makefile b/textproc/gnomespell/Makefile
index ecac3ec99a50..5731fbb101da 100644
--- a/textproc/gnomespell/Makefile
+++ b/textproc/gnomespell/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-spell-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME/Bonobo component for spell checking
LIB_DEPENDS= aspell.15:${PORTSDIR}/textproc/aspell
diff --git a/textproc/gnomespell/pkg-comment b/textproc/gnomespell/pkg-comment
deleted file mode 100644
index 00c3f27bdda0..000000000000
--- a/textproc/gnomespell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME/Bonobo component for spell checking
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index f92e3c8d09b5..e07682defa90 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://gtkspell.sourceforge.net/download/
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GTK+ 2 spell checking component
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
pspell.15:${PORTSDIR}/textproc/aspell
diff --git a/textproc/gtkspell/pkg-comment b/textproc/gtkspell/pkg-comment
deleted file mode 100644
index a5d57d42aa68..000000000000
--- a/textproc/gtkspell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ 2 spell checking component
diff --git a/textproc/gtkspell2/Makefile b/textproc/gtkspell2/Makefile
index f92e3c8d09b5..e07682defa90 100644
--- a/textproc/gtkspell2/Makefile
+++ b/textproc/gtkspell2/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://gtkspell.sourceforge.net/download/
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GTK+ 2 spell checking component
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
pspell.15:${PORTSDIR}/textproc/aspell
diff --git a/textproc/gtkspell2/pkg-comment b/textproc/gtkspell2/pkg-comment
deleted file mode 100644
index a5d57d42aa68..000000000000
--- a/textproc/gtkspell2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ 2 spell checking component
diff --git a/textproc/htdig/Makefile b/textproc/htdig/Makefile
index 7e7e87c2d6b3..f086940755f6 100644
--- a/textproc/htdig/Makefile
+++ b/textproc/htdig/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.htdig.org/files/ \
ftp://ftp.ntua.gr/pub/www/htdig/
MAINTAINER= DougB@FreeBSD.org
+COMMENT= A www indexing and searching system
RUN_DEPENDS= ${LOCALBASE}/share/doc/apache:${PORTSDIR}/www/apache13
diff --git a/textproc/htdig/pkg-comment b/textproc/htdig/pkg-comment
deleted file mode 100644
index 1a9f81a20be5..000000000000
--- a/textproc/htdig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A www indexing and searching system
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index c853c390ac4d..0ac3033246fa 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.25
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Xml internationalization support for GNOME, and others
LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/textproc/intltool/pkg-comment b/textproc/intltool/pkg-comment
deleted file mode 100644
index e03e503086c2..000000000000
--- a/textproc/intltool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xml internationalization support for GNOME, and others
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index cbdee86955d1..ced15c3c8f58 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ispell-3.2.06 # needed for slave ports / options
DISTFILES= ispell-3.2.06.tar.gz # needed for slave ports / options
MAINTAINER?= jmz@FreeBSD.org
+COMMENT= An interactive spelling checker for multiple languages
ISPELL_FILES= ispell-3.2.06.tar.gz
MAN1= ispell.1
diff --git a/textproc/ispell/pkg-comment b/textproc/ispell/pkg-comment
deleted file mode 100644
index f8a382067632..000000000000
--- a/textproc/ispell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interactive spelling checker for multiple languages
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 49305ecb845a..9479e0e8a015 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libxml/1.8
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Xml parser library for GNOME
BUILD_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
RUN_DEPENDS= pkg-config:${PORTSDIR}/devel/pkgconfig
diff --git a/textproc/libxml/pkg-comment b/textproc/libxml/pkg-comment
deleted file mode 100644
index f3cd928cb352..000000000000
--- a/textproc/libxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xml parser library for GNOME
diff --git a/textproc/man2html/Makefile b/textproc/man2html/Makefile
index 666cbf39a1b5..3954a3fdfa54 100644
--- a/textproc/man2html/Makefile
+++ b/textproc/man2html/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.oac.uci.edu/indiv/ehood/tar/ \
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
+COMMENT= Convert nroff(1) man pages to HTML
USE_PERL5= yes
NO_BUILD= yes
diff --git a/textproc/man2html/pkg-comment b/textproc/man2html/pkg-comment
deleted file mode 100644
index 007e43da7970..000000000000
--- a/textproc/man2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert nroff(1) man pages to HTML
diff --git a/textproc/mkcatalog/Makefile b/textproc/mkcatalog/Makefile
index 9a8789e7f61f..eb7554982bc7 100644
--- a/textproc/mkcatalog/Makefile
+++ b/textproc/mkcatalog/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= # none
DISTFILES= # none
MAINTAINER= shige@FreeBSD.org
+COMMENT= A maintainance utility for sgml catalog files
NO_WRKSUBDIR= yes
NO_CHECKSUM= yes
diff --git a/textproc/mkcatalog/pkg-comment b/textproc/mkcatalog/pkg-comment
deleted file mode 100644
index c7ea244ba9f6..000000000000
--- a/textproc/mkcatalog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A maintainance utility for sgml catalog files
diff --git a/textproc/modlogan/Makefile b/textproc/modlogan/Makefile
index a5d92b6dbb9c..d73b3eb0c9f2 100644
--- a/textproc/modlogan/Makefile
+++ b/textproc/modlogan/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://jan.kneschke.de/projects/modlogan/download/ \
${MASTER_SITE_SOURCEFORGE}
MAINTAINER= netchild@FreeBSD.org
+COMMENT= A modular log file analysis program
LIB_DEPENDS= adns.1:${PORTSDIR}/net/adns \
gd.2:${PORTSDIR}/graphics/gd \
diff --git a/textproc/modlogan/pkg-comment b/textproc/modlogan/pkg-comment
deleted file mode 100644
index 8b0c630ef31d..000000000000
--- a/textproc/modlogan/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A modular log file analysis program
diff --git a/textproc/nfbtrans/Makefile b/textproc/nfbtrans/Makefile
index 5719e95356f0..a905df389c2d 100644
--- a/textproc/nfbtrans/Makefile
+++ b/textproc/nfbtrans/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.nfb.org/braille/nfbtrans/
DISTNAME= nfbtr${PORTVERSION:S/.//}
MAINTAINER= max@FreeBSD.org
+COMMENT= ASCII text to Grade Two braille translator
RESTRICTED= "Unclear copyright status"
diff --git a/textproc/nfbtrans/pkg-comment b/textproc/nfbtrans/pkg-comment
deleted file mode 100644
index daa5ac64f028..000000000000
--- a/textproc/nfbtrans/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ASCII text to Grade Two braille translator
diff --git a/textproc/p5-CSS-SAC/Makefile b/textproc/p5-CSS-SAC/Makefile
index 48b95ba7b4b5..81f1e592bacb 100644
--- a/textproc/p5-CSS-SAC/Makefile
+++ b/textproc/p5-CSS-SAC/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CSS
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= SAC CSS (Simple API for CSS) parser
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Balanced.pm:${PORTSDIR}/textproc/p5-Text-Balanced \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Class/ArrayObjects.pm:${PORTSDIR}/devel/p5-Class-ArrayObjects
diff --git a/textproc/p5-CSS-SAC/pkg-comment b/textproc/p5-CSS-SAC/pkg-comment
deleted file mode 100644
index de81c5a85343..000000000000
--- a/textproc/p5-CSS-SAC/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SAC CSS (Simple API for CSS) parser
diff --git a/textproc/p5-DelimMatch/Makefile b/textproc/p5-DelimMatch/Makefile
index aee520eec965..efb0737443eb 100644
--- a/textproc/p5-DelimMatch/Makefile
+++ b/textproc/p5-DelimMatch/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://nwalsh.com/perl/delimmatch/
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension to find regexp delimited strings with proper nesting
PERL_CONFIGURE= yes
diff --git a/textproc/p5-DelimMatch/pkg-comment b/textproc/p5-DelimMatch/pkg-comment
deleted file mode 100644
index e2c381259e54..000000000000
--- a/textproc/p5-DelimMatch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension to find regexp delimited strings with proper nesting
diff --git a/textproc/p5-FreeBSD-Ports/Makefile b/textproc/p5-FreeBSD-Ports/Makefile
index 5e51cc112720..7799fc077646 100644
--- a/textproc/p5-FreeBSD-Ports/Makefile
+++ b/textproc/p5-FreeBSD-Ports/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://people.FreeBSD.org/~tom/portpm/
PKGNAMEPREFIX= p5-
MAINTAINER= tom@FreeBSD.org
+COMMENT= Perl modules for parsing FreeBSD's Ports INDEX file
USE_BZIP2= yes
diff --git a/textproc/p5-FreeBSD-Ports/pkg-comment b/textproc/p5-FreeBSD-Ports/pkg-comment
deleted file mode 100644
index 4ace9e196f0f..000000000000
--- a/textproc/p5-FreeBSD-Ports/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl modules for parsing FreeBSD's Ports INDEX file
diff --git a/textproc/p5-HTML-Format/Makefile b/textproc/p5-HTML-Format/Makefile
index 995ef86884c2..70aa8f5dc5a1 100644
--- a/textproc/p5-HTML-Format/Makefile
+++ b/textproc/p5-HTML-Format/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A module to format HTML to text or PS
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Font/AFM.pm:${PORTSDIR}/x11-fonts/p5-Font-AFM
diff --git a/textproc/p5-HTML-Format/pkg-comment b/textproc/p5-HTML-Format/pkg-comment
deleted file mode 100644
index 17e1c61d962b..000000000000
--- a/textproc/p5-HTML-Format/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module to format HTML to text or PS
diff --git a/textproc/p5-NetAddr-IP-Find/Makefile b/textproc/p5-NetAddr-IP-Find/Makefile
index cb2d60d898e9..8784b220fef1 100644
--- a/textproc/p5-NetAddr-IP-Find/Makefile
+++ b/textproc/p5-NetAddr-IP-Find/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= NetAddr
PKGNAMEPREFIX= p5-
MAINTAINER= kappa@freebsd.org.ua
+COMMENT= Iterates over all IP addresses in a text similar to Email::Find
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/NetAddr/IP.pm:${PORTSDIR}/net/p5-NetAddr-IP
diff --git a/textproc/p5-NetAddr-IP-Find/pkg-comment b/textproc/p5-NetAddr-IP-Find/pkg-comment
deleted file mode 100644
index 21962414169c..000000000000
--- a/textproc/p5-NetAddr-IP-Find/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Iterates over all IP addresses in a text similar to Email::Find
diff --git a/textproc/p5-PDF-Create/Makefile b/textproc/p5-PDF-Create/Makefile
index b3289d97a2c9..8853a3b2d32c 100644
--- a/textproc/p5-PDF-Create/Makefile
+++ b/textproc/p5-PDF-Create/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= File/FTASSIN
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= A perl script to convert text files to PDF files
PERL_CONFIGURE= yes
MAN3= PDF::Create.3
diff --git a/textproc/p5-PDF-Create/pkg-comment b/textproc/p5-PDF-Create/pkg-comment
deleted file mode 100644
index 413e2a657645..000000000000
--- a/textproc/p5-PDF-Create/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl script to convert text files to PDF files
diff --git a/textproc/p5-Pod-Constants/Makefile b/textproc/p5-Pod-Constants/Makefile
index d8c210e4ef15..01ad0ac9f9cf 100644
--- a/textproc/p5-Pod-Constants/Makefile
+++ b/textproc/p5-Pod-Constants/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SAMV
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Include constants from POD
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-Pod-Constants/pkg-comment b/textproc/p5-Pod-Constants/pkg-comment
deleted file mode 100644
index 7eabe038e2e6..000000000000
--- a/textproc/p5-Pod-Constants/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Include constants from POD
diff --git a/textproc/p5-Pod-POM/Makefile b/textproc/p5-Pod-POM/Makefile
index c49dc577b9f0..f9eb5ec0c2ce 100644
--- a/textproc/p5-Pod-POM/Makefile
+++ b/textproc/p5-Pod-POM/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Pod
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POD Object Model
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Pod-POM/pkg-comment b/textproc/p5-Pod-POM/pkg-comment
deleted file mode 100644
index 9b1b2f73d2d9..000000000000
--- a/textproc/p5-Pod-POM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POD Object Model
diff --git a/textproc/p5-Pod-Parser/Makefile b/textproc/p5-Pod-Parser/Makefile
index 63cfbe83abda..c9bec03eb78d 100644
--- a/textproc/p5-Pod-Parser/Makefile
+++ b/textproc/p5-Pod-Parser/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Pod
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Modules to work with POD (Plain Old Documentation)
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Pod-Parser/pkg-comment b/textproc/p5-Pod-Parser/pkg-comment
deleted file mode 100644
index 5e82cbd5c3db..000000000000
--- a/textproc/p5-Pod-Parser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules to work with POD (Plain Old Documentation)
diff --git a/textproc/p5-PodParser/Makefile b/textproc/p5-PodParser/Makefile
index 63cfbe83abda..c9bec03eb78d 100644
--- a/textproc/p5-PodParser/Makefile
+++ b/textproc/p5-PodParser/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Pod
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Modules to work with POD (Plain Old Documentation)
PERL_CONFIGURE= yes
diff --git a/textproc/p5-PodParser/pkg-comment b/textproc/p5-PodParser/pkg-comment
deleted file mode 100644
index 5e82cbd5c3db..000000000000
--- a/textproc/p5-PodParser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules to work with POD (Plain Old Documentation)
diff --git a/textproc/p5-RDF-Core/Makefile b/textproc/p5-RDF-Core/Makefile
index 313ac9f89bab..be75b16b7bbc 100644
--- a/textproc/p5-RDF-Core/Makefile
+++ b/textproc/p5-RDF-Core/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= RDF
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= An object oriented Perl modules for handling tasks related to RDF
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
diff --git a/textproc/p5-RDF-Core/pkg-comment b/textproc/p5-RDF-Core/pkg-comment
deleted file mode 100644
index c4871c43eefa..000000000000
--- a/textproc/p5-RDF-Core/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object oriented Perl modules for handling tasks related to RDF
diff --git a/textproc/p5-RDF-Notation3/Makefile b/textproc/p5-RDF-Notation3/Makefile
index 406ec362fbcf..6e1e36a364b4 100644
--- a/textproc/p5-RDF-Notation3/Makefile
+++ b/textproc/p5-RDF-Notation3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= RDF
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= RDF Notation3 parser
BUILD_DEPENDS= ${SITE_PERL}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
${SITE_PERL}/RDF/Core.pm:${PORTSDIR}/textproc/p5-RDF-Core \
diff --git a/textproc/p5-RDF-Notation3/pkg-comment b/textproc/p5-RDF-Notation3/pkg-comment
deleted file mode 100644
index 58baeb3e3981..000000000000
--- a/textproc/p5-RDF-Notation3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RDF Notation3 parser
diff --git a/textproc/p5-RDFStore/Makefile b/textproc/p5-RDFStore/Makefile
index 88ed958355c9..cfe572276071 100644
--- a/textproc/p5-RDFStore/Makefile
+++ b/textproc/p5-RDFStore/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= RDF
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl API for RDF Storage
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Digest.pm:${PORTSDIR}/security/p5-Digest \
diff --git a/textproc/p5-RDFStore/pkg-comment b/textproc/p5-RDFStore/pkg-comment
deleted file mode 100644
index 8bef8fa1bf45..000000000000
--- a/textproc/p5-RDFStore/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl API for RDF Storage
diff --git a/textproc/p5-Sort-ArbBiLex/Makefile b/textproc/p5-Sort-ArbBiLex/Makefile
index ed543537b9d9..5c423e7488fb 100644
--- a/textproc/p5-Sort-ArbBiLex/Makefile
+++ b/textproc/p5-Sort-ArbBiLex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Sort
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to make sort functions for arbitrary sort orders
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Sort-ArbBiLex/pkg-comment b/textproc/p5-Sort-ArbBiLex/pkg-comment
deleted file mode 100644
index d2f12dd6735e..000000000000
--- a/textproc/p5-Sort-ArbBiLex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to make sort functions for arbitrary sort orders
diff --git a/textproc/p5-Sort-Fields/Makefile b/textproc/p5-Sort-Fields/Makefile
index 79bfe670aa4f..c74933bd4f83 100644
--- a/textproc/p5-Sort-Fields/Makefile
+++ b/textproc/p5-Sort-Fields/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Sort
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module to sort lines containing delimited fields
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Sort-Fields/pkg-comment b/textproc/p5-Sort-Fields/pkg-comment
deleted file mode 100644
index 327aec62a07e..000000000000
--- a/textproc/p5-Sort-Fields/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to sort lines containing delimited fields
diff --git a/textproc/p5-Sort-PolySort/Makefile b/textproc/p5-Sort-PolySort/Makefile
index 7733bcb1b21d..b399d00e596c 100644
--- a/textproc/p5-Sort-PolySort/Makefile
+++ b/textproc/p5-Sort-PolySort/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Sort
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= General rules-based sorting of lists
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Sort-PolySort/pkg-comment b/textproc/p5-Sort-PolySort/pkg-comment
deleted file mode 100644
index f73b34e86852..000000000000
--- a/textproc/p5-Sort-PolySort/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-General rules-based sorting of lists
diff --git a/textproc/p5-Spreadsheet-ParseExcel/Makefile b/textproc/p5-Spreadsheet-ParseExcel/Makefile
index 9905f544a341..387a5edbeca9 100644
--- a/textproc/p5-Spreadsheet-ParseExcel/Makefile
+++ b/textproc/p5-Spreadsheet-ParseExcel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Spreadsheet
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Get information from Excel file
BUILD_DEPENDS= ${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-Spreadsheet-ParseExcel/pkg-comment b/textproc/p5-Spreadsheet-ParseExcel/pkg-comment
deleted file mode 100644
index ea547b8881a6..000000000000
--- a/textproc/p5-Spreadsheet-ParseExcel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Get information from Excel file
diff --git a/textproc/p5-Spreadsheet-WriteExcel/Makefile b/textproc/p5-Spreadsheet-WriteExcel/Makefile
index cf137a6a7750..8dbca995d229 100644
--- a/textproc/p5-Spreadsheet-WriteExcel/Makefile
+++ b/textproc/p5-Spreadsheet-WriteExcel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Spreadsheet
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Write to a cross-platform Excel binary file
BUILD_DEPENDS= ${SITE_PERL}/Parse/RecDescent.pm:${PORTSDIR}/devel/p5-Parse-RecDescent \
${SITE_PERL}/OLE/Storage_Lite.pm:${PORTSDIR}/devel/p5-OLE-Storage_Lite \
diff --git a/textproc/p5-Spreadsheet-WriteExcel/pkg-comment b/textproc/p5-Spreadsheet-WriteExcel/pkg-comment
deleted file mode 100644
index f5ba18051763..000000000000
--- a/textproc/p5-Spreadsheet-WriteExcel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Write to a cross-platform Excel binary file
diff --git a/textproc/p5-String-ShellQuote/Makefile b/textproc/p5-String-ShellQuote/Makefile
index 6ae1ab010ae4..bea2db08836e 100644
--- a/textproc/p5-String-ShellQuote/Makefile
+++ b/textproc/p5-String-ShellQuote/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= String
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for quote strings for passing through the shell
PERL_CONFIGURE= yes
diff --git a/textproc/p5-String-ShellQuote/pkg-comment b/textproc/p5-String-ShellQuote/pkg-comment
deleted file mode 100644
index 7ba6372ea1f8..000000000000
--- a/textproc/p5-String-ShellQuote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for quote strings for passing through the shell
diff --git a/textproc/p5-String-Strip/Makefile b/textproc/p5-String-Strip/Makefile
index 7bc6c6344495..662ae4f2778d 100644
--- a/textproc/p5-String-Strip/Makefile
+++ b/textproc/p5-String-Strip/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= String
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl extension for fast, commonly used, string operations
PERL_CONFIGURE= yes
diff --git a/textproc/p5-String-Strip/pkg-comment b/textproc/p5-String-Strip/pkg-comment
deleted file mode 100644
index 278901761888..000000000000
--- a/textproc/p5-String-Strip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl extension for fast, commonly used, string operations
diff --git a/textproc/p5-Text-Autoformat/Makefile b/textproc/p5-Text-Autoformat/Makefile
index 5c57b53a48e3..ced6137e9692 100644
--- a/textproc/p5-Text-Autoformat/Makefile
+++ b/textproc/p5-Text-Autoformat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Automatic and manual text wrapping and reformating formatting
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Autoformat/pkg-comment b/textproc/p5-Text-Autoformat/pkg-comment
deleted file mode 100644
index 2b9a2e560289..000000000000
--- a/textproc/p5-Text-Autoformat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Automatic and manual text wrapping and reformating formatting
diff --git a/textproc/p5-Text-Balanced/Makefile b/textproc/p5-Text-Balanced/Makefile
index 3f70b5c52ed4..3d1484965de1 100644
--- a/textproc/p5-Text-Balanced/Makefile
+++ b/textproc/p5-Text-Balanced/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Text::Balanced - extract delimited text sequences from strings
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Balanced/pkg-comment b/textproc/p5-Text-Balanced/pkg-comment
deleted file mode 100644
index 7fd92b05adc6..000000000000
--- a/textproc/p5-Text-Balanced/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text::Balanced - extract delimited text sequences from strings
diff --git a/textproc/p5-Text-Bind/Makefile b/textproc/p5-Text-Bind/Makefile
index ac4d190650f8..4d4bc1d8c569 100644
--- a/textproc/p5-Text-Bind/Makefile
+++ b/textproc/p5-Text-Bind/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Bind Perl structures to text files
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Bind/pkg-comment b/textproc/p5-Text-Bind/pkg-comment
deleted file mode 100644
index 971f725a4e0b..000000000000
--- a/textproc/p5-Text-Bind/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bind Perl structures to text files
diff --git a/textproc/p5-Text-CSV/Makefile b/textproc/p5-Text-CSV/Makefile
index bd3bf47187e6..1143e9e07f4d 100644
--- a/textproc/p5-Text-CSV/Makefile
+++ b/textproc/p5-Text-CSV/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= markm@FreeBSD.org
+COMMENT= Composition and decomposition of comma-separated values
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-CSV/pkg-comment b/textproc/p5-Text-CSV/pkg-comment
deleted file mode 100644
index 1266996f8149..000000000000
--- a/textproc/p5-Text-CSV/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Composition and decomposition of comma-separated values
diff --git a/textproc/p5-Text-CSV_XS/Makefile b/textproc/p5-Text-CSV_XS/Makefile
index 029ee52245b4..236f52097bac 100644
--- a/textproc/p5-Text-CSV_XS/Makefile
+++ b/textproc/p5-Text-CSV_XS/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= ache@FreeBSD.org
+COMMENT= Composition and decomposition of comma-separated values
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-CSV_XS/pkg-comment b/textproc/p5-Text-CSV_XS/pkg-comment
deleted file mode 100644
index 1266996f8149..000000000000
--- a/textproc/p5-Text-CSV_XS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Composition and decomposition of comma-separated values
diff --git a/textproc/p5-Text-Diff/Makefile b/textproc/p5-Text-Diff/Makefile
index 8cdef8bf7611..4f750a3f4f65 100644
--- a/textproc/p5-Text-Diff/Makefile
+++ b/textproc/p5-Text-Diff/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Text::Diff - Perform diffs on files and record sets
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-Text-Diff/pkg-comment b/textproc/p5-Text-Diff/pkg-comment
deleted file mode 100644
index 1ba92b74ab7a..000000000000
--- a/textproc/p5-Text-Diff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Text::Diff - Perform diffs on files and record sets
diff --git a/textproc/p5-Text-DoubleMetaphone/Makefile b/textproc/p5-Text-DoubleMetaphone/Makefile
index d26d10b2fa36..05c1a568b69d 100644
--- a/textproc/p5-Text-DoubleMetaphone/Makefile
+++ b/textproc/p5-Text-DoubleMetaphone/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Phonetic encoding of words
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-DoubleMetaphone/pkg-comment b/textproc/p5-Text-DoubleMetaphone/pkg-comment
deleted file mode 100644
index 69a8fb6f4af8..000000000000
--- a/textproc/p5-Text-DoubleMetaphone/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phonetic encoding of words
diff --git a/textproc/p5-Text-EtText/Makefile b/textproc/p5-Text-EtText/Makefile
index ab9a8bcf9758..9fa6b1f5d229 100644
--- a/textproc/p5-Text-EtText/Makefile
+++ b/textproc/p5-Text-EtText/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= A simple plain-text to HTML converter
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-EtText/pkg-comment b/textproc/p5-Text-EtText/pkg-comment
deleted file mode 100644
index 06ac90916677..000000000000
--- a/textproc/p5-Text-EtText/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple plain-text to HTML converter
diff --git a/textproc/p5-Text-FillIn/Makefile b/textproc/p5-Text-FillIn/Makefile
index 4cd8917c5e25..2d9f238bf5d9 100644
--- a/textproc/p5-Text-FillIn/Makefile
+++ b/textproc/p5-Text-FillIn/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A class implementing a fill-in template
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-FillIn/pkg-comment b/textproc/p5-Text-FillIn/pkg-comment
deleted file mode 100644
index 997314273c09..000000000000
--- a/textproc/p5-Text-FillIn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A class implementing a fill-in template
diff --git a/textproc/p5-Text-Filter-Chain/Makefile b/textproc/p5-Text-Filter-Chain/Makefile
index 0013cf42365b..71e1c33391fd 100644
--- a/textproc/p5-Text-Filter-Chain/Makefile
+++ b/textproc/p5-Text-Filter-Chain/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Chains multiple Text::Filter objects and runs them in sequence
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Filter.pm:${PORTSDIR}/textproc/p5-Text-Filter
diff --git a/textproc/p5-Text-Filter-Chain/pkg-comment b/textproc/p5-Text-Filter-Chain/pkg-comment
deleted file mode 100644
index fadde0962ab2..000000000000
--- a/textproc/p5-Text-Filter-Chain/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Chains multiple Text::Filter objects and runs them in sequence
diff --git a/textproc/p5-Text-Filter/Makefile b/textproc/p5-Text-Filter/Makefile
index ca982f99dc1b..a8a7e80eda92 100644
--- a/textproc/p5-Text-Filter/Makefile
+++ b/textproc/p5-Text-Filter/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Base class for objects that can read and write text lines
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Filter/pkg-comment b/textproc/p5-Text-Filter/pkg-comment
deleted file mode 100644
index d4543ce860f0..000000000000
--- a/textproc/p5-Text-Filter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Base class for objects that can read and write text lines
diff --git a/textproc/p5-Text-FixedLength-Extra/Makefile b/textproc/p5-Text-FixedLength-Extra/Makefile
index 2ad802132fec..b7c532d0f768 100644
--- a/textproc/p5-Text-FixedLength-Extra/Makefile
+++ b/textproc/p5-Text-FixedLength-Extra/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Various niceties for p5-Text-FixedLength lovers
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/FixedLength.pm:${PORTSDIR}/textproc/p5-Text-FixedLength
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-Text-FixedLength-Extra/pkg-comment b/textproc/p5-Text-FixedLength-Extra/pkg-comment
deleted file mode 100644
index 770d5787ba97..000000000000
--- a/textproc/p5-Text-FixedLength-Extra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Various niceties for p5-Text-FixedLength lovers
diff --git a/textproc/p5-Text-FixedLength/Makefile b/textproc/p5-Text-FixedLength/Makefile
index b7c3003dd996..466baac70f59 100644
--- a/textproc/p5-Text-FixedLength/Makefile
+++ b/textproc/p5-Text-FixedLength/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Parse and create fixed length field records
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-FixedLength/pkg-comment b/textproc/p5-Text-FixedLength/pkg-comment
deleted file mode 100644
index 99f795759f18..000000000000
--- a/textproc/p5-Text-FixedLength/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Parse and create fixed length field records
diff --git a/textproc/p5-Text-Flowchart/Makefile b/textproc/p5-Text-Flowchart/Makefile
index 8574f61ac667..06d0cdf93114 100644
--- a/textproc/p5-Text-Flowchart/Makefile
+++ b/textproc/p5-Text-Flowchart/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= ASCII Flowchart maker
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Flowchart/pkg-comment b/textproc/p5-Text-Flowchart/pkg-comment
deleted file mode 100644
index f316e06b4923..000000000000
--- a/textproc/p5-Text-Flowchart/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-ASCII Flowchart maker
diff --git a/textproc/p5-Text-Format/Makefile b/textproc/p5-Text-Format/Makefile
index ba4a39b662c1..db938a1068e6 100644
--- a/textproc/p5-Text-Format/Makefile
+++ b/textproc/p5-Text-Format/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Various subroutines to format text
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Format/pkg-comment b/textproc/p5-Text-Format/pkg-comment
deleted file mode 100644
index a6af685fc6f4..000000000000
--- a/textproc/p5-Text-Format/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Various subroutines to format text
diff --git a/textproc/p5-Text-Graphics/Makefile b/textproc/p5-Text-Graphics/Makefile
index 1e671c297eb3..9df57d09932e 100644
--- a/textproc/p5-Text-Graphics/Makefile
+++ b/textproc/p5-Text-Graphics/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A text graphics rendering toolkit
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/Wrapper.pm:${PORTSDIR}/textproc/p5-Text-Wrapper
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-Text-Graphics/pkg-comment b/textproc/p5-Text-Graphics/pkg-comment
deleted file mode 100644
index c17b8845a201..000000000000
--- a/textproc/p5-Text-Graphics/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text graphics rendering toolkit
diff --git a/textproc/p5-Text-Query/Makefile b/textproc/p5-Text-Query/Makefile
index 112270d4205a..199f96711fb5 100644
--- a/textproc/p5-Text-Query/Makefile
+++ b/textproc/p5-Text-Query/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Query processing framework
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Query/pkg-comment b/textproc/p5-Text-Query/pkg-comment
deleted file mode 100644
index 8c6d0faa4603..000000000000
--- a/textproc/p5-Text-Query/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Query processing framework
diff --git a/textproc/p5-Text-SimpleTemplate/Makefile b/textproc/p5-Text-SimpleTemplate/Makefile
index 10c4d51ef785..eb4456bafbc0 100644
--- a/textproc/p5-Text-SimpleTemplate/Makefile
+++ b/textproc/p5-Text-SimpleTemplate/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Yet another Perl module for template processing
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-SimpleTemplate/pkg-comment b/textproc/p5-Text-SimpleTemplate/pkg-comment
deleted file mode 100644
index 3a73298a1f1b..000000000000
--- a/textproc/p5-Text-SimpleTemplate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another Perl module for template processing
diff --git a/textproc/p5-Text-Tmpl/Makefile b/textproc/p5-Text-Tmpl/Makefile
index 40bda838d940..18b67e4c6159 100644
--- a/textproc/p5-Text-Tmpl/Makefile
+++ b/textproc/p5-Text-Tmpl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Templating system perl library
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Tmpl/pkg-comment b/textproc/p5-Text-Tmpl/pkg-comment
deleted file mode 100644
index e55654c2c169..000000000000
--- a/textproc/p5-Text-Tmpl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Templating system perl library
diff --git a/textproc/p5-Text-Wrapper/Makefile b/textproc/p5-Text-Wrapper/Makefile
index 8762436e1842..a6a1f0ab32ca 100644
--- a/textproc/p5-Text-Wrapper/Makefile
+++ b/textproc/p5-Text-Wrapper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Text
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Simple word wrapping routine
PERL_CONFIGURE= yes
diff --git a/textproc/p5-Text-Wrapper/pkg-comment b/textproc/p5-Text-Wrapper/pkg-comment
deleted file mode 100644
index 3a9667101a44..000000000000
--- a/textproc/p5-Text-Wrapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple word wrapping routine
diff --git a/textproc/p5-URI-Find/Makefile b/textproc/p5-URI-Find/Makefile
index 56237527624e..bf986e95c652 100644
--- a/textproc/p5-URI-Find/Makefile
+++ b/textproc/p5-URI-Find/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= URI
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module to find URIs in arbitrary text
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-URI-Find/pkg-comment b/textproc/p5-URI-Find/pkg-comment
deleted file mode 100644
index 2ce8af1e5bc3..000000000000
--- a/textproc/p5-URI-Find/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module to find URIs in arbitrary text
diff --git a/textproc/p5-XML-DBMS/Makefile b/textproc/p5-XML-DBMS/Makefile
index fb6df49d6061..73db6c823847 100644
--- a/textproc/p5-XML-DBMS/Makefile
+++ b/textproc/p5-XML-DBMS/Makefile
@@ -14,6 +14,7 @@ DISTNAME= perl-xml-dbms-1.03
EXTRACT_SUFX= .tgz
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl port of Java package XML-DBMS v1.0
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Date/Parse.pm:${PORTSDIR}/devel/p5-TimeDate \
diff --git a/textproc/p5-XML-DBMS/pkg-comment b/textproc/p5-XML-DBMS/pkg-comment
deleted file mode 100644
index ba62867cfe70..000000000000
--- a/textproc/p5-XML-DBMS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl port of Java package XML-DBMS v1.0
diff --git a/textproc/p5-XML-DT/Makefile b/textproc/p5-XML-DT/Makefile
index e8289aa6a12f..8a86df6dec18 100644
--- a/textproc/p5-XML-DT/Makefile
+++ b/textproc/p5-XML-DT/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for down translation of XML to strings
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-DT/pkg-comment b/textproc/p5-XML-DT/pkg-comment
deleted file mode 100644
index bd4ec48faad0..000000000000
--- a/textproc/p5-XML-DT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for down translation of XML to strings
diff --git a/textproc/p5-XML-Dumper/Makefile b/textproc/p5-XML-Dumper/Makefile
index cb1edcd4784c..b07b05543fe8 100644
--- a/textproc/p5-XML-Dumper/Makefile
+++ b/textproc/p5-XML-Dumper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Perl module for dumping Perl objects from/to XML
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-Dumper/pkg-comment b/textproc/p5-XML-Dumper/pkg-comment
deleted file mode 100644
index 01c1b813489d..000000000000
--- a/textproc/p5-XML-Dumper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module for dumping Perl objects from/to XML
diff --git a/textproc/p5-XML-Filter-BufferText/Makefile b/textproc/p5-XML-Filter-BufferText/Makefile
index a67b2ea2b494..1d2c36b132fd 100644
--- a/textproc/p5-XML-Filter-BufferText/Makefile
+++ b/textproc/p5-XML-Filter-BufferText/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Filter to put all characters() in one event
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/textproc/p5-XML-Filter-BufferText/pkg-comment b/textproc/p5-XML-Filter-BufferText/pkg-comment
deleted file mode 100644
index 7bbc50a524e5..000000000000
--- a/textproc/p5-XML-Filter-BufferText/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Filter to put all characters() in one event
diff --git a/textproc/p5-XML-Filter-DetectWS/Makefile b/textproc/p5-XML-Filter-DetectWS/Makefile
index debc752e285a..d82ab003d177 100644
--- a/textproc/p5-XML-Filter-DetectWS/Makefile
+++ b/textproc/p5-XML-Filter-DetectWS/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= A PerlSAX filter that detects ignorable whitespace
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Filter/SAXT.pm:${PORTSDIR}/textproc/p5-XML-Filter-SAXT
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/textproc/p5-XML-Filter-DetectWS/pkg-comment b/textproc/p5-XML-Filter-DetectWS/pkg-comment
deleted file mode 100644
index c2a692bedae7..000000000000
--- a/textproc/p5-XML-Filter-DetectWS/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PerlSAX filter that detects ignorable whitespace
diff --git a/textproc/p5-XML-Filter-Reindent/Makefile b/textproc/p5-XML-Filter-Reindent/Makefile
index ff1175280543..a22ec7637ce7 100644
--- a/textproc/p5-XML-Filter-Reindent/Makefile
+++ b/textproc/p5-XML-Filter-Reindent/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Reformats whitespace for pretty printing XML
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Filter/DetectWS.pm:${PORTSDIR}/textproc/p5-XML-Filter-DetectWS
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/textproc/p5-XML-Filter-Reindent/pkg-comment b/textproc/p5-XML-Filter-Reindent/pkg-comment
deleted file mode 100644
index e7e10352ad52..000000000000
--- a/textproc/p5-XML-Filter-Reindent/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Reformats whitespace for pretty printing XML
diff --git a/textproc/p5-XML-Filter-SAXT/Makefile b/textproc/p5-XML-Filter-SAXT/Makefile
index 2d654377d04e..2fde7217c2c8 100644
--- a/textproc/p5-XML-Filter-SAXT/Makefile
+++ b/textproc/p5-XML-Filter-SAXT/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Replicates SAX events to several SAX event handlers
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-Filter-SAXT/pkg-comment b/textproc/p5-XML-Filter-SAXT/pkg-comment
deleted file mode 100644
index ec1b07d8f85f..000000000000
--- a/textproc/p5-XML-Filter-SAXT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Replicates SAX events to several SAX event handlers
diff --git a/textproc/p5-XML-Filter-XInclude/Makefile b/textproc/p5-XML-Filter-XInclude/Makefile
index 5ae945c716a8..07069916c761 100644
--- a/textproc/p5-XML-Filter-XInclude/Makefile
+++ b/textproc/p5-XML-Filter-XInclude/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= XInclude as a SAX Filter
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/textproc/p5-XML-Filter-XInclude/pkg-comment b/textproc/p5-XML-Filter-XInclude/pkg-comment
deleted file mode 100644
index 98d1a629e342..000000000000
--- a/textproc/p5-XML-Filter-XInclude/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XInclude as a SAX Filter
diff --git a/textproc/p5-XML-Filter-XSLT/Makefile b/textproc/p5-XML-Filter-XSLT/Makefile
index a89c74d097c1..67bc3d2cf6e5 100644
--- a/textproc/p5-XML-Filter-XSLT/Makefile
+++ b/textproc/p5-XML-Filter-XSLT/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= XSLT as a SAX Filter
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Writer.pm:${PORTSDIR}/textproc/p5-XML-SAX-Writer \
diff --git a/textproc/p5-XML-Filter-XSLT/pkg-comment b/textproc/p5-XML-Filter-XSLT/pkg-comment
deleted file mode 100644
index 47dcb016f742..000000000000
--- a/textproc/p5-XML-Filter-XSLT/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSLT as a SAX Filter
diff --git a/textproc/p5-XML-Generator-DBI/Makefile b/textproc/p5-XML-Generator-DBI/Makefile
index 07ddbb3f22f9..acca9049d397 100644
--- a/textproc/p5-XML-Generator-DBI/Makefile
+++ b/textproc/p5-XML-Generator-DBI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Generate SAX events from SQL queries
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/textproc/p5-XML-Generator-DBI/pkg-comment b/textproc/p5-XML-Generator-DBI/pkg-comment
deleted file mode 100644
index d3ddfea459f0..000000000000
--- a/textproc/p5-XML-Generator-DBI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generate SAX events from SQL queries
diff --git a/textproc/p5-XML-Handler-YAWriter/Makefile b/textproc/p5-XML-Handler-YAWriter/Makefile
index bbbc26e3fd5c..dd63e9b48104 100644
--- a/textproc/p5-XML-Handler-YAWriter/Makefile
+++ b/textproc/p5-XML-Handler-YAWriter/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Yet another Perl SAX XML Writer
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Parser/PerlSAX.pm:${PORTSDIR}/textproc/p5-libxml
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/textproc/p5-XML-Handler-YAWriter/pkg-comment b/textproc/p5-XML-Handler-YAWriter/pkg-comment
deleted file mode 100644
index d62c1f612bd1..000000000000
--- a/textproc/p5-XML-Handler-YAWriter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another Perl SAX XML Writer
diff --git a/textproc/p5-XML-Node/Makefile b/textproc/p5-XML-Node/Makefile
index 258c4ccd7021..d152abe8fa42 100644
--- a/textproc/p5-XML-Node/Makefile
+++ b/textproc/p5-XML-Node/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Perl5 module to extend and simplify XML::Parser
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
diff --git a/textproc/p5-XML-Node/pkg-comment b/textproc/p5-XML-Node/pkg-comment
deleted file mode 100644
index b8cc43270ced..000000000000
--- a/textproc/p5-XML-Node/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module to extend and simplify XML::Parser
diff --git a/textproc/p5-XML-Quote/Makefile b/textproc/p5-XML-Quote/Makefile
index 6b827242ad54..9866a74eab8d 100644
--- a/textproc/p5-XML-Quote/Makefile
+++ b/textproc/p5-XML-Quote/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= XML quote/dequote functions
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-Quote/pkg-comment b/textproc/p5-XML-Quote/pkg-comment
deleted file mode 100644
index f4d017e5246d..000000000000
--- a/textproc/p5-XML-Quote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML quote/dequote functions
diff --git a/textproc/p5-XML-RegExp/Makefile b/textproc/p5-XML-RegExp/Makefile
index 22aff8b03265..afeb2deae0fd 100644
--- a/textproc/p5-XML-RegExp/Makefile
+++ b/textproc/p5-XML-RegExp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Regular expressions for XML tokens
PERL_CONFIGURE= yes
diff --git a/textproc/p5-XML-RegExp/pkg-comment b/textproc/p5-XML-RegExp/pkg-comment
deleted file mode 100644
index 312860120ff4..000000000000
--- a/textproc/p5-XML-RegExp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Regular expressions for XML tokens
diff --git a/textproc/p5-XML-SAX-Expat/Makefile b/textproc/p5-XML-SAX-Expat/Makefile
index 2dd265e5c301..14aa48ffe8ae 100644
--- a/textproc/p5-XML-SAX-Expat/Makefile
+++ b/textproc/p5-XML-SAX-Expat/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Simple API for XML
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
diff --git a/textproc/p5-XML-SAX-Expat/pkg-comment b/textproc/p5-XML-SAX-Expat/pkg-comment
deleted file mode 100644
index a54a304accf2..000000000000
--- a/textproc/p5-XML-SAX-Expat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple API for XML
diff --git a/textproc/p5-XML-SAX-Simple/Makefile b/textproc/p5-XML-SAX-Simple/Makefile
index 42cc3499bd23..a212c0fa9f75 100644
--- a/textproc/p5-XML-SAX-Simple/Makefile
+++ b/textproc/p5-XML-SAX-Simple/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= SAX version of XML::Simple
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX.pm:${PORTSDIR}/textproc/p5-XML-SAX \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Simple.pm:${PORTSDIR}/textproc/p5-XML-Simple
diff --git a/textproc/p5-XML-SAX-Simple/pkg-comment b/textproc/p5-XML-SAX-Simple/pkg-comment
deleted file mode 100644
index 1a006e801682..000000000000
--- a/textproc/p5-XML-SAX-Simple/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SAX version of XML::Simple
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/Makefile b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
index c2978bedb9df..5219877158ee 100644
--- a/textproc/p5-XML-SAXDriver-Sablotron/Makefile
+++ b/textproc/p5-XML-SAXDriver-Sablotron/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl SAX driver for the Sablotron XSLT
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/Sablotron.pm:${PORTSDIR}/textproc/p5-XML-Sablotron \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/SAX/Base.pm:${PORTSDIR}/textproc/p5-XML-SAX
diff --git a/textproc/p5-XML-SAXDriver-Sablotron/pkg-comment b/textproc/p5-XML-SAXDriver-Sablotron/pkg-comment
deleted file mode 100644
index 753adc4a192f..000000000000
--- a/textproc/p5-XML-SAXDriver-Sablotron/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl SAX driver for the Sablotron XSLT
diff --git a/textproc/p5-XML-Twig/Makefile b/textproc/p5-XML-Twig/Makefile
index 1d4f7f1318c0..0edd44f0cde9 100644
--- a/textproc/p5-XML-Twig/Makefile
+++ b/textproc/p5-XML-Twig/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Process huge XML documents by chunks via a tree interface
# On Perl < 5.8.0, XML::Twig has a further optional dependency on WeakRef.
# However, WeakRef needs Perl 5.005_55.
diff --git a/textproc/p5-XML-Twig/pkg-comment b/textproc/p5-XML-Twig/pkg-comment
deleted file mode 100644
index 443831d42934..000000000000
--- a/textproc/p5-XML-Twig/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Process huge XML documents by chunks via a tree interface
diff --git a/textproc/p5-XML-XPath/Makefile b/textproc/p5-XML-XPath/Makefile
index 2ae75dc48206..3dce55061dd1 100644
--- a/textproc/p5-XML-XPath/Makefile
+++ b/textproc/p5-XML-XPath/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= XML
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Modules for parsing and evaluating XPath statements
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-XPath/pkg-comment b/textproc/p5-XML-XPath/pkg-comment
deleted file mode 100644
index 35660e9d58a9..000000000000
--- a/textproc/p5-XML-XPath/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules for parsing and evaluating XPath statements
diff --git a/textproc/p5-libxml/Makefile b/textproc/p5-libxml/Makefile
index 97967d291905..a4a18f7249f4 100644
--- a/textproc/p5-libxml/Makefile
+++ b/textproc/p5-libxml/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= libxml-perl-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Collection of Perl5 modules for working with XML
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-libxml/pkg-comment b/textproc/p5-libxml/pkg-comment
deleted file mode 100644
index 1d08122dd834..000000000000
--- a/textproc/p5-libxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Collection of Perl5 modules for working with XML
diff --git a/textproc/p5-podlators/Makefile b/textproc/p5-podlators/Makefile
index e5f0a26c530a..334cf77f5ea3 100644
--- a/textproc/p5-podlators/Makefile
+++ b/textproc/p5-podlators/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Pod
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Modules to convert and parse POD (Plain Old Documentation)
RUN_DEPENDS= ${SITE_PERL}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
BUILD_DEPENDS= ${RUN_DEPENDS}
diff --git a/textproc/p5-podlators/pkg-comment b/textproc/p5-podlators/pkg-comment
deleted file mode 100644
index df4afe8e935f..000000000000
--- a/textproc/p5-podlators/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules to convert and parse POD (Plain Old Documentation)
diff --git a/textproc/py-4suite/Makefile b/textproc/py-4suite/Makefile
index 62b1df93b16e..ba97ffc23ec0 100644
--- a/textproc/py-4suite/Makefile
+++ b/textproc/py-4suite/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= 4Suite-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A collection of Python tools for XML processing and object database management
BUILD_DEPENDS= ${PYXML}
RUN_DEPENDS= ${PYXML}
diff --git a/textproc/py-4suite/pkg-comment b/textproc/py-4suite/pkg-comment
deleted file mode 100644
index 419a2157ecea..000000000000
--- a/textproc/py-4suite/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of Python tools for XML processing and object database management
diff --git a/textproc/py-csv/Makefile b/textproc/py-csv/Makefile
index 8c1b6d581932..3761bb9285eb 100644
--- a/textproc/py-csv/Makefile
+++ b/textproc/py-csv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://object-craft.com.au/projects/csv/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A Python module to parse or write comma-separated value (CSV) files
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-csv/pkg-comment b/textproc/py-csv/pkg-comment
deleted file mode 100644
index f830ebe912e1..000000000000
--- a/textproc/py-csv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python module to parse or write comma-separated value (CSV) files
diff --git a/textproc/py-dsv/Makefile b/textproc/py-dsv/Makefile
index c33678cf546f..b0b694c52ce3 100644
--- a/textproc/py-dsv/Makefile
+++ b/textproc/py-dsv/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME:U}-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A Python module to parse or write delimeter-separated (e.g. CSV) files
.if defined(WITH_GUI)
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/wxPython/__init__.py:${PORTSDIR}/x11-toolkits/py-wxPython
diff --git a/textproc/py-dsv/pkg-comment b/textproc/py-dsv/pkg-comment
deleted file mode 100644
index 548b97073e58..000000000000
--- a/textproc/py-dsv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python module to parse or write delimeter-separated (e.g. CSV) files
diff --git a/textproc/py-martel/Makefile b/textproc/py-martel/Makefile
index c204a8392ef9..2c0b13a25f74 100644
--- a/textproc/py-martel/Makefile
+++ b/textproc/py-martel/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= biopython-${BIOPYTHON_VERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A parser generator for regular languages, written in Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/TextTools/__init__.py:${PORTSDIR}/lang/py-mx-base
diff --git a/textproc/py-martel/pkg-comment b/textproc/py-martel/pkg-comment
deleted file mode 100644
index fefc95acc10d..000000000000
--- a/textproc/py-martel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A parser generator for regular languages, written in Python
diff --git a/textproc/py-sgrep/Makefile b/textproc/py-sgrep/Makefile
index eb593b8391c1..a2836dcab3bc 100644
--- a/textproc/py-sgrep/Makefile
+++ b/textproc/py-sgrep/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= pysgrep-${PORTVERSION}
MAINTAINER= ijliao@freebsd.org
+COMMENT= Python wrappers for Sgrep
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-sgrep/pkg-comment b/textproc/py-sgrep/pkg-comment
deleted file mode 100644
index 8fac595b1b68..000000000000
--- a/textproc/py-sgrep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python wrappers for Sgrep
diff --git a/textproc/py-trex/Makefile b/textproc/py-trex/Makefile
index 99e8a570a57c..ace3867cd225 100644
--- a/textproc/py-trex/Makefile
+++ b/textproc/py-trex/Makefile
@@ -16,6 +16,7 @@ DISTNAME= pytrex-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Python implementation of Tree Regular Expressions for XML (TREX)
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyexpat.so:${PORTSDIR}/textproc/py-expat
diff --git a/textproc/py-trex/pkg-comment b/textproc/py-trex/pkg-comment
deleted file mode 100644
index 0819ad6a99b3..000000000000
--- a/textproc/py-trex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python implementation of Tree Regular Expressions for XML (TREX)
diff --git a/textproc/py-xml/Makefile b/textproc/py-xml/Makefile
index 59c37a2d4b6c..24e0170d4473 100644
--- a/textproc/py-xml/Makefile
+++ b/textproc/py-xml/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyXML-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= The Python XML package, including parser, SAX, DOM, and Expat
USE_PYTHON= yes
USE_PYDISTUTILS= yes
diff --git a/textproc/py-xml/pkg-comment b/textproc/py-xml/pkg-comment
deleted file mode 100644
index 971f1e7c864f..000000000000
--- a/textproc/py-xml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Python XML package, including parser, SAX, DOM, and Expat
diff --git a/textproc/replaceit/Makefile b/textproc/replaceit/Makefile
index ffad6134cb78..d5fc7fb3b628 100644
--- a/textproc/replaceit/Makefile
+++ b/textproc/replaceit/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://pldaniels.com/replaceit/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A light replacement to the combination of sed/awk/grep/head/tail
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/replaceit ${PREFIX}/bin
diff --git a/textproc/replaceit/pkg-comment b/textproc/replaceit/pkg-comment
deleted file mode 100644
index 7bad6430483a..000000000000
--- a/textproc/replaceit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A light replacement to the combination of sed/awk/grep/head/tail
diff --git a/textproc/rman/Makefile b/textproc/rman/Makefile
index 3c3b65a93ae8..6fd0ad9e54ad 100644
--- a/textproc/rman/Makefile
+++ b/textproc/rman/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://polyglot.sourceforge.net/pub/polyglotman/
MAINTAINER= tg@FreeBSD.org
+COMMENT= Reverse compile man pages from formatted form
MAN1= rman.1
diff --git a/textproc/rman/pkg-comment b/textproc/rman/pkg-comment
deleted file mode 100644
index 9861e817be5a..000000000000
--- a/textproc/rman/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Reverse compile man pages from formatted form
diff --git a/textproc/rtfreader/Makefile b/textproc/rtfreader/Makefile
index 7c501d154b6c..98f7a071d00f 100644
--- a/textproc/rtfreader/Makefile
+++ b/textproc/rtfreader/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.fiction.net/blong/programs/
DISTNAME= ms-rtf
MAINTAINER= jim@FreeBSD.org
+COMMENT= A portable application/ms-rtf parser
ALL_TARGET= rtfreader
diff --git a/textproc/rtfreader/pkg-comment b/textproc/rtfreader/pkg-comment
deleted file mode 100644
index f40f4834be81..000000000000
--- a/textproc/rtfreader/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable application/ms-rtf parser
diff --git a/textproc/ruby-libxml/Makefile b/textproc/ruby-libxml/Makefile
index a7c3a240b168..02c6268bd3af 100644
--- a/textproc/ruby-libxml/Makefile
+++ b/textproc/ruby-libxml/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= A friendly API to libxml for Ruby
BUILD_DEPENDS= ${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/textproc/ruby-libxml/pkg-comment b/textproc/ruby-libxml/pkg-comment
deleted file mode 100644
index 2816e2b30f88..000000000000
--- a/textproc/ruby-libxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A friendly API to libxml for Ruby
diff --git a/textproc/ruby-libxslt/Makefile b/textproc/ruby-libxslt/Makefile
index b953f3bf578f..cefdc9879a8e 100644
--- a/textproc/ruby-libxslt/Makefile
+++ b/textproc/ruby-libxslt/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= A developer friendly libxslt binding for Ruby
BUILD_DEPENDS= ${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2 \
${LOCALBASE}/bin/xslt-config:${PORTSDIR}/textproc/libxslt \
diff --git a/textproc/ruby-libxslt/pkg-comment b/textproc/ruby-libxslt/pkg-comment
deleted file mode 100644
index 821939a6e886..000000000000
--- a/textproc/ruby-libxslt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A developer friendly libxslt binding for Ruby
diff --git a/textproc/rxp/Makefile b/textproc/rxp/Makefile
index eb9759a87735..34e14e16365c 100644
--- a/textproc/rxp/Makefile
+++ b/textproc/rxp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cogsci.ed.ac.uk/pub/richard/
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A validating XML parser written in C
MAN1= rxp.1
diff --git a/textproc/rxp/pkg-comment b/textproc/rxp/pkg-comment
deleted file mode 100644
index e33807f0c5a3..000000000000
--- a/textproc/rxp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A validating XML parser written in C
diff --git a/textproc/sarep/Makefile b/textproc/sarep/Makefile
index 4f99b80aec4e..5ad93d2fcadf 100644
--- a/textproc/sarep/Makefile
+++ b/textproc/sarep/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://tarp.worldserve.net/software/
EXTRACT_SUFX=
MAINTAINER= ache@FreeBSD.org
+COMMENT= Command-line search and replace tool; written in Perl; handles regexps
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Text/CSV_XS.pm:${PORTSDIR}/textproc/p5-Text-CSV_XS
diff --git a/textproc/sarep/pkg-comment b/textproc/sarep/pkg-comment
deleted file mode 100644
index 4ce6479441d4..000000000000
--- a/textproc/sarep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command-line search and replace tool; written in Perl; handles regexps
diff --git a/textproc/scr2txt/Makefile b/textproc/scr2txt/Makefile
index 69e717d838be..4ac0e42c699e 100644
--- a/textproc/scr2txt/Makefile
+++ b/textproc/scr2txt/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= nik
NO_WRKSUBDIR= yes
MAINTAINER= nik@freebsd.org
+COMMENT= Converts the output of "vidcontrol -p" to text
MAN1= scr2txt.1
MANCOMPRESSED= yes
diff --git a/textproc/scr2txt/pkg-comment b/textproc/scr2txt/pkg-comment
deleted file mode 100644
index f12890689da8..000000000000
--- a/textproc/scr2txt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts the output of "vidcontrol -p" to text
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index defca8756c66..f93bce4732ac 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.3
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An Open Document Cataloging Project
LIB_DEPENDS= xslt.1:${PORTSDIR}/textproc/libxslt \
intl.4:${PORTSDIR}/devel/gettext
diff --git a/textproc/scrollkeeper/pkg-comment b/textproc/scrollkeeper/pkg-comment
deleted file mode 100644
index 0fb70986065c..000000000000
--- a/textproc/scrollkeeper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Open Document Cataloging Project
diff --git a/textproc/sdocbook-xml/Makefile b/textproc/sdocbook-xml/Makefile
index 78a35b3740ff..3e87cf5d9d6f 100644
--- a/textproc/sdocbook-xml/Makefile
+++ b/textproc/sdocbook-xml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.oasis-open.org/docbook/xml/simple/4.1.2.5/
DISTNAME= simple${PORTVERSION:S/.//g}
MAINTAINER= des@FreeBSD.org
+COMMENT= "Simplified" DocBook XML DTD
RUN_DEPENDS= ${MKCATALOG}:${PORTSDIR}/textproc/mkcatalog
diff --git a/textproc/sdocbook-xml/pkg-comment b/textproc/sdocbook-xml/pkg-comment
deleted file mode 100644
index fb41d0f77c9e..000000000000
--- a/textproc/sdocbook-xml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-"Simplified" DocBook XML DTD
diff --git a/textproc/sed_inplace/Makefile b/textproc/sed_inplace/Makefile
index 0ef2d57013c2..ecfe29ad231e 100644
--- a/textproc/sed_inplace/Makefile
+++ b/textproc/sed_inplace/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= #
DISTFILES= #
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A modified version of the sed(1) which can do in-place editing of files
NO_WRKSUBDIR= yes
diff --git a/textproc/sed_inplace/pkg-comment b/textproc/sed_inplace/pkg-comment
deleted file mode 100644
index e372e0e76c04..000000000000
--- a/textproc/sed_inplace/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A modified version of the sed(1) which can do in-place editing of files
diff --git a/textproc/sgrep/Makefile b/textproc/sgrep/Makefile
index 9e9899a60fe5..b09cd4233c36 100644
--- a/textproc/sgrep/Makefile
+++ b/textproc/sgrep/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A `grep' for structured text like SGML and HTML
MAN1= sgrep.1
diff --git a/textproc/sgrep/pkg-comment b/textproc/sgrep/pkg-comment
deleted file mode 100644
index aba672ded677..000000000000
--- a/textproc/sgrep/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A `grep' for structured text like SGML and HTML
diff --git a/textproc/sgrep2/Makefile b/textproc/sgrep2/Makefile
index 9e9899a60fe5..b09cd4233c36 100644
--- a/textproc/sgrep2/Makefile
+++ b/textproc/sgrep2/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.cs.helsinki.fi/pub/Software/Local/Sgrep/
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A `grep' for structured text like SGML and HTML
MAN1= sgrep.1
diff --git a/textproc/sgrep2/pkg-comment b/textproc/sgrep2/pkg-comment
deleted file mode 100644
index aba672ded677..000000000000
--- a/textproc/sgrep2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A `grep' for structured text like SGML and HTML
diff --git a/textproc/source-highlight/Makefile b/textproc/source-highlight/Makefile
index f661c7540ac6..b2a41b87b11e 100644
--- a/textproc/source-highlight/Makefile
+++ b/textproc/source-highlight/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= source-highlight
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= C/C++ and Java sources to HTML converter
GNU_CONFIGURE= yes
.if defined(NOPORTDOCS)
diff --git a/textproc/source-highlight/pkg-comment b/textproc/source-highlight/pkg-comment
deleted file mode 100644
index d785f239da0e..000000000000
--- a/textproc/source-highlight/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C/C++ and Java sources to HTML converter
diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile
index e2f906b095b8..219074e3ce46 100644
--- a/textproc/sp/Makefile
+++ b/textproc/sp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/sp/
MAINTAINER= chuckr@FreeBSD.org
+COMMENT= An object-oriented toolkit for SGML parsing and entity management
USE_SUBMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/textproc/sp/pkg-comment b/textproc/sp/pkg-comment
deleted file mode 100644
index 7e732e24ecad..000000000000
--- a/textproc/sp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-oriented toolkit for SGML parsing and entity management
diff --git a/textproc/tclExpat/Makefile b/textproc/tclExpat/Makefile
index 5ceef9f244ad..761660d86c65 100644
--- a/textproc/tclExpat/Makefile
+++ b/textproc/tclExpat/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= textproc tcl83
MASTER_SITES= http://www.zveno.com/in-tclxml/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= The TCL interface to Expat library
LIB_DEPENDS= tcl${TCL_DVER}:${PORTSDIR}/lang/tcl${TCL_DVER} \
expat.4:${PORTSDIR}/textproc/expat2
diff --git a/textproc/tclExpat/pkg-comment b/textproc/tclExpat/pkg-comment
deleted file mode 100644
index 0082b0c532ab..000000000000
--- a/textproc/tclExpat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The TCL interface to Expat library
diff --git a/textproc/tkdiff/Makefile b/textproc/tkdiff/Makefile
index 470c033aaf12..705c26426a2b 100644
--- a/textproc/tkdiff/Makefile
+++ b/textproc/tkdiff/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc tk83
MASTER_SITES= http://people.freebsd.org/~kevlo/
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= A Tk frontend for diff(1)
RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83
diff --git a/textproc/tkdiff/pkg-comment b/textproc/tkdiff/pkg-comment
deleted file mode 100644
index 4045c12c15d4..000000000000
--- a/textproc/tkdiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Tk frontend for diff(1)
diff --git a/textproc/tnef2txt/Makefile b/textproc/tnef2txt/Makefile
index b73b4d862481..4f1e38f31954 100644
--- a/textproc/tnef2txt/Makefile
+++ b/textproc/tnef2txt/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc converters
MASTER_SITES= http://www.fiction.net/blong/programs/tnef2txt/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A portable application/ms-tnef parser
ALL_TARGET= tnef2txt
diff --git a/textproc/tnef2txt/pkg-comment b/textproc/tnef2txt/pkg-comment
deleted file mode 100644
index 9ec9ddfaaeaa..000000000000
--- a/textproc/tnef2txt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable application/ms-tnef parser
diff --git a/textproc/txt2tags/Makefile b/textproc/txt2tags/Makefile
index a13d660469be..f7610bbbae35 100644
--- a/textproc/txt2tags/Makefile
+++ b/textproc/txt2tags/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://txt2tags.sourceforge.net/src/
EXTRACT_SUFX= .tgz
MAINTAINER= alane@freebsd.org
+COMMENT= Utility to turn simply formatted text into markup (e.g., HTML)
NO_BUILD= yes
USE_PYTHON= yes
diff --git a/textproc/txt2tags/pkg-comment b/textproc/txt2tags/pkg-comment
deleted file mode 100644
index 1d7d293aa5e6..000000000000
--- a/textproc/txt2tags/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to turn simply formatted text into markup (e.g., HTML)
diff --git a/textproc/ua-ispell/Makefile b/textproc/ua-ispell/Makefile
index 701d21e49820..8147b0c6af48 100644
--- a/textproc/ua-ispell/Makefile
+++ b/textproc/ua-ispell/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ispell-uk
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Ukrainian (KOI8-U) dictionary for ISPELL
BUILD_DEPENDS= buildhash:${PORTSDIR}/textproc/ispell
diff --git a/textproc/ua-ispell/pkg-comment b/textproc/ua-ispell/pkg-comment
deleted file mode 100644
index dae7f93efc06..000000000000
--- a/textproc/ua-ispell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ukrainian (KOI8-U) dictionary for ISPELL
diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile
index 4a2151c8356d..8a5df03da7a4 100644
--- a/textproc/urlview/Makefile
+++ b/textproc/urlview/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= ftp://ftp.mutt.org/mutt/contrib/ \
#PATCHFILES= urlview.diff
MAINTAINER= obrien@FreeBSD.org
+COMMENT= URL extractor/launcher
USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
diff --git a/textproc/urlview/pkg-comment b/textproc/urlview/pkg-comment
deleted file mode 100644
index 7db44067ba73..000000000000
--- a/textproc/urlview/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-URL extractor/launcher
diff --git a/textproc/word2x/Makefile b/textproc/word2x/Makefile
index acb2d22e9051..f71f0679a69f 100644
--- a/textproc/word2x/Makefile
+++ b/textproc/word2x/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= textproc
MASTER_SITES= http://word2x.alcom.co.uk/download/
MAINTAINER= billf@FreeBSD.org
+COMMENT= Converter from MS Word to text, HTML or LaTeX
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/textproc/word2x/pkg-comment b/textproc/word2x/pkg-comment
deleted file mode 100644
index 665901e7251b..000000000000
--- a/textproc/word2x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converter from MS Word to text, HTML or LaTeX
diff --git a/textproc/wordnet/Makefile b/textproc/wordnet/Makefile
index 3abcc5954733..430ebabf06bb 100644
--- a/textproc/wordnet/Makefile
+++ b/textproc/wordnet/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.cogsci.princeton.edu/pub/wordnet/${PORTVERSION}/ \
ftp://ftp.ims.uni-stuttgart.de/pub/WordNet/${PORTVERSION}/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Dictionaries and thesauri with devel. libraries (C, TCL) and browsers
LIB_DEPENDS= tk${TCL_VER}.1:${PORTSDIR}/x11-toolkits/tk${TCL_VER}
diff --git a/textproc/wordnet/pkg-comment b/textproc/wordnet/pkg-comment
deleted file mode 100644
index 510639ac2a5c..000000000000
--- a/textproc/wordnet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dictionaries and thesauri with devel. libraries (C, TCL) and browsers
diff --git a/textproc/xalan-j/Makefile b/textproc/xalan-j/Makefile
index 744104bb5d9b..d397d2bcf2e1 100644
--- a/textproc/xalan-j/Makefile
+++ b/textproc/xalan-j/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://xml.apache.org/dist/${PORTNAME}/
DISTNAME= ${PORTNAME}_${PORTVERSION:S/./_/g}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Apache XSLT processor for transforming XML documents
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/textproc/xalan-j/pkg-comment b/textproc/xalan-j/pkg-comment
deleted file mode 100644
index ba27758f8b06..000000000000
--- a/textproc/xalan-j/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache XSLT processor for transforming XML documents
diff --git a/textproc/xerces-j/Makefile b/textproc/xerces-j/Makefile
index c8d1c49d7eb1..fc33df4d9438 100644
--- a/textproc/xerces-j/Makefile
+++ b/textproc/xerces-j/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://xml.apache.org/dist/xerces-j/old_xerces2/
DISTNAME= Xerces-J-src.${PORTVERSION}
MAINTAINER= kevlo@FreeBSD.org
+COMMENT= XML parser for Java
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/textproc/xerces-j/pkg-comment b/textproc/xerces-j/pkg-comment
deleted file mode 100644
index 8bc8117136d4..000000000000
--- a/textproc/xerces-j/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XML parser for Java
diff --git a/textproc/xincluder/Makefile b/textproc/xincluder/Makefile
index 717e50a9d11a..6d083de14cf5 100644
--- a/textproc/xincluder/Makefile
+++ b/textproc/xincluder/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.ibiblio.org/pub/languages/java/javafaq/
DISTNAME= ${PORTNAME}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Java-based XInclude processors
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/textproc/xincluder/pkg-comment b/textproc/xincluder/pkg-comment
deleted file mode 100644
index 27bea1838709..000000000000
--- a/textproc/xincluder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Java-based XInclude processors
diff --git a/textproc/xlhtml/Makefile b/textproc/xlhtml/Makefile
index dec5b9d41a15..d647316a43d3 100644
--- a/textproc/xlhtml/Makefile
+++ b/textproc/xlhtml/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Utilities converting Excel and PowerPoint files to HTML and text
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/textproc/xlhtml/pkg-comment b/textproc/xlhtml/pkg-comment
deleted file mode 100644
index 4ec92e51affe..000000000000
--- a/textproc/xlhtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utilities converting Excel and PowerPoint files to HTML and text
diff --git a/textproc/xls2xml/Makefile b/textproc/xls2xml/Makefile
index 6e031ecd18d8..70c4bcf53814 100644
--- a/textproc/xls2xml/Makefile
+++ b/textproc/xls2xml/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= sobomax
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A utility for converting MS Excel files to XML
LIB_DEPENDS= cole.2:${PORTSDIR}/textproc/cole \
xml.5:${PORTSDIR}/textproc/libxml
diff --git a/textproc/xls2xml/pkg-comment b/textproc/xls2xml/pkg-comment
deleted file mode 100644
index d8242480f35e..000000000000
--- a/textproc/xls2xml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility for converting MS Excel files to XML
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index c8b73b5b917c..371b39f01943 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Xml internationalization support for GNOME, and others
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/textproc/xml-i18n-tools/pkg-comment b/textproc/xml-i18n-tools/pkg-comment
deleted file mode 100644
index e03e503086c2..000000000000
--- a/textproc/xml-i18n-tools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Xml internationalization support for GNOME, and others
diff --git a/textproc/xmlenc/Makefile b/textproc/xmlenc/Makefile
index 5940cd6d07fa..06fa923252df 100644
--- a/textproc/xmlenc/Makefile
+++ b/textproc/xmlenc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= xmlenc
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Light-weight XML encoding library for Java
BUILD_DEPENDS= ${ANT}:${PORTSDIR}/devel/jakarta-ant
diff --git a/textproc/xmlenc/pkg-comment b/textproc/xmlenc/pkg-comment
deleted file mode 100644
index 02da97e3af23..000000000000
--- a/textproc/xmlenc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Light-weight XML encoding library for Java
diff --git a/textproc/xsl-docbook-modular/Makefile b/textproc/xsl-docbook-modular/Makefile
index 519d51c37766..c9eea6b075a5 100644
--- a/textproc/xsl-docbook-modular/Makefile
+++ b/textproc/xsl-docbook-modular/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX= .zip
BROKEN= use docbook-xsl instead
MAINTAINER= kiri@FreeBSD.org
+COMMENT= XSL stylesheets for the DocBook DTD by Norman Walsh
RUN_DEPENDS= ${LOCALBASE}/share/xml/docbook/readme.txt:${PORTSDIR}/textproc/docbook-xml \
${LOCALBASE}/share/xml/docbook/sdocbook/test.xml:${PORTSDIR}/textproc/sdocbook-xml \
diff --git a/textproc/xsl-docbook-modular/pkg-comment b/textproc/xsl-docbook-modular/pkg-comment
deleted file mode 100644
index e083e56e8b17..000000000000
--- a/textproc/xsl-docbook-modular/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XSL stylesheets for the DocBook DTD by Norman Walsh
diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile
index 93be114551ca..fbf056387958 100644
--- a/textproc/xxdiff/Makefile
+++ b/textproc/xxdiff/Makefile
@@ -18,6 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
.endif
MAINTAINER= petef@FreeBSD.org
+COMMENT= QT interface to view/merge differences between 2 or 3 files
BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake
diff --git a/textproc/xxdiff/pkg-comment b/textproc/xxdiff/pkg-comment
deleted file mode 100644
index 14be8dc8a4fa..000000000000
--- a/textproc/xxdiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QT interface to view/merge differences between 2 or 3 files
diff --git a/textproc/y2l/Makefile b/textproc/y2l/Makefile
index 5939e2bf6c26..f3371e88f04a 100644
--- a/textproc/y2l/Makefile
+++ b/textproc/y2l/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= Yacc-to-Latex pretty printer/convertor
NO_BUILD= yes
diff --git a/textproc/y2l/pkg-comment b/textproc/y2l/pkg-comment
deleted file mode 100644
index a4a2e4bb78ab..000000000000
--- a/textproc/y2l/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yacc-to-Latex pretty printer/convertor
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 4072aac18b67..c9de8b8dbbb0 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.sco.com/skunkware/src/textproc/ \
ftp://ftp.sunet.se/pub3/vendor/sco/skunkware/src/textproc/
MAINTAINER= dburr@FreeBSD.org
+COMMENT= An easy to use but powerful document formatting/preparation language
BUILD_DEPENDS= latex:${PORTSDIR}/print/latex \
dvips:${PORTSDIR}/print/dvips
diff --git a/textproc/yodl/pkg-comment b/textproc/yodl/pkg-comment
deleted file mode 100644
index 1443e3586932..000000000000
--- a/textproc/yodl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An easy to use but powerful document formatting/preparation language
diff --git a/ukrainian/ispell/Makefile b/ukrainian/ispell/Makefile
index 701d21e49820..8147b0c6af48 100644
--- a/ukrainian/ispell/Makefile
+++ b/ukrainian/ispell/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ispell-uk
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Ukrainian (KOI8-U) dictionary for ISPELL
BUILD_DEPENDS= buildhash:${PORTSDIR}/textproc/ispell
diff --git a/ukrainian/ispell/pkg-comment b/ukrainian/ispell/pkg-comment
deleted file mode 100644
index dae7f93efc06..000000000000
--- a/ukrainian/ispell/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ukrainian (KOI8-U) dictionary for ISPELL
diff --git a/ukrainian/kde3-i18n/Makefile b/ukrainian/kde3-i18n/Makefile
index 0a6c1c31502d..a3f7d31dfca3 100644
--- a/ukrainian/kde3-i18n/Makefile
+++ b/ukrainian/kde3-i18n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= uk-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/ukrainian/kde3-i18n/pkg-comment b/ukrainian/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/ukrainian/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/ukrainian/kde4-l10n/Makefile b/ukrainian/kde4-l10n/Makefile
index 0a6c1c31502d..a3f7d31dfca3 100644
--- a/ukrainian/kde4-l10n/Makefile
+++ b/ukrainian/kde4-l10n/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= uk-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/ukrainian/kde4-l10n/pkg-comment b/ukrainian/kde4-l10n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/ukrainian/kde4-l10n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/ukrainian/monacofonts/Makefile b/ukrainian/monacofonts/Makefile
index ef10ab79b463..051ec482bd98 100644
--- a/ukrainian/monacofonts/Makefile
+++ b/ukrainian/monacofonts/Makefile
@@ -14,6 +14,7 @@ PKGNAMESUFFIX= -x11
DISTNAME= ${PORTNAME}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= A collection of 5 "fixed" fonts for X11 from www.brama.com
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86
diff --git a/ukrainian/monacofonts/pkg-comment b/ukrainian/monacofonts/pkg-comment
deleted file mode 100644
index 8744ccd03437..000000000000
--- a/ukrainian/monacofonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of 5 "fixed" fonts for X11 from www.brama.com
diff --git a/vietnamese/kde3-i18n/Makefile b/vietnamese/kde3-i18n/Makefile
index c12d48e30da9..0ea237456a7c 100644
--- a/vietnamese/kde3-i18n/Makefile
+++ b/vietnamese/kde3-i18n/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= vi-
DIST_SUBDIR= KDE
MAINTAINER?= kde@FreeBSD.org
+COMMENT= Localized messages and documentation for KDE3
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/vietnamese/kde3-i18n/pkg-comment b/vietnamese/kde3-i18n/pkg-comment
deleted file mode 100644
index 3b4fe1543e1b..000000000000
--- a/vietnamese/kde3-i18n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Localized messages and documentation for KDE3
diff --git a/vietnamese/libviet/Makefile b/vietnamese/libviet/Makefile
index 2c8180ca9add..4110d6f19a8a 100644
--- a/vietnamese/libviet/Makefile
+++ b/vietnamese/libviet/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= obrien
MAINTAINER= obrien@FreeBSD.org
+COMMENT= VIQR<->VISCII conversion and VISCII ctype-like routines
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/lib
diff --git a/vietnamese/libviet/pkg-comment b/vietnamese/libviet/pkg-comment
deleted file mode 100644
index 74c336b48d0c..000000000000
--- a/vietnamese/libviet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-VIQR<->VISCII conversion and VISCII ctype-like routines
diff --git a/vietnamese/unicode-uhoai/Makefile b/vietnamese/unicode-uhoai/Makefile
index 269113cfd58c..7372e0e7965b 100644
--- a/vietnamese/unicode-uhoai/Makefile
+++ b/vietnamese/unicode-uhoai/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.geocities.com/~starkville/mozilla/
DISTNAME= uhoaiw21
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Unicode TrueType Font with UHoai Vietnamese encoding
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/vietnamese/unicode-uhoai/pkg-comment b/vietnamese/unicode-uhoai/pkg-comment
deleted file mode 100644
index ff41e09c1301..000000000000
--- a/vietnamese/unicode-uhoai/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Unicode TrueType Font with UHoai Vietnamese encoding
diff --git a/vietnamese/vi2vn/Makefile b/vietnamese/vi2vn/Makefile
index 5c4ce7e45218..0a9e0b910562 100644
--- a/vietnamese/vi2vn/Makefile
+++ b/vietnamese/vi2vn/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1.src
EXTRACT_SUFX= .rpm
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Perl script to convert VIQR encoding to other Vietnamese encodings.
PORTCOMMENT= Converts Vietnamese VIQR text into troff format
diff --git a/vietnamese/vi2vn/pkg-comment b/vietnamese/vi2vn/pkg-comment
deleted file mode 100644
index 4391e7623844..000000000000
--- a/vietnamese/vi2vn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl script to convert VIQR encoding to other Vietnamese encodings.
diff --git a/vietnamese/vis2u/Makefile b/vietnamese/vis2u/Makefile
index be4a7e2dca6e..931ce418e48d 100644
--- a/vietnamese/vis2u/Makefile
+++ b/vietnamese/vis2u/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.geocities.com/~starkville/mozilla/
DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
MAINTAINER= obrien@FreeBSD.org
+COMMENT= VISCII->Unicode conversion
USE_ZIP= yes
NO_WRKSUBDIR= yes
diff --git a/vietnamese/vis2u/pkg-comment b/vietnamese/vis2u/pkg-comment
deleted file mode 100644
index 7f75a2b567d7..000000000000
--- a/vietnamese/vis2u/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-VISCII->Unicode conversion
diff --git a/vietnamese/vn7to8/Makefile b/vietnamese/vn7to8/Makefile
index 567c486079b0..4a4151fb9ea0 100644
--- a/vietnamese/vn7to8/Makefile
+++ b/vietnamese/vn7to8/Makefile
@@ -16,6 +16,7 @@ DISTNAME= vn7to8
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Converts between 7-bit Vietnamese VIQR and 8-bit VISCII formats
BUILD_DEPENDS= ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet
diff --git a/vietnamese/vn7to8/pkg-comment b/vietnamese/vn7to8/pkg-comment
deleted file mode 100644
index e8fada3baa56..000000000000
--- a/vietnamese/vn7to8/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts between 7-bit Vietnamese VIQR and 8-bit VISCII formats
diff --git a/vietnamese/vnconvert/Makefile b/vietnamese/vnconvert/Makefile
index 7aa9e04d2fb1..c71fa58ca5eb 100644
--- a/vietnamese/vnconvert/Makefile
+++ b/vietnamese/vnconvert/Makefile
@@ -15,6 +15,7 @@ DISTNAME= convert
EXTRACT_SUFX= .tar
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Converts Vietnamese text files between popular formats
NO_WRKSUBDIR= yes
MAKEFILE= makefile
diff --git a/vietnamese/vnconvert/pkg-comment b/vietnamese/vnconvert/pkg-comment
deleted file mode 100644
index 5ab0c980745d..000000000000
--- a/vietnamese/vnconvert/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts Vietnamese text files between popular formats
diff --git a/vietnamese/vnelvis/Makefile b/vietnamese/vnelvis/Makefile
index a91f1da557a3..928ba7b5cc39 100644
--- a/vietnamese/vnelvis/Makefile
+++ b/vietnamese/vnelvis/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= A vi clone that speaks Vietnamese
BUILD_DEPENDS= ${LOCALBASE}/lib/libviqr.a:${PORTSDIR}/vietnamese/libviet
diff --git a/vietnamese/vnelvis/pkg-comment b/vietnamese/vnelvis/pkg-comment
deleted file mode 100644
index a458de823d77..000000000000
--- a/vietnamese/vnelvis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A vi clone that speaks Vietnamese
diff --git a/vietnamese/vnless/Makefile b/vietnamese/vnless/Makefile
index bc34079a1f9d..824b28111b94 100644
--- a/vietnamese/vnless/Makefile
+++ b/vietnamese/vnless/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= A pager utility that speaks Vietnamese
ALL_TARGET= clobber all
MAN1= vnless.1 vnlesskey.1
diff --git a/vietnamese/vnless/pkg-comment b/vietnamese/vnless/pkg-comment
deleted file mode 100644
index 8cbaeccdb5ce..000000000000
--- a/vietnamese/vnless/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager utility that speaks Vietnamese
diff --git a/vietnamese/vnlpr/Makefile b/vietnamese/vnlpr/Makefile
index 55d07f959002..9b632b5f82f6 100644
--- a/vietnamese/vnlpr/Makefile
+++ b/vietnamese/vnlpr/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Shell script and set of fonts to print Vietnamese text on PostScript printer
RUN_DEPENDS= vn7to8:${PORTSDIR}/vietnamese/vn7to8 \
vnpstext:${PORTSDIR}/vietnamese/vnpstext
diff --git a/vietnamese/vnlpr/pkg-comment b/vietnamese/vnlpr/pkg-comment
deleted file mode 100644
index eb6aca448927..000000000000
--- a/vietnamese/vnlpr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Shell script and set of fonts to print Vietnamese text on PostScript printer
diff --git a/vietnamese/vnpstext/Makefile b/vietnamese/vnpstext/Makefile
index caaafcee8eaa..04de7f759fb9 100644
--- a/vietnamese/vnpstext/Makefile
+++ b/vietnamese/vnpstext/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Converts 8-bit VISCII Vietnamese text into PostScript
CFLAGS+= -I../../include
MAN1= vnpstext.1
diff --git a/vietnamese/vnpstext/pkg-comment b/vietnamese/vnpstext/pkg-comment
deleted file mode 100644
index 12b645156eb3..000000000000
--- a/vietnamese/vnpstext/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts 8-bit VISCII Vietnamese text into PostScript
diff --git a/vietnamese/vnroff/Makefile b/vietnamese/vnroff/Makefile
index 0762e6948052..66c48b3429fe 100644
--- a/vietnamese/vnroff/Makefile
+++ b/vietnamese/vnroff/Makefile
@@ -14,6 +14,7 @@ DISTFILES= vnroff.c.Z vnroff.1.Z
DISTNAME= ${PORTNAME}-2.0
MAINTAINER= obrien@FreeBSD.org
+COMMENT= Converts Vietnamese VIQR text into troff format
NO_WRKSUBDIR= yes
MAN1= vnroff.1
diff --git a/vietnamese/vnroff/pkg-comment b/vietnamese/vnroff/pkg-comment
deleted file mode 100644
index ad9e0eaa3a05..000000000000
--- a/vietnamese/vnroff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Converts Vietnamese VIQR text into troff format
diff --git a/vietnamese/vnterm/Makefile b/vietnamese/vnterm/Makefile
index 60f383189060..821d52895b4a 100644
--- a/vietnamese/vnterm/Makefile
+++ b/vietnamese/vnterm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.x.org/pub/R6.5.1/tars/
DISTNAME= xorg-1
MAINTAINER= obrien@FreeBSD.org
+COMMENT= An xterm that speaks Vietnamese
USE_IMAKE= yes
diff --git a/vietnamese/vnterm/pkg-comment b/vietnamese/vnterm/pkg-comment
deleted file mode 100644
index e336ccb7bda0..000000000000
--- a/vietnamese/vnterm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An xterm that speaks Vietnamese
diff --git a/vietnamese/vntex/Makefile b/vietnamese/vntex/Makefile
index cdbe5ac6503e..bca87be11567 100644
--- a/vietnamese/vntex/Makefile
+++ b/vietnamese/vntex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.fi.muni.cz/~thanh/download/
DISTNAME= vntex
MAINTAINER= obrien@FreeBSD.org
+COMMENT= teTeX Vietnamese language + font support
# actually just need to make sure ${PREFIX}/share/texmf/tex/ exists
RUN_DEPENDS= virtex:${PORTSDIR}/print/teTeX
diff --git a/vietnamese/vntex/pkg-comment b/vietnamese/vntex/pkg-comment
deleted file mode 100644
index 80888be56b6b..000000000000
--- a/vietnamese/vntex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-teTeX Vietnamese language + font support
diff --git a/vietnamese/vnxfonts/Makefile b/vietnamese/vnxfonts/Makefile
index d043aeaca889..62aa2307c60d 100644
--- a/vietnamese/vnxfonts/Makefile
+++ b/vietnamese/vnxfonts/Makefile
@@ -17,6 +17,7 @@ DISTNAME= Xfonts
EXTRACT_SUFX= .tar.Z
MAINTAINER= obrien@FreeBSD.org
+COMMENT= X fonts for displaying Vietnamese
WRKSRC= ${WRKDIR}/fonts/X
USE_X_PREFIX= yes
diff --git a/vietnamese/vnxfonts/pkg-comment b/vietnamese/vnxfonts/pkg-comment
deleted file mode 100644
index 4287c1bd6664..000000000000
--- a/vietnamese/vnxfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X fonts for displaying Vietnamese
diff --git a/www/WebMagick/Makefile b/www/WebMagick/Makefile
index ac8c679039a9..a25ffeb0c781 100644
--- a/www/WebMagick/Makefile
+++ b/www/WebMagick/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= webmagick
DISTNAME= ${PORTNAME}-2.03pre3
MAINTAINER= ache@freebsd.org
+COMMENT= Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
LIB_DEPENDS= Magick.5:${PORTSDIR}/graphics/ImageMagick
diff --git a/www/WebMagick/pkg-comment b/www/WebMagick/pkg-comment
deleted file mode 100644
index 50e84a85d352..000000000000
--- a/www/WebMagick/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Image Web Generator - recursively build HTMLs, imagemaps, thumbnails
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 2d56a81fc45f..6a79ccc1d0c7 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://adzapper.sourceforge.net/ \
MASTER_SITE_SUBDIR=kris
MAINTAINER= kris@FreeBSD.org
+COMMENT= Filter out animated ad banners from web pages
WRKSRC= ${WRKDIR}/adzap
diff --git a/www/adzap/pkg-comment b/www/adzap/pkg-comment
deleted file mode 100644
index 13de7b07ee65..000000000000
--- a/www/adzap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Filter out animated ad banners from web pages
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index a8b05e6d8196..f163c61ce03b 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.crevola.com/about/current/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Display the contents of your Netscape cache
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/www/amyc/pkg-comment b/www/amyc/pkg-comment
deleted file mode 100644
index d496aa7a56a8..000000000000
--- a/www/amyc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Display the contents of your Netscape cache
diff --git a/www/analog/Makefile b/www/analog/Makefile
index 87304652aab9..cf66af445908 100644
--- a/www/analog/Makefile
+++ b/www/analog/Makefile
@@ -20,6 +20,7 @@ MASTER_SITES= http://www.analog.cx/ \
http://analog.tzone.it/
MAINTAINER= mharo@FreeBSD.org
+COMMENT= An extremely fast program for analysing WWW logfiles
LIB_DEPENDS= gd.2:${PORTSDIR}/graphics/gd \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/analog/pkg-comment b/www/analog/pkg-comment
deleted file mode 100644
index 51203e6ab31c..000000000000
--- a/www/analog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extremely fast program for analysing WWW logfiles
diff --git a/www/apache13+ipv6/Makefile b/www/apache13+ipv6/Makefile
index 96605ef36bfa..4036ef441321 100644
--- a/www/apache13+ipv6/Makefile
+++ b/www/apache13+ipv6/Makefile
@@ -30,6 +30,7 @@ PATCH_SITES= http://motoyuki.bsdclub.org/data/IPv6/
PATCHFILES= apache-1.3.27-v6-20021004.diff.gz
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= The extremely popular Apache http server. Very fast, very clean
USE_PERL5= yes
diff --git a/www/apache13+ipv6/pkg-comment b/www/apache13+ipv6/pkg-comment
deleted file mode 100644
index 0b2be74481cf..000000000000
--- a/www/apache13+ipv6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The extremely popular Apache http server. Very fast, very clean
diff --git a/www/apache13/Makefile b/www/apache13/Makefile
index 68d303f076b2..cef501223457 100644
--- a/www/apache13/Makefile
+++ b/www/apache13/Makefile
@@ -32,6 +32,7 @@ DISTNAME= apache_${PORTVERSION}
#PATCH_DIST_ARGS= -d ${WRKSRC}/src --forward --quiet -E ${PATCH_DIST_STRIP}
MAINTAINER= ache@freebsd.org
+COMMENT= The extremely popular Apache http server. Very fast, very clean
USE_PERL5= yes
diff --git a/www/apache13/pkg-comment b/www/apache13/pkg-comment
deleted file mode 100644
index 0b2be74481cf..000000000000
--- a/www/apache13/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The extremely popular Apache http server. Very fast, very clean
diff --git a/www/aria/Makefile b/www/aria/Makefile
index 3f09b02cad01..e6477d1a4657 100644
--- a/www/aria/Makefile
+++ b/www/aria/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://rabien.virtualave.net/linux/storage/sources/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.t/test/}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Yet another download tool
USE_BZIP2= yes
USE_GNOMENG= yes
diff --git a/www/aria/pkg-comment b/www/aria/pkg-comment
deleted file mode 100644
index fcfbe43e78e4..000000000000
--- a/www/aria/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another download tool
diff --git a/www/bk2site/Makefile b/www/bk2site/Makefile
index 4aa58830ac43..1db9548fe561 100644
--- a/www/bk2site/Makefile
+++ b/www/bk2site/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= clive@FreeBSD.org
+COMMENT= Transforms Netscape bookmarks into a Yahoo-like website
.include <bsd.port.pre.mk>
APXS= ${LOCALBASE}/sbin/apxs
diff --git a/www/bk2site/pkg-comment b/www/bk2site/pkg-comment
deleted file mode 100644
index 9774630af6cd..000000000000
--- a/www/bk2site/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transforms Netscape bookmarks into a Yahoo-like website
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 90277df65f67..e5cd33435d57 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= http://pkedu.fbt.eitn.wau.nl/~olivier/downloads/ \
http://bluefish.shellhung.org/downloads/
MAINTAINER= jim@FreeBSD.org
+COMMENT= HTML editor designed for the experienced web designer
RUN_DEPENDS= weblint:${PORTSDIR}/www/weblint
diff --git a/www/bluefish/pkg-comment b/www/bluefish/pkg-comment
deleted file mode 100644
index dffa2bcc760b..000000000000
--- a/www/bluefish/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTML editor designed for the experienced web designer
diff --git a/www/cgi-lib.pl/Makefile b/www/cgi-lib.pl/Makefile
index 87affeed3cbc..d151ee6eff72 100644
--- a/www/cgi-lib.pl/Makefile
+++ b/www/cgi-lib.pl/Makefile
@@ -14,6 +14,7 @@ DISTNAME= cgi-lib.pl-${PORTVERSION}
EXTRACT_SUFX= .gz
MAINTAINER= sada@FreeBSD.org
+COMMENT= De facto standard library for creating CGI in perl
USE_PERL5= YES
NO_BUILD= YES
diff --git a/www/cgi-lib.pl/pkg-comment b/www/cgi-lib.pl/pkg-comment
deleted file mode 100644
index 0486efcc0a17..000000000000
--- a/www/cgi-lib.pl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-De facto standard library for creating CGI in perl
diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
index 4d81295b97cf..ca442b7f786a 100644
--- a/www/cgiparse/Makefile
+++ b/www/cgiparse/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://resnet.uoregon.edu/~gurney_j/jmpc/dist/ \
http://www.funkthat.com/~jmg/
MAINTAINER= jmg@FreeBSD.org
+COMMENT= C library to parse CGI Forms
LIB_DEPENDS= mime.1:${PORTSDIR}/devel/mime:install
diff --git a/www/cgiparse/pkg-comment b/www/cgiparse/pkg-comment
deleted file mode 100644
index 5021cf1a9b69..000000000000
--- a/www/cgiparse/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C library to parse CGI Forms
diff --git a/www/cheetah/Makefile b/www/cheetah/Makefile
index 7d8711e2df8a..ed09f1e7ff59 100644
--- a/www/cheetah/Makefile
+++ b/www/cheetah/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= cheetah
MAINTAINER= nakai@FreeBSD.org
+COMMENT= GTK+ based light-weight web browser
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/cheetah/pkg-comment b/www/cheetah/pkg-comment
deleted file mode 100644
index 9331f7a212be..000000000000
--- a/www/cheetah/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ based light-weight web browser
diff --git a/www/crawl/Makefile b/www/crawl/Makefile
index 52b230d90df5..ac5e8a3b8e00 100644
--- a/www/crawl/Makefile
+++ b/www/crawl/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= http://www.monkey.org/~provos/
MAINTAINER= petef@FreeBSD.org
+COMMENT= A small, efficient web crawler with advanced features
BUILD_DEPENDS= ${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
LIB_DEPENDS= md5.1:${PORTSDIR}/www/libwww \
diff --git a/www/crawl/pkg-comment b/www/crawl/pkg-comment
deleted file mode 100644
index 16dd9e5120d0..000000000000
--- a/www/crawl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A small, efficient web crawler with advanced features
diff --git a/www/css-mode.el/Makefile b/www/css-mode.el/Makefile
index 619594c785ce..a06ca23f8467 100644
--- a/www/css-mode.el/Makefile
+++ b/www/css-mode.el/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.garshol.priv.no/download/software/css-mode/
DISTNAME= css-mode.el
MAINTAINER= shige@FreeBSD.org
+COMMENT= A CSS(Cascade Style Sheet) editing mode for Emacsen
EXTRACT_SUFX= # empty
DISTFILES= ${DISTNAME} doco.html
diff --git a/www/css-mode.el/pkg-comment b/www/css-mode.el/pkg-comment
deleted file mode 100644
index 84c15f385db9..000000000000
--- a/www/css-mode.el/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A CSS(Cascade Style Sheet) editing mode for Emacsen
diff --git a/www/demoroniser/Makefile b/www/demoroniser/Makefile
index dc724997edbf..4077494494b0 100644
--- a/www/demoroniser/Makefile
+++ b/www/demoroniser/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=jedgar
DISTNAME= ${PORTNAME}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= Correct moronic and gratuitously incompatible HTML from MS applications
USE_ZIP= yes
NO_BUILD= yes
diff --git a/www/demoroniser/pkg-comment b/www/demoroniser/pkg-comment
deleted file mode 100644
index 462433d2df82..000000000000
--- a/www/demoroniser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Correct moronic and gratuitously incompatible HTML from MS applications
diff --git a/www/djvuplugin/Makefile b/www/djvuplugin/Makefile
index b27a6da0e67d..ffaa2e7acd49 100644
--- a/www/djvuplugin/Makefile
+++ b/www/djvuplugin/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.djvu.com/products/plugin/unix/
DISTNAME= npdjvu-freebsd
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Netscape plugin that views AT&T DjVu images
RUN_DEPENDS= netscape:${PORTSDIR}/www/netscape47-communicator
diff --git a/www/djvuplugin/pkg-comment b/www/djvuplugin/pkg-comment
deleted file mode 100644
index c002ceac686f..000000000000
--- a/www/djvuplugin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape plugin that views AT&T DjVu images
diff --git a/www/encompass/Makefile b/www/encompass/Makefile
index 115ffde1a7a6..57bf098fc19a 100644
--- a/www/encompass/Makefile
+++ b/www/encompass/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://elysium.zoned.net/${PORTNAME}/ \
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A lightweight web browser for the Gnome Desktop Environment
LIB_DEPENDS= neon.23:${PORTSDIR}/www/neon
diff --git a/www/encompass/pkg-comment b/www/encompass/pkg-comment
deleted file mode 100644
index b756a1001afa..000000000000
--- a/www/encompass/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight web browser for the Gnome Desktop Environment
diff --git a/www/erwn/Makefile b/www/erwn/Makefile
index ffaa7406ce67..9beb6c6efa98 100644
--- a/www/erwn/Makefile
+++ b/www/erwn/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://lisas.de/erwin/legacy/
DISTNAME= erwin-${PORTVERSION}
MAINTAINER= jim@FreeBSD.org
+COMMENT= Simple (at the moment) html editor based on GTK+
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/www/erwn/pkg-comment b/www/erwn/pkg-comment
deleted file mode 100644
index b25b7e44386d..000000000000
--- a/www/erwn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple (at the moment) html editor based on GTK+
diff --git a/www/evg/Makefile b/www/evg/Makefile
index 729553c2133f..9b01fca067ec 100644
--- a/www/evg/Makefile
+++ b/www/evg/Makefile
@@ -14,6 +14,7 @@ DISTNAME= evg-1_3_1
EXTRACT_SUFX= _tar
MAINTAINER= demon@FreeBSD.org
+COMMENT= Create index pages in HTML for photo galleries
RUN_DEPENDS+= convert:${PORTSDIR}/graphics/ImageMagick
RUN_DEPENDS+= xv:${PORTSDIR}/graphics/xv
diff --git a/www/evg/pkg-comment b/www/evg/pkg-comment
deleted file mode 100644
index a2fcd28b2bb0..000000000000
--- a/www/evg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create index pages in HTML for photo galleries
diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 1af70fed78d9..8cbeb800316d 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.fastcgi.com/dist/
PKGNAMESUFFIX= -devkit
MAINTAINER= kbyanc@posi.net
+COMMENT= FastCGI Development Kit
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/www/fcgi/pkg-comment b/www/fcgi/pkg-comment
deleted file mode 100644
index eed2f56f047c..000000000000
--- a/www/fcgi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FastCGI Development Kit
diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox-devel/pkg-comment b/www/firefox-devel/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox-esr/pkg-comment b/www/firefox-esr/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox-esr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox/pkg-comment b/www/firefox/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox10/pkg-comment b/www/firefox10/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox15/pkg-comment b/www/firefox15/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox15/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox3-devel/pkg-comment b/www/firefox3-devel/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox3-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox35/pkg-comment b/www/firefox35/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox35/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/firefox36/pkg-comment b/www/firefox36/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/firefox36/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/flashpluginwrapper/Makefile b/www/flashpluginwrapper/Makefile
index 81e73b2b38a9..b51463e0535d 100644
--- a/www/flashpluginwrapper/Makefile
+++ b/www/flashpluginwrapper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= petef
MAINTAINER= nork@FreeBSD.org
+COMMENT= A wrapper allowing use of linux-flashplugin with native mozilla
RUN_DEPENDS= ${LOCALBASE}/lib/flash/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin
diff --git a/www/flashpluginwrapper/pkg-comment b/www/flashpluginwrapper/pkg-comment
deleted file mode 100644
index e90b8ebc66a9..000000000000
--- a/www/flashpluginwrapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A wrapper allowing use of linux-flashplugin with native mozilla
diff --git a/www/flock/Makefile b/www/flock/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/flock/pkg-comment b/www/flock/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/flock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 9e0f4e506a6b..59b80ace0a84 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME Web browser based on gecko (the Mozilla rendering engine)
BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
diff --git a/www/galeon/pkg-comment b/www/galeon/pkg-comment
deleted file mode 100644
index df476157a81a..000000000000
--- a/www/galeon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME Web browser based on gecko (the Mozilla rendering engine)
diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index ad357712ed3b..6f6bbef8f7ef 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:S/2$//}
DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
BUILD_DEPENDS= ${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
diff --git a/www/galeon2/pkg-comment b/www/galeon2/pkg-comment
deleted file mode 100644
index e55ce3fdfb05..000000000000
--- a/www/galeon2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
diff --git a/www/glibwww/Makefile b/www/glibwww/Makefile
index c4acc5f143cb..d07c508584f3 100644
--- a/www/glibwww/Makefile
+++ b/www/glibwww/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/glibwww/0.2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A library for people wanting to use libwww with gtk/gnome
LIB_DEPENDS= wwwzip.1:${PORTSDIR}/www/libwww
diff --git a/www/glibwww/pkg-comment b/www/glibwww/pkg-comment
deleted file mode 100644
index 413218961c55..000000000000
--- a/www/glibwww/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A library for people wanting to use libwww with gtk/gnome
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 20a429650205..97f1b9682c09 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
diff --git a/www/gtkhtml/pkg-comment b/www/gtkhtml/pkg-comment
deleted file mode 100644
index 7dd0e4db6f0c..000000000000
--- a/www/gtkhtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight HTML rendering/printing/editing engine
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 20a429650205..97f1b9682c09 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
diff --git a/www/gtkhtml3/pkg-comment b/www/gtkhtml3/pkg-comment
deleted file mode 100644
index 7dd0e4db6f0c..000000000000
--- a/www/gtkhtml3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight HTML rendering/printing/editing engine
diff --git a/www/gtkhtml38/Makefile b/www/gtkhtml38/Makefile
index 20a429650205..97f1b9682c09 100644
--- a/www/gtkhtml38/Makefile
+++ b/www/gtkhtml38/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Lightweight HTML rendering/printing/editing engine
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
diff --git a/www/gtkhtml38/pkg-comment b/www/gtkhtml38/pkg-comment
deleted file mode 100644
index 7dd0e4db6f0c..000000000000
--- a/www/gtkhtml38/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight HTML rendering/printing/editing engine
diff --git a/www/htdump/Makefile b/www/htdump/Makefile
index 4bb2047d4f63..efbb8588e030 100644
--- a/www/htdump/Makefile
+++ b/www/htdump/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://arak.cs.hro.nl/~ren/linux/htdump/bin/
MAINTAINER= mux@FreeBSD.org
+COMMENT= A tool to retrieve WWW data
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/www/htdump/pkg-comment b/www/htdump/pkg-comment
deleted file mode 100644
index e97f08069e1d..000000000000
--- a/www/htdump/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to retrieve WWW data
diff --git a/www/html2wml/Makefile b/www/html2wml/Makefile
index 11df22504e78..884e97759c8b 100644
--- a/www/html2wml/Makefile
+++ b/www/html2wml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://maddingue.free.fr/techie/download/Html2Wml/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p5//}-pre5
MAINTAINER= greid@FreeBSD.org
+COMMENT= A CGI that can do on-the-fly HTML to WML conversion
RUN_DEPENDS= ${SITE_PERL}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/Text/Template.pm:${PORTSDIR}/textproc/p5-Text-Template \
diff --git a/www/html2wml/pkg-comment b/www/html2wml/pkg-comment
deleted file mode 100644
index 7d115992c7c8..000000000000
--- a/www/html2wml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A CGI that can do on-the-fly HTML to WML conversion
diff --git a/www/htmlpp/Makefile b/www/htmlpp/Makefile
index a4eade57fabf..6bb1d4216488 100644
--- a/www/htmlpp/Makefile
+++ b/www/htmlpp/Makefile
@@ -13,6 +13,7 @@ DISTNAME= htmlp42a
EXTRACT_SUFX= .tgz
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A Perl script to allow easy creation of HTML from template files
USE_PERL5= YES
diff --git a/www/htmlpp/pkg-comment b/www/htmlpp/pkg-comment
deleted file mode 100644
index 298ba570b7ab..000000000000
--- a/www/htmlpp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Perl script to allow easy creation of HTML from template files
diff --git a/www/httptunnel/Makefile b/www/httptunnel/Makefile
index 1992ec0bbab6..7eb44eda1132 100644
--- a/www/httptunnel/Makefile
+++ b/www/httptunnel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.Awfulhak.org/httptunnel/ \
http://www.nocrew.org/software/httptunnel/
MAINTAINER= brian@FreeBSD.org
+COMMENT= Tunnel a tcp/ip connection through a http/tcp/ip connection
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --quiet
diff --git a/www/httptunnel/pkg-comment b/www/httptunnel/pkg-comment
deleted file mode 100644
index be1cfc5188ff..000000000000
--- a/www/httptunnel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tunnel a tcp/ip connection through a http/tcp/ip connection
diff --git a/www/httrack/Makefile b/www/httrack/Makefile
index 60f81c8f05b7..9413f5b0edf6 100644
--- a/www/httrack/Makefile
+++ b/www/httrack/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= dirk
DISTNAME= httrack-3.20-2
MAINTAINER= dirk@FreeBSD.org
+COMMENT= Easy-to-use offline browser utility and website copier
WRKSRC= ${WRKDIR}/httrack-3.20/src
USE_GMAKE= yes
diff --git a/www/httrack/pkg-comment b/www/httrack/pkg-comment
deleted file mode 100644
index 03c7088262d3..000000000000
--- a/www/httrack/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easy-to-use offline browser utility and website copier
diff --git a/www/hypermail/Makefile b/www/hypermail/Makefile
index bca15db01e90..95bb909e43e7 100644
--- a/www/hypermail/Makefile
+++ b/www/hypermail/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www mail
MASTER_SITES= http://isc.hypermail.org/dist/
MAINTAINER= petef@FreeBSD.org
+COMMENT= A program to generate a cross-referenced HTML mail archive
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm \
pcre.0:${PORTSDIR}/devel/pcre
diff --git a/www/hypermail/pkg-comment b/www/hypermail/pkg-comment
deleted file mode 100644
index eccc33cbb4e0..000000000000
--- a/www/hypermail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to generate a cross-referenced HTML mail archive
diff --git a/www/jakarta-jmeter/Makefile b/www/jakarta-jmeter/Makefile
index 5eccf254597e..98d185b95792 100644
--- a/www/jakarta-jmeter/Makefile
+++ b/www/jakarta-jmeter/Makefile
@@ -17,6 +17,7 @@ PKGNAMEPREFIX= jakarta-
DISTNAME= ApacheJMeter_${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Functional behaviour load and performance test application
USE_JAVA= 1.2+
NO_BUILD= yes
diff --git a/www/jakarta-jmeter/pkg-comment b/www/jakarta-jmeter/pkg-comment
deleted file mode 100644
index bea7cdb91463..000000000000
--- a/www/jakarta-jmeter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Functional behaviour load and performance test application
diff --git a/www/jakarta-tomcat3/Makefile b/www/jakarta-tomcat3/Makefile
index 84c93b765bd2..08aa854cf782 100644
--- a/www/jakarta-tomcat3/Makefile
+++ b/www/jakarta-tomcat3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat/release/v${PORTVER
MASTER_SITE_SUBDIR= znerd
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Open-source Java web server by Apache, stable 3.x branch
USE_JAVA= 1.2+
NO_BUILD= YES
diff --git a/www/jakarta-tomcat3/pkg-comment b/www/jakarta-tomcat3/pkg-comment
deleted file mode 100644
index 11581ba59563..000000000000
--- a/www/jakarta-tomcat3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open-source Java web server by Apache, stable 3.x branch
diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile
index f3f2b6595309..ea8aae5d34cf 100644
--- a/www/jakarta-tomcat4/Makefile
+++ b/www/jakarta-tomcat4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-${PORTVERSION:R}/r
MASTER_SITE_SUBDIR= znerd
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Open-source Java web server by Apache, stable 4.0.x branch
USE_JAVA= 1.2+
NO_BUILD= YES
diff --git a/www/jakarta-tomcat4/pkg-comment b/www/jakarta-tomcat4/pkg-comment
deleted file mode 100644
index 8cb3609565a4..000000000000
--- a/www/jakarta-tomcat4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open-source Java web server by Apache, stable 4.0.x branch
diff --git a/www/jakarta-tomcat41/Makefile b/www/jakarta-tomcat41/Makefile
index 1f3c3466dab7..ba710cd62633 100644
--- a/www/jakarta-tomcat41/Makefile
+++ b/www/jakarta-tomcat41/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v${POR
MASTER_SITE_SUBDIR= znerd
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Open-source Java web server by Apache, stable 4.1.x branch
USE_JAVA= 1.2+
NO_BUILD= YES
diff --git a/www/jakarta-tomcat41/pkg-comment b/www/jakarta-tomcat41/pkg-comment
deleted file mode 100644
index 865cad15732a..000000000000
--- a/www/jakarta-tomcat41/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open-source Java web server by Apache, stable 4.1.x branch
diff --git a/www/kdewebdev/Makefile b/www/kdewebdev/Makefile
index 75f7adbe3c7b..d2f4354e0f2c 100644
--- a/www/kdewebdev/Makefile
+++ b/www/kdewebdev/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
+COMMENT= GUI HTML editor that bears resemblence to kdevelop
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/www/kdewebdev/pkg-comment b/www/kdewebdev/pkg-comment
deleted file mode 100644
index 01d9e5a20586..000000000000
--- a/www/kdewebdev/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI HTML editor that bears resemblence to kdevelop
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 75f7adbe3c7b..d2f4354e0f2c 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
+COMMENT= GUI HTML editor that bears resemblence to kdevelop
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/www/kdewebdev4/pkg-comment b/www/kdewebdev4/pkg-comment
deleted file mode 100644
index 01d9e5a20586..000000000000
--- a/www/kdewebdev4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI HTML editor that bears resemblence to kdevelop
diff --git a/www/knowledgekit/Makefile b/www/knowledgekit/Makefile
index 9287dea9074a..d65faae83c0f 100644
--- a/www/knowledgekit/Makefile
+++ b/www/knowledgekit/Makefile
@@ -13,6 +13,7 @@ DISTNAME= KnowledgeKit-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A mechanism for the automatic creation and maintenance of Knowledge Bases
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/knowledgekit/pkg-comment b/www/knowledgekit/pkg-comment
deleted file mode 100644
index 89f2d265e69a..000000000000
--- a/www/knowledgekit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A mechanism for the automatic creation and maintenance of Knowledge Bases
diff --git a/www/libghttp/Makefile b/www/libghttp/Makefile
index 21a8158ff96a..01a807d10f38 100644
--- a/www/libghttp/Makefile
+++ b/www/libghttp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/libghttp/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME http client library
USE_LIBTOOL= yes
INSTALLS_SHLIB= yes
diff --git a/www/libghttp/pkg-comment b/www/libghttp/pkg-comment
deleted file mode 100644
index 1426da7f93c3..000000000000
--- a/www/libghttp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME http client library
diff --git a/www/linux-flashplugin/Makefile b/www/linux-flashplugin/Makefile
index 5050e1c8d0d1..9d89b9a32d5b 100644
--- a/www/linux-flashplugin/Makefile
+++ b/www/linux-flashplugin/Makefile
@@ -14,6 +14,7 @@ DISTNAME= flash_linux
DIST_SUBDIR= ${PORTNAME}/${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= The official Macromedia Flash Player for Linux Netscape and Opera
ONLY_FOR_ARCHS= i386
USE_LINUX= yes
diff --git a/www/linux-flashplugin/pkg-comment b/www/linux-flashplugin/pkg-comment
deleted file mode 100644
index 15704f09791b..000000000000
--- a/www/linux-flashplugin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The official Macromedia Flash Player for Linux Netscape and Opera
diff --git a/www/linux-opera-devel/Makefile b/www/linux-opera-devel/Makefile
index 0d12801e1d57..627a5163107c 100644
--- a/www/linux-opera-devel/Makefile
+++ b/www/linux-opera-devel/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386
MAINTAINER= des@FreeBSD.org
+COMMENT= A blazingly fast, full-featured, standards-compliant browser
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
diff --git a/www/linux-opera-devel/pkg-comment b/www/linux-opera-devel/pkg-comment
deleted file mode 100644
index a1c6be7835e0..000000000000
--- a/www/linux-opera-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/linux-opera/Makefile b/www/linux-opera/Makefile
index 0d12801e1d57..627a5163107c 100644
--- a/www/linux-opera/Makefile
+++ b/www/linux-opera/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386
MAINTAINER= des@FreeBSD.org
+COMMENT= A blazingly fast, full-featured, standards-compliant browser
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
diff --git a/www/linux-opera/pkg-comment b/www/linux-opera/pkg-comment
deleted file mode 100644
index a1c6be7835e0..000000000000
--- a/www/linux-opera/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/linux-opera7/Makefile b/www/linux-opera7/Makefile
index 0d12801e1d57..627a5163107c 100644
--- a/www/linux-opera7/Makefile
+++ b/www/linux-opera7/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= linux-
DISTNAME= ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386
MAINTAINER= des@FreeBSD.org
+COMMENT= A blazingly fast, full-featured, standards-compliant browser
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXm.so.2:${PORTSDIR}/x11-toolkits/linux-openmotif \
${LINUXBASE}/usr/lib/libpng.so.2:${PORTSDIR}/graphics/linux-png
diff --git a/www/linux-opera7/pkg-comment b/www/linux-opera7/pkg-comment
deleted file mode 100644
index a1c6be7835e0..000000000000
--- a/www/linux-opera7/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/linuxpluginwrapper/Makefile b/www/linuxpluginwrapper/Makefile
index 81e73b2b38a9..b51463e0535d 100644
--- a/www/linuxpluginwrapper/Makefile
+++ b/www/linuxpluginwrapper/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= petef
MAINTAINER= nork@FreeBSD.org
+COMMENT= A wrapper allowing use of linux-flashplugin with native mozilla
RUN_DEPENDS= ${LOCALBASE}/lib/flash/libflashplayer.so:${PORTSDIR}/www/linux-flashplugin
diff --git a/www/linuxpluginwrapper/pkg-comment b/www/linuxpluginwrapper/pkg-comment
deleted file mode 100644
index e90b8ebc66a9..000000000000
--- a/www/linuxpluginwrapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A wrapper allowing use of linux-flashplugin with native mozilla
diff --git a/www/lws/Makefile b/www/lws/Makefile
index d1d70c485a8b..c60da7c638e0 100644
--- a/www/lws/Makefile
+++ b/www/lws/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= archie
MAINTAINER= archie@freebsd.org
+COMMENT= Lightweight threaded HTTP/HTTPS web server based on libpdel(3)
LIB_DEPENDS= pdel.0:${PORTSDIR}/devel/libpdel
diff --git a/www/lws/pkg-comment b/www/lws/pkg-comment
deleted file mode 100644
index 9d6e54f523c4..000000000000
--- a/www/lws/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lightweight threaded HTTP/HTTPS web server based on libpdel(3)
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 7738b736c6dd..20aaa2784e20 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://lynx.isc.org/current/
DISTNAME= ${PORTNAME}2.8.5dev.12
MAINTAINER= ache@FreeBSD.org
+COMMENT= A non-graphical, text-based World-Wide Web client
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/www/lynx-current/pkg-comment b/www/lynx-current/pkg-comment
deleted file mode 100644
index 25d3368d9d21..000000000000
--- a/www/lynx-current/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A non-graphical, text-based World-Wide Web client
diff --git a/www/mathopd/Makefile b/www/mathopd/Makefile
index e863aa212952..4a90958f4a9f 100644
--- a/www/mathopd/Makefile
+++ b/www/mathopd/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.mathopd.org/dist/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/p/pl/}
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A very small, yet very fast HTTP server
post-install:
@${INSTALL_DATA} ${FILESDIR}/mathopd.conf.sample ${PREFIX}/etc
diff --git a/www/mathopd/pkg-comment b/www/mathopd/pkg-comment
deleted file mode 100644
index ff6a9a131941..000000000000
--- a/www/mathopd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very small, yet very fast HTTP server
diff --git a/www/mdw/Makefile b/www/mdw/Makefile
index 62118d7c4b6d..cd9873b32c08 100644
--- a/www/mdw/Makefile
+++ b/www/mdw/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://redbrick.dcu.ie/~colmmacc/mdw/
MAINTAINER= petef@FreeBSD.org
+COMMENT= A utility to check the MD5 sum of a webpage
USE_AUTOCONF= yes
USE_REINPLACE= yes
diff --git a/www/mdw/pkg-comment b/www/mdw/pkg-comment
deleted file mode 100644
index 9405257610d0..000000000000
--- a/www/mdw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility to check the MD5 sum of a webpage
diff --git a/www/mergelog/Makefile b/www/mergelog/Makefile
index 3d6d503715b5..6a7e62849a17 100644
--- a/www/mergelog/Makefile
+++ b/www/mergelog/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A tool to merge and sort by date http log files
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/www/mergelog/pkg-comment b/www/mergelog/pkg-comment
deleted file mode 100644
index 694b7e3b7ca8..000000000000
--- a/www/mergelog/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to merge and sort by date http log files
diff --git a/www/mhonarc/Makefile b/www/mhonarc/Makefile
index bd0bce476947..837e3a128568 100644
--- a/www/mhonarc/Makefile
+++ b/www/mhonarc/Makefile
@@ -18,6 +18,7 @@ MASTER_SITES= http://www.mhonarc.org/tar/ \
DISTNAME= MHonArc${PORTVERSION}
MAINTAINER= max@FreeBSD.org
+COMMENT= WWW front end for mail archives
USE_BZIP2= Yes
USE_PERL5= Yes
diff --git a/www/mhonarc/pkg-comment b/www/mhonarc/pkg-comment
deleted file mode 100644
index a3db720d2949..000000000000
--- a/www/mhonarc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW front end for mail archives
diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile
index 3fcfaae8e323..655823bce237 100644
--- a/www/mini_httpd/Makefile
+++ b/www/mini_httpd/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.acme.com/software/mini_httpd/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/b/beta/}
MAINTAINER= se@FreeBSD.org
+COMMENT= Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
.ifndef NO_SSL
USE_OPENSSL= YES
diff --git a/www/mini_httpd/pkg-comment b/www/mini_httpd/pkg-comment
deleted file mode 100644
index aa8f1422966f..000000000000
--- a/www/mini_httpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small HTTP server with support for GET, HEAD, POST, CGI, SSL, IPv6
diff --git a/www/mnogosearch/Makefile b/www/mnogosearch/Makefile
index 6b9760f6eea8..03890c517a22 100644
--- a/www/mnogosearch/Makefile
+++ b/www/mnogosearch/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www databases
MASTER_SITES= http://www.mnogosearch.org/Download/
MAINTAINER= ache@FreeBSD.org
+COMMENT= Full featured SQL-based hypertext search engine
MAN1= indexer.1
MAN5= indexer.conf.5
diff --git a/www/mnogosearch/pkg-comment b/www/mnogosearch/pkg-comment
deleted file mode 100644
index 16cd6e026f50..000000000000
--- a/www/mnogosearch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Full featured SQL-based hypertext search engine
diff --git a/www/mnogosearch31/Makefile b/www/mnogosearch31/Makefile
index 6b9760f6eea8..03890c517a22 100644
--- a/www/mnogosearch31/Makefile
+++ b/www/mnogosearch31/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www databases
MASTER_SITES= http://www.mnogosearch.org/Download/
MAINTAINER= ache@FreeBSD.org
+COMMENT= Full featured SQL-based hypertext search engine
MAN1= indexer.1
MAN5= indexer.conf.5
diff --git a/www/mnogosearch31/pkg-comment b/www/mnogosearch31/pkg-comment
deleted file mode 100644
index 16cd6e026f50..000000000000
--- a/www/mnogosearch31/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Full featured SQL-based hypertext search engine
diff --git a/www/mod_auth_external/Makefile b/www/mod_auth_external/Makefile
index e541160b8673..775c241cf562 100644
--- a/www/mod_auth_external/Makefile
+++ b/www/mod_auth_external/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.unixpapa.com/software/ \
ftp://ftp.nuug.no/pub/anders/distfiles/
MAINTAINER= anders@FreeBSD.org
+COMMENT= Enables the use of external mechanisms for user authentication
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_auth_external/pkg-comment b/www/mod_auth_external/pkg-comment
deleted file mode 100644
index 94d36ed72686..000000000000
--- a/www/mod_auth_external/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Enables the use of external mechanisms for user authentication
diff --git a/www/mod_auth_kerb/Makefile b/www/mod_auth_kerb/Makefile
index 0b53fbef142a..e7bb9a437928 100644
--- a/www/mod_auth_kerb/Makefile
+++ b/www/mod_auth_kerb/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=modauthkerb
MAINTAINER= wollman@FreeBSD.org
+COMMENT= An Apache module for authenticating users with Kerberos v5
#
# This module allows users to send their Kerberos password in
diff --git a/www/mod_auth_kerb/pkg-comment b/www/mod_auth_kerb/pkg-comment
deleted file mode 100644
index f5a1f4c2f90c..000000000000
--- a/www/mod_auth_kerb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module for authenticating users with Kerberos v5
diff --git a/www/mod_auth_kerb2/Makefile b/www/mod_auth_kerb2/Makefile
index 0b53fbef142a..e7bb9a437928 100644
--- a/www/mod_auth_kerb2/Makefile
+++ b/www/mod_auth_kerb2/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=modauthkerb
MAINTAINER= wollman@FreeBSD.org
+COMMENT= An Apache module for authenticating users with Kerberos v5
#
# This module allows users to send their Kerberos password in
diff --git a/www/mod_auth_kerb2/pkg-comment b/www/mod_auth_kerb2/pkg-comment
deleted file mode 100644
index f5a1f4c2f90c..000000000000
--- a/www/mod_auth_kerb2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module for authenticating users with Kerberos v5
diff --git a/www/mod_auth_mysql_another/Makefile b/www/mod_auth_mysql_another/Makefile
index f37f3dde0e4a..2826e7baedf6 100644
--- a/www/mod_auth_mysql_another/Makefile
+++ b/www/mod_auth_mysql_another/Makefile
@@ -12,6 +12,7 @@ DISTNAME= mod_auth_mysql
EXTRACT_SUFX= .c.gz
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Allows users to use MySQL databases for user authentication
BUILD_DEPENDS= ${PREFIX}/sbin/apxs:${PORTSDIR}/www/${AP_PORT}
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/www/mod_auth_mysql_another/pkg-comment b/www/mod_auth_mysql_another/pkg-comment
deleted file mode 100644
index 1d02fe297802..000000000000
--- a/www/mod_auth_mysql_another/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows users to use MySQL databases for user authentication
diff --git a/www/mod_auth_pam/Makefile b/www/mod_auth_pam/Makefile
index 007279245503..0e5a7b4ad5b0 100644
--- a/www/mod_auth_pam/Makefile
+++ b/www/mod_auth_pam/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://pam.sourceforge.net/mod_auth_pam/dist/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= Allows users to use PAM modules for user authentication
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_auth_pam/pkg-comment b/www/mod_auth_pam/pkg-comment
deleted file mode 100644
index 02168141c19f..000000000000
--- a/www/mod_auth_pam/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows users to use PAM modules for user authentication
diff --git a/www/mod_auth_pgsql/Makefile b/www/mod_auth_pgsql/Makefile
index e11317c87e4c..5c9d7d18de5e 100644
--- a/www/mod_auth_pgsql/Makefile
+++ b/www/mod_auth_pgsql/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql/dist/
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Allows users to use PostgreSQL databases for user authentication
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${LOCALBASE}/sbin/${AP_TARGET}:${APACHE_PORT}
diff --git a/www/mod_auth_pgsql/pkg-comment b/www/mod_auth_pgsql/pkg-comment
deleted file mode 100644
index b75baa2d4cda..000000000000
--- a/www/mod_auth_pgsql/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Allows users to use PostgreSQL databases for user authentication
diff --git a/www/mod_backhand/Makefile b/www/mod_backhand/Makefile
index 0d2791846cd8..d1a4ef6253e1 100644
--- a/www/mod_backhand/Makefile
+++ b/www/mod_backhand/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= ftp://ftp.cnds.jhu.edu/pub/backhand/
MAINTAINER= seanc@FreeBSD.org
+COMMENT= Apache module that allows seamless redirection and load balancing of HTTP requests
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_backhand/pkg-comment b/www/mod_backhand/pkg-comment
deleted file mode 100644
index f25acad562ea..000000000000
--- a/www/mod_backhand/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that allows seamless redirection and load balancing of HTTP requests
diff --git a/www/mod_cvs/Makefile b/www/mod_cvs/Makefile
index dbcb0300c37d..5a4aa7d87989 100644
--- a/www/mod_cvs/Makefile
+++ b/www/mod_cvs/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} \
MASTER_SITE_SUBDIR= petef
MAINTAINER= petef@FreeBSD.org
+COMMENT= A module that makes Apache CVS aware
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_cvs/pkg-comment b/www/mod_cvs/pkg-comment
deleted file mode 100644
index 02a4e99afe5d..000000000000
--- a/www/mod_cvs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A module that makes Apache CVS aware
diff --git a/www/mod_dtcl/Makefile b/www/mod_dtcl/Makefile
index 2f6962749d23..93e2bf8fac10 100644
--- a/www/mod_dtcl/Makefile
+++ b/www/mod_dtcl/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www tcl83
MASTER_SITES= http://tcl.apache.org/mod_dtcl/download/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Embeds a TCL8 interpreter in the Apache server
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
LIB_DEPENDS= tcl83:${PORTSDIR}/lang/tcl83
diff --git a/www/mod_dtcl/pkg-comment b/www/mod_dtcl/pkg-comment
deleted file mode 100644
index 89634a5a555d..000000000000
--- a/www/mod_dtcl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Embeds a TCL8 interpreter in the Apache server
diff --git a/www/mod_extract_forwarded/Makefile b/www/mod_extract_forwarded/Makefile
index 5147ba091149..4353ca43ecea 100644
--- a/www/mod_extract_forwarded/Makefile
+++ b/www/mod_extract_forwarded/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://web.systhug.com/mod_extract_forwarded/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= An Apache module that can make proxied requests appear with client IP
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/mod_extract_forwarded/pkg-comment b/www/mod_extract_forwarded/pkg-comment
deleted file mode 100644
index 2b25fe5ece54..000000000000
--- a/www/mod_extract_forwarded/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that can make proxied requests appear with client IP
diff --git a/www/mod_extract_forwarded_ap13/Makefile b/www/mod_extract_forwarded_ap13/Makefile
index 5147ba091149..4353ca43ecea 100644
--- a/www/mod_extract_forwarded_ap13/Makefile
+++ b/www/mod_extract_forwarded_ap13/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://web.systhug.com/mod_extract_forwarded/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= An Apache module that can make proxied requests appear with client IP
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/mod_extract_forwarded_ap13/pkg-comment b/www/mod_extract_forwarded_ap13/pkg-comment
deleted file mode 100644
index 2b25fe5ece54..000000000000
--- a/www/mod_extract_forwarded_ap13/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that can make proxied requests appear with client IP
diff --git a/www/mod_frontpage/Makefile b/www/mod_frontpage/Makefile
index 9d1a4014e3a3..4edfa517386f 100644
--- a/www/mod_frontpage/Makefile
+++ b/www/mod_frontpage/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/mirfak/g}
DISTFILES= ${PORTNAME}_mirfak-${PORTVERSION}.tar.gz
MAINTAINER= mbr@FreeBSD.org
+COMMENT= Improved mod_frontpage for Apache, as APXS installation
WRKSRC= ${WRKDIR}/${PORTNAME}_mirfak-${PORTVERSION}
AP_PORT?= apache13
diff --git a/www/mod_frontpage/pkg-comment b/www/mod_frontpage/pkg-comment
deleted file mode 100644
index 41308f273f21..000000000000
--- a/www/mod_frontpage/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Improved mod_frontpage for Apache, as APXS installation
diff --git a/www/mod_geoip/Makefile b/www/mod_geoip/Makefile
index 0fd1a601570e..f6977bc14749 100644
--- a/www/mod_geoip/Makefile
+++ b/www/mod_geoip/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.maxmind.com/download/geoip/api/mod_geoip/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= seanc@FreeBSD.org
+COMMENT= An Apache module that provides the country code of the client's IP
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_geoip/pkg-comment b/www/mod_geoip/pkg-comment
deleted file mode 100644
index 5927e4566718..000000000000
--- a/www/mod_geoip/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides the country code of the client's IP
diff --git a/www/mod_jk/Makefile b/www/mod_jk/Makefile
index 76ce968b3b6f..85204899eda5 100644
--- a/www/mod_jk/Makefile
+++ b/www/mod_jk/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= jakarta-tomcat-${PORTVERSION}-src
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Apache module for Tomcat 3
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT} \
diff --git a/www/mod_jk/pkg-comment b/www/mod_jk/pkg-comment
deleted file mode 100644
index 0a63f05b7777..000000000000
--- a/www/mod_jk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module for Tomcat 3
diff --git a/www/mod_perl/Makefile b/www/mod_perl/Makefile
index 3098668f5c1d..e73f4c927fa0 100644
--- a/www/mod_perl/Makefile
+++ b/www/mod_perl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= Apache
MAINTAINER= ports@FreeBSD.org
+COMMENT= Embeds a Perl interpreter in the Apache server
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${APACHE_PORT} \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/mod_perl/pkg-comment b/www/mod_perl/pkg-comment
deleted file mode 100644
index 94191384426a..000000000000
--- a/www/mod_perl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Embeds a Perl interpreter in the Apache server
diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 5f1d8019f6b3..cef2d84ba8c5 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -21,6 +21,7 @@ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
DISTNAME= php-${PORTVERSION}
MAINTAINER= dirk@FreeBSD.org
+COMMENT= PHP4 module for Apache
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_php4/pkg-comment b/www/mod_php4/pkg-comment
deleted file mode 100644
index e7a0ad78a7f3..000000000000
--- a/www/mod_php4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PHP4 module for Apache
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 5f1d8019f6b3..cef2d84ba8c5 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -21,6 +21,7 @@ MASTER_SITES= http://us.php.net/${PHP_DISTDIR}/ \
DISTNAME= php-${PORTVERSION}
MAINTAINER= dirk@FreeBSD.org
+COMMENT= PHP4 module for Apache
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
RUN_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_php5/pkg-comment b/www/mod_php5/pkg-comment
deleted file mode 100644
index e7a0ad78a7f3..000000000000
--- a/www/mod_php5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PHP4 module for Apache
diff --git a/www/mod_proxy_add_forward/Makefile b/www/mod_proxy_add_forward/Makefile
index 260cd43368cf..d79bbffb1a36 100644
--- a/www/mod_proxy_add_forward/Makefile
+++ b/www/mod_proxy_add_forward/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .c
MAINTAINER= anders@FreeBSD.org
+COMMENT= Apache module that adds a client IP header to outgoing proxy requests
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
diff --git a/www/mod_proxy_add_forward/pkg-comment b/www/mod_proxy_add_forward/pkg-comment
deleted file mode 100644
index 66e998990a3a..000000000000
--- a/www/mod_proxy_add_forward/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that adds a client IP header to outgoing proxy requests
diff --git a/www/mod_scgi/Makefile b/www/mod_scgi/Makefile
index 58637388cc20..1324a36a09f9 100644
--- a/www/mod_scgi/Makefile
+++ b/www/mod_scgi/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.mems-exchange.org/software/files/scgi/
PKGNAMEPREFIX= mod_
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Apache module that implements the client side of the SCGI protocol
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_scgi/pkg-comment b/www/mod_scgi/pkg-comment
deleted file mode 100644
index db51bf8c509f..000000000000
--- a/www/mod_scgi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apache module that implements the client side of the SCGI protocol
diff --git a/www/mod_sqlinclude/Makefile b/www/mod_sqlinclude/Makefile
index ad300d4c54c0..e3851f10d7ac 100644
--- a/www/mod_sqlinclude/Makefile
+++ b/www/mod_sqlinclude/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}_${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= An Apache module implementing config inclusion from MySQL databases
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
LIB_DEPENDS= mysqlclient.10:${PORTSDIR}/databases/mysql323-client
diff --git a/www/mod_sqlinclude/pkg-comment b/www/mod_sqlinclude/pkg-comment
deleted file mode 100644
index 29a205e84b4a..000000000000
--- a/www/mod_sqlinclude/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module implementing config inclusion from MySQL databases
diff --git a/www/mod_throttle/Makefile b/www/mod_throttle/Makefile
index 9d9debc03a21..2266e493c071 100644
--- a/www/mod_throttle/Makefile
+++ b/www/mod_throttle/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= An Apache module that provides bandwidth & request throttling
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_throttle/pkg-comment b/www/mod_throttle/pkg-comment
deleted file mode 100644
index 8a1f5362f1ea..000000000000
--- a/www/mod_throttle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module that provides bandwidth & request throttling
diff --git a/www/mod_watch/Makefile b/www/mod_watch/Makefile
index 10cebaaf5399..ae906ed673e7 100644
--- a/www/mod_watch/Makefile
+++ b/www/mod_watch/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g}
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= An Apache module to monitor bandwidth usage, for use with MRTG etc
BUILD_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
RUN_DEPENDS= ${APXS}:${PORTSDIR}/www/apache13
diff --git a/www/mod_watch/pkg-comment b/www/mod_watch/pkg-comment
deleted file mode 100644
index ce05d907549c..000000000000
--- a/www/mod_watch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Apache module to monitor bandwidth usage, for use with MRTG etc
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 688a86e018cf..3325acf829dd 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
diff --git a/www/mozilla-devel/pkg-comment b/www/mozilla-devel/pkg-comment
deleted file mode 100644
index 72ee27d1f037..000000000000
--- a/www/mozilla-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The open source, standards compliant web browser
diff --git a/www/mozilla-embedded-devel/Makefile b/www/mozilla-embedded-devel/Makefile
index 9da0f01092b3..8d57776c3a54 100644
--- a/www/mozilla-embedded-devel/Makefile
+++ b/www/mozilla-embedded-devel/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= www
DISTFILES=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The embeddable component of mozilla communicator web-surfboard
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/mozilla-devel:build \
zip:${PORTSDIR}/archivers/zip \
diff --git a/www/mozilla-embedded-devel/pkg-comment b/www/mozilla-embedded-devel/pkg-comment
deleted file mode 100644
index 7dd8dbba13f7..000000000000
--- a/www/mozilla-embedded-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The embeddable component of mozilla communicator web-surfboard
diff --git a/www/mozilla-embedded-vendor/Makefile b/www/mozilla-embedded-vendor/Makefile
index 2d45947be742..3f03faa8dfbd 100644
--- a/www/mozilla-embedded-vendor/Makefile
+++ b/www/mozilla-embedded-vendor/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= www
DISTFILES=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The embeddable component of mozilla communicator web-surfboard
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/mozilla-vendor:build \
zip:${PORTSDIR}/archivers/zip \
diff --git a/www/mozilla-embedded-vendor/pkg-comment b/www/mozilla-embedded-vendor/pkg-comment
deleted file mode 100644
index 7dd8dbba13f7..000000000000
--- a/www/mozilla-embedded-vendor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The embeddable component of mozilla communicator web-surfboard
diff --git a/www/mozilla-embedded/Makefile b/www/mozilla-embedded/Makefile
index dffedbaa1851..29602d25518f 100644
--- a/www/mozilla-embedded/Makefile
+++ b/www/mozilla-embedded/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= www
DISTFILES=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The embeddable component of mozilla communicator web-surfboard
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/mozilla:build \
zip:${PORTSDIR}/archivers/zip \
diff --git a/www/mozilla-embedded/pkg-comment b/www/mozilla-embedded/pkg-comment
deleted file mode 100644
index 7dd8dbba13f7..000000000000
--- a/www/mozilla-embedded/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The embeddable component of mozilla communicator web-surfboard
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/mozilla-firebird/pkg-comment b/www/mozilla-firebird/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/mozilla-firebird/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/mozilla-headers-devel/Makefile b/www/mozilla-headers-devel/Makefile
index 8e4c30738d21..48bc73606f48 100644
--- a/www/mozilla-headers-devel/Makefile
+++ b/www/mozilla-headers-devel/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= www
DISTFILES=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Header files for mozilla communicator web-surfboard
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/mozilla-devel:configure
diff --git a/www/mozilla-headers-devel/pkg-comment b/www/mozilla-headers-devel/pkg-comment
deleted file mode 100644
index 108312c7c035..000000000000
--- a/www/mozilla-headers-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Header files for mozilla communicator web-surfboard
diff --git a/www/mozilla-headers-vendor/Makefile b/www/mozilla-headers-vendor/Makefile
index 0b487aee6e98..763edaad1557 100644
--- a/www/mozilla-headers-vendor/Makefile
+++ b/www/mozilla-headers-vendor/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= www
DISTFILES=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Header files for mozilla communicator web-surfboard
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/mozilla-vendor:configure
diff --git a/www/mozilla-headers-vendor/pkg-comment b/www/mozilla-headers-vendor/pkg-comment
deleted file mode 100644
index 108312c7c035..000000000000
--- a/www/mozilla-headers-vendor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Header files for mozilla communicator web-surfboard
diff --git a/www/mozilla-headers/Makefile b/www/mozilla-headers/Makefile
index 468b3d309245..d354bd5f83da 100644
--- a/www/mozilla-headers/Makefile
+++ b/www/mozilla-headers/Makefile
@@ -13,6 +13,7 @@ CATEGORIES= www
DISTFILES=
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Header files for mozilla communicator web-surfboard
BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/www/mozilla:configure
diff --git a/www/mozilla-headers/pkg-comment b/www/mozilla-headers/pkg-comment
deleted file mode 100644
index 108312c7c035..000000000000
--- a/www/mozilla-headers/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Header files for mozilla communicator web-surfboard
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 193b5d678223..7c84ea69954c 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
diff --git a/www/mozilla-vendor/pkg-comment b/www/mozilla-vendor/pkg-comment
deleted file mode 100644
index 72ee27d1f037..000000000000
--- a/www/mozilla-vendor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The open source, standards compliant web browser
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index e68984f7f1be..e5f73de8c6d5 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
diff --git a/www/mozilla/pkg-comment b/www/mozilla/pkg-comment
deleted file mode 100644
index 72ee27d1f037..000000000000
--- a/www/mozilla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The open source, standards compliant web browser
diff --git a/www/nautilus-gtkhtml/Makefile b/www/nautilus-gtkhtml/Makefile
index d26c78e3ad71..495f789232ce 100644
--- a/www/nautilus-gtkhtml/Makefile
+++ b/www/nautilus-gtkhtml/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/nautilus-gtkhtml/0.3
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A simple NautilusView component for displaying html files in Nautilus
LIB_DEPENDS= gtkhtml-2.0:${PORTSDIR}/www/libgtkhtml \
nautilus.2:${PORTSDIR}/x11-fm/nautilus2
diff --git a/www/nautilus-gtkhtml/pkg-comment b/www/nautilus-gtkhtml/pkg-comment
deleted file mode 100644
index 1969d3f4ba39..000000000000
--- a/www/nautilus-gtkhtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple NautilusView component for displaying html files in Nautilus
diff --git a/www/neowebscript/Makefile b/www/neowebscript/Makefile
index 6dbf3e45d358..44bdcbc24522 100644
--- a/www/neowebscript/Makefile
+++ b/www/neowebscript/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=nws
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Embeds a TCL8 interpreter in the Apache server
BUILD_DEPENDS= ${LOCALBASE}/sbin/apxs:${PORTSDIR}/www/apache13
LIB_DEPENDS= neo82:${PORTSDIR}/devel/tcl-neo
diff --git a/www/neowebscript/pkg-comment b/www/neowebscript/pkg-comment
deleted file mode 100644
index 89634a5a555d..000000000000
--- a/www/neowebscript/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Embeds a TCL8 interpreter in the Apache server
diff --git a/www/netraider/Makefile b/www/netraider/Makefile
index 6bcf81f7ce59..4bac82b57ce4 100644
--- a/www/netraider/Makefile
+++ b/www/netraider/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-source-${PORTVERSION}
MAINTAINER= kde@freebsd.org
+COMMENT= Fast, small, free and nice web browser for Unix
USE_QT_VER= 2
USE_REINPLACE= yes
diff --git a/www/netraider/pkg-comment b/www/netraider/pkg-comment
deleted file mode 100644
index 4ec15cd9d738..000000000000
--- a/www/netraider/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Fast, small, free and nice web browser for Unix
diff --git a/www/netscape-remote/Makefile b/www/netscape-remote/Makefile
index fb3aafe096b6..08ca711e91fe 100644
--- a/www/netscape-remote/Makefile
+++ b/www/netscape-remote/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://home.netscape.com/newsref/std/
DISTFILES= remote.c vroot.h
MAINTAINER= kbyanc@posi.net
+COMMENT= Utility to pass commands to running netscape process
USE_XLIB= yes
DIST_SUBDIR= netscape-remote
diff --git a/www/netscape-remote/pkg-comment b/www/netscape-remote/pkg-comment
deleted file mode 100644
index a150d405eda6..000000000000
--- a/www/netscape-remote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Utility to pass commands to running netscape process
diff --git a/www/nscache/Makefile b/www/nscache/Makefile
index 8c4aa8a41c83..a242da3b5d53 100644
--- a/www/nscache/Makefile
+++ b/www/nscache/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= kris@FreeBSD.org
+COMMENT= Netscape cache browser
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/www/nscache/pkg-comment b/www/nscache/pkg-comment
deleted file mode 100644
index 8231e5385702..000000000000
--- a/www/nscache/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape cache browser
diff --git a/www/nspostgres/Makefile b/www/nspostgres/Makefile
index 23428f5d7db3..753883ed49b7 100644
--- a/www/nspostgres/Makefile
+++ b/www/nspostgres/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= aolserver
DISTNAME= nspostgres3_0
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A driver to access PostgreSQL databases from Aolserver
BUILD_DEPENDS= ${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver \
${LOCALBASE}/bin/postmaster:${PORTSDIR}/${POSTGRESQL_PORT}
diff --git a/www/nspostgres/pkg-comment b/www/nspostgres/pkg-comment
deleted file mode 100644
index c4e4e9fbf6a5..000000000000
--- a/www/nspostgres/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A driver to access PostgreSQL databases from Aolserver
diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile
index 44bf69f11217..ebc1a3d91b6e 100644
--- a/www/openvrml/Makefile
+++ b/www/openvrml/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= 3d@FreeBSD.org
+COMMENT= VRML97 runtime and browser ("lookat")
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png
diff --git a/www/openvrml/pkg-comment b/www/openvrml/pkg-comment
deleted file mode 100644
index de088b00466d..000000000000
--- a/www/openvrml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-VRML97 runtime and browser ("lookat")
diff --git a/www/opera-devel/Makefile b/www/opera-devel/Makefile
index 51805976eb09..a20a27c9b18a 100644
--- a/www/opera-devel/Makefile
+++ b/www/opera-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://opera.online.no/unix/freebsd/611/final/en/static/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386.freebsd
MAINTAINER= des@FreeBSD.org
+COMMENT= A blazingly fast, full-featured, standards-compliant browser
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/www/opera-devel/pkg-comment b/www/opera-devel/pkg-comment
deleted file mode 100644
index a1c6be7835e0..000000000000
--- a/www/opera-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/opera/Makefile b/www/opera/Makefile
index 51805976eb09..a20a27c9b18a 100644
--- a/www/opera/Makefile
+++ b/www/opera/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://opera.online.no/unix/freebsd/611/final/en/static/ \
DISTNAME= ${PORTNAME}-${PORTVERSION:S/11./11-/}.1-static-qt.i386.freebsd
MAINTAINER= des@FreeBSD.org
+COMMENT= A blazingly fast, full-featured, standards-compliant browser
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
diff --git a/www/opera/pkg-comment b/www/opera/pkg-comment
deleted file mode 100644
index a1c6be7835e0..000000000000
--- a/www/opera/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A blazingly fast, full-featured, standards-compliant browser
diff --git a/www/orion-devel/Makefile b/www/orion-devel/Makefile
index 44451760cd15..10604cc03fff 100644
--- a/www/orion-devel/Makefile
+++ b/www/orion-devel/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Orion Application Server
USE_JAVA= 1.2+
USE_ZIP= YES
diff --git a/www/orion-devel/pkg-comment b/www/orion-devel/pkg-comment
deleted file mode 100644
index 3cb69b99e7d1..000000000000
--- a/www/orion-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Orion Application Server
diff --git a/www/orion/Makefile b/www/orion/Makefile
index dcc3e7621528..948869130f99 100644
--- a/www/orion/Makefile
+++ b/www/orion/Makefile
@@ -17,6 +17,7 @@ MASTER_SITE_SUBDIR= znerd
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Orion Application Server
USE_JAVA= 1.2+
USE_ZIP= YES
diff --git a/www/orion/pkg-comment b/www/orion/pkg-comment
deleted file mode 100644
index 3cb69b99e7d1..000000000000
--- a/www/orion/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Orion Application Server
diff --git a/www/p5-Apache-Admin-Config/Makefile b/www/p5-Apache-Admin-Config/Makefile
index 0f93d8bfa4ca..0ee841593ff2 100644
--- a/www/p5-Apache-Admin-Config/Makefile
+++ b/www/p5-Apache-Admin-Config/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A perl module to manipulate Apache configuration files
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-Admin-Config/pkg-comment b/www/p5-Apache-Admin-Config/pkg-comment
deleted file mode 100644
index 8963dba2e279..000000000000
--- a/www/p5-Apache-Admin-Config/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl module to manipulate Apache configuration files
diff --git a/www/p5-Apache-DBI/Makefile b/www/p5-Apache-DBI/Makefile
index 119d603b6e48..ffc362998286 100644
--- a/www/p5-Apache-DBI/Makefile
+++ b/www/p5-Apache-DBI/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= DBI persistent connection, authentication and authorization
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
diff --git a/www/p5-Apache-DBI/pkg-comment b/www/p5-Apache-DBI/pkg-comment
deleted file mode 100644
index ffb230083113..000000000000
--- a/www/p5-Apache-DBI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DBI persistent connection, authentication and authorization
diff --git a/www/p5-Apache-Radius/Makefile b/www/p5-Apache-Radius/Makefile
index 88706dae3295..a21a2ccc6888 100644
--- a/www/p5-Apache-Radius/Makefile
+++ b/www/p5-Apache-Radius/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Apache-AuthenRadius-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= A perl5 module for providing RADIUS authentication in Apache+mod_perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
diff --git a/www/p5-Apache-Radius/pkg-comment b/www/p5-Apache-Radius/pkg-comment
deleted file mode 100644
index c9129ebecf8e..000000000000
--- a/www/p5-Apache-Radius/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module for providing RADIUS authentication in Apache+mod_perl
diff --git a/www/p5-Apache-Reload/Makefile b/www/p5-Apache-Reload/Makefile
index e487597c1eef..ded031f67f9d 100644
--- a/www/p5-Apache-Reload/Makefile
+++ b/www/p5-Apache-Reload/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Apache
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Reload changed modules
PERL_CONFIGURE= yes
diff --git a/www/p5-Apache-Reload/pkg-comment b/www/p5-Apache-Reload/pkg-comment
deleted file mode 100644
index dabe5e48e3b5..000000000000
--- a/www/p5-Apache-Reload/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Reload changed modules
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 65f14b3432ab..12cb00ede78f 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl module intended to make it easier to create reusable web apps
BUILD_DEPENDS= ${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template \
${SITE_PERL}/CGI/Base.pm:${PORTSDIR}/www/p5-CGI-modules \
diff --git a/www/p5-CGI-Application/pkg-comment b/www/p5-CGI-Application/pkg-comment
deleted file mode 100644
index d43b96c79319..000000000000
--- a/www/p5-CGI-Application/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module intended to make it easier to create reusable web apps
diff --git a/www/p5-CGI-XMLApplication/Makefile b/www/p5-CGI-XMLApplication/Makefile
index 95f53c734f09..206d52732d98 100644
--- a/www/p5-CGI-XMLApplication/Makefile
+++ b/www/p5-CGI-XMLApplication/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= CGI
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Object Oriented Interface for CGI Script Applications
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXML.pm:${PORTSDIR}/textproc/p5-XML-LibXML \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/XML/LibXSLT.pm:${PORTSDIR}/textproc/p5-XML-LibXSLT
diff --git a/www/p5-CGI-XMLApplication/pkg-comment b/www/p5-CGI-XMLApplication/pkg-comment
deleted file mode 100644
index 7b8fa76ab5e2..000000000000
--- a/www/p5-CGI-XMLApplication/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Object Oriented Interface for CGI Script Applications
diff --git a/www/p5-FastCGI/Makefile b/www/p5-FastCGI/Makefile
index ef72bb6423c6..b7d0412904b3 100644
--- a/www/p5-FastCGI/Makefile
+++ b/www/p5-FastCGI/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= FCGI-${PORTVERSION}
MAINTAINER= kbyanc@posi.net
+COMMENT= Modules for perl5, for enabling FastCGI support in CGI scripts
BUILD_DEPENDS= ${LOCALBASE}/lib/libfcgi.a:${PORTSDIR}/www/fcgi
diff --git a/www/p5-FastCGI/pkg-comment b/www/p5-FastCGI/pkg-comment
deleted file mode 100644
index b98c305cd93a..000000000000
--- a/www/p5-FastCGI/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Modules for perl5, for enabling FastCGI support in CGI scripts
diff --git a/www/p5-GtkHTML/Makefile b/www/p5-GtkHTML/Makefile
index 800fb948eb14..07b093588d09 100644
--- a/www/p5-GtkHTML/Makefile
+++ b/www/p5-GtkHTML/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Gtk HTML module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
diff --git a/www/p5-GtkHTML/pkg-comment b/www/p5-GtkHTML/pkg-comment
deleted file mode 100644
index db734029a8ab..000000000000
--- a/www/p5-GtkHTML/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Gtk HTML module of Gtk-Perl
diff --git a/www/p5-HTML-Element-Extended/Makefile b/www/p5-HTML-Element-Extended/Makefile
index 7f631c161447..39aee007db12 100644
--- a/www/p5-HTML-Element-Extended/Makefile
+++ b/www/p5-HTML-Element-Extended/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= wollman@FreeBSD.org
+COMMENT= An extended interface to HTML::Tree's HTML::Element class
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Element.pm:${PORTSDIR}/www/p5-HTML-Tree
diff --git a/www/p5-HTML-Element-Extended/pkg-comment b/www/p5-HTML-Element-Extended/pkg-comment
deleted file mode 100644
index 472626e09a3e..000000000000
--- a/www/p5-HTML-Element-Extended/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extended interface to HTML::Tree's HTML::Element class
diff --git a/www/p5-HTML-Parser/Makefile b/www/p5-HTML-Parser/Makefile
index 3e369a54f13e..2c210dbbd613 100644
--- a/www/p5-HTML-Parser/Makefile
+++ b/www/p5-HTML-Parser/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Perl5 module for parse HTML tag
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/Tagset.pm:${PORTSDIR}/www/p5-HTML-Tagset
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-HTML-Parser/pkg-comment b/www/p5-HTML-Parser/pkg-comment
deleted file mode 100644
index 2ab1ee8fe7bc..000000000000
--- a/www/p5-HTML-Parser/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 module for parse HTML tag
diff --git a/www/p5-HTML-Summary/Makefile b/www/p5-HTML-Summary/Makefile
index 4fa125ccf04d..bf3aa24b92ad 100644
--- a/www/p5-HTML-Summary/Makefile
+++ b/www/p5-HTML-Summary/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Produces summaries from the textual content of web pages
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTML/TreeBuilder.pm:${PORTSDIR}/www/p5-HTML-Tree
diff --git a/www/p5-HTML-Summary/pkg-comment b/www/p5-HTML-Summary/pkg-comment
deleted file mode 100644
index 7a00a02e4a0d..000000000000
--- a/www/p5-HTML-Summary/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Produces summaries from the textual content of web pages
diff --git a/www/p5-HTML-Table/Makefile b/www/p5-HTML-Table/Makefile
index 13f30c77784a..04df029f2de1 100644
--- a/www/p5-HTML-Table/Makefile
+++ b/www/p5-HTML-Table/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= Generate HTML tables for CGI scripts
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-Table/pkg-comment b/www/p5-HTML-Table/pkg-comment
deleted file mode 100644
index 784659ef965c..000000000000
--- a/www/p5-HTML-Table/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generate HTML tables for CGI scripts
diff --git a/www/p5-HTML-TableLayout/Makefile b/www/p5-HTML-TableLayout/Makefile
index 6ef813c677d4..bd37ff1e6d2d 100644
--- a/www/p5-HTML-TableLayout/Makefile
+++ b/www/p5-HTML-TableLayout/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= Layout manager for CGI-based web applications
PERL_CONFIGURE= yes
diff --git a/www/p5-HTML-TableLayout/pkg-comment b/www/p5-HTML-TableLayout/pkg-comment
deleted file mode 100644
index 6c89fd77d99f..000000000000
--- a/www/p5-HTML-TableLayout/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Layout manager for CGI-based web applications
diff --git a/www/p5-HTML-Tree/Makefile b/www/p5-HTML-Tree/Makefile
index d0e128e6b889..442f35ad4dbe 100644
--- a/www/p5-HTML-Tree/Makefile
+++ b/www/p5-HTML-Tree/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTML
PKGNAMEPREFIX= p5-
MAINTAINER= demon@FreeBSD.org
+COMMENT= A collection of modules to manupulate HTML syntax trees
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/HeadParser.pm:${PORTSDIR}/www/p5-HTML-Parser
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-HTML-Tree/pkg-comment b/www/p5-HTML-Tree/pkg-comment
deleted file mode 100644
index fc30b10e8cd4..000000000000
--- a/www/p5-HTML-Tree/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of modules to manupulate HTML syntax trees
diff --git a/www/p5-HTML-Webmake/Makefile b/www/p5-HTML-Webmake/Makefile
index 90d8d5315228..f18000e2f518 100644
--- a/www/p5-HTML-Webmake/Makefile
+++ b/www/p5-HTML-Webmake/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://webmake.sourceforge.net/devel/ \
PKGNAMEPREFIX= p5-
MAINTAINER= jkoshy@FreeBSD.org
+COMMENT= A simple perl based website content management system
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/EtText.pm:${PORTSDIR}/textproc/p5-Text-EtText \
diff --git a/www/p5-HTML-Webmake/pkg-comment b/www/p5-HTML-Webmake/pkg-comment
deleted file mode 100644
index 41e1dd278ad7..000000000000
--- a/www/p5-HTML-Webmake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple perl based website content management system
diff --git a/www/p5-HTTP-BrowserDetect/Makefile b/www/p5-HTTP-BrowserDetect/Makefile
index 6a4824c99925..780cbcf702e6 100644
--- a/www/p5-HTTP-BrowserDetect/Makefile
+++ b/www/p5-HTTP-BrowserDetect/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTTP
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Determine the Web browser, version, OS from an HTTP user agent string
PERL_CONFIGURE= yes
diff --git a/www/p5-HTTP-BrowserDetect/pkg-comment b/www/p5-HTTP-BrowserDetect/pkg-comment
deleted file mode 100644
index 421f38a81de6..000000000000
--- a/www/p5-HTTP-BrowserDetect/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Determine the Web browser, version, OS from an HTTP user agent string
diff --git a/www/p5-HTTP-DAV/Makefile b/www/p5-HTTP-DAV/Makefile
index 0ebaf5477d6a..78a19f1e64b9 100644
--- a/www/p5-HTTP-DAV/Makefile
+++ b/www/p5-HTTP-DAV/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTTP
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl interface to the gnome ghttp library
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/DOM.pm:${PORTSDIR}/textproc/p5-XML-DOM \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/p5-HTTP-DAV/pkg-comment b/www/p5-HTTP-DAV/pkg-comment
deleted file mode 100644
index 3091ea862817..000000000000
--- a/www/p5-HTTP-DAV/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to the gnome ghttp library
diff --git a/www/p5-HTTP-GHTTP/Makefile b/www/p5-HTTP-GHTTP/Makefile
index 7584228a2222..0937acb34e73 100644
--- a/www/p5-HTTP-GHTTP/Makefile
+++ b/www/p5-HTTP-GHTTP/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= HTTP
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Perl interface to the gnome ghttp library
LIB_DEPENDS= ghttp.1:${PORTSDIR}/www/libghttp
diff --git a/www/p5-HTTP-GHTTP/pkg-comment b/www/p5-HTTP-GHTTP/pkg-comment
deleted file mode 100644
index 3091ea862817..000000000000
--- a/www/p5-HTTP-GHTTP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl interface to the gnome ghttp library
diff --git a/www/p5-POE-Component-Client-HTTP/Makefile b/www/p5-POE-Component-Client-HTTP/Makefile
index 4c77c1509e50..7b9d7a4b09b3 100644
--- a/www/p5-POE-Component-Client-HTTP/Makefile
+++ b/www/p5-POE-Component-Client-HTTP/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= POE
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= POE component for non-blocking/concurrent HTTP queries
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/POE.pm:${PORTSDIR}/devel/p5-POE \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/HTTP/Request.pm:${PORTSDIR}/www/p5-libwww \
diff --git a/www/p5-POE-Component-Client-HTTP/pkg-comment b/www/p5-POE-Component-Client-HTTP/pkg-comment
deleted file mode 100644
index 8c44f9a9c83d..000000000000
--- a/www/p5-POE-Component-Client-HTTP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-POE component for non-blocking/concurrent HTTP queries
diff --git a/www/p5-ParallelUA/Makefile b/www/p5-ParallelUA/Makefile
index 0b7a3e82898e..8af4ce163dd4 100644
--- a/www/p5-ParallelUA/Makefile
+++ b/www/p5-ParallelUA/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= ParallelUserAgent-${PORTVERSION}
MAINTAINER= ache@FreeBSD.org
+COMMENT= Perl5 Parallel LWP User Agent for WWW access
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
diff --git a/www/p5-ParallelUA/pkg-comment b/www/p5-ParallelUA/pkg-comment
deleted file mode 100644
index a70146b1f6ac..000000000000
--- a/www/p5-ParallelUA/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 Parallel LWP User Agent for WWW access
diff --git a/www/p5-Template-Toolkit/Makefile b/www/p5-Template-Toolkit/Makefile
index e41e194e2911..ddbac095e1a9 100644
--- a/www/p5-Template-Toolkit/Makefile
+++ b/www/p5-Template-Toolkit/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Template
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Extensive Toolkit for template processing
BUILD_DEPENDS= ${SITE_PERL}/AppConfig.pm:${PORTSDIR}/devel/p5-AppConfig \
${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
diff --git a/www/p5-Template-Toolkit/pkg-comment b/www/p5-Template-Toolkit/pkg-comment
deleted file mode 100644
index cde8a7bada17..000000000000
--- a/www/p5-Template-Toolkit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extensive Toolkit for template processing
diff --git a/www/p5-URI-Sequin/Makefile b/www/p5-URI-Sequin/Makefile
index 6cb1128178fb..fec65cbc3179 100644
--- a/www/p5-URI-Sequin/Makefile
+++ b/www/p5-URI-Sequin/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ../../authors/id/S/SA/SARGIE
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= Extract information from the URLs of Search-Engines
PERL_CONFIGURE= yes
diff --git a/www/p5-URI-Sequin/pkg-comment b/www/p5-URI-Sequin/pkg-comment
deleted file mode 100644
index b0f74bf2fbd9..000000000000
--- a/www/p5-URI-Sequin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Extract information from the URLs of Search-Engines
diff --git a/www/p5-WWW-Automate/Makefile b/www/p5-WWW-Automate/Makefile
index 9336d3f477a8..03a98358fdb5 100644
--- a/www/p5-WWW-Automate/Makefile
+++ b/www/p5-WWW-Automate/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= WWW
PKGNAMEPREFIX= p5-
MAINTAINER= tobez@FreeBSD.org
+COMMENT= A perl5 module to automate interaction with websites
BUILD_DEPENDS= ${SITE_PERL}/LWP/UserAgent.pm:${PORTSDIR}/www/p5-libwww \
${SITE_PERL}/${PERL_ARCH}/HTML/TokeParser.pm:${PORTSDIR}/www/p5-HTML-Parser \
diff --git a/www/p5-WWW-Automate/pkg-comment b/www/p5-WWW-Automate/pkg-comment
deleted file mode 100644
index 29f549b71b97..000000000000
--- a/www/p5-WWW-Automate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A perl5 module to automate interaction with websites
diff --git a/www/p5-libapreq/Makefile b/www/p5-libapreq/Makefile
index afc4a7b1f622..b48b71f98ce2 100644
--- a/www/p5-libapreq/Makefile
+++ b/www/p5-libapreq/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ../../authors/id/J/JI/JIMW/
PKGNAMEPREFIX= p5-
MAINTAINER= skv@FreeBSD.org
+COMMENT= Generic Apache Request Library
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Apache/src.pm:${PORTSDIR}/www/mod_perl
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/www/p5-libapreq/pkg-comment b/www/p5-libapreq/pkg-comment
deleted file mode 100644
index 46cf1657a755..000000000000
--- a/www/p5-libapreq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generic Apache Request Library
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 1db243909806..deaf6bd07cc9 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= LWP
DISTNAME= libwww-perl-${PORTVERSION}
MAINTAINER= petef@FreeBSD.org
+COMMENT= Perl5 library for WWW access
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
diff --git a/www/p5-libwww/pkg-comment b/www/p5-libwww/pkg-comment
deleted file mode 100644
index cfe15895ce91..000000000000
--- a/www/p5-libwww/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl5 library for WWW access
diff --git a/www/pgdriver/Makefile b/www/pgdriver/Makefile
index 827147becad9..74305911a133 100644
--- a/www/pgdriver/Makefile
+++ b/www/pgdriver/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://openacs.org/sdm/download-package/2/38/
EXTRACT_SUFX= .tgz
MAINTAINER= jkoshy@freebsd.org
+COMMENT= A driver for AOLserver to PostgreSQL connectivity
LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
BUILD_DEPENDS= ${LOCALBASE}/aolserver/bin/nsd:${PORTSDIR}/www/aolserver
diff --git a/www/pgdriver/pkg-comment b/www/pgdriver/pkg-comment
deleted file mode 100644
index dddfe9a2ac45..000000000000
--- a/www/pgdriver/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A driver for AOLserver to PostgreSQL connectivity
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index fd8f49bcb698..f511a408b550 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
MASTER_SITE_SUBDIR= alane
MAINTAINER= phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+COMMENT= Phoenix is a fast, low-overhead browser from the Mozilla project
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
diff --git a/www/phoenix/pkg-comment b/www/phoenix/pkg-comment
deleted file mode 100644
index fce2998fe9f9..000000000000
--- a/www/phoenix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Phoenix is a fast, low-overhead browser from the Mozilla project
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index 135c4ee5c3aa..6b8ba2300336 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= phpBB-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A PHP-based bulletin board / discussion forum system
RUN_DEPENDS= ${LOCALBASE}/lib/php/System.php:${PORTSDIR}/www/mod_php4
diff --git a/www/phpbb/pkg-comment b/www/phpbb/pkg-comment
deleted file mode 100644
index da5f77453f79..000000000000
--- a/www/phpbb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A PHP-based bulletin board / discussion forum system
diff --git a/www/pound/Makefile b/www/pound/Makefile
index f4bc16055f92..c33ffaca8bd0 100644
--- a/www/pound/Makefile
+++ b/www/pound/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Pound-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= anders@FreeBSD.org
+COMMENT= Reverse proxy, load balancer and HTTP(S) frontend for web servers
WRKSRC= ${WRKDIR}/${PORTNAME}
GNU_CONFIGURE= yes
diff --git a/www/pound/pkg-comment b/www/pound/pkg-comment
deleted file mode 100644
index cf73170572b4..000000000000
--- a/www/pound/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Reverse proxy, load balancer and HTTP(S) frontend for web servers
diff --git a/www/publicfile/Makefile b/www/publicfile/Makefile
index 5d1e0d74d6f6..80d4a0d0dbe7 100644
--- a/www/publicfile/Makefile
+++ b/www/publicfile/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://cr.yp.to/publicfile/ \
ftp://cr.yp.to/publicfile/
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A secure, read-only, anonymous HTTP/FTP server
RUN_DEPENDS= setuidgid:${PORTSDIR}/sysutils/daemontools \
tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
diff --git a/www/publicfile/pkg-comment b/www/publicfile/pkg-comment
deleted file mode 100644
index 86a875b11e9d..000000000000
--- a/www/publicfile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A secure, read-only, anonymous HTTP/FTP server
diff --git a/www/py-scgi/Makefile b/www/py-scgi/Makefile
index 437926cf0c03..64c8764c029e 100644
--- a/www/py-scgi/Makefile
+++ b/www/py-scgi/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.mems-exchange.org/software/files/scgi/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Python server implementation of the Simple Common Gateway Protocol
PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
diff --git a/www/py-scgi/pkg-comment b/www/py-scgi/pkg-comment
deleted file mode 100644
index ea305f423230..000000000000
--- a/www/py-scgi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python server implementation of the Simple Common Gateway Protocol
diff --git a/www/qdecoder/Makefile b/www/qdecoder/Makefile
index e65ccf96253b..91ff6ec89e67 100644
--- a/www/qdecoder/Makefile
+++ b/www/qdecoder/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.qDecoder.org/pub/qDecoder/\
EXTRACT_SUFX= .tar.Z
MAINTAINER= cjh@FreeBSD.org
+COMMENT= CGI library for C/C++ language programming
GNU_CONFIGURE= YES
diff --git a/www/qdecoder/pkg-comment b/www/qdecoder/pkg-comment
deleted file mode 100644
index f31573e909e0..000000000000
--- a/www/qdecoder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CGI library for C/C++ language programming
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 75f7adbe3c7b..d2f4354e0f2c 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${KDE_VERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@freebsd.org
+COMMENT= GUI HTML editor that bears resemblence to kdevelop
BUILD_DEPENDS= xgettext:${PORTSDIR}/devel/gettext
diff --git a/www/quanta/pkg-comment b/www/quanta/pkg-comment
deleted file mode 100644
index 01d9e5a20586..000000000000
--- a/www/quanta/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GUI HTML editor that bears resemblence to kdevelop
diff --git a/www/quixote/Makefile b/www/quixote/Makefile
index 3f34896078df..2bd2802bd5e6 100644
--- a/www/quixote/Makefile
+++ b/www/quixote/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.mems-exchange.org/software/files/quixote/
DISTNAME= Quixote-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A framework for developing web applications in Python
BUILD_DEPENDS= ${PYDISTUTILS}
diff --git a/www/quixote/pkg-comment b/www/quixote/pkg-comment
deleted file mode 100644
index 2863ab400548..000000000000
--- a/www/quixote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A framework for developing web applications in Python
diff --git a/www/ruby-tmpl/Makefile b/www/ruby-tmpl/Makefile
index 5f76c3f90afb..0b9496274e7b 100644
--- a/www/ruby-tmpl/Makefile
+++ b/www/ruby-tmpl/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ruby-${PORTNAME}-${PORTVERSION}
DIST_SUBDIR= ruby
MAINTAINER= seanc@FreeBSD.org
+COMMENT= An online/offline templating system a la eRuby/ERb
USE_RUBY= yes
diff --git a/www/ruby-tmpl/pkg-comment b/www/ruby-tmpl/pkg-comment
deleted file mode 100644
index 999ad9b9e6b4..000000000000
--- a/www/ruby-tmpl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An online/offline templating system a la eRuby/ERb
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 688a86e018cf..3325acf829dd 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
diff --git a/www/seamonkey/pkg-comment b/www/seamonkey/pkg-comment
deleted file mode 100644
index 72ee27d1f037..000000000000
--- a/www/seamonkey/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The open source, standards compliant web browser
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 688a86e018cf..3325acf829dd 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -17,6 +17,7 @@ DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
MAINTAINER= gnome@FreeBSD.org
+COMMENT= The open source, standards compliant web browser
BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \
freetype-config:${PORTSDIR}/print/freetype2
diff --git a/www/seamonkey2/pkg-comment b/www/seamonkey2/pkg-comment
deleted file mode 100644
index 72ee27d1f037..000000000000
--- a/www/seamonkey2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The open source, standards compliant web browser
diff --git a/www/smb_auth/Makefile b/www/smb_auth/Makefile
index 8ad8df6cc26f..cd8000002c99 100644
--- a/www/smb_auth/Makefile
+++ b/www/smb_auth/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://www.hacom.nl/~richard/software/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A proxy authentication module against an SMB server
RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24 \
${LOCALBASE}/sbin/smbd:${PORTSDIR}/net/samba
diff --git a/www/smb_auth/pkg-comment b/www/smb_auth/pkg-comment
deleted file mode 100644
index 14431eb879e8..000000000000
--- a/www/smb_auth/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A proxy authentication module against an SMB server
diff --git a/www/snarf/Makefile b/www/snarf/Makefile
index 51cb29c08414..3828123b98d5 100644
--- a/www/snarf/Makefile
+++ b/www/snarf/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www
MASTER_SITES= http://www.xach.com/snarf/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Another small command-line URL (http/ftp/gopher/finger) fetcher
GNU_CONFIGURE= yes
diff --git a/www/snarf/pkg-comment b/www/snarf/pkg-comment
deleted file mode 100644
index 61bc8438c213..000000000000
--- a/www/snarf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another small command-line URL (http/ftp/gopher/finger) fetcher
diff --git a/www/squid/Makefile b/www/squid/Makefile
index ab126f4c2d78..65fdb66d4748 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.5
PATCH_DIST_STRIP= -p0
diff --git a/www/squid/pkg-comment b/www/squid/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squid24/Makefile b/www/squid24/Makefile
index dc88b9cf442f..ccef4080c89b 100644
--- a/www/squid24/Makefile
+++ b/www/squid24/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.4/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.4
PATCH_DIST_STRIP= -p0
diff --git a/www/squid24/pkg-comment b/www/squid24/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squid25/Makefile b/www/squid25/Makefile
index ab126f4c2d78..65fdb66d4748 100644
--- a/www/squid25/Makefile
+++ b/www/squid25/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.5
PATCH_DIST_STRIP= -p0
diff --git a/www/squid25/pkg-comment b/www/squid25/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid25/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squid26/Makefile b/www/squid26/Makefile
index ab126f4c2d78..65fdb66d4748 100644
--- a/www/squid26/Makefile
+++ b/www/squid26/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.5
PATCH_DIST_STRIP= -p0
diff --git a/www/squid26/pkg-comment b/www/squid26/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid26/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squid27/Makefile b/www/squid27/Makefile
index ab126f4c2d78..65fdb66d4748 100644
--- a/www/squid27/Makefile
+++ b/www/squid27/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.5
PATCH_DIST_STRIP= -p0
diff --git a/www/squid27/pkg-comment b/www/squid27/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid27/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squid30/Makefile b/www/squid30/Makefile
index ab126f4c2d78..65fdb66d4748 100644
--- a/www/squid30/Makefile
+++ b/www/squid30/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.5
PATCH_DIST_STRIP= -p0
diff --git a/www/squid30/pkg-comment b/www/squid30/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid30/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squid31/Makefile b/www/squid31/Makefile
index ab126f4c2d78..65fdb66d4748 100644
--- a/www/squid31/Makefile
+++ b/www/squid31/Makefile
@@ -23,6 +23,7 @@ PATCH_SITES= http://www.squid-cache.org/Versions/v2/2.5/bugs/
PATCHFILES=
MAINTAINER= adrian@freebsd.org
+COMMENT= The successful WWW proxy cache and accelerator
DIST_SUBDIR= squid2.5
PATCH_DIST_STRIP= -p0
diff --git a/www/squid31/pkg-comment b/www/squid31/pkg-comment
deleted file mode 100644
index eec4966b0f07..000000000000
--- a/www/squid31/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The successful WWW proxy cache and accelerator
diff --git a/www/squidclients/Makefile b/www/squidclients/Makefile
index 9829d56cac16..9d7455cf811a 100644
--- a/www/squidclients/Makefile
+++ b/www/squidclients/Makefile
@@ -13,6 +13,7 @@ DISTNAME= squidclients-1.6-freebsd.bin
EXTRACT_SUFX=
MAINTAINER= demon@FreeBSD.org
+COMMENT= Generate a summary of client usage from a Squid log
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/www/squidclients/pkg-comment b/www/squidclients/pkg-comment
deleted file mode 100644
index 8ff6da04251e..000000000000
--- a/www/squidclients/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generate a summary of client usage from a Squid log
diff --git a/www/squidtimes/Makefile b/www/squidtimes/Makefile
index 5e40d1c4f19f..16cb92c4fe0b 100644
--- a/www/squidtimes/Makefile
+++ b/www/squidtimes/Makefile
@@ -15,6 +15,7 @@ DISTNAME= squidtimes-1.12-freebsd.bin
EXTRACT_SUFX=
MAINTAINER= demon@FreeBSD.org
+COMMENT= Generates a report of average transfer times of Squid cache
NO_BUILD= YES
NO_WRKSUBDIR= YES
diff --git a/www/squidtimes/pkg-comment b/www/squidtimes/pkg-comment
deleted file mode 100644
index a3dab434068b..000000000000
--- a/www/squidtimes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generates a report of average transfer times of Squid cache
diff --git a/www/squirm/Makefile b/www/squirm/Makefile
index 83081e4cce14..fbb0ec08425a 100644
--- a/www/squirm/Makefile
+++ b/www/squirm/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://www.senet.com.au/squirm/ \
EXTRACT_SUFX= .tgz
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A fast & configurable redirector for the Squid
RUN_DEPENDS= ${LOCALBASE}/sbin/squid:${PORTSDIR}/www/squid24
diff --git a/www/squirm/pkg-comment b/www/squirm/pkg-comment
deleted file mode 100644
index 38185d48435f..000000000000
--- a/www/squirm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fast & configurable redirector for the Squid
diff --git a/www/squishdot/Makefile b/www/squishdot/Makefile
index 14df9f76b40f..1d1d6afa7ae1 100644
--- a/www/squishdot/Makefile
+++ b/www/squishdot/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://squishdot.org/Download/Squishdot/ \
DISTNAME= Squishdot-${PORTVERSION:S/./-/g}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A web-based news publishing and discussion product for Zope
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/squishdot/pkg-comment b/www/squishdot/pkg-comment
deleted file mode 100644
index 93b9652649cc..000000000000
--- a/www/squishdot/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A web-based news publishing and discussion product for Zope
diff --git a/www/tclhttpd/Makefile b/www/tclhttpd/Makefile
index 884931097d72..00e57d23e575 100644
--- a/www/tclhttpd/Makefile
+++ b/www/tclhttpd/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= httpd
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= mi@aldan.algebra.com
+COMMENT= An http-server implemented in TCL
RUN_DEPENDS= ${LOCALBASE}/lib/tcllib1.2/pkgIndex.tcl:${PORTSDIR}/devel/tcllib
LIB_DEPENDS= tcl${TCL_VER}:${PORTSDIR}/lang/tcl${TCL_VER}
diff --git a/www/tclhttpd/pkg-comment b/www/tclhttpd/pkg-comment
deleted file mode 100644
index e7c8d52ae9ba..000000000000
--- a/www/tclhttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An http-server implemented in TCL
diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
index 4a37667099a0..0c3b2a297d9c 100644
--- a/www/thttpd/Makefile
+++ b/www/thttpd/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= anders@FreeBSD.org
+COMMENT= Tiny/turbo/throttling HTTP server
IGNOREFILES= notes.html
diff --git a/www/thttpd/pkg-comment b/www/thttpd/pkg-comment
deleted file mode 100644
index 4b7de6bfa792..000000000000
--- a/www/thttpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Tiny/turbo/throttling HTTP server
diff --git a/www/tomcat41/Makefile b/www/tomcat41/Makefile
index 1f3c3466dab7..ba710cd62633 100644
--- a/www/tomcat41/Makefile
+++ b/www/tomcat41/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://jakarta.apache.org/builds/jakarta-tomcat-4.0/release/v${POR
MASTER_SITE_SUBDIR= znerd
MAINTAINER= znerd@FreeBSD.org
+COMMENT= Open-source Java web server by Apache, stable 4.1.x branch
USE_JAVA= 1.2+
NO_BUILD= YES
diff --git a/www/tomcat41/pkg-comment b/www/tomcat41/pkg-comment
deleted file mode 100644
index 865cad15732a..000000000000
--- a/www/tomcat41/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Open-source Java web server by Apache, stable 4.1.x branch
diff --git a/www/transproxy/Makefile b/www/transproxy/Makefile
index 7215df90ea15..fae843db3948 100644
--- a/www/transproxy/Makefile
+++ b/www/transproxy/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.nlc.net.au/pub/unix/transproxy/
EXTRACT_SUFX= .tgz
MAINTAINER= ports@FreeBSD.org
+COMMENT= Transparent HTTP proxy for ipfw's fwd rule (or IPFILTER's ipnat command)
MAN8= tproxy.8
diff --git a/www/transproxy/pkg-comment b/www/transproxy/pkg-comment
deleted file mode 100644
index b60d479685de..000000000000
--- a/www/transproxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transparent HTTP proxy for ipfw's fwd rule (or IPFILTER's ipnat command)
diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile
index b76d31cdf681..9574c8ed8469 100644
--- a/www/udmsearch/Makefile
+++ b/www/udmsearch/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://mysearch.udm.net/Download/ \
http://mirror.kuenzler.ch/udmsearch/Download/
MAINTAINER= demon@FreeBSD.org
+COMMENT= Full featured SQL-based hypertext search engine
MAN1= indexer.1
MAN5= indexer.conf.5
diff --git a/www/udmsearch/pkg-comment b/www/udmsearch/pkg-comment
deleted file mode 100644
index 16cd6e026f50..000000000000
--- a/www/udmsearch/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Full featured SQL-based hypertext search engine
diff --git a/www/viewml/Makefile b/www/viewml/Makefile
index fa59e94e74c5..888082ea5946 100644
--- a/www/viewml/Makefile
+++ b/www/viewml/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= www
MASTER_SITES= ftp://ftp.viewml.com/pub/viewml/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An open source web browser targeted at the embedded platforms
BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \
diff --git a/www/viewml/pkg-comment b/www/viewml/pkg-comment
deleted file mode 100644
index 66789cd36f13..000000000000
--- a/www/viewml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open source web browser targeted at the embedded platforms
diff --git a/www/w3-4/Makefile b/www/w3-4/Makefile
index 8b778411e70d..29c380006f3e 100644
--- a/www/w3-4/Makefile
+++ b/www/w3-4/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= emacs-w3
DISTNAME= w3-4.0pre.46
MAINTAINER= kiri@FreeBSD.org
+COMMENT= WWW browser based on emacs/mule
BUILD_DEPENDS?= emacs-20.7:${PORTSDIR}/editors/emacs20
RUN_DEPENDS?= emacs-20.7:${PORTSDIR}/editors/emacs20
diff --git a/www/w3-4/pkg-comment b/www/w3-4/pkg-comment
deleted file mode 100644
index f40be1afb337..000000000000
--- a/www/w3-4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-WWW browser based on emacs/mule
diff --git a/www/w3mir/Makefile b/www/w3mir/Makefile
index 618e9ed12c22..6c5ebed77bc0 100644
--- a/www/w3mir/Makefile
+++ b/www/w3mir/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= www perl5
MASTER_SITES= http://langfeldt.net/w3mir/
MAINTAINER= ache@freebsd.org
+COMMENT= All-purpose HTTP copying and mirroring tool
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/LWP.pm:${PORTSDIR}/www/p5-libwww
diff --git a/www/w3mir/pkg-comment b/www/w3mir/pkg-comment
deleted file mode 100644
index b39952793194..000000000000
--- a/www/w3mir/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-All-purpose HTTP copying and mirroring tool
diff --git a/www/wcol/Makefile b/www/wcol/Makefile
index 8b8c83583d75..534da4259993 100644
--- a/www/wcol/Makefile
+++ b/www/wcol/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://shika.aist-nara.ac.jp/products/DEST/Wcol/
DISTNAME= wcolEpre.990110_150126
MAINTAINER= shige@FreeBSD.org
+COMMENT= A prefetching proxy server for WWW
WRKSRC= ${WRKDIR}/${DISTNAME}/src
diff --git a/www/wcol/pkg-comment b/www/wcol/pkg-comment
deleted file mode 100644
index 7af386ff1510..000000000000
--- a/www/wcol/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A prefetching proxy server for WWW
diff --git a/www/webcrawl/Makefile b/www/webcrawl/Makefile
index 915b48b9a69b..ae266e6b90ad 100644
--- a/www/webcrawl/Makefile
+++ b/www/webcrawl/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= apps/www/mirroring
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= Download web sites without user interaction by following links
ALL_TARGET=
diff --git a/www/webcrawl/pkg-comment b/www/webcrawl/pkg-comment
deleted file mode 100644
index 93ac2f31e8ef..000000000000
--- a/www/webcrawl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Download web sites without user interaction by following links
diff --git a/www/webfs/Makefile b/www/webfs/Makefile
index fb3efe6982cd..cb80254ce4fa 100644
--- a/www/webfs/Makefile
+++ b/www/webfs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://bytesex.org/misc/
DISTNAME= ${PORTNAME}_${PORTVERSION}
MAINTAINER= jedgar@FreeBSD.org
+COMMENT= A simple http server for static content
WRKSRC= ${WRKDIR}/${DISTNAME:S/_/-/}
USE_REINPLACE= yes
diff --git a/www/webfs/pkg-comment b/www/webfs/pkg-comment
deleted file mode 100644
index 83c5f075806d..000000000000
--- a/www/webfs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple http server for static content
diff --git a/www/wsmake/Makefile b/www/wsmake/Makefile
index cf20053dede1..4a5e31853ef0 100644
--- a/www/wsmake/Makefile
+++ b/www/wsmake/Makefile
@@ -18,6 +18,7 @@ DIST_SUBDIR= wsmake
EXTRACT_ONLY= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= jkoshy@freebsd.org
+COMMENT= Software for production and maintenance of web sites
USE_BZIP2= YES
GNU_CONFIGURE= YES
diff --git a/www/wsmake/pkg-comment b/www/wsmake/pkg-comment
deleted file mode 100644
index d1f1c6d70a23..000000000000
--- a/www/wsmake/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Software for production and maintenance of web sites
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 10898d21642d..a29625a8cebd 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.gedanken.freeserve.co.uk/download-wwwoffle/
EXTRACT_SUFX= .tgz
MAINTAINER= sumikawa@FreeBSD.org
+COMMENT= A caching proxy server for HTTP and FTP designed for dial-up hosts
USE_PERL5= yes
USE_GMAKE= yes
diff --git a/www/wwwoffle/pkg-comment b/www/wwwoffle/pkg-comment
deleted file mode 100644
index 7173e6333996..000000000000
--- a/www/wwwoffle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A caching proxy server for HTTP and FTP designed for dial-up hosts
diff --git a/www/wwwstat/Makefile b/www/wwwstat/Makefile
index c21635a50a5e..6f5b431d7d02 100644
--- a/www/wwwstat/Makefile
+++ b/www/wwwstat/Makefile
@@ -16,6 +16,7 @@ PATCH_SITES= ${MASTER_SITES}
PATCHFILES= patch-2.01.txt
MAINTAINER= demon@FreeBSD.org
+COMMENT= Webserver logfile analysis package
RUN_DEPENDS= ${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/www/apache13
diff --git a/www/wwwstat/pkg-comment b/www/wwwstat/pkg-comment
deleted file mode 100644
index 9fcf6b8cbb59..000000000000
--- a/www/wwwstat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Webserver logfile analysis package
diff --git a/www/znavigator/Makefile b/www/znavigator/Makefile
index 4b658dac9cba..c6b6bad4c683 100644
--- a/www/znavigator/Makefile
+++ b/www/znavigator/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${ZOPEPRODUCTNAME}-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A Zope product to simplify the construction of navigation bars
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/znavigator/pkg-comment b/www/znavigator/pkg-comment
deleted file mode 100644
index 0673e50205c2..000000000000
--- a/www/znavigator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Zope product to simplify the construction of navigation bars
diff --git a/www/zope-cmf/Makefile b/www/zope-cmf/Makefile
index c9fad5db4f6b..7bf8e2d71798 100644
--- a/www/zope-cmf/Makefile
+++ b/www/zope-cmf/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://cmf.zope.org/download/CMF-${PORTVERSION}/
DISTNAME= CMF-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= The Zope Content Management Framework (CMF)
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/zope-cmf/pkg-comment b/www/zope-cmf/pkg-comment
deleted file mode 100644
index 476da3e89f5f..000000000000
--- a/www/zope-cmf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Zope Content Management Framework (CMF)
diff --git a/www/zope-cmfforum/Makefile b/www/zope-cmfforum/Makefile
index 4b8d62c6df80..93ecd73784c1 100644
--- a/www/zope-cmfforum/Makefile
+++ b/www/zope-cmfforum/Makefile
@@ -14,6 +14,7 @@ DISTNAME= CMFForum-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A forum for ZOPE CMF with file attachments
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/zope-cmfforum/pkg-comment b/www/zope-cmfforum/pkg-comment
deleted file mode 100644
index f8367a87bc41..000000000000
--- a/www/zope-cmfforum/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A forum for ZOPE CMF with file attachments
diff --git a/www/zope-guf/Makefile b/www/zope-guf/Makefile
index a3d634528b94..82532ecca252 100644
--- a/www/zope-guf/Makefile
+++ b/www/zope-guf/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${ZOPEPRODUCTNAME}-${PORTVERSION:S|.|-|g}
EXTRACT_SUFX= .tgz
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A roll-your-own user folder product for Zope
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/zope-guf/pkg-comment b/www/zope-guf/pkg-comment
deleted file mode 100644
index fcc894d5314c..000000000000
--- a/www/zope-guf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A roll-your-own user folder product for Zope
diff --git a/www/zope-zmysqlda/Makefile b/www/zope-zmysqlda/Makefile
index 07143bff9510..ec50d8f3401c 100644
--- a/www/zope-zmysqlda/Makefile
+++ b/www/zope-zmysqlda/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= zope-
DISTNAME= ${ZOPEPRODUCTNAME}-${PORTVERSION}
MAINTAINER= wjv@FreeBSD.org
+COMMENT= MySQL Database Adapter for the Zope web application framework
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope \
${LOCALBASE}/lib/${PYTHON_VERSION}/site-packages/MySQLdb/__init__.py:${PORTSDIR}/databases/py-MySQLdb
diff --git a/www/zope-zmysqlda/pkg-comment b/www/zope-zmysqlda/pkg-comment
deleted file mode 100644
index c5f7489e44f7..000000000000
--- a/www/zope-zmysqlda/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MySQL Database Adapter for the Zope web application framework
diff --git a/www/zope-zpt/Makefile b/www/zope-zpt/Makefile
index ff4239aecf8f..5de4f48c487d 100644
--- a/www/zope-zpt/Makefile
+++ b/www/zope-zpt/Makefile
@@ -15,6 +15,7 @@ DISTFILES= PageTemplates-${PORTVERSION}.tar.gz \
ZTUtils-${ZTUVERSION}.tar.gz
MAINTAINER= wjv@FreeBSD.org
+COMMENT= Zope Page Templates separate design and logic in Zope applications
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/zope-zpt/pkg-comment b/www/zope-zpt/pkg-comment
deleted file mode 100644
index 4b807b8468da..000000000000
--- a/www/zope-zpt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Zope Page Templates separate design and logic in Zope applications
diff --git a/www/zope-zwiki/Makefile b/www/zope-zwiki/Makefile
index ae7a8d747923..8501009cc71e 100644
--- a/www/zope-zwiki/Makefile
+++ b/www/zope-zwiki/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ZWiki-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= wjv@FreeBSD.org
+COMMENT= A WikiWikiWeb product for Zope
RUN_DEPENDS= ${LOCALBASE}/${SZOPEBASEDIR}/z2.py:${PORTSDIR}/www/zope
diff --git a/www/zope-zwiki/pkg-comment b/www/zope-zwiki/pkg-comment
deleted file mode 100644
index 3452e145e570..000000000000
--- a/www/zope-zwiki/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WikiWikiWeb product for Zope
diff --git a/www/zope/Makefile b/www/zope/Makefile
index dfa795b37bdf..e1b9fe731ca0 100644
--- a/www/zope/Makefile
+++ b/www/zope/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= An object-based web application platform with DB access, WebDAV, & more
USE_PYTHON= yes
PYTHON_VERSION= python2.1
diff --git a/www/zope/pkg-comment b/www/zope/pkg-comment
deleted file mode 100644
index 6a6a6bd0ce77..000000000000
--- a/www/zope/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-based web application platform with DB access, WebDAV, & more
diff --git a/www/zope210/Makefile b/www/zope210/Makefile
index dfa795b37bdf..e1b9fe731ca0 100644
--- a/www/zope210/Makefile
+++ b/www/zope210/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= An object-based web application platform with DB access, WebDAV, & more
USE_PYTHON= yes
PYTHON_VERSION= python2.1
diff --git a/www/zope210/pkg-comment b/www/zope210/pkg-comment
deleted file mode 100644
index 6a6a6bd0ce77..000000000000
--- a/www/zope210/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-based web application platform with DB access, WebDAV, & more
diff --git a/www/zope211/Makefile b/www/zope211/Makefile
index dfa795b37bdf..e1b9fe731ca0 100644
--- a/www/zope211/Makefile
+++ b/www/zope211/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= An object-based web application platform with DB access, WebDAV, & more
USE_PYTHON= yes
PYTHON_VERSION= python2.1
diff --git a/www/zope211/pkg-comment b/www/zope211/pkg-comment
deleted file mode 100644
index 6a6a6bd0ce77..000000000000
--- a/www/zope211/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-based web application platform with DB access, WebDAV, & more
diff --git a/www/zope213/Makefile b/www/zope213/Makefile
index dfa795b37bdf..e1b9fe731ca0 100644
--- a/www/zope213/Makefile
+++ b/www/zope213/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= An object-based web application platform with DB access, WebDAV, & more
USE_PYTHON= yes
PYTHON_VERSION= python2.1
diff --git a/www/zope213/pkg-comment b/www/zope213/pkg-comment
deleted file mode 100644
index 6a6a6bd0ce77..000000000000
--- a/www/zope213/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-based web application platform with DB access, WebDAV, & more
diff --git a/www/zope28/Makefile b/www/zope28/Makefile
index dfa795b37bdf..e1b9fe731ca0 100644
--- a/www/zope28/Makefile
+++ b/www/zope28/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= An object-based web application platform with DB access, WebDAV, & more
USE_PYTHON= yes
PYTHON_VERSION= python2.1
diff --git a/www/zope28/pkg-comment b/www/zope28/pkg-comment
deleted file mode 100644
index 6a6a6bd0ce77..000000000000
--- a/www/zope28/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-based web application platform with DB access, WebDAV, & more
diff --git a/www/zope29/Makefile b/www/zope29/Makefile
index dfa795b37bdf..e1b9fe731ca0 100644
--- a/www/zope29/Makefile
+++ b/www/zope29/Makefile
@@ -14,6 +14,7 @@ DISTNAME= Zope-${PORTVERSION}-src
EXTRACT_SUFX= .tgz
MAINTAINER= alane@FreeBSD.org
+COMMENT= An object-based web application platform with DB access, WebDAV, & more
USE_PYTHON= yes
PYTHON_VERSION= python2.1
diff --git a/www/zope29/pkg-comment b/www/zope29/pkg-comment
deleted file mode 100644
index 6a6a6bd0ce77..000000000000
--- a/www/zope29/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An object-based web application platform with DB access, WebDAV, & more
diff --git a/x11-clocks/asclock/Makefile b/x11-clocks/asclock/Makefile
index 0721c81f53e8..0a8129ee1fa6 100644
--- a/x11-clocks/asclock/Makefile
+++ b/x11-clocks/asclock/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Afterstep clock with some language extentions
USE_IMAKE= yes
USE_XPM= yes
diff --git a/x11-clocks/asclock/pkg-comment b/x11-clocks/asclock/pkg-comment
deleted file mode 100644
index d90a467c3110..000000000000
--- a/x11-clocks/asclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Afterstep clock with some language extentions
diff --git a/x11-clocks/astime/Makefile b/x11-clocks/astime/Makefile
index 61f5e4f8482f..90af0a947292 100644
--- a/x11-clocks/astime/Makefile
+++ b/x11-clocks/astime/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.afterstep.org/apps/astime/ \
ftp://ftp.tux.org/pub/x/afterstep/apps/astime/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Time/Date applet for WindowMaker
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-clocks/astime/pkg-comment b/x11-clocks/astime/pkg-comment
deleted file mode 100644
index 4fd1a2b999ca..000000000000
--- a/x11-clocks/astime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Time/Date applet for WindowMaker
diff --git a/x11-clocks/eyeclock/Makefile b/x11-clocks/eyeclock/Makefile
index d3903372d4f5..5f222351f21e 100644
--- a/x11-clocks/eyeclock/Makefile
+++ b/x11-clocks/eyeclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks
MASTER_SITES= http://www.seki.ee.kagu.sut.ac.jp/~sakai/
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A clock with eyes following the mouse pointer
#ALL_TARGET= all
diff --git a/x11-clocks/eyeclock/pkg-comment b/x11-clocks/eyeclock/pkg-comment
deleted file mode 100644
index 438a0982d0f6..000000000000
--- a/x11-clocks/eyeclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clock with eyes following the mouse pointer
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 59444817b9c9..e6eee1b891f3 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Small applications for KDE
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/x11-clocks/kdetoys3/pkg-comment b/x11-clocks/kdetoys3/pkg-comment
deleted file mode 100644
index b3d58d0a1be9..000000000000
--- a/x11-clocks/kdetoys3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small applications for KDE
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 59444817b9c9..e6eee1b891f3 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Small applications for KDE
USE_KDELIBS_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/x11-clocks/kdetoys4/pkg-comment b/x11-clocks/kdetoys4/pkg-comment
deleted file mode 100644
index b3d58d0a1be9..000000000000
--- a/x11-clocks/kdetoys4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small applications for KDE
diff --git a/x11-clocks/mlclock/Makefile b/x11-clocks/mlclock/Makefile
index 4b8aecaf97ff..1bac399862a8 100644
--- a/x11-clocks/mlclock/Makefile
+++ b/x11-clocks/mlclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks
MASTER_SITES= http://www.hry.info.gifu-u.ac.jp/~hideki/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Clock for mlvwm window manager
USE_IMAKE= yes
WRKSRC= ${WRKDIR}/mlclock
diff --git a/x11-clocks/mlclock/pkg-comment b/x11-clocks/mlclock/pkg-comment
deleted file mode 100644
index 87ddde1e4f58..000000000000
--- a/x11-clocks/mlclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clock for mlvwm window manager
diff --git a/x11-clocks/pclock/Makefile b/x11-clocks/pclock/Makefile
index 97a798ce7a5c..1ef63d6ce983 100644
--- a/x11-clocks/pclock/Makefile
+++ b/x11-clocks/pclock/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.kourakos.com/pub/pclock/
EXTRACT_SUFX= .tgz
MAINTAINER= jim@FreeBSD.org
+COMMENT= Simple analog clock program for the Window Maker dock
USE_GMAKE= yes
USE_X_PREFIX= yes
diff --git a/x11-clocks/pclock/pkg-comment b/x11-clocks/pclock/pkg-comment
deleted file mode 100644
index 68212dd8f30f..000000000000
--- a/x11-clocks/pclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple analog clock program for the Window Maker dock
diff --git a/x11-clocks/sanduhr/Makefile b/x11-clocks/sanduhr/Makefile
index 84af5bbdb4f5..db95c157fa1e 100644
--- a/x11-clocks/sanduhr/Makefile
+++ b/x11-clocks/sanduhr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks gnome
MASTER_SITES= http://www.mathematik.uni-kl.de/~wwwstoch/voss/
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= An alarm clock for GNOME desktop designed as a sand-glass
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-clocks/sanduhr/pkg-comment b/x11-clocks/sanduhr/pkg-comment
deleted file mode 100644
index 7d016927fbc8..000000000000
--- a/x11-clocks/sanduhr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An alarm clock for GNOME desktop designed as a sand-glass
diff --git a/x11-clocks/washerdryer/Makefile b/x11-clocks/washerdryer/Makefile
index f15f4c9f4508..f6eddf22c692 100644
--- a/x11-clocks/washerdryer/Makefile
+++ b/x11-clocks/washerdryer/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://lucille.dhs.org/
DISTNAME= washerDryer-${PORTVERSION}
MAINTAINER= pat@FreeBSD.org
+COMMENT= A dockapp that keeps track of the loads in your washer and dryer
WRKSRC= ${WRKDIR}/${DISTNAME}/washerDryer
USE_X_PREFIX= yes
diff --git a/x11-clocks/washerdryer/pkg-comment b/x11-clocks/washerdryer/pkg-comment
deleted file mode 100644
index 86a32a066423..000000000000
--- a/x11-clocks/washerdryer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockapp that keeps track of the loads in your washer and dryer
diff --git a/x11-clocks/wmcalclock/Makefile b/x11-clocks/wmcalclock/Makefile
index ec59846c3df3..01f4b52e86f3 100644
--- a/x11-clocks/wmcalclock/Makefile
+++ b/x11-clocks/wmcalclock/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://nis-www.lanl.gov/~mgh/WindowMaker/
MAINTAINER= kris@FreeBSD.org
+COMMENT= Another Window Maker calendar/clock dockapp
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
diff --git a/x11-clocks/wmcalclock/pkg-comment b/x11-clocks/wmcalclock/pkg-comment
deleted file mode 100644
index c25bd589ee92..000000000000
--- a/x11-clocks/wmcalclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Another Window Maker calendar/clock dockapp
diff --git a/x11-clocks/wmclockmon/Makefile b/x11-clocks/wmclockmon/Makefile
index ba150aa4dfaa..bbf97674aff0 100644
--- a/x11-clocks/wmclockmon/Makefile
+++ b/x11-clocks/wmclockmon/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://tnemeth.free.fr/projets/programmes/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A digital clock dockapp with a similar look to wmcpuload
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-clocks/wmclockmon/pkg-comment b/x11-clocks/wmclockmon/pkg-comment
deleted file mode 100644
index afe72b52e93c..000000000000
--- a/x11-clocks/wmclockmon/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A digital clock dockapp with a similar look to wmcpuload
diff --git a/x11-clocks/wmdate/Makefile b/x11-clocks/wmdate/Makefile
index 9ea09654fd04..aee1baafd25f 100644
--- a/x11-clocks/wmdate/Makefile
+++ b/x11-clocks/wmdate/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://solfertje.student.utwente.nl/~dalroi/apps/ \
http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
+COMMENT= Date app for the WindowMaker dock
BUILD_DEPENDS= ${X11BASE}/include/dockapp.h:${PORTSDIR}/x11-wm/libdockapp
diff --git a/x11-clocks/wmdate/pkg-comment b/x11-clocks/wmdate/pkg-comment
deleted file mode 100644
index 1353864037d0..000000000000
--- a/x11-clocks/wmdate/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Date app for the WindowMaker dock
diff --git a/x11-clocks/wmfishtime/Makefile b/x11-clocks/wmfishtime/Makefile
index c30e8a8010cb..a93ac7669405 100644
--- a/x11-clocks/wmfishtime/Makefile
+++ b/x11-clocks/wmfishtime/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.ne.jp/asahi/linux/timecop/software/ \
http://atreides.freenix.no/~anders/
MAINTAINER= anders@FreeBSD.org
+COMMENT= A time/date applet for WindowMaker with fishes swimming around
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/x11-clocks/wmfishtime/pkg-comment b/x11-clocks/wmfishtime/pkg-comment
deleted file mode 100644
index b4543cb37432..000000000000
--- a/x11-clocks/wmfishtime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A time/date applet for WindowMaker with fishes swimming around
diff --git a/x11-clocks/wmfuzzy/Makefile b/x11-clocks/wmfuzzy/Makefile
index f83c90c66698..bf4d5c1e6084 100644
--- a/x11-clocks/wmfuzzy/Makefile
+++ b/x11-clocks/wmfuzzy/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.manicai.net/comp/wmfuzzy/
EXTRACT_SUFX= .tgz
MAINTAINER= adamw@FreeBSD.org
+COMMENT= A fuzzy clock WindowMaker dockapp
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/x11-clocks/wmfuzzy/pkg-comment b/x11-clocks/wmfuzzy/pkg-comment
deleted file mode 100644
index 6fc0c95a2cb3..000000000000
--- a/x11-clocks/wmfuzzy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A fuzzy clock WindowMaker dockapp
diff --git a/x11-clocks/wmitime/Makefile b/x11-clocks/wmitime/Makefile
index da8d1b0ec526..3a5ca2142a6c 100644
--- a/x11-clocks/wmitime/Makefile
+++ b/x11-clocks/wmitime/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://www.neotokyo.org/illusion/downloads/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A clock dockapp that shows the date, time, and internet time
WRKSRC= ${WRKDIR}/wmitime/wmitime
diff --git a/x11-clocks/wmitime/pkg-comment b/x11-clocks/wmitime/pkg-comment
deleted file mode 100644
index ea34d63a9e01..000000000000
--- a/x11-clocks/wmitime/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clock dockapp that shows the date, time, and internet time
diff --git a/x11-clocks/wmtimer/Makefile b/x11-clocks/wmtimer/Makefile
index 3bc6da676d4f..baf0f8e9e2b5 100644
--- a/x11-clocks/wmtimer/Makefile
+++ b/x11-clocks/wmtimer/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-clocks windowmaker
MASTER_SITES= http://home.dwave.net/~jking/wmtimer/
MAINTAINER= pat@FreeBSD.org
+COMMENT= Multi-Function timer dockapp for WindowMaker
WRKSRC= ${WRKDIR}/${DISTNAME}/wmtimer
USE_GMAKE= yes
diff --git a/x11-clocks/wmtimer/pkg-comment b/x11-clocks/wmtimer/pkg-comment
deleted file mode 100644
index 53e8c8ef3ec8..000000000000
--- a/x11-clocks/wmtimer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi-Function timer dockapp for WindowMaker
diff --git a/x11-clocks/wmtz/Makefile b/x11-clocks/wmtz/Makefile
index b28bb2913895..0f1f99bf3ff5 100644
--- a/x11-clocks/wmtz/Makefile
+++ b/x11-clocks/wmtz/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.geocities.com/jl1n/wmtz/ \
http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
+COMMENT= Dockapp that displays the time in different time zones
USE_GMAKE= yes
WRKSRC= ${WRKDIR}/${DISTNAME}/wmtz
diff --git a/x11-clocks/wmtz/pkg-comment b/x11-clocks/wmtz/pkg-comment
deleted file mode 100644
index 91ed4e8c0812..000000000000
--- a/x11-clocks/wmtz/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Dockapp that displays the time in different time zones
diff --git a/x11-clocks/xdaliclock/Makefile b/x11-clocks/xdaliclock/Makefile
index a55b2424cda9..54caf428dfee 100644
--- a/x11-clocks/xdaliclock/Makefile
+++ b/x11-clocks/xdaliclock/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.jwz.org/xdaliclock/ \
MASTER_SITE_SUBDIR= applications
MAINTAINER= gpalmer@FreeBSD.org
+COMMENT= A rather neat animated clock
MAN1= xdaliclock.1
diff --git a/x11-clocks/xdaliclock/pkg-comment b/x11-clocks/xdaliclock/pkg-comment
deleted file mode 100644
index db1a5b7aa576..000000000000
--- a/x11-clocks/xdaliclock/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A rather neat animated clock
diff --git a/x11-fm/binder/Makefile b/x11-fm/binder/Makefile
index 24316aa9df0c..d1a1319631c9 100644
--- a/x11-fm/binder/Makefile
+++ b/x11-fm/binder/Makefile
@@ -13,6 +13,7 @@ DISTNAME= Binder-${PORTVERSION}
EXTRACT_ONLY= # extracted directly in install target
MAINTAINER= kiri@pis.toba-cmt.ac.jp
+COMMENT= A file manager on X window with TkStep
RUN_DEPENDS= ${RUN_DEP_LIST}
LIB_DEPENDS= ${LIB_DEP_LIST}
diff --git a/x11-fm/binder/pkg-comment b/x11-fm/binder/pkg-comment
deleted file mode 100644
index 2121ec35e73a..000000000000
--- a/x11-fm/binder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A file manager on X window with TkStep
diff --git a/x11-fm/cfm/Makefile b/x11-fm/cfm/Makefile
index 281fa2f9ea8d..b6876ae56544 100644
--- a/x11-fm/cfm/Makefile
+++ b/x11-fm/cfm/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-fm
MASTER_SITES= http://www.rpi.edu/~mullr/cfm/dist/
MAINTAINER= petef@FreeBSD.org
+COMMENT= Quick Perl/Tk file manager with support for regular expressions
RUN_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk
diff --git a/x11-fm/cfm/pkg-comment b/x11-fm/cfm/pkg-comment
deleted file mode 100644
index cb9e66423060..000000000000
--- a/x11-fm/cfm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Quick Perl/Tk file manager with support for regular expressions
diff --git a/x11-fm/filerunner/Makefile b/x11-fm/filerunner/Makefile
index a14d0402e922..f7bf463ebe78 100644
--- a/x11-fm/filerunner/Makefile
+++ b/x11-fm/filerunner/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= X11/desktop
DISTNAME= FileRunner-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= Filemanager with FTP capabilities. Uses Tcl/Tk
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/x11-fm/filerunner/pkg-comment b/x11-fm/filerunner/pkg-comment
deleted file mode 100644
index fb0310605176..000000000000
--- a/x11-fm/filerunner/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Filemanager with FTP capabilities. Uses Tcl/Tk
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile
index 56e7ac2b46d8..5f3793ba12f5 100644
--- a/x11-fm/nautilus/Makefile
+++ b/x11-fm/nautilus/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME file manager and graphical shell developed by Eazel
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= medusa.0:${PORTSDIR}/sysutils/medusa \
diff --git a/x11-fm/nautilus/pkg-comment b/x11-fm/nautilus/pkg-comment
deleted file mode 100644
index 846cbed6b414..000000000000
--- a/x11-fm/nautilus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME file manager and graphical shell developed by Eazel
diff --git a/x11-fm/nautilus2/Makefile b/x11-fm/nautilus2/Makefile
index 0fdf55410caa..6647960662f8 100644
--- a/x11-fm/nautilus2/Makefile
+++ b/x11-fm/nautilus2/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= gnome2
DISTNAME= nautilus-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME file manager and graphical shell developed by Eazel
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2
LIB_DEPENDS= rsvg-2.4:${PORTSDIR}/graphics/librsvg2 \
diff --git a/x11-fm/nautilus2/pkg-comment b/x11-fm/nautilus2/pkg-comment
deleted file mode 100644
index 846cbed6b414..000000000000
--- a/x11-fm/nautilus2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNOME file manager and graphical shell developed by Eazel
diff --git a/x11-fm/rox-base/Makefile b/x11-fm/rox-base/Makefile
index 374567afd50b..5a78b48f1cb1 100644
--- a/x11-fm/rox-base/Makefile
+++ b/x11-fm/rox-base/Makefile
@@ -13,6 +13,7 @@ DISTNAME= rox-base-${PORTVERSION}
EXTRACT_SUFX= .tgz
MAINTAINER= olgeni@FreeBSD.org
+COMMENT= Resources needed by several ROX desktop applications
NO_BUILD= yes
diff --git a/x11-fm/rox-base/pkg-comment b/x11-fm/rox-base/pkg-comment
deleted file mode 100644
index 7d711b397cdc..000000000000
--- a/x11-fm/rox-base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Resources needed by several ROX desktop applications
diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile
index 469cd1547861..62f2627689f0 100644
--- a/x11-fm/xnc/Makefile
+++ b/x11-fm/xnc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.xnc.dubna.su/src-5/
DISTNAME= ${PORTNAME}-${PORTVERSION}.src
MAINTAINER= demon@FreeBSD.org
+COMMENT= File manager for X Window
# xnc will use the following programs if you have them installed.
#RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
diff --git a/x11-fm/xnc/pkg-comment b/x11-fm/xnc/pkg-comment
deleted file mode 100644
index 8d947394ff77..000000000000
--- a/x11-fm/xnc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-File manager for X Window
diff --git a/x11-fonts/XFree86-4-font100dpi/Makefile b/x11-fonts/XFree86-4-font100dpi/Makefile
index e994da3180ee..cb9dab40fbf4 100644
--- a/x11-fonts/XFree86-4-font100dpi/Makefile
+++ b/x11-fonts/XFree86-4-font100dpi/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= XFree86-
DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 bitmap 100 dpi fonts
BUILD_DEPENDS= ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
diff --git a/x11-fonts/XFree86-4-font100dpi/pkg-comment b/x11-fonts/XFree86-4-font100dpi/pkg-comment
deleted file mode 100644
index 33a39e114b2d..000000000000
--- a/x11-fonts/XFree86-4-font100dpi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 bitmap 100 dpi fonts
diff --git a/x11-fonts/XFree86-4-font75dpi/Makefile b/x11-fonts/XFree86-4-font75dpi/Makefile
index 935b3124846b..6655d28ef3f7 100644
--- a/x11-fonts/XFree86-4-font75dpi/Makefile
+++ b/x11-fonts/XFree86-4-font75dpi/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= XFree86-
DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 bitmap 75 dpi fonts
BUILD_DEPENDS= ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
diff --git a/x11-fonts/XFree86-4-font75dpi/pkg-comment b/x11-fonts/XFree86-4-font75dpi/pkg-comment
deleted file mode 100644
index eb2b1b5f10a1..000000000000
--- a/x11-fonts/XFree86-4-font75dpi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 bitmap 75 dpi fonts
diff --git a/x11-fonts/XFree86-4-fontCyrillic/Makefile b/x11-fonts/XFree86-4-fontCyrillic/Makefile
index 7aec94fd5411..662894f50f96 100644
--- a/x11-fonts/XFree86-4-fontCyrillic/Makefile
+++ b/x11-fonts/XFree86-4-fontCyrillic/Makefile
@@ -17,6 +17,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz:x \
xrus-2.3.1-xf4-bdf.tgz:xrus
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 Cyrillic Fonts
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
diff --git a/x11-fonts/XFree86-4-fontCyrillic/pkg-comment b/x11-fonts/XFree86-4-fontCyrillic/pkg-comment
deleted file mode 100644
index 63f1da91fbd2..000000000000
--- a/x11-fonts/XFree86-4-fontCyrillic/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Cyrillic Fonts
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
index af89dfbb9f55..e30fd1afc3e1 100644
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
+++ b/x11-fonts/XFree86-4-fontDefaultBitmaps/Makefile
@@ -15,6 +15,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz X${PORTVERSION:S/.//g}src-2.tgz
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-2.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 default bitmap fonts
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
diff --git a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-comment b/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-comment
deleted file mode 100644
index 5fc5f0458247..000000000000
--- a/x11-fonts/XFree86-4-fontDefaultBitmaps/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 default bitmap fonts
diff --git a/x11-fonts/XFree86-4-fontEncodings/Makefile b/x11-fonts/XFree86-4-fontEncodings/Makefile
index 0e4d2ce0188a..5ad6d899b956 100644
--- a/x11-fonts/XFree86-4-fontEncodings/Makefile
+++ b/x11-fonts/XFree86-4-fontEncodings/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= XFree86-
DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 font encoding files
BUILD_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-fonts/XFree86-4-fontEncodings/pkg-comment b/x11-fonts/XFree86-4-fontEncodings/pkg-comment
deleted file mode 100644
index fd9d239fdbef..000000000000
--- a/x11-fonts/XFree86-4-fontEncodings/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 font encoding files
diff --git a/x11-fonts/XFree86-4-fontScalable/Makefile b/x11-fonts/XFree86-4-fontScalable/Makefile
index 1daedb587c8e..3364a267156e 100644
--- a/x11-fonts/XFree86-4-fontScalable/Makefile
+++ b/x11-fonts/XFree86-4-fontScalable/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= XFree86-
DISTFILES= X${PORTVERSION:S/.//g}src-2.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 Scalable font files
BUILD_DEPENDS= ucs2any.pl:${PORTSDIR}/x11/XFree86-4-clients
RUN_DEPENDS= ${X11BASE}/lib/X11/fonts/encodings/encodings.dir:${PORTSDIR}/x11-fonts/XFree86-4-fontEncodings
diff --git a/x11-fonts/XFree86-4-fontScalable/pkg-comment b/x11-fonts/XFree86-4-fontScalable/pkg-comment
deleted file mode 100644
index 160bbd3f3ae3..000000000000
--- a/x11-fonts/XFree86-4-fontScalable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Scalable font files
diff --git a/x11-fonts/bitmap-fonts/Makefile b/x11-fonts/bitmap-fonts/Makefile
index da33e3ebe3de..13d5b81c10dd 100644
--- a/x11-fonts/bitmap-fonts/Makefile
+++ b/x11-fonts/bitmap-fonts/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ftp://ftp.jpl.org/pub/elisp/bitmap/ \
DISTNAME= ${PORTNAME}-${BITMAP_FONTS_VER}
MAINTAINER= shige@FreeBSD.org
+COMMENT= Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86
diff --git a/x11-fonts/bitmap-fonts/pkg-comment b/x11-fonts/bitmap-fonts/pkg-comment
deleted file mode 100644
index 03547860f82e..000000000000
--- a/x11-fonts/bitmap-fonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Bitmap font, (6x12, 7x14, 8x16, 12x24) dots bitmap font
diff --git a/x11-fonts/cyr-rfx/Makefile b/x11-fonts/cyr-rfx/Makefile
index 7be6dc153bae..8b4ad2c2e3d4 100644
--- a/x11-fonts/cyr-rfx/Makefile
+++ b/x11-fonts/cyr-rfx/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ftp.inp.nsk.su/pub/BINP/X11/fonts/cyr-rfx/srctgz
EXTRACT_SUFX= .bdfs.tgz
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Cyrillic X11 bitmap fonts from CYR-RFX project
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients \
mkfontdir:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-fonts/cyr-rfx/pkg-comment b/x11-fonts/cyr-rfx/pkg-comment
deleted file mode 100644
index 8df495f7d68e..000000000000
--- a/x11-fonts/cyr-rfx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cyrillic X11 bitmap fonts from CYR-RFX project
diff --git a/x11-fonts/etlfonts/Makefile b/x11-fonts/etlfonts/Makefile
index 03619940efea..facbce5defe5 100644
--- a/x11-fonts/etlfonts/Makefile
+++ b/x11-fonts/etlfonts/Makefile
@@ -13,6 +13,7 @@ DISTNAME= non-cjk
EXTRACT_SUFX= .tar
MAINTAINER= mita@jp.FreeBSD.org
+COMMENT= X11 supplemental fonts
EXTRACT_CMD= ${TAR}
EXTRACT_BEFORE_ARGS= -xf
diff --git a/x11-fonts/etlfonts/pkg-comment b/x11-fonts/etlfonts/pkg-comment
deleted file mode 100644
index e30d906cd1fe..000000000000
--- a/x11-fonts/etlfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11 supplemental fonts
diff --git a/x11-fonts/geminifonts/Makefile b/x11-fonts/geminifonts/Makefile
index 2ff6934ea655..679b01867c1d 100644
--- a/x11-fonts/geminifonts/Makefile
+++ b/x11-fonts/geminifonts/Makefile
@@ -15,6 +15,7 @@ DISTNAME= x-koi8u
EXTRACT_SUFX= .tgz
MAINTAINER= mi@aldan.algebra.com
+COMMENT= Ukrainian KOI8 fonts for X11R6 (koi8-u)
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86-4-clients
diff --git a/x11-fonts/geminifonts/pkg-comment b/x11-fonts/geminifonts/pkg-comment
deleted file mode 100644
index c718d043b9ba..000000000000
--- a/x11-fonts/geminifonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ukrainian KOI8 fonts for X11R6 (koi8-u)
diff --git a/x11-fonts/getbdf/Makefile b/x11-fonts/getbdf/Makefile
index 09a04d7319b7..3bc308d2e066 100644
--- a/x11-fonts/getbdf/Makefile
+++ b/x11-fonts/getbdf/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tar.Z
MAINTAINER= ache@FreeBSD.org
+COMMENT= Convert any X server font to .bdf format
USE_X_PREFIX= yes
NO_WRKSUBDIR= yes
diff --git a/x11-fonts/getbdf/pkg-comment b/x11-fonts/getbdf/pkg-comment
deleted file mode 100644
index 77c38487c139..000000000000
--- a/x11-fonts/getbdf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Convert any X server font to .bdf format
diff --git a/x11-fonts/intlfonts/Makefile b/x11-fonts/intlfonts/Makefile
index e64a56c65bb9..abc5b12a7010 100644
--- a/x11-fonts/intlfonts/Makefile
+++ b/x11-fonts/intlfonts/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= intlfonts
MAINTAINER= taoka@FreeBSD.org
+COMMENT= Free X11 fonts for all characters that Emacs can handle
BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11/XFree86
RUN_DEPENDS= mkfontdir:${PORTSDIR}/x11/XFree86 \
diff --git a/x11-fonts/intlfonts/pkg-comment b/x11-fonts/intlfonts/pkg-comment
deleted file mode 100644
index 175b0d5ba0f6..000000000000
--- a/x11-fonts/intlfonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Free X11 fonts for all characters that Emacs can handle
diff --git a/x11-fonts/nexfontsel/Makefile b/x11-fonts/nexfontsel/Makefile
index f661d9a3d62a..9bf0e3f4f27f 100644
--- a/x11-fonts/nexfontsel/Makefile
+++ b/x11-fonts/nexfontsel/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.netlab.is.tsukuba.ac.jp/~yokota/archive/
DISTNAME= NeXFontSel-${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT= A neXtaw based replacement for xfontsel
LIB_DEPENDS= neXtaw.${XAWVER}:${PORTSDIR}/x11-toolkits/neXtaw
diff --git a/x11-fonts/nexfontsel/pkg-comment b/x11-fonts/nexfontsel/pkg-comment
deleted file mode 100644
index dd03c7a954df..000000000000
--- a/x11-fonts/nexfontsel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A neXtaw based replacement for xfontsel
diff --git a/x11-fonts/p5-Font-AFM/Makefile b/x11-fonts/p5-Font-AFM/Makefile
index 9dbba931c95c..9c1a7a3c87d4 100644
--- a/x11-fonts/p5-Font-AFM/Makefile
+++ b/x11-fonts/p5-Font-AFM/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= Font
PKGNAMEPREFIX= p5-
MAINTAINER= petef@FreeBSD.org
+COMMENT= An interface to Adobe font metrics files
PERL_CONFIGURE= yes
diff --git a/x11-fonts/p5-Font-AFM/pkg-comment b/x11-fonts/p5-Font-AFM/pkg-comment
deleted file mode 100644
index 737f0112de3a..000000000000
--- a/x11-fonts/p5-Font-AFM/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interface to Adobe font metrics files
diff --git a/x11-fonts/sharefonts/Makefile b/x11-fonts/sharefonts/Makefile
index 58f95b57de88..e230f700bc29 100644
--- a/x11-fonts/sharefonts/Makefile
+++ b/x11-fonts/sharefonts/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-fonts
MASTER_SITES= ftp://ftp.gimp.org/pub/gimp/fonts/
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A collection of shareware ATM fonts from the CICA archives
RESTRICTED= "Shareware. Cannot be distributed w/o prior authorization."
NO_CDROM= ${RESTRICTED}
diff --git a/x11-fonts/sharefonts/pkg-comment b/x11-fonts/sharefonts/pkg-comment
deleted file mode 100644
index 788057a65d55..000000000000
--- a/x11-fonts/sharefonts/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of shareware ATM fonts from the CICA archives
diff --git a/x11-fonts/xfontselector/Makefile b/x11-fonts/xfontselector/Makefile
index 82aec633a52d..fc8a2ed805a4 100644
--- a/x11-fonts/xfontselector/Makefile
+++ b/x11-fonts/xfontselector/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
DISTNAME= ${PORTNAME}-${PORTVERSION:R}-4
MAINTAINER= kde@freebsd.org
+COMMENT= X Font Selector
USE_REINPLACE= yes
USE_X_PREFIX= yes
diff --git a/x11-fonts/xfontselector/pkg-comment b/x11-fonts/xfontselector/pkg-comment
deleted file mode 100644
index 4f000566dbe4..000000000000
--- a/x11-fonts/xfontselector/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X Font Selector
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 73d0b8862e7f..8641c6b9966f 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -16,6 +16,7 @@ DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz
EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 Font Server
XFREE86_VERSION= 4
USE_IMAKE= YES
diff --git a/x11-servers/XFree86-4-FontServer/pkg-comment b/x11-servers/XFree86-4-FontServer/pkg-comment
deleted file mode 100644
index daf34f1deea1..000000000000
--- a/x11-servers/XFree86-4-FontServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Font Server
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index b887b51159a6..f45b95594e4b 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 Xnest server
XFREE86_VERSION= 4
USE_IMAKE= YES
diff --git a/x11-servers/XFree86-4-NestServer/pkg-comment b/x11-servers/XFree86-4-NestServer/pkg-comment
deleted file mode 100644
index 11dc2170ee07..000000000000
--- a/x11-servers/XFree86-4-NestServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Xnest server
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 9f018d3a61cc..4b5ddb228b91 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 print Server
XFREE86_VERSION= 4
USE_IMAKE= YES
diff --git a/x11-servers/XFree86-4-PrintServer/pkg-comment b/x11-servers/XFree86-4-PrintServer/pkg-comment
deleted file mode 100644
index 1791f4dcb0fa..000000000000
--- a/x11-servers/XFree86-4-PrintServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 print Server
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index d8bb093d2c22..141c8213eb58 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -24,6 +24,7 @@ PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz \
patch-nvchips.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 X server and related programs
XFREE86_VERSION= 4
USE_IMAKE= YES
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-comment b/x11-servers/XFree86-4-Server-snap/pkg-comment
deleted file mode 100644
index 1ca8c042c1e7..000000000000
--- a/x11-servers/XFree86-4-Server-snap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 X server and related programs
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index d8bb093d2c22..141c8213eb58 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -24,6 +24,7 @@ PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz \
patch-nvchips.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 X server and related programs
XFREE86_VERSION= 4
USE_IMAKE= YES
diff --git a/x11-servers/XFree86-4-Server/pkg-comment b/x11-servers/XFree86-4-Server/pkg-comment
deleted file mode 100644
index 1ca8c042c1e7..000000000000
--- a/x11-servers/XFree86-4-Server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 X server and related programs
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index a60444b285c8..60e81e443844 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR= anholt/patches-4.2.0/
PATCHFILES= 4.2.0-4.2.1-1-freebsd.patch.gz
MAINTAINER= anholt@freebsd.org
+COMMENT= XFree86-4 Virtual Framebuffer Server
RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment
deleted file mode 100644
index 35e9c9443f2c..000000000000
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Virtual Framebuffer Server
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index cbed32cb5c4e..a17dd0fc2441 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://gatekeeper.dec.com/pub/DEC/SRC/x2x/
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= grog@FreeBSD.org
+COMMENT= A program to link multiple X servers together
USE_IMAKE= yes
USE_GMAKE= yes
diff --git a/x11-servers/x2x/pkg-comment b/x11-servers/x2x/pkg-comment
deleted file mode 100644
index b34c32e0b43c..000000000000
--- a/x11-servers/x2x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to link multiple X servers together
diff --git a/x11-themes/buffy/Makefile b/x11-themes/buffy/Makefile
index 3b8e5060e71d..c112faebb9ef 100644
--- a/x11-themes/buffy/Makefile
+++ b/x11-themes/buffy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= buffy02
DISTNAME= buffy02-1.2
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GTK theme engine looking like SGI enhanced Motif (aka Roxy)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/buffy/pkg-comment b/x11-themes/buffy/pkg-comment
deleted file mode 100644
index 45b39b2065c6..000000000000
--- a/x11-themes/buffy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK theme engine looking like SGI enhanced Motif (aka Roxy)
diff --git a/x11-themes/clean-theme-gtk/Makefile b/x11-themes/clean-theme-gtk/Makefile
index 678b355a57b9..fabbfbaa6866 100644
--- a/x11-themes/clean-theme-gtk/Makefile
+++ b/x11-themes/clean-theme-gtk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= clean___
DISTNAME= clean___-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The Clean GTK theme engine
WRKSRC= ${WRKDIR}/gtk-clean-theme
diff --git a/x11-themes/clean-theme-gtk/pkg-comment b/x11-themes/clean-theme-gtk/pkg-comment
deleted file mode 100644
index 4a78d138b32b..000000000000
--- a/x11-themes/clean-theme-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Clean GTK theme engine
diff --git a/x11-themes/gnome-look/Makefile b/x11-themes/gnome-look/Makefile
index db01eab6c030..b4b200ef2daf 100644
--- a/x11-themes/gnome-look/Makefile
+++ b/x11-themes/gnome-look/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GTK theme engine designed to look nice with the GNOME desktop environment
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-themes/gnome-look/pkg-comment b/x11-themes/gnome-look/pkg-comment
deleted file mode 100644
index 5fa44dc1367d..000000000000
--- a/x11-themes/gnome-look/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK theme engine designed to look nice with the GNOME desktop environment
diff --git a/x11-themes/gnome-themes/Makefile b/x11-themes/gnome-themes/Makefile
index c5ba736a1e5e..8888d0c79b9f 100644
--- a/x11-themes/gnome-themes/Makefile
+++ b/x11-themes/gnome-themes/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A collection of themes and icons for GNOME 2 designed for accessibility
BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
diff --git a/x11-themes/gnome-themes/pkg-comment b/x11-themes/gnome-themes/pkg-comment
deleted file mode 100644
index 635b86dba1f7..000000000000
--- a/x11-themes/gnome-themes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of themes and icons for GNOME 2 designed for accessibility
diff --git a/x11-themes/gtk-engines-collection/Makefile b/x11-themes/gtk-engines-collection/Makefile
index 769052adda2d..f7f8004f1bdd 100644
--- a/x11-themes/gtk-engines-collection/Makefile
+++ b/x11-themes/gtk-engines-collection/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The "meta-port" for the collection of several GTK+ theme engines
RUN_DEPENDS= ${THEMESBASE}/libbuffy.so:${THEMESPORTDIR}/buffy \
${THEMESBASE}/libclean.so:${THEMESPORTDIR}/clean-theme-gtk \
diff --git a/x11-themes/gtk-engines-collection/pkg-comment b/x11-themes/gtk-engines-collection/pkg-comment
deleted file mode 100644
index 22479f09808e..000000000000
--- a/x11-themes/gtk-engines-collection/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the collection of several GTK+ theme engines
diff --git a/x11-themes/gtk-engines/Makefile b/x11-themes/gtk-engines/Makefile
index b4b73ff4c4af..fd98d8a7ea9f 100644
--- a/x11-themes/gtk-engines/Makefile
+++ b/x11-themes/gtk-engines/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Theme engine for gtk+ toolkits
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-themes/gtk-engines/pkg-comment b/x11-themes/gtk-engines/pkg-comment
deleted file mode 100644
index bc31903b7d69..000000000000
--- a/x11-themes/gtk-engines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Theme engine for gtk+ toolkits
diff --git a/x11-themes/gtk-engines2/Makefile b/x11-themes/gtk-engines2/Makefile
index 649e67dcae87..0660a301d32e 100644
--- a/x11-themes/gtk-engines2/Makefile
+++ b/x11-themes/gtk-engines2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Theme engine for the gtk+-2.0 toolkit
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-themes/gtk-engines2/pkg-comment b/x11-themes/gtk-engines2/pkg-comment
deleted file mode 100644
index 5f0762d3497e..000000000000
--- a/x11-themes/gtk-engines2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Theme engine for the gtk+-2.0 toolkit
diff --git a/x11-themes/gtkstep-pastel/Makefile b/x11-themes/gtkstep-pastel/Makefile
index 0dacbb38ce13..463053a9af5c 100644
--- a/x11-themes/gtkstep-pastel/Makefile
+++ b/x11-themes/gtkstep-pastel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gtksteppastel
DISTNAME= gtksteppastel-1.2.x
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Theme engine based on GtkStep to make GTK+ look nicier
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-themes/gtkstep-pastel/pkg-comment b/x11-themes/gtkstep-pastel/pkg-comment
deleted file mode 100644
index 0d1969e31451..000000000000
--- a/x11-themes/gtkstep-pastel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Theme engine based on GtkStep to make GTK+ look nicier
diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 1107dbc257e5..85bf2299441f 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Additional themes, sounds, wallpapers and window styles for KDE
USE_KDEBASE_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/x11-themes/kdeartwork3/pkg-comment b/x11-themes/kdeartwork3/pkg-comment
deleted file mode 100644
index 3fec02a061c7..000000000000
--- a/x11-themes/kdeartwork3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional themes, sounds, wallpapers and window styles for KDE
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 1107dbc257e5..85bf2299441f 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Additional themes, sounds, wallpapers and window styles for KDE
USE_KDEBASE_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/x11-themes/kdeartwork4/pkg-comment b/x11-themes/kdeartwork4/pkg-comment
deleted file mode 100644
index 3fec02a061c7..000000000000
--- a/x11-themes/kdeartwork4/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional themes, sounds, wallpapers and window styles for KDE
diff --git a/x11-themes/mosfet-liquid/Makefile b/x11-themes/mosfet-liquid/Makefile
index 81dc7369c98c..0c2eb09a8fd8 100644
--- a/x11-themes/mosfet-liquid/Makefile
+++ b/x11-themes/mosfet-liquid/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.mosfet.org/
DISTNAME= ${PORTNAME}${PORTVERSION}-pre4
MAINTAINER= kde@freebsd.org
+COMMENT= A High Performance Liquid KDE style engine
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake \
autoconf:${PORTSDIR}/devel/autoconf
diff --git a/x11-themes/mosfet-liquid/pkg-comment b/x11-themes/mosfet-liquid/pkg-comment
deleted file mode 100644
index ff7e890c7799..000000000000
--- a/x11-themes/mosfet-liquid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A High Performance Liquid KDE style engine
diff --git a/x11-themes/qnxstyle/Makefile b/x11-themes/qnxstyle/Makefile
index 7ec83786f8b1..8cfcb64fdfcd 100644
--- a/x11-themes/qnxstyle/Makefile
+++ b/x11-themes/qnxstyle/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.kde-look.org/content/files/
DISTNAME= $(KDELOOKITEM)-${PORTNAME}-$(PORTVERSION)
MAINTAINER= adamw@FreeBSD.org
+COMMENT= A QNX style/theme for KDE3
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
diff --git a/x11-themes/qnxstyle/pkg-comment b/x11-themes/qnxstyle/pkg-comment
deleted file mode 100644
index 6c492645b4e3..000000000000
--- a/x11-themes/qnxstyle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QNX style/theme for KDE3
diff --git a/x11-themes/thinice/Makefile b/x11-themes/thinice/Makefile
index d02bd529e386..4d81622fc34e 100644
--- a/x11-themes/thinice/Makefile
+++ b/x11-themes/thinice/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= thinice
DISTNAME= thinice-1.2.x
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A clean-looking GTK Theme Engine
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
diff --git a/x11-themes/thinice/pkg-comment b/x11-themes/thinice/pkg-comment
deleted file mode 100644
index d29bffda816a..000000000000
--- a/x11-themes/thinice/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clean-looking GTK Theme Engine
diff --git a/x11-toolkits/at-spi/Makefile b/x11-toolkits/at-spi/Makefile
index 475f05818565..60a4d0437386 100644
--- a/x11-toolkits/at-spi/Makefile
+++ b/x11-toolkits/at-spi/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An Assistive Technology Service Provider Interface
LIB_DEPENDS= gailutil.17:${PORTSDIR}/x11-toolkits/gail \
bonobo-2.0:${PORTSDIR}/devel/libbonobo
diff --git a/x11-toolkits/at-spi/pkg-comment b/x11-toolkits/at-spi/pkg-comment
deleted file mode 100644
index 147c5c72af79..000000000000
--- a/x11-toolkits/at-spi/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An Assistive Technology Service Provider Interface
diff --git a/x11-toolkits/bakery/Makefile b/x11-toolkits/bakery/Makefile
index 00574a4c6075..f4d1554473d1 100644
--- a/x11-toolkits/bakery/Makefile
+++ b/x11-toolkits/bakery/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A C++ Application Framework for use with Gnome--
LIB_DEPENDS= gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
diff --git a/x11-toolkits/bakery/pkg-comment b/x11-toolkits/bakery/pkg-comment
deleted file mode 100644
index 45f580094eab..000000000000
--- a/x11-toolkits/bakery/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ Application Framework for use with Gnome--
diff --git a/x11-toolkits/buffy/Makefile b/x11-toolkits/buffy/Makefile
index 3b8e5060e71d..c112faebb9ef 100644
--- a/x11-toolkits/buffy/Makefile
+++ b/x11-toolkits/buffy/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= buffy02
DISTNAME= buffy02-1.2
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GTK theme engine looking like SGI enhanced Motif (aka Roxy)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/buffy/pkg-comment b/x11-toolkits/buffy/pkg-comment
deleted file mode 100644
index 45b39b2065c6..000000000000
--- a/x11-toolkits/buffy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK theme engine looking like SGI enhanced Motif (aka Roxy)
diff --git a/x11-toolkits/clean-theme-gtk/Makefile b/x11-toolkits/clean-theme-gtk/Makefile
index 678b355a57b9..fabbfbaa6866 100644
--- a/x11-toolkits/clean-theme-gtk/Makefile
+++ b/x11-toolkits/clean-theme-gtk/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= clean___
DISTNAME= clean___-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The Clean GTK theme engine
WRKSRC= ${WRKDIR}/gtk-clean-theme
diff --git a/x11-toolkits/clean-theme-gtk/pkg-comment b/x11-toolkits/clean-theme-gtk/pkg-comment
deleted file mode 100644
index 4a78d138b32b..000000000000
--- a/x11-toolkits/clean-theme-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Clean GTK theme engine
diff --git a/x11-toolkits/easygtk/Makefile b/x11-toolkits/easygtk/Makefile
index a488cb203da5..cb5ab245d9e4 100644
--- a/x11-toolkits/easygtk/Makefile
+++ b/x11-toolkits/easygtk/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sobomax
EXTRACT_SUFX= .tar
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A wrapper library for GTK+ which provides simplified GUI API
EXTRACT_BEFORE_ARGS= # it's intentionally left blank
EXTRACT_CMD= ${CAT} # not quite `extract', but who cares? ;)
diff --git a/x11-toolkits/easygtk/pkg-comment b/x11-toolkits/easygtk/pkg-comment
deleted file mode 100644
index 1f4d32ec6008..000000000000
--- a/x11-toolkits/easygtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A wrapper library for GTK+ which provides simplified GUI API
diff --git a/x11-toolkits/eel/Makefile b/x11-toolkits/eel/Makefile
index f16047b9b270..b5e10e0e54eb 100644
--- a/x11-toolkits/eel/Makefile
+++ b/x11-toolkits/eel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/eel/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Generally useful classes and extensions to GNOME
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= rsvg.1:${PORTSDIR}/graphics/librsvg
diff --git a/x11-toolkits/eel/pkg-comment b/x11-toolkits/eel/pkg-comment
deleted file mode 100644
index 89feaa7b52a1..000000000000
--- a/x11-toolkits/eel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generally useful classes and extensions to GNOME
diff --git a/x11-toolkits/eel2/Makefile b/x11-toolkits/eel2/Makefile
index 49f591221971..cb328ff38f58 100644
--- a/x11-toolkits/eel2/Makefile
+++ b/x11-toolkits/eel2/Makefile
@@ -14,6 +14,7 @@ DIST_SUBDIR= gnome2
DISTNAME= eel-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Generally useful classes and extensions to GNOME
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= gnomevfs-2.0:${PORTSDIR}/devel/gnomevfs2 \
diff --git a/x11-toolkits/eel2/pkg-comment b/x11-toolkits/eel2/pkg-comment
deleted file mode 100644
index 89feaa7b52a1..000000000000
--- a/x11-toolkits/eel2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Generally useful classes and extensions to GNOME
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index c3515535376d..81072197b081 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An implementation of the ATK interfaces for GTK+ widgets
LIB_DEPENDS= gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
diff --git a/x11-toolkits/gail/pkg-comment b/x11-toolkits/gail/pkg-comment
deleted file mode 100644
index 916da666154f..000000000000
--- a/x11-toolkits/gail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the ATK interfaces for GTK+ widgets
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index 0323450ea478..8fa08e842134 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.23
DIST_SUBDIR= gnome
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= A collection of widgets taken from GNOME gnumeric and evolution
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode \
iconv.3:${PORTSDIR}/converters/libiconv
diff --git a/x11-toolkits/gal/pkg-comment b/x11-toolkits/gal/pkg-comment
deleted file mode 100644
index a65315dc654c..000000000000
--- a/x11-toolkits/gal/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of widgets taken from GNOME gnumeric and evolution
diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile
index 26f09c50d8b5..27dce1b0fcf1 100644
--- a/x11-toolkits/gal2/Makefile
+++ b/x11-toolkits/gal2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A collection of widgets taken from GNOME 2 gnumeric
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
diff --git a/x11-toolkits/gal2/pkg-comment b/x11-toolkits/gal2/pkg-comment
deleted file mode 100644
index 4fb814572bab..000000000000
--- a/x11-toolkits/gal2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of widgets taken from GNOME 2 gnumeric
diff --git a/x11-toolkits/gdl/Makefile b/x11-toolkits/gdl/Makefile
index 541419fd206b..cdd976635cc3 100644
--- a/x11-toolkits/gdl/Makefile
+++ b/x11-toolkits/gdl/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.1
MAINTAINER?= gnome@FreeBSD.org
+COMMENT= A components intended to be shared between GNOME development tools
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-toolkits/gdl/pkg-comment b/x11-toolkits/gdl/pkg-comment
deleted file mode 100644
index 68991cf555a1..000000000000
--- a/x11-toolkits/gdl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A components intended to be shared between GNOME development tools
diff --git a/x11-toolkits/gnome--/Makefile b/x11-toolkits/gnome--/Makefile
index 36e421633fca..be8068e3849a 100644
--- a/x11-toolkits/gnome--/Makefile
+++ b/x11-toolkits/gnome--/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A powerful C++ binding for the GNOME libraries
LIB_DEPENDS= gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-toolkits/gnome--/pkg-comment b/x11-toolkits/gnome--/pkg-comment
deleted file mode 100644
index 1605f7e902ea..000000000000
--- a/x11-toolkits/gnome--/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A powerful C++ binding for the GNOME libraries
diff --git a/x11-toolkits/gnome-look/Makefile b/x11-toolkits/gnome-look/Makefile
index db01eab6c030..b4b200ef2daf 100644
--- a/x11-toolkits/gnome-look/Makefile
+++ b/x11-toolkits/gnome-look/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A GTK theme engine designed to look nice with the GNOME desktop environment
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-toolkits/gnome-look/pkg-comment b/x11-toolkits/gnome-look/pkg-comment
deleted file mode 100644
index 5fa44dc1367d..000000000000
--- a/x11-toolkits/gnome-look/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK theme engine designed to look nice with the GNOME desktop environment
diff --git a/x11-toolkits/gnome-themes/Makefile b/x11-toolkits/gnome-themes/Makefile
index c5ba736a1e5e..8888d0c79b9f 100644
--- a/x11-toolkits/gnome-themes/Makefile
+++ b/x11-toolkits/gnome-themes/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A collection of themes and icons for GNOME 2 designed for accessibility
BUILD_DEPENDS= ${X11BASE}/lib/gtk-2.0/2.2.0/engines/libthinice.so:${PORTSDIR}/x11-toolkits/gtk-thinice-engine \
${X11BASE}/libdata/pkgconfig/gtk-engines-2.pc:${PORTSDIR}/x11-toolkits/gtk-engines2
diff --git a/x11-toolkits/gnome-themes/pkg-comment b/x11-toolkits/gnome-themes/pkg-comment
deleted file mode 100644
index 635b86dba1f7..000000000000
--- a/x11-toolkits/gnome-themes/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of themes and icons for GNOME 2 designed for accessibility
diff --git a/x11-toolkits/gob/Makefile b/x11-toolkits/gob/Makefile
index 45fea36688a0..dcd98a2fe46b 100644
--- a/x11-toolkits/gob/Makefile
+++ b/x11-toolkits/gob/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gob/1.0
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A preprocessor for making GTK+ objects with inline C
USE_GMAKE= yes
USE_GNOMENG= yes
diff --git a/x11-toolkits/gob/pkg-comment b/x11-toolkits/gob/pkg-comment
deleted file mode 100644
index a89848e9f23d..000000000000
--- a/x11-toolkits/gob/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A preprocessor for making GTK+ objects with inline C
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 670c68b22fef..a1e49fc5d9d1 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-toolkits/gtk--/pkg-comment b/x11-toolkits/gtk--/pkg-comment
deleted file mode 100644
index 656cd11549cb..000000000000
--- a/x11-toolkits/gtk--/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for gtk, a x11 graphics library
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 1d5d9a0b423c..42bdcd6e513e 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtk--2/pkg-comment b/x11-toolkits/gtk--2/pkg-comment
deleted file mode 100644
index 656cd11549cb..000000000000
--- a/x11-toolkits/gtk--2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for gtk, a x11 graphics library
diff --git a/x11-toolkits/gtk-engines-collection/Makefile b/x11-toolkits/gtk-engines-collection/Makefile
index 769052adda2d..f7f8004f1bdd 100644
--- a/x11-toolkits/gtk-engines-collection/Makefile
+++ b/x11-toolkits/gtk-engines-collection/Makefile
@@ -13,6 +13,7 @@ DISTFILES= # empty
EXTRACT_ONLY= # empty
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The "meta-port" for the collection of several GTK+ theme engines
RUN_DEPENDS= ${THEMESBASE}/libbuffy.so:${THEMESPORTDIR}/buffy \
${THEMESBASE}/libclean.so:${THEMESPORTDIR}/clean-theme-gtk \
diff --git a/x11-toolkits/gtk-engines-collection/pkg-comment b/x11-toolkits/gtk-engines-collection/pkg-comment
deleted file mode 100644
index 22479f09808e..000000000000
--- a/x11-toolkits/gtk-engines-collection/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The "meta-port" for the collection of several GTK+ theme engines
diff --git a/x11-toolkits/gtk-engines/Makefile b/x11-toolkits/gtk-engines/Makefile
index b4b73ff4c4af..fd98d8a7ea9f 100644
--- a/x11-toolkits/gtk-engines/Makefile
+++ b/x11-toolkits/gtk-engines/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtk-engines/0.12
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Theme engine for gtk+ toolkits
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-toolkits/gtk-engines/pkg-comment b/x11-toolkits/gtk-engines/pkg-comment
deleted file mode 100644
index bc31903b7d69..000000000000
--- a/x11-toolkits/gtk-engines/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Theme engine for gtk+ toolkits
diff --git a/x11-toolkits/gtk-engines2/Makefile b/x11-toolkits/gtk-engines2/Makefile
index 649e67dcae87..0660a301d32e 100644
--- a/x11-toolkits/gtk-engines2/Makefile
+++ b/x11-toolkits/gtk-engines2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Theme engine for the gtk+-2.0 toolkit
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtk-engines2/pkg-comment b/x11-toolkits/gtk-engines2/pkg-comment
deleted file mode 100644
index 5f0762d3497e..000000000000
--- a/x11-toolkits/gtk-engines2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Theme engine for the gtk+-2.0 toolkit
diff --git a/x11-toolkits/gtk-sharp-devel/Makefile b/x11-toolkits/gtk-sharp-devel/Makefile
index 9d0885353eed..7468837bae68 100644
--- a/x11-toolkits/gtk-sharp-devel/Makefile
+++ b/x11-toolkits/gtk-sharp-devel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtk-sharp
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk+ and GNOME interfaces for the .NET runtime
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
LIB_DEPENDS= gnomedb-2:${PORTSDIR}/databases/libgnomedb \
diff --git a/x11-toolkits/gtk-sharp-devel/pkg-comment b/x11-toolkits/gtk-sharp-devel/pkg-comment
deleted file mode 100644
index ff992efb63b3..000000000000
--- a/x11-toolkits/gtk-sharp-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ and GNOME interfaces for the .NET runtime
diff --git a/x11-toolkits/gtk-sharp/Makefile b/x11-toolkits/gtk-sharp/Makefile
index 9d0885353eed..7468837bae68 100644
--- a/x11-toolkits/gtk-sharp/Makefile
+++ b/x11-toolkits/gtk-sharp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtk-sharp
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk+ and GNOME interfaces for the .NET runtime
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
LIB_DEPENDS= gnomedb-2:${PORTSDIR}/databases/libgnomedb \
diff --git a/x11-toolkits/gtk-sharp/pkg-comment b/x11-toolkits/gtk-sharp/pkg-comment
deleted file mode 100644
index ff992efb63b3..000000000000
--- a/x11-toolkits/gtk-sharp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ and GNOME interfaces for the .NET runtime
diff --git a/x11-toolkits/gtk-sharp10/Makefile b/x11-toolkits/gtk-sharp10/Makefile
index 9d0885353eed..7468837bae68 100644
--- a/x11-toolkits/gtk-sharp10/Makefile
+++ b/x11-toolkits/gtk-sharp10/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtk-sharp
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk+ and GNOME interfaces for the .NET runtime
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
LIB_DEPENDS= gnomedb-2:${PORTSDIR}/databases/libgnomedb \
diff --git a/x11-toolkits/gtk-sharp10/pkg-comment b/x11-toolkits/gtk-sharp10/pkg-comment
deleted file mode 100644
index ff992efb63b3..000000000000
--- a/x11-toolkits/gtk-sharp10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ and GNOME interfaces for the .NET runtime
diff --git a/x11-toolkits/gtk-sharp20/Makefile b/x11-toolkits/gtk-sharp20/Makefile
index 9d0885353eed..7468837bae68 100644
--- a/x11-toolkits/gtk-sharp20/Makefile
+++ b/x11-toolkits/gtk-sharp20/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= gtk-sharp
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gtk+ and GNOME interfaces for the .NET runtime
BUILD_DEPENDS= mono:${PORTSDIR}/lang/mono
LIB_DEPENDS= gnomedb-2:${PORTSDIR}/databases/libgnomedb \
diff --git a/x11-toolkits/gtk-sharp20/pkg-comment b/x11-toolkits/gtk-sharp20/pkg-comment
deleted file mode 100644
index ff992efb63b3..000000000000
--- a/x11-toolkits/gtk-sharp20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gtk+ and GNOME interfaces for the .NET runtime
diff --git a/x11-toolkits/gtk-thinice-engine/Makefile b/x11-toolkits/gtk-thinice-engine/Makefile
index bdf7f356bddd..d9267c71871b 100644
--- a/x11-toolkits/gtk-thinice-engine/Makefile
+++ b/x11-toolkits/gtk-thinice-engine/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A simple, clean theme engine
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtk-thinice-engine/pkg-comment b/x11-toolkits/gtk-thinice-engine/pkg-comment
deleted file mode 100644
index 20b04cca2dc4..000000000000
--- a/x11-toolkits/gtk-thinice-engine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple, clean theme engine
diff --git a/x11-toolkits/gtk12/Makefile b/x11-toolkits/gtk12/Makefile
index dbfa68617322..6889fab713de 100644
--- a/x11-toolkits/gtk12/Makefile
+++ b/x11-toolkits/gtk12/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/gtk+/1.2
DISTNAME= gtk+-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gimp Toolkit for X11 GUI (previous stable version)
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/x11-toolkits/gtk12/pkg-comment b/x11-toolkits/gtk12/pkg-comment
deleted file mode 100644
index 458b4c8441ae..000000000000
--- a/x11-toolkits/gtk12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gimp Toolkit for X11 GUI (previous stable version)
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 56058548cba4..b9aced0fbe15 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -20,6 +20,7 @@ DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gimp Toolkit for X11 GUI (current stable version)
LIB_DEPENDS= atk-1.0.200:${PORTSDIR}/devel/atk \
pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \
diff --git a/x11-toolkits/gtk20/pkg-comment b/x11-toolkits/gtk20/pkg-comment
deleted file mode 100644
index 313e77e779dc..000000000000
--- a/x11-toolkits/gtk20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gimp Toolkit for X11 GUI (current stable version)
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 56058548cba4..b9aced0fbe15 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -20,6 +20,7 @@ DISTNAME= gtk+-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gimp Toolkit for X11 GUI (current stable version)
LIB_DEPENDS= atk-1.0.200:${PORTSDIR}/devel/atk \
pango-1.0.200:${PORTSDIR}/x11-toolkits/pango \
diff --git a/x11-toolkits/gtk30/pkg-comment b/x11-toolkits/gtk30/pkg-comment
deleted file mode 100644
index 313e77e779dc..000000000000
--- a/x11-toolkits/gtk30/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gimp Toolkit for X11 GUI (current stable version)
diff --git a/x11-toolkits/gtkextra--/Makefile b/x11-toolkits/gtkextra--/Makefile
index 8fcc34891079..660e43d30da2 100644
--- a/x11-toolkits/gtkextra--/Makefile
+++ b/x11-toolkits/gtkextra--/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A C++ wrappers for GtkExtra, for use with Gtk--
LIB_DEPENDS= gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \
gtkmm.2:${PORTSDIR}/x11-toolkits/gtk--
diff --git a/x11-toolkits/gtkextra--/pkg-comment b/x11-toolkits/gtkextra--/pkg-comment
deleted file mode 100644
index bcb354a7fb15..000000000000
--- a/x11-toolkits/gtkextra--/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ wrappers for GtkExtra, for use with Gtk--
diff --git a/x11-toolkits/gtkextra/Makefile b/x11-toolkits/gtkextra/Makefile
index c52d866a6038..80db342368b3 100644
--- a/x11-toolkits/gtkextra/Makefile
+++ b/x11-toolkits/gtkextra/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= scigraphica
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A useful widget set complementary to GTK+
USE_X_PREFIX= yes
USE_LIBTOOL= yes
diff --git a/x11-toolkits/gtkextra/pkg-comment b/x11-toolkits/gtkextra/pkg-comment
deleted file mode 100644
index bb306181f41c..000000000000
--- a/x11-toolkits/gtkextra/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A useful widget set complementary to GTK+
diff --git a/x11-toolkits/gtkextra2/Makefile b/x11-toolkits/gtkextra2/Makefile
index c52d866a6038..80db342368b3 100644
--- a/x11-toolkits/gtkextra2/Makefile
+++ b/x11-toolkits/gtkextra2/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= scigraphica
DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A useful widget set complementary to GTK+
USE_X_PREFIX= yes
USE_LIBTOOL= yes
diff --git a/x11-toolkits/gtkextra2/pkg-comment b/x11-toolkits/gtkextra2/pkg-comment
deleted file mode 100644
index bb306181f41c..000000000000
--- a/x11-toolkits/gtkextra2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A useful widget set complementary to GTK+
diff --git a/x11-toolkits/gtkglarea2/Makefile b/x11-toolkits/gtkglarea2/Makefile
index ad710c5e748f..2c69054b5bff 100644
--- a/x11-toolkits/gtkglarea2/Makefile
+++ b/x11-toolkits/gtkglarea2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gtkglarea-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An OpenGL widget for the GTK+2 GUI toolkit
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtkglarea2/pkg-comment b/x11-toolkits/gtkglarea2/pkg-comment
deleted file mode 100644
index fc98706bbc78..000000000000
--- a/x11-toolkits/gtkglarea2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An OpenGL widget for the GTK+2 GUI toolkit
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 670c68b22fef..a1e49fc5d9d1 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-toolkits/gtkmm12/pkg-comment b/x11-toolkits/gtkmm12/pkg-comment
deleted file mode 100644
index 656cd11549cb..000000000000
--- a/x11-toolkits/gtkmm12/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for gtk, a x11 graphics library
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 1d5d9a0b423c..42bdcd6e513e 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtkmm20/pkg-comment b/x11-toolkits/gtkmm20/pkg-comment
deleted file mode 100644
index 656cd11549cb..000000000000
--- a/x11-toolkits/gtkmm20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for gtk, a x11 graphics library
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 1d5d9a0b423c..42bdcd6e513e 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtkmm24/pkg-comment b/x11-toolkits/gtkmm24/pkg-comment
deleted file mode 100644
index 656cd11549cb..000000000000
--- a/x11-toolkits/gtkmm24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for gtk, a x11 graphics library
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 1d5d9a0b423c..42bdcd6e513e 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2 \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc-1.2.5:${PORTSDIR}/devel/libsigc++12 \
gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
diff --git a/x11-toolkits/gtkmm30/pkg-comment b/x11-toolkits/gtkmm30/pkg-comment
deleted file mode 100644
index 656cd11549cb..000000000000
--- a/x11-toolkits/gtkmm30/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for gtk, a x11 graphics library
diff --git a/x11-toolkits/gtkscintilla/Makefile b/x11-toolkits/gtkscintilla/Makefile
index b32415947885..ebd33a6c23eb 100644
--- a/x11-toolkits/gtkscintilla/Makefile
+++ b/x11-toolkits/gtkscintilla/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= moleskine
DISTNAME= GtkScintilla-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A wrapper for the Scintilla editing component
LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
diff --git a/x11-toolkits/gtkscintilla/pkg-comment b/x11-toolkits/gtkscintilla/pkg-comment
deleted file mode 100644
index 99845ad946f9..000000000000
--- a/x11-toolkits/gtkscintilla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A wrapper for the Scintilla editing component
diff --git a/x11-toolkits/gtkstep-pastel/Makefile b/x11-toolkits/gtkstep-pastel/Makefile
index 0dacbb38ce13..463053a9af5c 100644
--- a/x11-toolkits/gtkstep-pastel/Makefile
+++ b/x11-toolkits/gtkstep-pastel/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= gtksteppastel
DISTNAME= gtksteppastel-1.2.x
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= Theme engine based on GtkStep to make GTK+ look nicier
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/x11-toolkits/gtkstep-pastel/pkg-comment b/x11-toolkits/gtkstep-pastel/pkg-comment
deleted file mode 100644
index 0d1969e31451..000000000000
--- a/x11-toolkits/gtkstep-pastel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Theme engine based on GtkStep to make GTK+ look nicier
diff --git a/x11-toolkits/guile-gnome/Makefile b/x11-toolkits/guile-gnome/Makefile
index d447c9b3a285..f40ca60702f4 100644
--- a/x11-toolkits/guile-gnome/Makefile
+++ b/x11-toolkits/guile-gnome/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/gnome-guile/0.20
DISTNAME= gnome-guile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Guile binding library for GNOME
LIB_DEPENDS= guilegtk-1.2.0:${PORTSDIR}/x11-toolkits/guile-gtk
diff --git a/x11-toolkits/guile-gnome/pkg-comment b/x11-toolkits/guile-gnome/pkg-comment
deleted file mode 100644
index 54f9958ee5ad..000000000000
--- a/x11-toolkits/guile-gnome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Guile binding library for GNOME
diff --git a/x11-toolkits/guile-gtk/Makefile b/x11-toolkits/guile-gtk/Makefile
index fea8f2ca3463..8aee259ad344 100644
--- a/x11-toolkits/guile-gtk/Makefile
+++ b/x11-toolkits/guile-gtk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/gnome-guile/0.20
DISTNAME= gnome-guile-${PORTVERSION}
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Guile binding library for GTK+
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
diff --git a/x11-toolkits/guile-gtk/pkg-comment b/x11-toolkits/guile-gtk/pkg-comment
deleted file mode 100644
index d2dcd13290da..000000000000
--- a/x11-toolkits/guile-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Guile binding library for GTK+
diff --git a/x11-toolkits/iv/Makefile b/x11-toolkits/iv/Makefile
index fd0adbd41021..59574b45cb19 100644
--- a/x11-toolkits/iv/Makefile
+++ b/x11-toolkits/iv/Makefile
@@ -13,6 +13,7 @@ DISTNAME= ${PORTVERSION}
EXTRACT_SUFX= .tar.Z
MAINTAINER= tanimura@FreeBSD.org
+COMMENT= InterViews: A toolkit from Stanford University and Silicon Graphics
BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4
diff --git a/x11-toolkits/iv/pkg-comment b/x11-toolkits/iv/pkg-comment
deleted file mode 100644
index 59eb2c585f0f..000000000000
--- a/x11-toolkits/iv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-InterViews: A toolkit from Stanford University and Silicon Graphics
diff --git a/x11-toolkits/libgail-gnome/Makefile b/x11-toolkits/libgail-gnome/Makefile
index dda56c9df969..f7c048303544 100644
--- a/x11-toolkits/libgail-gnome/Makefile
+++ b/x11-toolkits/libgail-gnome/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An implementation of the ATK interfaces for GNOME widgets
LIB_DEPENDS= gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui \
spi.8:${PORTSDIR}/x11-toolkits/at-spi
diff --git a/x11-toolkits/libgail-gnome/pkg-comment b/x11-toolkits/libgail-gnome/pkg-comment
deleted file mode 100644
index df59910da661..000000000000
--- a/x11-toolkits/libgail-gnome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An implementation of the ATK interfaces for GNOME widgets
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index a4facd7dfcbd..80f01c1aa961 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Gnome print support library
LIB_DEPENDS= gnomeprint-2-2.0:${PORTSDIR}/print/libgnomeprint \
gnomecanvas-2.200:${PORTSDIR}/graphics/libgnomecanvas
diff --git a/x11-toolkits/libgnomeprintui/pkg-comment b/x11-toolkits/libgnomeprintui/pkg-comment
deleted file mode 100644
index 7ab03ca6b3e7..000000000000
--- a/x11-toolkits/libgnomeprintui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Gnome print support library
diff --git a/x11-toolkits/libgnomeui/Makefile b/x11-toolkits/libgnomeui/Makefile
index 6a2da9db23c0..f05fc6ba3172 100644
--- a/x11-toolkits/libgnomeui/Makefile
+++ b/x11-toolkits/libgnomeui/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Libraries for the GNOME GUI, a GNU desktop environment
LIB_DEPENDS+= bonoboui-2.0:${PORTSDIR}/x11-toolkits/libbonoboui \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
diff --git a/x11-toolkits/libgnomeui/pkg-comment b/x11-toolkits/libgnomeui/pkg-comment
deleted file mode 100644
index 888f6ae4731a..000000000000
--- a/x11-toolkits/libgnomeui/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Libraries for the GNOME GUI, a GNU desktop environment
diff --git a/x11-toolkits/libgtkeditor/Makefile b/x11-toolkits/libgtkeditor/Makefile
index 6f049deeedfd..d71411359080 100644
--- a/x11-toolkits/libgtkeditor/Makefile
+++ b/x11-toolkits/libgtkeditor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME:S/lib//}
DISTNAME= ${PORTNAME:S/lib//}-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A source code editor widget for GTK+
BUILD_DEPENDS= ${LOCALBASE}/share/automake/install-sh:${PORTSDIR}/devel/automake
LIB_DEPENDS= unicode.0:${PORTSDIR}/devel/libunicode
diff --git a/x11-toolkits/libgtkeditor/pkg-comment b/x11-toolkits/libgtkeditor/pkg-comment
deleted file mode 100644
index 90a502ef0489..000000000000
--- a/x11-toolkits/libgtkeditor/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A source code editor widget for GTK+
diff --git a/x11-toolkits/libwnck/Makefile b/x11-toolkits/libwnck/Makefile
index a92e45d31e0a..e3da0a2f6e35 100644
--- a/x11-toolkits/libwnck/Makefile
+++ b/x11-toolkits/libwnck/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library used for writing pagers and taskslists
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
startup-notification-1.0:${PORTSDIR}/x11/startup-notification
diff --git a/x11-toolkits/libwnck/pkg-comment b/x11-toolkits/libwnck/pkg-comment
deleted file mode 100644
index 10fc713395ac..000000000000
--- a/x11-toolkits/libwnck/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library used for writing pagers and taskslists
diff --git a/x11-toolkits/libzvt/Makefile b/x11-toolkits/libzvt/Makefile
index 6b9568835f4a..12379f15f200 100644
--- a/x11-toolkits/libzvt/Makefile
+++ b/x11-toolkits/libzvt/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.0
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Library components for Zed's Virtual Terminal
LIB_DEPENDS= gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20 \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2
diff --git a/x11-toolkits/libzvt/pkg-comment b/x11-toolkits/libzvt/pkg-comment
deleted file mode 100644
index 370d07a2536c..000000000000
--- a/x11-toolkits/libzvt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library components for Zed's Virtual Terminal
diff --git a/x11-toolkits/mowitz/Makefile b/x11-toolkits/mowitz/Makefile
index 68c661a6617b..9562a201712e 100644
--- a/x11-toolkits/mowitz/Makefile
+++ b/x11-toolkits/mowitz/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://siag.nu/pub/mowitz/
MAINTAINER= mi@aldan.algebra.com
+COMMENT= This is the Mowitz ("More widgets") library
LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/x11-toolkits/mowitz/pkg-comment b/x11-toolkits/mowitz/pkg-comment
deleted file mode 100644
index ef1c53a33741..000000000000
--- a/x11-toolkits/mowitz/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-This is the Mowitz ("More widgets") library
diff --git a/x11-toolkits/neXtaw/Makefile b/x11-toolkits/neXtaw/Makefile
index dd31d8623e68..5889f1d8ba16 100644
--- a/x11-toolkits/neXtaw/Makefile
+++ b/x11-toolkits/neXtaw/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://gama.urisan.tche.br/~casantos/neXtaw/
MAINTAINER= tg@FreeBSD.org
+COMMENT= Athena Widgets with N*XTSTEP appearance
USE_IMAKE= yes
INSTALLS_SHLIB= yes
diff --git a/x11-toolkits/neXtaw/pkg-comment b/x11-toolkits/neXtaw/pkg-comment
deleted file mode 100644
index b7edc6b748ce..000000000000
--- a/x11-toolkits/neXtaw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Athena Widgets with N*XTSTEP appearance
diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index b30c975f0486..c033f2d774c9 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -19,6 +19,7 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= openmotif
MAINTAINER= steve@FreeBSD.org
+COMMENT= Motif X11 Toolkit (industry standard GUI (IEEE 1295))
USE_X_PREFIX= yes
USE_REINPLACE= yes
diff --git a/x11-toolkits/open-motif/pkg-comment b/x11-toolkits/open-motif/pkg-comment
deleted file mode 100644
index 1e6d05156383..000000000000
--- a/x11-toolkits/open-motif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Motif X11 Toolkit (industry standard GUI (IEEE 1295))
diff --git a/x11-toolkits/p5-GdkImlib/Makefile b/x11-toolkits/p5-GdkImlib/Makefile
index fd314ef2540e..5985a04e510f 100644
--- a/x11-toolkits/p5-GdkImlib/Makefile
+++ b/x11-toolkits/p5-GdkImlib/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Imlib module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-GdkImlib/pkg-comment b/x11-toolkits/p5-GdkImlib/pkg-comment
deleted file mode 100644
index 6a58527cb487..000000000000
--- a/x11-toolkits/p5-GdkImlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Imlib module of Gtk-Perl
diff --git a/x11-toolkits/p5-GdkPixbuf/Makefile b/x11-toolkits/p5-GdkPixbuf/Makefile
index f0b5c138f5ba..3cd033268d40 100644
--- a/x11-toolkits/p5-GdkPixbuf/Makefile
+++ b/x11-toolkits/p5-GdkPixbuf/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Pixbuf module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-GdkPixbuf/pkg-comment b/x11-toolkits/p5-GdkPixbuf/pkg-comment
deleted file mode 100644
index a3e98a712c6d..000000000000
--- a/x11-toolkits/p5-GdkPixbuf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Pixbuf module of Gtk-Perl
diff --git a/x11-toolkits/p5-Glade/Makefile b/x11-toolkits/p5-Glade/Makefile
index 91b89ad9e4c8..0b61d6113c09 100644
--- a/x11-toolkits/p5-Glade/Makefile
+++ b/x11-toolkits/p5-Glade/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Glade interface files of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Glade/pkg-comment b/x11-toolkits/p5-Glade/pkg-comment
deleted file mode 100644
index b1f7a64f7103..000000000000
--- a/x11-toolkits/p5-Glade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Glade interface files of Gtk-Perl
diff --git a/x11-toolkits/p5-Glade2/Makefile b/x11-toolkits/p5-Glade2/Makefile
index 91b89ad9e4c8..0b61d6113c09 100644
--- a/x11-toolkits/p5-Glade2/Makefile
+++ b/x11-toolkits/p5-Glade2/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Glade interface files of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-Glade2/pkg-comment b/x11-toolkits/p5-Glade2/pkg-comment
deleted file mode 100644
index b1f7a64f7103..000000000000
--- a/x11-toolkits/p5-Glade2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Glade interface files of Gtk-Perl
diff --git a/x11-toolkits/p5-Gnome/Makefile b/x11-toolkits/p5-Gnome/Makefile
index 1e76e95dd582..3b00b3ad44db 100644
--- a/x11-toolkits/p5-Gnome/Makefile
+++ b/x11-toolkits/p5-Gnome/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The main Gnome module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk/Gdk/ImlibImage.pm:${PORTSDIR}/x11-toolkits/p5-GdkImlib \
${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
diff --git a/x11-toolkits/p5-Gnome/pkg-comment b/x11-toolkits/p5-Gnome/pkg-comment
deleted file mode 100644
index 77356f9525f4..000000000000
--- a/x11-toolkits/p5-Gnome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The main Gnome module of Gtk-Perl
diff --git a/x11-toolkits/p5-GnomeApplet/Makefile b/x11-toolkits/p5-GnomeApplet/Makefile
index 8ebd9df98f21..21093e791a7d 100644
--- a/x11-toolkits/p5-GnomeApplet/Makefile
+++ b/x11-toolkits/p5-GnomeApplet/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The Gnome Applet module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-GnomeApplet/pkg-comment b/x11-toolkits/p5-GnomeApplet/pkg-comment
deleted file mode 100644
index 52c3bbdf9724..000000000000
--- a/x11-toolkits/p5-GnomeApplet/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Gnome Applet module of Gtk-Perl
diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index efcf29101520..4ffe60318a9e 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -15,6 +15,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= ${PORTNAME}-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The base module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/XML/Writer.pm:${PORTSDIR}/textproc/p5-XML-Writer
diff --git a/x11-toolkits/p5-Gtk/pkg-comment b/x11-toolkits/p5-Gtk/pkg-comment
deleted file mode 100644
index 4264c529ec63..000000000000
--- a/x11-toolkits/p5-Gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base module of Gtk-Perl
diff --git a/x11-toolkits/p5-GtkXmHTML/Makefile b/x11-toolkits/p5-GtkXmHTML/Makefile
index 831fa907deba..931a102da486 100644
--- a/x11-toolkits/p5-GtkXmHTML/Makefile
+++ b/x11-toolkits/p5-GtkXmHTML/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= p5-
DISTNAME= Gtk-Perl-${PORTVERSION}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= The HTML widget module of Gtk-Perl
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Gnome.pm:${PORTSDIR}/x11-toolkits/p5-Gnome
RUN_DEPENDS= ${BUILD_DEPENDS}
diff --git a/x11-toolkits/p5-GtkXmHTML/pkg-comment b/x11-toolkits/p5-GtkXmHTML/pkg-comment
deleted file mode 100644
index 779713c8344f..000000000000
--- a/x11-toolkits/p5-GtkXmHTML/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The HTML widget module of Gtk-Perl
diff --git a/x11-toolkits/panel--/Makefile b/x11-toolkits/panel--/Makefile
index 73525104d6a2..accb8c401144 100644
--- a/x11-toolkits/panel--/Makefile
+++ b/x11-toolkits/panel--/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/panelmm/0.3
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A powerful C++ binding for the GNOME panel libraries
LIB_DEPENDS= gnomemm-1.2.10:${PORTSDIR}/x11-toolkits/gnome--
diff --git a/x11-toolkits/panel--/pkg-comment b/x11-toolkits/panel--/pkg-comment
deleted file mode 100644
index 22e34f7970a4..000000000000
--- a/x11-toolkits/panel--/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A powerful C++ binding for the GNOME panel libraries
diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile
index f0706b190858..7d70c96a20b2 100644
--- a/x11-toolkits/pango/Makefile
+++ b/x11-toolkits/pango/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/1.2,} \
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= An open-source framework for the layout and rendering of i18n text
BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX
LIB_DEPENDS= glib-2.0.200:${PORTSDIR}/devel/glib20 \
diff --git a/x11-toolkits/pango/pkg-comment b/x11-toolkits/pango/pkg-comment
deleted file mode 100644
index 4c28fa1a4d11..000000000000
--- a/x11-toolkits/pango/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An open-source framework for the layout and rendering of i18n text
diff --git a/x11-toolkits/pike-gtk/Makefile b/x11-toolkits/pike-gtk/Makefile
index c526d025e18a..a0a932a89cca 100644
--- a/x11-toolkits/pike-gtk/Makefile
+++ b/x11-toolkits/pike-gtk/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://pike-community.org/sites/pigtk/download/
DISTNAME= pigtk_${PORTVERSION}
MAINTAINER= ijliao@FreeBSD.org
+COMMENT= A pike interface to Gtk Graphics Library
BUILD_DEPENDS= pike:${PORTSDIR}/lang/pike70
diff --git a/x11-toolkits/pike-gtk/pkg-comment b/x11-toolkits/pike-gtk/pkg-comment
deleted file mode 100644
index 397bb2b6cd1a..000000000000
--- a/x11-toolkits/pike-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pike interface to Gtk Graphics Library
diff --git a/x11-toolkits/pmw/Makefile b/x11-toolkits/pmw/Makefile
index 76a4124d8684..4f156690dad9 100644
--- a/x11-toolkits/pmw/Makefile
+++ b/x11-toolkits/pmw/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Pmw.${PORTVERSION}
MAINTAINER= alane@FreeBSD.org
+COMMENT= High-level compound graphics widgets for Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
LIB_DEPENDS= BLT24.2:${PORTSDIR}/x11-toolkits/blt
diff --git a/x11-toolkits/pmw/pkg-comment b/x11-toolkits/pmw/pkg-comment
deleted file mode 100644
index 6b822b5c10ba..000000000000
--- a/x11-toolkits/pmw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-level compound graphics widgets for Python
diff --git a/x11-toolkits/py-Pmw/Makefile b/x11-toolkits/py-Pmw/Makefile
index 76a4124d8684..4f156690dad9 100644
--- a/x11-toolkits/py-Pmw/Makefile
+++ b/x11-toolkits/py-Pmw/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= Pmw.${PORTVERSION}
MAINTAINER= alane@FreeBSD.org
+COMMENT= High-level compound graphics widgets for Python
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
LIB_DEPENDS= BLT24.2:${PORTSDIR}/x11-toolkits/blt
diff --git a/x11-toolkits/py-Pmw/pkg-comment b/x11-toolkits/py-Pmw/pkg-comment
deleted file mode 100644
index 6b822b5c10ba..000000000000
--- a/x11-toolkits/py-Pmw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-High-level compound graphics widgets for Python
diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile
index 30c88288d53f..849dd8ce55f4 100644
--- a/x11-toolkits/py-gnome/Makefile
+++ b/x11-toolkits/py-gnome/Makefile
@@ -15,6 +15,7 @@ DISTNAME= gnome-python-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A set of Python bindings for GNOME
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pygtk.pth:${PORTSDIR}/x11-toolkits/py-gtk
diff --git a/x11-toolkits/py-gnome/pkg-comment b/x11-toolkits/py-gnome/pkg-comment
deleted file mode 100644
index 0e3a0dda9c55..000000000000
--- a/x11-toolkits/py-gnome/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of Python bindings for GNOME
diff --git a/x11-toolkits/py-gtk/Makefile b/x11-toolkits/py-gtk/Makefile
index 9800837ed9a2..ad6c7ca29b4d 100644
--- a/x11-toolkits/py-gtk/Makefile
+++ b/x11-toolkits/py-gtk/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gnome-python-1.4.4
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A set of Python bindings for GTK
BUILD_DEPENDS= ${PYNUMERIC}
LIB_DEPENDS= gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
diff --git a/x11-toolkits/py-gtk/pkg-comment b/x11-toolkits/py-gtk/pkg-comment
deleted file mode 100644
index bbe813f51cac..000000000000
--- a/x11-toolkits/py-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of Python bindings for GTK
diff --git a/x11-toolkits/py-gtk2/Makefile b/x11-toolkits/py-gtk2/Makefile
index 3da2230215ba..07f3ec3045da 100644
--- a/x11-toolkits/py-gtk2/Makefile
+++ b/x11-toolkits/py-gtk2/Makefile
@@ -14,6 +14,7 @@ DISTNAME= pygtk-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A set of Python bindings for GTK
LIB_DEPENDS= glade-2.0.0:${PORTSDIR}/devel/libglade2 \
gtkgl-2.0:${PORTSDIR}/x11-toolkits/gtkglarea2
diff --git a/x11-toolkits/py-gtk2/pkg-comment b/x11-toolkits/py-gtk2/pkg-comment
deleted file mode 100644
index bbe813f51cac..000000000000
--- a/x11-toolkits/py-gtk2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A set of Python bindings for GTK
diff --git a/x11-toolkits/py-gtkscintilla/Makefile b/x11-toolkits/py-gtkscintilla/Makefile
index ae8587169270..07e773039fb8 100644
--- a/x11-toolkits/py-gtkscintilla/Makefile
+++ b/x11-toolkits/py-gtkscintilla/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= moleskine
DISTNAME= PyGtkScintilla-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A Python bindings for gtkscintilla library
LIB_DEPENDS= gtkscintilla.0:${PORTSDIR}/x11-toolkits/gtkscintilla
diff --git a/x11-toolkits/py-gtkscintilla/pkg-comment b/x11-toolkits/py-gtkscintilla/pkg-comment
deleted file mode 100644
index ce47ebf0f5d4..000000000000
--- a/x11-toolkits/py-gtkscintilla/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Python bindings for gtkscintilla library
diff --git a/x11-toolkits/py-kde/Makefile b/x11-toolkits/py-kde/Makefile
index d91d8ed74ae5..535995adbb0f 100644
--- a/x11-toolkits/py-kde/Makefile
+++ b/x11-toolkits/py-kde/Makefile
@@ -15,6 +15,7 @@ DISTNAME= PyKDE-${PORTVERSION}-3
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} PyQt-x11-gpl-${PYQTVERSION}${EXTRACT_SUFX}:qt
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Python Bindings for KDE
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/qt.py:${PORTSDIR}/x11-toolkits/py-qt
diff --git a/x11-toolkits/py-kde/pkg-comment b/x11-toolkits/py-kde/pkg-comment
deleted file mode 100644
index b7dced59276b..000000000000
--- a/x11-toolkits/py-kde/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python Bindings for KDE
diff --git a/x11-toolkits/py-qt/Makefile b/x11-toolkits/py-qt/Makefile
index 6383d7461ceb..0c3e8ffa8ab9 100644
--- a/x11-toolkits/py-qt/Makefile
+++ b/x11-toolkits/py-qt/Makefile
@@ -13,6 +13,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= PyQt-x11-gpl-${PORTVERSION}
MAINTAINER= nbm@FreeBSD.org
+COMMENT= Python Bindings for Qt
LIB_DEPENDS= sip.9:${PORTSDIR}/devel/sip
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/libsip.so:${PORTSDIR}/devel/py-sip
diff --git a/x11-toolkits/py-qt/pkg-comment b/x11-toolkits/py-qt/pkg-comment
deleted file mode 100644
index cbb3bf8a7335..000000000000
--- a/x11-toolkits/py-qt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python Bindings for Qt
diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile
index 70b416a18d5e..b6d804e319ca 100644
--- a/x11-toolkits/py-tkinter/Makefile
+++ b/x11-toolkits/py-tkinter/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTFILES= ${PYTHON_DISTFILE}
MAINTAINER= tg@FreeBSD.org
+COMMENT= Python bindings to the Tk widget set
LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83
diff --git a/x11-toolkits/py-tkinter/pkg-comment b/x11-toolkits/py-tkinter/pkg-comment
deleted file mode 100644
index 17c9bfda792c..000000000000
--- a/x11-toolkits/py-tkinter/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings to the Tk widget set
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index 573309d64b00..f57969f2014e 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}Src-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.ORG
+COMMENT= Python bindings for the wxWindows/GTK GUI toolkit
LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython/pkg-comment b/x11-toolkits/py-wxPython/pkg-comment
deleted file mode 100644
index 3afec5d3c22b..000000000000
--- a/x11-toolkits/py-wxPython/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for the wxWindows/GTK GUI toolkit
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index 573309d64b00..f57969f2014e 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}Src-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.ORG
+COMMENT= Python bindings for the wxWindows/GTK GUI toolkit
LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython24/pkg-comment b/x11-toolkits/py-wxPython24/pkg-comment
deleted file mode 100644
index 3afec5d3c22b..000000000000
--- a/x11-toolkits/py-wxPython24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for the wxWindows/GTK GUI toolkit
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index 573309d64b00..f57969f2014e 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}Src-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.ORG
+COMMENT= Python bindings for the wxWindows/GTK GUI toolkit
LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython26/pkg-comment b/x11-toolkits/py-wxPython26/pkg-comment
deleted file mode 100644
index 3afec5d3c22b..000000000000
--- a/x11-toolkits/py-wxPython26/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for the wxWindows/GTK GUI toolkit
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index 573309d64b00..f57969f2014e 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -14,6 +14,7 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= ${PORTNAME}Src-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.ORG
+COMMENT= Python bindings for the wxWindows/GTK GUI toolkit
LIB_DEPENDS= wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk-devel
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython28/pkg-comment b/x11-toolkits/py-wxPython28/pkg-comment
deleted file mode 100644
index 3afec5d3c22b..000000000000
--- a/x11-toolkits/py-wxPython28/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python bindings for the wxWindows/GTK GUI toolkit
diff --git a/x11-toolkits/qt145/Makefile b/x11-toolkits/qt145/Makefile
index 005dcfefa5e3..a2c03b096c7a 100644
--- a/x11-toolkits/qt145/Makefile
+++ b/x11-toolkits/qt145/Makefile
@@ -18,6 +18,7 @@ PATCHFILES= qt-1.45-i18n-20000531.diff.gz
PATCH_DIST_STRIP= -p1
MAINTAINER= kris@FreeBSD.org
+COMMENT= A C++ X GUI toolkit
LATEST_LINK= qt1
USE_GMAKE= yes
diff --git a/x11-toolkits/qt145/pkg-comment b/x11-toolkits/qt145/pkg-comment
deleted file mode 100644
index 0e56180e5c92..000000000000
--- a/x11-toolkits/qt145/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ X GUI toolkit
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile
index 69b05a85c079..0b2dcb0694b2 100644
--- a/x11-toolkits/rep-gtk/Makefile
+++ b/x11-toolkits/rep-gtk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= sources/rep-gtk/0.15
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GTK+ binding for rep Lisp interpreter
LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep
diff --git a/x11-toolkits/rep-gtk/pkg-comment b/x11-toolkits/rep-gtk/pkg-comment
deleted file mode 100644
index a787e921609a..000000000000
--- a/x11-toolkits/rep-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ binding for rep Lisp interpreter
diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile
index 5de4706f7096..887ff0b88797 100644
--- a/x11-toolkits/rep-gtk2/Makefile
+++ b/x11-toolkits/rep-gtk2/Makefile
@@ -16,6 +16,7 @@ DISTNAME= rep-gtk-${PORTVERSION}
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= GTK+ binding for rep Lisp interpreter
LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep \
gnomeui-2.200:${PORTSDIR}/x11-toolkits/libgnomeui
diff --git a/x11-toolkits/rep-gtk2/pkg-comment b/x11-toolkits/rep-gtk2/pkg-comment
deleted file mode 100644
index a787e921609a..000000000000
--- a/x11-toolkits/rep-gtk2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GTK+ binding for rep Lisp interpreter
diff --git a/x11-toolkits/thinice/Makefile b/x11-toolkits/thinice/Makefile
index d02bd529e386..4d81622fc34e 100644
--- a/x11-toolkits/thinice/Makefile
+++ b/x11-toolkits/thinice/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= thinice
DISTNAME= thinice-1.2.x
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= A clean-looking GTK Theme Engine
WRKSRC= ${WRKDIR}/gtk-${PORTNAME}-theme-${PORTVERSION}
diff --git a/x11-toolkits/thinice/pkg-comment b/x11-toolkits/thinice/pkg-comment
deleted file mode 100644
index d29bffda816a..000000000000
--- a/x11-toolkits/thinice/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clean-looking GTK Theme Engine
diff --git a/x11-toolkits/tix/Makefile b/x11-toolkits/tix/Makefile
index ea6d30b4a7bb..4a5356b4e80b 100644
--- a/x11-toolkits/tix/Makefile
+++ b/x11-toolkits/tix/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR= sorted/packages-8.0/x11/Tix/4.1.0.007
DISTNAME= Tix${PORTVERSION}
MAINTAINER= jmz@FreeBSD.org
+COMMENT= An extension to the Tk toolkit
LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82
diff --git a/x11-toolkits/tix/pkg-comment b/x11-toolkits/tix/pkg-comment
deleted file mode 100644
index 111056cb7c2b..000000000000
--- a/x11-toolkits/tix/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extension to the Tk toolkit
diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile
index 78000c0a8bc2..e4d913d18e86 100644
--- a/x11-toolkits/v/Makefile
+++ b/x11-toolkits/v/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.ntua.gr/pub/X11/v/old/ \
ftp://ftp.dl.ac.uk/ccp14/ftp-mirror/programming/objectcentral/old/
MAINTAINER= dburr@FreeBSD.org
+COMMENT= A C++ GUI development framework for X11 and Microsoft Windows
.if ${MACHINE_ARCH} == "alpha"
BROKEN= compiler error in function fixup_memory_subreg
diff --git a/x11-toolkits/v/pkg-comment b/x11-toolkits/v/pkg-comment
deleted file mode 100644
index 233dfcb16595..000000000000
--- a/x11-toolkits/v/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A C++ GUI development framework for X11 and Microsoft Windows
diff --git a/x11-toolkits/vdk/Makefile b/x11-toolkits/vdk/Makefile
index 78d7fe7bb636..19c28d8c2a88 100644
--- a/x11-toolkits/vdk/Makefile
+++ b/x11-toolkits/vdk/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= vdkbuilder
MAINTAINER= nakai@FreeBSD.org
+COMMENT= C++ wrapper for GTK+ toolkit
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-toolkits/vdk/pkg-comment b/x11-toolkits/vdk/pkg-comment
deleted file mode 100644
index dcacb90d744f..000000000000
--- a/x11-toolkits/vdk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-C++ wrapper for GTK+ toolkit
diff --git a/x11-toolkits/vdkbuilder/Makefile b/x11-toolkits/vdkbuilder/Makefile
index fd5975feeff4..48b9c3f63475 100644
--- a/x11-toolkits/vdkbuilder/Makefile
+++ b/x11-toolkits/vdkbuilder/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-toolkits
MASTER_SITES= http://download.sourceforge.net/vdkbuilder/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A general ide tool for GTK+/VDK
LIB_DEPENDS= vdk.3:${PORTSDIR}/x11-toolkits/vdk
diff --git a/x11-toolkits/vdkbuilder/pkg-comment b/x11-toolkits/vdkbuilder/pkg-comment
deleted file mode 100644
index 201ac783eb8d..000000000000
--- a/x11-toolkits/vdkbuilder/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A general ide tool for GTK+/VDK
diff --git a/x11-toolkits/wxgtk-devel/Makefile b/x11-toolkits/wxgtk-devel/Makefile
index 77c799cf9bd6..d2df73374d60 100644
--- a/x11-toolkits/wxgtk-devel/Makefile
+++ b/x11-toolkits/wxgtk-devel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= wxwindows
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The wxWindows GUI toolkit with GTK+ bindings (unstable version)
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/x11-toolkits/wxgtk-devel/pkg-comment b/x11-toolkits/wxgtk-devel/pkg-comment
deleted file mode 100644
index 96b42bb43f19..000000000000
--- a/x11-toolkits/wxgtk-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The wxWindows GUI toolkit with GTK+ bindings (unstable version)
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index b1f06f2d13c1..6994db7b2eda 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= wxwindows
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The wxWindows GUI toolkit with GTK+ bindings
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/x11-toolkits/wxgtk/pkg-comment b/x11-toolkits/wxgtk/pkg-comment
deleted file mode 100644
index 818cecfb652e..000000000000
--- a/x11-toolkits/wxgtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The wxWindows GUI toolkit with GTK+ bindings
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index b1f06f2d13c1..6994db7b2eda 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= wxwindows
DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= The wxWindows GUI toolkit with GTK+ bindings
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/x11-toolkits/wxgtk24/pkg-comment b/x11-toolkits/wxgtk24/pkg-comment
deleted file mode 100644
index 818cecfb652e..000000000000
--- a/x11-toolkits/wxgtk24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The wxWindows GUI toolkit with GTK+ bindings
diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile
index 1e27ae2e6e8b..71fdfd3f0672 100644
--- a/x11-toolkits/xforms/Makefile
+++ b/x11-toolkits/xforms/Makefile
@@ -17,6 +17,7 @@ USE_REINPLACE= yes
REINPLACE_ARGS= -i ""
MAINTAINER= mikeh@FreeBSD.ORG
+COMMENT= A graphical user interface toolkit for X Window System
LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff
diff --git a/x11-toolkits/xforms/pkg-comment b/x11-toolkits/xforms/pkg-comment
deleted file mode 100644
index 120fa409419f..000000000000
--- a/x11-toolkits/xforms/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical user interface toolkit for X Window System
diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index 1499aee01870..f0fb5d9e6af3 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= stable
DISTNAME= AfterStep-${PORTVERSION}
MAINTAINER= demon@FreeBSD.org
+COMMENT= A stable version of the AfterStep window manager
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/x11-wm/afterstep-stable/pkg-comment b/x11-wm/afterstep-stable/pkg-comment
deleted file mode 100644
index 1c91e8ebd811..000000000000
--- a/x11-wm/afterstep-stable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A stable version of the AfterStep window manager
diff --git a/x11-wm/amaterus/Makefile b/x11-wm/amaterus/Makefile
index 4de90985b2d8..d709d0f8ca70 100644
--- a/x11-wm/amaterus/Makefile
+++ b/x11-wm/amaterus/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www.taiyaki.org/amaterus/src/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A GTK+ window manager
LIB_DEPENDS= xml.5:${PORTSDIR}/textproc/libxml
diff --git a/x11-wm/amaterus/pkg-comment b/x11-wm/amaterus/pkg-comment
deleted file mode 100644
index 6eb48d17ad90..000000000000
--- a/x11-wm/amaterus/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A GTK+ window manager
diff --git a/x11-wm/bbapm/Makefile b/x11-wm/bbapm/Makefile
index 32d7b81cf495..9a9896ec322c 100644
--- a/x11-wm/bbapm/Makefile
+++ b/x11-wm/bbapm/Makefile
@@ -15,6 +15,7 @@ PATCHFILES= bbapm-0.0.1-freebsd-patch-2.diff
PATCH_DIST_STRIP= -p1
MAINTAINER= adamw@FreeBSD.org
+COMMENT= APM monitor for the Blackbox slit
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-wm/bbapm/pkg-comment b/x11-wm/bbapm/pkg-comment
deleted file mode 100644
index d2ac28951ef0..000000000000
--- a/x11-wm/bbapm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-APM monitor for the Blackbox slit
diff --git a/x11-wm/bbrun/Makefile b/x11-wm/bbrun/Makefile
index aaf185364a55..1048b551c1f9 100644
--- a/x11-wm/bbrun/Makefile
+++ b/x11-wm/bbrun/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www.dwave.net/~jking/bbrun/
MAINTAINER= adamw@FreeBSD.org
+COMMENT= A Run box for Blackbox
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/x11-wm/bbrun/pkg-comment b/x11-wm/bbrun/pkg-comment
deleted file mode 100644
index 99685f92c63c..000000000000
--- a/x11-wm/bbrun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Run box for Blackbox
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 4a959e9aed00..b829edf0c987 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -20,6 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= A very artistic X window manager
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
diff --git a/x11-wm/e16/pkg-comment b/x11-wm/e16/pkg-comment
deleted file mode 100644
index e6545835a62c..000000000000
--- a/x11-wm/e16/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very artistic X window manager
diff --git a/x11-wm/enlightenment-devel/Makefile b/x11-wm/enlightenment-devel/Makefile
index 4a959e9aed00..b829edf0c987 100644
--- a/x11-wm/enlightenment-devel/Makefile
+++ b/x11-wm/enlightenment-devel/Makefile
@@ -20,6 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= A very artistic X window manager
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
diff --git a/x11-wm/enlightenment-devel/pkg-comment b/x11-wm/enlightenment-devel/pkg-comment
deleted file mode 100644
index e6545835a62c..000000000000
--- a/x11-wm/enlightenment-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very artistic X window manager
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 4a959e9aed00..b829edf0c987 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -20,6 +20,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= vanilla@FreeBSD.org
+COMMENT= A very artistic X window manager
LIB_DEPENDS= Fnlib.0:${PORTSDIR}/graphics/fnlib \
ghttp.1:${PORTSDIR}/www/libghttp \
diff --git a/x11-wm/enlightenment/pkg-comment b/x11-wm/enlightenment/pkg-comment
deleted file mode 100644
index e6545835a62c..000000000000
--- a/x11-wm/enlightenment/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very artistic X window manager
diff --git a/x11-wm/flwm/Makefile b/x11-wm/flwm/Makefile
index 2615162c7d7c..7e79f1360d97 100644
--- a/x11-wm/flwm/Makefile
+++ b/x11-wm/flwm/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES= http://flwm.sourceforge.net/ \
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= The Fast Light Window Manager
LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk
diff --git a/x11-wm/flwm/pkg-comment b/x11-wm/flwm/pkg-comment
deleted file mode 100644
index 3871b7064ffa..000000000000
--- a/x11-wm/flwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The Fast Light Window Manager
diff --git a/x11-wm/fvwm/Makefile b/x11-wm/fvwm/Makefile
index e68b6d308351..5d7cce1cd44d 100644
--- a/x11-wm/fvwm/Makefile
+++ b/x11-wm/fvwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp.hpc.uh.edu/pub/fvwm/version-1/ \
ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/
MAINTAINER= me@FreeBSD.org
+COMMENT= The fvwm window manager
NO_LATEST_LINK= yes
USE_IMAKE= yes
diff --git a/x11-wm/fvwm/pkg-comment b/x11-wm/fvwm/pkg-comment
deleted file mode 100644
index 602130d5743f..000000000000
--- a/x11-wm/fvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The fvwm window manager
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index efb62083409e..e8c45fd726ce 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
+COMMENT= Popular virtual window manager for X
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/Xft
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-wm/fvwm2-devel/pkg-comment b/x11-wm/fvwm2-devel/pkg-comment
deleted file mode 100644
index cda5684de57b..000000000000
--- a/x11-wm/fvwm2-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular virtual window manager for X
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 03f977da5492..771cb3486cb9 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
+COMMENT= Popular virtual window manager for X
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-wm/fvwm2/pkg-comment b/x11-wm/fvwm2/pkg-comment
deleted file mode 100644
index cda5684de57b..000000000000
--- a/x11-wm/fvwm2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular virtual window manager for X
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 03f977da5492..771cb3486cb9 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= cy@FreeBSD.org
+COMMENT= Popular virtual window manager for X
RUN_DEPENDS= gm4:${PORTSDIR}/devel/m4
diff --git a/x11-wm/fvwm24/pkg-comment b/x11-wm/fvwm24/pkg-comment
deleted file mode 100644
index cda5684de57b..000000000000
--- a/x11-wm/fvwm24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Popular virtual window manager for X
diff --git a/x11-wm/fvwm95/Makefile b/x11-wm/fvwm95/Makefile
index 5e67be294850..6ca5d1a60d97 100644
--- a/x11-wm/fvwm95/Makefile
+++ b/x11-wm/fvwm95/Makefile
@@ -15,6 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-Autoconf
EXTRACT_SUFX= .tgz
MAINTAINER= demon@FreeBSD.org
+COMMENT= Win95 lookalike version of the fvwm2 window manager
BUILD_DEPENDS= ${LOCALBASE}/lib/librplay.a:${PORTSDIR}/audio/rplay
RUN_DEPENDS= ${X11BASE}/icons/chuck.xpm:${PORTSDIR}/x11/fbsd-icons
diff --git a/x11-wm/fvwm95/pkg-comment b/x11-wm/fvwm95/pkg-comment
deleted file mode 100644
index 11d22d488b55..000000000000
--- a/x11-wm/fvwm95/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Win95 lookalike version of the fvwm2 window manager
diff --git a/x11-wm/gnome2wmaker/Makefile b/x11-wm/gnome2wmaker/Makefile
index f7307fa1288a..84eaf1f158f2 100644
--- a/x11-wm/gnome2wmaker/Makefile
+++ b/x11-wm/gnome2wmaker/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm gnome
MASTER_SITES= http://ulli.on.openave.net/gnome2wmaker/
MAINTAINER= reg@FreeBSD.org
+COMMENT= Inserts the GNOME menu into the WindowMaker menu
LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList
RUN_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
diff --git a/x11-wm/gnome2wmaker/pkg-comment b/x11-wm/gnome2wmaker/pkg-comment
deleted file mode 100644
index 3b621f6db613..000000000000
--- a/x11-wm/gnome2wmaker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Inserts the GNOME menu into the WindowMaker menu
diff --git a/x11-wm/icemc/Makefile b/x11-wm/icemc/Makefile
index 965665d2a43a..ca2d11a4a715 100644
--- a/x11-wm/icemc/Makefile
+++ b/x11-wm/icemc/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www.algorithm.at/comp/icemc/
MAINTAINER= adamw@FreeBSD.org
+COMMENT= QT-based menu editor for IceWM
USE_X_PREFIX= yes
USE_QT_VER= 3
diff --git a/x11-wm/icemc/pkg-comment b/x11-wm/icemc/pkg-comment
deleted file mode 100644
index d3475f8f72ac..000000000000
--- a/x11-wm/icemc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-QT-based menu editor for IceWM
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 7e8557d93ec0..b33bb001c50f 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Window Manager designed for speed, usability and consistency
BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf
LIB_DEPENDS= intl.4:${PORTSDIR}/devel/gettext
diff --git a/x11-wm/icewm/pkg-comment b/x11-wm/icewm/pkg-comment
deleted file mode 100644
index f4f1c1e6dc23..000000000000
--- a/x11-wm/icewm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Window Manager designed for speed, usability and consistency
diff --git a/x11-wm/kdeartwork3/Makefile b/x11-wm/kdeartwork3/Makefile
index 1107dbc257e5..85bf2299441f 100644
--- a/x11-wm/kdeartwork3/Makefile
+++ b/x11-wm/kdeartwork3/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
+COMMENT= Additional themes, sounds, wallpapers and window styles for KDE
USE_KDEBASE_VER=3
PREFIX= ${KDE_PREFIX}
diff --git a/x11-wm/kdeartwork3/pkg-comment b/x11-wm/kdeartwork3/pkg-comment
deleted file mode 100644
index 3fec02a061c7..000000000000
--- a/x11-wm/kdeartwork3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Additional themes, sounds, wallpapers and window styles for KDE
diff --git a/x11-wm/libdockapp/Makefile b/x11-wm/libdockapp/Makefile
index 8c278c6d86e9..f3715d44005b 100644
--- a/x11-wm/libdockapp/Makefile
+++ b/x11-wm/libdockapp/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://shadowmere.student.utwente.nl/pub/WindowMaker/ \
http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
+COMMENT= Standard library for Window Maker dock apps
USE_BZIP2= yes
USE_X_PREFIX= yes
diff --git a/x11-wm/libdockapp/pkg-comment b/x11-wm/libdockapp/pkg-comment
deleted file mode 100644
index a637cfc098f7..000000000000
--- a/x11-wm/libdockapp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Standard library for Window Maker dock apps
diff --git a/x11-wm/metacity/Makefile b/x11-wm/metacity/Makefile
index aaca2ddc11d1..5bfaed5d71c0 100644
--- a/x11-wm/metacity/Makefile
+++ b/x11-wm/metacity/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.4
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= A window manager for the adult in you
LIB_DEPENDS= gconf-2:${PORTSDIR}/devel/gconf2 \
glade-2.0.0:${PORTSDIR}/devel/libglade2 \
diff --git a/x11-wm/metacity/pkg-comment b/x11-wm/metacity/pkg-comment
deleted file mode 100644
index 2b1334579866..000000000000
--- a/x11-wm/metacity/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A window manager for the adult in you
diff --git a/x11-wm/mlvwm/Makefile b/x11-wm/mlvwm/Makefile
index f091add07cd4..27df429195bd 100644
--- a/x11-wm/mlvwm/Makefile
+++ b/x11-wm/mlvwm/Makefile
@@ -14,6 +14,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} mini-icons.tar.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Macintosh like window manager for X11
USE_IMAKE= yes
USE_XPM= yes
diff --git a/x11-wm/mlvwm/pkg-comment b/x11-wm/mlvwm/pkg-comment
deleted file mode 100644
index ce2618f0a629..000000000000
--- a/x11-wm/mlvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Macintosh like window manager for X11
diff --git a/x11-wm/mosfet-liquid/Makefile b/x11-wm/mosfet-liquid/Makefile
index 81dc7369c98c..0c2eb09a8fd8 100644
--- a/x11-wm/mosfet-liquid/Makefile
+++ b/x11-wm/mosfet-liquid/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.mosfet.org/
DISTNAME= ${PORTNAME}${PORTVERSION}-pre4
MAINTAINER= kde@freebsd.org
+COMMENT= A High Performance Liquid KDE style engine
BUILD_DEPENDS= automake:${PORTSDIR}/devel/automake \
autoconf:${PORTSDIR}/devel/autoconf
diff --git a/x11-wm/mosfet-liquid/pkg-comment b/x11-wm/mosfet-liquid/pkg-comment
deleted file mode 100644
index ff7e890c7799..000000000000
--- a/x11-wm/mosfet-liquid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A High Performance Liquid KDE style engine
diff --git a/x11-wm/olvwm/Makefile b/x11-wm/olvwm/Makefile
index 7934ae18c5bd..a4b03586c40c 100644
--- a/x11-wm/olvwm/Makefile
+++ b/x11-wm/olvwm/Makefile
@@ -20,6 +20,7 @@ PATCHFILES= olvwm4.Patch01.Z \
PATCH_DIST_STRIP= -p1
MAINTAINER= green@FreeBSD.org
+COMMENT= OpenLook Virtual Window manager
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/x11-wm/olvwm/pkg-comment b/x11-wm/olvwm/pkg-comment
deleted file mode 100644
index 8a025605aab7..000000000000
--- a/x11-wm/olvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-OpenLook Virtual Window manager
diff --git a/x11-wm/phluid/Makefile b/x11-wm/phluid/Makefile
index b51acda2fe6b..efd3c6300792 100644
--- a/x11-wm/phluid/Makefile
+++ b/x11-wm/phluid/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR= phluid
LIB_DEPENDS= Imlib2.1:${PORTSDIR}/graphics/imlib2
MAINTAINER= nakai@FreeBSD.org
+COMMENT= a window manager that emphasizes efficiency, speed, and beauty
USE_X_PREFIX= yes
GNU_CONFIGURE= yes
diff --git a/x11-wm/phluid/pkg-comment b/x11-wm/phluid/pkg-comment
deleted file mode 100644
index 46d404fa5f0e..000000000000
--- a/x11-wm/phluid/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-a window manager that emphasizes efficiency, speed, and beauty
diff --git a/x11-wm/pwm/Makefile b/x11-wm/pwm/Makefile
index 915d1ac2060a..a48b4ee02efb 100644
--- a/x11-wm/pwm/Makefile
+++ b/x11-wm/pwm/Makefile
@@ -12,6 +12,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://modeemi.fi/~tuomov/dl/
MAINTAINER= nbm@FreeBSD.org
+COMMENT= A lightweight window manager with emphasis on usability
USE_X_PREFIX= yes
USE_GMAKE= yes
diff --git a/x11-wm/pwm/pkg-comment b/x11-wm/pwm/pkg-comment
deleted file mode 100644
index 4c00dc3bcc0d..000000000000
--- a/x11-wm/pwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A lightweight window manager with emphasis on usability
diff --git a/x11-wm/qnxstyle/Makefile b/x11-wm/qnxstyle/Makefile
index 7ec83786f8b1..8cfcb64fdfcd 100644
--- a/x11-wm/qnxstyle/Makefile
+++ b/x11-wm/qnxstyle/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.kde-look.org/content/files/
DISTNAME= $(KDELOOKITEM)-${PORTNAME}-$(PORTVERSION)
MAINTAINER= adamw@FreeBSD.org
+COMMENT= A QNX style/theme for KDE3
BUILD_DEPENDS= autoconf213:${PORTSDIR}/devel/autoconf213 \
automake14:${PORTSDIR}/devel/automake14
diff --git a/x11-wm/qnxstyle/pkg-comment b/x11-wm/qnxstyle/pkg-comment
deleted file mode 100644
index 6c492645b4e3..000000000000
--- a/x11-wm/qnxstyle/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A QNX style/theme for KDE3
diff --git a/x11-wm/qvwm/Makefile b/x11-wm/qvwm/Makefile
index c8222ccd1491..f20c845c3929 100644
--- a/x11-wm/qvwm/Makefile
+++ b/x11-wm/qvwm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://www.qvwm.org/pub/qvwm/ \
ftp://ftp.chg.ru/pub/X11/windowmanagers/qvwm/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Windows 95/98/NT like window manager for X11
USE_X_PREFIX= yes
USE_GNOMENG= yes
diff --git a/x11-wm/qvwm/pkg-comment b/x11-wm/qvwm/pkg-comment
deleted file mode 100644
index d3992ff32f66..000000000000
--- a/x11-wm/qvwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Windows 95/98/NT like window manager for X11
diff --git a/x11-wm/sawfish/Makefile b/x11-wm/sawfish/Makefile
index 63e7d12e8d72..60091a846afb 100644
--- a/x11-wm/sawfish/Makefile
+++ b/x11-wm/sawfish/Makefile
@@ -16,6 +16,7 @@ DIST_SUBDIR= gnome
DISTNAME= ${PORTNAME}-${PORTVERSION}-gtk1
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Lisp configurable window manager
LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep \
Xft.2:${PORTSDIR}/x11-fonts/Xft
diff --git a/x11-wm/sawfish/pkg-comment b/x11-wm/sawfish/pkg-comment
deleted file mode 100644
index 7b3f278ded4e..000000000000
--- a/x11-wm/sawfish/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lisp configurable window manager
diff --git a/x11-wm/sawfish2/Makefile b/x11-wm/sawfish2/Makefile
index 2e898c4568e7..0fbcffbf52fb 100644
--- a/x11-wm/sawfish2/Makefile
+++ b/x11-wm/sawfish2/Makefile
@@ -16,6 +16,7 @@ DISTNAME= ${PORTNAME:S/2$//}-${PORTVERSION}-gtk2
DIST_SUBDIR= gnome2
MAINTAINER= gnome@FreeBSD.org
+COMMENT= Lisp configurable window manager
LIB_DEPENDS= rep.12:${PORTSDIR}/lang/librep \
Xft.2:${PORTSDIR}/x11-fonts/Xft
diff --git a/x11-wm/sawfish2/pkg-comment b/x11-wm/sawfish2/pkg-comment
deleted file mode 100644
index 7b3f278ded4e..000000000000
--- a/x11-wm/sawfish2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Lisp configurable window manager
diff --git a/x11-wm/scwm/Makefile b/x11-wm/scwm/Makefile
index 3d3bab85cc06..fd8525285ff6 100644
--- a/x11-wm/scwm/Makefile
+++ b/x11-wm/scwm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= ftp://scwm.mit.edu/pub/scwm/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Scheme configurable window manager
LIB_DEPENDS= guile.10:${PORTSDIR}/lang/guile
RUN_DEPENDS= ${X11BASE}/share/scwm/pixmaps/Animator.xpm:${PORTSDIR}/graphics/scwm-icons
diff --git a/x11-wm/scwm/pkg-comment b/x11-wm/scwm/pkg-comment
deleted file mode 100644
index c8c2af38b9f0..000000000000
--- a/x11-wm/scwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Scheme configurable window manager
diff --git a/x11-wm/spager/Makefile b/x11-wm/spager/Makefile
index 3e66fde54fb1..663c69e34547 100644
--- a/x11-wm/spager/Makefile
+++ b/x11-wm/spager/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www.stanford.edu/~satyakid/
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A pager for sawfish without GNOME
RUN_DEPENDS= sawfish:${PORTSDIR}/x11-wm/sawfish
diff --git a/x11-wm/spager/pkg-comment b/x11-wm/spager/pkg-comment
deleted file mode 100644
index f7710034f485..000000000000
--- a/x11-wm/spager/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A pager for sawfish without GNOME
diff --git a/x11-wm/tvtwm/Makefile b/x11-wm/tvtwm/Makefile
index 6bb5813db696..83540758f9f0 100644
--- a/x11-wm/tvtwm/Makefile
+++ b/x11-wm/tvtwm/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= window_managers
DISTNAME= ${PORTNAME}.${PORTVERSION}
MAINTAINER= gpalmer@FreeBSD.org
+COMMENT= Twm with a virtual desktop
WRKSRC= ${WRKDIR}/tvtwm
USE_IMAKE= yes
diff --git a/x11-wm/tvtwm/pkg-comment b/x11-wm/tvtwm/pkg-comment
deleted file mode 100644
index 2058f8c02d73..000000000000
--- a/x11-wm/tvtwm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Twm with a virtual desktop
diff --git a/x11-wm/w9wm/Makefile b/x11-wm/w9wm/Makefile
index a1cf98418569..649e33cba633 100644
--- a/x11-wm/w9wm/Makefile
+++ b/x11-wm/w9wm/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://inferno.cs.univ-paris8.fr/~drieu/w9wm/src/
MAINTAINER= greid@ukug.uk.freebsd.org
+COMMENT= A hack of 9wm to give virtual screens
USE_X_PREFIX= yes
MAKEFILE= Makefile.no-imake
diff --git a/x11-wm/w9wm/pkg-comment b/x11-wm/w9wm/pkg-comment
deleted file mode 100644
index 073696dcfb0a..000000000000
--- a/x11-wm/w9wm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A hack of 9wm to give virtual screens
diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile
index 4149a3ab5c2b..1735757184be 100644
--- a/x11-wm/windowmaker/Makefile
+++ b/x11-wm/windowmaker/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR= source/release
DISTNAME= WindowMaker-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
+COMMENT= GNUStep-compliant NeXTStep window manager clone
LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \
png.5:${PORTSDIR}/graphics/png \
diff --git a/x11-wm/windowmaker/pkg-comment b/x11-wm/windowmaker/pkg-comment
deleted file mode 100644
index 5eb139c15daa..000000000000
--- a/x11-wm/windowmaker/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-GNUStep-compliant NeXTStep window manager clone
diff --git a/x11-wm/wm2/Makefile b/x11-wm/wm2/Makefile
index 04d205eea727..3b308f7ab5ad 100644
--- a/x11-wm/wm2/Makefile
+++ b/x11-wm/wm2/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= http://www.all-day-breakfast.com/wm2/
DISTNAME= ${PORTNAME}-4
MAINTAINER= nakai@FreeBSD.org
+COMMENT= A very simple window manager for X
USE_X_PREFIX= yes
ALL_TARGET= depend wm2
diff --git a/x11-wm/wm2/pkg-comment b/x11-wm/wm2/pkg-comment
deleted file mode 100644
index 3b8f2f4b4642..000000000000
--- a/x11-wm/wm2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A very simple window manager for X
diff --git a/x11-wm/wmcp/Makefile b/x11-wm/wmcp/Makefile
index 8716e7c8d922..070e12b47d04 100644
--- a/x11-wm/wmcp/Makefile
+++ b/x11-wm/wmcp/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc windowmaker
MASTER_SITES= http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
+COMMENT= A dockable pager for Window Maker
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-wm/wmcp/pkg-comment b/x11-wm/wmcp/pkg-comment
deleted file mode 100644
index 9ae513d0f161..000000000000
--- a/x11-wm/wmcp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dockable pager for Window Maker
diff --git a/x11-wm/wmg/Makefile b/x11-wm/wmg/Makefile
index 25662d35cf99..ed602d520fc8 100644
--- a/x11-wm/wmg/Makefile
+++ b/x11-wm/wmg/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://ductape.net/~reeve/downloads/ \
DISTNAME= wmG-${PORTVERSION}
MAINTAINER= nakai@FreeBSD.org
+COMMENT= Small GTK-based GNOME-compliant window manager
USE_X_PREFIX= yes
USE_XPM= yes
diff --git a/x11-wm/wmg/pkg-comment b/x11-wm/wmg/pkg-comment
deleted file mode 100644
index 6f287910d5f2..000000000000
--- a/x11-wm/wmg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Small GTK-based GNOME-compliant window manager
diff --git a/x11-wm/xwmm/Makefile b/x11-wm/xwmm/Makefile
index 07612e92ef5c..575564f01902 100644
--- a/x11-wm/xwmm/Makefile
+++ b/x11-wm/xwmm/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= asami
MAINTAINER= kde@freebsd.org
+COMMENT= A simple utility managing multiple Window Managers with Qt
USE_X_PREFIX= yes
USE_QT_VER= 2
diff --git a/x11-wm/xwmm/pkg-comment b/x11-wm/xwmm/pkg-comment
deleted file mode 100644
index 805f49d037b5..000000000000
--- a/x11-wm/xwmm/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple utility managing multiple Window Managers with Qt
diff --git a/x11/bbrun/Makefile b/x11/bbrun/Makefile
index aaf185364a55..1048b551c1f9 100644
--- a/x11/bbrun/Makefile
+++ b/x11/bbrun/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= x11-wm
MASTER_SITES= http://www.dwave.net/~jking/bbrun/
MAINTAINER= adamw@FreeBSD.org
+COMMENT= A Run box for Blackbox
LIB_DEPENDS= gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
diff --git a/x11/bbrun/pkg-comment b/x11/bbrun/pkg-comment
deleted file mode 100644
index 99685f92c63c..000000000000
--- a/x11/bbrun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A Run box for Blackbox
diff --git a/x11/wmessage/Makefile b/x11/wmessage/Makefile
index cb3a7b2c4881..8b57f59b70c1 100644
--- a/x11/wmessage/Makefile
+++ b/x11/wmessage/Makefile
@@ -11,6 +11,7 @@ CATEGORIES= misc windowmaker
MASTER_SITES= http://members.ozemail.com.au/~crn/wmessage/
MAINTAINER= pat@FreeBSD.org
+COMMENT= A WINGs based message viewer similar to xmessage
BUILD_DEPENDS= get-wraster-flags:${PORTSDIR}/x11-wm/windowmaker
diff --git a/x11/wmessage/pkg-comment b/x11/wmessage/pkg-comment
deleted file mode 100644
index fa9a56c8d7b2..000000000000
--- a/x11/wmessage/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A WINGs based message viewer similar to xmessage