De-pkg-comment.

author: Akinori MUSHA <knu@FreeBSD.org> 2003-02-20 17:24:13 +0000
committer: Akinori MUSHA <knu@FreeBSD.org> 2003-02-20 17:24:13 +0000
commit: 1707b424cb5fb67d17318c9d90affaf0c362531d (patch)
tree: e2f41c497a07a8a220e52c34456b2ab2734091ff
parent: De-pkg-comment. (diff)
118 files changed, 60 insertions, 68 deletions
diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile
index b65482e51bdf..66b9d1628b6b 100644
--- a/chinese/nvi-big5/Makefile
+++ b/chinese/nvi-big5/Makefile
@@ -11,8 +11,8 @@ PKGNAMESUFFIX=	-big5
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A clone of vi/ex, with multilingual patch, default settings for big5
 
-COMMENTFILE=	${.CURDIR}/pkg-comment
 CONFIGURE_ARGS+=	--enable-multibyte=big5 --program-prefix=n
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/nvi-big5/pkg-comment b/chinese/nvi-big5/pkg-comment
deleted file mode 100644
index 653cd8f2c81b..000000000000
--- a/chinese/nvi-big5/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, default settings for big5
diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile
index 5b6992362d37..d57148559a8c 100644
--- a/chinese/nvi-euc-cn/Makefile
+++ b/chinese/nvi-euc-cn/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	chinese editors
 PKGNAMESUFFIX=	-euccn
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A clone of vi/ex, with multilingual patch, default settings for euc-cn
 
 CONFIGURE_ARGS+=	--enable-multibyte=euc-cn --program-prefix=n
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/nvi-euc-cn/pkg-comment b/chinese/nvi-euc-cn/pkg-comment
deleted file mode 100644
index d50120285988..000000000000
--- a/chinese/nvi-euc-cn/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, default settings for euc-cn
diff --git a/chinese/nvi-euc-tw/Makefile b/chinese/nvi-euc-tw/Makefile
index 56c8c20f1849..e3ac7843a6f4 100644
--- a/chinese/nvi-euc-tw/Makefile
+++ b/chinese/nvi-euc-tw/Makefile
@@ -9,10 +9,10 @@ CATEGORIES=	chinese editors
 PKGNAMESUFFIX=	-euctw
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A clone of vi/ex, with multilingual patch, default settings for euc-tw
 
 CONFIGURE_ARGS+=	--enable-multibyte=euc-tw --program-prefix=n
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 .include "${MASTERDIR}/Makefile"
diff --git a/chinese/nvi-euc-tw/pkg-comment b/chinese/nvi-euc-tw/pkg-comment
deleted file mode 100644
index 55c7b928505b..000000000000
--- a/chinese/nvi-euc-tw/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, default settings for euc-tw
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index d70d8b3bbbed..6ae4eef96613 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -16,7 +16,8 @@ DISTNAME=	nvi-1.79
 PATCH_SITES=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 PATCHFILES=	nvi-1.79.m17n-20011024.diff.gz
 
-MAINTAINER?=   ports@FreeBSD.org
+MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	A clone of vi/ex, with multilingual patch, no default settings
 
 PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p0 -f
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
diff --git a/editors/nvi-m17n/pkg-comment b/editors/nvi-m17n/pkg-comment
deleted file mode 100644
index 22a9e99dedf0..000000000000
--- a/editors/nvi-m17n/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, no default settings
diff --git a/editors/nvi-perl/Makefile b/editors/nvi-perl/Makefile
index 3284434610bb..8db12192eb20 100644
--- a/editors/nvi-perl/Makefile
+++ b/editors/nvi-perl/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	ftp://sleepy.vwh.net/pub/ \
 PKGNAMESUFFIX=	-perl
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A clone of vi/ex, with perl5 linked into
 
 # can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC}
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0
diff --git a/editors/nvi-perl/pkg-comment b/editors/nvi-perl/pkg-comment
deleted file mode 100644
index 27512530bbb6..000000000000
--- a/editors/nvi-perl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with perl5 linked into
diff --git a/emulators/aftp/Makefile b/emulators/aftp/Makefile
index aaaa52776e47..d67ab25908f1 100644
--- a/emulators/aftp/Makefile
+++ b/emulators/aftp/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A ftp-like shell for accessing Apple II disk images
 
 MAN1=		aftp.1
 
diff --git a/emulators/aftp/pkg-comment b/emulators/aftp/pkg-comment
deleted file mode 100644
index 516aa8f7ebc7..000000000000
--- a/emulators/aftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A ftp-like shell for accessing Apple II disk images
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index d09e9d2b2050..680aa826d390 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -15,6 +15,7 @@ DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Atari 8-bit computer emulator
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
diff --git a/emulators/atari800/pkg-comment b/emulators/atari800/pkg-comment
deleted file mode 100644
index b1079aac50d4..000000000000
--- a/emulators/atari800/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Atari 8-bit computer emulator
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index 8ca346b6a6b5..2b30ae37366d 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	system/emulators
 DISTFILES=	${DISTNAME}-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An extensible hardware simulation framework with MC68K support
 
 RUN_DEPENDS=	wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
diff --git a/emulators/bsvc/pkg-comment b/emulators/bsvc/pkg-comment
deleted file mode 100644
index e3efea96b52e..000000000000
--- a/emulators/bsvc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An extensible hardware simulation framework with MC68K support
diff --git a/emulators/cpmemu/Makefile b/emulators/cpmemu/Makefile
index 998d60d9ec98..6f98449a5360 100644
--- a/emulators/cpmemu/Makefile
+++ b/emulators/cpmemu/Makefile
@@ -18,6 +18,7 @@ PATCHFILES=	cpm-0.2.1-glibc-rjm.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Cpm emulator
 
 ONLY_FOR_ARCHS=	i386
 
diff --git a/emulators/cpmemu/pkg-comment b/emulators/cpmemu/pkg-comment
deleted file mode 100644
index 6197cd3c5a9b..000000000000
--- a/emulators/cpmemu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cpm emulator
diff --git a/emulators/dlx/Makefile b/emulators/dlx/Makefile
index f7e5bfae06db..fc86e2adc68b 100644
--- a/emulators/dlx/Makefile
+++ b/emulators/dlx/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Assembler for Hennessy and Patterson's DLX architecture
 
 .if ${MACHINE_ARCH} == alpha
 BROKEN=		will not build on alpha
diff --git a/emulators/dlx/pkg-comment b/emulators/dlx/pkg-comment
deleted file mode 100644
index d44487c3e997..000000000000
--- a/emulators/dlx/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Assembler for Hennessy and Patterson's DLX architecture
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 11c605857b79..9fc5fea35bce 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	http://www.pacificsites.com/~ccrayne/  \
 DISTFILES=	${PORTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	IA64 simulator (Intel(R) Architecture 64)
 
 EXTRACT_BEFORE_ARGS=	-qLa
 WRKSRC=		${WRKDIR}/home/chuck/ia64simcc
diff --git a/emulators/ia64sim/pkg-comment b/emulators/ia64sim/pkg-comment
deleted file mode 100644
index 7f774a0ac294..000000000000
--- a/emulators/ia64sim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-IA64 simulator (Intel(R) Architecture 64)
diff --git a/emulators/libvm68k/Makefile b/emulators/libvm68k/Makefile
index edb2b26ab16c..fac31af7a38c 100644
--- a/emulators/libvm68k/Makefile
+++ b/emulators/libvm68k/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.hypercore.co.jp/vx68k/${PORTNAME}-${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	M68000 virtual machine library
 
 USE_LIBTOOL=	yes
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
diff --git a/emulators/libvm68k/pkg-comment b/emulators/libvm68k/pkg-comment
deleted file mode 100644
index 34fba5456a6f..000000000000
--- a/emulators/libvm68k/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-M68000 virtual machine library
diff --git a/emulators/linux_base-6/Makefile b/emulators/linux_base-6/Makefile
index f72084eade1e..3a0f9d03011a 100644
--- a/emulators/linux_base-6/Makefile
+++ b/emulators/linux_base-6/Makefile
@@ -20,6 +20,7 @@ PATCH_SITE_SUBDIR=	updates/6.2/en/os/${MACHINE_ARCH} \
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base-6/pkg-comment b/emulators/linux_base-6/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base-6/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/linux_base-8/Makefile b/emulators/linux_base-8/Makefile
index 4a3d0349fc2c..16b1dc853c2e 100644
--- a/emulators/linux_base-8/Makefile
+++ b/emulators/linux_base-8/Makefile
@@ -43,6 +43,7 @@ PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base-8/pkg-comment b/emulators/linux_base-8/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base-8/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/linux_base-rh-9/Makefile b/emulators/linux_base-rh-9/Makefile
index 4a3d0349fc2c..16b1dc853c2e 100644
--- a/emulators/linux_base-rh-9/Makefile
+++ b/emulators/linux_base-rh-9/Makefile
@@ -43,6 +43,7 @@ PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base-rh-9/pkg-comment b/emulators/linux_base-rh-9/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base-rh-9/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/linux_base-suse-9.1/Makefile b/emulators/linux_base-suse-9.1/Makefile
index 4a3d0349fc2c..16b1dc853c2e 100644
--- a/emulators/linux_base-suse-9.1/Makefile
+++ b/emulators/linux_base-suse-9.1/Makefile
@@ -43,6 +43,7 @@ PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base-suse-9.1/pkg-comment b/emulators/linux_base-suse-9.1/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base-suse-9.1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/linux_base-suse-9.2/Makefile b/emulators/linux_base-suse-9.2/Makefile
index 4a3d0349fc2c..16b1dc853c2e 100644
--- a/emulators/linux_base-suse-9.2/Makefile
+++ b/emulators/linux_base-suse-9.2/Makefile
@@ -43,6 +43,7 @@ PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base-suse-9.2/pkg-comment b/emulators/linux_base-suse-9.2/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base-suse-9.2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/linux_base-suse-9.3/Makefile b/emulators/linux_base-suse-9.3/Makefile
index 4a3d0349fc2c..16b1dc853c2e 100644
--- a/emulators/linux_base-suse-9.3/Makefile
+++ b/emulators/linux_base-suse-9.3/Makefile
@@ -43,6 +43,7 @@ PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base-suse-9.3/pkg-comment b/emulators/linux_base-suse-9.3/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base-suse-9.3/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/linux_base/Makefile b/emulators/linux_base/Makefile
index 4a3d0349fc2c..16b1dc853c2e 100644
--- a/emulators/linux_base/Makefile
+++ b/emulators/linux_base/Makefile
@@ -43,6 +43,7 @@ PATCH_SITE_SUBDIR=	updates/${PORTVERSION}/${LANG}/os/${MACHINE_ARCH}
 PATCHFILES=		${UPDATES}
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	The base set of packages needed in Linux mode
 
 BUILD_DEPENDS=		rpm:${PORTSDIR}/archivers/rpm
 
diff --git a/emulators/linux_base/pkg-comment b/emulators/linux_base/pkg-comment
deleted file mode 100644
index 19a3f47dee11..000000000000
--- a/emulators/linux_base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-The base set of packages needed in Linux mode
diff --git a/emulators/p-interp/Makefile b/emulators/p-interp/Makefile
index 914d18116195..ba09703fffa6 100644
--- a/emulators/p-interp/Makefile
+++ b/emulators/p-interp/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A UCSD (Apple) Pascal p-code interpreter environment
 
 USE_XLIB=	yes
 
diff --git a/emulators/p-interp/pkg-comment b/emulators/p-interp/pkg-comment
deleted file mode 100644
index 40abb649c147..000000000000
--- a/emulators/p-interp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A UCSD (Apple) Pascal p-code interpreter environment
diff --git a/emulators/prodosemu/Makefile b/emulators/prodosemu/Makefile
index 7a564640d19e..00dc3364ed62 100644
--- a/emulators/prodosemu/Makefile
+++ b/emulators/prodosemu/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	ftp://apple2.caltech.edu/pub/apple2/emulators/
 DISTNAME=	${PORTNAME}.v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A text based Apple IIe ProDOS emulator
 
 NO_PACKAGE=	yes
 RESTRICTED=	apple.rom copyright is owned by Apple and cannot be distributed.
diff --git a/emulators/prodosemu/pkg-comment b/emulators/prodosemu/pkg-comment
deleted file mode 100644
index ae02ea7c0498..000000000000
--- a/emulators/prodosemu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A text based Apple IIe ProDOS emulator
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 31025f141a4b..3e1aa8f5d63f 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.cs.wisc.edu/~larus/SPIM/
 DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	MIPS R2000 Simulator
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/emulators/spim/pkg-comment b/emulators/spim/pkg-comment
deleted file mode 100644
index 774dcff69a7b..000000000000
--- a/emulators/spim/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-MIPS R2000 Simulator
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index fb6e3c7916eb..fc76a2aeb0d4 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A multi-platform Atari 2600 VCS emulator
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 BUILD_WRKSRC=	${WRKSRC}/src/build
diff --git a/emulators/stella/pkg-comment b/emulators/stella/pkg-comment
deleted file mode 100644
index fa9f6ba3cc49..000000000000
--- a/emulators/stella/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A multi-platform Atari 2600 VCS emulator
diff --git a/emulators/svr4_base/Makefile b/emulators/svr4_base/Makefile
index 1d4af6cd7d1a..d5adc8f1ad6c 100644
--- a/emulators/svr4_base/Makefile
+++ b/emulators/svr4_base/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	# none for now
 DISTFILES=	# none for now
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Compatibility framework necessary for SVR4 emulation
 
 PREFIX=		/	# distfile tared as "/compat/svr4"
 NO_MTREE=	yes
diff --git a/emulators/svr4_base/pkg-comment b/emulators/svr4_base/pkg-comment
deleted file mode 100644
index 41fd616767f2..000000000000
--- a/emulators/svr4_base/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Compatibility framework necessary for SVR4 emulation
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index c94440b6c0f3..9c00d58a1255 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.willows.com/pub/twin/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Willows Toolkit for migrating and developing Windows applications
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
diff --git a/emulators/twin/pkg-comment b/emulators/twin/pkg-comment
deleted file mode 100644
index 39ab72031226..000000000000
--- a/emulators/twin/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Willows Toolkit for migrating and developing Windows applications
diff --git a/emulators/vmware_xf4mod/Makefile b/emulators/vmware_xf4mod/Makefile
index e44c673c86ed..3d09295ae26c 100644
--- a/emulators/vmware_xf4mod/Makefile
+++ b/emulators/vmware_xf4mod/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	vmware_drv.o
 EXTRACT_SUFX=	# none
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A XFree86 4.x driver module for VMware guests
 
 RUN_DEPENDS=	XFree86:${PORTSDIR}/x11/XFree86-4
 
diff --git a/emulators/vmware_xf4mod/pkg-comment b/emulators/vmware_xf4mod/pkg-comment
deleted file mode 100644
index 957390931144..000000000000
--- a/emulators/vmware_xf4mod/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A XFree86 4.x driver module for VMware guests
diff --git a/emulators/vx68k/Makefile b/emulators/vx68k/Makefile
index a689c0d491b5..aff5459338cc 100644
--- a/emulators/vx68k/Makefile
+++ b/emulators/vx68k/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	ftp://ftp.hypercore.co.jp/vx68k/${PORTNAME}-${PORTVERSION:R}/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A virtual machine that emulates a Sharp X68000
 
 LIB_DEPENDS=	vm68k.4:${PORTSDIR}/emulators/libvm68k
 
diff --git a/emulators/vx68k/pkg-comment b/emulators/vx68k/pkg-comment
deleted file mode 100644
index 744fdf34f88b..000000000000
--- a/emulators/vx68k/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A virtual machine that emulates a Sharp X68000
diff --git a/emulators/x48/Makefile b/emulators/x48/Makefile
index cea4156aeace..590397875bf3 100644
--- a/emulators/x48/Makefile
+++ b/emulators/x48/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An HP48sx emulator
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/e//}
 
diff --git a/emulators/x48/pkg-comment b/emulators/x48/pkg-comment
deleted file mode 100644
index b8eb072bb109..000000000000
--- a/emulators/x48/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An HP48sx emulator
diff --git a/emulators/xgs/Makefile b/emulators/xgs/Makefile
index 3fa7365d0617..a7ea7bf445be 100644
--- a/emulators/xgs/Makefile
+++ b/emulators/xgs/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	xgs050.tgz ROM01.ZIP
 EXTRACT_ONLY=	xgs050.tgz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Apple IIGS emulator stable release
 
 BUILD_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
diff --git a/emulators/xgs/pkg-comment b/emulators/xgs/pkg-comment
deleted file mode 100644
index 12682de7a64d..000000000000
--- a/emulators/xgs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Apple IIGS emulator stable release
diff --git a/finance/khacc/Makefile b/finance/khacc/Makefile
index 590fdd598fe6..77e1bc74c742 100644
--- a/finance/khacc/Makefile
+++ b/finance/khacc/Makefile
@@ -11,6 +11,7 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	qhacc
 
 MAINTAINER=		ports@FreeBSD.org
+COMMENT=	Simple KDE-base financial manager
 
 USE_KDELIBS_VER=	3
 GNU_CONFIGURE=		yes
diff --git a/finance/khacc/pkg-comment b/finance/khacc/pkg-comment
deleted file mode 100644
index fd98640713e2..000000000000
--- a/finance/khacc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple KDE-base financial manager
diff --git a/finance/p5-Math-Financial/Makefile b/finance/p5-Math-Financial/Makefile
index c3e807db8006..411676a6b1d8 100644
--- a/finance/p5-Math-Financial/Makefile
+++ b/finance/p5-Math-Financial/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	Math
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Perl module containing common functions for loans and annuities
 
 PERL_CONFIGURE=	yes
 
diff --git a/finance/p5-Math-Financial/pkg-comment b/finance/p5-Math-Financial/pkg-comment
deleted file mode 100644
index b2e6e5c4eeee..000000000000
--- a/finance/p5-Math-Financial/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Perl module containing common functions for loans and annuities
diff --git a/finance/qhacc/Makefile b/finance/qhacc/Makefile
index b13a758eb146..78ed5c8d54f6 100644
--- a/finance/qhacc/Makefile
+++ b/finance/qhacc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Simple QT-based financial manager
 
 USE_QT_VER=	3
 USE_X_PREFIX=	yes
diff --git a/finance/qhacc/pkg-comment b/finance/qhacc/pkg-comment
deleted file mode 100644
index 02366b909907..000000000000
--- a/finance/qhacc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Simple QT-based financial manager
diff --git a/ftp/IglooFTP/Makefile b/ftp/IglooFTP/Makefile
index 11eb56fda463..45d8d0fa1fb4 100644
--- a/ftp/IglooFTP/Makefile
+++ b/ftp/IglooFTP/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	system/network/file-transfer
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Easy to use FTP client for X Window System
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
diff --git a/ftp/IglooFTP/pkg-comment b/ftp/IglooFTP/pkg-comment
deleted file mode 100644
index 0e02b5a2d4f7..000000000000
--- a/ftp/IglooFTP/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Easy to use FTP client for X Window System
diff --git a/ftp/axelq/Makefile b/ftp/axelq/Makefile
index 88244e970ed8..d61a3769de2b 100644
--- a/ftp/axelq/Makefile
+++ b/ftp/axelq/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://elektron.its.tudelft.nl/~hemmin98/axelq_releases/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A queue manager for the download accelerator axel
 
 RUN_DEPENDS=	axel:${PORTSDIR}/ftp/axel \
 		bash:${PORTSDIR}/shells/bash2
diff --git a/ftp/axelq/pkg-comment b/ftp/axelq/pkg-comment
deleted file mode 100644
index c3f4332a66a3..000000000000
--- a/ftp/axelq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A queue manager for the download accelerator axel
diff --git a/ftp/cftp/Makefile b/ftp/cftp/Makefile
index e8cc9296c45d..9135cc9ad3a1 100644
--- a/ftp/cftp/Makefile
+++ b/ftp/cftp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.giga.or.at/pub/nih/cftp/ \
 		ftp://sunsite.univie.ac.at/pub/nih/cftp/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Comfortable FTP, a full screen ftp client
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sftp
diff --git a/ftp/cftp/pkg-comment b/ftp/cftp/pkg-comment
deleted file mode 100644
index 789ad7555404..000000000000
--- a/ftp/cftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Comfortable FTP, a full screen ftp client
diff --git a/ftp/downloader/Makefile b/ftp/downloader/Makefile
index f380b17f9261..d73680512df3 100644
--- a/ftp/downloader/Makefile
+++ b/ftp/downloader/Makefile
@@ -17,6 +17,7 @@ MASTER_SITES=	http://www.krasu.ru/soft/chuchelo/files/ \
 DISTNAME=	d4x-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Program for downloading via ftp or http with GUI
 
 LIB_DEPENDS=	gtk-x11-2.0.200:${PORTSDIR}/x11-toolkits/gtk20
 
diff --git a/ftp/downloader/pkg-comment b/ftp/downloader/pkg-comment
deleted file mode 100644
index ac51b678c530..000000000000
--- a/ftp/downloader/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Program for downloading via ftp or http with GUI
diff --git a/ftp/emirror/Makefile b/ftp/emirror/Makefile
index dd517bb3d09f..41ca473eefa1 100644
--- a/ftp/emirror/Makefile
+++ b/ftp/emirror/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A full features FTP-mirroring software with nice logfiles
 
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
diff --git a/ftp/emirror/pkg-comment b/ftp/emirror/pkg-comment
deleted file mode 100644
index fe1886a999aa..000000000000
--- a/ftp/emirror/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A full features FTP-mirroring software with nice logfiles
diff --git a/ftp/ftpcube/Makefile b/ftp/ftpcube/Makefile
index c6417c2961bf..61c2e9a3dad7 100644
--- a/ftp/ftpcube/Makefile
+++ b/ftp/ftpcube/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A graphical FTP Client
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/gtk.py:${PORTSDIR}/x11-toolkits/py-gtk
 
diff --git a/ftp/ftpcube/pkg-comment b/ftp/ftpcube/pkg-comment
deleted file mode 100644
index 6faabf7a2ff2..000000000000
--- a/ftp/ftpcube/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphical FTP Client
diff --git a/ftp/ftpq/Makefile b/ftp/ftpq/Makefile
index 60659206aa15..46107c0fb93a 100644
--- a/ftp/ftpq/Makefile
+++ b/ftp/ftpq/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://www.tranchant.freeserve.co.uk/software/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Upload queue manager for non-permanent connections
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/ftp/ftpq/pkg-comment b/ftp/ftpq/pkg-comment
deleted file mode 100644
index 2a77235c2bae..000000000000
--- a/ftp/ftpq/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Upload queue manager for non-permanent connections
diff --git a/ftp/ftptool/Makefile b/ftp/ftptool/Makefile
index 885053521f72..c3f7cb7eb645 100644
--- a/ftp/ftptool/Makefile
+++ b/ftp/ftptool/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	utilities
 DISTFILES=	Ftptool${PORTVERSION}.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Graphic ftp shell based on xview
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
 
diff --git a/ftp/ftptool/pkg-comment b/ftp/ftptool/pkg-comment
deleted file mode 100644
index 634e877402d6..000000000000
--- a/ftp/ftptool/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Graphic ftp shell based on xview
diff --git a/ftp/greed/Makefile b/ftp/greed/Makefile
index 20dc2d90f509..43adce3d447d 100644
--- a/ftp/greed/Makefile
+++ b/ftp/greed/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://www.public.asu.edu/~arturner/greed/
 DISTNAME=	greed.81p
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A utility for downloading files with resume capabilities
 
 ALL_TARGET=	freebsd
 WRKSRC=		${WRKDIR}/greed.81p
diff --git a/ftp/greed/pkg-comment b/ftp/greed/pkg-comment
deleted file mode 100644
index 67743c5a2027..000000000000
--- a/ftp/greed/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A utility for downloading files with resume capabilities
diff --git a/ftp/hsftp/Makefile b/ftp/hsftp/Makefile
index f36a54beca61..cf657323228f 100644
--- a/ftp/hsftp/Makefile
+++ b/ftp/hsftp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://la-samhna.de/hsftp/ \
 MASTER_SITE_SUBDIR=	system/network/file-transfer
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	FTP emulator that uses ssh to transport commands/data
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-readline
diff --git a/ftp/hsftp/pkg-comment b/ftp/hsftp/pkg-comment
deleted file mode 100644
index 32d1d1828c44..000000000000
--- a/ftp/hsftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FTP emulator that uses ssh to transport commands/data
diff --git a/ftp/jmirror/Makefile b/ftp/jmirror/Makefile
index cf52e18fc183..43e1c49d5877 100644
--- a/ftp/jmirror/Makefile
+++ b/ftp/jmirror/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://galileo.spaceports.com/~jharris/distfiles/ \
 		ftp://ftp.ruin.org/pub/All/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	FTP mirroring program written in PERL (REQUIRES PERL5,Net::FTP)
 
 RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net
 
diff --git a/ftp/jmirror/pkg-comment b/ftp/jmirror/pkg-comment
deleted file mode 100644
index d4276d864b73..000000000000
--- a/ftp/jmirror/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FTP mirroring program written in PERL (REQUIRES PERL5,Net::FTP)
diff --git a/ftp/junglemonkey/Makefile b/ftp/junglemonkey/Makefile
index 6214794a46db..799d61b276ed 100644
--- a/ftp/junglemonkey/Makefile
+++ b/ftp/junglemonkey/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.junglemonkey.net/src/
 DISTNAME=	jm-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A distributed file sharing program for GNOME
 
 LIB_DEPENDS=	gnet.1:${PORTSDIR}/net/gnet
 
diff --git a/ftp/junglemonkey/pkg-comment b/ftp/junglemonkey/pkg-comment
deleted file mode 100644
index 207bda2d9b98..000000000000
--- a/ftp/junglemonkey/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A distributed file sharing program for GNOME
diff --git a/ftp/libfxp/Makefile b/ftp/libfxp/Makefile
index ac1e5ee1547c..15b0a372ce25 100644
--- a/ftp/libfxp/Makefile
+++ b/ftp/libfxp/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://millweed.com/projects/libfxp/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	An ftp client library
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/ftp/libfxp/pkg-comment b/ftp/libfxp/pkg-comment
deleted file mode 100644
index 5414b386c443..000000000000
--- a/ftp/libfxp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-An ftp client library
diff --git a/ftp/mget/Makefile b/ftp/mget/Makefile
index 8ce9e6b92075..3d1daa8accfd 100644
--- a/ftp/mget/Makefile
+++ b/ftp/mget/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp ipv6
 MASTER_SITES=	http://www.cse.iitk.ac.in/users/dbera/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Multi Threaded Wget
 
 CFLAGS+=	-DHAS_HERROR -DHAVE_GETOPT_LONG -DHAVE_INET_NTOP -DHAVE_IPV6 \
 		${PTHREAD_CFLAGS:S/"//g}
diff --git a/ftp/mget/pkg-comment b/ftp/mget/pkg-comment
deleted file mode 100644
index 0cd0bf68c00c..000000000000
--- a/ftp/mget/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Multi Threaded Wget
diff --git a/ftp/moxftp/Makefile b/ftp/moxftp/Makefile
index 0e6171ade963..b1bf872d9d13 100644
--- a/ftp/moxftp/Makefile
+++ b/ftp/moxftp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.ibiblio.org/pub/X11/contrib/applications/ \
 EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Ftp shell under X Window System
 
 FORBIDDEN=	Remotely exploitable buffer overflow
 
diff --git a/ftp/moxftp/pkg-comment b/ftp/moxftp/pkg-comment
deleted file mode 100644
index 5be1cdc0ddb8..000000000000
--- a/ftp/moxftp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Ftp shell under X Window System
diff --git a/ftp/muddleftpd/Makefile b/ftp/muddleftpd/Makefile
index d357998a63a7..d1d52dd05622 100644
--- a/ftp/muddleftpd/Makefile
+++ b/ftp/muddleftpd/Makefile
@@ -12,6 +12,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	http://savannah.nongnu.org/download/muddleftpd/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A new ftp server that can perform a variety of ftp tasks
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/ftp/muddleftpd/pkg-comment b/ftp/muddleftpd/pkg-comment
deleted file mode 100644
index 4c333c225cfa..000000000000
--- a/ftp/muddleftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A new ftp server that can perform a variety of ftp tasks
diff --git a/ftp/ncftp2/Makefile b/ftp/ncftp2/Makefile
index cf4ef12c2e96..f0657c3aa278 100644
--- a/ftp/ncftp2/Makefile
+++ b/ftp/ncftp2/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.ncftp.com/ncftp/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	FTP replacement with advanced user interface
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_func_getmaxyx=yes ac_cv_lib_readline=yes
diff --git a/ftp/ncftp2/pkg-comment b/ftp/ncftp2/pkg-comment
deleted file mode 100644
index 74f015677bfd..000000000000
--- a/ftp/ncftp2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FTP replacement with advanced user interface
diff --git a/ftp/pavuk/Makefile b/ftp/pavuk/Makefile
index fbc7b4425092..aaf80c4c89df 100644
--- a/ftp/pavuk/Makefile
+++ b/ftp/pavuk/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}-0.9pl28
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	HTTP, FTP and Gopher mirroring tool
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
diff --git a/ftp/pavuk/pkg-comment b/ftp/pavuk/pkg-comment
deleted file mode 100644
index 3be77f76fcfe..000000000000
--- a/ftp/pavuk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-HTTP, FTP and Gopher mirroring tool
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index e729d6b28248..5d5a13106098 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://duncanthrax.net/profxp/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:S/p/-pre/}-src
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	FXP (server-to-server FTP) client
 
 .include <bsd.port.pre.mk>
 
diff --git a/ftp/profxp/pkg-comment b/ftp/profxp/pkg-comment
deleted file mode 100644
index f1aae732947c..000000000000
--- a/ftp/profxp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-FXP (server-to-server FTP) client
diff --git a/ftp/puf/Makefile b/ftp/puf/Makefile
index 05598b64517e..2509264c32f1 100644
--- a/ftp/puf/Makefile
+++ b/ftp/puf/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A parallel HTTP downloader similar to wget
 
 GNU_CONFIGURE=	yes
 
diff --git a/ftp/puf/pkg-comment b/ftp/puf/pkg-comment
deleted file mode 100644
index 774bad90aff6..000000000000
--- a/ftp/puf/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A parallel HTTP downloader similar to wget
diff --git a/ftp/yafc/Makefile b/ftp/yafc/Makefile
index 707d2e0654ff..fbfff482dabc 100644
--- a/ftp/yafc/Makefile
+++ b/ftp/yafc/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Yet another ftp client. Similar to ftp(1)
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
diff --git a/ftp/yafc/pkg-comment b/ftp/yafc/pkg-comment
deleted file mode 100644
index 2fb0af59fc0a..000000000000
--- a/ftp/yafc/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Yet another ftp client. Similar to ftp(1)
diff --git a/ftp/yale-tftpd/Makefile b/ftp/yale-tftpd/Makefile
index ed30fd47c12b..4cf3c69f52a2 100644
--- a/ftp/yale-tftpd/Makefile
+++ b/ftp/yale-tftpd/Makefile
@@ -11,6 +11,7 @@ CATEGORIES=	ftp
 MASTER_SITES=	ftp://ftp.cert.dfn.de/pub/tools/net/yale-tftpd/
 
 MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Enhanced tftpd(8) from Yale University and cisco Systems
 
 NO_WRKSUBDIR=
 MAN8=		tftpd.8
diff --git a/ftp/yale-tftpd/pkg-comment b/ftp/yale-tftpd/pkg-comment
deleted file mode 100644
index 343cdf6f8438..000000000000
--- a/ftp/yale-tftpd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Enhanced tftpd(8) from Yale University and cisco Systems
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index b12353a235d8..8196ccf1f22c 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -8,13 +8,13 @@
 PKGNAMESUFFIX=	-eucjp
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 CATEGORIES=	japanese editors
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A clone of vi/ex, with multilingual patch, default settings for euc-jp
 
 CONFIGURE_ARGS=        --enable-multibyte=euc-jp --program-prefix=n --enable-canna
 
diff --git a/japanese/nvi-euc-jp/pkg-comment b/japanese/nvi-euc-jp/pkg-comment
deleted file mode 100644
index d43df6e94ad7..000000000000
--- a/japanese/nvi-euc-jp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, default settings for euc-jp
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index 45898a7a2fe8..ee5301ab21d1 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -8,13 +8,13 @@
 PKGNAMESUFFIX=	-iso2022jp
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 CATEGORIES=	japanese editors
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	Clone of vi/ex, with multilingual patch, default settings for iso-2022-jp
 
 CONFIGURE_ARGS=        --enable-multibyte=iso-2022-jp --program-prefix=n --enable-canna
 
diff --git a/japanese/nvi-iso-2022-jp/pkg-comment b/japanese/nvi-iso-2022-jp/pkg-comment
deleted file mode 100644
index a34876fbf66b..000000000000
--- a/japanese/nvi-iso-2022-jp/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of vi/ex, with multilingual patch, default settings for iso-2022-jp
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index 77d175dd5888..646bb2c46507 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -8,13 +8,13 @@
 PKGNAMESUFFIX=	-sjis
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 CATEGORIES=	japanese editors
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A clone of vi/ex, with multilingual patch, default settings for sjis
 
 CONFIGURE_ARGS=        --enable-multibyte=sjis --program-prefix=n --enable-canna
 
diff --git a/japanese/nvi-sjis/pkg-comment b/japanese/nvi-sjis/pkg-comment
deleted file mode 100644
index 5356d68e6809..000000000000
--- a/japanese/nvi-sjis/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, default settings for sjis
diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile
index bfdf8edb28b9..480d298f918f 100644
--- a/korean/nvi-euc-kr/Makefile
+++ b/korean/nvi-euc-kr/Makefile
@@ -8,11 +8,11 @@
 PKGNAMESUFFIX=	-euckr
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 CATEGORIES=	korean editors
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	A clone of vi/ex, with multilingual patch, default settings for euc-kr
 
 CONFIGURE_ARGS=        --enable-multibyte=euc-kr --program-prefix=n
 
diff --git a/korean/nvi-euc-kr/pkg-comment b/korean/nvi-euc-kr/pkg-comment
deleted file mode 100644
index d9d0d7095a13..000000000000
--- a/korean/nvi-euc-kr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A clone of vi/ex, with multilingual patch, default settings for euc-kr
diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile
index aa715cd56fff..126633023692 100644
--- a/korean/nvi-iso-2022-kr/Makefile
+++ b/korean/nvi-iso-2022-kr/Makefile
@@ -8,11 +8,11 @@
 PKGNAMESUFFIX=	-iso2022kr
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
-COMMENTFILE=	${.CURDIR}/pkg-comment
 
 CATEGORIES=	korean editors
 
 MAINTAINER=	ports@freebsd.org
+COMMENT=	Clone of vi/ex, with multilingual patch, default settings for iso-2022-kr
 
 CONFIGURE_ARGS=        --enable-multibyte=iso-2022-kr --program-prefix=n
 
diff --git a/korean/nvi-iso-2022-kr/pkg-comment b/korean/nvi-iso-2022-kr/pkg-comment
deleted file mode 100644
index da8687e7e729..000000000000
--- a/korean/nvi-iso-2022-kr/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Clone of vi/ex, with multilingual patch, default settings for iso-2022-kr
author	Akinori MUSHA <knu@FreeBSD.org>	2003-02-20 17:24:13 +0000
committer	Akinori MUSHA <knu@FreeBSD.org>	2003-02-20 17:24:13 +0000
commit	1707b424cb5fb67d17318c9d90affaf0c362531d (patch)
tree	e2f41c497a07a8a220e52c34456b2ab2734091ff
parent	De-pkg-comment. (diff)