14 files changed, 7 insertions, 7 deletions

diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 73d0b8862e7f..8641c6b9966f 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	X${PORTVERSION:S/.//g}src-1.tgz
 EXTRACT_ONLY=	X${PORTVERSION:S/.//g}src-1.tgz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 Font Server
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11-servers/XFree86-4-FontServer/pkg-comment b/x11-servers/XFree86-4-FontServer/pkg-comment
deleted file mode 100644
index daf34f1deea1..000000000000
--- a/x11-servers/XFree86-4-FontServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Font Server
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile
index b887b51159a6..f45b95594e4b 100644
--- a/x11-servers/XFree86-4-NestServer/Makefile
+++ b/x11-servers/XFree86-4-NestServer/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
 PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 Xnest server
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11-servers/XFree86-4-NestServer/pkg-comment b/x11-servers/XFree86-4-NestServer/pkg-comment
deleted file mode 100644
index 11dc2170ee07..000000000000
--- a/x11-servers/XFree86-4-NestServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Xnest server
diff --git a/x11-servers/XFree86-4-PrintServer/Makefile b/x11-servers/XFree86-4-PrintServer/Makefile
index 9f018d3a61cc..4b5ddb228b91 100644
--- a/x11-servers/XFree86-4-PrintServer/Makefile
+++ b/x11-servers/XFree86-4-PrintServer/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
 PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 print Server
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11-servers/XFree86-4-PrintServer/pkg-comment b/x11-servers/XFree86-4-PrintServer/pkg-comment
deleted file mode 100644
index 1791f4dcb0fa..000000000000
--- a/x11-servers/XFree86-4-PrintServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 print Server
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile
index d8bb093d2c22..141c8213eb58 100644
--- a/x11-servers/XFree86-4-Server-snap/Makefile
+++ b/x11-servers/XFree86-4-Server-snap/Makefile
@@ -24,6 +24,7 @@ PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz \
 			patch-nvchips.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 X server and related programs
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11-servers/XFree86-4-Server-snap/pkg-comment b/x11-servers/XFree86-4-Server-snap/pkg-comment
deleted file mode 100644
index 1ca8c042c1e7..000000000000
--- a/x11-servers/XFree86-4-Server-snap/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 X server and related programs
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile
index d8bb093d2c22..141c8213eb58 100644
--- a/x11-servers/XFree86-4-Server/Makefile
+++ b/x11-servers/XFree86-4-Server/Makefile
@@ -24,6 +24,7 @@ PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz \
 			patch-nvchips.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 X server and related programs
 
 XFREE86_VERSION=	4
 USE_IMAKE=		YES
diff --git a/x11-servers/XFree86-4-Server/pkg-comment b/x11-servers/XFree86-4-Server/pkg-comment
deleted file mode 100644
index 1ca8c042c1e7..000000000000
--- a/x11-servers/XFree86-4-Server/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 X server and related programs
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
index a60444b285c8..60e81e443844 100644
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
+++ b/x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
@@ -23,6 +23,7 @@ PATCH_SITE_SUBDIR=	anholt/patches-4.2.0/
 PATCHFILES=		4.2.0-4.2.1-1-freebsd.patch.gz
 
 MAINTAINER=	anholt@freebsd.org
+COMMENT=	XFree86-4 Virtual Framebuffer Server
 
 RUN_DEPENDS=	${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
 
diff --git a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment b/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment
deleted file mode 100644
index 35e9c9443f2c..000000000000
--- a/x11-servers/XFree86-4-VirtualFramebufferServer/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-XFree86-4 Virtual Framebuffer Server
diff --git a/x11-servers/x2x/Makefile b/x11-servers/x2x/Makefile
index cbed32cb5c4e..a17dd0fc2441 100644
--- a/x11-servers/x2x/Makefile
+++ b/x11-servers/x2x/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://gatekeeper.dec.com/pub/DEC/SRC/x2x/
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	grog@FreeBSD.org
+COMMENT=	A program to link multiple X servers together
 
 USE_IMAKE=	yes
 USE_GMAKE=	yes
diff --git a/x11-servers/x2x/pkg-comment b/x11-servers/x2x/pkg-comment
deleted file mode 100644
index b34c32e0b43c..000000000000
--- a/x11-servers/x2x/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A program to link multiple X servers together