Index: head/net/smokeping/Makefile
===================================================================
--- head/net/smokeping/Makefile	(revision 109429)
+++ head/net/smokeping/Makefile	(revision 109430)
@@ -1,168 +1,166 @@
 # New ports collection makefile for:	SmokePing
 # Date created:				Tue Feb 12 22:17:40 CET 2002
 # Whom:                                 Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.28
+PORTVERSION=	1.30
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
 MAINTAINER=	lars@thegler.dk
 COMMENT=	Latency logging and graphing system
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 		${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 
 OPTIONS=	FPING "Support for fping probes" on
 OPTIONS+=	ECHOPING "Support for EchoPing probes" off
 OPTIONS+=	CURL "Support for Curl probes" off
 OPTIONS+=	LDAP "Support for LDAP probes" off
 OPTIONS+=	RADIUS "Support for Radius probes" off
 
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_FPING)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
 .endif
 
 .ifdef(WITH_ECHOPING)
 RUN_DEPENDS+=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
 .endif
 
 .ifdef(WITH_CURL)
 RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
 .ifdef(WITH_LDAP)
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .ifdef(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
 .if defined(WITH_LDAP) || defined(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
 MAN1=		CiscoRTTMonDNS.pm.1 CiscoRTTMonEchoICMP.pm.1 CiscoRTTMonTcpConnect.pm.1 \
 		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
 		EchoPingHttp.pm.1 EchoPingHttps.pm.1 EchoPingIcp.pm.1 EchoPingSmtp.pm.1 \
 		FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 RemoteFPing.pm.1 \
 		Smokeping.pm.1 base.pm.1 basefork.pm.1 basevars.pm.1 smokeping.1 \
 		smokeping.cgi.1 smokeping_config.1 smokeping_install.1 telnetIOSPing.pm.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 USER=		smokeping
 GROUP=		smokeping
 WWW_USER=	www
 WWW_UID=	80
 WWW_GROUP=	www
 WWW_GID=	80
 
 FILES_SUB=	USER=${USER} GROUP=${GROUP} \
 		WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \
 		WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \
 		PERL=${PERL} PREFIX=${PREFIX}
 
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		CiscoRTTMonDNS.pm CiscoRTTMonEchoICMP.pm CiscoRTTMonTcpConnect.pm \
 		Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \
 		EchoPingHttp.pm EchoPingHttps.pm EchoPingIcp.pm EchoPingSmtp.pm \
 		FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm RemoteFPing.pm Smokeping.pm \
 		base.pm basefork.pm basevars.pm smokeping.cgi \
 		smokeping smokeping_config smokeping_install telnetIOSPing.pm
 ETC1=		basepage.html config smokemail config-echoping
 
 # Things that shouldn't have been in the tarball in the first place
 post-extract:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
 	@${RM} ${WRKSRC}/lib/probes/patch
-	@${RM} ${WRKSRC}/lib/Smokeping.pm.orig
-	@${RM} ${WRKSRC}/lib/Smokeping.pm.rej
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 pre-configure:
 	@${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/bin/smokeping.dist \
 		${WRKSRC}/htdocs/smokeping.cgi.dist \
 		${WRKSRC}/etc/config.dist \
 		${WRKSRC}/lib/probes/*.pm
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-install > ${PKGINSTALL}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping
 	@${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi
 
 # work around  a bug in bsd.port.mk, see PR 63293 - remove when resolved
 do-build:
 	@${DO_NADA}
 
 pre-su-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 .for FILE in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${PREFIX}/man/man1
 .endfor
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .for FILE in ${DOC2}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}
 .endfor
 .endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
 .for FILE in ${ETC1}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping
 	@if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \
 		${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \
 	fi
 .endfor
 	@${MKDIR} ${PREFIX}/smokeping
 	@${CP} -Rp ${WRKSRC}/[hl]* ${PREFIX}/smokeping/
 	@${MKDIR} ${PREFIX}/var/smokeping
 	@${CHOWN} ${USER}:${GROUP} ${PREFIX}/var/smokeping
 	@${MKDIR} ${PREFIX}/smokeping/htdocs/img
 	@${CHOWN} ${WWW_USER}:${WWW_GROUP} ${PREFIX}/smokeping/htdocs/img
 	@if [ ! -f ${PREFIX}/etc/rc.d/smokeping.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/smokeping.sh startup file."; \
 		${INSTALL_SCRIPT} ${FILESDIR}/smokeping.sh ${PREFIX}/etc/rc.d/smokeping.sh; \
 	fi
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 post-deinstall:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 
 .include <bsd.port.post.mk>

Property changes on: head/net/smokeping/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.20
\ No newline at end of property
+1.21
\ No newline at end of property
Index: head/net/smokeping/distinfo
===================================================================
--- head/net/smokeping/distinfo	(revision 109429)
+++ head/net/smokeping/distinfo	(revision 109430)
@@ -1,2 +1,2 @@
-MD5 (smokeping-1.28.tar.gz) = c6f6b03e917c4b04d2079bff0aee6b35
-SIZE (smokeping-1.28.tar.gz) = 214564
+MD5 (smokeping-1.30.tar.gz) = b7e909fb4d851995edc05afffb1a1e4b
+SIZE (smokeping-1.30.tar.gz) = 191865

Property changes on: head/net/smokeping/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/net/smokeping/files/patch-bin-smokeping.dist
===================================================================
--- head/net/smokeping/files/patch-bin-smokeping.dist	(revision 109429)
+++ head/net/smokeping/files/patch-bin-smokeping.dist	(revision 109430)
@@ -1,45 +1,45 @@
 --- bin/smokeping.dist.orig	Sun Jan 18 15:48:21 2004
 +++ bin/smokeping.dist	Sun Jan 18 15:52:40 2004
 @@ -1,14 +1,11 @@
 -#!/usr/sepp/bin/perl -w
 +#!%%PERL%% -w
  # -*-perl-*-
  
 -use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/lib);
 -use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/arch);
 -use lib qw(/usr/pack/rrdtool-1.0.40-ds/lib/perl/5.8.0);
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 1.28;
+ use Smokeping 1.30;
  
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("%%PREFIX%%/etc/smokeping/config");
  
  =head1 NAME
  
 @@ -86,22 +83,8 @@
  
  =head1 SETUP
  
 -When installing SmokePing, this file has to be adjusted to fit your
 -local system. Three paths have to be entered.
 -
 -One pointing to your B<rrdtool> installation
 -
 - use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
 -
 -One pointing to the place where you have installed the SmokePing libraries
 -
 - use lib qw(/home/oetiker/public_html/smokeping/lib);
 -
 -The third path is the argument to the Smokeping::main command. It points to
 -the SmokePing configuration file.
 -
 - use Smokeping;
 - Smokeping::main("/home/oetiker/.smokeping/config");
 +When installing SmokePing, this file has been adjusted to fit your
 +local system. There should be no need for further path adjustments.
  
  =head1 COPYRIGHT
  

Property changes on: head/net/smokeping/files/patch-bin-smokeping.dist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/smokeping/files/patch-htdocs-smokeping.cgi.dist
===================================================================
--- head/net/smokeping/files/patch-htdocs-smokeping.cgi.dist	(revision 109429)
+++ head/net/smokeping/files/patch-htdocs-smokeping.cgi.dist	(revision 109430)
@@ -1,18 +1,18 @@
 --- htdocs/smokeping.cgi.dist.orig	Sun Oct  5 16:20:06 2003
 +++ htdocs/smokeping.cgi.dist	Sun Jan 11 18:03:19 2004
 @@ -1,12 +1,11 @@
 -#!/usr/sepp/bin/speedy -w
 +#!%%PREFIX%%/bin/speedy -w
  # -*-perl-*-
  
 -use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 1.28;
+ use Smokeping 1.30;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
  
  
  BEGIN {

Property changes on: head/net/smokeping/files/patch-htdocs-smokeping.cgi.dist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/smokeping/pkg-install
===================================================================
--- head/net/smokeping/pkg-install	(revision 109429)
+++ head/net/smokeping/pkg-install	(revision 109430)
@@ -1,52 +1,51 @@
 #! /bin/sh
 #
 # $FreeBSD$
 #
 
 case $2 in
 PRE-INSTALL)
 	if ! pw groupshow %%WWW_GROUP%% 2>/dev/null 1>&2; then
 		if pw groupadd %%WWW_GROUP%% -g %%WWW_GID%%; then
 			echo 'Added group "%%WWW_GROUP%%".'
 		else
 			echo 'Adding group "%%WWW_GROUP%%" failed...'
 			exit 1
 		fi
 	fi
 
 	if ! pw usershow %%WWW_USER%% 2>/dev/null 1>&2; then
 		if pw useradd %%WWW_USER%% -u %%WWW_UID%% -g %%WWW_GROUP%% -h - \
 			-s /sbin/nologin -d /nonexistent \
 			-c "World Wide Web Owner"; \
 		then
 			echo 'Added user "%%WWW_USER%%".'
 		else
 			echo 'Adding user "%%WWW_USER%%" failed...'
 			exit 1
 		fi
 	fi
 
 	if ! pw groupshow %%GROUP%% 2>/dev/null 1>&2; then
 		if pw groupadd %%GROUP%%; then
 			echo 'Added group "%%GROUP%%".'
 		else
 			echo 'Adding group "%%GROUP%%" failed...'
 			exit 1
 		fi
 	fi
 
 	if ! pw usershow %%USER%% 2>/dev/null 1>&2; then
                 if pw useradd %%USER%% -g %%GROUP%% -h - \
 			-s /nonexistent -c "SmokePing Daemon"; \
 		then
 			echo 'Added user "%%USER%%".'
 		else
 			echo 'Adding user "%%USER%%" failed...'
 			exit 1
 		fi
 	fi
 
 	exit 0
 	;;
 esac
-

Property changes on: head/net/smokeping/pkg-install
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-mgmt/smokeping/Makefile
===================================================================
--- head/net-mgmt/smokeping/Makefile	(revision 109429)
+++ head/net-mgmt/smokeping/Makefile	(revision 109430)
@@ -1,168 +1,166 @@
 # New ports collection makefile for:	SmokePing
 # Date created:				Tue Feb 12 22:17:40 CET 2002
 # Whom:                                 Lars Thegler <lars@thegler.dk>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	smokeping
-PORTVERSION=	1.28
+PORTVERSION=	1.30
 CATEGORIES=	net www
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
 
 MAINTAINER=	lars@thegler.dk
 COMMENT=	Latency logging and graphing system
 
 RUN_DEPENDS=	rrdtool:${PORTSDIR}/net/rrdtool \
 		${SITE_PERL}/CGI/SpeedyCGI.pm:${PORTSDIR}/www/p5-CGI-SpeedyCGI \
 		${SITE_PERL}/BER.pm:${PORTSDIR}/net-mgmt/p5-SNMP_Session \
 		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
 		${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
 		${SITE_PERL}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser \
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 
 OPTIONS=	FPING "Support for fping probes" on
 OPTIONS+=	ECHOPING "Support for EchoPing probes" off
 OPTIONS+=	CURL "Support for Curl probes" off
 OPTIONS+=	LDAP "Support for LDAP probes" off
 OPTIONS+=	RADIUS "Support for Radius probes" off
 
 .include <bsd.port.pre.mk>
 
 .ifdef(WITH_FPING)
 RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
 .endif
 
 .ifdef(WITH_ECHOPING)
 RUN_DEPENDS+=	${LOCALBASE}/bin/echoping:${PORTSDIR}/net/echoping
 .endif
 
 .ifdef(WITH_CURL)
 RUN_DEPENDS+=	${LOCALBASE}/bin/curl:${PORTSDIR}/ftp/curl
 .endif
 
 .ifdef(WITH_LDAP)
 RUN_DEPENDS+=	${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
 .endif
 
 .ifdef(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/Authen/Radius.pm:${PORTSDIR}/security/p5-Authen-Radius
 .endif
 
 .if defined(WITH_LDAP) || defined(WITH_RADIUS)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 .endif
 
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 USE_PERL5=	yes
 
 MAN1=		CiscoRTTMonDNS.pm.1 CiscoRTTMonEchoICMP.pm.1 CiscoRTTMonTcpConnect.pm.1 \
 		Curl.pm.1 DNS.pm.1 EchoPing.pm.1 EchoPingChargen.pm.1 EchoPingDiscard.pm.1 \
 		EchoPingHttp.pm.1 EchoPingHttps.pm.1 EchoPingIcp.pm.1 EchoPingSmtp.pm.1 \
 		FPing.pm.1 FPing6.pm.1 IOSPing.pm.1 ParseConfig.pm.1 RemoteFPing.pm.1 \
 		Smokeping.pm.1 base.pm.1 basefork.pm.1 basevars.pm.1 smokeping.1 \
 		smokeping.cgi.1 smokeping_config.1 smokeping_install.1 telnetIOSPing.pm.1
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
 
 USER=		smokeping
 GROUP=		smokeping
 WWW_USER=	www
 WWW_UID=	80
 WWW_GROUP=	www
 WWW_GID=	80
 
 FILES_SUB=	USER=${USER} GROUP=${GROUP} \
 		WWW_USER=${WWW_USER} WWW_UID=${WWW_UID} \
 		WWW_GROUP=${WWW_GROUP} WWW_GID=${WWW_GID} \
 		PERL=${PERL} PREFIX=${PREFIX}
 
 DOC1=		CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO
 DOC2=		CiscoRTTMonDNS.pm CiscoRTTMonEchoICMP.pm CiscoRTTMonTcpConnect.pm \
 		Curl.pm DNS.pm EchoPing.pm EchoPingChargen.pm EchoPingDiscard.pm \
 		EchoPingHttp.pm EchoPingHttps.pm EchoPingIcp.pm EchoPingSmtp.pm \
 		FPing.pm FPing6.pm IOSPing.pm ParseConfig.pm RemoteFPing.pm Smokeping.pm \
 		base.pm basefork.pm basevars.pm smokeping.cgi \
 		smokeping smokeping_config smokeping_install telnetIOSPing.pm
 ETC1=		basepage.html config smokemail config-echoping
 
 # Things that shouldn't have been in the tarball in the first place
 post-extract:
 	@${RM} ${WRKSRC}/lib/BER.pm
 	@${RM} ${WRKSRC}/lib/SNMP_*.pm
 	@${RM} ${WRKSRC}/lib/probes/patch
-	@${RM} ${WRKSRC}/lib/Smokeping.pm.orig
-	@${RM} ${WRKSRC}/lib/Smokeping.pm.rej
 
 post-patch:
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 pre-configure:
 	@${REINPLACE_CMD} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${WRKSRC}/bin/smokeping.dist \
 		${WRKSRC}/htdocs/smokeping.cgi.dist \
 		${WRKSRC}/etc/config.dist \
 		${WRKSRC}/lib/probes/*.pm
 	@${FIND} ${WRKSRC} -name \*.bak -delete
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-install > ${PKGINSTALL}
 	@${SED} ${FILES_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
 		${PKGDIR}/pkg-deinstall > ${PKGDEINSTALL}
 	@${MV} ${WRKSRC}/bin/smokeping.dist ${WRKSRC}/bin/smokeping
 	@${MV} ${WRKSRC}/htdocs/smokeping.cgi.dist ${WRKSRC}/htdocs/smokeping.cgi
 
 # work around  a bug in bsd.port.mk, see PR 63293 - remove when resolved
 do-build:
 	@${DO_NADA}
 
 pre-su-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/bin/smokeping ${PREFIX}/bin
 .if !defined(NOPORTDOCS)
 .for FILE in ${MAN1}
 	@${INSTALL_MAN} ${WRKSRC}/doc/${FILE} ${PREFIX}/man/man1
 .endfor
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOC1}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}
 .endfor
 .for FILE in ${DOC2}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.html ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE}.txt  ${DOCSDIR}
 .endfor
 .endif
 	@${MKDIR} ${PREFIX}/etc/smokeping
 .for FILE in ${ETC1}
 	@${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping
 	@if [ ! -f ${PREFIX}/etc/smokeping/${FILE} ]; then \
 		${INSTALL_DATA} ${WRKSRC}/etc/${FILE}.dist ${PREFIX}/etc/smokeping/${FILE} ; \
 	fi
 .endfor
 	@${MKDIR} ${PREFIX}/smokeping
 	@${CP} -Rp ${WRKSRC}/[hl]* ${PREFIX}/smokeping/
 	@${MKDIR} ${PREFIX}/var/smokeping
 	@${CHOWN} ${USER}:${GROUP} ${PREFIX}/var/smokeping
 	@${MKDIR} ${PREFIX}/smokeping/htdocs/img
 	@${CHOWN} ${WWW_USER}:${WWW_GROUP} ${PREFIX}/smokeping/htdocs/img
 	@if [ ! -f ${PREFIX}/etc/rc.d/smokeping.sh ]; then \
 		${ECHO} "Installing ${PREFIX}/etc/rc.d/smokeping.sh startup file."; \
 		${INSTALL_SCRIPT} ${FILESDIR}/smokeping.sh ${PREFIX}/etc/rc.d/smokeping.sh; \
 	fi
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .if !defined(BATCH)
 	@${CAT} ${PKGMESSAGE}
 .endif
 
 post-deinstall:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDEINSTALL} ${PKGNAME} POST-DEINSTALL
 
 .include <bsd.port.post.mk>

Property changes on: head/net-mgmt/smokeping/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.20
\ No newline at end of property
+1.21
\ No newline at end of property
Index: head/net-mgmt/smokeping/distinfo
===================================================================
--- head/net-mgmt/smokeping/distinfo	(revision 109429)
+++ head/net-mgmt/smokeping/distinfo	(revision 109430)
@@ -1,2 +1,2 @@
-MD5 (smokeping-1.28.tar.gz) = c6f6b03e917c4b04d2079bff0aee6b35
-SIZE (smokeping-1.28.tar.gz) = 214564
+MD5 (smokeping-1.30.tar.gz) = b7e909fb4d851995edc05afffb1a1e4b
+SIZE (smokeping-1.30.tar.gz) = 191865

Property changes on: head/net-mgmt/smokeping/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/net-mgmt/smokeping/files/patch-bin-smokeping.dist
===================================================================
--- head/net-mgmt/smokeping/files/patch-bin-smokeping.dist	(revision 109429)
+++ head/net-mgmt/smokeping/files/patch-bin-smokeping.dist	(revision 109430)
@@ -1,45 +1,45 @@
 --- bin/smokeping.dist.orig	Sun Jan 18 15:48:21 2004
 +++ bin/smokeping.dist	Sun Jan 18 15:52:40 2004
 @@ -1,14 +1,11 @@
 -#!/usr/sepp/bin/perl -w
 +#!%%PERL%% -w
  # -*-perl-*-
  
 -use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/lib);
 -use lib qw(/home/oetiker/data/projects/AABN-rrdtool/perl-shared/blib/arch);
 -use lib qw(/usr/pack/rrdtool-1.0.40-ds/lib/perl/5.8.0);
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 1.28;
+ use Smokeping 1.30;
  
 -Smokeping::main("etc/config.dist");
 +Smokeping::main("%%PREFIX%%/etc/smokeping/config");
  
  =head1 NAME
  
 @@ -86,22 +83,8 @@
  
  =head1 SETUP
  
 -When installing SmokePing, this file has to be adjusted to fit your
 -local system. Three paths have to be entered.
 -
 -One pointing to your B<rrdtool> installation
 -
 - use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
 -
 -One pointing to the place where you have installed the SmokePing libraries
 -
 - use lib qw(/home/oetiker/public_html/smokeping/lib);
 -
 -The third path is the argument to the Smokeping::main command. It points to
 -the SmokePing configuration file.
 -
 - use Smokeping;
 - Smokeping::main("/home/oetiker/.smokeping/config");
 +When installing SmokePing, this file has been adjusted to fit your
 +local system. There should be no need for further path adjustments.
  
  =head1 COPYRIGHT
  

Property changes on: head/net-mgmt/smokeping/files/patch-bin-smokeping.dist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
===================================================================
--- head/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist	(revision 109429)
+++ head/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist	(revision 109430)
@@ -1,18 +1,18 @@
 --- htdocs/smokeping.cgi.dist.orig	Sun Oct  5 16:20:06 2003
 +++ htdocs/smokeping.cgi.dist	Sun Jan 11 18:03:19 2004
 @@ -1,12 +1,11 @@
 -#!/usr/sepp/bin/speedy -w
 +#!%%PREFIX%%/bin/speedy -w
  # -*-perl-*-
  
 -use lib qw(/usr/pack/rrdtool-1.0.33-to/lib/perl);
 -use lib qw(/home/oetiker/data/projects/AADJ-smokeping/dist/lib);
 +use lib qw(%%PREFIX%%/smokeping/lib);
  
- use Smokeping 1.28;
+ use Smokeping 1.30;
  
 -Smokeping::cgi("/home/oetiker/data/projects/AADJ-smokeping/dist/etc/config");
 +Smokeping::cgi("%%PREFIX%%/etc/smokeping/config");
  
  
  BEGIN {

Property changes on: head/net-mgmt/smokeping/files/patch-htdocs-smokeping.cgi.dist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-mgmt/smokeping/pkg-install
===================================================================
--- head/net-mgmt/smokeping/pkg-install	(revision 109429)
+++ head/net-mgmt/smokeping/pkg-install	(revision 109430)
@@ -1,52 +1,51 @@
 #! /bin/sh
 #
 # $FreeBSD$
 #
 
 case $2 in
 PRE-INSTALL)
 	if ! pw groupshow %%WWW_GROUP%% 2>/dev/null 1>&2; then
 		if pw groupadd %%WWW_GROUP%% -g %%WWW_GID%%; then
 			echo 'Added group "%%WWW_GROUP%%".'
 		else
 			echo 'Adding group "%%WWW_GROUP%%" failed...'
 			exit 1
 		fi
 	fi
 
 	if ! pw usershow %%WWW_USER%% 2>/dev/null 1>&2; then
 		if pw useradd %%WWW_USER%% -u %%WWW_UID%% -g %%WWW_GROUP%% -h - \
 			-s /sbin/nologin -d /nonexistent \
 			-c "World Wide Web Owner"; \
 		then
 			echo 'Added user "%%WWW_USER%%".'
 		else
 			echo 'Adding user "%%WWW_USER%%" failed...'
 			exit 1
 		fi
 	fi
 
 	if ! pw groupshow %%GROUP%% 2>/dev/null 1>&2; then
 		if pw groupadd %%GROUP%%; then
 			echo 'Added group "%%GROUP%%".'
 		else
 			echo 'Adding group "%%GROUP%%" failed...'
 			exit 1
 		fi
 	fi
 
 	if ! pw usershow %%USER%% 2>/dev/null 1>&2; then
                 if pw useradd %%USER%% -g %%GROUP%% -h - \
 			-s /nonexistent -c "SmokePing Daemon"; \
 		then
 			echo 'Added user "%%USER%%".'
 		else
 			echo 'Adding user "%%USER%%" failed...'
 			exit 1
 		fi
 	fi
 
 	exit 0
 	;;
 esac
-

Property changes on: head/net-mgmt/smokeping/pkg-install
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property