Ticket #1097: portfile.diff

(a) Portfile-orig vs. (b) Portfile

@@ -2 +2 @@
 
 PortSystem 1.0
 name            apache2
-version         2.0.47
+version         2.0.48
 categories      www
 platforms       darwin freebsd
 maintainers     jcorley1@nc.rr.com
@@ -23 +23 @@
                 http://ftp.epix.net/apache/httpd/
 
 distname        httpd-${version}
-checksums       md5 63f16638c18b140b649fab32b54d7f9c 
+checksums       md5 466c63bb71b710d20a5c353df8c1a19c
 depends_lib     lib:libapr-0.0:apr lib:libaprutil-0.0:apr-util
 patchfiles      patch-httpd-std.conf.in
-configure.env   CC=/usr/bin/gcc CPP=/usr/bin/cpp
+
+configure.pre_args --prefix=${prefix}/${name}
+
 configure.args  --with-layout=FreeBSD --with-apr=${prefix}/bin/apr-config \
-                --with-apr-util=${prefix}/bin --prefix=${prefix}/${name} \
-                --enable-mods-shared=all --enable-ssl --with-ssl \
+                --with-apr-util=${prefix}/bin --enable-mods-shared=all --enable-ssl --with-ssl \
                 --enable-deflate --enable-proxy --enable-proxy-connect \
                 --enable-proxy-http --enable-proxy-ftp
 
 destroot.args   root=${destroot}
-post-destroot {         system "touch ${destroot}${prefix}/${name}/logs/.turd"
-                system "test -L ${destroot}${prefix}/${name}/build/libtool \
-                        || ln -s /usr/bin/glibtool \
-                        ${destroot}${prefix}/${name}/build/libtool" }
 
 variant activate_server {
                 depends_run     path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
@@ -45 +42 @@
                                         ${filespath}/${name}.sh > \
                                         ${worksrcdir}/${name}.sh" }
 
-                post-destroot-append {  file mkdir ${destroot}${prefix}/etc/rc.d/
-                                        system "install -bC ${portpath}/${workdir}/${name}.sh \
-                                                ${destroot}${prefix}/etc/rc.d/"} }
+}
+
+post-destroot { 
+
+        system "touch ${destroot}${prefix}/${name}/logs/.turd"
+        system "test -L ${destroot}${prefix}/${name}/build/libtool \
+                || ln -s /usr/bin/glibtool \
+                ${destroot}${prefix}/${name}/build/libtool"
+
+        if { [variant_isset activate_server] } {
+                file mkdir ${destroot}${prefix}/etc/rc.d/
+                system "install -bC ${portpath}/${workdir}/${name}.sh \
+                        ${destroot}${prefix}/etc/rc.d/"
+        } 
+}