Changeset 14695 for trunk/dports

Timestamp:

Oct 18, 2005, 8:20:30 PM (19 years ago)

Author:

mww

Message:

update to 1.3.34, switch to startupitem-code

Location:

trunk/dports/www/apache

Files:

• Portfile (modified) (4 diffs)
• files/apache.sh (deleted)

trunk/dports/www/apache/Portfile

@@ -1 @@
-# $Id: Portfile,v 1.48 2005/06/27 19:57:45 mww Exp $
+# $Id: Portfile,v 1.49 2005/10/18 20:20:30 mww Exp $
 
 PortSystem 1.0
 name                apache
-version             1.3.33
-revision            3
+version             1.3.34
 categories          www
 platforms           darwin freebsd
@@ -18 +17 @@
 master_sites        apache:httpd/ \
                     http://archive.apache.org/dist/httpd/old/
-                      
 
 distname            ${name}_${version}
-checksums           ${distname}${extract.suffix} md5 3dfd2c3778f37a2dfc22b97417a61407
+checksums           md5 9978cc552b423f0015c1052d23ab619e
 
 variant darwin {
-        depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
         if { ![variant_isset apache_layout] } {
-                configure.args-append   --with-layout=FreeBSD  --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run
+                configure.args-append   --with-layout=FreeBSD  --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/run
         } 
-}
-
-variant freebsd {
-        if { ![variant_isset apache_layout] } {
-                configure.args-append   --with-layout=FreeBSD --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run
-        }
 }
 
@@ -49 +40 @@
 destroot.args           root=${destroot}
 
-post-patch        {
-        if { [variant_isset apache_layout] } { 
-                system "sed -e \"s=%%PREFIX%%=${prefix}/apache=g\" \
-                        ${filespath}/apache.sh >${workpath}/apache.sh"
-        } else {
-                system "sed -e \"s=%%PREFIX%%=${prefix}=g\" \
-                        ${filespath}/apache.sh >${workpath}/apache.sh"
-        }       
-}                 
+startupitem.create      yes
+if { [variant_isset apache_layout] } { 
+        startupitem.init        \
+                "CTL=${prefix}/apache/bin/apachectl\nPID=${prefix}/apache/run/httpd.pid"
+} else {
+        startupitem.init        \
+                "CTL=${prefix}/sbin/apachectl\nPID=${prefix}/var/run/httpd.pid"
+}
+startupitem.start       \
+"\[ -x \${CTL} \] && \${CTL} start >/dev/null"
+startupitem.stop        \
+"\[ -r \${PID} \] && \${CTL} stop >/dev/null"
+startupitem.restart     \
+"\[ -x \${CTL} \] && \${CTL} restart >/dev/null"
 
 post-destroot      {
@@ -71 +67 @@
                                 ${destroot}${prefix}/var/run
         }
-        xinstall -m 755 -d ${destroot}${prefix}/etc/rc.d/
-        xinstall -m 644 ${workpath}/apache.sh ${destroot}${prefix}/etc/rc.d/
-}   
+}
+