Ticket #767: apache-portfile-20030818.diff

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

@@ -21 +21 @@
 
 distname            ${name}_${version}
 checksums           ${distname}${extract.sufx} md5 2cdece7b4881d541e072de6a2b65db77
-configure.pre_args  --prefix=${prefix}/${name}-${version}
-configure.args      --with-layout=FreeBSD --server-uid=www \
-                      --server-gid=www  --enable-module=most \
-                      --enable-shared=max --disable-rule=expat \
-                      --logfiledir=${prefix}/${name}-${version}/var/log/httpd \
-                      --runtimedir=${prefix}/${name}-${version}/var/run
 
+variant darwin {
+        if { ![variant_isset apache_layout] } {
+                configure.args-append   --with-layout=FreeBS  --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run
+        } 
+}
+
+variant freebsd {
+        if { ![variant_isset apache_layout] } {
+                configure.args-append   --with-layout=FreeBSD --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run
+        }
+}
+
+
+variant apache_layout {
+        configure.pre_args      --prefix=${prefix}/apache
+        configure.args-append   --with-layout=Apache --logfiledir=${prefix}/apache/var/log/httpd --runtimedir=${prefix}/apache/var/run
+}
+
+
+#configure.pre_args  --prefix=${prefix}/${name}
+configure.args          --server-uid=www \
+                        --server-gid=www  --enable-module=most \
+                        --enable-shared=max --disable-rule=expat
 
 destroot.args           root=${destroot}
 
 variant activate_server {
         depends_run path:/Library/StartupItems/DarwinPortsStartup:DarwinPortsStartup
-        post-patch        { system "sed -e \"s=%%PREFIX%%=${prefix}/${name}-${version}=g\" \
-                            ${filespath}/apache.sh >${workpath}/apache.sh"
-               }
+        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"
+                }       
+        }
 }                 
 
 variant mod_perl {
@@ -56 +79 @@
         worksrcdir          mod_perl-1.27
         
         configure.pre_args 
+
+
         #APACI_ARGS all on one line because otherwise apache gets upset if the shell is csh/tcsh
-        configure         { system "cd ${workpath}/${worksrcdir} && \
-                                                 perl Makefile.PL USE_APACI=1 EVERYTHING=1 \
+        configure         {
+                if { [variant_isset apache_layout] } {
+                        set APACI_ARGS "APACI_ARGS='--prefix=${prefix}/apache --with-layout=Apache --server-uid=www --server-gid=www --enable-module=most --enable-shared=max --disable-shared=perl --disable-rule=expat --logfiledir=${prefix}/apache/var/log --runtimedir=${prefix}/apache/var/run'"
+                } else {
+                        set APACI_ARGS "APACI_ARGS='--prefix=${prefix} --with-layout=FreeBSD --server-uid=www --server-gid=www --enable-module=most --enable-shared=max --disable-shared=perl --disable-rule=expat --logfiledir=${prefix}/var/log/httpd --runtimedir=${prefix}/var/run'"
+                }
+ 
+                system "cd ${workpath}/${worksrcdir} && \
+                                                 perl Makefile.PL USE_APACI=1 EVERYTHING=1 \
                                                  DO_HTTPD=1 APACHE_PREFIX=${prefix} \
                                                  APACHE_SRC=../${distname}/src \
-                                                 APACI_ARGS='--prefix=${prefix}/${name}-${version} --logfiledir=${prefix}/${name}-${version}/var/log/httpd --runtimedir=${prefix}/${name}-${version}/var/run --with-layout=FreeBSD --server-uid=www --server-gid=www --enable-module=most --enable-shared=max --disable-shared=perl --disable-rule=expat'" }
-        
-        destroot.args   PREFIX=${destroot}${prefix} INSTALLPRIVLIB=${destroot}${prefix}/lib/perl5/5.8.0 \
+                                                 ${APACI_ARGS}" 
+        }
+
+
+        destroot.args   PREFIX=${destroot}${prefix}/apache INSTALLPRIVLIB=${destroot}${prefix}/lib/perl5/5.8.0 \
                          INSTALLSITELIB=${destroot}${prefix}/lib/perl5/site_perl/5.8.0 \
                          INSTALLARCHLIB=${destroot}${prefix}/lib/perl5/5.8.0/darwin \
                          INSTALLSITEARCH=${destroot}${prefix}/lib/perl5/site_perl/5.8.0/darwin \
-root=${destroot}
+                         root=${destroot}
 
 }
 
 post-destroot      {
+        
+        if { [variant_isset apache_layout] } { 
+                 file mkdir  ${destroot}${prefix}/apache/log
+                 file mkdir  ${destroot}${prefix}/apache/run
+
+                system "touch ${destroot}${prefix}/apache/run/.turd \
+                        ${destroot}${prefix}/apache/log/.turd"
+        } else {
+
+                file mkdir  ${destroot}${prefix}/log/httpd
+                file mkdir  ${destroot}${prefix}/run
+
+                system "touch ${destroot}${prefix}/run/.turd \
+                        ${destroot}${prefix}/log/httpd/.turd"                                           
+        }
 
-        file mkdir  ${prefix}/${name}-${version}/var/log/httpd
-        file mkdir  ${prefix}/${name}-${version}/var/run
-
-        system "touch ${destroot}${prefix}/${name}-${version}/var/run/.turd \
-                ${destroot}${prefix}/${name}-${version}/var/log/httpd/.turd"                                           
 
         if { [variant_isset activate_server]} {
                 file mkdir  ${destroot}${prefix}/etc/rc.d/