48 files changed, 24 insertions, 24 deletions

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