14 files changed, 22 insertions, 10 deletions

diff --git a/misc/p5-DataCash/Makefile b/misc/p5-DataCash/Makefile
index e24249b1d3f5..315190cd1797 100644
--- a/misc/p5-DataCash/Makefile
+++ b/misc/p5-DataCash/Makefile
@@ -11,11 +11,14 @@ CATEGORIES=	misc perl5
 MASTER_SITES=	http://www.datacash.com/stronghold/perl/
 PKGNAMEPREFIX=	p5-
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Online credit card transactions
+
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/FreezeThaw.pm:${PORTSDIR}/devel/p5-FreezeThaw \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Crypt/Blowfish.pm:${PORTSDIR}/security/p5-Crypt-Blowfish \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Text/CSV.pm:${PORTSDIR}/textproc/p5-Text-CSV
-		
+
 PERL_CONFIGURE=	yes
 
 MAN3=		CCCheck.3 \
@@ -24,6 +27,6 @@ MAN3=		CCCheck.3 \
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 post-extract:
-	find ${WRKSRC} -type f -exec perl -spi -e 's/\r//g' {} ';'
+	${FIND} ${WRKSRC} -type f -exec ${PERL} -spi -e 's/\r//g' {} ';'
 
 .include <bsd.port.mk>
diff --git a/misc/p5-DataCash/pkg-comment b/misc/p5-DataCash/pkg-comment
deleted file mode 100644
index 7056e4e7eec1..000000000000
--- a/misc/p5-DataCash/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Online credit card transactions
diff --git a/sysutils/dvdtape/Makefile b/sysutils/dvdtape/Makefile
index a669c880b89e..ac811922ef02 100644
--- a/sysutils/dvdtape/Makefile
+++ b/sysutils/dvdtape/Makefile
@@ -14,6 +14,9 @@ MASTER_SITES=	ftp://ftp.Awfulhak.org/pub/dvdtape/ \
 		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/disk-management
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Create DVD master filesystems on DLT media
+
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 MAN1=		dvdtape.1
diff --git a/sysutils/dvdtape/pkg-comment b/sysutils/dvdtape/pkg-comment
deleted file mode 100644
index 22e0fd68c623..000000000000
--- a/sysutils/dvdtape/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Create DVD master filesystems on DLT media
diff --git a/sysutils/ffsrecov/Makefile b/sysutils/ffsrecov/Makefile
index 60a6b57b91ae..e600fa9d8f49 100644
--- a/sysutils/ffsrecov/Makefile
+++ b/sysutils/ffsrecov/Makefile
@@ -10,6 +10,9 @@ PORTVERSION=	0.5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://resnet.uoregon.edu/~gurney_j/
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Recover files from a corrupt FFS
+
 MAN8=		ffsrecov.8
 
 .include <bsd.port.pre.mk>
diff --git a/sysutils/ffsrecov/pkg-comment b/sysutils/ffsrecov/pkg-comment
deleted file mode 100644
index 7022909d5002..000000000000
--- a/sysutils/ffsrecov/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Recover files from a corrupt FFS
diff --git a/www/lynx-ssl/Makefile b/www/lynx-ssl/Makefile
index a5d4a627ada8..efddbac6052f 100644
--- a/www/lynx-ssl/Makefile
+++ b/www/lynx-ssl/Makefile
@@ -7,8 +7,9 @@
 
 PKGNAMESUFFIX =	-ssl
 
+COMMENT=	A non-graphical, text-based World-Wide Web client with SSL support
+
 MASTERDIR=	${.CURDIR}/../lynx
-COMMENTFILE=	${.CURDIR}/pkg-comment
 DESCR=		${.CURDIR}/pkg-descr
 
 .include "${MASTERDIR}/Makefile"
diff --git a/www/lynx-ssl/pkg-comment b/www/lynx-ssl/pkg-comment
deleted file mode 100644
index 25d3368d9d21..000000000000
--- a/www/lynx-ssl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A non-graphical, text-based World-Wide Web client
diff --git a/x11-clocks/xtu/Makefile b/x11-clocks/xtu/Makefile
index f2a3d0d1382d..350e1b07a3b5 100644
--- a/x11-clocks/xtu/Makefile
+++ b/x11-clocks/xtu/Makefile
@@ -10,6 +10,9 @@ PORTVERSION=	1.1
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://core.de/~coto/projects/xtu/
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Transparent analog clock for X11
+
 USE_IMAKE=	yes
 USE_XPM=	yes
 
diff --git a/x11-clocks/xtu/pkg-comment b/x11-clocks/xtu/pkg-comment
deleted file mode 100644
index 857a2a954fc1..000000000000
--- a/x11-clocks/xtu/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Transparent analog clock for X11
diff --git a/x11-toolkits/Motif-dummy/Makefile b/x11-toolkits/Motif-dummy/Makefile
index 9a12a2ae92e5..e08fee1f11ee 100644
--- a/x11-toolkits/Motif-dummy/Makefile
+++ b/x11-toolkits/Motif-dummy/Makefile
@@ -10,6 +10,9 @@ PORTVERSION= 	2.1.10
 CATEGORIES=	x11-toolkits
 DISTFILES=	# empty
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Motif dummy package
+
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 NO_INSTALL=	yes
diff --git a/x11-toolkits/Motif-dummy/pkg-comment b/x11-toolkits/Motif-dummy/pkg-comment
deleted file mode 100644
index 6b9e8c5543be..000000000000
--- a/x11-toolkits/Motif-dummy/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Motif
diff --git a/x11/xlupe/Makefile b/x11/xlupe/Makefile
index e2bf45983ea5..ae9e48cd0747 100644
--- a/x11/xlupe/Makefile
+++ b/x11/xlupe/Makefile
@@ -10,6 +10,9 @@ PORTVERSION=	1.1
 CATEGORIES=	x11
 MASTER_SITES=	http://www.core.de/~coto/projects/xlupe/
 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Magnifying glass for X. like xmag but with continously updates
+
 USE_IMAKE=	yes
 USE_XPM=	yes
 
diff --git a/x11/xlupe/pkg-comment b/x11/xlupe/pkg-comment
deleted file mode 100644
index c3eb6a681e5b..000000000000
--- a/x11/xlupe/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Magnifying glass for X. like xmag but with continously updates