[116413] trunk/dports/www/apache24-devel/Portfile

[ryandesign at macports.org]

Revision: 116413
          https://trac.macports.org/changeset/116413
Author:   ryandesign at macports.org
Date:     2014-01-24 01:49:02 -0800 (Fri, 24 Jan 2014)
Log Message:
-----------
apache24-devel: fix incorrect destroot.keepdirs

Modified Paths:
--------------
    trunk/dports/www/apache24-devel/Portfile

Modified: trunk/dports/www/apache24-devel/Portfile
===================================================================
--- trunk/dports/www/apache24-devel/Portfile	2014-01-24 08:36:00 UTC (rev 116412)
+++ trunk/dports/www/apache24-devel/Portfile	2014-01-24 09:49:02 UTC (rev 116413)
@@ -7,8 +7,8 @@
 
 name                apache24-devel
 apache2.name        apache2
-# Both apache and apache2 want to install dbmmanage.1 and other manpages.
 version             2.4.7
+revision            1
 categories          www
 maintainers         ryandesign mathiesen.info:macintosh pixilla openmaintainer
 license             Apache-2
@@ -101,9 +101,9 @@
     xinstall -m 755 -d  ${destroot}${apache2.datadir}
     xinstall -m 755 -d  ${destroot}${apache2.runtimedir}
     xinstall -m 755 -d  ${destroot}${apache2.logfiledir}
-    destroot.keepdirs   ${apache2.datadir} \
-                        ${apache2.runtimedir} \
-                        ${apache2.logfiledir}
+    destroot.keepdirs   ${destroot}${apache2.datadir} \
+                        ${destroot}${apache2.runtimedir} \
+                        ${destroot}${apache2.logfiledir}
 
     # fix libtool path
     reinplace "s|/build/libtool|/share/apr-1/build/libtool|g" \
@@ -118,6 +118,18 @@
 #     }
 }
 
+pre-activate {
+    # apache24-devel 2.4.7_0 and earlier installed these items directly to ${prefix} (bypassing ${destroot}); remove them if found
+    foreach d "${apache2.datadir} ${apache2.runtimedir} ${apache2.logfiledir}" {
+        set f ${d}/.turd_${name}
+        if {[file exists ${f}] && [registry_file_registered ${f}] == "0"} {
+            if {[catch {delete ${f}}]} {
+                ui_warn "Cannot delete ${f}; please remove it manually"
+            }
+        }
+    }
+}
+
 # post-activate {
 # 
 #     if {![file exists ${apache2.sbindir}/envvars]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140124/887fe17e/attachment-0001.html>