10 files changed, 4 insertions, 18 deletions

diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index 3c391504787a..a30f3fa25bf1 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/ \
 DISTNAME=	cdrtools-2.0
 
 MAINTAINER=	dirk@FreeBSD.org
+COMMENT?=	Cdrecord, mkisofs and several other programs to record CD-R[W]
 
 .if defined(MKISOFS)
 MAN8=		apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
diff --git a/sysutils/cdrtools-devel/pkg-comment b/sysutils/cdrtools-devel/pkg-comment
deleted file mode 100644
index 1257714deea4..000000000000
--- a/sysutils/cdrtools-devel/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cdrecord, mkisofs and several other programs to record CD-R[W]
diff --git a/sysutils/cdrtools-devel/pkg-comment.mkisofs b/sysutils/cdrtools-devel/pkg-comment.mkisofs
deleted file mode 100644
index 3b56ca683c02..000000000000
--- a/sysutils/cdrtools-devel/pkg-comment.mkisofs
+++ /dev/null
@@ -1 +0,0 @@
-Create iso9660/Rock Ridge/Joliet filesystems
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 3c391504787a..a30f3fa25bf1 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.berlios.de/pub/cdrecord/ \
 DISTNAME=	cdrtools-2.0
 
 MAINTAINER=	dirk@FreeBSD.org
+COMMENT?=	Cdrecord, mkisofs and several other programs to record CD-R[W]
 
 .if defined(MKISOFS)
 MAN8=		apple_driver.8 isoinfo.8 mkhybrid.8 mkisofs.8
diff --git a/sysutils/cdrtools/pkg-comment b/sysutils/cdrtools/pkg-comment
deleted file mode 100644
index 1257714deea4..000000000000
--- a/sysutils/cdrtools/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Cdrecord, mkisofs and several other programs to record CD-R[W]
diff --git a/sysutils/cdrtools/pkg-comment.mkisofs b/sysutils/cdrtools/pkg-comment.mkisofs
deleted file mode 100644
index 3b56ca683c02..000000000000
--- a/sysutils/cdrtools/pkg-comment.mkisofs
+++ /dev/null
@@ -1 +0,0 @@
-Create iso9660/Rock Ridge/Joliet filesystems
diff --git a/sysutils/mkisofs-devel/Makefile b/sysutils/mkisofs-devel/Makefile
index e59e7ae926ff..b8c7ed591dfb 100644
--- a/sysutils/mkisofs-devel/Makefile
+++ b/sysutils/mkisofs-devel/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	0
 CATEGORIES=	sysutils
 
 MASTERDIR=	${.CURDIR}/../cdrtools
-COMMENTFILE=	${PKGDIR}/pkg-comment.mkisofs
+COMMENT=	Create iso9660/Rock Ridge/Joliet filesystems
 DESCR=		${PKGDIR}/pkg-descr.mkisofs
 PLIST=		${PKGDIR}/pkg-plist.mkisofs
 
diff --git a/sysutils/mkisofs-devel/pkg-descr b/sysutils/mkisofs-devel/pkg-descr
deleted file mode 100644
index d95bc8559469..000000000000
--- a/sysutils/mkisofs-devel/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-mkisofs is effectively a pre-mastering program to generate the iso9660
-filesystem - it takes a snapshot of a given directory tree, and generates
-a binary image which will correspond to an iso9660 filesystem when written
-to a block device.
-
-WWW: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html
diff --git a/sysutils/mkisofs/Makefile b/sysutils/mkisofs/Makefile
index e59e7ae926ff..b8c7ed591dfb 100644
--- a/sysutils/mkisofs/Makefile
+++ b/sysutils/mkisofs/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	0
 CATEGORIES=	sysutils
 
 MASTERDIR=	${.CURDIR}/../cdrtools
-COMMENTFILE=	${PKGDIR}/pkg-comment.mkisofs
+COMMENT=	Create iso9660/Rock Ridge/Joliet filesystems
 DESCR=		${PKGDIR}/pkg-descr.mkisofs
 PLIST=		${PKGDIR}/pkg-plist.mkisofs
 
diff --git a/sysutils/mkisofs/pkg-descr b/sysutils/mkisofs/pkg-descr
deleted file mode 100644
index d95bc8559469..000000000000
--- a/sysutils/mkisofs/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-mkisofs is effectively a pre-mastering program to generate the iso9660
-filesystem - it takes a snapshot of a given directory tree, and generates
-a binary image which will correspond to an iso9660 filesystem when written
-to a block device.
-
-WWW: http://www.fokus.gmd.de/research/cc/glone/employees/joerg.schilling/private/cdrecord.html