aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--converters/mule-ucs-emacs20/Makefile3
-rw-r--r--converters/mule-ucs-emacs20/pkg-comment1
-rw-r--r--converters/mule-ucs/Makefile1
-rw-r--r--converters/mule-ucs/pkg-comment1
-rw-r--r--databases/mysql323-client/Makefile2
-rw-r--r--databases/mysql323-server/Makefile1
-rw-r--r--databases/mysql323-server/pkg-comment1
-rw-r--r--databases/mysql323-server/pkg-comment.client1
-rw-r--r--databases/mysql40-client/Makefile2
-rw-r--r--databases/mysql40-server/Makefile2
-rw-r--r--databases/mysql40-server/pkg-comment.client1
-rw-r--r--databases/mysql41-client/Makefile2
-rw-r--r--databases/mysql41-server/Makefile2
-rw-r--r--databases/mysql41-server/pkg-comment.client1
-rw-r--r--databases/mysql50-client/Makefile2
-rw-r--r--databases/mysql50-server/Makefile2
-rw-r--r--databases/mysql50-server/pkg-comment.client1
-rw-r--r--databases/mysql51-client/Makefile2
-rw-r--r--databases/mysql51-server/Makefile2
-rw-r--r--databases/mysql51-server/pkg-comment.client1
-rw-r--r--databases/mysql54-client/Makefile2
-rw-r--r--databases/mysql54-server/Makefile2
-rw-r--r--databases/mysql54-server/pkg-comment.client1
-rw-r--r--databases/mysql55-client/Makefile2
-rw-r--r--databases/mysql55-server/Makefile2
-rw-r--r--databases/mysql55-server/pkg-comment.client1
-rw-r--r--databases/mysql60-client/Makefile2
-rw-r--r--databases/mysql60-server/Makefile2
-rw-r--r--databases/mysql60-server/pkg-comment.client1
-rw-r--r--databases/percona55-client/Makefile2
-rw-r--r--databases/percona55-server/Makefile2
-rw-r--r--databases/percona55-server/pkg-comment.client1
-rw-r--r--editors/apel-emacs19/Makefile1
-rw-r--r--editors/apel-emacs20/Makefile1
-rw-r--r--editors/apel-mule/Makefile1
-rw-r--r--editors/apel-xemacs21-mule/Makefile1
-rw-r--r--editors/apel/Makefile1
-rw-r--r--editors/apel/pkg-comment.emacs191
-rw-r--r--editors/apel/pkg-comment.emacs201
-rw-r--r--editors/apel/pkg-comment.emacs211
-rw-r--r--editors/apel/pkg-comment.mule1
-rw-r--r--editors/apel/pkg-comment.xemacs21-mule1
-rw-r--r--editors/flim-emacs20/Makefile1
-rw-r--r--editors/flim-xemacs21-mule/Makefile1
-rw-r--r--editors/flim/Makefile1
-rw-r--r--editors/flim/pkg-comment.emacs201
-rw-r--r--editors/flim/pkg-comment.emacs211
-rw-r--r--editors/flim/pkg-comment.xemacs21-mule1
-rw-r--r--editors/flim113-emacs19/Makefile1
-rw-r--r--editors/flim113-emacs20/Makefile1
-rw-r--r--editors/flim113-mule/Makefile1
-rw-r--r--editors/flim113-xemacs21-mule/Makefile1
-rw-r--r--editors/flim113/Makefile1
-rw-r--r--editors/flim113/pkg-comment.emacs191
-rw-r--r--editors/flim113/pkg-comment.emacs201
-rw-r--r--editors/flim113/pkg-comment.emacs211
-rw-r--r--editors/flim113/pkg-comment.mule1
-rw-r--r--editors/flim113/pkg-comment.xemacs21-mule1
-rw-r--r--editors/semi-emacs20/Makefile1
-rw-r--r--editors/semi-xemacs21-mule/Makefile1
-rw-r--r--editors/semi/Makefile1
-rw-r--r--editors/semi/pkg-comment.emacs201
-rw-r--r--editors/semi/pkg-comment.emacs211
-rw-r--r--editors/semi/pkg-comment.xemacs21-mule1
-rw-r--r--editors/semi113-emacs19/Makefile1
-rw-r--r--editors/semi113-emacs20/Makefile1
-rw-r--r--editors/semi113-mule/Makefile1
-rw-r--r--editors/semi113-xemacs21-mule/Makefile1
-rw-r--r--editors/semi113/Makefile1
-rw-r--r--editors/semi113/pkg-comment.emacs191
-rw-r--r--editors/semi113/pkg-comment.emacs201
-rw-r--r--editors/semi113/pkg-comment.emacs211
-rw-r--r--editors/semi113/pkg-comment.mule1
-rw-r--r--editors/semi113/pkg-comment.xemacs21-mule1
-rw-r--r--editors/xemacs-devel-mule/Makefile1
-rw-r--r--editors/xemacs-devel-mule/pkg-comment1
-rw-r--r--editors/xemacs21-mule/Makefile1
-rw-r--r--editors/xemacs21-mule/pkg-comment1
-rw-r--r--graphics/gdk-pixbuf/Makefile1
-rw-r--r--graphics/gdk-pixbuf/pkg-comment1
-rw-r--r--graphics/gnomecanvas/Makefile2
-rw-r--r--graphics/gnomecanvas/pkg-comment1
-rw-r--r--japanese/acroread-jpnfont/Makefile2
-rw-r--r--japanese/acroread-jpnfont/pkg-comment1
-rw-r--r--japanese/exmh2/Makefile2
-rw-r--r--japanese/exmh2/pkg-comment1
-rw-r--r--japanese/magicpoint/Makefile2
-rw-r--r--japanese/magicpoint/pkg-comment1
-rw-r--r--japanese/skk-jisyo-cdb/Makefile2
-rw-r--r--japanese/skk-jisyo-cdb/pkg-comment1
-rw-r--r--japanese/skk-jisyo/Makefile1
-rw-r--r--japanese/skk-jisyo/pkg-comment1
-rw-r--r--japanese/xemacs-devel-canna+freewnn/Makefile2
-rw-r--r--japanese/xemacs-devel-canna+freewnn/pkg-comment1
-rw-r--r--japanese/xemacs-devel-canna+wnn6/Makefile2
-rw-r--r--japanese/xemacs-devel-canna+wnn6/pkg-comment1
-rw-r--r--japanese/xemacs-devel-canna/Makefile2
-rw-r--r--japanese/xemacs-devel-canna/pkg-comment1
-rw-r--r--japanese/xemacs-devel-freewnn/Makefile2
-rw-r--r--japanese/xemacs-devel-freewnn/pkg-comment1
-rw-r--r--japanese/xemacs-devel-wnn6/Makefile2
-rw-r--r--japanese/xemacs-devel-wnn6/pkg-comment1
-rw-r--r--korean/acroread-korfont/Makefile2
-rw-r--r--korean/acroread-korfont/pkg-comment1
-rw-r--r--lang/php3/Makefile2
-rw-r--r--lang/python-devel/Makefile1
-rw-r--r--lang/python-devel/pkg-comment1
-rw-r--r--lang/python/Makefile1
-rw-r--r--lang/python/pkg-comment1
-rw-r--r--lang/python22/Makefile1
-rw-r--r--lang/python22/pkg-comment1
-rw-r--r--lang/python23/Makefile1
-rw-r--r--lang/python23/pkg-comment1
-rw-r--r--lang/python24/Makefile1
-rw-r--r--lang/python24/pkg-comment1
-rw-r--r--lang/python25/Makefile1
-rw-r--r--lang/python25/pkg-comment1
-rw-r--r--lang/python26/Makefile1
-rw-r--r--lang/python26/pkg-comment1
-rw-r--r--lang/python27/Makefile1
-rw-r--r--lang/python27/pkg-comment1
-rw-r--r--lang/python30/Makefile1
-rw-r--r--lang/python30/pkg-comment1
-rw-r--r--lang/python31/Makefile1
-rw-r--r--lang/python31/pkg-comment1
-rw-r--r--lang/python32/Makefile1
-rw-r--r--lang/python32/pkg-comment1
-rw-r--r--lang/stackless_python/Makefile2
-rw-r--r--lang/stackless_python/pkg-comment1
-rw-r--r--mail/exmh2/Makefile1
-rw-r--r--mail/exmh2/pkg-comment1
-rw-r--r--misc/magicpoint/Makefile1
-rw-r--r--misc/magicpoint/pkg-comment1
-rw-r--r--net/cvsup/Makefile3
-rw-r--r--net/cvsup/pkg-comment1
-rw-r--r--net/cvsup/pkg-comment.nogui1
-rw-r--r--print/acroread-commfont/Makefile2
-rw-r--r--print/acroread-commfont/pkg-comment1
-rw-r--r--print/bjfilter360/Makefile2
-rw-r--r--print/bjfilter360/pkg-comment1
-rw-r--r--print/bjfilter850/Makefile2
-rw-r--r--print/bjfilter850/pkg-comment1
-rw-r--r--print/bjfilter850ug/Makefile2
-rw-r--r--print/bjfilter850ug/pkg-comment1
-rw-r--r--print/bjfilter860/Makefile2
-rw-r--r--print/bjfilter860/pkg-comment1
-rw-r--r--print/bjfilter870/Makefile2
-rw-r--r--print/bjfilter870/pkg-comment1
-rw-r--r--print/bjfiltercom/Makefile2
-rw-r--r--print/bjfiltercom/pkg-comment1
-rw-r--r--print/bjfilters600/Makefile2
-rw-r--r--print/bjfilters600/pkg-comment1
-rw-r--r--print/bjfilters630/Makefile2
-rw-r--r--print/bjfilters630/pkg-comment1
-rw-r--r--print/bjfilters6300/Makefile2
-rw-r--r--print/bjfilters6300/pkg-comment1
-rw-r--r--print/pips2200/Makefile2
-rw-r--r--print/pips2200/pkg-comment1
-rw-r--r--print/pips3000/Makefile2
-rw-r--r--print/pips3000/pkg-comment1
-rw-r--r--print/pips3300/Makefile2
-rw-r--r--print/pips3300/pkg-comment1
-rw-r--r--print/pips3500/Makefile2
-rw-r--r--print/pips3500/pkg-comment1
-rw-r--r--print/pips670/Makefile2
-rw-r--r--print/pips670/pkg-comment1
-rw-r--r--print/pips750_2000/Makefile2
-rw-r--r--print/pips750_2000/pkg-comment1
-rw-r--r--print/pips760/Makefile2
-rw-r--r--print/pips760/pkg-comment1
-rw-r--r--print/pips770/Makefile2
-rw-r--r--print/pips770/pkg-comment1
-rw-r--r--print/pips780/Makefile2
-rw-r--r--print/pips780/pkg-comment1
-rw-r--r--print/pips800/Makefile6
-rw-r--r--print/pips800/pkg-comment1
-rw-r--r--print/pips820/Makefile2
-rw-r--r--print/pips820/pkg-comment1
-rw-r--r--print/pips880/Makefile2
-rw-r--r--print/pips880/pkg-comment1
-rw-r--r--print/pips900/Makefile2
-rw-r--r--print/pips900/pkg-comment1
-rw-r--r--print/yatex-mule/Makefile3
-rw-r--r--print/yatex-mule/pkg-comment1
-rw-r--r--print/yatex-xemacs-mule/Makefile3
-rw-r--r--print/yatex-xemacs-mule/pkg-comment1
-rw-r--r--print/yatex-xemacs/Makefile3
-rw-r--r--print/yatex-xemacs/pkg-comment1
-rw-r--r--print/yatex/Makefile1
-rw-r--r--print/yatex/pkg-comment1
-rw-r--r--sysutils/cdrtools-devel/Makefile1
-rw-r--r--sysutils/cdrtools-devel/pkg-comment1
-rw-r--r--sysutils/cdrtools-devel/pkg-comment.mkisofs1
-rw-r--r--sysutils/cdrtools/Makefile1
-rw-r--r--sysutils/cdrtools/pkg-comment1
-rw-r--r--sysutils/cdrtools/pkg-comment.mkisofs1
-rw-r--r--sysutils/mkisofs-devel/Makefile2
-rw-r--r--sysutils/mkisofs-devel/pkg-descr6
-rw-r--r--sysutils/mkisofs/Makefile2
-rw-r--r--sysutils/mkisofs/pkg-descr6
-rw-r--r--www/mod_php3/Makefile1
-rw-r--r--www/mod_php3/pkg-comment1
-rw-r--r--www/mod_php3/pkg-comment.standalone1
-rw-r--r--www/netscape48-communicator/Makefile1
-rw-r--r--www/netscape48-communicator/pkg-comment1
-rw-r--r--www/netscape48-navigator/Makefile2
-rw-r--r--www/netscape48-navigator/pkg-comment1
207 files changed, 134 insertions, 153 deletions
diff --git a/converters/mule-ucs-emacs20/Makefile b/converters/mule-ucs-emacs20/Makefile
index d7b0a3a9c937..7de9f5176649 100644
--- a/converters/mule-ucs-emacs20/Makefile
+++ b/converters/mule-ucs-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= okazaki@FreeBSD.org
+COMMENT= Universal encoding system for GNU Emacs 20
PORTCLASS= slave
@@ -13,6 +14,4 @@ MASTERDIR= ${.CURDIR}/../../converters/mule-ucs
EMACS_PORT_NAME= emacs20
-COMMENTFILE= ${.CURDIR}/pkg-comment
-
.include <${MASTERDIR}/Makefile>
diff --git a/converters/mule-ucs-emacs20/pkg-comment b/converters/mule-ucs-emacs20/pkg-comment
deleted file mode 100644
index 2c4818bb7900..000000000000
--- a/converters/mule-ucs-emacs20/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Universal encoding system for GNU Emacs 20
diff --git a/converters/mule-ucs/Makefile b/converters/mule-ucs/Makefile
index c0a5461ac487..ea49dae398d1 100644
--- a/converters/mule-ucs/Makefile
+++ b/converters/mule-ucs/Makefile
@@ -18,6 +18,7 @@ PKGNAMESUFFIX= -${EMACS_PORT_NAME}
DISTNAME= Mule-UCS-${PORTVERSION}
MAINTAINER?= okazaki@FreeBSD.org
+COMMENT?= Universal encoding system for GNU Emacs 21
# This is a master port.
PORTCLASS?= master
diff --git a/converters/mule-ucs/pkg-comment b/converters/mule-ucs/pkg-comment
deleted file mode 100644
index fbe5fcd2468c..000000000000
--- a/converters/mule-ucs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Universal encoding system for GNU Emacs 21
diff --git a/databases/mysql323-client/Makefile b/databases/mysql323-client/Makefile
index 0070533bc9c9..84a0321ab2b1 100644
--- a/databases/mysql323-client/Makefile
+++ b/databases/mysql323-client/Makefile
@@ -9,7 +9,7 @@ PORTNAME= mysql-client
PORTREVISION= 0
MASTERDIR= ${.CURDIR}/../mysql323-server
-COMMENTFILE= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql323-server/Makefile b/databases/mysql323-server/Makefile
index 24991d53587f..f13f2212ca0d 100644
--- a/databases/mysql323-server/Makefile
+++ b/databases/mysql323-server/Makefile
@@ -19,6 +19,7 @@ MASTER_SITES= http://www.kernelnotes.de/MySQL/Downloads/MySQL-3.23/ \
DISTFILES= mysql-${PORTVERSION}${EXTRACT_SUFX}
MAINTAINER= dirk@FreeBSD.org
+COMMENT?= Multithreaded SQL database (server)
WRKSRC= ${WRKDIR}/mysql-${PORTVERSION}
SLAVEDIRS= databases/mysql323-client
diff --git a/databases/mysql323-server/pkg-comment b/databases/mysql323-server/pkg-comment
deleted file mode 100644
index 2e29c8d2b15b..000000000000
--- a/databases/mysql323-server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (server)
diff --git a/databases/mysql323-server/pkg-comment.client b/databases/mysql323-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql323-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql40-client/Makefile b/databases/mysql40-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql40-client/Makefile
+++ b/databases/mysql40-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql40-server/Makefile b/databases/mysql40-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql40-server/Makefile
+++ b/databases/mysql40-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql40-server/pkg-comment.client b/databases/mysql40-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql40-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql41-client/Makefile b/databases/mysql41-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql41-client/Makefile
+++ b/databases/mysql41-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql41-server/Makefile b/databases/mysql41-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql41-server/Makefile
+++ b/databases/mysql41-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql41-server/pkg-comment.client b/databases/mysql41-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql41-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql50-client/Makefile b/databases/mysql50-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql50-client/Makefile
+++ b/databases/mysql50-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql50-server/Makefile b/databases/mysql50-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql50-server/Makefile
+++ b/databases/mysql50-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql50-server/pkg-comment.client b/databases/mysql50-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql50-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql51-client/Makefile b/databases/mysql51-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql51-client/Makefile
+++ b/databases/mysql51-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql51-server/Makefile b/databases/mysql51-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql51-server/Makefile
+++ b/databases/mysql51-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql51-server/pkg-comment.client b/databases/mysql51-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql51-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql54-client/Makefile b/databases/mysql54-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql54-client/Makefile
+++ b/databases/mysql54-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql54-server/Makefile b/databases/mysql54-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql54-server/Makefile
+++ b/databases/mysql54-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql54-server/pkg-comment.client b/databases/mysql54-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql54-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql55-client/Makefile b/databases/mysql55-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql55-client/Makefile
+++ b/databases/mysql55-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql55-server/Makefile b/databases/mysql55-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql55-server/Makefile
+++ b/databases/mysql55-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql55-server/pkg-comment.client b/databases/mysql55-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql55-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/mysql60-client/Makefile b/databases/mysql60-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/mysql60-client/Makefile
+++ b/databases/mysql60-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/mysql60-server/Makefile b/databases/mysql60-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/mysql60-server/Makefile
+++ b/databases/mysql60-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/mysql60-server/pkg-comment.client b/databases/mysql60-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/mysql60-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/databases/percona55-client/Makefile b/databases/percona55-client/Makefile
index e9f4c3c3277e..48990cf60dcf 100644
--- a/databases/percona55-client/Makefile
+++ b/databases/percona55-client/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 0
PKGNAMESUFFIX= -client
MASTERDIR= ${.CURDIR}/../mysql40-server
-COMMENT= ${PKGDIR}/pkg-comment.client
+COMMENT= Multithreaded SQL database (client)
PKGINSTALL= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.client
diff --git a/databases/percona55-server/Makefile b/databases/percona55-server/Makefile
index 3db2a1958982..153e9a67730c 100644
--- a/databases/percona55-server/Makefile
+++ b/databases/percona55-server/Makefile
@@ -26,7 +26,7 @@ PKGNAMESUFFIX?= -server
DISTNAME= ${PORTNAME}-${PORTVERSION}-gamma
MAINTAINER= sysadmin@alexdupre.com
-COMMENT= Multithreaded SQL database (server)
+COMMENT?= Multithreaded SQL database (server)
SLAVEDIRS= databases/mysql40-client
DB_DIR?= /var/db/mysql
diff --git a/databases/percona55-server/pkg-comment.client b/databases/percona55-server/pkg-comment.client
deleted file mode 100644
index cd0c61571cfb..000000000000
--- a/databases/percona55-server/pkg-comment.client
+++ /dev/null
@@ -1 +0,0 @@
-Multithreaded SQL database (client)
diff --git a/editors/apel-emacs19/Makefile b/editors/apel-emacs19/Makefile
index 7de7bc828c63..39e400441bc5 100644
--- a/editors/apel-emacs19/Makefile
+++ b/editors/apel-emacs19/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A Portable Emacs Library for emacs19
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-emacs20/Makefile b/editors/apel-emacs20/Makefile
index 3a36ef4c4741..09aa04355f8d 100644
--- a/editors/apel-emacs20/Makefile
+++ b/editors/apel-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A Portable Emacs Library for emacs20
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-mule/Makefile b/editors/apel-mule/Makefile
index 5854bf683ac6..02f4fcbf0a22 100644
--- a/editors/apel-mule/Makefile
+++ b/editors/apel-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A Portable Emacs Library for mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel-xemacs21-mule/Makefile b/editors/apel-xemacs21-mule/Makefile
index fed9a179de42..b32cfaa92981 100644
--- a/editors/apel-xemacs21-mule/Makefile
+++ b/editors/apel-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= A Portable Emacs Library for xemacs21-mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/apel/Makefile b/editors/apel/Makefile
index 0a9c0c6cb997..66347f903327 100644
--- a/editors/apel/Makefile
+++ b/editors/apel/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/apel/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= A Portable Emacs Library for emacs21
# distfile version
APEL_VER= 10.4
diff --git a/editors/apel/pkg-comment.emacs19 b/editors/apel/pkg-comment.emacs19
deleted file mode 100644
index 182232a8cd55..000000000000
--- a/editors/apel/pkg-comment.emacs19
+++ /dev/null
@@ -1 +0,0 @@
-A Portable Emacs Library for emacs19
diff --git a/editors/apel/pkg-comment.emacs20 b/editors/apel/pkg-comment.emacs20
deleted file mode 100644
index 5a611f960f0f..000000000000
--- a/editors/apel/pkg-comment.emacs20
+++ /dev/null
@@ -1 +0,0 @@
-A Portable Emacs Library for emacs20
diff --git a/editors/apel/pkg-comment.emacs21 b/editors/apel/pkg-comment.emacs21
deleted file mode 100644
index d887d9ad5fef..000000000000
--- a/editors/apel/pkg-comment.emacs21
+++ /dev/null
@@ -1 +0,0 @@
-A Portable Emacs Library for emacs21
diff --git a/editors/apel/pkg-comment.mule b/editors/apel/pkg-comment.mule
deleted file mode 100644
index d2aef39aa680..000000000000
--- a/editors/apel/pkg-comment.mule
+++ /dev/null
@@ -1 +0,0 @@
-A Portable Emacs Library for mule
diff --git a/editors/apel/pkg-comment.xemacs21-mule b/editors/apel/pkg-comment.xemacs21-mule
deleted file mode 100644
index 96d1015dd519..000000000000
--- a/editors/apel/pkg-comment.xemacs21-mule
+++ /dev/null
@@ -1 +0,0 @@
-A Portable Emacs Library for xemacs21-mule
diff --git a/editors/flim-emacs20/Makefile b/editors/flim-emacs20/Makefile
index ac192c9a0f15..7af6ea9cc52e 100644
--- a/editors/flim-emacs20/Makefile
+++ b/editors/flim-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= FLIM, message representation or encoding elisp library for emacs20
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim-xemacs21-mule/Makefile b/editors/flim-xemacs21-mule/Makefile
index b116bde1b74d..73131e235470 100644
--- a/editors/flim-xemacs21-mule/Makefile
+++ b/editors/flim-xemacs21-mule/Makefile
@@ -11,6 +11,7 @@ MAINTAINER= shige@FreeBSD.org
PORTCLASS= slave
MASTERDIR= ${.CURDIR}/../../editors/flim
+COMMENT= FLIM, message representation or encoding elisp library for xemacs21-mule
# emacs port setup
EMACS_PORT_NAME= xemacs21-mule
diff --git a/editors/flim/Makefile b/editors/flim/Makefile
index ca34ee213081..4082d772b00a 100644
--- a/editors/flim/Makefile
+++ b/editors/flim/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/flim/flim-1.14/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= FLIM, message representation or encoding elisp library for emacs21
PORTCLASS?= master
diff --git a/editors/flim/pkg-comment.emacs20 b/editors/flim/pkg-comment.emacs20
deleted file mode 100644
index 4943f5883e60..000000000000
--- a/editors/flim/pkg-comment.emacs20
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding elisp library for emacs20
diff --git a/editors/flim/pkg-comment.emacs21 b/editors/flim/pkg-comment.emacs21
deleted file mode 100644
index 5851798873a5..000000000000
--- a/editors/flim/pkg-comment.emacs21
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding elisp library for emacs21
diff --git a/editors/flim/pkg-comment.xemacs21-mule b/editors/flim/pkg-comment.xemacs21-mule
deleted file mode 100644
index 09a74248c87d..000000000000
--- a/editors/flim/pkg-comment.xemacs21-mule
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding elisp library for xemacs21-mule
diff --git a/editors/flim113-emacs19/Makefile b/editors/flim113-emacs19/Makefile
index 3a6680bf756a..df78d9d3fcb7 100644
--- a/editors/flim113-emacs19/Makefile
+++ b/editors/flim113-emacs19/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= FLIM, message representation or encoding emacs lisp library for emacs19
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-emacs20/Makefile b/editors/flim113-emacs20/Makefile
index ace0ce5cdd0b..23383c336c90 100644
--- a/editors/flim113-emacs20/Makefile
+++ b/editors/flim113-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= FLIM, message representation or encoding emacs lisp library for emacs20
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-mule/Makefile b/editors/flim113-mule/Makefile
index cfcdb638d57f..49db0f52f35f 100644
--- a/editors/flim113-mule/Makefile
+++ b/editors/flim113-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= FLIM, message representation or encoding emacs lisp library for mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113-xemacs21-mule/Makefile b/editors/flim113-xemacs21-mule/Makefile
index f77a570280f3..50aecd34d3c5 100644
--- a/editors/flim113-xemacs21-mule/Makefile
+++ b/editors/flim113-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= FLIM, message representation or encoding emacs lisp library for xemacs21-mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/flim113/Makefile b/editors/flim113/Makefile
index 7ba272737ff0..297661a5afb6 100644
--- a/editors/flim113/Makefile
+++ b/editors/flim113/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/flim/flim-1.13/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= FLIM, message representation or encoding emacs lisp library for emacs21
PORTCLASS?= master
diff --git a/editors/flim113/pkg-comment.emacs19 b/editors/flim113/pkg-comment.emacs19
deleted file mode 100644
index b6d146a48cab..000000000000
--- a/editors/flim113/pkg-comment.emacs19
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs19
diff --git a/editors/flim113/pkg-comment.emacs20 b/editors/flim113/pkg-comment.emacs20
deleted file mode 100644
index 8517efff787a..000000000000
--- a/editors/flim113/pkg-comment.emacs20
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs20
diff --git a/editors/flim113/pkg-comment.emacs21 b/editors/flim113/pkg-comment.emacs21
deleted file mode 100644
index 6b774373623e..000000000000
--- a/editors/flim113/pkg-comment.emacs21
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for emacs21
diff --git a/editors/flim113/pkg-comment.mule b/editors/flim113/pkg-comment.mule
deleted file mode 100644
index 6cea8f5d2cd0..000000000000
--- a/editors/flim113/pkg-comment.mule
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for mule
diff --git a/editors/flim113/pkg-comment.xemacs21-mule b/editors/flim113/pkg-comment.xemacs21-mule
deleted file mode 100644
index e0bf6ba11318..000000000000
--- a/editors/flim113/pkg-comment.xemacs21-mule
+++ /dev/null
@@ -1 +0,0 @@
-FLIM, message representation or encoding emacs lisp library for xemacs21-mule
diff --git a/editors/semi-emacs20/Makefile b/editors/semi-emacs20/Makefile
index dd14fe2aab41..4d911dfe9c09 100644
--- a/editors/semi-emacs20/Makefile
+++ b/editors/semi-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= SEMI, Library of MIME feature for GNU Emacs for emacs20
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi-xemacs21-mule/Makefile b/editors/semi-xemacs21-mule/Makefile
index 8e6fd6dbd091..bb38fc3da12c 100644
--- a/editors/semi-xemacs21-mule/Makefile
+++ b/editors/semi-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi/Makefile b/editors/semi/Makefile
index 25872701ba53..8c5cdedafcae 100644
--- a/editors/semi/Makefile
+++ b/editors/semi/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/semi-1.14-for-flim-1.14/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= SEMI, Library of MIME feature for GNU Emacs for emacs21
PORTCLASS?= master
diff --git a/editors/semi/pkg-comment.emacs20 b/editors/semi/pkg-comment.emacs20
deleted file mode 100644
index 5fedc11e1f37..000000000000
--- a/editors/semi/pkg-comment.emacs20
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi/pkg-comment.emacs21 b/editors/semi/pkg-comment.emacs21
deleted file mode 100644
index ee2c44c781fb..000000000000
--- a/editors/semi/pkg-comment.emacs21
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs21
diff --git a/editors/semi/pkg-comment.xemacs21-mule b/editors/semi/pkg-comment.xemacs21-mule
deleted file mode 100644
index cecdd81db035..000000000000
--- a/editors/semi/pkg-comment.xemacs21-mule
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/semi113-emacs19/Makefile b/editors/semi113-emacs19/Makefile
index b9eb7e9398e0..db030109fdbf 100644
--- a/editors/semi113-emacs19/Makefile
+++ b/editors/semi113-emacs19/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= SEMI, Library of MIME feature for GNU Emacs for emacs19
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-emacs20/Makefile b/editors/semi113-emacs20/Makefile
index 40d3ce7e3d65..ef9a2693c067 100644
--- a/editors/semi113-emacs20/Makefile
+++ b/editors/semi113-emacs20/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= SEMI, Library of MIME feature for GNU Emacs for emacs20
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-mule/Makefile b/editors/semi113-mule/Makefile
index 16674322962d..04cad83af89a 100644
--- a/editors/semi113-mule/Makefile
+++ b/editors/semi113-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= SEMI, Library of MIME feature for GNU Emacs for mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113-xemacs21-mule/Makefile b/editors/semi113-xemacs21-mule/Makefile
index 6afe7ada180a..e7e1d0768445 100644
--- a/editors/semi113-xemacs21-mule/Makefile
+++ b/editors/semi113-xemacs21-mule/Makefile
@@ -6,6 +6,7 @@
#
MAINTAINER= shige@FreeBSD.org
+COMMENT= SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
# This is a slave port.
PORTCLASS= slave
diff --git a/editors/semi113/Makefile b/editors/semi113/Makefile
index d0eb032ee4d7..63409fa48fe4 100644
--- a/editors/semi113/Makefile
+++ b/editors/semi113/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES= ftp://ftp.m17n.org/pub/mule/semi/semi-1.13-for-flim-1.13/ \
PKGNAMESUFFIX= -${EMACS_PORT_NAME}
MAINTAINER?= shige@FreeBSD.org
+COMMENT?= SEMI, Library of MIME feature for GNU Emacs for emacs21
PORTCLASS?= master
diff --git a/editors/semi113/pkg-comment.emacs19 b/editors/semi113/pkg-comment.emacs19
deleted file mode 100644
index d645639bb462..000000000000
--- a/editors/semi113/pkg-comment.emacs19
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs
diff --git a/editors/semi113/pkg-comment.emacs20 b/editors/semi113/pkg-comment.emacs20
deleted file mode 100644
index 5fedc11e1f37..000000000000
--- a/editors/semi113/pkg-comment.emacs20
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs20
diff --git a/editors/semi113/pkg-comment.emacs21 b/editors/semi113/pkg-comment.emacs21
deleted file mode 100644
index ee2c44c781fb..000000000000
--- a/editors/semi113/pkg-comment.emacs21
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for emacs21
diff --git a/editors/semi113/pkg-comment.mule b/editors/semi113/pkg-comment.mule
deleted file mode 100644
index 6fa10ef6ea3a..000000000000
--- a/editors/semi113/pkg-comment.mule
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for mule
diff --git a/editors/semi113/pkg-comment.xemacs21-mule b/editors/semi113/pkg-comment.xemacs21-mule
deleted file mode 100644
index cecdd81db035..000000000000
--- a/editors/semi113/pkg-comment.xemacs21-mule
+++ /dev/null
@@ -1 +0,0 @@
-SEMI, Library of MIME feature for GNU Emacs for xemacs21-mule
diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile
index 78642080e61a..e8fd74600b87 100644
--- a/editors/xemacs-devel-mule/Makefile
+++ b/editors/xemacs-devel-mule/Makefile
@@ -18,6 +18,7 @@ DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX} \
DIST_SUBDIR= xemacs
MAINTAINER= kiri@FreeBSD.org
+COMMENT?= XEmacs(gamma version) text editor with mule(Only the executables)
.include <bsd.port.pre.mk>
diff --git a/editors/xemacs-devel-mule/pkg-comment b/editors/xemacs-devel-mule/pkg-comment
deleted file mode 100644
index aa4b73169a40..000000000000
--- a/editors/xemacs-devel-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor with mule(Only the executables)
diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile
index 2ee4f412fac7..4c837dc8328b 100644
--- a/editors/xemacs21-mule/Makefile
+++ b/editors/xemacs21-mule/Makefile
@@ -24,6 +24,7 @@ MULE_SLAVE= yes
.endif
MAINTAINER?= kiri@FreeBSD.org
+COMMENT=? XEmacs(version 21) text editor with mule(Only the executables)
BUILD_DEPENDS= ${BUILD_INPUT_METHOD}
.if defined(MULE_SLAVE)
diff --git a/editors/xemacs21-mule/pkg-comment b/editors/xemacs21-mule/pkg-comment
deleted file mode 100644
index e18c5d954ece..000000000000
--- a/editors/xemacs21-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(version 21) text editor with mule(Only the executables)
diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile
index 965a8e635303..6b712b4a8a14 100644
--- a/graphics/gdk-pixbuf/Makefile
+++ b/graphics/gdk-pixbuf/Makefile
@@ -14,6 +14,7 @@ DISTNAME= gdk-pixbuf-${PORTVERSION}
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
+COMMENT?= A graphic library for GTK+
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
diff --git a/graphics/gdk-pixbuf/pkg-comment b/graphics/gdk-pixbuf/pkg-comment
deleted file mode 100644
index e3257c34ecfa..000000000000
--- a/graphics/gdk-pixbuf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphic library for GTK+
diff --git a/graphics/gnomecanvas/Makefile b/graphics/gnomecanvas/Makefile
index 6f7b62fae443..e114baf6cebc 100644
--- a/graphics/gnomecanvas/Makefile
+++ b/graphics/gnomecanvas/Makefile
@@ -10,7 +10,7 @@ CATEGORIES= graphics gnome
MASTERDIR= ${.CURDIR}/../gdk-pixbuf
-COMMENTFILE= ${.CURDIR}/pkg-comment
+COMMENT= A graphics library for GNOME
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
diff --git a/graphics/gnomecanvas/pkg-comment b/graphics/gnomecanvas/pkg-comment
deleted file mode 100644
index dd8305e7668d..000000000000
--- a/graphics/gnomecanvas/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphics library for GNOME
diff --git a/japanese/acroread-jpnfont/Makefile b/japanese/acroread-jpnfont/Makefile
index 45a83e1d5a97..13dc82a34dbc 100644
--- a/japanese/acroread-jpnfont/Makefile
+++ b/japanese/acroread-jpnfont/Makefile
@@ -8,6 +8,8 @@
DISTNAME= jpnfont
CATEGORIES= japanese
+COMMENT= Asian Font Packs for Acrobat Reader 4.0 (for Japanese)
+
MASTERDIR= ${.CURDIR}/../../print/acroread-commfont
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/acroread-jpnfont/pkg-comment b/japanese/acroread-jpnfont/pkg-comment
deleted file mode 100644
index a0cfcada69b7..000000000000
--- a/japanese/acroread-jpnfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 4.0 (for Japanese)
diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile
index 7d5c88b73fd8..9f00d31b0312 100644
--- a/japanese/exmh2/Makefile
+++ b/japanese/exmh2/Makefile
@@ -8,11 +8,11 @@
CATEGORIES= japanese
MAINTAINER= ports@FreeBSD.org
+COMMENT= X11/TK based mail reader front end to MH for Japanese environments
JAPANESE_EXMH= yes
MASTERDIR= ${.CURDIR}/../../mail/exmh2
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
WRKDIR= ${WRKDIRPREFIX}${.CURDIR}/work
diff --git a/japanese/exmh2/pkg-comment b/japanese/exmh2/pkg-comment
deleted file mode 100644
index c7c0b8f89026..000000000000
--- a/japanese/exmh2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11/TK based mail reader front end to MH for Japanese environments
diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index ccd158e44ee9..3d83c6d695bb 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -6,7 +6,7 @@
#
MASTERDIR= ${.CURDIR}/../../misc/magicpoint
-COMMENTFILE= ${.CURDIR}/pkg-comment
+COMMENT= An X11-based presentation tool, configured with vflib support
LIB_DEPENDS= VFlib2.24:${PORTSDIR}/japanese/vflib
diff --git a/japanese/magicpoint/pkg-comment b/japanese/magicpoint/pkg-comment
deleted file mode 100644
index c10efef92efd..000000000000
--- a/japanese/magicpoint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11-based presentation tool, configured with vflib support
diff --git a/japanese/skk-jisyo-cdb/Makefile b/japanese/skk-jisyo-cdb/Makefile
index fbea0d261ad4..bbd5c694f0c4 100644
--- a/japanese/skk-jisyo-cdb/Makefile
+++ b/japanese/skk-jisyo-cdb/Makefile
@@ -10,13 +10,13 @@ PORTVERSION= 200209
PORTREVISION= 0
MAINTAINER= toru@tkd.ne.jp
+COMMENT= CDB jisyo (dictionary) files for the SKK Japanese-input software
SKK_JISYO_SUFFIX= .cdb
MASTERDIR= ${.CURDIR}/../skk-jisyo
MD5_FILE= ${.CURDIR}/distinfo
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
.include "${MASTERDIR}/Makefile"
diff --git a/japanese/skk-jisyo-cdb/pkg-comment b/japanese/skk-jisyo-cdb/pkg-comment
deleted file mode 100644
index 2bf728f96959..000000000000
--- a/japanese/skk-jisyo-cdb/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CDB jisyo (dictionary) files for the SKK Japanese-input software
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index 520a9420e605..710cc3493404 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -15,6 +15,7 @@ DISTFILES?= SKK-JISYO.L.${PORTVERSION}${SKK_JISYO_SUFFIX}.gz \
DIST_SUBDIR= skk-jisyo
MAINTAINER?= yoichi@FreeBSD.org
+COMMENT?= Jisyo (dictionary) files for the SKK Japanese-input software
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/japanese/skk-jisyo/pkg-comment b/japanese/skk-jisyo/pkg-comment
deleted file mode 100644
index e5221b534a5a..000000000000
--- a/japanese/skk-jisyo/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Jisyo (dictionary) files for the SKK Japanese-input software
diff --git a/japanese/xemacs-devel-canna+freewnn/Makefile b/japanese/xemacs-devel-canna+freewnn/Makefile
index 14fb846c236f..f99df928af9c 100644
--- a/japanese/xemacs-devel-canna+freewnn/Makefile
+++ b/japanese/xemacs-devel-canna+freewnn/Makefile
@@ -8,7 +8,7 @@
CATEGORIES= japanese
MASTERDIR= ${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE= ${.CURDIR}/../../japanese/xemacs-devel-canna+freewnn/pkg-comment
+COMMENT= XEmacs(gamma version) text editor, with SJ3, SKK, Canna and FreeWnn support
CANNA= yes
FREEWNN= yes
diff --git a/japanese/xemacs-devel-canna+freewnn/pkg-comment b/japanese/xemacs-devel-canna+freewnn/pkg-comment
deleted file mode 100644
index ef39b44ca453..000000000000
--- a/japanese/xemacs-devel-canna+freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK, Canna and FreeWnn support
diff --git a/japanese/xemacs-devel-canna+wnn6/Makefile b/japanese/xemacs-devel-canna+wnn6/Makefile
index d9f7135460d2..3ec8ac636040 100644
--- a/japanese/xemacs-devel-canna+wnn6/Makefile
+++ b/japanese/xemacs-devel-canna+wnn6/Makefile
@@ -8,7 +8,7 @@
CATEGORIES= japanese
MASTERDIR= ${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE= ${.CURDIR}/../../japanese/xemacs-devel-canna+wnn6/pkg-comment
+COMMENT= XEmacs(gamma version) text editor, with SJ3, SKK, Canna and Wnn6 support
CANNA= yes
WNN6= yes
diff --git a/japanese/xemacs-devel-canna+wnn6/pkg-comment b/japanese/xemacs-devel-canna+wnn6/pkg-comment
deleted file mode 100644
index e50147ab1c9a..000000000000
--- a/japanese/xemacs-devel-canna+wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK, Canna and Wnn6 support
diff --git a/japanese/xemacs-devel-canna/Makefile b/japanese/xemacs-devel-canna/Makefile
index 85cd934b5723..e128d600b498 100644
--- a/japanese/xemacs-devel-canna/Makefile
+++ b/japanese/xemacs-devel-canna/Makefile
@@ -8,7 +8,7 @@
CATEGORIES= japanese
MASTERDIR= ${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE= ${.CURDIR}/../../japanese/xemacs-devel-canna/pkg-comment
+COMMENT= XEmacs(gamma version) text editor, with SJ3, SKK and Canna support
CANNA= yes
diff --git a/japanese/xemacs-devel-canna/pkg-comment b/japanese/xemacs-devel-canna/pkg-comment
deleted file mode 100644
index b1b11b1e3523..000000000000
--- a/japanese/xemacs-devel-canna/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK and Canna support
diff --git a/japanese/xemacs-devel-freewnn/Makefile b/japanese/xemacs-devel-freewnn/Makefile
index 531732f1d0d4..b7dbed12717c 100644
--- a/japanese/xemacs-devel-freewnn/Makefile
+++ b/japanese/xemacs-devel-freewnn/Makefile
@@ -8,7 +8,7 @@
CATEGORIES= japanese
MASTERDIR= ${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE= ${.CURDIR}/../../japanese/xemacs-devel-freewnn/pkg-comment
+COMMENT= XEmacs(gamma version) text editor, with SJ3, SKK and FreeWnn support
FREEWNN= yes
diff --git a/japanese/xemacs-devel-freewnn/pkg-comment b/japanese/xemacs-devel-freewnn/pkg-comment
deleted file mode 100644
index e79f92642115..000000000000
--- a/japanese/xemacs-devel-freewnn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK and FreeWnn support
diff --git a/japanese/xemacs-devel-wnn6/Makefile b/japanese/xemacs-devel-wnn6/Makefile
index 0e77470cd89d..6d320e580a7c 100644
--- a/japanese/xemacs-devel-wnn6/Makefile
+++ b/japanese/xemacs-devel-wnn6/Makefile
@@ -8,7 +8,7 @@
CATEGORIES= japanese
MASTERDIR= ${.CURDIR}/../../editors/xemacs-devel-mule
-COMMENTFILE= ${.CURDIR}/../../japanese/xemacs-devel-wnn6/pkg-comment
+COMMENT= XEmacs(gamma version) text editor, with SJ3, SKK and Wnn6 support
WNN6= yes
diff --git a/japanese/xemacs-devel-wnn6/pkg-comment b/japanese/xemacs-devel-wnn6/pkg-comment
deleted file mode 100644
index f70759bfae05..000000000000
--- a/japanese/xemacs-devel-wnn6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XEmacs(gamma version) text editor, with SJ3, SKK and Wnn6 support
diff --git a/korean/acroread-korfont/Makefile b/korean/acroread-korfont/Makefile
index e51e8ac35876..668710feb745 100644
--- a/korean/acroread-korfont/Makefile
+++ b/korean/acroread-korfont/Makefile
@@ -8,6 +8,8 @@
DISTNAME= korfont
CATEGORIES= korean
+COMMENT= Asian Font Packs for Acrobat Reader 4.0 (for Korean)
+
MASTERDIR= ${.CURDIR}/../../print/acroread-commfont
.include "${MASTERDIR}/Makefile"
diff --git a/korean/acroread-korfont/pkg-comment b/korean/acroread-korfont/pkg-comment
deleted file mode 100644
index 19a24f7ef563..000000000000
--- a/korean/acroread-korfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 4.0 (for Korean)
diff --git a/lang/php3/Makefile b/lang/php3/Makefile
index aff32eafa487..2ac8dce9d5d5 100644
--- a/lang/php3/Makefile
+++ b/lang/php3/Makefile
@@ -10,7 +10,7 @@ PORTREVISION= 1
CATEGORIES= lang
MASTERDIR= ${.CURDIR}/../../www/mod_php3
-COMMENTFILE= ${PKGDIR}/pkg-comment.standalone
+COMMENT= PHP3 commandline interpreter
PKGMESSAGE= mustnotexist
PLIST= ${PKGDIR}/pkg-plist.standalone
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/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/python-devel/pkg-comment b/lang/python-devel/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python/Makefile b/lang/python/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python/Makefile
+++ b/lang/python/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/python/pkg-comment b/lang/python/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/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/python22/pkg-comment b/lang/python22/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python22/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/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/python23/pkg-comment b/lang/python23/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python23/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/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/python24/pkg-comment b/lang/python24/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python24/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/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/python25/pkg-comment b/lang/python25/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python25/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/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/python26/pkg-comment b/lang/python26/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python26/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/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/python27/pkg-comment b/lang/python27/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python27/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/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/python30/pkg-comment b/lang/python30/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python30/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/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/python31/pkg-comment b/lang/python31/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python31/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index 83fca2974e1c..0b0a336f65a1 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/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/python32/pkg-comment b/lang/python32/pkg-comment
deleted file mode 100644
index d2f9289af5eb..000000000000
--- a/lang/python32/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An interpreted object-oriented programming language
diff --git a/lang/stackless_python/Makefile b/lang/stackless_python/Makefile
index abf71d997b88..0a2802c6e18d 100644
--- a/lang/stackless_python/Makefile
+++ b/lang/stackless_python/Makefile
@@ -19,12 +19,12 @@ PATCHFILES= stackless-${CVSDATE}.diff.bz2
PATCH_DIST_STRIP= -p1
MAINTAINER= perky@FreeBSD.org
+COMMENT= Python implementation that does not use the C stack
ONLY_FOR_ARCHS= i386 powerpc
CVSDATE= 021026
MASTERDIR= ${.CURDIR}/../../lang/python
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
MD5_FILE= ${.CURDIR}/distinfo
PLIST= ${WRKDIR}/pkg-plist
diff --git a/lang/stackless_python/pkg-comment b/lang/stackless_python/pkg-comment
deleted file mode 100644
index f77be94b277d..000000000000
--- a/lang/stackless_python/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Python implementation that does not use the C stack
diff --git a/mail/exmh2/Makefile b/mail/exmh2/Makefile
index 71db80e3663a..d8300ec7ad3d 100644
--- a/mail/exmh2/Makefile
+++ b/mail/exmh2/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES+= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER?= bmah@FreeBSD.org
+COMMENT?= X11/TK based mail reader front end to MH
.if defined(JAPANESE_EXMH)
RUN_DEPENDS= wish8.0jp:${PORTSDIR}/japanese/tk80
diff --git a/mail/exmh2/pkg-comment b/mail/exmh2/pkg-comment
deleted file mode 100644
index a5273198f057..000000000000
--- a/mail/exmh2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-X11/TK based mail reader front end to MH
diff --git a/misc/magicpoint/Makefile b/misc/magicpoint/Makefile
index 8db397a2a887..877c782b0af2 100644
--- a/misc/magicpoint/Makefile
+++ b/misc/magicpoint/Makefile
@@ -12,6 +12,7 @@ CATEGORIES+= misc
MASTER_SITES= ftp://ftp.mew.org/pub/MagicPoint/
MAINTAINER?= mita@FreeBSD.org
+COMMENT?= An X11-based presentation tool
LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png
RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm
diff --git a/misc/magicpoint/pkg-comment b/misc/magicpoint/pkg-comment
deleted file mode 100644
index 3fbaed533138..000000000000
--- a/misc/magicpoint/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An X11-based presentation tool
diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile
index b228c73293f8..2840bdbf5124 100644
--- a/net/cvsup/Makefile
+++ b/net/cvsup/Makefile
@@ -14,12 +14,13 @@ MASTER_SITE_SUBDIR=development/CVSup/snapshots
DISTNAME= cvsup-snap-${PORTVERSION}
MAINTAINER= jdp@FreeBSD.org
+COMMENT?= General network file distribution system optimized for CVS (GUI version)
.ifdef WITHOUT_X11
M3FLAGS+= -DNOGUI
BUILD_DEPENDS= ${PREFIX}/lib/m3/pkg/tcp/${TARGET}/libm3tcp.a:${PORTSDIR}/lang/ezm3
PKGNAMESUFFIX= -without-gui
-COMMENTFILE= ${PKGDIR}/pkg-comment.nogui
+COMMENT= General network file distribution system optimized for CVS (non-GUI version)
DESCR= ${PKGDIR}/pkg-descr.nogui
.else
USE_XLIB= yes
diff --git a/net/cvsup/pkg-comment b/net/cvsup/pkg-comment
deleted file mode 100644
index 57e6df9a9a16..000000000000
--- a/net/cvsup/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-General network file distribution system optimized for CVS (GUI version)
diff --git a/net/cvsup/pkg-comment.nogui b/net/cvsup/pkg-comment.nogui
deleted file mode 100644
index d5ac5a5e121f..000000000000
--- a/net/cvsup/pkg-comment.nogui
+++ /dev/null
@@ -1 +0,0 @@
-General network file distribution system optimized for CVS (non-GUI version)
diff --git a/print/acroread-commfont/Makefile b/print/acroread-commfont/Makefile
index 5f1d8a453506..1bd430658516 100644
--- a/print/acroread-commfont/Makefile
+++ b/print/acroread-commfont/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ftp://ftp-pac.adobe.com/pub/adobe/acrobatreader/unix/4.x/
DISTNAME?= commfont # dummy
MAINTAINER= taoka@FreeBSD.org
+COMMENT?= Asian Font Packs for Acrobat Reader 4.0 (for common files)
NO_BUILD= yes
SLAVEDIRS= chinese/acroread-chsfont chinese/acroread-chtfont
@@ -42,7 +43,6 @@ RUN_DEPENDS= acroread4:${PORTSDIR}/print/acroread4
.else
###### For slave ports ##############################
## Use a local directory of the slave port!!
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist
FILESDIR= ${.CURDIR}/files
diff --git a/print/acroread-commfont/pkg-comment b/print/acroread-commfont/pkg-comment
deleted file mode 100644
index 7f4d0c22c07f..000000000000
--- a/print/acroread-commfont/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Asian Font Packs for Acrobat Reader 4.0 (for common files)
diff --git a/print/bjfilter360/Makefile b/print/bjfilter360/Makefile
index 420caf7d7580..856485bb63c4 100644
--- a/print/bjfilter360/Makefile
+++ b/print/bjfilter360/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ F360
+
PRTYPE?= 360
.include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter360/pkg-comment b/print/bjfilter360/pkg-comment
deleted file mode 100644
index a18a10806d7d..000000000000
--- a/print/bjfilter360/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F360
diff --git a/print/bjfilter850/Makefile b/print/bjfilter850/Makefile
index ed3fb1ce8556..4fc0605e5530 100644
--- a/print/bjfilter850/Makefile
+++ b/print/bjfilter850/Makefile
@@ -8,6 +8,8 @@
PORTNAME= bjfilter${PREFIX_PRTYPE}${PRTYPE}${SUFFIX_PRTYPE}
MASTERDIR= ${.CURDIR}/../bjfiltercom
+COMMENT?= Canon Bubble Jet Print Filter for Linux -- BJ F850
+
SLAVE_PORT= yes
PRTYPE?= 850
SUFIX_PRTYPE?=
diff --git a/print/bjfilter850/pkg-comment b/print/bjfilter850/pkg-comment
deleted file mode 100644
index bdb2aa0d6875..000000000000
--- a/print/bjfilter850/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F850
diff --git a/print/bjfilter850ug/Makefile b/print/bjfilter850ug/Makefile
index d6eb93344401..e9ce1a09a1d5 100644
--- a/print/bjfilter850ug/Makefile
+++ b/print/bjfilter850ug/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ F850 (supported BCI-6 inks)
+
PRTYPE= 850
SUFFIX_PRTYPE= ug
diff --git a/print/bjfilter850ug/pkg-comment b/print/bjfilter850ug/pkg-comment
deleted file mode 100644
index de9cc9ce943a..000000000000
--- a/print/bjfilter850ug/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F850 (supported BCI-6 inks)
diff --git a/print/bjfilter860/Makefile b/print/bjfilter860/Makefile
index c528e573d3ab..68ee515e8997 100644
--- a/print/bjfilter860/Makefile
+++ b/print/bjfilter860/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ F860
+
PRTYPE= 860
.include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter860/pkg-comment b/print/bjfilter860/pkg-comment
deleted file mode 100644
index 2b4a6fa9de1d..000000000000
--- a/print/bjfilter860/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F860
diff --git a/print/bjfilter870/Makefile b/print/bjfilter870/Makefile
index 48a01ac3e6aa..798c542b1f5e 100644
--- a/print/bjfilter870/Makefile
+++ b/print/bjfilter870/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ F870
+
PRTYPE= 870
.include "${MASTERDIR}/Makefile"
diff --git a/print/bjfilter870/pkg-comment b/print/bjfilter870/pkg-comment
deleted file mode 100644
index fc7d4ee868a5..000000000000
--- a/print/bjfilter870/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ F870
diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile
index 47e9597b8d64..da23b3941b6b 100644
--- a/print/bjfiltercom/Makefile
+++ b/print/bjfiltercom/Makefile
@@ -17,6 +17,7 @@ DISTFILES+= ${DOC_DISTFILES}
EXTRACT_ONLY= ${RPMFILE}
MAINTAINER= taoka@FreeBSD.org
+COMMENT?= Canon Bubble Jet Print Filter for Linux -- Common files
BUILD_DEPENDS= rpm2cpio:${PORTSDIR}/archivers/rpm2cpio
.if defined(SLAVE_PORT)
@@ -40,7 +41,6 @@ EXTRACT_AFTER_ARGS= | cpio -id --quiet
PLIST_SUB+= PORTVERSION=${PORTVERSION}${_SUF1}${_SUF2}
DIST_SUBDIR= bjfilter
PLIST= ${.CURDIR}/pkg-plist
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
MD5_FILE= ${.CURDIR}/distinfo
ONLY_FOR_ARCHS= i386
diff --git a/print/bjfiltercom/pkg-comment b/print/bjfiltercom/pkg-comment
deleted file mode 100644
index fe6bda38f500..000000000000
--- a/print/bjfiltercom/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- Common files
diff --git a/print/bjfilters600/Makefile b/print/bjfilters600/Makefile
index 0fa61035a9db..e9ae6748d728 100644
--- a/print/bjfilters600/Makefile
+++ b/print/bjfilters600/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ S600
+
PREFIX_PRTYPE= s
PRTYPE?= 600
diff --git a/print/bjfilters600/pkg-comment b/print/bjfilters600/pkg-comment
deleted file mode 100644
index 387e676ef5d9..000000000000
--- a/print/bjfilters600/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ S600
diff --git a/print/bjfilters630/Makefile b/print/bjfilters630/Makefile
index 0af71cd13108..338c3a248516 100644
--- a/print/bjfilters630/Makefile
+++ b/print/bjfilters630/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ S630
+
PREFIX_PRTYPE= s
PRTYPE?= 630
diff --git a/print/bjfilters630/pkg-comment b/print/bjfilters630/pkg-comment
deleted file mode 100644
index a618365aa933..000000000000
--- a/print/bjfilters630/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ S630
diff --git a/print/bjfilters6300/Makefile b/print/bjfilters6300/Makefile
index fcc669cb33b9..5cc1e14f17a7 100644
--- a/print/bjfilters6300/Makefile
+++ b/print/bjfilters6300/Makefile
@@ -7,6 +7,8 @@
MASTERDIR= ${.CURDIR}/../bjfilter850
+COMMENT= Canon Bubble Jet Print Filter for Linux -- BJ S6300
+
PREFIX_PRTYPE= s
PRTYPE?= 6300
diff --git a/print/bjfilters6300/pkg-comment b/print/bjfilters6300/pkg-comment
deleted file mode 100644
index b32078c97813..000000000000
--- a/print/bjfilters6300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Canon Bubble Jet Print Filter for Linux -- BJ S6300
diff --git a/print/pips2200/Makefile b/print/pips2200/Makefile
index bc5740901d7a..ae2669e2c2c8 100644
--- a/print/pips2200/Makefile
+++ b/print/pips2200/Makefile
@@ -6,6 +6,8 @@
#
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-2200C
+
PRTYPE= 2200
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips2200/pkg-comment b/print/pips2200/pkg-comment
deleted file mode 100644
index b9181d222353..000000000000
--- a/print/pips2200/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-2200C
diff --git a/print/pips3000/Makefile b/print/pips3000/Makefile
index ece5249c5ab7..f991bf93fdad 100644
--- a/print/pips3000/Makefile
+++ b/print/pips3000/Makefile
@@ -6,6 +6,8 @@
#
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-3000C
+
PRTYPE= 3000
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips3000/pkg-comment b/print/pips3000/pkg-comment
deleted file mode 100644
index 14c685bd0403..000000000000
--- a/print/pips3000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-3000C
diff --git a/print/pips3300/Makefile b/print/pips3300/Makefile
index a5da29f08d55..c8f147e8ed5d 100644
--- a/print/pips3300/Makefile
+++ b/print/pips3300/Makefile
@@ -8,6 +8,8 @@
PORTVERSION= 1.3
PORTREVISION= 1
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-3300C
+
PRTYPE= 3300
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips3300/pkg-comment b/print/pips3300/pkg-comment
deleted file mode 100644
index de769869d484..000000000000
--- a/print/pips3300/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-3300C
diff --git a/print/pips3500/Makefile b/print/pips3500/Makefile
index 571082390c3b..cc9642b6df1f 100644
--- a/print/pips3500/Makefile
+++ b/print/pips3500/Makefile
@@ -7,6 +7,8 @@
PORTVERSION= 1.3
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-3500C
+
PRTYPE= 3500
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips3500/pkg-comment b/print/pips3500/pkg-comment
deleted file mode 100644
index b93719eadab2..000000000000
--- a/print/pips3500/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-3500C
diff --git a/print/pips670/Makefile b/print/pips670/Makefile
index a154c9a2b3d5..a1dddf258d32 100644
--- a/print/pips670/Makefile
+++ b/print/pips670/Makefile
@@ -6,6 +6,8 @@
#
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-670C
+
PRTYPE= 670
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips670/pkg-comment b/print/pips670/pkg-comment
deleted file mode 100644
index f13c861b4ddd..000000000000
--- a/print/pips670/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-670C
diff --git a/print/pips750_2000/Makefile b/print/pips750_2000/Makefile
index eec70e2deea2..785f8a00e945 100644
--- a/print/pips750_2000/Makefile
+++ b/print/pips750_2000/Makefile
@@ -7,6 +7,8 @@
MASTER_SITES= http://www.epkowa.on.arena.ne.jp/pips/data/750/
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
+
PRTYPE= 750_2000
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips750_2000/pkg-comment b/print/pips750_2000/pkg-comment
deleted file mode 100644
index b273423aa237..000000000000
--- a/print/pips750_2000/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-750C PM-2000C
diff --git a/print/pips760/Makefile b/print/pips760/Makefile
index 56d5f6c15110..0c75ca154886 100644
--- a/print/pips760/Makefile
+++ b/print/pips760/Makefile
@@ -6,6 +6,8 @@
#
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-760C
+
PRTYPE= 760
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips760/pkg-comment b/print/pips760/pkg-comment
deleted file mode 100644
index ee9a96452470..000000000000
--- a/print/pips760/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-760C
diff --git a/print/pips770/Makefile b/print/pips770/Makefile
index 1065c884da80..6a5939a83c1f 100644
--- a/print/pips770/Makefile
+++ b/print/pips770/Makefile
@@ -6,6 +6,8 @@
#
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-770C
+
PRTYPE= 770
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips770/pkg-comment b/print/pips770/pkg-comment
deleted file mode 100644
index 1fc964f72db7..000000000000
--- a/print/pips770/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-770C
diff --git a/print/pips780/Makefile b/print/pips780/Makefile
index b15e1357acef..3b4194ab2e56 100644
--- a/print/pips780/Makefile
+++ b/print/pips780/Makefile
@@ -7,6 +7,8 @@
PORTVERSION= 1.3
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-780C
+
PRTYPE= 780
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips780/pkg-comment b/print/pips780/pkg-comment
deleted file mode 100644
index 4d27b3f19665..000000000000
--- a/print/pips780/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-780C
diff --git a/print/pips800/Makefile b/print/pips800/Makefile
index ca4b32c8ebf9..cd60fc45ebcf 100644
--- a/print/pips800/Makefile
+++ b/print/pips800/Makefile
@@ -29,6 +29,7 @@ DISTNAME?= ${PORTNAME}-${PORTVERSION}
EXTRACT_SUFX= .i386.tgz
MAINTAINER= taoka@FreeBSD.org
+COMMENT?= Photo Image Print System for Linux --- EPSON PM-800C
RUN_DEPENDS= ${LINUXBASE}/lib/libc.so.6:${PORTSDIR}/emulators/linux_base \
${LINUXBASE}/usr/lib/libgtk-1.2.so.0:${PORTSDIR}/x11-toolkits/linux-gtk \
@@ -72,7 +73,6 @@ FILTER= ${FILESDIR}/filter.rev
BASE_NAME= pips${PRTYPE}
PAPERSIZE?= a4
# for slave ports
-COMMENTFILE= ${.CURDIR}/pkg-comment
DESCR= ${.CURDIR}/pkg-descr
.if ${PORTVERSION} == 2.0 && !defined(INTERNATIONAL_PRODUCTS)
LANGS= ja
@@ -250,7 +250,7 @@ post-install:
_MAKE_COMMENT_DESCR:
.if defined(INTERNATIONAL_PRODUCTS)
.if ${PRTYPE} != -sc880 || ${PORTVERSION} != 1.0
-.for file in pkg-comment pkg-descr
+.for file in pkg-descr
.if ${PRTYPE} == -sc680_777
${SED} -e 's,Stylus Color 880,Stylus Color 680/Stylus Color 777,g' \
-e 's/880/${PRTYPE:S/^-sc//}/g' \
@@ -275,7 +275,7 @@ _MAKE_COMMENT_DESCR:
.endif
.else # for defined(INTERNATIONAL_PRODUCTS)
.if ${PRTYPE} != 800
-.for file in pkg-comment pkg-descr
+.for file in pkg-descr
.if ${PRTYPE} == 750_2000
${SED} -e 's/PM-800C/PM-750C PM-2000C/g' \
-e 's/pm800c/pm750c_2000c/g' \
diff --git a/print/pips800/pkg-comment b/print/pips800/pkg-comment
deleted file mode 100644
index 47986b1204f0..000000000000
--- a/print/pips800/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-800C
diff --git a/print/pips820/Makefile b/print/pips820/Makefile
index 656a2c51ec7c..854809142fe2 100644
--- a/print/pips820/Makefile
+++ b/print/pips820/Makefile
@@ -7,6 +7,8 @@
PORTVERSION= 1.3.1
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-820C
+
PRTYPE= 820
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips820/pkg-comment b/print/pips820/pkg-comment
deleted file mode 100644
index 78670c6dbb06..000000000000
--- a/print/pips820/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-820C
diff --git a/print/pips880/Makefile b/print/pips880/Makefile
index 2c7352df291f..892582aeee76 100644
--- a/print/pips880/Makefile
+++ b/print/pips880/Makefile
@@ -7,6 +7,8 @@
PORTVERSION= 1.3
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-880C
+
PRTYPE= 880
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips880/pkg-comment b/print/pips880/pkg-comment
deleted file mode 100644
index 9d509f90017a..000000000000
--- a/print/pips880/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-880C
diff --git a/print/pips900/Makefile b/print/pips900/Makefile
index 5bb17242d993..481584844b0e 100644
--- a/print/pips900/Makefile
+++ b/print/pips900/Makefile
@@ -7,6 +7,8 @@
PORTVERSION= 1.3
MASTERDIR= ${.CURDIR}/../pips800
+COMMENT= Photo Image Print System for Linux --- EPSON PM-900C
+
PRTYPE= 900
.include "${MASTERDIR}/Makefile"
diff --git a/print/pips900/pkg-comment b/print/pips900/pkg-comment
deleted file mode 100644
index 9cd0c173c676..000000000000
--- a/print/pips900/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Photo Image Print System for Linux --- EPSON PM-900C
diff --git a/print/yatex-mule/Makefile b/print/yatex-mule/Makefile
index 6349cdbcd4d1..f24d548aa015 100644
--- a/print/yatex-mule/Makefile
+++ b/print/yatex-mule/Makefile
@@ -8,7 +8,8 @@
PKGNAMESUFFIX= -mule
MASTERDIR= ${.CURDIR}/../yatex
-COMMENTFILE= ${.CURDIR}/pkg-comment
+COMMENT= Yet Another LaTeX mode and html mode on Emacs (for mule 2.3)
+
EMACS_PORT_NAME=mule
.include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-mule/pkg-comment b/print/yatex-mule/pkg-comment
deleted file mode 100644
index 5e9578779bfb..000000000000
--- a/print/yatex-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for mule 2.3)
diff --git a/print/yatex-xemacs-mule/Makefile b/print/yatex-xemacs-mule/Makefile
index ff825e5d5c08..48af002262b2 100644
--- a/print/yatex-xemacs-mule/Makefile
+++ b/print/yatex-xemacs-mule/Makefile
@@ -8,7 +8,8 @@
PKGNAMESUFFIX= -xemacs-mule
MASTERDIR= ${.CURDIR}/../yatex
-COMMENTFILE= ${.CURDIR}/pkg-comment
+COMMENT= Yet Another LaTeX mode and html mode on Emacs (for XEmacs21-mule)
+
EMACS_PORT_NAME=xemacs21-mule
.include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs-mule/pkg-comment b/print/yatex-xemacs-mule/pkg-comment
deleted file mode 100644
index 2f8b3092f31f..000000000000
--- a/print/yatex-xemacs-mule/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for XEmacs21-mule)
diff --git a/print/yatex-xemacs/Makefile b/print/yatex-xemacs/Makefile
index 8db590e2260e..0e4f35013136 100644
--- a/print/yatex-xemacs/Makefile
+++ b/print/yatex-xemacs/Makefile
@@ -8,7 +8,8 @@
PKGNAMESUFFIX= -xemacs
MASTERDIR= ${.CURDIR}/../yatex
-COMMENTFILE= ${.CURDIR}/pkg-comment
+COMMENT= Yet Another LaTeX mode and html mode on Emacs (for XEmacs21)
+
EMACS_PORT_NAME=xemacs21
.include "${MASTERDIR}/Makefile"
diff --git a/print/yatex-xemacs/pkg-comment b/print/yatex-xemacs/pkg-comment
deleted file mode 100644
index afdc8b01ea85..000000000000
--- a/print/yatex-xemacs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for XEmacs21)
diff --git a/print/yatex/Makefile b/print/yatex/Makefile
index f02946e0d3cc..33119b3d7feb 100644
--- a/print/yatex/Makefile
+++ b/print/yatex/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES= http://www.yatex.org/ \
DISTNAME= ${PORTNAME}${PORTVERSION}
MAINTAINER= taoka@FreeBSD.org
+COMMENT?= Yet Another LaTeX mode and html mode on Emacs (for Emacs{19,20} and XEmacs{19,20})
PKGINSTALL= ${WRKDIR}/INSTALL
PKGDEINSTALL= ${WRKDIR}/DEINSTALL
diff --git a/print/yatex/pkg-comment b/print/yatex/pkg-comment
deleted file mode 100644
index 048dedbc1198..000000000000
--- a/print/yatex/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet Another LaTeX mode and html mode on Emacs (for Emacs{19,20} and XEmacs{19,20})
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 3c391504787a..a30f3fa25bf1 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \
DISTNAME= cdrtools-2.0
MAINTAINER= dirk@FreeBSD.org
+COMMENT?= Cdrecord, mkisofs and several other programs to record CD-R[W]
.if defined(MKISOFS)
MAN8= apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
diff --git a/sysutils/cdrtools-devel/pkg-comment b/sysutils/cdrtools-devel/pkg-comment
deleted file mode 100644
index 1257714deea4..000000000000
--- a/sysutils/cdrtools-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cdrecord, mkisofs and several other programs to record CD-R[W]
diff --git a/sysutils/cdrtools-devel/pkg-comment.mkisofs b/sysutils/cdrtools-devel/pkg-comment.mkisofs
deleted file mode 100644
index 3b56ca683c02..000000000000
--- a/sysutils/cdrtools-devel/pkg-comment.mkisofs
+++ /dev/null
@@ -1 +0,0 @@
-Create iso9660/Rock Ridge/Joliet filesystems
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 3c391504787a..a30f3fa25bf1 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/ \
DISTNAME= cdrtools-2.0
MAINTAINER= dirk@FreeBSD.org
+COMMENT?= Cdrecord, mkisofs and several other programs to record CD-R[W]
.if defined(MKISOFS)
MAN8= apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
diff --git a/sysutils/cdrtools/pkg-comment b/sysutils/cdrtools/pkg-comment
deleted file mode 100644
index 1257714deea4..000000000000
--- a/sysutils/cdrtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cdrecord, mkisofs and several other programs to record CD-R[W]
diff --git a/sysutils/cdrtools/pkg-comment.mkisofs b/sysutils/cdrtools/pkg-comment.mkisofs
deleted file mode 100644
index 3b56ca683c02..000000000000
--- a/sysutils/cdrtools/pkg-comment.mkisofs
+++ /dev/null
@@ -1 +0,0 @@
-Create iso9660/Rock Ridge/Joliet filesystems
diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index e59e7ae926ff..b8c7ed591dfb 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 0
CATEGORIES= sysutils
MASTERDIR= ${.CURDIR}/../cdrtools
-COMMENTFILE= ${PKGDIR}/pkg-comment.mkisofs
+COMMENT= Create iso9660/Rock Ridge/Joliet filesystems
DESCR= ${PKGDIR}/pkg-descr.mkisofs
PLIST= ${PKGDIR}/pkg-plist.mkisofs
diff --git a/sysutils/mkisofs-devel/pkg-descr b/sysutils/mkisofs-devel/pkg-descr
deleted file mode 100644
index d95bc8559469..000000000000
--- a/sysutils/mkisofs-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-mkisofs is effectively a pre-mastering program to generate the iso9660
-filesystem - it takes a snapshot of a given directory tree, and generates
-a binary image which will correspond to an iso9660 filesystem when written
-to a block device.
-
-WWW: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index e59e7ae926ff..b8c7ed591dfb 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -11,7 +11,7 @@ PORTREVISION= 0
CATEGORIES= sysutils
MASTERDIR= ${.CURDIR}/../cdrtools
-COMMENTFILE= ${PKGDIR}/pkg-comment.mkisofs
+COMMENT= Create iso9660/Rock Ridge/Joliet filesystems
DESCR= ${PKGDIR}/pkg-descr.mkisofs
PLIST= ${PKGDIR}/pkg-plist.mkisofs
diff --git a/sysutils/mkisofs/pkg-descr b/sysutils/mkisofs/pkg-descr
deleted file mode 100644
index d95bc8559469..000000000000
--- a/sysutils/mkisofs/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-mkisofs is effectively a pre-mastering program to generate the iso9660
-filesystem - it takes a snapshot of a given directory tree, and generates
-a binary image which will correspond to an iso9660 filesystem when written
-to a block device.
-
-WWW: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
diff --git a/www/mod_php3/Makefile b/www/mod_php3/Makefile
index 3f3428d5d5f3..562801b20f8f 100644
--- a/www/mod_php3/Makefile
+++ b/www/mod_php3/Makefile
@@ -25,6 +25,7 @@ PATCH_SITES= http://www.php.net/distributions/
PATCHFILES= mime.c.diff-3.0.gz
MAINTAINER= dirk@FreeBSD.org
+COMMENT?= PHP3 module for Apache
.if !defined(STANDALONE)
BUILD_DEPENDS= ${APXS}:${APACHE_PORT}
diff --git a/www/mod_php3/pkg-comment b/www/mod_php3/pkg-comment
deleted file mode 100644
index 926a0750a77c..000000000000
--- a/www/mod_php3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-PHP3 module for Apache
diff --git a/www/mod_php3/pkg-comment.standalone b/www/mod_php3/pkg-comment.standalone
deleted file mode 100644
index 7a6bc18966f7..000000000000
--- a/www/mod_php3/pkg-comment.standalone
+++ /dev/null
@@ -1 +0,0 @@
-PHP3 commandline interpreter
diff --git a/www/netscape48-communicator/Makefile b/www/netscape48-communicator/Makefile
index ac6547283833..4731663a5e8b 100644
--- a/www/netscape48-communicator/Makefile
+++ b/www/netscape48-communicator/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES= ${MASTER_SITE_NETSCAPE}
DISTFILES= ${BROWSER_NAME}-v${BROWSER_V}-us.${NETSCAPE_DIST_TAG}.tar.gz
MAINTAINER= sada@FreeBSD.org
+COMMENT?= Netscape ver 4 communicator web-surfboard
RUN_DEPENDS+= netscape:${PORTSDIR}/www/netscape-wrapper
diff --git a/www/netscape48-communicator/pkg-comment b/www/netscape48-communicator/pkg-comment
deleted file mode 100644
index 87c288818755..000000000000
--- a/www/netscape48-communicator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Netscape ver 4 communicator web-surfboard
diff --git a/www/netscape48-navigator/Makefile b/www/netscape48-navigator/Makefile
index bb7f7ac313d4..c9eb176ee7ba 100644
--- a/www/netscape48-navigator/Makefile
+++ b/www/netscape48-navigator/Makefile
@@ -6,7 +6,7 @@
#
MASTERDIR= ${.CURDIR}/../netscape48-communicator
-COMMENTFILE= ${.CURDIR}/pkg-comment
+COMMENT= Linux Netscape navigator web-surfboard
PLIST= ${.CURDIR}/pkg-plist
BROWSER_NAME= navigator
diff --git a/www/netscape48-navigator/pkg-comment b/www/netscape48-navigator/pkg-comment
deleted file mode 100644
index 1cec451df9f3..000000000000
--- a/www/netscape48-navigator/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Linux Netscape navigator web-surfboard