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)

40 files changed, 20 insertions, 40 deletions

diff --git a/archivers/9e/Makefile b/archivers/9e/Makefile
index 8fc43d159eeb..90702ac17ed3 100644
--- a/archivers/9e/Makefile
+++ b/archivers/9e/Makefile
@@ -13,8 +13,6 @@ DISTNAME=	9e
 
 MAINTAINER=	ports@FreeBSD.Org
 
-PORTCOMMENT=	Explode Plan9 archives
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/9e ${PREFIX}/bin
 
diff --git a/archivers/9e/pkg-comment b/archivers/9e/pkg-comment
new file mode 100644
index 000000000000..1941b5fbc61a
--- /dev/null
+++ b/archivers/9e/pkg-comment
@@ -0,0 +1 @@
+Explode Plan9 archives
diff --git a/archivers/bzip/Makefile b/archivers/bzip/Makefile
index 4ae2ce271f58..e2f4882e4a5e 100644
--- a/archivers/bzip/Makefile
+++ b/archivers/bzip/Makefile
@@ -12,8 +12,6 @@ MASTER_SITES=	ftp://ftp.fu-berlin.de/unix/tools/archivers/bzip/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A block-sorting file compressor
-
 NO_CDROM=	"Restrictive copyright (don't sell for profit)"
 MAN1=		bzip.1 bunzip.1
 
diff --git a/archivers/bzip/pkg-comment b/archivers/bzip/pkg-comment
new file mode 100644
index 000000000000..b2289372af60
--- /dev/null
+++ b/archivers/bzip/pkg-comment
@@ -0,0 +1 @@
+A block-sorting file compressor
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 69af0b054575..575a1482f6a5 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	http://www.rkeene.org/devel/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Dynamic Adaptive Compression Tool
-
 LIB_DEPENDS=	mcrypt.7:${PORTSDIR}/security/libmcrypt
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
diff --git a/archivers/dact/pkg-comment b/archivers/dact/pkg-comment
new file mode 100644
index 000000000000..2c490c0bec98
--- /dev/null
+++ b/archivers/dact/pkg-comment
@@ -0,0 +1 @@
+Dynamic Adaptive Compression Tool
diff --git a/archivers/gshar+gunshar/Makefile b/archivers/gshar+gunshar/Makefile
index f19abb06570b..0ab89ed17640 100644
--- a/archivers/gshar+gunshar/Makefile
+++ b/archivers/gshar+gunshar/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	sharutils
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Allow packing and unpacking of shell archives
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g --disable-uucode --disable-nls
 INSTALL_TARGET=	install install-man
diff --git a/archivers/gshar+gunshar/pkg-comment b/archivers/gshar+gunshar/pkg-comment
new file mode 100644
index 000000000000..a7764ea9b174
--- /dev/null
+++ b/archivers/gshar+gunshar/pkg-comment
@@ -0,0 +1 @@
+Allow packing and unpacking of shell archives
diff --git a/archivers/libcomprex/Makefile b/archivers/libcomprex/Makefile
index fc9691b7f32b..d1db67941118 100644
--- a/archivers/libcomprex/Makefile
+++ b/archivers/libcomprex/Makefile
@@ -14,8 +14,6 @@ MASTER_SITE_SUBDIR=	gnupdate
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Transparently handles automatic compression and decompression of files
-
 LIB_DEPENDS=	curl.2:${PORTSDIR}/ftp/curl
 .if !exists(/usr/bin/bzip2) 
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
diff --git a/archivers/libcomprex/pkg-comment b/archivers/libcomprex/pkg-comment
new file mode 100644
index 000000000000..4c3c03f64187
--- /dev/null
+++ b/archivers/libcomprex/pkg-comment
@@ -0,0 +1 @@
+Transparently handles automatic compression and decompression of files
diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile
index 36013d564b10..27fda7279f7b 100644
--- a/archivers/lzo/Makefile
+++ b/archivers/lzo/Makefile
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	libs/compression
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Portable speedy, lossless data compression library
-
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
diff --git a/archivers/lzo/pkg-comment b/archivers/lzo/pkg-comment
new file mode 100644
index 000000000000..63620281e374
--- /dev/null
+++ b/archivers/lzo/pkg-comment
@@ -0,0 +1 @@
+Portable speedy, lossless data compression library
diff --git a/archivers/lzo2/Makefile b/archivers/lzo2/Makefile
index 36013d564b10..27fda7279f7b 100644
--- a/archivers/lzo2/Makefile
+++ b/archivers/lzo2/Makefile
@@ -15,8 +15,6 @@ MASTER_SITE_SUBDIR=	libs/compression
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Portable speedy, lossless data compression library
-
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-shared
diff --git a/archivers/lzo2/pkg-comment b/archivers/lzo2/pkg-comment
new file mode 100644
index 000000000000..63620281e374
--- /dev/null
+++ b/archivers/lzo2/pkg-comment
@@ -0,0 +1 @@
+Portable speedy, lossless data compression library
diff --git a/archivers/lzop/Makefile b/archivers/lzop/Makefile
index b4a271fb671e..131f4f14b8f4 100644
--- a/archivers/lzop/Makefile
+++ b/archivers/lzop/Makefile
@@ -14,8 +14,6 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	lzo.1:${PORTSDIR}/archivers/lzo
 
-PORTCOMMENT=	Fast file compressor similar to gzip, using the LZO library
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/archivers/lzop/pkg-comment b/archivers/lzop/pkg-comment
new file mode 100644
index 000000000000..f8e83d3734b4
--- /dev/null
+++ b/archivers/lzop/pkg-comment
@@ -0,0 +1 @@
+Fast file compressor similar to gzip, using the LZO library
diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile
index cbd6685a53b6..0580a25a15d5 100644
--- a/archivers/macutils/Makefile
+++ b/archivers/macutils/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@freebsd.org
 
-PORTCOMMENT=	Utilities for Apple Macintosh files
-
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	makefile
 
diff --git a/archivers/macutils/pkg-comment b/archivers/macutils/pkg-comment
new file mode 100644
index 000000000000..c430d06f75dd
--- /dev/null
+++ b/archivers/macutils/pkg-comment
@@ -0,0 +1 @@
+Utilities for Apple Macintosh files
diff --git a/archivers/makeself/Makefile b/archivers/makeself/Makefile
index bd9e98d6e39f..c11053c395c5 100644
--- a/archivers/makeself/Makefile
+++ b/archivers/makeself/Makefile
@@ -13,8 +13,6 @@ EXTRACT_SUFX=	.gz.sh
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	A neat script to make self-extracting archives
-
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
diff --git a/archivers/makeself/pkg-comment b/archivers/makeself/pkg-comment
new file mode 100644
index 000000000000..db20d2d9640e
--- /dev/null
+++ b/archivers/makeself/pkg-comment
@@ -0,0 +1 @@
+A neat script to make self-extracting archives
diff --git a/archivers/p5-Mac-Macbinary/Makefile b/archivers/p5-Mac-Macbinary/Makefile
index db6b141e8215..78cd295a1e4f 100644
--- a/archivers/p5-Mac-Macbinary/Makefile
+++ b/archivers/p5-Mac-Macbinary/Makefile
@@ -14,8 +14,6 @@ PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Perl module that can extract info from Macbinary files
-
 PERL_CONFIGURE=	yes
 
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff --git a/archivers/p5-Mac-Macbinary/pkg-comment b/archivers/p5-Mac-Macbinary/pkg-comment
new file mode 100644
index 000000000000..faccdd7779f6
--- /dev/null
+++ b/archivers/p5-Mac-Macbinary/pkg-comment
@@ -0,0 +1 @@
+Perl module that can extract info from Macbinary files
diff --git a/archivers/parchive/Makefile b/archivers/parchive/Makefile
index 0159640cf117..192543958bd3 100644
--- a/archivers/parchive/Makefile
+++ b/archivers/parchive/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	par-v${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Parity Archiver - makes multiple parity volumes from a set of files
-
 MAKEFILE=	${FILESDIR}/Makefile
 WRKSRC=		${WRKDIR}/par-cmdline-${PORTVERSION}
 
diff --git a/archivers/parchive/pkg-comment b/archivers/parchive/pkg-comment
new file mode 100644
index 000000000000..74ac39e6a4b1
--- /dev/null
+++ b/archivers/parchive/pkg-comment
@@ -0,0 +1 @@
+Parity Archiver - makes multiple parity volumes from a set of files
diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
index 7133e9c6de6b..24ef12dbf4ea 100644
--- a/archivers/ppunpack/Makefile
+++ b/archivers/ppunpack/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Decompresses Amiga PowerPacker files
-
 RESTRICTED=	"No commercial redistribution"
 NO_CDROM=	${RESTRICTED}
 
diff --git a/archivers/ppunpack/pkg-comment b/archivers/ppunpack/pkg-comment
new file mode 100644
index 000000000000..7c6df540bcf3
--- /dev/null
+++ b/archivers/ppunpack/pkg-comment
@@ -0,0 +1 @@
+Decompresses Amiga PowerPacker files
diff --git a/archivers/sharutils/Makefile b/archivers/sharutils/Makefile
index f19abb06570b..0ab89ed17640 100644
--- a/archivers/sharutils/Makefile
+++ b/archivers/sharutils/Makefile
@@ -13,8 +13,6 @@ MASTER_SITE_SUBDIR=	sharutils
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Allow packing and unpacking of shell archives
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g --disable-uucode --disable-nls
 INSTALL_TARGET=	install install-man
diff --git a/archivers/sharutils/pkg-comment b/archivers/sharutils/pkg-comment
new file mode 100644
index 000000000000..a7764ea9b174
--- /dev/null
+++ b/archivers/sharutils/pkg-comment
@@ -0,0 +1 @@
+Allow packing and unpacking of shell archives
diff --git a/archivers/star-devel/Makefile b/archivers/star-devel/Makefile
index 3cf8d27852a3..83ed1bfdd052 100644
--- a/archivers/star-devel/Makefile
+++ b/archivers/star-devel/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Unique standard tape archiver with many enhancements
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	MAKEPROG=${GMAKE} CCOM=${CC}
diff --git a/archivers/star-devel/pkg-comment b/archivers/star-devel/pkg-comment
new file mode 100644
index 000000000000..b0332b514fb1
--- /dev/null
+++ b/archivers/star-devel/pkg-comment
@@ -0,0 +1 @@
+Unique standard tape archiver with many enhancements
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 3cf8d27852a3..83ed1bfdd052 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	ftp://ftp.fokus.gmd.de/pub/unix/star/
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Unique standard tape archiver with many enhancements
-
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	MAKEPROG=${GMAKE} CCOM=${CC}
diff --git a/archivers/star/pkg-comment b/archivers/star/pkg-comment
new file mode 100644
index 000000000000..b0332b514fb1
--- /dev/null
+++ b/archivers/star/pkg-comment
@@ -0,0 +1 @@
+Unique standard tape archiver with many enhancements
diff --git a/archivers/stuffit/Makefile b/archivers/stuffit/Makefile
index d6657a8ec3fc..2f5a2f5321c5 100644
--- a/archivers/stuffit/Makefile
+++ b/archivers/stuffit/Makefile
@@ -17,8 +17,6 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Stuffit Archive Creator and Expander
-
 NO_CDROM=	Shareware -- should not redistribute
 NO_PACKAGE=	Only unmodified original package can be distributed
 
diff --git a/archivers/stuffit/pkg-comment b/archivers/stuffit/pkg-comment
new file mode 100644
index 000000000000..643a95600cc5
--- /dev/null
+++ b/archivers/stuffit/pkg-comment
@@ -0,0 +1 @@
+Stuffit Archive Creator and Expander
diff --git a/archivers/undms/Makefile b/archivers/undms/Makefile
index 28a48618b09a..1b1463364bc4 100644
--- a/archivers/undms/Makefile
+++ b/archivers/undms/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Converts .dms Amiga disk images to uncompressed .adf images
-
 NO_WRKSUBDIR=	yes
 
 do-extract:
diff --git a/archivers/undms/pkg-comment b/archivers/undms/pkg-comment
new file mode 100644
index 000000000000..cbd397419f81
--- /dev/null
+++ b/archivers/undms/pkg-comment
@@ -0,0 +1 @@
+Converts .dms Amiga disk images to uncompressed .adf images
diff --git a/archivers/unlzx/Makefile b/archivers/unlzx/Makefile
index 20bdec5eaf20..e343848b42af 100644
--- a/archivers/unlzx/Makefile
+++ b/archivers/unlzx/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
-PORTCOMMENT=	Extracts .lzx archives from Amiga systems
-
 NO_WRKSUBDIR=		yes
 
 do-extract:
diff --git a/archivers/unlzx/pkg-comment b/archivers/unlzx/pkg-comment
new file mode 100644
index 000000000000..05cd538a3818
--- /dev/null
+++ b/archivers/unlzx/pkg-comment
@@ -0,0 +1 @@
+Extracts .lzx archives from Amiga systems
diff --git a/archivers/xpk/Makefile b/archivers/xpk/Makefile
index 4f99e7d09211..0581910a918b 100644
--- a/archivers/xpk/Makefile
+++ b/archivers/xpk/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	http://www.jormas.com/~vesuri/xpk/ \
 
 MAINTAINER=     adamw@FreeBSD.org
 
-PORTCOMMENT=	The eXternal PacKer (XPK) library system
-
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
diff --git a/archivers/xpk/pkg-comment b/archivers/xpk/pkg-comment
new file mode 100644
index 000000000000..8452e0436a1c
--- /dev/null
+++ b/archivers/xpk/pkg-comment
@@ -0,0 +1 @@
+The eXternal PacKer (XPK) library system