[91290] trunk/dports/net

[jmr at macports.org]

Revision: 91290
          https://trac.macports.org/changeset/91290
Author:   jmr at macports.org
Date:     2012-03-28 06:45:19 -0700 (Wed, 28 Mar 2012)
Log Message:
-----------
squid3, squid: use startupitem.pidfile (#33436)

Modified Paths:
--------------
    trunk/dports/net/squid/Portfile
    trunk/dports/net/squid3/Portfile

Modified: trunk/dports/net/squid/Portfile
===================================================================
--- trunk/dports/net/squid/Portfile	2012-03-28 13:42:12 UTC (rev 91289)
+++ trunk/dports/net/squid/Portfile	2012-03-28 13:45:19 UTC (rev 91290)
@@ -5,7 +5,7 @@
 
 name            squid
 version         2.7.STABLE9
-revision        2
+revision        3
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      net
 platforms       darwin
@@ -42,7 +42,7 @@
 
 depends_lib     port:zlib
 
-conflicts       squid3
+conflicts       squid3 squid3-devel
 
 configure.args  --with-pthreads \
                 --mandir=${prefix}/share/man \
@@ -64,12 +64,15 @@
     }
 }
 
-build.args      DEFAULT_PID_FILE=${prefix}/var/run/squid/squid.pid
+set pidfile     ${prefix}/var/run/squid/squid.pid
+
+build.args      DEFAULT_PID_FILE=${pidfile}
 use_parallel_build  yes
 
 startupitem.create      yes
 startupitem.name        Squid
 startupitem.netchange   yes
+startupitem.pidfile     auto ${pidfile}
 startupitem.start \
     "cd ${prefix}/var/squid" \
     "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2012-03-28 13:42:12 UTC (rev 91289)
+++ trunk/dports/net/squid3/Portfile	2012-03-28 13:45:19 UTC (rev 91290)
@@ -5,6 +5,7 @@
 
 name            squid3
 version         3.1.19
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      net
 platforms       darwin
@@ -45,12 +46,14 @@
 
 conflicts       squid squid3-devel
 
+set pidfile     ${prefix}/var/run/squid/squid.pid
+
 configure.args  --mandir=${prefix}/share/man \
                 --sysconfdir=${prefix}/etc/squid \
                 --datadir=${prefix}/share/squid \
                 --localstatedir=${prefix}/var/squid \
                 --libexecdir=${prefix}/libexec/squid \
-                --with-pidfile=${prefix}/var/run/squid/squid.pid \
+                --with-pidfile=${pidfile} \
                 --disable-strict-error-checking \
                 --disable-ipv6 \
                 --disable-loadable-modules \
@@ -77,6 +80,7 @@
 startupitem.create      yes
 startupitem.name        Squid
 startupitem.netchange   yes
+startupitem.pidfile     auto ${pidfile}
 startupitem.start \
     "cd ${prefix}/var/squid" \
     "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120328/09b04fa2/attachment.html>