[24662] trunk/base/src

[source_changes at macosforge.org]

Revision: 24662
          http://trac.macosforge.org/projects/macports/changeset/24662
Author:   eridius at macports.org
Date:     2007-04-29 12:34:08 -0700 (Sun, 29 Apr 2007)

Log Message:
-----------
Revert r 24659 because it wasn't well thought-out

Modified Paths:
--------------
    trunk/base/src/package1.0/portpkg.tcl
    trunk/base/src/port1.0/portactivate.tcl
    trunk/base/src/port1.0/portinstall.tcl

Modified: trunk/base/src/package1.0/portpkg.tcl
===================================================================
--- trunk/base/src/package1.0/portpkg.tcl	2007-04-29 19:33:02 UTC (rev 24661)
+++ trunk/base/src/package1.0/portpkg.tcl	2007-04-29 19:34:08 UTC (rev 24662)
@@ -36,7 +36,7 @@
 set com.apple.pkg [target_new com.apple.pkg pkg_main]
 target_runtype ${com.apple.pkg} always
 target_provides ${com.apple.pkg} pkg
-if {[info exists darwinports::portarchivemode] && $darwinports::portarchivemode == "yes"} {
+if {[option portarchivemode] == "yes"} {
 	target_requires ${com.apple.pkg} unarchive destroot
 } else {
 	target_requires ${com.apple.pkg} destroot

Modified: trunk/base/src/port1.0/portactivate.tcl
===================================================================
--- trunk/base/src/port1.0/portactivate.tcl	2007-04-29 19:33:02 UTC (rev 24661)
+++ trunk/base/src/port1.0/portactivate.tcl	2007-04-29 19:34:08 UTC (rev 24662)
@@ -40,7 +40,7 @@
 target_runtype ${com.apple.activate} always
 target_state ${com.apple.activate} no
 target_provides ${com.apple.activate} activate
-if {[info exists darwinports::portarchivemode] && $darwinports::portarchivemode == "yes"} {
+if {[option portarchivemode] == "yes"} {
 	target_requires ${com.apple.activate} main unarchive fetch extract checksum patch configure build destroot archive install
 } else {
 	target_requires ${com.apple.activate} main fetch extract checksum patch configure build destroot install

Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl	2007-04-29 19:33:02 UTC (rev 24661)
+++ trunk/base/src/port1.0/portinstall.tcl	2007-04-29 19:34:08 UTC (rev 24662)
@@ -37,7 +37,7 @@
 set com.apple.install [target_new com.apple.install install_main]
 target_state ${com.apple.install} no
 target_provides ${com.apple.install} install
-if {[info exists darwinports::portarchivemode] && $darwinports::portarchivemode == "yes"} {
+if {[option portarchivemode] == "yes"} {
 	target_requires ${com.apple.install} main unarchive fetch extract checksum patch configure build destroot archive
 } else {
 	target_requires ${com.apple.install} main fetch extract checksum patch configure build destroot

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070429/a7e32d9e/attachment.html