Update to smokeping-2.0.9

Package changes include:
- pkglintification
- move to options.mk

smokeping changes include:
* remove the FPing 'timeout' variable, since it never really did anything
* Curl.pm: new variables 'follow_redirects' and 'include_redirects'
* make buggy_perl_version test work on perl 5.8.7 too ...
* AnotherDNS.pm: added option 'require_answers' for testing

For a full list see:
http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/CHANGES

ok'ed bouyer@

1 files changed, 11 insertions, 25 deletions

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index e3fe6f67a4c..8d90bf9227b 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2006/06/30 10:07:50 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2006/08/09 21:48:53 adrianp Exp $
 
-DISTNAME=	smokeping-2.0.4
-PKGREVISION=	2
+DISTNAME=	smokeping-2.0.9
 CATEGORIES=	net
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
@@ -17,8 +16,6 @@ DEPENDS+=	p5-libwww>=5.64:../../www/p5-libwww
 USE_TOOLS+=	perl:run
 NO_BUILD=	YES
 
-BUILD_DEFS+=	USE_INET6
-
 PKG_SYSCONFSUBDIR?=     smokeping
 SMOKEPING_HOME=		${VARBASE}/db/smokeping
 MESSAGE_SUBST+=         PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
@@ -31,37 +28,26 @@ CONF_FILES+= 	${EGDIR}/tmail.dist ${PKG_SYSCONFDIR}/tmail
 RCD_SCRIPTS=	smokeping
 REPLACE_PERL=	bin/smokeping.dist bin/tSmoke.dist
 
-BUILD_DEFS+=	USE_SPEEDY
-
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(USE_INET6) && ${USE_INET6} == "YES"
-DEPENDS+=	p5-Socket6-[0-9]*:../../net/p5-Socket6
-.endif
-
-.if defined(USE_SPEEDY) && ${USE_SPEEDY} == "YES"
-DEPENDS+=	SpeedyCGI-[0-9]*:../../www/SpeedyCGI
-INTERP=		speedy
-.else
-INTERP=		perl
-.endif
-
 SUBST_CLASSES+=		files
 SUBST_STAGE.files=	post-patch
 SUBST_FILES.files=	bin/smokeping.dist htdocs/smokeping.cgi.dist \
 			etc/config.dist etc/smokemail.dist bin/tSmoke.dist
-SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g" \
-			-e "s|@VARBASE@|${VARBASE}|g" \
-			-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
-			-e "s|@INTERP@|${INTERP}|g" \
-			-e "s|perl-5.8.4|perl|g" \
-			-e "s|/usr/bin/perl|${PERL5}|g"
+SUBST_SED.files=	-e "s|@PREFIX@|${PREFIX}|g"
+SUBST_SED.files+=	-e "s|@VARBASE@|${VARBASE}|g"
+SUBST_SED.files+=	-e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g"
+SUBST_SED.files+=	-e "s|@INTERP@|${INTERP}|g"
+SUBST_SED.files+=	-e "s|perl-5.8.4|perl|g"
+SUBST_SED.files+=	-e "s|/usr/bin/perl|${PERL5}|g"
 SUBST_MESSAGE.files=	Fixing configuration files.
 
-OWN_DIRS+=		${SMOKEPING_HOME} 
+OWN_DIRS+=		${SMOKEPING_HOME}
 
 INSTALLATION_DIRS=	bin libexec/cgi-bin
 
+.include "options.mk"
+
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/smokeping/Config