[57777] trunk/dports/lang

[ryandesign at macports.org]

Revision: 57777
          http://trac.macports.org/changeset/57777
Author:   ryandesign at macports.org
Date:     2009-09-16 07:18:50 -0700 (Wed, 16 Sep 2009)
Log Message:
-----------
php4, php52, php5, php5-devel: clean up rogue .turd file left behind by the erroneous destroot.keepdirs statement; see #21422

Modified Paths:
--------------
    trunk/dports/lang/php4/Portfile
    trunk/dports/lang/php5/Portfile
    trunk/dports/lang/php5-devel/Portfile
    trunk/dports/lang/php52/Portfile

Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile	2009-09-16 13:58:13 UTC (rev 57776)
+++ trunk/dports/lang/php4/Portfile	2009-09-16 14:18:50 UTC (rev 57777)
@@ -338,6 +338,13 @@
     system "if \[ -d ${prefix}/lib/php4/.channels \]; then rm -rf ${destroot}${prefix}/lib/php4/.channels; fi"
 }
 
+pre-activate {
+    set filepath ${extraphpinidir}/.turd_${name}
+    if {[file exists ${filepath}]} {
+        delete ${filepath}
+    }
+}
+
 post-activate {
     if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
         move ${prefix}/etc/php.ini ${phpinidir}

Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile	2009-09-16 13:58:13 UTC (rev 57776)
+++ trunk/dports/lang/php5/Portfile	2009-09-16 14:18:50 UTC (rev 57777)
@@ -313,6 +313,13 @@
         ${destroot}${phpinidir}
 }
 
+pre-activate {
+    set filepath ${extraphpinidir}/.turd_${name}
+    if {[file exists ${filepath}]} {
+        delete ${filepath}
+    }
+}
+
 post-activate {
     if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
         move ${prefix}/etc/php.ini ${phpinidir}

Modified: trunk/dports/lang/php5-devel/Portfile
===================================================================
--- trunk/dports/lang/php5-devel/Portfile	2009-09-16 13:58:13 UTC (rev 57776)
+++ trunk/dports/lang/php5-devel/Portfile	2009-09-16 14:18:50 UTC (rev 57777)
@@ -312,6 +312,13 @@
         ${destroot}${phpinidir}
 }
 
+pre-activate {
+    set filepath ${extraphpinidir}/.turd_${name}
+    if {[file exists ${filepath}]} {
+        delete ${filepath}
+    }
+}
+
 post-activate {
     if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
         move ${prefix}/etc/php.ini ${phpinidir}

Modified: trunk/dports/lang/php52/Portfile
===================================================================
--- trunk/dports/lang/php52/Portfile	2009-09-16 13:58:13 UTC (rev 57776)
+++ trunk/dports/lang/php52/Portfile	2009-09-16 14:18:50 UTC (rev 57777)
@@ -432,6 +432,13 @@
         ${destroot}${phpinidir}
 }
 
+pre-activate {
+    set filepath ${extraphpinidir}/.turd_${name}
+    if {[file exists ${filepath}]} {
+        delete ${filepath}
+    }
+}
+
 post-activate {
     if {[file exists ${prefix}/etc/php.ini] && ![file exists ${phpinidir}/php.ini]} {
         move ${prefix}/etc/php.ini ${phpinidir}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090916/03398f1f/attachment.html>