Ticket #43208: PortIndex2MySQL.tcl.diff

PortIndex2MySQL.tcl

@@ -1 @@
-#!/opt/local/bin/tclsh
+#!/bin/sh
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
+# $Id$
 #
-# PortIndex2MySQL.tcl
 # Kevin Van Vechten | kevin@opendarwin.org
 # 3-Oct-2002
 # Juan Manuel Palacios | jmpp@macports.org
 # 22-Nov-2007
-# $Id$
 #
 # Copyright (c) 2007 Juan Manuel Palacios, The MacPorts Project.
 # Copyright (c) 2003 Apple Inc.
@@ -37 +36 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
+# A short Bourne shell script to relaunch this file under MacPorts' tclsh.\
+PORT="$(which port 2>&1)" #\
+if [ ! -x "$PORT" ]; then #\
+    echo "Could not find port command in PATH." 1>&2 #\
+    exit 1 #\
+fi #\
+MACPORTS_PREFIX=${PORT%/bin/port} #\
+exec "$MACPORTS_PREFIX/libexec/macports/bin/tclsh8.5" "$0" "$@"
 
+
 #####
 # The PortIndex2MySQL script populates a database with key information extracted
 # from the Portfiles in the ports tree pointed to by the sources.conf file in a
@@ -57 +65 @@
 # setup.
 #####
 
+set macports_prefix [file join {*}[lrange [file split [info nameofexecutable]] 0 end-4]]
 
 
 # Runtime information log file and reciepient.
@@ -178 +187 @@
 }
 
 # Load macports1.0 so that we can use some of its procs and the portinfo array.
-if {[catch { source [file join "@macports_tcl_dir@" macports1.0 macports_fastload.tcl] } errstr]} {
+if {[catch { source [file join $macports_prefix share macports Tcl macports1.0 macports_fastload.tcl] } errstr]} {
     puts $runlog_fd "${::errorInfo}"
     puts $runlog_fd "Failed to locate the macports1.0 Tcl package file: $errstr"
     cleanup lockfile
@@ -208 +217 @@
 set portsdb_host localhost
 set portsdb_name macports
 set portsdb_user macports
-set passwdfile "/opt/local/share/macports/resources/portmgr/password_file"
+set passwdfile [file join $macports_prefix share macports resources portmgr password_file]
 set portsdb_passwd [getpasswd $passwdfile]
 set portsdb_cmd [macports::findBinary mysql5]