[47789] trunk/dports/devel

[mcalhoun at macports.org]

Revision: 47789
          http://trac.macports.org/changeset/47789
Author:   mcalhoun at macports.org
Date:     2009-03-05 21:28:48 -0800 (Thu, 05 Mar 2009)
Log Message:
-----------
ncursesw, ncurses: Correct behavior if phases aries from separate port calls.

Modified Paths:
--------------
    trunk/dports/devel/ncurses/Portfile
    trunk/dports/devel/ncursesw/Portfile

Modified: trunk/dports/devel/ncurses/Portfile
===================================================================
--- trunk/dports/devel/ncurses/Portfile	2009-03-06 05:28:35 UTC (rev 47788)
+++ trunk/dports/devel/ncurses/Portfile	2009-03-06 05:28:48 UTC (rev 47789)
@@ -49,9 +49,9 @@
 }
 
 if {[variant_isset universal]} {
-    pre-fetch {
+    pre-destroot {
         global merger_dont_diff
-        # This test must be done in pre-fetch because it is the earliest stage in which universal_archs_to_use has the correct values.
+        # These tests must be done in pre-destroot to ensure universal_archs_to_use has the correct values.
         if { [llength ${universal_archs_to_use}] > 2 } {
             lappend merger_dont_diff ${prefix}/include/${name}/curses.h
         }

Modified: trunk/dports/devel/ncursesw/Portfile
===================================================================
--- trunk/dports/devel/ncursesw/Portfile	2009-03-06 05:28:35 UTC (rev 47788)
+++ trunk/dports/devel/ncursesw/Portfile	2009-03-06 05:28:48 UTC (rev 47789)
@@ -38,10 +38,10 @@
 				--with-manpage-format=normal
 
 if {[variant_isset universal]} {
-	pre-fetch {
+	pre-destroot {
 		global merger_dont_diff merger_destroot_env
 
-		# These tests must be done in pre-fetch because it is the earliest stage in which universal_archs_to_use has the correct values.
+		# These tests must be done in pre-destroot to ensure universal_archs_to_use has the correct values.
 		if { [llength ${universal_archs_to_use}] > 2 } {
 			lappend merger_dont_diff ${prefix}/include/${name}/curses.h
 		}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090305/8ed2560a/attachment.html>