aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accessibility/Makefile23
-rw-r--r--accessibility/pkg/COMMENT1
-rw-r--r--arabic/Makefile3
-rw-r--r--arabic/pkg/COMMENT1
-rw-r--r--archivers/Makefile2
-rw-r--r--archivers/pkg/COMMENT1
-rw-r--r--astro/Makefile2
-rw-r--r--astro/pkg/COMMENT1
-rw-r--r--audio/Makefile2
-rw-r--r--audio/pkg/COMMENT1
-rw-r--r--benchmarks/Makefile2
-rw-r--r--benchmarks/pkg/COMMENT1
-rw-r--r--biology/Makefile2
-rw-r--r--biology/pkg/COMMENT1
-rw-r--r--cad/Makefile2
-rw-r--r--cad/pkg/COMMENT1
-rw-r--r--chinese/Makefile2
-rw-r--r--chinese/pkg/COMMENT1
-rw-r--r--comms/Makefile2
-rw-r--r--comms/pkg/COMMENT1
-rw-r--r--converters/Makefile2
-rw-r--r--converters/pkg/COMMENT1
-rw-r--r--databases/Makefile2
-rw-r--r--databases/pkg/COMMENT1
-rw-r--r--deskutils/Makefile2
-rw-r--r--deskutils/pkg/COMMENT1
-rw-r--r--devel/Makefile2
-rw-r--r--devel/pkg/COMMENT1
-rw-r--r--dns/Makefile2
-rw-r--r--dns/pkg/COMMENT1
-rw-r--r--editors/Makefile2
-rw-r--r--editors/pkg/COMMENT1
-rw-r--r--emulators/Makefile2
-rw-r--r--emulators/pkg/COMMENT1
-rw-r--r--finance/Makefile3
-rw-r--r--finance/pkg/COMMENT1
-rw-r--r--french/Makefile2
-rw-r--r--french/pkg/COMMENT1
-rw-r--r--ftp/Makefile2
-rw-r--r--ftp/pkg/COMMENT1
-rw-r--r--games/Makefile2
-rw-r--r--games/pkg/COMMENT1
-rw-r--r--german/Makefile2
-rw-r--r--german/pkg/COMMENT1
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/pkg/COMMENT1
-rw-r--r--hebrew/Makefile2
-rw-r--r--hebrew/pkg/COMMENT1
-rw-r--r--hungarian/Makefile3
-rw-r--r--hungarian/pkg/COMMENT1
-rw-r--r--irc/Makefile2
-rw-r--r--irc/pkg/COMMENT1
-rw-r--r--japanese/Makefile2
-rw-r--r--japanese/pkg/COMMENT1
-rw-r--r--java/Makefile2
-rw-r--r--java/pkg/COMMENT1
-rw-r--r--korean/Makefile2
-rw-r--r--korean/pkg/COMMENT1
-rw-r--r--lang/Makefile2
-rw-r--r--lang/pkg/COMMENT1
-rw-r--r--mail/Makefile2
-rw-r--r--mail/pkg/COMMENT1
-rw-r--r--math/Makefile2
-rw-r--r--math/pkg/COMMENT1
-rw-r--r--mbone/Makefile2
-rw-r--r--mbone/pkg/COMMENT1
-rw-r--r--misc/Makefile2
-rw-r--r--misc/pkg/COMMENT1
-rw-r--r--multimedia/Makefile3
-rw-r--r--multimedia/pkg/COMMENT1
-rw-r--r--net-mgmt/Makefile2
-rw-r--r--net-mgmt/pkg/COMMENT1
-rw-r--r--net/Makefile2
-rw-r--r--net/pkg/COMMENT1
-rw-r--r--news/Makefile2
-rw-r--r--news/pkg/COMMENT1
-rw-r--r--palm/Makefile2
-rw-r--r--palm/pkg/COMMENT1
-rw-r--r--picobsd/Makefile2
-rw-r--r--picobsd/pkg/COMMENT1
-rw-r--r--polish/Makefile3
-rw-r--r--polish/pkg/COMMENT1
-rw-r--r--portuguese/Makefile3
-rw-r--r--portuguese/pkg/COMMENT1
-rw-r--r--print/Makefile2
-rw-r--r--print/pkg/COMMENT1
-rw-r--r--russian/Makefile2
-rw-r--r--russian/pkg/COMMENT1
-rw-r--r--science/Makefile2
-rw-r--r--science/pkg/COMMENT1
-rw-r--r--security/Makefile2
-rw-r--r--security/pkg/COMMENT1
-rw-r--r--shells/Makefile2
-rw-r--r--shells/pkg/COMMENT1
-rw-r--r--sysutils/Makefile2
-rw-r--r--sysutils/pkg/COMMENT1
-rw-r--r--textproc/Makefile2
-rw-r--r--textproc/pkg/COMMENT1
-rw-r--r--ukrainian/Makefile2
-rw-r--r--ukrainian/pkg/COMMENT1
-rw-r--r--vietnamese/Makefile2
-rw-r--r--vietnamese/pkg/COMMENT1
-rw-r--r--www/Makefile2
-rw-r--r--www/pkg/COMMENT1
-rw-r--r--x11-clocks/Makefile2
-rw-r--r--x11-clocks/pkg/COMMENT1
-rw-r--r--x11-fm/Makefile2
-rw-r--r--x11-fm/pkg/COMMENT1
-rw-r--r--x11-fonts/Makefile2
-rw-r--r--x11-fonts/pkg/COMMENT1
-rw-r--r--x11-servers/Makefile2
-rw-r--r--x11-servers/pkg/COMMENT1
-rw-r--r--x11-themes/Makefile3
-rw-r--r--x11-themes/pkg/COMMENT1
-rw-r--r--x11-toolkits/Makefile2
-rw-r--r--x11-toolkits/pkg/COMMENT1
-rw-r--r--x11-wm/Makefile2
-rw-r--r--x11-wm/pkg/COMMENT1
-rw-r--r--x11/Makefile2
-rw-r--r--x11/pkg/COMMENT1
120 files changed, 138 insertions, 70 deletions
diff --git a/accessibility/Makefile b/accessibility/Makefile
index e540361eba7e..b5c4a4bbc6d7 100644
--- a/accessibility/Makefile
+++ b/accessibility/Makefile
@@ -1,14 +1,17 @@
# $FreeBSD$
#
- SUBDIR += at-spi
- SUBDIR += atk
- SUBDIR += dasher
- SUBDIR += gail
- SUBDIR += gnomemag
- SUBDIR += gnomespeech
- SUBDIR += gnopernicus
- SUBDIR += gok
- SUBDIR += kdeaccessibility
- SUBDIR += linux-atk
+
+ COMMENT = Ports to help disabled users
+
+ SUBDIR += at-spi
+ SUBDIR += atk
+ SUBDIR += dasher
+ SUBDIR += gail
+ SUBDIR += gnomemag
+ SUBDIR += gnomespeech
+ SUBDIR += gnopernicus
+ SUBDIR += gok
+ SUBDIR += kdeaccessibility
+ SUBDIR += linux-atk
.include <bsd.port.subdir.mk>
diff --git a/accessibility/pkg/COMMENT b/accessibility/pkg/COMMENT
deleted file mode 100644
index 303b88115cde..000000000000
--- a/accessibility/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Ports to help disabled users
diff --git a/arabic/Makefile b/arabic/Makefile
index 5f27d8c1aa42..e7725ca4ee42 100644
--- a/arabic/Makefile
+++ b/arabic/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = Arabic language support
+
SUBDIR += ae_fonts_mono
SUBDIR += ae_fonts_ttf
SUBDIR += kacst_fonts
diff --git a/arabic/pkg/COMMENT b/arabic/pkg/COMMENT
deleted file mode 100644
index 76776e596bc9..000000000000
--- a/arabic/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Arabic support
diff --git a/archivers/Makefile b/archivers/Makefile
index f4a4bb17d0e6..21fa66db9415 100644
--- a/archivers/Makefile
+++ b/archivers/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Archivers
+
SUBDIR += 9e
SUBDIR += alz2zip
SUBDIR += arc
diff --git a/archivers/pkg/COMMENT b/archivers/pkg/COMMENT
deleted file mode 100644
index ee6925abfa8c..000000000000
--- a/archivers/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Archivers
diff --git a/astro/Makefile b/astro/Makefile
index acfcbe2c6ffc..48cb79afaed5 100644
--- a/astro/Makefile
+++ b/astro/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Astronomical ports
+
SUBDIR += SETIsupport
SUBDIR += accrete
SUBDIR += celestia
diff --git a/astro/pkg/COMMENT b/astro/pkg/COMMENT
deleted file mode 100644
index 1515e1b07686..000000000000
--- a/astro/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Astronomical ports
diff --git a/audio/Makefile b/audio/Makefile
index 62b05647af58..1cc3737eb4b1 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Audio tools
+
SUBDIR += HVSC-Update
SUBDIR += Maaate
SUBDIR += abcde
diff --git a/audio/pkg/COMMENT b/audio/pkg/COMMENT
deleted file mode 100644
index 6b4100d811ab..000000000000
--- a/audio/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Audio tools
diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 73741392530e..e2636b5716aa 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Benchmarking tools
+
SUBDIR += autobench
SUBDIR += bonnie
SUBDIR += bonnie++
diff --git a/benchmarks/pkg/COMMENT b/benchmarks/pkg/COMMENT
deleted file mode 100644
index 4b2d98eb0d1b..000000000000
--- a/benchmarks/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Benchmarking tools
diff --git a/biology/Makefile b/biology/Makefile
index 7959934915f1..8a93091edb93 100644
--- a/biology/Makefile
+++ b/biology/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Biology
+
SUBDIR += L-Breeder
SUBDIR += act
SUBDIR += artemis
diff --git a/biology/pkg/COMMENT b/biology/pkg/COMMENT
deleted file mode 100644
index e2c965a88aa4..000000000000
--- a/biology/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Biology
diff --git a/cad/Makefile b/cad/Makefile
index 60b6b6e0ed09..490c7e06d71a 100644
--- a/cad/Makefile
+++ b/cad/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = CAD tools
+
SUBDIR += admesh
SUBDIR += astk-client
SUBDIR += astk-serveur
diff --git a/cad/pkg/COMMENT b/cad/pkg/COMMENT
deleted file mode 100644
index 34425d86ea95..000000000000
--- a/cad/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-CAD tools
diff --git a/chinese/Makefile b/chinese/Makefile
index 13f6ca7c0845..5da7e2d2628a 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Chinese support
+
SUBDIR += CJK
SUBDIR += FreeWnn-lib
SUBDIR += FreeWnn-server
diff --git a/chinese/pkg/COMMENT b/chinese/pkg/COMMENT
deleted file mode 100644
index cc8552a0ca0a..000000000000
--- a/chinese/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Chinese support
diff --git a/comms/Makefile b/comms/Makefile
index d2d5a58ac5c5..fa5933597551 100644
--- a/comms/Makefile
+++ b/comms/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Communication utilities
+
SUBDIR += acfax
SUBDIR += aldo
SUBDIR += asmodem
diff --git a/comms/pkg/COMMENT b/comms/pkg/COMMENT
deleted file mode 100644
index cda188f01daf..000000000000
--- a/comms/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Communication utilities
diff --git a/converters/Makefile b/converters/Makefile
index 24ea374aadcb..555408dc455e 100644
--- a/converters/Makefile
+++ b/converters/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Character code converters
+
SUBDIR += aish
SUBDIR += asr10
SUBDIR += base64
diff --git a/converters/pkg/COMMENT b/converters/pkg/COMMENT
deleted file mode 100644
index bd3dc017da10..000000000000
--- a/converters/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Character code converters
diff --git a/databases/Makefile b/databases/Makefile
index 5396da1a48a5..a89fa1df8013 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Databases
+
SUBDIR += WWWdb
SUBDIR += adodb
SUBDIR += arcexplorer
diff --git a/databases/pkg/COMMENT b/databases/pkg/COMMENT
deleted file mode 100644
index c02193e210f8..000000000000
--- a/databases/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Databases
diff --git a/deskutils/Makefile b/deskutils/Makefile
index 198f9096da32..f19ee52c86ea 100644
--- a/deskutils/Makefile
+++ b/deskutils/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Things that used to be on the desktop before computers were invented
+
SUBDIR += abacus
SUBDIR += aspostit
SUBDIR += autocutsel
diff --git a/deskutils/pkg/COMMENT b/deskutils/pkg/COMMENT
deleted file mode 100644
index 0e34074caf93..000000000000
--- a/deskutils/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Things that used to be on the desktop before computers were invented
diff --git a/devel/Makefile b/devel/Makefile
index e8dbc3bf8b37..ef66e1148cf9 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Development utilities
+
SUBDIR += ElectricFence
SUBDIR += ORBacus
SUBDIR += ORBit
diff --git a/devel/pkg/COMMENT b/devel/pkg/COMMENT
deleted file mode 100644
index 41063843884e..000000000000
--- a/devel/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Development utilities
diff --git a/dns/Makefile b/dns/Makefile
index 1619331659e2..15016f8f4b33 100644
--- a/dns/Makefile
+++ b/dns/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Domain Name Service tools
+
SUBDIR += adns
SUBDIR += ares
SUBDIR += bind8
diff --git a/dns/pkg/COMMENT b/dns/pkg/COMMENT
deleted file mode 100644
index e644dd11a1aa..000000000000
--- a/dns/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Domain Name Service tools
diff --git a/editors/Makefile b/editors/Makefile
index 5a3f1e4a33ce..af5423a0dca4 100644
--- a/editors/Makefile
+++ b/editors/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Editors
+
SUBDIR += AbiWord2
SUBDIR += MathPlanner
SUBDIR += aee
diff --git a/editors/pkg/COMMENT b/editors/pkg/COMMENT
deleted file mode 100644
index 42379c0375df..000000000000
--- a/editors/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Editors
diff --git a/emulators/Makefile b/emulators/Makefile
index 795d4432249c..2fbab684f2c2 100644
--- a/emulators/Makefile
+++ b/emulators/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Emulators for other operating systems
+
SUBDIR += adamem
SUBDIR += aftp
SUBDIR += atari800
diff --git a/emulators/pkg/COMMENT b/emulators/pkg/COMMENT
deleted file mode 100644
index e41c5a5659f8..000000000000
--- a/emulators/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Emulators for other operating systems
diff --git a/finance/Makefile b/finance/Makefile
index f05a528c4755..070cabf8a92e 100644
--- a/finance/Makefile
+++ b/finance/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = Monetary, financial and related applications
+
SUBDIR += aqmoney
SUBDIR += cbb
SUBDIR += emma
diff --git a/finance/pkg/COMMENT b/finance/pkg/COMMENT
deleted file mode 100644
index a4406b8c6a82..000000000000
--- a/finance/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Monetary, financial and related applications
diff --git a/french/Makefile b/french/Makefile
index 701e8f445c49..a7b28b5ceacc 100644
--- a/french/Makefile
+++ b/french/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = French support
+
SUBDIR += abispell-fr-FR
SUBDIR += aspell
SUBDIR += aster
diff --git a/french/pkg/COMMENT b/french/pkg/COMMENT
deleted file mode 100644
index a8361b06d990..000000000000
--- a/french/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-French support
diff --git a/ftp/Makefile b/ftp/Makefile
index 2c18ed53699f..a3e5c1a00846 100644
--- a/ftp/Makefile
+++ b/ftp/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = FTP client and server utilities
+
SUBDIR += IglooFTP
SUBDIR += axel
SUBDIR += axelq
diff --git a/ftp/pkg/COMMENT b/ftp/pkg/COMMENT
deleted file mode 100644
index 58e357fe0103..000000000000
--- a/ftp/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-FTP client and server utilities
diff --git a/games/Makefile b/games/Makefile
index e418b6dbdfaa..55f99cc2cf61 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Games
+
SUBDIR += 0verkill
SUBDIR += 3dc
SUBDIR += 3dpong
diff --git a/games/pkg/COMMENT b/games/pkg/COMMENT
deleted file mode 100644
index a14e46629f10..000000000000
--- a/games/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Games
diff --git a/german/Makefile b/german/Makefile
index 7b6aeeaa3e11..781be6d8fe30 100644
--- a/german/Makefile
+++ b/german/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = German support
+
SUBDIR += BBBike
SUBDIR += aspell
SUBDIR += citrix_ica
diff --git a/german/pkg/COMMENT b/german/pkg/COMMENT
deleted file mode 100644
index 3e35167cae3e..000000000000
--- a/german/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-German support
diff --git a/graphics/Makefile b/graphics/Makefile
index 1c297f1bd65d..08319d269b22 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Graphics tools and libraries
+
SUBDIR += 4va
SUBDIR += Cgraph
SUBDIR += Coin
diff --git a/graphics/pkg/COMMENT b/graphics/pkg/COMMENT
deleted file mode 100644
index 09cd23ea2e7b..000000000000
--- a/graphics/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Graphics tools and libraries
diff --git a/hebrew/Makefile b/hebrew/Makefile
index c3e6ce0f0544..060737249245 100644
--- a/hebrew/Makefile
+++ b/hebrew/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Hebrew support
+
SUBDIR += culmus
SUBDIR += elmar-fonts
SUBDIR += he2
diff --git a/hebrew/pkg/COMMENT b/hebrew/pkg/COMMENT
deleted file mode 100644
index 0cb5e98996ca..000000000000
--- a/hebrew/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Hebrew support
diff --git a/hungarian/Makefile b/hungarian/Makefile
index 684af27494d0..5eadffce7a9c 100644
--- a/hungarian/Makefile
+++ b/hungarian/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = Hungarian language support
+
SUBDIR += hu-phone
SUBDIR += hu-zipcodes
SUBDIR += ispell
diff --git a/hungarian/pkg/COMMENT b/hungarian/pkg/COMMENT
deleted file mode 100644
index 26630ce88213..000000000000
--- a/hungarian/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Hungarian language support
diff --git a/irc/Makefile b/irc/Makefile
index af371f858234..d9c862602968 100644
--- a/irc/Makefile
+++ b/irc/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Internet Relay Chat utilities
+
SUBDIR += bitchx
SUBDIR += bitlbee
SUBDIR += blackened
diff --git a/irc/pkg/COMMENT b/irc/pkg/COMMENT
deleted file mode 100644
index 262346ab0bea..000000000000
--- a/irc/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Internet Relay Chat utilities
diff --git a/japanese/Makefile b/japanese/Makefile
index 99769dfa7504..8fd7d1594f53 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Japanese support
+
SUBDIR += ASCIIdates98-fpw
SUBDIR += CGdic-fpw
SUBDIR += Canna
diff --git a/japanese/pkg/COMMENT b/japanese/pkg/COMMENT
deleted file mode 100644
index ca367d43b07c..000000000000
--- a/japanese/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Japanese support
diff --git a/java/Makefile b/java/Makefile
index 0c6ee2957ae2..6e6c6343676e 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Java language support
+
SUBDIR += avalon-logkit
SUBDIR += bluej
SUBDIR += bouncycastle
diff --git a/java/pkg/COMMENT b/java/pkg/COMMENT
deleted file mode 100644
index a431a6a01fcf..000000000000
--- a/java/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Java language support
diff --git a/korean/Makefile b/korean/Makefile
index 0353acef6c2c..751197ad0795 100644
--- a/korean/Makefile
+++ b/korean/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Korean support
+
SUBDIR += FreeWnn-lib
SUBDIR += FreeWnn-server
SUBDIR += a2ps
diff --git a/korean/pkg/COMMENT b/korean/pkg/COMMENT
deleted file mode 100644
index 017352521ff9..000000000000
--- a/korean/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Korean support
diff --git a/lang/Makefile b/lang/Makefile
index b4aca05adb61..ea8c9448ef59 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Programming languages
+
SUBDIR += Gofer
SUBDIR += STk
SUBDIR += Sather
diff --git a/lang/pkg/COMMENT b/lang/pkg/COMMENT
deleted file mode 100644
index 3aa382f8a83b..000000000000
--- a/lang/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Programming languages
diff --git a/mail/Makefile b/mail/Makefile
index d893de23d594..06b9b7c2e47a 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Electronic mail utilities
+
SUBDIR += abook
SUBDIR += adcomplain
SUBDIR += aileron
diff --git a/mail/pkg/COMMENT b/mail/pkg/COMMENT
deleted file mode 100644
index f70a8f747920..000000000000
--- a/mail/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Electronic mail utilities
diff --git a/math/Makefile b/math/Makefile
index 4132fe7ccd35..32ba9fcee9a8 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Mathematics
+
SUBDIR += GiNaC
SUBDIR += PDL
SUBDIR += R-a4
diff --git a/math/pkg/COMMENT b/math/pkg/COMMENT
deleted file mode 100644
index 435a3feb197a..000000000000
--- a/math/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Mathematics
diff --git a/mbone/Makefile b/mbone/Makefile
index cf9dd91f6f36..4d918a2cefce 100644
--- a/mbone/Makefile
+++ b/mbone/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = MBone applications
+
SUBDIR += imm
SUBDIR += mcl
SUBDIR += nte
diff --git a/mbone/pkg/COMMENT b/mbone/pkg/COMMENT
deleted file mode 100644
index 2eb3d11b9f6b..000000000000
--- a/mbone/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-MBone applications
diff --git a/misc/Makefile b/misc/Makefile
index e27f414602d6..372bf6595a6c 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Miscellaneous utilities
+
SUBDIR += 44bsd-more
SUBDIR += Howto
SUBDIR += achievo
diff --git a/misc/pkg/COMMENT b/misc/pkg/COMMENT
deleted file mode 100644
index 230e41a20090..000000000000
--- a/misc/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Miscellaneous utilities
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 3e9ca1e12c79..97ae9ff16965 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = Multimedia software
+
SUBDIR += acidrip
SUBDIR += acme
SUBDIR += avidemux
diff --git a/multimedia/pkg/COMMENT b/multimedia/pkg/COMMENT
deleted file mode 100644
index 241d11f2fa27..000000000000
--- a/multimedia/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Multimedia software
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index 7d0efb3f811c..ba7ffc744e26 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Network management tools
+
SUBDIR += NeTraMet
SUBDIR += aggregate
SUBDIR += aguri
diff --git a/net-mgmt/pkg/COMMENT b/net-mgmt/pkg/COMMENT
deleted file mode 100644
index 745e4ef6af66..000000000000
--- a/net-mgmt/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Network management tools
diff --git a/net/Makefile b/net/Makefile
index 70d264ba763a..ac6e563fbe48 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Networking tools
+
SUBDIR += 3proxy
SUBDIR += 44bsd-rdist
SUBDIR += 4g8
diff --git a/net/pkg/COMMENT b/net/pkg/COMMENT
deleted file mode 100644
index b5d47729cb6a..000000000000
--- a/net/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Networking tools
diff --git a/news/Makefile b/news/Makefile
index bd1e6f2e9e69..4211f2f9b63e 100644
--- a/news/Makefile
+++ b/news/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Network news
+
SUBDIR += PicMonger
SUBDIR += atp
SUBDIR += aub
diff --git a/news/pkg/COMMENT b/news/pkg/COMMENT
deleted file mode 100644
index 16189392ab64..000000000000
--- a/news/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Network news
diff --git a/palm/Makefile b/palm/Makefile
index 19a266841ee0..b7c970c8febf 100644
--- a/palm/Makefile
+++ b/palm/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Software support for the 3Com Palm(tm) series
+
SUBDIR += bibelot
SUBDIR += coldsync
SUBDIR += gnomepilot-conduits2
diff --git a/palm/pkg/COMMENT b/palm/pkg/COMMENT
deleted file mode 100644
index fed87405642a..000000000000
--- a/palm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Software support for the 3Com Palm(tm) series
diff --git a/picobsd/Makefile b/picobsd/Makefile
index a9962fe0e7c3..f4644b300388 100644
--- a/picobsd/Makefile
+++ b/picobsd/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = PicoBSD-related ports
+
SUBDIR += ssh-picobsd
.include <bsd.port.subdir.mk>
diff --git a/picobsd/pkg/COMMENT b/picobsd/pkg/COMMENT
deleted file mode 100644
index dcad6a95d201..000000000000
--- a/picobsd/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-PicoBSD-related ports
diff --git a/polish/Makefile b/polish/Makefile
index ad6a5f5d6276..ff046b8c8aaf 100644
--- a/polish/Makefile
+++ b/polish/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = Polish language support
+
SUBDIR += aspell
SUBDIR += ekg
SUBDIR += gnugadu
diff --git a/polish/pkg/COMMENT b/polish/pkg/COMMENT
deleted file mode 100644
index 42e79e7ca55a..000000000000
--- a/polish/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Polish language support
diff --git a/portuguese/Makefile b/portuguese/Makefile
index e17ab39f15da..8c519b4079e3 100644
--- a/portuguese/Makefile
+++ b/portuguese/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = Portuguese language support
+
SUBDIR += aspell
SUBDIR += frontpage-pt_BR
SUBDIR += ispell-pt_BR
diff --git a/portuguese/pkg/COMMENT b/portuguese/pkg/COMMENT
deleted file mode 100644
index 90251db55321..000000000000
--- a/portuguese/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Portuguese language support
diff --git a/print/Makefile b/print/Makefile
index ba8f7af3d324..f7c7b81278a4 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Desktop publishing
+
SUBDIR += a2ps-a4
SUBDIR += a2ps-letter
SUBDIR += a2ps-letterdj
diff --git a/print/pkg/COMMENT b/print/pkg/COMMENT
deleted file mode 100644
index 832f788ee4a4..000000000000
--- a/print/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Desktop publishing
diff --git a/russian/Makefile b/russian/Makefile
index 77306c351158..8bed88e80a76 100644
--- a/russian/Makefile
+++ b/russian/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Russian support
+
SUBDIR += X.language
SUBDIR += apache13
SUBDIR += apache13-modssl
diff --git a/russian/pkg/COMMENT b/russian/pkg/COMMENT
deleted file mode 100644
index 2ab1f9dd4bf5..000000000000
--- a/russian/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Russian support
diff --git a/science/Makefile b/science/Makefile
index d53a84b0b4e5..c1bf0897d601 100644
--- a/science/Makefile
+++ b/science/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Scientific ports
+
SUBDIR += 2dhf
SUBDIR += at
SUBDIR += bblimage
diff --git a/science/pkg/COMMENT b/science/pkg/COMMENT
deleted file mode 100644
index f9c6b2885b88..000000000000
--- a/science/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Scientific ports
diff --git a/security/Makefile b/security/Makefile
index 2f7d94bdc58a..03109cfc290f 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Security tools
+
SUBDIR += ADMsmb
SUBDIR += ADMsnmp
SUBDIR += IMHear
diff --git a/security/pkg/COMMENT b/security/pkg/COMMENT
deleted file mode 100644
index 5ee88eaab9d6..000000000000
--- a/security/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Security tools
diff --git a/shells/Makefile b/shells/Makefile
index 28216cb52bcf..19450eee385a 100644
--- a/shells/Makefile
+++ b/shells/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Shells
+
SUBDIR += 44bsd-csh
SUBDIR += bash-completion
SUBDIR += bash1
diff --git a/shells/pkg/COMMENT b/shells/pkg/COMMENT
deleted file mode 100644
index 7f88f8abeeda..000000000000
--- a/shells/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Shells
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 176064ce43aa..a074548cdd61 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = System utilities
+
SUBDIR += 3dm
SUBDIR += LPRng
SUBDIR += LPRngTool
diff --git a/sysutils/pkg/COMMENT b/sysutils/pkg/COMMENT
deleted file mode 100644
index 004ba2ab05ac..000000000000
--- a/sysutils/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-System utilities
diff --git a/textproc/Makefile b/textproc/Makefile
index a2ee22c3bd8a..7acd2fa9f41e 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Text processing utilities (does not include desktop publishing)
+
SUBDIR += 2bsd-diff
SUBDIR += Ebnf2ps
SUBDIR += af-aspell
diff --git a/textproc/pkg/COMMENT b/textproc/pkg/COMMENT
deleted file mode 100644
index 965a3ef8f053..000000000000
--- a/textproc/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Text processing utilities (does not include desktop publishing)
diff --git a/ukrainian/Makefile b/ukrainian/Makefile
index 8aad126fc04b..630d2c3aff46 100644
--- a/ukrainian/Makefile
+++ b/ukrainian/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Ukrainian support
+
SUBDIR += aspell
SUBDIR += gd
SUBDIR += iceb
diff --git a/ukrainian/pkg/COMMENT b/ukrainian/pkg/COMMENT
deleted file mode 100644
index 397e32fa6577..000000000000
--- a/ukrainian/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Ukrainian support
diff --git a/vietnamese/Makefile b/vietnamese/Makefile
index d5b2b8ae897c..a094a5581bda 100644
--- a/vietnamese/Makefile
+++ b/vietnamese/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Vietnamese support
+
.if !defined(NO_VIET_KDE)
SUBDIR += kde3-i18n
.endif
diff --git a/vietnamese/pkg/COMMENT b/vietnamese/pkg/COMMENT
deleted file mode 100644
index 51a9f98936d2..000000000000
--- a/vietnamese/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Vietnamese support
diff --git a/www/Makefile b/www/Makefile
index cb3ae76e17d1..10c3ca137989 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Ports related to the World Wide Web
+
SUBDIR += MT
SUBDIR += MT-PM
SUBDIR += Mosaic # requires Motif
diff --git a/www/pkg/COMMENT b/www/pkg/COMMENT
deleted file mode 100644
index da5ca2744848..000000000000
--- a/www/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Ports related to the World Wide Web
diff --git a/x11-clocks/Makefile b/x11-clocks/Makefile
index 1e17dc3b0ba0..fc416e8700db 100644
--- a/x11-clocks/Makefile
+++ b/x11-clocks/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = X11 clocks
+
SUBDIR += abclock
SUBDIR += alltraxclock
SUBDIR += asclock
diff --git a/x11-clocks/pkg/COMMENT b/x11-clocks/pkg/COMMENT
deleted file mode 100644
index 4b1066e571dd..000000000000
--- a/x11-clocks/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11 clocks
diff --git a/x11-fm/Makefile b/x11-fm/Makefile
index 4fb8d9dd72d9..bded778d724e 100644
--- a/x11-fm/Makefile
+++ b/x11-fm/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = X11 file managers
+
SUBDIR += FSViewer
SUBDIR += apotheke
SUBDIR += asfiles
diff --git a/x11-fm/pkg/COMMENT b/x11-fm/pkg/COMMENT
deleted file mode 100644
index f58a3816002f..000000000000
--- a/x11-fm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11 file managers
diff --git a/x11-fonts/Makefile b/x11-fonts/Makefile
index 09335a8b60b3..08ce3a6e5969 100644
--- a/x11-fonts/Makefile
+++ b/x11-fonts/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = X11 fonts and font utilities
+
SUBDIR += XFree86-4-font100dpi
SUBDIR += XFree86-4-font75dpi
SUBDIR += XFree86-4-fontCyrillic
diff --git a/x11-fonts/pkg/COMMENT b/x11-fonts/pkg/COMMENT
deleted file mode 100644
index ee9f2db8a014..000000000000
--- a/x11-fonts/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11 fonts and font utilities
diff --git a/x11-servers/Makefile b/x11-servers/Makefile
index 8d3ddb72227a..1f121962c587 100644
--- a/x11-servers/Makefile
+++ b/x11-servers/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = X11 servers
+
SUBDIR += XFree86-4-FontServer
SUBDIR += XFree86-4-NestServer
SUBDIR += XFree86-4-PrintServer
diff --git a/x11-servers/pkg/COMMENT b/x11-servers/pkg/COMMENT
deleted file mode 100644
index 676c0fa94c0f..000000000000
--- a/x11-servers/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11 servers
diff --git a/x11-themes/Makefile b/x11-themes/Makefile
index 69a55506d13b..91793ef5582b 100644
--- a/x11-themes/Makefile
+++ b/x11-themes/Makefile
@@ -1,5 +1,8 @@
# $FreeBSD$
#
+
+ COMMENT = X Windows System themes
+
SUBDIR += gnome-icons
SUBDIR += gnome-icons-aqua-fusion
SUBDIR += gnome-icons-cool-gorilla
diff --git a/x11-themes/pkg/COMMENT b/x11-themes/pkg/COMMENT
deleted file mode 100644
index 672e29e92ff8..000000000000
--- a/x11-themes/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X Windows System themes
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index ff512f5b423a..d164ef2186a7 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = X11 toolkits
+
SUBDIR += 9libs
SUBDIR += SoXt
SUBDIR += Xaw3d
diff --git a/x11-toolkits/pkg/COMMENT b/x11-toolkits/pkg/COMMENT
deleted file mode 100644
index 3beef208f230..000000000000
--- a/x11-toolkits/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11 toolkits
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index dc68d2de442d..565ec1323abf 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = X11 window managers
+
SUBDIR += 9wm
SUBDIR += aewm
SUBDIR += aewm++
diff --git a/x11-wm/pkg/COMMENT b/x11-wm/pkg/COMMENT
deleted file mode 100644
index 1d393a0167f5..000000000000
--- a/x11-wm/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-X11 window managers
diff --git a/x11/Makefile b/x11/Makefile
index b29b0518982e..35938f053397 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -1,6 +1,8 @@
# $FreeBSD$
#
+ COMMENT = Ports to support the X window system
+
SUBDIR += 3ddesktop
SUBDIR += 9box
SUBDIR += 9menu
diff --git a/x11/pkg/COMMENT b/x11/pkg/COMMENT
deleted file mode 100644
index 0bfb6803a585..000000000000
--- a/x11/pkg/COMMENT
+++ /dev/null
@@ -1 +0,0 @@
-Ports to support the X window system