5 files changed, 44 insertions, 43 deletions

diff --git a/astro/dgpsip/Makefile b/astro/dgpsip/Makefile
index dbf79e7ce293..97cdf9df499a 100644
--- a/astro/dgpsip/Makefile
+++ b/astro/dgpsip/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.32
 CATEGORIES=	astro
 MASTER_SITES=	http://www.wsrcc.com/wolfgang/ftp/
 
-MAINTAINER=	dbaker@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Differential GPS over IP communication device
 
 GNU_CONFIGURE=	yes
diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile
index 50f43c24d848..c8b92a2fdd33 100644
--- a/misc/dnetc/Makefile
+++ b/misc/dnetc/Makefile
@@ -13,24 +13,15 @@ CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.distributed.net/pub/dcti/%SUBDIR%/ \
 		http://http.distributed.net/pub/dcti/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION:S/^/v/:R}
-.include <bsd.port.pre.mk>
-
 DISTFILES=	dnetc${PORTVERSION:E}-freebsd-x86-elf.tar.gz
 
-ONLY_FOR_ARCHS=	i386
-
-.if ${OSVERSION} < 300000
-IGNORE=		"This port requires FreeBSD 3.X or greater."
-.endif
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Distributed.net distributed computing project client
 
-.if exists(${PREFIX}/distributed.net/rc5des)
-BROKEN=		"rc5des/dnetc conflict: Please deinstall all rc5des ports/packages first."
-.endif
+WRKSRC=		${WRKDIR}/dnetc484-freebsd-x86-elf
 
-MAINTAINER=	dbaker@FreeBSD.org
-COMMENT=	Distributed.net distributed computing project client (modules: rc5-72/ogr)
+ONLY_FOR_ARCHS=	i386
 
-WRKSRC=		${WRKDIR}/dnetc484-freebsd-x86-elf
 NO_BUILD=	yes
 
 BINDIR=		${PREFIX}/distributed.net
@@ -44,6 +35,16 @@ BINMODE=	700
 
 MAN1=		dnetc.1
 
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 300000
+IGNORE=		"This port requires FreeBSD 3.X or greater."
+.endif
+
+.if exists(${PREFIX}/distributed.net/rc5des)
+BROKEN=		"rc5des/dnetc conflict: Please deinstall all rc5des ports/packages first."
+.endif
+
 do-configure:
 	@if [ ! -f ${PREFIX}/dnetc.ini ]; then \
 		${INSTALL} -c -m 644 ${FILESDIR}/dnetc.ini ${WRKSRC}; \
@@ -75,20 +76,20 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/${MAN1} ${PREFIX}/man/man1
 	${INSTALL} -c -m 644 -o ${CLIENTUSER} -g ${CLIENTGROUP} ${WRKSRC}/dnetc.ini ${BINDIR}/dnetc.ini.default
 .if !exists(${BINDIR}/dnetc.ini)
-	@echo ""
-	@echo ""
-	@echo ""
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "! REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER !"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "           Don't forget to run '${BINDIR}/dnetc -config'                  "
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo ""
-	@echo ""
-	@echo ""
+	@${ECHO} ""
+	@${ECHO} ""
+	@${ECHO} ""
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "! REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER REMEMBER !"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "           Don't forget to run '${BINDIR}/dnetc -config'                  "
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} ""
+	@${ECHO} ""
+	@${ECHO} ""
 	${INSTALL} -c -m 644 -o ${CLIENTUSER} -g ${CLIENTGROUP} ${WRKSRC}/dnetc.ini ${BINDIR}
 .endif
 
diff --git a/misc/proxyper/Makefile b/misc/proxyper/Makefile
index 9551d9c1ea17..f91bc7a3f8eb 100644
--- a/misc/proxyper/Makefile
+++ b/misc/proxyper/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.distributed.net/pub/dcti/proxyper/ \
 		http://http.distributed.net/pub/dcti/proxyper/
 DISTNAME=	proxyper${PORTVERSION}-freebsd-x86
 
-MAINTAINER=	dbaker@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The official distributed.net v2 personal proxy
 
 USE_REINPLACE=	yes
diff --git a/net/datapipe/Makefile b/net/datapipe/Makefile
index c9186048fdc5..55b52afe5b33 100644
--- a/net/datapipe/Makefile
+++ b/net/datapipe/Makefile
@@ -11,8 +11,8 @@ CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.distributed.net/pub/dcti/unsupported/ \
 		http://http.distributed.net/pub/dcti/unsupported/
 
-MAINTAINER=	dbaker@FreeBSD.org
-COMMENT=	A simple program to bind a local port and connect it to a remote socket
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Bind a local port and connect it to a remote socket
 
 PLIST_FILES=	bin/datapipe
 
diff --git a/sysutils/3dm/Makefile b/sysutils/3dm/Makefile
index 8f24b9f60ec0..441fe431dc32 100644
--- a/sysutils/3dm/Makefile
+++ b/sysutils/3dm/Makefile
@@ -14,13 +14,13 @@ MASTER_SITES=	ftp://ftp.procplace.com/pub/contrib/3ware/3dm/ \
 		http://people.freebsd.org/~msmith/RAID/3ware/
 DISTNAME=	3dm-bsd-${PORTVERSION}
 
-MAINTAINER=	dbaker@FreeBSD.org
-COMMENT=	3ware ATA RAID monitoring daemon and web server 
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	3ware ATA RAID monitoring daemon and web server
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 450000
-BROKEN=		"3ware 3ware ATA RAID (twe) is not supported in versions earlier than 4.5-RELEASE"
+IGNORE=		"3ware 3ware ATA RAID (twe) is not supported in versions earlier than 4.5-RELEASE"
 .endif
 
 ONLY_FOR_ARCHS=	i386
@@ -53,15 +53,15 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/3dmd ${PREFIX}/sbin
 
 .if !exists(${PREFIX}/etc/3dmd.conf)
-	@echo ""
-	@echo ""
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "           Don't forget to edit '${PREFIX}/etc/3dmd.conf'		"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo "             Visit http://`hostname`:1080/		"
-	@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	@echo ""
-	@echo ""
+	@${ECHO} ""
+	@${ECHO} ""
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "           Don't forget to edit '${PREFIX}/etc/3dmd.conf'		"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} "             Visit http://`hostname`:1080/		"
+	@${ECHO} "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+	@${ECHO} ""
+	@${ECHO} ""
 
 	${INSTALL_DATA} ${FILESDIR}/3dmd.conf ${PREFIX}/etc/
 #