De-pkg-comment.

81 files changed, 59 insertions, 46 deletions

diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 7bcb5c47290f..d8811a01cd77 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=	audio linux
 PORTVERSION=	0.2.22
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of esound
 
 RPM_SET=	esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/audio/linux-esound/pkg-comment b/audio/linux-esound/pkg-comment
deleted file mode 100644
index 8208fbba136b..000000000000
--- a/audio/linux-esound/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of esound
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index 7bcb5c47290f..d8811a01cd77 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=	audio linux
 PORTVERSION=	0.2.22
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of esound
 
 RPM_SET=	esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/audio/linux-f10-esound/pkg-comment b/audio/linux-f10-esound/pkg-comment
deleted file mode 100644
index 8208fbba136b..000000000000
--- a/audio/linux-f10-esound/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of esound
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index e62116ff5f5b..b2a0b590a288 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.1.11
 CATEGORIES=	audio linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of audiofile
 
 RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/audio/linux-f10-libaudiofile/pkg-comment b/audio/linux-f10-libaudiofile/pkg-comment
deleted file mode 100644
index e1208b391854..000000000000
--- a/audio/linux-f10-libaudiofile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of audiofile
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 7bcb5c47290f..d8811a01cd77 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -10,6 +10,7 @@ CATEGORIES=	audio linux
 PORTVERSION=	0.2.22
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of esound
 
 RPM_SET=	esound-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/audio/linux-f8-esound/pkg-comment b/audio/linux-f8-esound/pkg-comment
deleted file mode 100644
index 8208fbba136b..000000000000
--- a/audio/linux-f8-esound/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of esound
diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile
index e62116ff5f5b..b2a0b590a288 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.1.11
 CATEGORIES=	audio linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of audiofile
 
 RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/audio/linux-f8-libaudiofile/pkg-comment b/audio/linux-f8-libaudiofile/pkg-comment
deleted file mode 100644
index e1208b391854..000000000000
--- a/audio/linux-f8-libaudiofile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of audiofile
diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile
index e62116ff5f5b..b2a0b590a288 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.1.11
 CATEGORIES=	audio linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of audiofile
 
 RPM_SET=	audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/audio/linux-libaudiofile/pkg-comment b/audio/linux-libaudiofile/pkg-comment
deleted file mode 100644
index e1208b391854..000000000000
--- a/audio/linux-libaudiofile/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of audiofile
diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile
index 62e4eff07c76..5d8be3f51adf 100644
--- a/devel/linux-f10-libglade/Makefile
+++ b/devel/linux-f10-libglade/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.14
 CATEGORIES=	devel linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
 
diff --git a/devel/linux-f10-libglade/pkg-comment b/devel/linux-f10-libglade/pkg-comment
deleted file mode 100644
index 460968ccfe1c..000000000000
--- a/devel/linux-f10-libglade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libglade
diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile
index 62e4eff07c76..5d8be3f51adf 100644
--- a/devel/linux-f10-libglade2/Makefile
+++ b/devel/linux-f10-libglade2/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.14
 CATEGORIES=	devel linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
 
diff --git a/devel/linux-f10-libglade2/pkg-comment b/devel/linux-f10-libglade2/pkg-comment
deleted file mode 100644
index 460968ccfe1c..000000000000
--- a/devel/linux-f10-libglade2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libglade
diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile
index 62e4eff07c76..5d8be3f51adf 100644
--- a/devel/linux-f8-libglade/Makefile
+++ b/devel/linux-f8-libglade/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.14
 CATEGORIES=	devel linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
 
diff --git a/devel/linux-f8-libglade/pkg-comment b/devel/linux-f8-libglade/pkg-comment
deleted file mode 100644
index 460968ccfe1c..000000000000
--- a/devel/linux-f8-libglade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libglade
diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile
index 62e4eff07c76..5d8be3f51adf 100644
--- a/devel/linux-f8-libglade2/Makefile
+++ b/devel/linux-f8-libglade2/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.14
 CATEGORIES=	devel linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
 
diff --git a/devel/linux-f8-libglade2/pkg-comment b/devel/linux-f8-libglade2/pkg-comment
deleted file mode 100644
index 460968ccfe1c..000000000000
--- a/devel/linux-f8-libglade2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libglade
diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile
index 62e4eff07c76..5d8be3f51adf 100644
--- a/devel/linux-libglade/Makefile
+++ b/devel/linux-libglade/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.14
 CATEGORIES=	devel linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
 
diff --git a/devel/linux-libglade/pkg-comment b/devel/linux-libglade/pkg-comment
deleted file mode 100644
index 460968ccfe1c..000000000000
--- a/devel/linux-libglade/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libglade
diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile
index 62e4eff07c76..5d8be3f51adf 100644
--- a/devel/linux-libglade2/Makefile
+++ b/devel/linux-libglade2/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	0.14
 CATEGORIES=	devel linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libglade
 
 RPM_SET=	libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
 
diff --git a/devel/linux-libglade2/pkg-comment b/devel/linux-libglade2/pkg-comment
deleted file mode 100644
index 460968ccfe1c..000000000000
--- a/devel/linux-libglade2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libglade
diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile
index ed665fb95db6..90918885e3bc 100644
--- a/graphics/linux-f10-imlib/Makefile
+++ b/graphics/linux-f10-imlib/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of imlib
 
 RPM_SET=	imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
 
diff --git a/graphics/linux-f10-imlib/pkg-comment b/graphics/linux-f10-imlib/pkg-comment
deleted file mode 100644
index c357b59f93c7..000000000000
--- a/graphics/linux-f10-imlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of imlib
diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile
index 71ab949529b9..221ba3770758 100644
--- a/graphics/linux-f10-jpeg/Makefile
+++ b/graphics/linux-f10-jpeg/Makefile
@@ -9,6 +9,9 @@ PORTNAME=	jpeg
 PORTVERSION=	6b.15
 CATEGORIES=	graphics linux
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the JPEG lib
+
 RPM_SET=	libjpeg-6b-15.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-jpeg/pkg-comment b/graphics/linux-f10-jpeg/pkg-comment
deleted file mode 100644
index 66f3bad947cd..000000000000
--- a/graphics/linux-f10-jpeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the JPEG lib
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index 9d2f32e5c2a3..9945b8073b0c 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	png
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics linux
-
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the PNG lib
+
 RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-png/pkg-comment b/graphics/linux-f10-png/pkg-comment
deleted file mode 100644
index c73dbdbcee6a..000000000000
--- a/graphics/linux-f10-png/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the PNG lib
diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile
index 9d2f32e5c2a3..9945b8073b0c 100644
--- a/graphics/linux-f10-png10/Makefile
+++ b/graphics/linux-f10-png10/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	png
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics linux
-
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the PNG lib
+
 RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-png10/pkg-comment b/graphics/linux-f10-png10/pkg-comment
deleted file mode 100644
index c73dbdbcee6a..000000000000
--- a/graphics/linux-f10-png10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the PNG lib
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index a05c45a87234..e7e693367abd 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	3.5.5
 CATEGORIES=	graphics linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of tiff lib
 
 RPM_SET=	libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
 
diff --git a/graphics/linux-f10-tiff/pkg-comment b/graphics/linux-f10-tiff/pkg-comment
deleted file mode 100644
index 0af46a19535c..000000000000
--- a/graphics/linux-f10-tiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of tiff lib
diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile
index 6052042a39d3..8360a2dafba6 100644
--- a/graphics/linux-f10-ungif/Makefile
+++ b/graphics/linux-f10-ungif/Makefile
@@ -9,6 +9,7 @@ PORTREVISION=	0
 CATEGORIES=	graphics linux
 
 MAINTAINTER=	maho@FreeBSD.org
+COMMENT=	RPM of the ungif lib
 
 .if (${MACHINE_ARCH} == "i386")
 RPM_SET=	libungif-4.1.0-7.${MACHINE_ARCH}.rpm
diff --git a/graphics/linux-f10-ungif/pkg-comment b/graphics/linux-f10-ungif/pkg-comment
deleted file mode 100644
index f11b276beaa5..000000000000
--- a/graphics/linux-f10-ungif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the ungif lib
diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile
index ed665fb95db6..90918885e3bc 100644
--- a/graphics/linux-f8-imlib/Makefile
+++ b/graphics/linux-f8-imlib/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of imlib
 
 RPM_SET=	imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
 
diff --git a/graphics/linux-f8-imlib/pkg-comment b/graphics/linux-f8-imlib/pkg-comment
deleted file mode 100644
index c357b59f93c7..000000000000
--- a/graphics/linux-f8-imlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of imlib
diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile
index 71ab949529b9..221ba3770758 100644
--- a/graphics/linux-f8-jpeg/Makefile
+++ b/graphics/linux-f8-jpeg/Makefile
@@ -9,6 +9,9 @@ PORTNAME=	jpeg
 PORTVERSION=	6b.15
 CATEGORIES=	graphics linux
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the JPEG lib
+
 RPM_SET=	libjpeg-6b-15.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-jpeg/pkg-comment b/graphics/linux-f8-jpeg/pkg-comment
deleted file mode 100644
index 66f3bad947cd..000000000000
--- a/graphics/linux-f8-jpeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the JPEG lib
diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index 9d2f32e5c2a3..9945b8073b0c 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	png
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics linux
-
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the PNG lib
+
 RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png/pkg-comment b/graphics/linux-f8-png/pkg-comment
deleted file mode 100644
index c73dbdbcee6a..000000000000
--- a/graphics/linux-f8-png/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the PNG lib
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index 9d2f32e5c2a3..9945b8073b0c 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	png
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics linux
-
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the PNG lib
+
 RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png10/pkg-comment b/graphics/linux-f8-png10/pkg-comment
deleted file mode 100644
index c73dbdbcee6a..000000000000
--- a/graphics/linux-f8-png10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the PNG lib
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index a05c45a87234..e7e693367abd 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	3.5.5
 CATEGORIES=	graphics linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of tiff lib
 
 RPM_SET=	libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
 
diff --git a/graphics/linux-f8-tiff/pkg-comment b/graphics/linux-f8-tiff/pkg-comment
deleted file mode 100644
index 0af46a19535c..000000000000
--- a/graphics/linux-f8-tiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of tiff lib
diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile
index 6052042a39d3..8360a2dafba6 100644
--- a/graphics/linux-f8-ungif/Makefile
+++ b/graphics/linux-f8-ungif/Makefile
@@ -9,6 +9,7 @@ PORTREVISION=	0
 CATEGORIES=	graphics linux
 
 MAINTAINTER=	maho@FreeBSD.org
+COMMENT=	RPM of the ungif lib
 
 .if (${MACHINE_ARCH} == "i386")
 RPM_SET=	libungif-4.1.0-7.${MACHINE_ARCH}.rpm
diff --git a/graphics/linux-f8-ungif/pkg-comment b/graphics/linux-f8-ungif/pkg-comment
deleted file mode 100644
index f11b276beaa5..000000000000
--- a/graphics/linux-f8-ungif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the ungif lib
diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile
index ed665fb95db6..90918885e3bc 100644
--- a/graphics/linux-imlib/Makefile
+++ b/graphics/linux-imlib/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.9.8.1
 CATEGORIES=	graphics linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of imlib
 
 RPM_SET=	imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
 
diff --git a/graphics/linux-imlib/pkg-comment b/graphics/linux-imlib/pkg-comment
deleted file mode 100644
index c357b59f93c7..000000000000
--- a/graphics/linux-imlib/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of imlib
diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile
index 71ab949529b9..221ba3770758 100644
--- a/graphics/linux-jpeg/Makefile
+++ b/graphics/linux-jpeg/Makefile
@@ -9,6 +9,9 @@ PORTNAME=	jpeg
 PORTVERSION=	6b.15
 CATEGORIES=	graphics linux
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the JPEG lib
+
 RPM_SET=	libjpeg-6b-15.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-jpeg/pkg-comment b/graphics/linux-jpeg/pkg-comment
deleted file mode 100644
index 66f3bad947cd..000000000000
--- a/graphics/linux-jpeg/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the JPEG lib
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index 9d2f32e5c2a3..9945b8073b0c 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	png
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics linux
-
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the PNG lib
+
 RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-png/pkg-comment b/graphics/linux-png/pkg-comment
deleted file mode 100644
index c73dbdbcee6a..000000000000
--- a/graphics/linux-png/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the PNG lib
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index 9d2f32e5c2a3..9945b8073b0c 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -8,9 +8,11 @@
 PORTNAME=	png
 PORTVERSION=	1.0.14
 CATEGORIES=	graphics linux
-
 MASTER_SITES=	${RPM_MIRRORS:S/__DIR__/${UPDDIR}/g}
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	RPM of the PNG lib
+
 RPM_SET=	libpng-${PORTVERSION}-0.7x.3.${MACHINE_ARCH}.rpm
 
 .include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-png10/pkg-comment b/graphics/linux-png10/pkg-comment
deleted file mode 100644
index c73dbdbcee6a..000000000000
--- a/graphics/linux-png10/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the PNG lib
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index a05c45a87234..e7e693367abd 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	3.5.5
 CATEGORIES=	graphics linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of tiff lib
 
 RPM_SET=	libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
 
diff --git a/graphics/linux-tiff/pkg-comment b/graphics/linux-tiff/pkg-comment
deleted file mode 100644
index 0af46a19535c..000000000000
--- a/graphics/linux-tiff/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of tiff lib
diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile
index 6052042a39d3..8360a2dafba6 100644
--- a/graphics/linux-ungif/Makefile
+++ b/graphics/linux-ungif/Makefile
@@ -9,6 +9,7 @@ PORTREVISION=	0
 CATEGORIES=	graphics linux
 
 MAINTAINTER=	maho@FreeBSD.org
+COMMENT=	RPM of the ungif lib
 
 .if (${MACHINE_ARCH} == "i386")
 RPM_SET=	libungif-4.1.0-7.${MACHINE_ARCH}.rpm
diff --git a/graphics/linux-ungif/pkg-comment b/graphics/linux-ungif/pkg-comment
deleted file mode 100644
index f11b276beaa5..000000000000
--- a/graphics/linux-ungif/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the ungif lib
diff --git a/sysutils/linux-e2fsprogs/Makefile b/sysutils/linux-e2fsprogs/Makefile
index 833fe0786d16..460f93954c55 100644
--- a/sysutils/linux-e2fsprogs/Makefile
+++ b/sysutils/linux-e2fsprogs/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	e2fsprogs
 CATEGORIES=	sysutils linux
 
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RPM of the a set of utilities and library to manipulate an ext2 filesystem
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile
index 28208690e8d8..c36ff7e2c265 100644
--- a/textproc/linux-f10-libxml/Makefile
+++ b/textproc/linux-f10-libxml/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libxml
 
 RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/textproc/linux-f10-libxml/pkg-comment b/textproc/linux-f10-libxml/pkg-comment
deleted file mode 100644
index e5d26fe506c8..000000000000
--- a/textproc/linux-f10-libxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libxml
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
index 28208690e8d8..c36ff7e2c265 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libxml
 
 RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/textproc/linux-f10-libxml2/pkg-comment b/textproc/linux-f10-libxml2/pkg-comment
deleted file mode 100644
index e5d26fe506c8..000000000000
--- a/textproc/linux-f10-libxml2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libxml
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index 28208690e8d8..c36ff7e2c265 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libxml
 
 RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/textproc/linux-f8-libxml/pkg-comment b/textproc/linux-f8-libxml/pkg-comment
deleted file mode 100644
index e5d26fe506c8..000000000000
--- a/textproc/linux-f8-libxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libxml
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index 28208690e8d8..c36ff7e2c265 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libxml
 
 RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/textproc/linux-f8-libxml2/pkg-comment b/textproc/linux-f8-libxml2/pkg-comment
deleted file mode 100644
index e5d26fe506c8..000000000000
--- a/textproc/linux-f8-libxml2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libxml
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index 28208690e8d8..c36ff7e2c265 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libxml
 
 RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/textproc/linux-libxml/pkg-comment b/textproc/linux-libxml/pkg-comment
deleted file mode 100644
index e5d26fe506c8..000000000000
--- a/textproc/linux-libxml/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libxml
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index 28208690e8d8..c36ff7e2c265 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.8.10
 CATEGORIES=	textproc linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of libxml
 
 RPM_SET=	libxml-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
 
diff --git a/textproc/linux-libxml2/pkg-comment b/textproc/linux-libxml2/pkg-comment
deleted file mode 100644
index e5d26fe506c8..000000000000
--- a/textproc/linux-libxml2/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of libxml
diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index 9578bc7c15c5..d91b487f8910 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX=	linux-
 DISTFILES=	${RPM_SET}
 
 MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	RPM of the Gtk lib
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 USE_LINUX_PREFIX=	yes
diff --git a/x11-toolkits/linux-f10-gtk/pkg-comment b/x11-toolkits/linux-f10-gtk/pkg-comment
deleted file mode 100644
index 6ef33b12c539..000000000000
--- a/x11-toolkits/linux-f10-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the Gtk lib
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index 9578bc7c15c5..d91b487f8910 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX=	linux-
 DISTFILES=	${RPM_SET}
 
 MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	RPM of the Gtk lib
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 USE_LINUX_PREFIX=	yes
diff --git a/x11-toolkits/linux-f8-gtk/pkg-comment b/x11-toolkits/linux-f8-gtk/pkg-comment
deleted file mode 100644
index 6ef33b12c539..000000000000
--- a/x11-toolkits/linux-f8-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the Gtk lib
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index 9578bc7c15c5..d91b487f8910 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -16,6 +16,7 @@ PKGNAMEPREFIX=	linux-
 DISTFILES=	${RPM_SET}
 
 MAINTAINER?=	ports@FreeBSD.org
+COMMENT?=	RPM of the Gtk lib
 
 BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
 USE_LINUX_PREFIX=	yes
diff --git a/x11-toolkits/linux-gtk/pkg-comment b/x11-toolkits/linux-gtk/pkg-comment
deleted file mode 100644
index 6ef33b12c539..000000000000
--- a/x11-toolkits/linux-gtk/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of the Gtk lib
diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile
index 832e78fc82f0..85611bb9f655 100644
--- a/x11/linux-gnomelibs/Makefile
+++ b/x11/linux-gnomelibs/Makefile
@@ -10,6 +10,7 @@ PORTVERSION=	1.2.8
 CATEGORIES=	x11 linux
 
 MAINTAINER=	taoka@FreeBSD.org
+COMMENT=	RPM of gnome-libs
 
 RPM_SET=	gnome-libs-${PORTVERSION}-11.${MACHINE_ARCH}.rpm
 
diff --git a/x11/linux-gnomelibs/pkg-comment b/x11/linux-gnomelibs/pkg-comment
deleted file mode 100644
index 1d897efb5469..000000000000
--- a/x11/linux-gnomelibs/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-RPM of gnome-libs