From fb659fb0a3c625be49e17d4308a9a421bb77ae17 Mon Sep 17 00:00:00 2001
From: jakob <jakob@openbsd.org>
Date: Sun, 18 Jun 2006 18:05:46 +0000
Subject: [PATCH] use /var/db/smokeping and move webpages to
 /var/www/htdocs/smokeping fix fping reference

---
 net/smokeping/Makefile                      | 11 ++++++-----
 net/smokeping/patches/patch-etc_config_dist | 21 +++++++++++----------
 net/smokeping/pkg/PLIST                     |  7 ++++---
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/net/smokeping/Makefile b/net/smokeping/Makefile
index e491b3685b9..d091ecf43f4 100644
--- a/net/smokeping/Makefile
+++ b/net/smokeping/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.5 2006/06/14 08:58:22 jakob Exp $
+# $OpenBSD: Makefile,v 1.6 2006/06/18 18:05:46 jakob Exp $
 
 COMMENT=	"latency logging and graphing system"
 
-DISTNAME=	smokeping-2.0.8
+VERSION=	2.0.8
+DISTNAME=	smokeping-${VERSION}
+PKGNAME=	smokeping-${VERSION}p0
 CATEGORIES=	net
 
 MASTER_SITES=	http://people.ee.ethz.ch/~oetiker/webtools/smokeping/pub/
@@ -28,14 +30,13 @@ NO_BUILD=	Yes
 PKG_ARCH=	*
 
 PMDIR=		libdata/perl5/site_perl
-WEBDIR=		/var/www/smokeping
 SUBST_VARS=	PMDIR
 
 ETCFILES=	basepage.html config smokemail tmail
 
 do-install:
-	@perl -pi -e "s|%%WEBDIR%%|${WEBDIR}|g; \
-		s|%%SYSCONFDIR%%|${SYSCONFDIR}|g;" \
+	@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g; \
+		s|%%LOCALBASE%%|${LOCALBASE}|g;" \
 		${WRKSRC}/etc/config.dist
 	@perl -pi -e "s|%%SYSCONFDIR%%|${SYSCONFDIR}|g" \
 		< ${WRKSRC}/bin/smokeping.dist > ${WRKSRC}/bin/smokeping
diff --git a/net/smokeping/patches/patch-etc_config_dist b/net/smokeping/patches/patch-etc_config_dist
index 9da71594e2c..9455148253e 100644
--- a/net/smokeping/patches/patch-etc_config_dist
+++ b/net/smokeping/patches/patch-etc_config_dist
@@ -1,7 +1,7 @@
-$OpenBSD: patch-etc_config_dist,v 1.1 2006/06/14 08:58:22 jakob Exp $
---- etc/config.dist.orig	Tue May 23 13:31:29 2006
-+++ etc/config.dist	Tue May 23 13:41:27 2006
-@@ -7,14 +7,14 @@
+$OpenBSD: patch-etc_config_dist,v 1.2 2006/06/18 18:05:46 jakob Exp $
+--- etc/config.dist.orig	Fri Mar 24 17:51:02 2006
++++ etc/config.dist	Sun Jun 18 19:38:15 2006
+@@ -7,14 +7,15 @@
  owner    = Joe Random
  contact  = joe@some.place.xyz
  mailhost = smtp.mailhost.abc
@@ -11,9 +11,10 @@ $OpenBSD: patch-etc_config_dist,v 1.1 2006/06/14 08:58:22 jakob Exp $
 -datadir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
 -piddir  = /home/oetiker/data/projects/AADJ-smokeping/dist/var
 +sendmail = /usr/sbin/sendmail
-+imgcache = %%WEBDIR%%/img
-+imgurl   = /img
-+datadir  = /var/spool/smokeping
++imgcache = /var/www/htdocs/smokeping/img
++imgurl   = /smokeping/img
++pagedir  = /var/www/htdocs/smokeping
++datadir  = /var/db/smokeping
 +piddir  = /var/run/smokeping
  cgiurl   = http://people.ee.ethz.ch/~oetiker/smokeping/smokeping.cgi
 -smokemail = /home/oetiker/data/projects/AADJ-smokeping/dist/etc/smokemail.dist
@@ -23,7 +24,7 @@ $OpenBSD: patch-etc_config_dist,v 1.1 2006/06/14 08:58:22 jakob Exp $
  # specify this to get syslog logging
  syslogfacility = local0
  # each probe is now run in its own process
-@@ -66,7 +66,7 @@ AVERAGE  0.5 144   720
+@@ -66,7 +67,7 @@ AVERAGE  0.5 144   720
  
  *** Presentation ***
  
@@ -32,12 +33,12 @@ $OpenBSD: patch-etc_config_dist,v 1.1 2006/06/14 08:58:22 jakob Exp $
  
  + overview 
  
-@@ -89,7 +89,7 @@ unison_tolerance = 2
+@@ -89,7 +90,7 @@ unison_tolerance = 2
  
  + FPing
  
 -binary = /usr/sepp/bin/fping
-+binary = /usr/local/sbin/fping
++binary = %%LOCALBASE%%/sbin/fping
  
  *** Targets ***
  
diff --git a/net/smokeping/pkg/PLIST b/net/smokeping/pkg/PLIST
index 2b669d96f56..ab2716b4abb 100644
--- a/net/smokeping/pkg/PLIST
+++ b/net/smokeping/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2006/06/14 08:58:22 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.6 2006/06/18 18:05:46 jakob Exp $
 @newgroup _smokeping:562
 @newuser _smokeping:562:562:daemon:Smokeping account:/var/empty:/sbin/nologin
 bin/smokeping
@@ -103,8 +103,9 @@ share/examples/smokeping/tmail
 @owner _smokeping
 @group _smokeping
 @sample /var/run/smokeping/
-@sample /var/spool/smokeping/
+@sample /var/db/smokeping/
+@sample /var/www/htdocs/smokeping/
 @mode 0755
 @owner www
 @group
-@sample /var/www/smokeping/img/
+@sample /var/www/htdocs/smokeping/img/