<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[118562] trunk/base</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/118562">118562</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-04-04 15:58:04 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: remove all references to macports_tcl_dir, install Tcl packages in TCL_PACKAGE_PATH directly, fixes #43208
This completely removes the need for macports_fastload.tcl and all the other
hacks that MacPorts has been using to locate its own packages (such as appending
to $auto_path during mportinit and preloading some packages).
Note: ${TCL_PACKAGE_PATH}/macports1.0 previously was a symlink and now is
a directory. When the symlink isn't removed before trying to create the
directory, this causes a failure. The Makefile now ensures this doesn't happen,
but I don't know what installer(8) will do in this case. This means we might
have to add delete the symlink in installer preflight.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseMakefilein">trunk/base/Makefile.in</a></li>
<li><a href="#trunkbaseMkmacportsautoconfmkin">trunk/base/Mk/macports.autoconf.mk.in</a></li>
<li><a href="#trunkbaseconfigure">trunk/base/configure</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
<li><a href="#trunkbaseportmgrjobsMakefile">trunk/base/portmgr/jobs/Makefile</a></li>
<li><a href="#trunkbaseportmgrjobsPortIndex2MySQLtcl">trunk/base/portmgr/jobs/PortIndex2MySQL.tcl</a></li>
<li><a href="#trunkbasesrccflib10Makefilein">trunk/base/src/cflib1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcdarwintracelib10Makefilein">trunk/base/src/darwintracelib1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcmachista10Makefilein">trunk/base/src/machista1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcmacports10Makefilein">trunk/base/src/macports1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcmacports10macportstcl">trunk/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#trunkbasesrcmacports10macports_test_autoconftclin">trunk/base/src/macports1.0/macports_test_autoconf.tcl.in</a></li>
<li><a href="#trunkbasesrcpackage10Makefilein">trunk/base/src/package1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcpackage10package_test_autoconftclin">trunk/base/src/package1.0/package_test_autoconf.tcl.in</a></li>
<li><a href="#trunkbasesrcpextlib10Makefilein">trunk/base/src/pextlib1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcportMakefilein">trunk/base/src/port/Makefile.in</a></li>
<li><a href="#trunkbasesrcport10Makefilein">trunk/base/src/port1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcport10port_test_autoconftclin">trunk/base/src/port1.0/port_test_autoconf.tcl.in</a></li>
<li><a href="#trunkbasesrcregistry20Makefilein">trunk/base/src/registry2.0/Makefile.in</a></li>
<li><a href="#trunkbasesrctclobjc10Makefilein">trunk/base/src/tclobjc1.0/Makefile.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -96,8 +96,8 @@
</span><span class="cx"> # Add [default] tag to the central MacPorts repository, if it isn't already
</span><span class="cx"> $(TCLSH) $(srcdir)/src/upgrade_sources_conf_default.tcl "${prefix}"
</span><span class="cx"> # Convert image directories (and direct mode installs) to image archives
</span><del>- $(TCLSH) $(srcdir)/src/images_to_archives.tcl "${macports_tcl_dir}"
- $(TCLSH) $(srcdir)/src/dedup_portfiles.tcl "${macports_tcl_dir}"
</del><ins>+ $(TCLSH) $(srcdir)/src/images_to_archives.tcl
+ $(TCLSH) $(srcdir)/src/dedup_portfiles.tcl
</ins><span class="cx"> endif
</span><span class="cx"> ifndef SELFUPDATING
</span><span class="cx"> @echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, add ${prefix}/bin to your PATH and run:"; echo ""
</span></span></pre></div>
<a id="trunkbaseMkmacportsautoconfmkin"></a>
<div class="modfile"><h4>Modified: trunk/base/Mk/macports.autoconf.mk.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/Mk/macports.autoconf.mk.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/Mk/macports.autoconf.mk.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> INTREE_TCLSH = @INTREE_TCLSH@
</span><span class="cx"> TCLSH = @TCLSH@
</span><span class="cx"> TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
</span><del>-macports_tcl_dir = @macports_tcl_dir@
</del><span class="cx">
</span><span class="cx"> DSCL = @DSCL@
</span><span class="cx"> DSEDITGROUP = @DSEDITGROUP@
</span></span></pre></div>
<a id="trunkbaseconfigure"></a>
<div class="modfile"><h4>Modified: trunk/base/configure (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/configure 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -652,7 +652,6 @@
</span><span class="cx"> VENDOR_DESTROOT
</span><span class="cx"> VENDOR_TCL_INSTALL
</span><span class="cx"> VENDOR_TCL_SUBDIR
</span><del>-macports_tcl_dir
</del><span class="cx"> localstatedir_expanded
</span><span class="cx"> MPCONFIGDIR_EXPANDED
</span><span class="cx"> prefix_expanded
</span><span class="lines">@@ -9496,9 +9495,6 @@
</span><span class="cx">
</span><span class="cx"> eval "localstatedir_expanded=$localstatedir"
</span><span class="cx">
</span><del>-eval "macports_tcl_dir=${datadir}/macports/Tcl"
-eval "macports_tcl_dir=$macports_tcl_dir"
-
</del><span class="cx"> # Compute the libexec dir for the vendor packages
</span><span class="cx"> eval "macports_libexec_dir=${libexecdir}/macports"
</span><span class="cx"> eval "macports_libexec_dir=$macports_libexec_dir"
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/configure.ac 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -311,9 +311,6 @@
</span><span class="cx"> AC_SUBST(MPCONFIGDIR_EXPANDED)
</span><span class="cx"> eval "localstatedir_expanded=$localstatedir"
</span><span class="cx"> AC_SUBST(localstatedir_expanded)
</span><del>-eval "macports_tcl_dir=${datadir}/macports/Tcl"
-eval "macports_tcl_dir=$macports_tcl_dir"
-AC_SUBST(macports_tcl_dir)
</del><span class="cx"> # Compute the libexec dir for the vendor packages
</span><span class="cx"> eval "macports_libexec_dir=${libexecdir}/macports"
</span><span class="cx"> eval "macports_libexec_dir=$macports_libexec_dir"
</span></span></pre></div>
<a id="trunkbaseportmgrjobsMakefile"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/jobs/Makefile (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/jobs/Makefile 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/portmgr/jobs/Makefile 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -3,7 +3,7 @@
</span><span class="cx"> SCRIPTS= PortIndex2MySQL
</span><span class="cx">
</span><span class="cx"> edit = sed \
</span><del>- -e 's,@macports_tcl_dir@,$(macports_tcl_dir),g'
</del><ins>+ -e 's,@TCLSH@,$(TCLSH),g'
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> include ../../Mk/macports.autoconf.mk
</span></span></pre></div>
<a id="trunkbaseportmgrjobsPortIndex2MySQLtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/portmgr/jobs/PortIndex2MySQL.tcl (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/portmgr/jobs/PortIndex2MySQL.tcl 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/portmgr/jobs/PortIndex2MySQL.tcl 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-#!/opt/local/bin/tclsh
</del><ins>+#!@TCLSH@
</ins><span class="cx"> # -*- 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
</span><span class="cx"> #
</span><span class="cx"> # PortIndex2MySQL.tcl
</span><span class="lines">@@ -178,12 +178,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Load macports1.0 so that we can use some of its procs and the portinfo array.
</span><del>-if {[catch { source [file join "@macports_tcl_dir@" 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
- terminate 1
-}
</del><span class="cx"> if {[catch { package require macports } errstr]} {
</span><span class="cx"> puts $runlog_fd "${::errorInfo}"
</span><span class="cx"> puts $runlog_fd "Failed to load the macports1.0 Tcl package: $errstr"
</span></span></pre></div>
<a id="trunkbasesrccflib10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/cflib1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cflib1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/cflib1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,10 +1,11 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> OBJS= CFLib.o
</span><span class="cx"> SHLIB_NAME= CFLib${SHLIB_SUFFIX}
</span><span class="cx"> LIBS+= -framework CoreFoundation
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/cflib1.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/cflib1.0
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
</del><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span></span></pre></div>
<a id="trunkbasesrcdarwintracelib10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/darwintracelib1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/darwintracelib1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,15 +1,15 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> # This Makefile will only be run on Darwin systems; we can safely use
</span><span class="cx"> # Apple-specifics here
</span><span class="cx"> SRCS= $(wildcard *.c)
</span><span class="cx"> OBJS= $(SRCS:%.c=%.o)
</span><span class="cx"> SHLIB_NAME= darwintrace${SHLIB_SUFFIX}
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/darwintrace1.0
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
-
</del><span class="cx"> # Yes, we know having $ signs in identifiers is not a very good idea; in the
</span><span class="cx"> # case of darwintrace we still need them, though.
</span><span class="cx"> CFLAGS_PEDANTIC=
</span></span></pre></div>
<a id="trunkbasesrcmachista10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/machista1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/machista1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/machista1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> OBJS= libmachista.o hashmap.o machista_wrap.o
</span><span class="cx"> SHLIB_NAME= machista${SHLIB_SUFFIX}
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/machista1.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/machista1.0
</ins><span class="cx">
</span><span class="cx"> SWIG = @SWIG@
</span><span class="cx"> SWIG_FLAGS = -tcl8 -pkgversion 1.0 -namespace
</span><span class="lines">@@ -15,7 +17,6 @@
</span><span class="cx">
</span><span class="cx"> TESTS = ./tests/libmachista-test
</span><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
</del><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span><span class="cx">
</span><span class="cx"> CFLAGS+= -fPIC
</span></span></pre></div>
<a id="trunkbasesrcmacports10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/macports1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,17 +1,16 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> SRCS= macports.tcl macports_dlist.tcl macports_util.tcl \
</span><span class="cx"> macports_autoconf.tcl
</span><span class="cx"> OBJS= macports.o get_systemconfiguration_proxies.o sysctl.o
</span><span class="cx"> SHLIB_NAME= MacPorts${SHLIB_SUFFIX}
</span><span class="cx">
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/macports1.0
-INSTALLPKGLINK= ${TCL_PACKAGE_PATH}/macports1.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/macports1.0
+OLDINSTALLDIR= ${datadir}/macports
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
-include $(srcdir)/../../Mk/macports.tea.mk
-
</del><span class="cx"> ifeq ($(OBJC_RUNTIME), APPLE_RUNTIME)
</span><span class="cx"> LIBS+= -framework CoreFoundation -framework SystemConfiguration
</span><span class="cx"> endif
</span><span class="lines">@@ -26,6 +25,13 @@
</span><span class="cx"> rm -f Makefile
</span><span class="cx">
</span><span class="cx"> install:: all
</span><ins>+ @# Clean up old instances of the MacPorts Tcl packages
+ if test -z "${DESTDIR}"; then rm -rf "${OLDINSTALLDIR}"; fi
+
+ @# Remove the previously installed link if it still exists. Without this,
+ @# creating the directory will fail.
+ if test -L "${INSTALLDIR}"; then rm -rf "${INSTALLDIR}"; fi
+
</ins><span class="cx"> $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
</span><span class="cx">
</span><span class="cx"> $(SILENT) set -x; for file in ${SRCS}; do \
</span><span class="lines">@@ -34,17 +40,5 @@
</span><span class="cx">
</span><span class="cx"> $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</span><span class="cx">
</span><del>- echo "${TCL_PACKAGE_PATH}" > ${DESTDIR}${prefix}/var/macports/.tclpackage
- if test -z "${DESTDIR}" -a "${INSTALLPKGLINK}" != "${INSTALLDIR}"; then \
- if test ! -L "${INSTALLPKGLINK}"; then \
- if test ! -e "${TCL_PACKAGE_PATH}"; then \
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${TCL_PACKAGE_PATH}" || true; \
- fi; \
- if test -d "${INSTALLPKGLINK}"; then \
- rm -vrf "${INSTALLPKGLINK}" || true; \
- fi; \
- if test ! -e "${INSTALLPKGLINK}"; then \
- ln -vs "${INSTALLDIR}" "${INSTALLPKGLINK}" || true; \
- fi; \
- fi; \
- fi
</del><ins>+
+include $(srcdir)/../../Mk/macports.tea.mk
</ins></span></pre></div>
<a id="trunkbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports.tcl (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports.tcl 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/macports1.0/macports.tcl 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1023,21 +1023,6 @@
</span><span class="cx"> set keepenvkeys [concat $keepenvkeys $extra_env]
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[file isdirectory $libpath]} {
- lappend auto_path $libpath
- set macports::auto_path $auto_path
-
- # XXX: not sure if this the best place, but it needs to happen
- # early, and after auto_path has been set. Or maybe Pextlib
- # should ship with macports1.0 API?
- package require Pextlib 1.0
- package require registry 1.0
- package require registry2 2.0
- package require machista 1.0
- } else {
- return -code error "Library directory '$libpath' must exist"
- }
-
</del><span class="cx"> # set the hidden flag on $portdbpath to avoid spotlight indexing, which
</span><span class="cx"> # might slow builds down considerably. You can avoid this by touching
</span><span class="cx"> # $portdbpath/.nohide.
</span></span></pre></div>
<a id="trunkbasesrcmacports10macports_test_autoconftclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports_test_autoconf.tcl.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports_test_autoconf.tcl.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/macports1.0/macports_test_autoconf.tcl.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -32,6 +32,5 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> namespace eval macports::autoconf {
</span><del>- variable macports_tcl_dir "@macports_tcl_dir@"
</del><span class="cx"> variable prefix "@prefix@"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcpackage10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/package1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,14 +1,14 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/package1.0
</del><ins>+include ../../Mk/macports.autoconf.mk
</ins><span class="cx">
</span><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/package1.0
+
</ins><span class="cx"> SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl \
</span><span class="cx"> portrpm.tcl portsrpm.tcl portdpkg.tcl portunarchive.tcl \
</span><span class="cx"> portarchivefetch.tcl
</span><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
-
</del><span class="cx"> all:: pkgIndex.tcl
</span><span class="cx">
</span><span class="cx"> pkgIndex.tcl: $(SRCS)
</span></span></pre></div>
<a id="trunkbasesrcpackage10package_test_autoconftclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/package_test_autoconf.tcl.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/package_test_autoconf.tcl.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/package1.0/package_test_autoconf.tcl.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> namespace eval macports::autoconf {
</span><del>- variable macports_tcl_dir "@macports_tcl_dir@"
</del><span class="cx"> variable prefix "@prefix@"
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcpextlib10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/pextlib1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/pextlib1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/pextlib1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> OBJS= \
</span><span class="cx"> Pextlib.o strsed.o fgetln.o md5cmd.o setmode.o xinstall.o \
</span><span class="cx"> fs-traverse.o strcasecmp.o vercomp.o filemap.o base32cmd.o \
</span><span class="lines">@@ -12,9 +14,8 @@
</span><span class="cx"> endif
</span><span class="cx">
</span><span class="cx"> SHLIB_NAME= Pextlib${SHLIB_SUFFIX}
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/pextlib1.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/pextlib1.0
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
</del><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span><span class="cx">
</span><span class="cx"> CFLAGS+= ${CURL_CFLAGS} ${MD5_CFLAGS} ${READLINE_CFLAGS}
</span></span></pre></div>
<a id="trunkbasesrcportMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/port/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,16 +1,14 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> INSTALLDIR= ${DESTDIR}${prefix}
</span><span class="cx"> TOPSRCDIR= ../..
</span><span class="cx"> SCRIPTS= portmirror portindex port port-tclsh
</span><span class="cx">
</span><del>-edit = sed \
- -e 's,@TCLSH\@,$(TCLSH),g' \
- -e 's,@macports_tcl_dir\@,$(macports_tcl_dir),g'
</del><ins>+edit = sed -e 's,@TCLSH\@,$(TCLSH),g'
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
-
</del><span class="cx"> .PHONY: mkdirs
</span><span class="cx">
</span><span class="cx"> all: ${SCRIPTS}
</span></span></pre></div>
<a id="trunkbasesrcport10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/port1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,8 +1,10 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/port1.0
</del><ins>+include ../../Mk/macports.autoconf.mk
</ins><span class="cx">
</span><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/port1.0
+
</ins><span class="cx"> SRCS_AUTOCONF= port_autoconf.tcl
</span><span class="cx"> SRCS= port.tcl portchecksum.tcl portconfigure.tcl portextract.tcl \
</span><span class="cx"> portfetch.tcl portmain.tcl portbuild.tcl portpatch.tcl portutil.tcl \
</span><span class="lines">@@ -13,7 +15,6 @@
</span><span class="cx"> portdistfiles.tcl fetch_common.tcl portsandbox.tcl
</span><span class="cx">
</span><span class="cx"> include $(srcdir)/../../Mk/macports.subdir.mk
</span><del>-include ../../Mk/macports.autoconf.mk
</del><span class="cx">
</span><span class="cx"> .PHONY: test
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcport10port_test_autoconftclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/port1.0/port_test_autoconf.tcl.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/port_test_autoconf.tcl.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/port1.0/port_test_autoconf.tcl.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -32,6 +32,5 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> namespace eval macports::autoconf {
</span><del>- variable macports_tcl_dir "@macports_tcl_dir@"
</del><span class="cx"> variable prefix "@prefix@"
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbasesrcregistry20Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/registry2.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/registry2.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> SRCS_AUTOCONF = registry_autoconf.tcl
</span><span class="cx"> SRCS = registry.tcl registry_util.tcl receipt_flat.tcl receipt_sqlite.tcl portimage.tcl portuninstall.tcl
</span><span class="cx"> OBJS = registry.o util.o \
</span><span class="lines">@@ -12,9 +14,8 @@
</span><span class="cx"> #graph.o graphobj.o
</span><span class="cx">
</span><span class="cx"> SHLIB_NAME= registry${SHLIB_SUFFIX}
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/registry2.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/registry2.0
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
</del><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span><span class="cx">
</span><span class="cx"> pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
</span></span></pre></div>
<a id="trunkbasesrctclobjc10Makefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/tclobjc1.0/Makefile.in (118561 => 118562)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/tclobjc1.0/Makefile.in 2014-04-04 22:38:29 UTC (rev 118561)
+++ trunk/base/src/tclobjc1.0/Makefile.in 2014-04-04 22:58:04 UTC (rev 118562)
</span><span class="lines">@@ -1,11 +1,12 @@
</span><span class="cx"> srcdir = @srcdir@
</span><span class="cx"> VPATH = @srcdir@
</span><span class="cx">
</span><ins>+include ../../Mk/macports.autoconf.mk
+
</ins><span class="cx"> OBJS= tclobjc.o tclobjc_types.o MPMethodSignatureExtensions.o objc_encoding.o
</span><span class="cx"> SHLIB_NAME= tclobjc${SHLIB_SUFFIX}
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/tclobjc1.0
</del><ins>+INSTALLDIR= ${DESTDIR}${TCL_PACKAGE_PATH}/tclobjc1.0
</ins><span class="cx">
</span><del>-include ../../Mk/macports.autoconf.mk
</del><span class="cx"> include $(srcdir)/../../Mk/macports.tea.mk
</span><span class="cx">
</span><span class="cx"> LDFLAGS+= ${OBJC_FOUNDATION_LDFLAGS}
</span></span></pre>
</div>
</div>
</body>
</html>