[118830] contrib/port_cutleaves/port_cutleaves.in

[jmr at macports.org]

Revision: 118830
          https://trac.macports.org/changeset/118830
Author:   jmr at macports.org
Date:     2014-04-11 08:50:11 -0700 (Fri, 11 Apr 2014)
Log Message:
-----------
port_cutleaves: support macports 2.3

Modified Paths:
--------------
    contrib/port_cutleaves/port_cutleaves.in

Modified: contrib/port_cutleaves/port_cutleaves.in
===================================================================
--- contrib/port_cutleaves/port_cutleaves.in	2014-04-11 14:47:01 UTC (rev 118829)
+++ contrib/port_cutleaves/port_cutleaves.in	2014-04-11 15:50:11 UTC (rev 118830)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
 # \
-exec /usr/bin/tclsh "$0" "$@"
+if test -x @prefix@/bin/port-tclsh; then exec @prefix@/bin/port-tclsh "$0" "$@"; else exec /usr/bin/tclsh "$0" "$@"; fi
 # $Id$
 
 set VERSION 0.1.3
@@ -300,8 +300,6 @@
     { F.arg ~/.port_leaves.exclude \
             "Specify a different file to read exclusions from" }
     { l     "List leaves and exit"}
-    { t.arg "" \
-            "Specify a different location for the base MacPorts Tcl file" }
     { V     "Display version information and exit" }
 }
 set usage "\[-b] \[-F value] \[-l] \[-t value] \[-V] \[-help] \[-?]\n\nOptions:"
@@ -310,15 +308,11 @@
     exit 1
 }
 
-if {$option(t) eq ""} {
-    if {[catch {source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl} result]
-        && [catch {source /Library/Tcl/macports1.0/macports_fastload.tcl} result]} {
+if {![file exists ${prefix}/bin/port-tclsh]} {
+    if {[catch {source ${prefix}/share/macports/Tcl/macports1.0/macports_fastload.tcl} result]} {
         puts stderr "Error: $result"
         exit 1
     }
-} elseif {[catch {source $option(t)/macports1.0/macports_fastload.tcl} result]} {
-    puts stderr "Error: $result"
-    exit 1
 }
 
 package require macports
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140411/35e40c44/attachment.html>