[66639] trunk/base/src/port

[raimue at macports.org]

Revision: 66639
          http://trac.macports.org/changeset/66639
Author:   raimue at macports.org
Date:     2010-04-18 08:46:33 -0700 (Sun, 18 Apr 2010)
Log Message:
-----------
port: Revert r66608 and r66610
This does not work as intended. macports 1.0 does set auto_path itself leading
to multiple loading of *.dylib libraries from different paths in sub-interp
causing lots of trouble. Probably the whole loading should be rethought as in
its current state fastload does only serve functionality for the initial
package requires.

Revision Links:
--------------
    http://trac.macports.org/changeset/66608
    http://trac.macports.org/changeset/66610

Modified Paths:
--------------
    trunk/base/src/port/Makefile
    trunk/base/src/port/port.tcl
    trunk/base/src/port/portindex.tcl
    trunk/base/src/port/portmirror.tcl

Modified: trunk/base/src/port/Makefile
===================================================================
--- trunk/base/src/port/Makefile	2010-04-18 15:43:45 UTC (rev 66638)
+++ trunk/base/src/port/Makefile	2010-04-18 15:46:33 UTC (rev 66639)
@@ -14,15 +14,12 @@
 
 portmirror: portmirror.tcl ../../Mk/macports.autoconf.mk
 	${edit} portmirror.tcl > $@
-	chmod +x $@
 
 portindex: portindex.tcl ../../Mk/macports.autoconf.mk
 	${edit} portindex.tcl > $@
-	chmod +x $@
 
 port: port.tcl ../../Mk/macports.autoconf.mk
 	${edit} port.tcl > $@
-	chmod +x $@
 
 mkdirs:
 	cat ../../doc/prefix.mtree | $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2010-04-18 15:43:45 UTC (rev 66638)
+++ trunk/base/src/port/port.tcl	2010-04-18 15:46:33 UTC (rev 66639)
@@ -34,14 +34,8 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-if {([file tail [pwd]] == "src" && [file exists [set dir macports1.0]/macports_fastload.tcl])
-        || ([file tail [pwd]] == "base" && [file exists [set dir src/macports1.0]/macports_fastload.tcl])} {
-    # developer mode, source packages from current directory
-    source [file join $dir macports_fastload.tcl]
-} else {
-    source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]
-}
-
+catch {source \
+    [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]}
 package require macports
 package require Pextlib 1.0
 

Modified: trunk/base/src/port/portindex.tcl
===================================================================
--- trunk/base/src/port/portindex.tcl	2010-04-18 15:43:45 UTC (rev 66638)
+++ trunk/base/src/port/portindex.tcl	2010-04-18 15:46:33 UTC (rev 66639)
@@ -7,14 +7,8 @@
 # if requested
 # $Id$
 
-if {([file tail [pwd]] == "src" && [file exists [set dir macports1.0]/macports_fastload.tcl])
-        || ([file tail [pwd]] == "base" && [file exists [set dir src/macports1.0]/macports_fastload.tcl])} {
-    # developer mode, source packages from current directory
-    source [file join $dir macports_fastload.tcl]
-} else {
-    source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]
-}
-
+catch {source \
+    [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]}
 package require macports
 package require Pextlib
 

Modified: trunk/base/src/port/portmirror.tcl
===================================================================
--- trunk/base/src/port/portmirror.tcl	2010-04-18 15:43:45 UTC (rev 66638)
+++ trunk/base/src/port/portmirror.tcl	2010-04-18 15:46:33 UTC (rev 66639)
@@ -11,14 +11,8 @@
 # Updates the distfiles to current distfiles by deleting old stuff.
 # Uses the database.
 
-if {([file tail [pwd]] == "src" && [file exists [set dir macports1.0]/macports_fastload.tcl])
-        || ([file tail [pwd]] == "base" && [file exists [set dir src/macports1.0]/macports_fastload.tcl])} {
-    # developer mode, source packages from current directory
-    source [file join $dir macports_fastload.tcl]
-} else {
-    source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]
-}
-
+catch {source \
+    [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl]}
 package require macports
 package require Pextlib
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100418/ceb1ec6f/attachment.html>