- Unbreak fetching by sorting out MASTER_SITES (point it back to SF)

- Modernize Makefile header (bring it down to just two lines)
- Convert USE_GMAKE and USE_PERL5_BUILD to USES, sort the knobs
- Clean up port description and do-install: message, utilize ${FMT}

2 files changed, 20 insertions, 28 deletions

diff --git a/net/etherboot/Makefile b/net/etherboot/Makefile
index d1b5d1da32c0..959955dd5026 100644
--- a/net/etherboot/Makefile
+++ b/net/etherboot/Makefile
@@ -1,35 +1,27 @@
-# New ports collection makefile for:   etherboot
-# Date created:        16 April 1999
-# Whom:                Doug Ambrisko <ambrisko@whistle.com>
-#
+# Created by: Doug Ambrisko <ambrisko@whistle.com>
 # $FreeBSD$
-#
 
 PORTNAME=	etherboot
 PORTVERSION=	5.2.6
-PORTREVISION=	0
 CATEGORIES=	net
-#MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-#MASTER_SITE_SUBDIR=	${PORTNAME}
-#use development sources for now instead of standard ftp site.
-MASTER_SITES=	http://etherboot.sourceforge.net/ \
-		http://etherboot.berlios.de/dist/
+MASTER_SITES=	SF http://etherboot.berlios.de/dist/
 
 MAINTAINER=	ambrisko@FreeBSD.org
 COMMENT=	Network boot of FreeBSD a.out/ELF kernels (improved netboot)
 
-NO_PACKAGE=	lots of configuration necessary
-USE_BZIP2=	1
-USE_GMAKE=	1
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
-USE_PERL5_BUILD=yes
 ONLY_FOR_ARCHS=	i386
+NO_PACKAGE=	lots of configuration necessary
 
-.include <bsd.port.pre.mk>
+USES=		gmake perl5
+USE_BZIP2=	yes
+USE_PERL5=	build
+
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 do-install:
-	@${ECHO} Refer ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for how to
-	@${ECHO} build and install the rom/floppy image.
+	@${ECHO_MSG}
+	@${ECHO_MSG} Refer to ${DESCR} and ${WRKDIR}/${PKGNAME}/doc for \
+		how to build and install the ROM/floppy image. | ${FMT} -w 76
 	@${FALSE}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net/etherboot/pkg-descr b/net/etherboot/pkg-descr
index 4192ba412955..edb38650fb2d 100644
--- a/net/etherboot/pkg-descr
+++ b/net/etherboot/pkg-descr
@@ -1,16 +1,16 @@
-This code produce bootloaders for a number of cards that can be
-loaded from raw or DOS-formatted floppy/hard disks and ROMs
-to boot ELF/aout kernels over NFS or TFTP.
-Edit work/etherboot/src/Config to see/set the desired features.
+This code produce bootloaders for a number of cards that can be loaded
+from raw or DOS-formatted floppy/hard disks and ROMs to boot ELF/a.out
+kernels over NFS or TFTP.  Edit work/etherboot/src/Config to see/set
+the desired features.
 
 The defaults used here are suited to boot FreeBSD ELF kernels over NFS.
 
-To produce an etherboot floppy (or HD partition) do
+To produce an etherboot floppy (or hard disk partition), do this:
 
-	cd work/etherboot-5.2.4/src 
-	cat bin/boot1a.bin bin/<device>.zrom > /dev/fd0
+	$ cd work/etherboot-5.2.4/src
+	$ cat bin/boot1a.bin bin/<device>.zrom > /dev/fd0
 
 Replace <device> with the specific code for your card, and /dev/fd0
 with your hard disk partition.
 
-WWW: http://etherboot.sourceforge.net/
+WWW: http://etherboot.org/wiki/