o Rollback PORTCOMMENT modifications while this feature's implementation

  is better studied
o Turn PORTCOMMENT variable in Makefile back into pkg-comment files

Approved by:	kris (portmgr hat),
		portmgr, re (silence)

44 files changed, 22 insertions, 44 deletions

diff --git a/x11-wm/9menu/Makefile b/x11-wm/9menu/Makefile
index 0bd32f304dbd..0658a8dca320 100644
--- a/x11-wm/9menu/Makefile
+++ b/x11-wm/9menu/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.shar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A simple menu patterened after plan9
-
 USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
 EXTRACT_CMD=		zcat
diff --git a/x11-wm/9menu/pkg-comment b/x11-wm/9menu/pkg-comment
new file mode 100644
index 000000000000..bb43512b660f
--- /dev/null
+++ b/x11-wm/9menu/pkg-comment
@@ -0,0 +1 @@
+A simple menu patterened after plan9
diff --git a/x11-wm/9wm/Makefile b/x11-wm/9wm/Makefile
index edcd1a1f4348..f6dffe12f3b8 100644
--- a/x11-wm/9wm/Makefile
+++ b/x11-wm/9wm/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://sources.isc.org/X/window-managers/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	An 8 1/2-like Window Manager for X
-
 USE_IMAKE=	yes
 MAN1=		9wm.1
 
diff --git a/x11-wm/9wm/pkg-comment b/x11-wm/9wm/pkg-comment
new file mode 100644
index 000000000000..822917fb4111
--- /dev/null
+++ b/x11-wm/9wm/pkg-comment
@@ -0,0 +1 @@
+An 8 1/2-like Window Manager for X
diff --git a/x11-wm/afterstep-i18n/Makefile b/x11-wm/afterstep-i18n/Makefile
index 141341067903..ed5c20b16672 100644
--- a/x11-wm/afterstep-i18n/Makefile
+++ b/x11-wm/afterstep-i18n/Makefile
@@ -27,8 +27,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	The NeXTSTEP clone window manager with Fontset support
-
 RUN_DEPENDS=	asclock:${PORTSDIR}/x11-clocks/asclock
 
 DIST_SUBDIR=	afterstep
diff --git a/x11-wm/afterstep-i18n/pkg-comment b/x11-wm/afterstep-i18n/pkg-comment
new file mode 100644
index 000000000000..429448bede01
--- /dev/null
+++ b/x11-wm/afterstep-i18n/pkg-comment
@@ -0,0 +1 @@
+The NeXTSTEP clone window manager with Fontset support
diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile
index 58a09f272bce..386bf28bb7e1 100644
--- a/x11-wm/afterstep/Makefile
+++ b/x11-wm/afterstep/Makefile
@@ -16,8 +16,6 @@ DISTNAME=	AfterStep-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Window manager originally based on the Bowman NeXTSTEP clone
-
 RUN_DEPENDS=	asclock:${PORTSDIR}/x11-clocks/asclock
 
 NO_LATEST_LINK= yes
diff --git a/x11-wm/afterstep/pkg-comment b/x11-wm/afterstep/pkg-comment
new file mode 100644
index 000000000000..c12ab04699fe
--- /dev/null
+++ b/x11-wm/afterstep/pkg-comment
@@ -0,0 +1 @@
+Window manager originally based on the Bowman NeXTSTEP clone
diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile
index 7fed34acec7a..94b694dfa509 100644
--- a/x11-wm/amiwm/Makefile
+++ b/x11-wm/amiwm/Makefile
@@ -13,8 +13,6 @@ DISTNAME=	${PORTNAME}0.20pl48
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A window manager that makes your desktop look like an Amiga(TM)
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS="${CFLAGS} -DHAVE_X11_EXTENSIONS_SHAPE_H"
 USE_X_PREFIX=	yes
diff --git a/x11-wm/amiwm/pkg-comment b/x11-wm/amiwm/pkg-comment
new file mode 100644
index 000000000000..9e2d313c9754
--- /dev/null
+++ b/x11-wm/amiwm/pkg-comment
@@ -0,0 +1 @@
+A window manager that makes your desktop look like an Amiga(TM)
diff --git a/x11-wm/bbapm/Makefile b/x11-wm/bbapm/Makefile
index 0dd819bd2159..32d7b81cf495 100644
--- a/x11-wm/bbapm/Makefile
+++ b/x11-wm/bbapm/Makefile
@@ -16,8 +16,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	adamw@FreeBSD.org
 
-PORTCOMMENT=	APM monitor for the Blackbox slit
-
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
diff --git a/x11-wm/bbapm/pkg-comment b/x11-wm/bbapm/pkg-comment
new file mode 100644
index 000000000000..d2ac28951ef0
--- /dev/null
+++ b/x11-wm/bbapm/pkg-comment
@@ -0,0 +1 @@
+APM monitor for the Blackbox slit
diff --git a/x11-wm/bbrun/Makefile b/x11-wm/bbrun/Makefile
index 14c1c0004970..aaf185364a55 100644
--- a/x11-wm/bbrun/Makefile
+++ b/x11-wm/bbrun/Makefile
@@ -12,8 +12,6 @@ MASTER_SITES=	http://www.dwave.net/~jking/bbrun/
 
 MAINTAINER=	adamw@FreeBSD.org
 
-PORTCOMMENT=	A Run box for Blackbox
-
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_X_PREFIX=	yes
diff --git a/x11-wm/bbrun/pkg-comment b/x11-wm/bbrun/pkg-comment
new file mode 100644
index 000000000000..99685f92c63c
--- /dev/null
+++ b/x11-wm/bbrun/pkg-comment
@@ -0,0 +1 @@
+A Run box for Blackbox
diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile
index 2407e340e1d9..ffc94aac6cff 100644
--- a/x11-wm/ctwm/Makefile
+++ b/x11-wm/ctwm/Makefile
@@ -14,8 +14,6 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ctwm-images${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	An extension to twm, with support for multiple virtual screens, etc
-
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
diff --git a/x11-wm/ctwm/pkg-comment b/x11-wm/ctwm/pkg-comment
new file mode 100644
index 000000000000..589277e445d2
--- /dev/null
+++ b/x11-wm/ctwm/pkg-comment
@@ -0,0 +1 @@
+An extension to twm, with support for multiple virtual screens, etc
diff --git a/x11-wm/e16utils/Makefile b/x11-wm/e16utils/Makefile
index e4aeb5e48b24..d0b4c914c20a 100644
--- a/x11-wm/e16utils/Makefile
+++ b/x11-wm/e16utils/Makefile
@@ -15,8 +15,6 @@ DISTFILES=	e16menuedit-0.1.tar.gz e16keyedit-0.2.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Standalone menu and keybinding editors for enlightment 0.16
-
 LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_X_PREFIX=	yes
diff --git a/x11-wm/e16utils/pkg-comment b/x11-wm/e16utils/pkg-comment
new file mode 100644
index 000000000000..b0673815fd4a
--- /dev/null
+++ b/x11-wm/e16utils/pkg-comment
@@ -0,0 +1 @@
+Standalone menu and keybinding editors for enlightment 0.16
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile
index 4d7ff5081d9f..364506c87799 100644
--- a/x11-wm/fvwm2-devel/Makefile
+++ b/x11-wm/fvwm2-devel/Makefile
@@ -15,8 +15,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
 
-PORTCOMMENT=	Popular virtual window manager for X
-
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 .if defined(WITH_STROKE)
diff --git a/x11-wm/fvwm2-devel/pkg-comment b/x11-wm/fvwm2-devel/pkg-comment
new file mode 100644
index 000000000000..cda5684de57b
--- /dev/null
+++ b/x11-wm/fvwm2-devel/pkg-comment
@@ -0,0 +1 @@
+Popular virtual window manager for X
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index 6112060d2cfd..fd8755d12f76 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -15,8 +15,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
 
-PORTCOMMENT=	Popular virtual window manager for X
-
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 .if defined(WITH_STROKE)
diff --git a/x11-wm/fvwm2/pkg-comment b/x11-wm/fvwm2/pkg-comment
new file mode 100644
index 000000000000..cda5684de57b
--- /dev/null
+++ b/x11-wm/fvwm2/pkg-comment
@@ -0,0 +1 @@
+Popular virtual window manager for X
diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile
index 6112060d2cfd..fd8755d12f76 100644
--- a/x11-wm/fvwm24/Makefile
+++ b/x11-wm/fvwm24/Makefile
@@ -15,8 +15,6 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	cy@FreeBSD.org
 
-PORTCOMMENT=	Popular virtual window manager for X
-
 RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
 .if defined(WITH_STROKE)
diff --git a/x11-wm/fvwm24/pkg-comment b/x11-wm/fvwm24/pkg-comment
new file mode 100644
index 000000000000..cda5684de57b
--- /dev/null
+++ b/x11-wm/fvwm24/pkg-comment
@@ -0,0 +1 @@
+Popular virtual window manager for X
diff --git a/x11-wm/gwm/Makefile b/x11-wm/gwm/Makefile
index 58bebbacbb66..382a4d257f4d 100644
--- a/x11-wm/gwm/Makefile
+++ b/x11-wm/gwm/Makefile
@@ -13,8 +13,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Generic Window Manager
-
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		gwm.1
diff --git a/x11-wm/gwm/pkg-comment b/x11-wm/gwm/pkg-comment
new file mode 100644
index 000000000000..0bb87a4eb08f
--- /dev/null
+++ b/x11-wm/gwm/pkg-comment
@@ -0,0 +1 @@
+Generic Window Manager
diff --git a/x11-wm/icemc/Makefile b/x11-wm/icemc/Makefile
index 3b0319baea56..fc26b4fe08c5 100644
--- a/x11-wm/icemc/Makefile
+++ b/x11-wm/icemc/Makefile
@@ -17,8 +17,6 @@ PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	adamw@FreeBSD.org
 
-PORTCOMMENT=	QT-based menu editor for IceWM
-
 USE_X_PREFIX=	yes
 USE_QT_VER=	3
 
diff --git a/x11-wm/icemc/pkg-comment b/x11-wm/icemc/pkg-comment
new file mode 100644
index 000000000000..d3475f8f72ac
--- /dev/null
+++ b/x11-wm/icemc/pkg-comment
@@ -0,0 +1 @@
+QT-based menu editor for IceWM
diff --git a/x11-wm/icepref/Makefile b/x11-wm/icepref/Makefile
index 267b4b2839b5..00c6253251fd 100644
--- a/x11-wm/icepref/Makefile
+++ b/x11-wm/icepref/Makefile
@@ -12,8 +12,6 @@ MASTER_SITES=	ftp://ftp:ftp@ftp.mxlab.com/x/wm/
 
 MAINTAINER=	ports@FreeBSD.Org
 
-PORTCOMMENT=	A small graphical configuration utility for the Ice Window Manager
-
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/x11-wm/icepref/pkg-comment b/x11-wm/icepref/pkg-comment
new file mode 100644
index 000000000000..cccaf5ff5149
--- /dev/null
+++ b/x11-wm/icepref/pkg-comment
@@ -0,0 +1 @@
+A small graphical configuration utility for the Ice Window Manager
diff --git a/x11-wm/lwm/Makefile b/x11-wm/lwm/Makefile
index 90ad0cd4e33e..ed50c8ddf828 100644
--- a/x11-wm/lwm/Makefile
+++ b/x11-wm/lwm/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A lightweight window manager
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
diff --git a/x11-wm/lwm/pkg-comment b/x11-wm/lwm/pkg-comment
new file mode 100644
index 000000000000..1f87716c201a
--- /dev/null
+++ b/x11-wm/lwm/pkg-comment
@@ -0,0 +1 @@
+A lightweight window manager
diff --git a/x11-wm/novawm/Makefile b/x11-wm/novawm/Makefile
index 597f396a4eca..9459d5056b2c 100644
--- a/x11-wm/novawm/Makefile
+++ b/x11-wm/novawm/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}_alpha
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A window manager for X, developed with speed, size, and style in mind
-
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
diff --git a/x11-wm/novawm/pkg-comment b/x11-wm/novawm/pkg-comment
new file mode 100644
index 000000000000..880e95325a85
--- /dev/null
+++ b/x11-wm/novawm/pkg-comment
@@ -0,0 +1 @@
+A window manager for X, developed with speed, size, and style in mind
diff --git a/x11-wm/piewm/Makefile b/x11-wm/piewm/Makefile
index 70877f7116bc..043d54684ca5 100644
--- a/x11-wm/piewm/Makefile
+++ b/x11-wm/piewm/Makefile
@@ -12,8 +12,6 @@ MASTER_SITES=	ftp://ftp.crynwr.com/piewm/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A tvtwm with pie (circular) menus
-
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		piewm.1
diff --git a/x11-wm/piewm/pkg-comment b/x11-wm/piewm/pkg-comment
new file mode 100644
index 000000000000..1c1b37765f8d
--- /dev/null
+++ b/x11-wm/piewm/pkg-comment
@@ -0,0 +1 @@
+A tvtwm with pie (circular) menus
diff --git a/x11-wm/qnxstyle/Makefile b/x11-wm/qnxstyle/Makefile
index 52958a9ff601..7ec83786f8b1 100644
--- a/x11-wm/qnxstyle/Makefile
+++ b/x11-wm/qnxstyle/Makefile
@@ -13,8 +13,6 @@ DISTNAME=	$(KDELOOKITEM)-${PORTNAME}-$(PORTVERSION)
 
 MAINTAINER=	adamw@FreeBSD.org
 
-PORTCOMMENT=	A QNX style/theme for KDE3
-
 BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 		automake14:${PORTSDIR}/devel/automake14
 
diff --git a/x11-wm/qnxstyle/pkg-comment b/x11-wm/qnxstyle/pkg-comment
new file mode 100644
index 000000000000..6c492645b4e3
--- /dev/null
+++ b/x11-wm/qnxstyle/pkg-comment
@@ -0,0 +1 @@
+A QNX style/theme for KDE3
diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 2354276729a0..10344f9828c2 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	udeproject
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Small, fast, compact windowmanager
-
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
diff --git a/x11-wm/ude/pkg-comment b/x11-wm/ude/pkg-comment
new file mode 100644
index 000000000000..7538a45695cf
--- /dev/null
+++ b/x11-wm/ude/pkg-comment
@@ -0,0 +1 @@
+Small, fast, compact windowmanager
diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile
index a22e4277428c..f4ed22c2b47c 100644
--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	CDE like desktop with GTK
-
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
diff --git a/x11-wm/xfce/pkg-comment b/x11-wm/xfce/pkg-comment
new file mode 100644
index 000000000000..2902db4925d4
--- /dev/null
+++ b/x11-wm/xfce/pkg-comment
@@ -0,0 +1 @@
+CDE like desktop with GTK
diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile
index a22e4277428c..f4ed22c2b47c 100644
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	CDE like desktop with GTK
-
 LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf
diff --git a/x11-wm/xfce4/pkg-comment b/x11-wm/xfce4/pkg-comment
new file mode 100644
index 000000000000..2902db4925d4
--- /dev/null
+++ b/x11-wm/xfce4/pkg-comment
@@ -0,0 +1 @@
+CDE like desktop with GTK