[21562] trunk/dports/net/smokeping

[source_changes at macosforge.org]

Revision: 21562
          http://trac.macosforge.org/projects/macports/changeset/21562
Author:   markd at macports.org
Date:     2007-01-28 18:12:57 -0800 (Sun, 28 Jan 2007)

Log Message:
-----------
Add apple_apache variant for using Apple's Apache; use perl5 portgroup to set a path to 'perl -V:sitearch'.

Modified Paths:
--------------
    trunk/dports/net/smokeping/Portfile
    trunk/dports/net/smokeping/files/patch-bin-smokeping.dist
    trunk/dports/net/smokeping/files/patch-bin-tSmoke.dist
    trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist

Modified: trunk/dports/net/smokeping/Portfile
===================================================================
--- trunk/dports/net/smokeping/Portfile	2007-01-28 21:09:58 UTC (rev 21561)
+++ trunk/dports/net/smokeping/Portfile	2007-01-29 02:12:57 UTC (rev 21562)
@@ -1,9 +1,11 @@
 # $Id: Portfile
 
 PortSystem 1.0
+PortGroup		perl5 1.0
 name			smokeping
 version			2.0.9
-categories		net
+revision		1
+categories		net perl
 maintainers		markd at macports.org
 description		A deluxe latency logging and graphing system.
 long_description	SmokePing is a deluxe latency measurement tool. \
@@ -46,6 +48,13 @@
 	startupitem.name	smokeping
 	startupitem.executable	${prefix}/bin/smokeping
 
+variant apple_apache {
+# This variant is for using Smokeping with Apple's built-in Apache.  The variant
+# doesn't do anything in the Smokeping port, but it triggers the same variant name
+# in p5-cgi-speedycgi, which is necessary for SpeedyCGI to work with Apache 1, and
+# therefore necessary for Smokeping to work with Apple's Apache.
+}
+
 use_configure		no
 build {}
 
@@ -55,6 +64,11 @@
 		[glob ${worksrcpath}/etc/*.dist] \
 		[glob ${worksrcpath}/htdocs/*.dist]
 
+	eval reinplace "s|__PERL5__ARCHLIB__|${perl5.archlib}|g" \
+                [glob ${worksrcpath}/bin/*.dist] \
+                [glob ${worksrcpath}/etc/*.dist] \
+                [glob ${worksrcpath}/htdocs/*.dist]
+
 	eval reinplace "s|/usr/bin/perl|${prefix}/bin/perl|g" \
                 [glob ${worksrcpath}/bin/*.dist] \
                 [glob ${worksrcpath}/etc/*.dist] \
@@ -91,7 +105,8 @@
 # etc
 	xinstall -m 755 -d ${destroot}${smokeetc}
 	file copy ${worksrcpath}/etc/basepage.html.dist ${destroot}${smokeetc}/basepage.html
-	file copy ${worksrcpath}/etc/config.dist ${destroot}${smokeetc}/config
+# Leave the config.dist filename for users to remove so upgrades won't destroy the config file.
+	file copy ${worksrcpath}/etc/config.dist ${destroot}${smokeetc}/config.dist
 	file copy ${worksrcpath}/etc/smokemail.dist ${destroot}${smokeetc}/smokemail
 	file copy ${worksrcpath}/etc/tmail.dist ${destroot}${smokeetc}/tmail
 
@@ -157,8 +172,13 @@
 	sudo chown -R www:www ${prefix}/var/smokeping/
 
 
-4) Edit ${prefix}/etc/smokeping/config.
+4) Use the ${smokeetc}/config sample file.
 
+   -Remove the .dist extension to activate the config file.
+
+	cd ${smokeetc}
+	sudo mv config.dist config
+
    -Paths are set by MacPorts, leave them alone.
 
    -Customize variables.
@@ -181,7 +201,7 @@
 
    -Add this statement to /etc/syslog.conf.
 
-   local1.*	${prefix}/var/smokeping/smokeping.log
+   local1.*	${smokedata}/log/smokeping.log
 
    -Create a logfile to receive the log messages.
 

Modified: trunk/dports/net/smokeping/files/patch-bin-smokeping.dist
===================================================================
--- trunk/dports/net/smokeping/files/patch-bin-smokeping.dist	2007-01-28 21:09:58 UTC (rev 21561)
+++ trunk/dports/net/smokeping/files/patch-bin-smokeping.dist	2007-01-29 02:12:57 UTC (rev 21562)
@@ -7,7 +7,7 @@
  
 -use lib qw(/usr/pack/rrdtool-1.0.49-to/lib/perl);
 -use lib qw(lib);
-+use lib qw(__PREFIX__/lib/perl5/site_perl/5.8.8/darwin-2level/auto/RRDs);
++use lib qw(__PERL5__ARCHLIB__/auto/RRDs);
 +use lib qw(__PREFIX__/lib/smokeping);
  
  use Smokeping 2.000009;

Modified: trunk/dports/net/smokeping/files/patch-bin-tSmoke.dist
===================================================================
--- trunk/dports/net/smokeping/files/patch-bin-tSmoke.dist	2007-01-28 21:09:58 UTC (rev 21561)
+++ trunk/dports/net/smokeping/files/patch-bin-tSmoke.dist	2007-01-29 02:12:57 UTC (rev 21562)
@@ -13,7 +13,7 @@
 -use lib qw(lib);
 -use lib "/usr/local/rrdtool-1.0.39/lib/perl";
 +use lib qw(__PREFIX__/lib/smokeping/lib);
-+use lib "__PREFIX__/lib/perl5/site_perl/5.8.8/darwin-2level/auto/RRDs";
++use lib "__PERL5__ARCHLIB__/auto/RRDs";
  
  use Smokeping 2.000009;
  use Net::SMTP;

Modified: trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist
===================================================================
--- trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist	2007-01-28 21:09:58 UTC (rev 21561)
+++ trunk/dports/net/smokeping/files/patch-htdocs-smokeping.cgi.dist	2007-01-29 02:12:57 UTC (rev 21562)
@@ -7,7 +7,7 @@
  
 -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__/lib/perl5/site_perl/5.8.8/darwin-2level/auto/RRDs);
++use lib qw(__PERL5__ARCHLIB__/auto/RRDs);
 +use lib qw(__PREFIX__/lib/smokeping);
  use CGI::Carp qw(fatalsToBrowser);
  

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070128/12b3f046/attachment.html