80 files changed, 40 insertions, 40 deletions

diff --git a/devel/libelf/Makefile b/devel/libelf/Makefile
index 0cff46def638..0f7af3a9064e 100644
--- a/devel/libelf/Makefile
+++ b/devel/libelf/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 MASTER_SITE_SUBDIR=	libs .
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A public ELF file access library"
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
diff --git a/devel/libelf/pkg-comment b/devel/libelf/pkg-comment
deleted file mode 100644
index 445e91e8976d..000000000000
--- a/devel/libelf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A public ELF file access library
diff --git a/devel/makedepend/Makefile b/devel/makedepend/Makefile
index 165527b25627..5cb446d93002 100644
--- a/devel/makedepend/Makefile
+++ b/devel/makedepend/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=. OLD-VERSIONS/imap
 DISTNAME=	cyrus-imapd-2.0.9
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A dependency generator for makefiles"
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/makedepend
 GNU_CONFIGURE=	YES
diff --git a/devel/makedepend/pkg-comment b/devel/makedepend/pkg-comment
deleted file mode 100644
index 9e15273e0ca5..000000000000
--- a/devel/makedepend/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A dependency generator for makefiles
diff --git a/dns/djbdns/Makefile b/dns/djbdns/Makefile
index 7774e56cfe2d..e508ceb667db 100644
--- a/dns/djbdns/Makefile
+++ b/dns/djbdns/Makefile
@@ -51,6 +51,7 @@ DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test14
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A collection of secure and reliable DNS tools"
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
diff --git a/dns/djbdns/pkg-comment b/dns/djbdns/pkg-comment
deleted file mode 100644
index 70215c9da7c6..000000000000
--- a/dns/djbdns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of secure and reliable DNS tools
diff --git a/dns/ghtool/Makefile b/dns/ghtool/Makefile
index d3b0943006e7..d4cfaa169e48 100644
--- a/dns/ghtool/Makefile
+++ b/dns/ghtool/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	ghmain.c
 EXTRACT_SUFX=
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A command-line interface to the resolver library"
 
 WRKSRC=		${WRKDIR}
 
diff --git a/dns/ghtool/pkg-comment b/dns/ghtool/pkg-comment
deleted file mode 100644
index 111745d590f9..000000000000
--- a/dns/ghtool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line interface to the resolver library
diff --git a/dns/nsping/Makefile b/dns/nsping/Makefile
index 644e3cad5230..dcdd88e11ffe 100644
--- a/dns/nsping/Makefile
+++ b/dns/nsping/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	roam
 DISTFILES=	nsping.tar.gz
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"DNS \"ping\""
 
 MAN8=		nsping.8
 
diff --git a/dns/nsping/pkg-comment b/dns/nsping/pkg-comment
deleted file mode 100644
index 7ea95bbb5d7b..000000000000
--- a/dns/nsping/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DNS "ping"
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 670135c1cc59..f0dcdc7bf7b2 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -22,6 +22,7 @@ PATCH_SITES=	${MASTER_SITE_LOCAL} \
 PATCH_SITE_SUBDIR=	roam
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers"
 
 MAN1=		curl.1 curl-config.1
 MAN3=		curl_easy_cleanup.3 curl_easy_duphandle.3 curl_easy_getinfo.3 \
diff --git a/ftp/curl/pkg-comment b/ftp/curl/pkg-comment
deleted file mode 100644
index 0b42615cdcb3..000000000000
--- a/ftp/curl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Non-interactive tool to get files from FTP, GOPHER, HTTP(S) servers
diff --git a/games/gnarr/Makefile b/games/gnarr/Makefile
index ca83e10c4bf1..c6b76a956a1d 100644
--- a/games/gnarr/Makefile
+++ b/games/gnarr/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.sacredchao.net/freednd/gnarr/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A program for generating battle cries"
 
 MAN6=		gnarr.6
 
diff --git a/games/gnarr/pkg-comment b/games/gnarr/pkg-comment
deleted file mode 100644
index 34e088e61403..000000000000
--- a/games/gnarr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program for generating battle cries
diff --git a/games/nonsense/Makefile b/games/nonsense/Makefile
index bb293004c27b..c4db59a83460 100644
--- a/games/nonsense/Makefile
+++ b/games/nonsense/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A nonsense text generator"
 
 NO_BUILD=	defined
 USE_REINPLACE=	yes
diff --git a/games/nonsense/pkg-comment b/games/nonsense/pkg-comment
deleted file mode 100644
index 808dc0f81ba0..000000000000
--- a/games/nonsense/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A nonsense text generator
diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
index 6095c0e6c280..bd1e788f4b01 100644
--- a/mail/autorespond/Makefile
+++ b/mail/autorespond/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/devel/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Simple autoresponder for qmail"
 
 USE_REINPLACE=	yes
 
diff --git a/mail/autorespond/pkg-comment b/mail/autorespond/pkg-comment
deleted file mode 100644
index 32835d693ff0..000000000000
--- a/mail/autorespond/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple autoresponder for qmail
diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile
index d60d42c3081c..aea4d03d2c96 100644
--- a/mail/qmailadmin-devel/Makefile
+++ b/mail/qmailadmin-devel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail www
 MASTER_SITES=	http://www.inter7.com/qmailadmin/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"CGI program for administering Qmail with vchkpw/vpopmail"
 
 BUILD_DEPENDS= \
 	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
diff --git a/mail/qmailadmin-devel/pkg-comment b/mail/qmailadmin-devel/pkg-comment
deleted file mode 100644
index 64d0715d5b11..000000000000
--- a/mail/qmailadmin-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CGI program for administering Qmail with vchkpw/vpopmail
diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile
index d60d42c3081c..aea4d03d2c96 100644
--- a/mail/qmailadmin/Makefile
+++ b/mail/qmailadmin/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail www
 MASTER_SITES=	http://www.inter7.com/qmailadmin/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"CGI program for administering Qmail with vchkpw/vpopmail"
 
 BUILD_DEPENDS= \
 	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
diff --git a/mail/qmailadmin/pkg-comment b/mail/qmailadmin/pkg-comment
deleted file mode 100644
index 64d0715d5b11..000000000000
--- a/mail/qmailadmin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-CGI program for administering Qmail with vchkpw/vpopmail
diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile
index 1458869d69a5..b59003e77181 100644
--- a/mail/vpopmail-devel/Makefile
+++ b/mail/vpopmail-devel/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/devel/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Easy virtual domain and authentication package for use with qmail"
 
 BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
diff --git a/mail/vpopmail-devel/pkg-comment b/mail/vpopmail-devel/pkg-comment
deleted file mode 100644
index 3a0300b4b781..000000000000
--- a/mail/vpopmail-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easy virtual domain and authentication package for use with qmail
diff --git a/mail/vpopmail-stable/Makefile b/mail/vpopmail-stable/Makefile
index 3cccf887d8c7..8be243ba7d34 100644
--- a/mail/vpopmail-stable/Makefile
+++ b/mail/vpopmail-stable/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.inter7.com/vpopmail/
 PKGNAMESUFFIX=	-stable
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Easy virtual domain and authentication package for use with qmail"
 
 BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
diff --git a/mail/vpopmail-stable/pkg-comment b/mail/vpopmail-stable/pkg-comment
deleted file mode 100644
index 3a0300b4b781..000000000000
--- a/mail/vpopmail-stable/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easy virtual domain and authentication package for use with qmail
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index 1458869d69a5..b59003e77181 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	mail
 MASTER_SITES=	http://www.inter7.com/devel/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Easy virtual domain and authentication package for use with qmail"
 
 BUILD_DEPENDS=	${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \
 		${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp
diff --git a/mail/vpopmail/pkg-comment b/mail/vpopmail/pkg-comment
deleted file mode 100644
index 3a0300b4b781..000000000000
--- a/mail/vpopmail/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easy virtual domain and authentication package for use with qmail
diff --git a/misc/bogosort/Makefile b/misc/bogosort/Makefile
index 99ef13f26ff7..2b4afe166f61 100644
--- a/misc/bogosort/Makefile
+++ b/misc/bogosort/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}
 DIST_SUBDIR=	${PORTNAME}/${PORTVERSION}
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Sort (or not) stdin using the bogo-sort algorithm"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/misc/bogosort/pkg-comment b/misc/bogosort/pkg-comment
deleted file mode 100644
index 0dc2765d762e..000000000000
--- a/misc/bogosort/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Sort (or not) stdin using the bogo-sort algorithm
diff --git a/misc/histring/Makefile b/misc/histring/Makefile
index 0332c4c9bf4b..d927731c0033 100644
--- a/misc/histring/Makefile
+++ b/misc/histring/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	http://www.gusnet.cx/proj/histring/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A tool to highlight strings using the ANSI terminal escape sequences"
 
 GNU_CONFIGURE=	yes
 
diff --git a/misc/histring/pkg-comment b/misc/histring/pkg-comment
deleted file mode 100644
index b569a76949c8..000000000000
--- a/misc/histring/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A tool to highlight strings using the ANSI terminal escape sequences
diff --git a/misc/rname/Makefile b/misc/rname/Makefile
index d38de3daa1eb..d944179e4895 100644
--- a/misc/rname/Makefile
+++ b/misc/rname/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	misc
 MASTER_SITES=	http://ringwraith.online.bg/devel/sysutils/rname/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Execute a program with a fake name"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
diff --git a/misc/rname/pkg-comment b/misc/rname/pkg-comment
deleted file mode 100644
index 12783d469e7f..000000000000
--- a/misc/rname/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Execute a program with a fake name
diff --git a/net/bsdproxy/Makefile b/net/bsdproxy/Makefile
index 1fb4ef521adb..3ce28847a091 100644
--- a/net/bsdproxy/Makefile
+++ b/net/bsdproxy/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://sydney.daveb.net/bsdproxy/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A TCP proxy, demonstrating use of the kevent(2)/kqueue(2) API"
 
 LIB_DEPENDS=	glib12.3:${PORTSDIR}/devel/glib12
 
diff --git a/net/bsdproxy/pkg-comment b/net/bsdproxy/pkg-comment
deleted file mode 100644
index 93aae30653d6..000000000000
--- a/net/bsdproxy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A TCP proxy, demonstrating use of the kevent(2)/kqueue(2) API
diff --git a/net/despoof/Makefile b/net/despoof/Makefile
index 6f3aec1513a1..f4411169b540 100644
--- a/net/despoof/Makefile
+++ b/net/despoof/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	UNIX/misc
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Command-line anti-spoofing detection utility"
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
diff --git a/net/despoof/pkg-comment b/net/despoof/pkg-comment
deleted file mode 100644
index aaa9517c02c8..000000000000
--- a/net/despoof/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Command-line anti-spoofing detection utility
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 7774e56cfe2d..e508ceb667db 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -51,6 +51,7 @@ DJBDNS_VER=	1.05
 DJBDNS_V6_VER=	test14
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A collection of secure and reliable DNS tools"
 
 RUN_DEPENDS=	setuidgid:${PORTSDIR}/sysutils/daemontools \
 		tcpserver:${PORTSDIR}/sysutils/ucspi-tcp
diff --git a/net/djbdns/pkg-comment b/net/djbdns/pkg-comment
deleted file mode 100644
index 70215c9da7c6..000000000000
--- a/net/djbdns/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A collection of secure and reliable DNS tools
diff --git a/net/ghtool/Makefile b/net/ghtool/Makefile
index d3b0943006e7..d4cfaa169e48 100644
--- a/net/ghtool/Makefile
+++ b/net/ghtool/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	ghmain.c
 EXTRACT_SUFX=
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A command-line interface to the resolver library"
 
 WRKSRC=		${WRKDIR}
 
diff --git a/net/ghtool/pkg-comment b/net/ghtool/pkg-comment
deleted file mode 100644
index 111745d590f9..000000000000
--- a/net/ghtool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line interface to the resolver library
diff --git a/net/libnids/Makefile b/net/libnids/Makefile
index 681484894efb..e8dce58e212b 100644
--- a/net/libnids/Makefile
+++ b/net/libnids/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	net security
 MASTER_SITES=	http://www.packetfactory.net/projects/libnids/dist/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Network monitoring library with TCP/IP reassembly"
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
diff --git a/net/libnids/pkg-comment b/net/libnids/pkg-comment
deleted file mode 100644
index c74f7b376701..000000000000
--- a/net/libnids/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Network monitoring library with TCP/IP reassembly
diff --git a/net/magictun/Makefile b/net/magictun/Makefile
index f39e1dbf417b..b5a92f6b3875 100644
--- a/net/magictun/Makefile
+++ b/net/magictun/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://anight.org/magictun/dist/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"An LD_PRELOAD module for transparent HTTPS proxy redirection"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/magictun.so ${PREFIX}/lib/magictun.so
diff --git a/net/magictun/pkg-comment b/net/magictun/pkg-comment
deleted file mode 100644
index 942a24ab2264..000000000000
--- a/net/magictun/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An LD_PRELOAD module for transparent HTTPS proxy redirection
diff --git a/net/nsping/Makefile b/net/nsping/Makefile
index 644e3cad5230..dcdd88e11ffe 100644
--- a/net/nsping/Makefile
+++ b/net/nsping/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	roam
 DISTFILES=	nsping.tar.gz
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"DNS \"ping\""
 
 MAN8=		nsping.8
 
diff --git a/net/nsping/pkg-comment b/net/nsping/pkg-comment
deleted file mode 100644
index 7ea95bbb5d7b..000000000000
--- a/net/nsping/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-DNS "ping"
diff --git a/net/tcpcat/Makefile b/net/tcpcat/Makefile
index 1c1ee0efe5e1..7ec47b47fd0a 100644
--- a/net/tcpcat/Makefile
+++ b/net/tcpcat/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.gusnet.cx/proj/tcpcat/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A simple utility for sending/receiving data over a TCP or a Unix-domain socket"
 
 GNU_CONFIGURE=	yes
 
diff --git a/net/tcpcat/pkg-comment b/net/tcpcat/pkg-comment
deleted file mode 100644
index 008b0491fd82..000000000000
--- a/net/tcpcat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A simple utility for sending/receiving data over a TCP or a Unix-domain socket
diff --git a/security/aescrypt/Makefile b/security/aescrypt/Makefile
index aa8e3990c65c..7ed269576341 100644
--- a/security/aescrypt/Makefile
+++ b/security/aescrypt/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://aescrypt.sourceforge.net/
 MASTER_SITE_SUBDIR=aescrypt
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A command-line AES encryption/decryption suite"
 
 GNU_CONFIGURE=	yes
 
diff --git a/security/aescrypt/pkg-comment b/security/aescrypt/pkg-comment
deleted file mode 100644
index 727f4c3a6cfc..000000000000
--- a/security/aescrypt/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A command-line AES encryption/decryption suite
diff --git a/security/apg/Makefile b/security/apg/Makefile
index deaaddcb5f18..0f87ac7904e4 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	security
 MASTER_SITES=	http://www.adel.nursat.kz/apg/download/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"An automated password generator"
 
 MAN1=		apg.1 apgbfm.1
 MAN8=		apgd.8
diff --git a/security/apg/pkg-comment b/security/apg/pkg-comment
deleted file mode 100644
index 36d8f52994a1..000000000000
--- a/security/apg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An automated password generator
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index d2ee31fac3c0..761842b9b0ef 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Library provides an easy way to access strong hashes such as MD5 and SHA1"
 
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
diff --git a/security/mhash/pkg-comment b/security/mhash/pkg-comment
deleted file mode 100644
index d933f6a19283..000000000000
--- a/security/mhash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library provides an easy way to access strong hashes such as MD5 and SHA1
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index 6e4c79da3247..3344be049dbe 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.stunnel.org/download/stunnel/src/ \
 		ftp://ftp.cryptoarchive.net/pub/cryptoarchive/mirrors/opensores.thebunker.net/pub/mirrors/stunnel/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"SSL encryption wrapper for standard network daemons"
 
 USE_OPENSSL=	YES
 USE_REINPLACE=	YES
diff --git a/security/stunnel/pkg-comment b/security/stunnel/pkg-comment
deleted file mode 100644
index 36598179fccc..000000000000
--- a/security/stunnel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-SSL encryption wrapper for standard network daemons
diff --git a/security/zombiezapper/Makefile b/security/zombiezapper/Makefile
index 182cc71fed5c..a6a3032d0c66 100644
--- a/security/zombiezapper/Makefile
+++ b/security/zombiezapper/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	zombie
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Send a terminate command to Trinoo/TFN/Stacheldracht DDoS agents"
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/libnet-config:${PORTSDIR}/net/libnet/
 
diff --git a/security/zombiezapper/pkg-comment b/security/zombiezapper/pkg-comment
deleted file mode 100644
index 4e190a74002d..000000000000
--- a/security/zombiezapper/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Send a terminate command to Trinoo/TFN/Stacheldracht DDoS agents
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 4728a0a7e817..626914bd9402 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -26,6 +26,7 @@ MANCOMPRESSED=	no
 .endif
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Service monitoring and logging utilities by djb"
 
 WRKSRC=		${WRKDIR}/admin/${DISTNAME}/src
 NO_PACKAGE=	"Unsure of djb\'s license"
diff --git a/sysutils/daemontools/pkg-comment b/sysutils/daemontools/pkg-comment
deleted file mode 100644
index 9f1c8ff6bbec..000000000000
--- a/sysutils/daemontools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Service monitoring and logging utilities by djb
diff --git a/sysutils/penv/Makefile b/sysutils/penv/Makefile
index bb2147d0de40..e8a367366716 100644
--- a/sysutils/penv/Makefile
+++ b/sysutils/penv/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://devel.ringlet.net/sysutils/penv/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/pre/}
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Set the environment accoring to the current working directory"
 
 RUN_DEPENDS=	envdir:${PORTSDIR}/sysutils/daemontools
 
diff --git a/sysutils/penv/pkg-comment b/sysutils/penv/pkg-comment
deleted file mode 100644
index 7ccead9f79ec..000000000000
--- a/sysutils/penv/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Set the environment accoring to the current working directory
diff --git a/sysutils/pslist/Makefile b/sysutils/pslist/Makefile
index 04775611d6cb..7fb2ec45dd69 100644
--- a/sysutils/pslist/Makefile
+++ b/sysutils/pslist/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://ringwraith.online.bg/devel/sysutils/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A utility to view or send signals to processes with all their children"
 
 NO_BUILD=	yes
 
diff --git a/sysutils/pslist/pkg-comment b/sysutils/pslist/pkg-comment
deleted file mode 100644
index 6c9e519d6bae..000000000000
--- a/sysutils/pslist/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility to view or send signals to processes with all their children
diff --git a/sysutils/safecat/Makefile b/sysutils/safecat/Makefile
index d02e22c0b3fe..885a582c3439 100644
--- a/sysutils/safecat/Makefile
+++ b/sysutils/safecat/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	sysutils mail
 MASTER_SITES=	http://www.nb.net/~lbudney/linux/software/safecat/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Safely write data to a directory using D. J. Bernstein's Maildir ideology"
 
 USE_REINPLACE=	yes
 
diff --git a/sysutils/safecat/pkg-comment b/sysutils/safecat/pkg-comment
deleted file mode 100644
index f4b34a2b6b4d..000000000000
--- a/sysutils/safecat/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Safely write data to a directory using D. J. Bernstein's Maildir ideology
diff --git a/sysutils/timelimit/Makefile b/sysutils/timelimit/Makefile
index 96505a75854f..c1fa2c9daaec 100644
--- a/sysutils/timelimit/Makefile
+++ b/sysutils/timelimit/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://ringwraith.online.bg/~roam/devel/sys/timelimit/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/pre/}
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Limit the absolute execution time of a process"
 
 MAN8=		timelimit.8
 
diff --git a/sysutils/timelimit/pkg-comment b/sysutils/timelimit/pkg-comment
deleted file mode 100644
index ff985f486124..000000000000
--- a/sysutils/timelimit/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Limit the absolute execution time of a process
diff --git a/sysutils/unquote/Makefile b/sysutils/unquote/Makefile
index a4cddfcb9102..0b8ba302a598 100644
--- a/sysutils/unquote/Makefile
+++ b/sysutils/unquote/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://devel.ringlet.net/misc/unquote/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.b/pre/}
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Execute a command with safely quoted arguments"
 
 MAN1=		unquote.1
 MANCOMPRESSED=	yes
diff --git a/sysutils/unquote/pkg-comment b/sysutils/unquote/pkg-comment
deleted file mode 100644
index 24492c27e388..000000000000
--- a/sysutils/unquote/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Execute a command with safely quoted arguments
diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile
index b29543bc10c4..a2dcca707612 100644
--- a/textproc/texi2html/Makefile
+++ b/textproc/texi2html/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://www.mathematik.uni-kl.de/~obachman/Texi2html/Distrib/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Texinfo to HTML converter"
 
 USE_AUTOMAKE=	yes
 USE_AUTOCONF=	yes
diff --git a/textproc/texi2html/pkg-comment b/textproc/texi2html/pkg-comment
deleted file mode 100644
index 97ca004803b1..000000000000
--- a/textproc/texi2html/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Texinfo to HTML converter
diff --git a/www/cgihtml/Makefile b/www/cgihtml/Makefile
index 48a1be9da4ba..72ee0224235f 100644
--- a/www/cgihtml/Makefile
+++ b/www/cgihtml/Makefile
@@ -16,6 +16,7 @@ MASTER_SITES=	http://www.eekim.com/software/cgihtml/cgihtml.tar.gz \
 FORBIDDEN=	Multiple vulnerabilities, see http://online.securityfocus.com/archive/1/305469
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"Library that simplifies the task of writing CGI programs in C"
 
 INSTALLS_SHLIB=	yes
 
diff --git a/www/cgihtml/pkg-comment b/www/cgihtml/pkg-comment
deleted file mode 100644
index 025333ac8ee3..000000000000
--- a/www/cgihtml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Library that simplifies the task of writing CGI programs in C
diff --git a/www/comclear/Makefile b/www/comclear/Makefile
index 945049d418fd..6ba438ec360d 100644
--- a/www/comclear/Makefile
+++ b/www/comclear/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.neuro-tech.net/files/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A history cleaner for Netscape Navigator and Communicator"
 
 USE_REINPLACE=	yes
 USE_GNOMENG=	yes
diff --git a/www/comclear/pkg-comment b/www/comclear/pkg-comment
deleted file mode 100644
index d97dda900cd0..000000000000
--- a/www/comclear/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A history cleaner for Netscape Navigator and Communicator
diff --git a/x11/xvkbd/Makefile b/x11/xvkbd/Makefile
index 6d8afe46713e..23d0f8bd47f0 100644
--- a/x11/xvkbd/Makefile
+++ b/x11/xvkbd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://member.nifty.ne.jp/tsato/xvkbd/
 
 MAINTAINER=	roam@FreeBSD.org
+COMMENT=	"A virtual keyboard for X applications"
 
 MAN1=		xvkbd.1
 
diff --git a/x11/xvkbd/pkg-comment b/x11/xvkbd/pkg-comment
deleted file mode 100644
index d0566fc105b2..000000000000
--- a/x11/xvkbd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual keyboard for X applications