* Use the Zip distfile as it is smaller.

* Move the warning about stale distfiles near the top where it will be seen.
* sed can read from a file, it is not always a filter...

4 files changed, 18 insertions, 22 deletions

diff --git a/www/junkbuster-zlib/Makefile b/www/junkbuster-zlib/Makefile
index d7db03d90691..1eabd1a412ac 100644
--- a/www/junkbuster-zlib/Makefile
+++ b/www/junkbuster-zlib/Makefile
@@ -5,24 +5,22 @@
 #
 # $FreeBSD$
 
+# You need to delete the old distfile if you are upgrading, as the tar ball
+# for ijb has not been changing names between minor revisions(ie 2.0->2.0.1).
+# I have contacted the author about this though so we may see something new
+# in the next revision.
+
 DISTNAME=	ijb20
 PKGNAME=	ijb-2.0.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.junkbusters.com/ht/en/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ian@broken.net
 
+USE_ZIP=	yes
 ALL_TARGET=	# yes, an empty target.
-
-# You need to delete the old distfile if you are upgrading, as the tar ball
-# for ijb has not been changing names between minor revisions(ie 2.0->2.0.1).
-# I have contacted the author about this though so we may see something new
-# in the next revision.
-
-MAN1=		junkbuster.1
-
 JDIR=		${PREFIX}/etc/junkbuster
+MAN1=		junkbuster.1
 
 post-patch:
 	@${PERL} -pi -e 's:\r::' ${WRKSRC}/*
@@ -39,7 +37,7 @@ do-install:
 	$(INSTALL_MAN) ${WRKSRC}/junkbuster.1 $(PREFIX)/man/man1/
 # Create the startup script.  JB will run as user nobody.
 	@${SED} -e 's%JDIR%${JDIR}%g' -e 's%PREFIX%${PREFIX}%g' \
-	    < ${FILESDIR}/junkbuster.sh.in > ${PREFIX}/etc/rc.d/junkbuster.sh
+	    ${FILESDIR}/junkbuster.sh.in > ${PREFIX}/etc/rc.d/junkbuster.sh
 	${CHMOD} 755 ${PREFIX}/etc/rc.d/junkbuster.sh
 
 post-install:
diff --git a/www/junkbuster-zlib/distinfo b/www/junkbuster-zlib/distinfo
index 5ee8fae9d880..e5e9b38da8de 100644
--- a/www/junkbuster-zlib/distinfo
+++ b/www/junkbuster-zlib/distinfo
@@ -1 +1 @@
-MD5 (ijb20.tar.Z) = 1404ac1659334aecd4aa86db6a8b8edf
+MD5 (ijb20.zip) = 4a384a649bf7bda12e5c3f8e0b809d08
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index d7db03d90691..1eabd1a412ac 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -5,24 +5,22 @@
 #
 # $FreeBSD$
 
+# You need to delete the old distfile if you are upgrading, as the tar ball
+# for ijb has not been changing names between minor revisions(ie 2.0->2.0.1).
+# I have contacted the author about this though so we may see something new
+# in the next revision.
+
 DISTNAME=	ijb20
 PKGNAME=	ijb-2.0.2
 CATEGORIES=	www
 MASTER_SITES=	http://www.junkbusters.com/ht/en/
-EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ian@broken.net
 
+USE_ZIP=	yes
 ALL_TARGET=	# yes, an empty target.
-
-# You need to delete the old distfile if you are upgrading, as the tar ball
-# for ijb has not been changing names between minor revisions(ie 2.0->2.0.1).
-# I have contacted the author about this though so we may see something new
-# in the next revision.
-
-MAN1=		junkbuster.1
-
 JDIR=		${PREFIX}/etc/junkbuster
+MAN1=		junkbuster.1
 
 post-patch:
 	@${PERL} -pi -e 's:\r::' ${WRKSRC}/*
@@ -39,7 +37,7 @@ do-install:
 	$(INSTALL_MAN) ${WRKSRC}/junkbuster.1 $(PREFIX)/man/man1/
 # Create the startup script.  JB will run as user nobody.
 	@${SED} -e 's%JDIR%${JDIR}%g' -e 's%PREFIX%${PREFIX}%g' \
-	    < ${FILESDIR}/junkbuster.sh.in > ${PREFIX}/etc/rc.d/junkbuster.sh
+	    ${FILESDIR}/junkbuster.sh.in > ${PREFIX}/etc/rc.d/junkbuster.sh
 	${CHMOD} 755 ${PREFIX}/etc/rc.d/junkbuster.sh
 
 post-install:
diff --git a/www/junkbuster/distinfo b/www/junkbuster/distinfo
index 5ee8fae9d880..e5e9b38da8de 100644
--- a/www/junkbuster/distinfo
+++ b/www/junkbuster/distinfo
@@ -1 +1 @@
-MD5 (ijb20.tar.Z) = 1404ac1659334aecd4aa86db6a8b8edf
+MD5 (ijb20.zip) = 4a384a649bf7bda12e5c3f8e0b809d08