<!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>[117621] 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/117621">117621</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-05 14:19:14 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>macports: use a local copy of Tcl 8.5, mostly fix out-of-source build (#28001)
This change switches MacPorts to a private copy of Tcl 8.5 that will be extracted, configured, built
and installed along with MacPorts. This will allow us to drop Tcl 8.4-compatibility for older OS
releases that didn't ship Tcl 8.5 and is an important step towards Tcl 8.6 compatibility.
Most of the changes to make this happen were in aclocal.m4 (where I re-implemented a custom version
of AC_CONFIG_SUBDIRS similar to what was proposed upstream in
http://lists.gnu.org/archive/html/autoconf/2011-04/msg00000.html but never actually merged),
configure.ac and the vendor directory.
Since we want to build MacPorts against the headers of our custom Tcl, this change also required
adjusting Mk/macports.autoconf.mk.in to pass the correct path to the headers. However, we cannot use
the build directory containing the public headers, because this directory is also clobbered with
other headers such as regex.h, breaking the build later on when this file is included in pextlib1.0.
Fortunately, the Tcl autoconf macros take care of all the other details required to build against
a private Tcl.
Not having the blessed copy of Tcl around during configure lead to some other difficulties such as
the MP_TCL_PLATFORM macro, which uses $TCLSH to read the $tcl_platform variable. I have
re-implemented this as MP_PLATFORM using uname in the same way as the $tcl_platform variable is set
up in the Tcl source code.
Besides a standard Tcl distribution, this change also installs the Tcl Thread package (required for
trace mode) and Tcllib, a package containing various helpful modules for Tcl (such as an
8.6-compatible try implementation). It also drops support for the Tcl sqlite3 extension that is
present on OS X and was previously picked up by configure, but isn't used in the source.
While I was refactoring the build system I also mostly fixed out-of-source builds (see #28001,
caused all Makefile -> Makefile.in moves). The remaining issue is that the pkgIndex.tcl files
generated by pkg_mkIndex only list the files present in the build directory (i.e. all files that
have been re-inplaced or built from source), but not those from the source directory. That currently
causes the Tcl scripts in the install target to fail.
I also unified indentation in aclocal.m4.</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="#trunkbaseaclocalm4">trunk/base/aclocal.m4</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
<li><a href="#trunkbasesrcMakefilein">trunk/base/src/Makefile.in</a></li>
<li><a href="#trunkbasesrcmacports10macports_fastloadtclin">trunk/base/src/macports1.0/macports_fastload.tcl.in</a></li>
<li><a href="#trunkbasesrcpkg_mkindexshin">trunk/base/src/pkg_mkindex.sh.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbasedocMakefilein">trunk/base/doc/Makefile.in</a></li>
<li><a href="#trunkbasesrccflib10Makefilein">trunk/base/src/cflib1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrccregistryMakefilein">trunk/base/src/cregistry/Makefile.in</a></li>
<li><a href="#trunkbasesrcdarwintracelib10Makefilein">trunk/base/src/darwintracelib1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcmacports10Makefilein">trunk/base/src/macports1.0/Makefile.in</a></li>
<li><a href="#trunkbasesrcpackage10Makefilein">trunk/base/src/package1.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="#trunkbasesrcregistry20Makefilein">trunk/base/src/registry2.0/Makefile.in</a></li>
<li><a href="#trunkbasetestsMakefilein">trunk/base/tests/Makefile.in</a></li>
<li>trunk/base/vendor/</li>
<li><a href="#trunkbasevendorMakefilein">trunk/base/vendor/Makefile.in</a></li>
<li><a href="#trunkbasevendortcl8515srctargz">trunk/base/vendor/tcl8.5.15-src.tar.gz</a></li>
<li><a href="#trunkbasevendortcllib115targz">trunk/base/vendor/tcllib-1.15.tar.gz</a></li>
<li><a href="#trunkbasevendorthread270targz">trunk/base/vendor/thread2.7.0.tar.gz</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkbasedocMakefile">trunk/base/doc/Makefile</a></li>
<li><a href="#trunkbasesrccflib10Makefile">trunk/base/src/cflib1.0/Makefile</a></li>
<li><a href="#trunkbasesrccregistryMakefile">trunk/base/src/cregistry/Makefile</a></li>
<li><a href="#trunkbasesrcdarwintracelib10Makefile">trunk/base/src/darwintracelib1.0/Makefile</a></li>
<li><a href="#trunkbasesrcmacports10Makefile">trunk/base/src/macports1.0/Makefile</a></li>
<li><a href="#trunkbasesrcpackage10Makefile">trunk/base/src/package1.0/Makefile</a></li>
<li><a href="#trunkbasesrcportMakefile">trunk/base/src/port/Makefile</a></li>
<li><a href="#trunkbasesrcport10Makefile">trunk/base/src/port1.0/Makefile</a></li>
<li><a href="#trunkbasesrcregistry20Makefile">trunk/base/src/registry2.0/Makefile</a></li>
<li><a href="#trunkbasesrcthread26diff">trunk/base/src/thread2.6.diff</a></li>
<li><a href="#trunkbasesrcthread26targz">trunk/base/src/thread2.6.tar.gz</a></li>
<li><a href="#trunkbasetestsMakefile">trunk/base/tests/Makefile</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkbasedoc">trunk/base/doc/</a></li>
<li><a href="#trunkbasesrccflib10">trunk/base/src/cflib1.0/</a></li>
<li><a href="#trunkbasesrccregistry">trunk/base/src/cregistry/</a></li>
<li><a href="#trunkbasesrcdarwintracelib10">trunk/base/src/darwintracelib1.0/</a></li>
<li><a href="#trunkbasesrcpackage10">trunk/base/src/package1.0/</a></li>
<li><a href="#trunkbasesrcport">trunk/base/src/port/</a></li>
<li><a href="#trunkbasesrcport10">trunk/base/src/port1.0/</a></li>
<li><a href="#trunkbasesrcregistry20">trunk/base/src/registry2.0/</a></li>
<li><a href="#trunkbasetests">trunk/base/tests/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/Makefile.in (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/Makefile.in 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,7 +1,10 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
</ins><span class="cx"> PATH = @PATH_CLEANED@
</span><del>-SUBDIR = doc src tests
</del><ins>+SUBDIR = vendor doc src tests
</ins><span class="cx"> DISTDIR = dist
</span><span class="cx"> DISTVER =
</span><span class="cx"> DISTTAG = release_${subst .,_,${DISTVER}}
</span><span class="lines">@@ -29,13 +32,13 @@
</span><span class="cx"> echo "Source tree not configured. Use ./configure" ; \
</span><span class="cx"> fi
</span><span class="cx">
</span><del>-include Mk/macports.subdir.mk
</del><ins>+include $(srcdir)/Mk/macports.subdir.mk
</ins><span class="cx">
</span><span class="cx"> install::
</span><span class="cx"> [ ! -f "$(DESTDIR)${sysconfdir}/macports/mp_version" ] || rm -vf "$(DESTDIR)${sysconfdir}/macports/mp_version"
</span><span class="cx"> $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "$(DESTDIR)${datadir}/macports/"
</span><span class="cx"> $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 setupenv.bash "$(DESTDIR)${datadir}/macports/"
</span><del>- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"
</del><ins>+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/macports-pubkey.pem "$(DESTDIR)${datadir}/macports/"
</ins><span class="cx"> # Only run these scripts when not building in a destroot
</span><span class="cx"> ifeq ($(DESTDIR),)
</span><span class="cx"> # create run user if it doesn't exist
</span><span class="lines">@@ -91,10 +94,10 @@
</span><span class="cx"> echo "Can't find ${DSCL} / ${DSEDITGROUP}, not creating user \"${RUNUSR}\"" ; \
</span><span class="cx"> fi
</span><span class="cx"> # Add [default] tag to the central MacPorts repository, if it isn't already
</span><del>- $(TCLSH) src/upgrade_sources_conf_default.tcl "${prefix}"
</del><ins>+ $(TCLSH) $(srcdir)/src/upgrade_sources_conf_default.tcl "${prefix}"
</ins><span class="cx"> # Convert image directories (and direct mode installs) to image archives
</span><del>- $(TCLSH) src/images_to_archives.tcl "${macports_tcl_dir}"
- $(TCLSH) src/dedup_portfiles.tcl "${macports_tcl_dir}"
</del><ins>+ $(TCLSH) $(srcdir)/src/images_to_archives.tcl "${macports_tcl_dir}"
+ $(TCLSH) $(srcdir)/src/dedup_portfiles.tcl "${macports_tcl_dir}"
</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 (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/Mk/macports.autoconf.mk.in 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/Mk/macports.autoconf.mk.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,17 +1,12 @@
</span><span class="cx"> # $Id$
</span><ins>+# vim:ts=8:noet:sts=8:sw=8
</ins><span class="cx">
</span><span class="cx"> SHELL = @SHELL@
</span><span class="cx">
</span><del>-
-srcdir = @srcdir@
-VPATH = @srcdir@
-
</del><span class="cx"> CC = @CC@
</span><span class="cx"> CFLAGS = @CFLAGS@ -std=c99 $(CFLAGS_QUICHEEATERS) $(CFLAGS_PEDANTIC) $(CFLAGS_WERROR)
</span><span class="cx"> OBJCFLAGS = @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_PEDANTIC) $(CFLAGS_WERROR)
</span><del>-CPPFLAGS = @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
-TCL_DEFS = @TCL_DEFS@
-SHLIB_CFLAGS = @SHLIB_CFLAGS@
</del><ins>+CPPFLAGS = @CPPFLAGS@ @DEFS@ -I@abs_top_builddir@/src -I@abs_top_srcdir@/src -I. -I@abs_top_builddir@/@VENDOR_DESTROOT@/@TCL_PREFIX@/include
</ins><span class="cx"> CFLAGS_QUICHEEATERS = @CFLAGS_QUICHEEATERS@
</span><span class="cx"> CFLAGS_PEDANTIC = @CFLAGS_PEDANTIC@
</span><span class="cx"> CFLAGS_WERROR = @CFLAGS_WERROR@
</span><span class="lines">@@ -32,11 +27,11 @@
</span><span class="cx"> OBJC_FOUNDATION_LDFLAGS = @OBJC_FOUNDATION_LDFLAGS@
</span><span class="cx"> OBJC_FOUNDATION_LIBS = @OBJC_FOUNDATION_LIBS@
</span><span class="cx">
</span><del>-TCL_CC = @TCL_CC@
</del><ins>+LDFLAGS = @LDFLAGS@
</ins><span class="cx"> SHLIB_LD = @SHLIB_LD@
</span><span class="cx"> STLIB_LD = @STLIB_LD@
</span><del>-LDFLAGS = @LDFLAGS@
-SHLIB_LDFLAGS = @SHLIB_LDFLAGS@ ${LDFLAGS}
</del><ins>+SHLIB_CFLAGS = @SHLIB_CFLAGS@
+SHLIB_LDFLAGS = @LDFLAGS@
</ins><span class="cx"> SHLIB_SUFFIX = @SHLIB_SUFFIX@
</span><span class="cx"> TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
</span><span class="cx">
</span><span class="lines">@@ -51,8 +46,9 @@
</span><span class="cx"> XCODEBUILD = @XCODEBUILD@
</span><span class="cx"> BZIP2 = @BZIP2@
</span><span class="cx">
</span><ins>+INTREE_TCLSH = @INTREE_TCLSH@
</ins><span class="cx"> TCLSH = @TCLSH@
</span><del>-TCL_PACKAGE_DIR = @TCL_PACKAGE_DIR@
</del><ins>+TCL_PACKAGE_PATH = @TCL_PACKAGE_PATH@
</ins><span class="cx"> macports_tcl_dir = @macports_tcl_dir@
</span><span class="cx">
</span><span class="cx"> DSCL = @DSCL@
</span></span></pre></div>
<a id="trunkbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: trunk/base/aclocal.m4 (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/aclocal.m4 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/aclocal.m4 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -3,6 +3,288 @@
</span><span class="cx"> builtin(include,m4/pthread.m4)
</span><span class="cx"> builtin(include,m4/foundation.m4)
</span><span class="cx">
</span><ins>+dnl Search for a variable in a list. Run ACTION-IF-FOUND if it is in the list,
+dnl ACTION-IF-NOT-FOUND otherwise.
+dnl
+dnl Parameters:
+dnl - The name of the list.
+dnl - The name of the variable that should be searched in the list.
+dnl - An optional action to be run if found
+dnl - An optional action to be run if not found
+dnl
+dnl _MP_LIST_CONTAINS_QUOTED([listname], [varname], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+AC_DEFUN([_MP_LIST_CONTAINS], [dnl
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$$1\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$$2" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ m4_ifvaln([$3], [$3], [:])dnl
+ m4_ifvaln([$4], [else $4])dnl
+ fi
+])
+
+dnl Quote a variable and prepend it to a list.
+dnl
+dnl Parameters:
+dnl - The name of the list.
+dnl - The name of the variable that should be quoted and prepended to the
+dnl list.
+AC_DEFUN([_MP_LIST_PREPEND_QUOTED], [dnl
+ _MP_QUOTE([$2])
+ _MP_VAR_PREPEND([$1], ["$$2 "])
+])
+
+
+dnl Quote a variable and append it to a list.
+dnl
+dnl Parameters:
+dnl - The name of the list.
+dnl - The name of the variable that should be quoted and appended to the list.
+AC_DEFUN([_MP_LIST_APPEND_QUOTED], [dnl
+ _MP_QUOTE([$2])
+ AS_VAR_APPEND([$1], [" $$2"])
+])
+
+dnl Prepend the shell expansion of a value to a variable.
+dnl
+dnl Parameters:
+dnl - The name of the variable to which the second argument should be
+dnl prepended.
+dnl - The value that should be expanded using the shell expansion rules and
+dnl prepended to the variable given in the first argument.
+AC_DEFUN([_MP_VAR_PREPEND], [dnl
+ AC_REQUIRE([_MP_VAR_PREPEND_PREPARE])dnl
+ mp_fn_var_prepend $1 $2
+])
+
+dnl Define the function required for _MP_VAR_PREPEND
+AC_DEFUN([_MP_VAR_PREPEND_PREPARE], [dnl
+ mp_fn_var_prepend() {
+ eval "$[]1=\"$[]2\$$[]1\""
+ }
+])
+
+dnl Quote a variable in single quotes (escaping any existing single quotes) and
+dnl store it in itself.
+dnl
+dnl Parameters:
+dnl - The name of the variable that should be quoted using single quotes.
+AC_DEFUN([_MP_QUOTE], [dnl
+ case $$1 in
+ *\'*)
+ $1=$(AS_ECHO(["$$1"]) | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ $1="'$$1'"dnl
+])
+
+
+dnl Extract the key part of a key-value pair given as string in the form
+dnl --key=value or
+dnl -key=value
+dnl
+dnl Parameters:
+dnl - The variable name to assign to
+dnl - The (quoted, if necessary) key-value pair
+AC_DEFUN([_MP_EXTRACT_KEY], [dnl
+ $1=$(AS_ECHO([$2]) | sed -E 's/^--?([^=]+)=.*$/\1/')dnl
+])
+
+dnl Configure a project contained in a .tar.gz (or .tgz) tarball, extracting it
+dnl previously, if necessary. Different from AC_CONFIG_SUBDIRS (on which this
+dnl macro is based), you can pass parameters to the sub-configure script.
+dnl
+dnl Parameters:
+dnl - The relative path to the tarball
+dnl - The relative path to the directory that will be extracted from the
+dnl tarball and contains the configure script to be run (can be a sub directory of the extracted directory)
+dnl - Parameters to pass to the configure script
+dnl
+dnl MP_CONFIG_TARBALL([path-to-tarball], [dir-extracted-from-tarball-with-configure], [configure-parameters])
+AC_DEFUN([MP_CONFIG_TARBALL], [
+ mp_tarball="$1"
+ ac_dir=$2
+
+ if test "$no_recursion" != yes; then
+ mp_popdir=$(pwd)
+ if ! test -d "$ac_dir"; then
+ mp_tarball_vendordir="$(dirname "$mp_tarball")"
+ AS_MKDIR_P(["$mp_tarball_vendordir"])
+ AC_MSG_NOTICE([=== extracting $mp_tarball])
+ (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
+ fi
+ if ! test -d "$ac_dir"; then
+ AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
+ fi
+
+ AC_MSG_NOTICE([=== configuring in $ac_dir ($mp_popdir/$ac_dir)])
+ AS_MKDIR_P(["$ac_dir"])
+ _AC_SRCDIRS(["$ac_dir"])
+ cd "$ac_dir"
+ if test -f "$ac_srcdir/configure"; then
+ mp_sub_configure_args=
+ mp_sub_configure_keys=
+ # Compile a list of keys that have been given to the MP_CONFIG_TARBALL
+ # macro; we want to skip copying those parameters from the original
+ # configure invocation.
+ for mp_arg in $3; do
+ case $mp_arg in
+ --*=* | -*=*)
+ _MP_EXTRACT_KEY([mp_arg_key], ["$mp_arg"])
+ _MP_LIST_APPEND_QUOTED([mp_sub_configure_keys], [mp_arg_key])
+ ;
+ esac
+ _MP_LIST_APPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+ done
+ # Walk the list of arguments given to the original configure script;
+ # filter out a few common ones we likely would not want to pass along,
+ # add --disable-option-checking and filter those already given as
+ # argument to MP_CONFIG_TARBALL.
+ # Most of this code is adapted from _AC_OUTPUT_SUBDIRS in
+ # $prefix/share/autoconf/autoconf/status.m4.
+ mp_prev=
+ eval "set x $ac_configure_args"
+ shift
+ for mp_arg; do
+ if test -n "$mp_prev"; then
+ mp_prev=
+ continue
+ fi
+ case $mp_arg in
+ -cache-file \
+ | --cache-file \
+ | --cache-fil \
+ | --cache-fi \
+ | --cache-f \
+ | --cache- \
+ | --cache \
+ | --cach \
+ | --cac \
+ | --ca \
+ | --c)
+ mp_prev=cache_file
+ ;
+ -cache-file=* \
+ | --cache-file=* \
+ | --cache-fil=* \
+ | --cache-fi=* \
+ | --cache-f=* \
+ | --cache-=* \
+ | --cache=* \
+ | --cach=* \
+ | --cac=* \
+ | --ca=* \
+ | --c=*)
+ # ignore --cache-file
+ ;
+ --config-cache \
+ | -C)
+ # ignore -C
+ ;
+ -srcdir \
+ | --srcdir \
+ | -srcdi \
+ | -srcd \
+ | -src \
+ | -sr)
+ mp_prev=srcdir
+ ;
+ -srcdir=* \
+ | --srcdir=* \
+ | --srcdi=* \
+ | --srcd=* \
+ | --src=* \
+ | --sr=*)
+ # ignore --srcdir
+ ;
+ -prefix \
+ | --prefix \
+ | --prefi \
+ | --pref \
+ | --pre \
+ | --pr \
+ | --p)
+ mp_prev=prefix
+ ;
+ -prefix=* \
+ | --prefix=* \
+ | --prefi=* \
+ | --pref=* \
+ | --pre=* \
+ | --pr=* \
+ | --p=*)
+ # ignore --prefix
+ ;
+ --disable-option-checking)
+ # ignore --disable-option-checking
+ ;
+ --*=* | -*=*)
+ _MP_EXTRACT_KEY([mp_arg_key], ["$mp_arg"])
+ _MP_LIST_CONTAINS([mp_sub_configure_keys], [mp_arg_key], [], [
+ _MP_LIST_APPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+ ])
+ ;
+ *)
+ # always pass positional arguments
+ _MP_LIST_APPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+ ;
+ esac
+ done
+
+ # Now prepend some arguments that should always be present unless
+ # overriden, such as --prefix, --silent, --disable-option-checking,
+ # --cache-file, --srcdir
+ # Pass --prefix unless already given
+ mp_arg_key=prefix
+ _MP_LIST_CONTAINS([mp_sub_configure_args], [mp_arg_key], [], [
+ mp_arg="--prefix=$prefix"
+ _MP_LIST_PREPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+ ])
+
+ # Pass --silent
+ if test "$silent" = yes; then
+ mp_arg="--silent"
+ _MP_LIST_PREPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+ fi
+
+ # Always prepend --disable-option-checking to silence warnings, since
+ # different subdirs can have different --enable and --with options.
+ mp_arg="--disable-option-checking"
+ _MP_LIST_PREPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+
+ # Make the cache file name correct relative to the subdirectory.
+ case $cache_file in
+ [[\\/]]* | ?:[[\\/]]* )
+ mp_sub_cache_file=$cache_file
+ ;
+ *) # Relative name.
+ mp_sub_cache_file=$ac_top_build_prefix$cache_file
+ ;
+ esac
+ mp_arg="--cache-file=$mp_sub_cache_file"
+ _MP_LIST_PREPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+
+ mp_arg="--srcdir=$ac_srcdir"
+ _MP_LIST_APPEND_QUOTED([mp_sub_configure_args], [mp_arg])
+
+ AC_MSG_NOTICE([running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir])
+ eval "\$SHELL \$ac_srcdir/configure $mp_sub_configure_args" || AC_MSG_ERROR([configure failed for $ac_dir])
+ else
+ AC_MSG_ERROR([no configure script found in $ac_dir])
+ fi
+ AC_MSG_NOTICE([=== finished configuring in $ac_dir ($mp_popdir/$ac_dir)])
+
+ cd "$mp_popdir"
+ fi
+])
+
+
</ins><span class="cx"> #------------------------------------------------------------------------
</span><span class="cx"> # MP_CHECK_FRAMEWORK_COREFOUNDATION --
</span><span class="cx"> #
</span><span class="lines">@@ -309,18 +591,17 @@
</span><span class="cx"> dnl if with user specifies --with-no-root-privileges,
</span><span class="cx"> dnl use current user and group.
</span><span class="cx"> dnl use ~/Library/Tcl as Tcl package directory
</span><del>- AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</del><ins>+ AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</ins><span class="cx">
</span><span class="cx"> AC_ARG_WITH(no-root-privileges, [AS_HELP_STRING([--with-no-root-privileges],[Specify that MacPorts should be installed in your home directory])], [ROOTPRIVS=$withval] )
</span><span class="cx">
</span><span class="cx"> if test "${ROOTPRIVS+set}" = set; then
</span><del>-
</del><span class="cx"> # Set install-user to current user
</span><span class="cx"> AC_MSG_CHECKING([for install user])
</span><span class="cx"> DSTUSR=`id -un`
</span><span class="cx"> AC_MSG_RESULT([$DSTUSR])
</span><span class="cx"> AC_SUBST(DSTUSR)
</span><del>-
</del><ins>+
</ins><span class="cx"> # Set install-group to current user
</span><span class="cx"> AC_MSG_CHECKING([for install group])
</span><span class="cx"> DSTGRP=`id -gn`
</span><span class="lines">@@ -332,19 +613,6 @@
</span><span class="cx"> RUNUSR=`id -un`
</span><span class="cx"> AC_MSG_RESULT([$RUNUSR])
</span><span class="cx"> AC_SUBST(RUNUSR)
</span><del>-
- # Set Tcl package directory to ~/Library/Tcl
- AC_MSG_CHECKING(for Tcl package directory)
- ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
- # Convert to a native path and substitute into the output files.
- PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
- TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE}
- AC_SUBST(TCL_PACKAGE_DIR)
- if test x"${ac_cv_c_tclpkgd}" = x ; then
- AC_MSG_ERROR(Tcl package directory not found. Please specify its location with --with-tclpackage)
- else
- AC_MSG_RESULT(${ac_cv_c_tclpkgd})
- fi
</del><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> ])
</span><span class="lines">@@ -354,13 +622,13 @@
</span><span class="cx"> AC_DEFUN([MP_CHECK_RUNUSER],[
</span><span class="cx"> dnl if with user specifies --with-macports-user,
</span><span class="cx"> dnl use it. otherwise default to platform defaults
</span><del>- AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</del><ins>+ AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</ins><span class="cx">
</span><span class="cx"> AC_ARG_WITH(macports-user, [AS_HELP_STRING([--with-macports-user=USER],[Specify user to drop privileges to, if possible, during compiles etc.])], [ RUNUSR=$withval ] )
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for macports user])
</span><span class="cx"> if test "x$RUNUSR" = "x" ; then
</span><del>- RUNUSR=macports
</del><ins>+ RUNUSR=macports
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$RUNUSR])
</span><span class="lines">@@ -373,13 +641,13 @@
</span><span class="cx"> AC_DEFUN([MP_SHARED_DIRECTORY],[
</span><span class="cx"> dnl if with user specifies --with-shared-directory,
</span><span class="cx"> dnl use 0775 permissions for ${prefix} directories
</span><del>- AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</del><ins>+ AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</ins><span class="cx">
</span><span class="cx"> AC_ARG_WITH(shared-directory, [AS_HELP_STRING([--with-shared-directory],[Use 0775 permissions for installed directories])], [ SHAREDIR=$withval ] )
</span><span class="cx">
</span><span class="cx"> if test "${SHAREDIR+set}" = set; then
</span><span class="cx"> AC_MSG_CHECKING([whether to share the install directory with all members of the install group])
</span><del>- DSTMODE=0775
</del><ins>+ DSTMODE=0775
</ins><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$DSTMODE])
</span><span class="cx"> AC_SUBST(DSTMODE)
</span><span class="lines">@@ -391,13 +659,13 @@
</span><span class="cx"> AC_DEFUN([MP_CHECK_INSTALLUSER],[
</span><span class="cx"> dnl if with user specifies --with-install-user,
</span><span class="cx"> dnl use it. otherwise default to platform defaults
</span><del>- AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</del><ins>+ AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</ins><span class="cx">
</span><span class="cx"> AC_ARG_WITH(install-user, [AS_HELP_STRING([--with-install-user=USER],[Specify user ownership of installed files])], [ DSTUSR=$withval ] )
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for install user])
</span><span class="cx"> if test "x$DSTUSR" = "x" ; then
</span><del>- DSTUSR=root
</del><ins>+ DSTUSR=root
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$DSTUSR])
</span><span class="lines">@@ -409,27 +677,26 @@
</span><span class="cx"> AC_DEFUN([MP_CHECK_INSTALLGROUP],[
</span><span class="cx"> dnl if with user specifies --with-install-group,
</span><span class="cx"> dnl use it. otherwise default to platform defaults
</span><del>- AC_REQUIRE([MP_CHECK_INSTALLUSER])
</del><ins>+ AC_REQUIRE([MP_CHECK_INSTALLUSER])
</ins><span class="cx">
</span><span class="cx"> AC_ARG_WITH(install-group, [AS_HELP_STRING([--with-install-group=GROUP],[Specify group ownership of installed files])], [ DSTGRP=$withval ] )
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for install group])
</span><span class="cx"> if test "x$DSTGRP" = "x" ; then
</span><del>-
- case $host_os in
- darwin*)
- DSTGRP="admin"
- ;
- freebsd*)
- DSTGRP="wheel"
- ;
- linux*)
- DSTGRP="root"
- ;
- *)
- DSTGRP="wheel"
- ;
- esac
</del><ins>+ case $host_os in
+ darwin*)
+ DSTGRP="admin"
+ ;
+ freebsd*)
+ DSTGRP="wheel"
+ ;
+ linux*)
+ DSTGRP="root"
+ ;
+ *)
+ DSTGRP="wheel"
+ ;
+ esac
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$DSTGRP])
</span><span class="lines">@@ -442,13 +709,13 @@
</span><span class="cx"> dnl if with user specifies --with-directory-mode,
</span><span class="cx"> dnl use the specified permissions for ${prefix} directories
</span><span class="cx"> dnl otherwise use 0755
</span><del>- AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</del><ins>+ AC_REQUIRE([MP_PATH_MPCONFIGDIR])
</ins><span class="cx">
</span><span class="cx"> AC_ARG_WITH(directory-mode, [AS_HELP_STRING([--with-directory-mode=MODE],[Specify directory mode of installed directories])], [ DSTMODE=$withval ] )
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([what permissions to use for installation directories])
</span><span class="cx"> if test "x$DSTMODE" = "x" ; then
</span><del>- DSTMODE=0755
</del><ins>+ DSTMODE=0755
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$DSTMODE])
</span><span class="lines">@@ -458,87 +725,85 @@
</span><span class="cx"> # MP_PATH_APPLICATIONS
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> AC_DEFUN([MP_PATH_APPLICATIONS],[
</span><del>- AC_REQUIRE([MP_CHECK_INSTALLUSER])
</del><ins>+ AC_REQUIRE([MP_CHECK_INSTALLUSER])
</ins><span class="cx">
</span><del>- AC_ARG_WITH(applications-dir,[AS_HELP_STRING([--with-applications-dir],[Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
</del><ins>+ AC_ARG_WITH(applications-dir,[AS_HELP_STRING([--with-applications-dir],[Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
</ins><span class="cx">
</span><del>- oldprefix=$prefix
- if test "x$prefix" = "xNONE" ; then
- prefix=$ac_default_prefix
- fi
- AC_MSG_CHECKING([for Applications installation directory])
</del><ins>+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
+ AC_MSG_CHECKING([for Applications installation directory])
</ins><span class="cx">
</span><span class="cx"> if test "x$MPAPPLICATIONSDIR" = "x" ; then
</span><del>- if test "$DSTUSR" = "root" ; then
- MPAPPLICATIONSDIR="/Applications/MacPorts"
- else
- MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
- fi
</del><ins>+ if test "$DSTUSR" = "root" ; then
+ MPAPPLICATIONSDIR="/Applications/MacPorts"
+ else
+ MPAPPLICATIONSDIR="$(eval echo ~$DSTUSR)/Applications/MacPorts"
+ fi
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$MPAPPLICATIONSDIR])
</span><del>- AC_SUBST(MPAPPLICATIONSDIR)
- prefix=$oldprefix
</del><ins>+ AC_SUBST(MPAPPLICATIONSDIR)
+ prefix=$oldprefix
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> # MP_PATH_FRAMEWORKS
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> AC_DEFUN([MP_PATH_FRAMEWORKS],[
</span><del>- AC_REQUIRE([MP_CHECK_INSTALLUSER])
</del><ins>+ AC_REQUIRE([MP_CHECK_INSTALLUSER])
</ins><span class="cx">
</span><del>- AC_ARG_WITH(frameworks-dir,[AS_HELP_STRING([--with-frameworks-dir],[Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
</del><ins>+ AC_ARG_WITH(frameworks-dir,[AS_HELP_STRING([--with-frameworks-dir],[Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
</ins><span class="cx">
</span><del>- oldprefix=$prefix
- if test "x$prefix" = "xNONE" ; then
- prefix=$ac_default_prefix
- fi
- AC_MSG_CHECKING([for Frameworks installation directory])
</del><ins>+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
+ AC_MSG_CHECKING([for Frameworks installation directory])
</ins><span class="cx">
</span><span class="cx"> if test "x$MPFRAMEWORKSDIR" = "x" ; then
</span><span class="cx"> MPFRAMEWORKSDIR="${prefix}/Library/Frameworks"
</span><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> AC_MSG_RESULT([$MPFRAMEWORKSDIR])
</span><del>- AC_SUBST(MPFRAMEWORKSDIR)
- prefix=$oldprefix
</del><ins>+ AC_SUBST(MPFRAMEWORKSDIR)
+ prefix=$oldprefix
</ins><span class="cx"> ])
</span><span class="cx">
</span><del>-
</del><span class="cx"> # MP_UNIVERSAL_OPTIONS
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> AC_DEFUN([MP_UNIVERSAL_OPTIONS],[
</span><del>- AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
</del><ins>+ AC_ARG_WITH(universal-archs,[AS_HELP_STRING([--with-universal-archs="CPU"],[Universal CPU architectures (space separated)])], UNIVERSAL_ARCHS=${withval})
</ins><span class="cx">
</span><del>- if test "x$UNIVERSAL_ARCHS" = "x"; then
- case "$MACOSX_VERSION" in
- 10.1[[0-9]]*)
- UNIVERSAL_ARCHS="x86_64 i386"
- ;;
- 10.[[0-5]]*)
- UNIVERSAL_ARCHS="i386 ppc"
- ;;
- *)
- UNIVERSAL_ARCHS="x86_64 i386"
- ;;
- esac
- fi
</del><ins>+ if test "x$UNIVERSAL_ARCHS" = "x"; then
+ case "$MACOSX_VERSION" in
+ 10.1[[0-9]]*)
+ UNIVERSAL_ARCHS="x86_64 i386"
+ ;
+ 10.[[0-5]]*)
+ UNIVERSAL_ARCHS="i386 ppc"
+ ;
+ *)
+ UNIVERSAL_ARCHS="x86_64 i386"
+ ;
+ esac
+ fi
</ins><span class="cx">
</span><del>- UNIVERSAL_ARCHFLAGS=
- for arch in $UNIVERSAL_ARCHS; do
- UNIVERSAL_ARCHFLAGS="$UNIVERSAL_ARCHFLAGS -arch $arch"
- done
</del><ins>+ UNIVERSAL_ARCHFLAGS=
+ for arch in $UNIVERSAL_ARCHS; do
+ UNIVERSAL_ARCHFLAGS="$UNIVERSAL_ARCHFLAGS -arch $arch"
+ done
</ins><span class="cx">
</span><del>- AC_MSG_CHECKING([for Universal CPU architectures])
- AC_MSG_RESULT([$UNIVERSAL_ARCHS])
- AC_SUBST(UNIVERSAL_ARCHS)
- AC_SUBST(UNIVERSAL_ARCHFLAGS)
</del><ins>+ AC_MSG_CHECKING([for Universal CPU architectures])
+ AC_MSG_RESULT([$UNIVERSAL_ARCHS])
+ AC_SUBST(UNIVERSAL_ARCHS)
+ AC_SUBST(UNIVERSAL_ARCHFLAGS)
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> # MP_LIB_MD5
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> # Check for an md5 implementation
</span><span class="cx"> AC_DEFUN([MP_LIB_MD5],[
</span><del>-
</del><span class="cx"> # Check for libmd from FreeBSD, which is preferred
</span><span class="cx"> AC_CHECK_LIB([md], [MD5File],[
</span><span class="cx"> AC_CHECK_HEADERS([md5.h sha.h], ,[
</span><span class="lines">@@ -581,181 +846,24 @@
</span><span class="cx"> AC_REQUIRE([MP_CHECK_FRAMEWORK_IOKIT])
</span><span class="cx"> AC_REQUIRE([MP_CHECK_FUNCTION_CFNOTIFICATIONCENTERGETDARWINNOTIFYCENTER])
</span><span class="cx">
</span><del>- AC_MSG_CHECKING(for whether we will build daemondo)
- result=no
</del><ins>+ AC_MSG_CHECKING(for whether we will build daemondo)
+ result=no
</ins><span class="cx"> case $host_os in
</span><del>- darwin*)
- if test "x$mp_cv_have_framework_corefoundation" == "xyes" &&
- test "x$mp_cv_have_framework_systemconfiguration" == "xyes" &&
- test "x$mp_cv_have_framework_iokit" == "xyes" &&
- test "x$mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter" == "xyes"; then
- result=yes
- EXTRA_PROGS="$EXTRA_PROGS daemondo"
- AC_CONFIG_FILES([src/programs/daemondo/Makefile])
- fi
</del><ins>+ darwin*)
+ if test "x$mp_cv_have_framework_corefoundation" == "xyes" &&
+ test "x$mp_cv_have_framework_systemconfiguration" == "xyes" &&
+ test "x$mp_cv_have_framework_iokit" == "xyes" &&
+ test "x$mp_cv_have_function_cfnotificationcentergetdarwinnotifycenter" == "xyes"; then
+ result=yes
+ EXTRA_PROGS="$EXTRA_PROGS daemondo"
+ AC_CONFIG_FILES([src/programs/daemondo/Makefile])
+ fi
</ins><span class="cx"> ;
</span><del>- *)
</del><ins>+ *)
</ins><span class="cx"> esac
</span><span class="cx"> AC_MSG_RESULT(${result})
</span><span class="cx"> ])
</span><span class="cx">
</span><del>-#------------------------------------------------------------------------
-# MP_TCL_PACKAGE_DIR --
-#
-# Locate the correct directory for Tcl package installation
-#
-# Arguments:
-# None.
-#
-# Requires:
-# TCLVERSION must be set
-# CYGPATH must be set
-# TCLSH must be set
-#
-# Results:
-#
-# Adds a --with-tclpackage switch to configure.
-# Result is cached.
-#
-# Substs the following vars:
-# TCL_PACKAGE_DIR
-#------------------------------------------------------------------------
-
-AC_DEFUN(MP_TCL_PACKAGE_DIR, [
- AC_REQUIRE([MP_CHECK_INSTALLUSER])
-
- AC_MSG_CHECKING(for Tcl package directory)
-
- AC_ARG_WITH(tclpackage, [ --with-tclpackage Tcl package installation directory.], with_tclpackagedir=${withval})
-
- if test x"${with_tclpackagedir}" != x ; then
- ac_cv_c_tclpkgd=${with_tclpackagedir}
- else
- AC_CACHE_VAL(ac_cv_c_tclpkgd, [
- # Use the value from --with-tclpackage, if it was given
-
- if test x"${with_tclpackagedir}" != x ; then
- echo "tclpackagedir"
- ac_cv_c_tclpkgd=${with_tclpackagedir}
- else
- # On darwin we can do some intelligent guessing
- case $host_os in
- darwin*)
- tcl_autopath=`echo 'puts -nonewline \$auto_path' | $TCLSH`
- for path in $tcl_autopath; do
- if test "$DSTUSR" = "root" ; then
- if test "$path" = "/Library/Tcl"; then
- ac_cv_c_tclpkgd="$path"
- break
- fi
- if test "$path" = "/System/Library/Tcl"; then
- if test -d "$path"; then
- ac_cv_c_tclpkgd="$path"
- break
- fi
- fi
- elif test "$path" = "~/Library/Tcl"; then
- ac_cv_c_tclpkgd=`eval echo ~$DSTUSR/Library/Tcl`
- break
- fi
- done
- ;;
- esac
- if test x"${ac_cv_c_tclpkgd}" = x ; then
- # Fudge a path from the first entry in the auto_path
- tcl_pkgpath=`echo 'puts -nonewline [[lindex \$auto_path 0]]' | $TCLSH`
- if test -d "$tcl_pkgpath"; then
- ac_cv_c_tclpkgd="$tcl_pkgpath"
- fi
- # If the first entry does not exist, do nothing
- fi
- fi
- ])
- fi
-
- if test x"${ac_cv_c_tclpkgd}" = x ; then
- AC_MSG_ERROR(Tcl package directory not found. Please specify its location with --with-tclpackage)
- else
- AC_MSG_RESULT(${ac_cv_c_tclpkgd})
- fi
-
- # Convert to a native path and substitute into the output files.
-
- PACKAGE_DIR_NATIVE=`${CYGPATH} ${ac_cv_c_tclpkgd}`
-
- TCL_PACKAGE_DIR=${PACKAGE_DIR_NATIVE}
-
- AC_SUBST(TCL_PACKAGE_DIR)
-])
-
-# MP_PROG_TCLSH
-#---------------------------------------
-AC_DEFUN([MP_PROG_TCLSH],[
-
-
- case $host_os in
- freebsd*)
- # FreeBSD installs a dummy tclsh (annoying)
- # Look for a real versioned tclsh with threads first
- # Look for a real versioned tclsh without threads second
- AC_PATH_PROG([TCLSH], [tclsh${TCL_VERSION}-threads tclsh${TCL_VERSION} tclsh])
- ;
- *)
- # Otherwise, look for a non-versioned tclsh
- AC_PATH_PROG([TCLSH], [tclsh tclsh${TCL_VERSION}])
- ;
- esac
- if test "x$TCLSH" = "x" ; then
- AC_MSG_ERROR([Could not find tclsh])
- fi
-
- AC_SUBST(TCLSH)
-])
-
-# MP_TCL_PACKAGE
-# Determine if a Tcl package is present.
-#
-# Arguments:
-# Package name (may include the version)
-#
-# Syntax:
-# MP_TCL_PACKAGE (package, [action-if-found], [action-if-not-found])
-#
-# Requires:
-# TCLSH must be set
-#
-# Results:
-# Execute action-if-found or action-if-not-found
-#---------------------------------------
-AC_DEFUN([MP_TCL_PACKAGE],[
- AC_MSG_CHECKING([for Tcl $1 package])
- package_present=`echo 'if {[[catch {package require $1}]]} {puts -nonewline 0} else {puts -nonewline 1}' | $TCLSH`
- AS_IF([test "$package_present" = "1"], [$2], [$3])[]
-])
-
-# MP_TCL_THREAD_SUPPORT
-# Determine if thread support is available in tclsh.
-#
-# Arguments:
-# None.
-#
-# Requires:
-# TCLSH must be set
-#
-# Results:
-# Fails if thread support isn't available.
-#---------------------------------------
-AC_DEFUN([MP_TCL_THREAD_SUPPORT],[
- AC_MSG_CHECKING([whether tclsh was compiled with threads])
- tcl_threadenabled=`echo 'puts -nonewline [[info exists tcl_platform(threaded)]]' | $TCLSH`
- if test "$tcl_threadenabled" = "1" ; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([tcl wasn't compiled with threads enabled])
- fi
-])
-
</del><span class="cx"> # MP_LIBCURL_FLAGS
</span><span class="cx"> # Sets the flags to compile with libcurl.
</span><span class="cx"> #
</span><span class="lines">@@ -841,42 +949,14 @@
</span><span class="cx"> LDFLAGS_SQLITE3="-L${sqlite3prefix}/lib -lsqlite3"
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # check if we have sqlite3ext.h, using the appropriate cppflags
- CPPFLAGS_OLD="${CPPFLAGS}"
- CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
- AC_CHECK_HEADERS(sqlite3ext.h)
- CPPFLAGS="${CPPFLAGS_OLD}"
</del><ins>+ # check if we have sqlite3ext.h, using the appropriate cppflags
+ CPPFLAGS_OLD="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${CFLAGS_SQLITE3}"
+ AC_CHECK_HEADERS(sqlite3ext.h)
+ CPPFLAGS="${CPPFLAGS_OLD}"
</ins><span class="cx">
</span><span class="cx"> AC_SUBST(CFLAGS_SQLITE3)
</span><span class="cx"> AC_SUBST(LDFLAGS_SQLITE3)
</span><del>-
- # now the sqlite Tcl bindings
- AC_ARG_WITH(tcl-sqlite3,
- AS_HELP_STRING([--with-tcl-sqlite3=DIR],
- [directory for Tcl sqlite3 (default /usr/lib/sqlite3)]),
- [mp_sqlite3_dir=$withval])
-
- if test "x$mp_sqlite3_dir" = "x"; then
- case $host_os in
- darwin*)
- mp_sqlite3_dir="/usr/lib/sqlite3"
- ;;
- freebsd*)
- mp_sqlite3_dir="/usr/local/lib/sqlite"
- ;;
- *)
- mp_sqlite3_dir="/usr/share/tcl${TCL_VERSION}/sqlite3"
- ;;
- esac
- fi
-
- AC_CACHE_CHECK([for Tcl sqlite3 location], [mp_cv_sqlite3_dir],
- [mp_cv_sqlite3_dir=
- test -r "${mp_sqlite3_dir}/pkgIndex.tcl" && mp_cv_sqlite3_dir=$mp_sqlite3_dir
- ])
-
- SQLITE3_TCL_DIR=$mp_cv_sqlite3_dir
- AC_SUBST(SQLITE3_TCL_DIR)
</del><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> dnl This macro tests if the compiler supports GCC's
</span><span class="lines">@@ -1151,7 +1231,7 @@
</span><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> #------------------------------------------------------------------------
</span><del>-# MP_TCL_PLATFORM --
</del><ins>+# MP_PLATFORM --
</ins><span class="cx"> #
</span><span class="cx"> # Export target platform and major version
</span><span class="cx"> #
</span><span class="lines">@@ -1159,7 +1239,7 @@
</span><span class="cx"> # none.
</span><span class="cx"> #
</span><span class="cx"> # Requires:
</span><del>-# TCLSH must be set.
</del><ins>+# none.
</ins><span class="cx"> #
</span><span class="cx"> # Depends:
</span><span class="cx"> # none.
</span><span class="lines">@@ -1168,10 +1248,10 @@
</span><span class="cx"> # Defines OS_PLATFORM and OS_MAJOR.
</span><span class="cx"> #
</span><span class="cx"> #------------------------------------------------------------------------
</span><del>-AC_DEFUN([MP_TCL_PLATFORM],[
- AC_MSG_CHECKING([for Tcl target platform])
- OS_PLATFORM=`echo 'puts -nonewline [[string tolower \$tcl_platform(os)]]' | $TCLSH`
- OS_MAJOR=`echo 'puts -nonewline [[lindex [split \$tcl_platform(osVersion) .] 0]]' | $TCLSH`
</del><ins>+AC_DEFUN([MP_PLATFORM],[
+ AC_MSG_CHECKING([for target platform])
+ OS_PLATFORM=`uname -s | tr '[[:upper:]]' '[[:lower:]]'`
+ OS_MAJOR=`uname -r | cut -d '.' -f 1`
</ins><span class="cx"> AC_MSG_RESULT($OS_PLATFORM $OS_MAJOR)
</span><span class="cx"> AC_SUBST(OS_PLATFORM)
</span><span class="cx"> AC_SUBST(OS_MAJOR)
</span><span class="lines">@@ -1186,7 +1266,7 @@
</span><span class="cx"> # none.
</span><span class="cx"> #
</span><span class="cx"> # Requires:
</span><del>-# OS_PLATOFRM and OS_MAJOR from MP_TCL_PLATFORM.
</del><ins>+# OS_PLATOFRM and OS_MAJOR from MP_PLATFORM.
</ins><span class="cx"> #
</span><span class="cx"> # Depends:
</span><span class="cx"> # none.
</span><span class="lines">@@ -1197,7 +1277,7 @@
</span><span class="cx"> #
</span><span class="cx"> #------------------------------------------------------------------------
</span><span class="cx"> AC_DEFUN([MP_TRACEMODE_SUPPORT],[
</span><del>- AC_REQUIRE([MP_TCL_PLATFORM])
</del><ins>+ AC_REQUIRE([MP_PLATFORM])
</ins><span class="cx">
</span><span class="cx"> AC_CHECK_FUNCS([kqueue kevent])
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/configure.ac 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -241,8 +241,6 @@
</span><span class="cx"> readline/history.h readline/readline.h spawn.h sys/cdefs.h sys/event.h sys/fcntl.h sys/file.h \
</span><span class="cx"> sys/paths.h sys/socket.h sys/sysctl.h utime.h])
</span><span class="cx">
</span><del>-INCLUDES="-I.. -I. $INCLUDES"
-
</del><span class="cx"> # Checks for library functions.
</span><span class="cx"> AC_CHECK_FUNCS([OSAtomicCompareAndSwap32 OSAtomicCompareAndSwap64 OSAtomicCompareAndSwapPtr bzero \
</span><span class="cx"> clearenv copyfile fgetln flock fls kqueue lockf memset posix_spawn setmode strcasecmp strlcat \
</span><span class="lines">@@ -275,27 +273,9 @@
</span><span class="cx"> AC_DEFINE([MIN_USABLE_UID], [500], [Lowest non-system-reserved UID.])
</span><span class="cx"> AC_DEFINE([MIN_USABLE_GID], [500], [Lowest non-system-reserved GID.])
</span><span class="cx">
</span><del>-# Load tclConfig.sh
-SC_PATH_TCLCONFIG
-SC_LOAD_TCLCONFIG
</del><ins>+# Substitute platform for base compatibility check
+MP_PLATFORM
</ins><span class="cx">
</span><del>-# Check for Tcl public headers
-dnl XXX hardwire CYGPATH (CYGPATH must be set for SC_PUBLIC_TCL_HEADERS)
-CYGPATH=echo
-SC_PUBLIC_TCL_HEADERS
-
-# Check for tclsh binary
-MP_PROG_TCLSH
-
-# Substitute Tcl platform for base compatibility check
-MP_TCL_PLATFORM
-
-# Check for Tcl package path
-MP_TCL_PACKAGE_DIR
-
-# Check if thread is enabled.
-MP_TCL_THREAD_SUPPORT
-
</del><span class="cx"> ## libcurl
</span><span class="cx"> MP_LIBCURL_FLAGS
</span><span class="cx">
</span><span class="lines">@@ -310,91 +290,112 @@
</span><span class="cx"> # check whether trace mode is supported on this platform
</span><span class="cx"> MP_TRACEMODE_SUPPORT
</span><span class="cx">
</span><ins>+# misc variables that need to be expanded for substitution into tcl
+oldprefix=$prefix
+oldexec_prefix=$exec_prefix
+if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+fi
+if test "x$exec_prefix" = "xNONE" ; then
+ exec_prefix=$prefix
+fi
+eval "prefix_expanded=$prefix"
+eval "exec_prefix_expanded=$exec_prefix"
+AC_SUBST(prefix_expanded)
+# do this twice, since there is a nested variable of
+# ${prefix} inside of ${sysconfdir}
+eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
+eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR_EXPANDED"
+AC_SUBST(MPCONFIGDIR_EXPANDED)
+eval "localstatedir_expanded=$localstatedir"
+AC_SUBST(localstatedir_expanded)
+eval "macports_tcl_dir=${datadir}/macports/Tcl"
+eval "macports_tcl_dir=$macports_tcl_dir"
+AC_SUBST(macports_tcl_dir)
+# Compute the libexec dir for the vendor packages
+eval "macports_libexec_dir=${libexecdir}/macports"
+eval "macports_libexec_dir=$macports_libexec_dir"
+prefix=$oldprefix
+exec_prefix=$oldexec_prefix
+
</ins><span class="cx"> # Determine if we need to install some bundled packages
</span><del>-OUR_INCLUDED_PACKAGES=
</del><ins>+VENDOR_PACKAGES=
</ins><span class="cx">
</span><del>-## Thread package.
-AC_ARG_WITH(
- included-tclthread,
- AS_HELP_STRING([--with-included-tclthread],
- [install included Thread package.]),
- [with_included_tclthread=$withval],
- [with_included_tclthread="unspecified"])
</del><ins>+## Tcl package
+tcl_version=8.5.15
+tcl_thread_version=2.7.0
+tcllib_version=1.15
+MP_CONFIG_TARBALL([vendor/tcl${tcl_version}-src.tar.gz], [vendor/tcl${tcl_version}/unix], [--prefix=${macports_libexec_dir} --enable-threads])
+VENDOR_TCL_SUBDIR=tcl${tcl_version}/unix
+VENDOR_TCL_INSTALL="install-binaries install-libraries"
+AC_SUBST(VENDOR_TCL_SUBDIR)
+AC_SUBST(VENDOR_TCL_INSTALL)
</ins><span class="cx">
</span><del>-# Check if thread package is already installed.
-if test "x$with_included_tclthread" = "xunspecified" ; then
- MP_TCL_PACKAGE(
- [Thread],
- [AC_MSG_RESULT([yes]); with_included_tclthread=no],
- [AC_MSG_RESULT([no]); with_included_tclthread=yes])
-fi
</del><ins>+# Set up some variables needed by MacPorts' Tcl setup
+VENDOR_DESTROOT=vendor/vendor-destroot
+AC_SUBST(VENDOR_DESTROOT)
</ins><span class="cx">
</span><del>-# If thread package isn't installed, configure and install thread package.
-if test "$with_included_tclthread" = "yes"; then
- OUR_INCLUDED_PACKAGES="$OUR_INCLUDED_PACKAGES thread2.6"
- AC_CONFIG_SUBDIRS([src/thread2.6])
- # Extract thread package
- (cd src/; gzip -d < thread2.6.tar.gz | tar xf -)
- # Patch thread package (so thread2.6 is the vanilla distribution directory)
- patch -p0 < src/thread2.6.diff
-fi
</del><ins>+## Tcl Thread package
+# Tcl supports Threads internally, but to use threads from Tcl code we need
+# this package
+MP_CONFIG_TARBALL([vendor/thread${tcl_thread_version}.tar.gz], [vendor/thread${tcl_thread_version}], [--prefix=${macports_libexec_dir}])
+VENDOR_TCLTHREAD_SUBDIR=thread${tcl_thread_version}
+VENDOR_TCLTHREAD_INSTALL="install-binaries install-libraries"
+AC_SUBST(VENDOR_TCLTHREAD_SUBDIR)
+AC_SUBST(VENDOR_TCLTHREAD_INSTALL)
</ins><span class="cx">
</span><del>-# Allows building of shared libraries
</del><ins>+## Tcllib package
+# Note that Tcllib needs a Tcl interpreter during installation; it will *not*
+# be the one we configure above, because that one isn't built yet. That's not
+# a problem, though -- it's only used during installation.
+MP_CONFIG_TARBALL([vendor/tcllib-${tcllib_version}.tar.gz], [vendor/tcllib-${tcllib_version}], [--prefix=${macports_libexec_dir}])
+VENDOR_PACKAGES="$VENDOR_PACKAGES tcllib-${tcllib_version}"
+VENDOR_TCLLIB_SUBDIR=tcllib-${tcllib_version}
+VENDOR_TCLLIB_INSTALL="install-libraries"
+AC_SUBST(VENDOR_TCLLIB_SUBDIR)
+AC_SUBST(VENDOR_TCLLIB_INSTALL)
+
+# Load tclConfig.sh from our private install of Tcl
+AC_MSG_CHECKING([for Tcl configuration])
+TCL_BIN_DIR=`(cd vendor/tcl${tcl_version}/unix; pwd)`
+AC_MSG_RESULT([found $TCL_BIN_DIR/tclConfig.sh])
+SC_LOAD_TCLCONFIG
</ins><span class="cx"> SC_ENABLE_SHARED
</span><span class="cx">
</span><del>-# Pull compiler / linker values from tclConfig.sh
-LDFLAGS_DEBUG=${TCL_LDFLAGS_DEBUG}
-LDFLAGS_OPTIMIZE=${TCL_LDFLAGS_OPTIMIZE}
</del><ins>+# Pull compiler/linker values from tclConfig.sh
</ins><span class="cx"> SHLIB_LD=${TCL_SHLIB_LD}
</span><span class="cx"> STLIB_LD=${TCL_STLIB_LD}
</span><span class="cx"> SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
</span><span class="cx"> SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
</span><ins>+TCLSH=${TCL_EXEC_PREFIX}/bin/tclsh${TCL_VERSION}
+INTREE_TCLSH=${TCL_BIN_DIR}/tclsh
+# strip possible whitespace at the end of TCL_PACKAGE_PATH
+eval "TCL_PACKAGE_PATH=${TCL_PACKAGE_PATH}"
</ins><span class="cx">
</span><del>-AC_SUBST(INCLUDES)
</del><ins>+AC_SUBST(SHLIB_LD)
</ins><span class="cx"> AC_SUBST(STLIB_LD)
</span><del>-AC_SUBST(SHLIB_LD)
</del><span class="cx"> AC_SUBST(SHLIB_CFLAGS)
</span><del>-AC_SUBST(SHLIB_LDFLAGS)
</del><span class="cx"> AC_SUBST(SHLIB_SUFFIX)
</span><del>-AC_SUBST(TCL_DEFS)
</del><ins>+AC_SUBST(TCL_PREFIX)
+AC_SUBST(TCL_VERSION)
+AC_SUBST(TCL_PACKAGE_PATH)
</ins><span class="cx"> AC_SUBST(TCL_STUB_LIB_SPEC)
</span><del>-AC_SUBST(TCL_CC)
-AC_SUBST(OUR_INCLUDED_PACKAGES)
</del><ins>+AC_SUBST(TCL_SRC_DIR)
+AC_SUBST(TCLSH)
+AC_SUBST(INTREE_TCLSH)
</ins><span class="cx">
</span><del>-# misc variables that need to be expanded for substitution into tcl
</del><ins>+INCLUDES="-I.. -I. $INCLUDES"
+AC_SUBST(INCLUDES)
</ins><span class="cx">
</span><del>-oldprefix=$prefix
-if test "x$prefix" = "xNONE" ; then
- prefix=$ac_default_prefix
-fi
-
</del><span class="cx"> # Check if there's an existing DP/MP install too old to upgrade
</span><span class="cx"> MP_CHECK_OLDLAYOUT
</span><span class="cx">
</span><del>-eval "prefix_expanded=$prefix"
-AC_SUBST(prefix_expanded)
-# do this twice, since there is a nested variable of
-# ${prefix} inside of ${sysconfdir}
-eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR"
-eval "MPCONFIGDIR_EXPANDED=$MPCONFIGDIR_EXPANDED"
-AC_SUBST(MPCONFIGDIR_EXPANDED)
-eval "localstatedir_expanded=$localstatedir"
-AC_SUBST(localstatedir_expanded)
-eval "macports_tcl_dir=${datadir}/macports/Tcl"
-eval "macports_tcl_dir=$macports_tcl_dir"
-AC_SUBST(macports_tcl_dir)
-
-prefix=$oldprefix
-
-dnl man page settings (compressed, links, etc)
-dnl
-dnl SC_CONFIG_MANPAGES
-
</del><span class="cx"> # Output
</span><span class="cx"> AC_CONFIG_FILES([
</span><span class="cx"> Doxyfile
</span><span class="cx"> Makefile
</span><span class="cx"> Mk/macports.autoconf.mk
</span><ins>+ doc/Makefile
</ins><span class="cx"> doc/base.mtree
</span><span class="cx"> doc/macosx.mtree
</span><span class="cx"> doc/macports.conf
</span><span class="lines">@@ -403,16 +404,26 @@
</span><span class="cx"> portmgr/freebsd/Makefile
</span><span class="cx"> setupenv.bash
</span><span class="cx"> src/Makefile
</span><ins>+ src/cflib1.0/Makefile
+ src/cregistry/Makefile
+ src/darwintracelib1.0/Makefile
</ins><span class="cx"> src/machista1.0/Makefile
</span><ins>+ src/macports1.0/Makefile
</ins><span class="cx"> src/macports1.0/macports_autoconf.tcl
</span><ins>+ src/macports1.0/macports_fastload.tcl
</ins><span class="cx"> src/macports1.0/macports_test_autoconf.tcl
</span><del>- src/macports1.0/macports_fastload.tcl
</del><ins>+ src/package1.0/Makefile
</ins><span class="cx"> src/package1.0/package_test_autoconf.tcl
</span><span class="cx"> src/pextlib1.0/Makefile
</span><ins>+ src/port/Makefile
+ src/port1.0/Makefile
</ins><span class="cx"> src/port1.0/port_autoconf.tcl
</span><span class="cx"> src/port1.0/port_test_autoconf.tcl
</span><span class="cx"> src/programs/Makefile
</span><ins>+ src/registry2.0/Makefile
</ins><span class="cx"> src/registry2.0/registry_autoconf.tcl
</span><ins>+ tests/Makefile
+ vendor/Makefile
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> AC_CONFIG_FILES([src/pkg_mkindex.sh], [chmod +x src/pkg_mkindex.sh])
</span></span></pre></div>
<a id="trunkbasedoc"></a>
<div class="propset"><h4>Property changes: trunk/base/doc</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">pubkeys.conf
</span><span class="cx">base.mtree
</span><span class="cx">prefix.mtree
</span><span class="cx">macosx.mtree
</span><span class="cx">*[0-9].gz
</span><span class="cx"> + Makefile
</span><span class="cx">macports.conf
</span><span class="cx">pubkeys.conf
</span><span class="cx">base.mtree
</span><span class="cx">prefix.mtree
</span><span class="cx">macosx.mtree
</span><span class="cx">*[0-9].gz
</span><a id="trunkbasedocMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/doc/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/doc/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/doc/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,60 +0,0 @@
</span><del>-MAN1= port.1
-MAN5= macports.conf.5
-MAN7= portfile.7 portstyle.7 porthier.7 portgroup.7
-CONF= archive_sites.conf macports.conf pubkeys.conf sources.conf variants.conf
-INSTALLDIR= ${DESTDIR}${prefix}
-TOPSRCDIR= ..
-
-ifneq ($(MAKECMDGOALS),distclean)
-include ../Mk/macports.autoconf.mk
-endif
-
-all: ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
-
-clean:
- rm -f *.{1,5,7}.gz
-
-test:
-
-distclean: clean
- rm -f macports.conf base.mtree macosx.mtree prefix.mtree pubkeys.conf
-
-%.1.gz: %.1
- gzip -c $^ > $@
-
-%.5.gz: %.5
- gzip -c $^ > $@
-
-%.7.gz: %.7
- gzip -c $^ > $@
-
-install: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}"
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${DESTDIR}${mpconfigdir}"
-
- < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
- < base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
-
- for f in ${CONF}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f "${DESTDIR}${mpconfigdir}/$${f}.default"; \
- if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \
- set -x; \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f "${DESTDIR}${mpconfigdir}"; \
- fi; \
- done
-
- # delete old uncompressed man pages if they exist
- for m in ${MAN1}; do rm -f "${INSTALLDIR}/share/man/man1/$$m" ; done
- for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
- for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
-
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}/share/macports/install"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
</del></span></pre></div>
<a id="trunkbasedocMakefileinfromrev117613trunkbasedocMakefile"></a>
<div class="copfile"><h4>Copied: trunk/base/doc/Makefile.in (from rev 117613, trunk/base/doc/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/doc/Makefile.in (rev 0)
+++ trunk/base/doc/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+MAN1= port.1
+MAN5= macports.conf.5
+MAN7= portfile.7 portstyle.7 porthier.7 portgroup.7
+CONF= archive_sites.conf macports.conf pubkeys.conf sources.conf variants.conf
+INSTALLDIR= ${DESTDIR}${prefix}
+TOPSRCDIR= ..
+
+ifneq ($(MAKECMDGOALS),distclean)
+include ../Mk/macports.autoconf.mk
+endif
+
+all: ${MAN1:.1=.1.gz} ${MAN5:.5=.5.gz} ${MAN7:.7=.7.gz}
+
+clean:
+ rm -f *.{1,5,7}.gz
+
+test:
+
+distclean: clean
+ rm -f macports.conf base.mtree macosx.mtree prefix.mtree pubkeys.conf
+
+%.1.gz: %.1
+ gzip -c $^ > $@
+
+%.5.gz: %.5
+ gzip -c $^ > $@
+
+%.7.gz: %.7
+ gzip -c $^ > $@
+
+install: all
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}"
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${DESTDIR}${mpconfigdir}"
+
+ < prefix.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
+ < base.mtree $(MTREE) -U -e -p "${INSTALLDIR}" > /dev/null
+
+ for f in ${CONF}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$f "${DESTDIR}${mpconfigdir}/$${f}.default"; \
+ if test ! -e "${DESTDIR}${mpconfigdir}/$$f" ; then \
+ set -x; \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 $$f "${DESTDIR}${mpconfigdir}"; \
+ fi; \
+ done
+
+ # delete old uncompressed man pages if they exist
+ for m in ${MAN1}; do rm -f "${INSTALLDIR}/share/man/man1/$$m" ; done
+ for m in ${MAN5}; do rm -f "${INSTALLDIR}/share/man/man5/$$m" ; done
+ for m in ${MAN7}; do rm -f "${INSTALLDIR}/share/man/man7/$$m" ; done
+
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${INSTALLDIR}/share/macports/install"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 base.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree "${INSTALLDIR}/share/macports/install/"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz "${INSTALLDIR}/share/man/man1"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz "${INSTALLDIR}/share/man/man5"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portstyle.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 porthier.7.gz "${INSTALLDIR}/share/man/man7"
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portgroup.7.gz "${INSTALLDIR}/share/man/man7"
</ins></span></pre></div>
<a id="trunkbasesrcMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/src/Makefile.in (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/Makefile.in 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,5 +1,7 @@
</span><del>-TCLPKG= @OUR_INCLUDED_PACKAGES@ \
- cregistry \
</del><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+TCLPKG= cregistry \
</ins><span class="cx"> registry2.0 \
</span><span class="cx"> macports1.0 \
</span><span class="cx"> port1.0 \
</span><span class="lines">@@ -21,4 +23,4 @@
</span><span class="cx">
</span><span class="cx"> test::
</span><span class="cx">
</span><del>-include ../Mk/macports.subdir.mk
</del><ins>+include $(srcdir)/../Mk/macports.subdir.mk
</ins></span></pre></div>
<a id="trunkbasesrccflib10"></a>
<div class="propset"><h4>Property changes: trunk/base/src/cflib1.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkbasesrccflib10Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/cflib1.0/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cflib1.0/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/cflib1.0/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-OBJS= CFLib.o
-SHLIB_NAME= CFLib${SHLIB_SUFFIX}
-LIBS+= -framework CoreFoundation
-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/cflib1.0
-
-include ../../Mk/macports.autoconf.mk
-include ../../Mk/macports.tea.mk
</del></span></pre></div>
<a id="trunkbasesrccflib10Makefileinfromrev117487trunkbasesrccflib10Makefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/cflib1.0/Makefile.in (from rev 117487, trunk/base/src/cflib1.0/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cflib1.0/Makefile.in (rev 0)
+++ trunk/base/src/cflib1.0/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+OBJS= CFLib.o
+SHLIB_NAME= CFLib${SHLIB_SUFFIX}
+LIBS+= -framework CoreFoundation
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/cflib1.0
+
+include ../../Mk/macports.autoconf.mk
+include $(srcdir)/../../Mk/macports.tea.mk
</ins></span></pre></div>
<a id="trunkbasesrccregistry"></a>
<div class="propset"><h4>Property changes: trunk/base/src/cregistry</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">macports.sqlext
</span><span class="cx"> + Makefile
</span><span class="cx">cregistry.a
</span><span class="cx">macports.sqlext
</span><a id="trunkbasesrccregistryMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/cregistry/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/cregistry/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,31 +0,0 @@
</span><del>-# $Id$
-
-OBJS = registry.o entry.o sql.o vercomp.o util.o file.o portgroup.o
-STLIB_NAME = cregistry.a
-RANLIB = ranlib
-
-SQLEXT_NAME = macports.sqlext
-SQLEXT_OBJS = sqlext.o vercomp.o
-
-include ../../Mk/macports.autoconf.mk
-
-all:: ${STLIB_NAME} ${SQLEXT_NAME}
-
-.c.o:
- ${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${CPPFLAGS} ${SHLIB_CFLAGS} $< -o $@
-
-${STLIB_NAME}:: ${OBJS}
- ${STLIB_LD} ${STLIB_NAME} ${OBJS}
- ${RANLIB} ${STLIB_NAME}
-
-${SQLEXT_NAME}: ${SQLEXT_OBJS}
- ${SHLIB_LD} ${SQLEXT_OBJS} -o $@
-
-clean::
- rm -f ${STLIB_NAME} ${SQLEXT_NAME} ${SQLEXT_OBJS} ${OBJS}
-
-distclean:: clean
-
-test:
-
-install:: all
</del></span></pre></div>
<a id="trunkbasesrccregistryMakefileinfromrev117487trunkbasesrccregistryMakefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/cregistry/Makefile.in (from rev 117487, trunk/base/src/cregistry/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/cregistry/Makefile.in (rev 0)
+++ trunk/base/src/cregistry/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+# $Id$
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+OBJS = registry.o entry.o sql.o vercomp.o util.o file.o portgroup.o
+STLIB_NAME = cregistry.a
+RANLIB = ranlib
+
+SQLEXT_NAME = macports.sqlext
+SQLEXT_OBJS = sqlext.o vercomp.o
+
+include ../../Mk/macports.autoconf.mk
+
+all:: ${STLIB_NAME} ${SQLEXT_NAME}
+
+.c.o:
+ ${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${CPPFLAGS} ${SHLIB_CFLAGS} $< -o $@
+
+${STLIB_NAME}:: ${OBJS}
+ ${STLIB_LD} ${STLIB_NAME} ${OBJS}
+ ${RANLIB} ${STLIB_NAME}
+
+${SQLEXT_NAME}: ${SQLEXT_OBJS}
+ ${SHLIB_LD} ${SQLEXT_OBJS} -o $@
+
+clean::
+ rm -f ${STLIB_NAME} ${SQLEXT_NAME} ${SQLEXT_OBJS} ${OBJS}
+
+distclean:: clean
+
+test:
+
+install:: all
</ins></span></pre></div>
<a id="trunkbasesrcdarwintracelib10"></a>
<div class="propset"><h4>Property changes: trunk/base/src/darwintracelib1.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx"> + Makefile
</span><span class="cx">darwintrace.dylib
</span><a id="trunkbasesrcdarwintracelib10Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/darwintracelib1.0/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/darwintracelib1.0/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,30 +0,0 @@
</span><del>-# This Makefile will only be run on Darwin systems; we can safely use
-# Apple-specifics here
-SRCS= $(wildcard *.c)
-OBJS= $(SRCS:%.c=%.o)
-SHLIB_NAME= darwintrace${SHLIB_SUFFIX}
-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
-
-include ../../Mk/macports.autoconf.mk
-
-# Yes, we know having $ signs in identifiers is not a very good idea; in the
-# case of darwintrace we still need them, though.
-CFLAGS_PEDANTIC=
-CFLAGS+= -fPIC ${UNIVERSAL_ARCHFLAGS}
-SHLIB_LDFLAGS+=${UNIVERSAL_ARCHFLAGS}
-
-all:: ${SHLIB_NAME}
-
-$(SHLIB_NAME):: ${OBJS}
- ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${SHLIB_LDFLAGS} ${LIBS}
-
-clean::
- rm -f ${OBJS} ${SHLIB_NAME} so_locations
-
-distclean:: clean
-
-install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
-
-test::
</del></span></pre></div>
<a id="trunkbasesrcdarwintracelib10Makefileinfromrev117487trunkbasesrcdarwintracelib10Makefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/darwintracelib1.0/Makefile.in (from rev 117487, trunk/base/src/darwintracelib1.0/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/darwintracelib1.0/Makefile.in (rev 0)
+++ trunk/base/src/darwintracelib1.0/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+# This Makefile will only be run on Darwin systems; we can safely use
+# Apple-specifics here
+SRCS= $(wildcard *.c)
+OBJS= $(SRCS:%.c=%.o)
+SHLIB_NAME= darwintrace${SHLIB_SUFFIX}
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/darwintrace1.0
+
+include ../../Mk/macports.autoconf.mk
+
+# Yes, we know having $ signs in identifiers is not a very good idea; in the
+# case of darwintrace we still need them, though.
+CFLAGS_PEDANTIC=
+CFLAGS+= -fPIC ${UNIVERSAL_ARCHFLAGS}
+SHLIB_LDFLAGS+=${UNIVERSAL_ARCHFLAGS}
+
+all:: ${SHLIB_NAME}
+
+$(SHLIB_NAME):: ${OBJS}
+ ${SHLIB_LD} ${OBJS} -o ${SHLIB_NAME} ${SHLIB_LDFLAGS} ${LIBS}
+
+clean::
+ rm -f ${OBJS} ${SHLIB_NAME} so_locations
+
+distclean:: clean
+
+install:: all
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
+
+test::
</ins></span></pre></div>
<a id="trunkbasesrcmacports10Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/macports1.0/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/macports1.0/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,46 +0,0 @@
</span><del>-SRCS= macports.tcl macports_dlist.tcl macports_util.tcl \
- macports_autoconf.tcl macports_fastload.tcl
-OBJS= macports.o get_systemconfiguration_proxies.o sysctl.o
-SHLIB_NAME= MacPorts${SHLIB_SUFFIX}
-
-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/macports1.0
-INSTALLPKGLINK= ${TCL_PACKAGE_DIR}/macports1.0
-
-include ../../Mk/macports.autoconf.mk
-include ../../Mk/macports.tea.mk
-
-ifeq ($(OBJC_RUNTIME), APPLE_RUNTIME)
- LIBS+= -framework CoreFoundation -framework SystemConfiguration
-endif
-
-pkgIndex.tcl: $(SRCS)
-
-test::
- $(TCLSH) ./tests/test.tcl -nocolor
-
-distclean:: clean
- rm -f macports_autoconf.tcl macports_fastload.tcl macports_test_autoconf.tcl ${SHLIB_NAME}
-
-install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
-
- $(SILENT) set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
- done
-
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
-
- echo "${TCL_PACKAGE_DIR}" > ${DESTDIR}${prefix}/var/macports/.tclpackage
- if test -z "${DESTDIR}" -a "${INSTALLPKGLINK}" != "${INSTALLDIR}"; then \
- if test ! -L "${INSTALLPKGLINK}"; then \
- if test ! -e "${TCL_PACKAGE_DIR}"; then \
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} "${TCL_PACKAGE_DIR}" || 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></span></pre></div>
<a id="trunkbasesrcmacports10Makefileinfromrev117487trunkbasesrcmacports10Makefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/macports1.0/Makefile.in (from rev 117487, trunk/base/src/macports1.0/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/Makefile.in (rev 0)
+++ trunk/base/src/macports1.0/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+SRCS= macports.tcl macports_dlist.tcl macports_util.tcl \
+ macports_autoconf.tcl macports_fastload.tcl
+OBJS= macports.o get_systemconfiguration_proxies.o sysctl.o
+SHLIB_NAME= MacPorts${SHLIB_SUFFIX}
+
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/macports1.0
+INSTALLPKGLINK= ${TCL_PACKAGE_PATH}/macports1.0
+
+include ../../Mk/macports.autoconf.mk
+include $(srcdir)/../../Mk/macports.tea.mk
+
+ifeq ($(OBJC_RUNTIME), APPLE_RUNTIME)
+ LIBS+= -framework CoreFoundation -framework SystemConfiguration
+endif
+
+pkgIndex.tcl: $(SRCS)
+
+test::
+ $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
+
+distclean:: clean
+ rm -f macports_autoconf.tcl macports_fastload.tcl macports_test_autoconf.tcl ${SHLIB_NAME}
+
+install:: all
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+
+ $(SILENT) set -x; for file in ${SRCS}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
+ done
+
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+
+ 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
</ins></span></pre></div>
<a id="trunkbasesrcmacports10macports_fastloadtclin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/macports1.0/macports_fastload.tcl.in (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/macports1.0/macports_fastload.tcl.in 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/macports1.0/macports_fastload.tcl.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -81,11 +81,3 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-if { "@SQLITE3_TCL_DIR@" != "" } {
- set dir "@SQLITE3_TCL_DIR@"
- set pkgindex [file join $dir pkgIndex.tcl]
- if [file exists $pkgindex] {
- source $pkgindex
- }
-}
</del></span></pre></div>
<a id="trunkbasesrcpackage10"></a>
<div class="propset"><h4>Property changes: trunk/base/src/package1.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">package_test_autoconf.tcl
</span><span class="cx"> + Makefile
</span><span class="cx">package_test_autoconf.tcl
</span><span class="cx">pkgIndex.tcl
</span><a id="trunkbasesrcpackage10Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/package1.0/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/package1.0/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,29 +0,0 @@
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/package1.0
-
-SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl \
- portrpm.tcl portsrpm.tcl portdpkg.tcl portunarchive.tcl \
- portarchivefetch.tcl
-
-include ../../Mk/macports.autoconf.mk
-
-all:: pkgIndex.tcl
-
-pkgIndex.tcl: $(SRCS)
- $(SILENT) ../pkg_mkindex.sh .
-
-clean::
- rm -f pkgIndex.tcl
-
-distclean:: clean
- rm -f package_test_autoconf.tcl
-
-test::
- -$(prefix)/bin/port sync
- $(TCLSH) ./tests/test.tcl -nocolor
-
-install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(SILENT)set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
- done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del></span></pre></div>
<a id="trunkbasesrcpackage10Makefileinfromrev117487trunkbasesrcpackage10Makefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/package1.0/Makefile.in (from rev 117487, trunk/base/src/package1.0/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/Makefile.in (rev 0)
+++ trunk/base/src/package1.0/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/package1.0
+
+SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl \
+ portrpm.tcl portsrpm.tcl portdpkg.tcl portunarchive.tcl \
+ portarchivefetch.tcl
+
+include ../../Mk/macports.autoconf.mk
+
+all:: pkgIndex.tcl
+
+pkgIndex.tcl: $(SRCS)
+ $(SILENT) ../pkg_mkindex.sh .
+
+clean::
+ rm -f pkgIndex.tcl
+
+distclean:: clean
+ rm -f package_test_autoconf.tcl
+
+test::
+ -$(prefix)/bin/port sync
+ $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
+
+install:: all
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(SILENT)set -x; for file in ${SRCS}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
+ done
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</ins></span></pre></div>
<a id="trunkbasesrcpkg_mkindexshin"></a>
<div class="modfile"><h4>Modified: trunk/base/src/pkg_mkindex.sh.in (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/pkg_mkindex.sh.in 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/pkg_mkindex.sh.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
</span><span class="cx"> # POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><del>-TCLSH=@TCLSH@
</del><ins>+TCLSH=@INTREE_TCLSH@
</ins><span class="cx"> GREP=@GREP@
</span><span class="cx">
</span><span class="cx"> if [ $# = 0 ]; then
</span></span></pre></div>
<a id="trunkbasesrcport"></a>
<div class="propset"><h4>Property changes: trunk/base/src/port</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">portall
</span><span class="cx">portindex
</span><span class="cx">portmirror
</span><span class="cx"> + Makefile
</span><span class="cx">port
</span><span class="cx">portall
</span><span class="cx">portindex
</span><span class="cx">portmirror
</span><a id="trunkbasesrcportMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/port/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/port/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-INSTALLDIR= ${DESTDIR}${prefix}
-TOPSRCDIR= ../..
-SCRIPTS= portmirror portindex port
-
-edit = sed \
- -e 's,@TCLSH\@,$(TCLSH),g' \
- -e 's,@macports_tcl_dir\@,$(macports_tcl_dir),g'
-
-include ../../Mk/macports.autoconf.mk
-
-.PHONY: mkdirs
-
-all: ${SCRIPTS}
-
-portmirror: portmirror.tcl ../../Mk/macports.autoconf.mk
- ${edit} portmirror.tcl > $@
-
-portindex: portindex.tcl ../../Mk/macports.autoconf.mk
- ${edit} portindex.tcl > $@
-
-port: port.tcl ../../Mk/macports.autoconf.mk
- ${edit} port.tcl > $@
-
-mkdirs:
- < ../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
- < ../../doc/base.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
-
-clean:
- rm -f ${SCRIPTS}
-
-test:
-
-distclean: clean
-
-install: all mkdirs
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/bin
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/var/macports
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 555 port portindex portmirror ${INSTALLDIR}/bin/
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port-help.tcl ${INSTALLDIR}/var/macports/
- cd ${INSTALLDIR}/bin && $(LN_S) -f port portf
</del></span></pre></div>
<a id="trunkbasesrcportMakefileinfromrev117487trunkbasesrcportMakefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/port/Makefile.in (from rev 117487, trunk/base/src/port/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port/Makefile.in (rev 0)
+++ trunk/base/src/port/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+INSTALLDIR= ${DESTDIR}${prefix}
+TOPSRCDIR= ../..
+SCRIPTS= portmirror portindex port
+
+edit = sed \
+ -e 's,@TCLSH\@,$(TCLSH),g' \
+ -e 's,@macports_tcl_dir\@,$(macports_tcl_dir),g'
+
+include ../../Mk/macports.autoconf.mk
+
+.PHONY: mkdirs
+
+all: ${SCRIPTS}
+
+portmirror: portmirror.tcl ../../Mk/macports.autoconf.mk
+ ${edit} $(srcdir)/portmirror.tcl > $@
+
+portindex: portindex.tcl ../../Mk/macports.autoconf.mk
+ ${edit} $(srcdir)/portindex.tcl > $@
+
+port: port.tcl ../../Mk/macports.autoconf.mk
+ ${edit} $(srcdir)/port.tcl > $@
+
+mkdirs:
+ < ../../doc/prefix.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+ < ../../doc/base.mtree $(MTREE) -U -d -e -p ${INSTALLDIR} > /dev/null
+
+clean:
+ rm -f ${SCRIPTS}
+
+test:
+
+distclean: clean
+
+install: all mkdirs
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/bin
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/var/macports
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 555 port portindex portmirror ${INSTALLDIR}/bin/
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/port-help.tcl ${INSTALLDIR}/var/macports/
+ cd ${INSTALLDIR}/bin && $(LN_S) -f port portf
</ins></span></pre></div>
<a id="trunkbasesrcport10"></a>
<div class="propset"><h4>Property changes: trunk/base/src/port1.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">port_test_autoconf.tcl
</span><span class="cx">pkgIndex.tcl
</span><span class="cx"> + Makefile
</span><span class="cx">pkgIndex.tcl
</span><span class="cx">port_autoconf.tcl
</span><span class="cx">port_test_autoconf.tcl
</span><a id="trunkbasesrcport10Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/port1.0/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/port1.0/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,36 +0,0 @@
</span><del>-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/port1.0
-
-SRCS= port.tcl portchecksum.tcl portconfigure.tcl portextract.tcl \
- portfetch.tcl portmain.tcl portbuild.tcl portpatch.tcl portutil.tcl \
- portinstall.tcl portuninstall.tcl portdepends.tcl portdestroot.tcl \
- portlint.tcl portclean.tcl porttest.tcl portactivate.tcl \
- portdeactivate.tcl port_autoconf.tcl portstartupitem.tcl \
- porttrace.tcl portlivecheck.tcl portdistcheck.tcl portmirror.tcl \
- portload.tcl portunload.tcl portdistfiles.tcl fetch_common.tcl \
- portsandbox.tcl
-
-include ../../Mk/macports.subdir.mk
-include ../../Mk/macports.autoconf.mk
-
-.PHONY: test
-
-all:: pkgIndex.tcl
-
-pkgIndex.tcl: $(SRCS)
- $(SILENT) ../pkg_mkindex.sh . || ( rm -rf $@ && exit 1 )
-
-clean::
- rm -f pkgIndex.tcl
-
-distclean:: clean
- rm -f port_autoconf.tcl port_test_autoconf.tcl
-
-install:: all
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(SILENT)set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
- done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
-
-test::
- $(TCLSH) ./tests/test.tcl -nocolor
</del></span></pre></div>
<a id="trunkbasesrcport10Makefileinfromrev117487trunkbasesrcport10Makefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/port1.0/Makefile.in (from rev 117487, trunk/base/src/port1.0/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/port1.0/Makefile.in (rev 0)
+++ trunk/base/src/port1.0/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/port1.0
+
+SRCS_AUTOCONF= port_autoconf.tcl
+SRCS= port.tcl portchecksum.tcl portconfigure.tcl portextract.tcl \
+ portfetch.tcl portmain.tcl portbuild.tcl portpatch.tcl portutil.tcl \
+ portinstall.tcl portuninstall.tcl portdepends.tcl portdestroot.tcl \
+ portlint.tcl portclean.tcl porttest.tcl portactivate.tcl \
+ portdeactivate.tcl portstartupitem.tcl porttrace.tcl portlivecheck.tcl \
+ portdistcheck.tcl portmirror.tcl portload.tcl portunload.tcl \
+ portdistfiles.tcl fetch_common.tcl portsandbox.tcl
+
+include $(srcdir)/../../Mk/macports.subdir.mk
+include ../../Mk/macports.autoconf.mk
+
+.PHONY: test
+
+all:: pkgIndex.tcl
+
+pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
+ $(SILENT) ../pkg_mkindex.sh . || ( rm -rf $@ && exit 1 )
+
+clean::
+ rm -f pkgIndex.tcl
+
+distclean:: clean
+ rm -f port_autoconf.tcl port_test_autoconf.tcl
+
+install:: all
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(SILENT)set -x; for file in ${SRCS}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}; \
+ done
+ $(SILENT)set -x; for file in ${SRCS_AUTOCONF}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}; \
+ done
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
+
+test::
+ $(TCLSH) $(srcdir)/tests/test.tcl -nocolor
</ins></span></pre></div>
<a id="trunkbasesrcregistry20"></a>
<div class="propset"><h4>Property changes: trunk/base/src/registry2.0</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="modfile"><h4>Modified: svn:ignore</h4></div>
<span class="cx">registry.dylib
</span><span class="cx">registry_autoconf.tcl
</span><span class="cx"> + Makefile
</span><span class="cx">pkgIndex.tcl
</span><span class="cx">registry.dylib
</span><span class="cx">registry_autoconf.tcl
</span><a id="trunkbasesrcregistry20Makefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/registry2.0/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/registry2.0/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,42 +0,0 @@
</span><del>-# $Id$
-
-SRCS = registry.tcl registry_autoconf.tcl registry_util.tcl receipt_flat.tcl receipt_sqlite.tcl portimage.tcl portuninstall.tcl
-OBJS = registry.o util.o \
- entry.o entryobj.o \
- file.o fileobj.o \
- portgroup.o portgroupobj.o
- #graph.o graphobj.o
-
-SHLIB_NAME= registry${SHLIB_SUFFIX}
-INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/registry2.0
-
-include ../../Mk/macports.autoconf.mk
-include ../../Mk/macports.tea.mk
-
-pkgIndex.tcl: $(SRCS)
-
-CFLAGS+= ${SQLITE3_CFLAGS}
-LIBS+= ${SQLITE3_LIBS} ../cregistry/cregistry.a
-ifeq ($(shell uname), Darwin)
-SHLIB_LDFLAGS+= -install_name @loader_path/../registry2.0/${SHLIB_NAME}
-endif
-
-${SHLIB_NAME}: ../cregistry/cregistry.a
-
-.PHONY: test
-
-test:: ${SHLIB_NAME}
- ${TCLSH} tests/entry.tcl ./${SHLIB_NAME}
- ${TCLSH} tests/depends.tcl ./${SHLIB_NAME}
-
-distclean:: clean
- rm -f registry_autoconf.tcl
-
-install:: all
- [ ! -d $(DESTDIR)${datadir}/macports/Tcl/registry1.0 ] || rm -vrf $(DESTDIR)${datadir}/macports/Tcl/registry1.0
- $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
- $(SILENT) set -x; for file in ${SRCS}; do \
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
- done
- $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</del></span></pre></div>
<a id="trunkbasesrcregistry20Makefileinfromrev117487trunkbasesrcregistry20Makefile"></a>
<div class="copfile"><h4>Copied: trunk/base/src/registry2.0/Makefile.in (from rev 117487, trunk/base/src/registry2.0/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/registry2.0/Makefile.in (rev 0)
+++ trunk/base/src/registry2.0/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+# $Id$
+
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+SRCS_AUTOCONF = registry_autoconf.tcl
+SRCS = registry.tcl registry_util.tcl receipt_flat.tcl receipt_sqlite.tcl portimage.tcl portuninstall.tcl
+OBJS = registry.o util.o \
+ entry.o entryobj.o \
+ file.o fileobj.o \
+ portgroup.o portgroupobj.o
+ #graph.o graphobj.o
+
+SHLIB_NAME= registry${SHLIB_SUFFIX}
+INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/registry2.0
+
+include ../../Mk/macports.autoconf.mk
+include $(srcdir)/../../Mk/macports.tea.mk
+
+pkgIndex.tcl: $(SRCS) $(SRCS_AUTOCONF)
+
+CFLAGS+= ${SQLITE3_CFLAGS}
+LIBS+= ${SQLITE3_LIBS} ../cregistry/cregistry.a
+ifeq ($(shell uname), Darwin)
+SHLIB_LDFLAGS+= -install_name @loader_path/../registry2.0/${SHLIB_NAME}
+endif
+
+${SHLIB_NAME}: ../cregistry/cregistry.a
+
+.PHONY: test
+
+test:: ${SHLIB_NAME}
+ ${TCLSH} $(srcdir)/tests/entry.tcl ./${SHLIB_NAME}
+ ${TCLSH} $(srcdir)/tests/depends.tcl ./${SHLIB_NAME}
+
+distclean:: clean
+ rm -f registry_autoconf.tcl
+
+install:: all $(SHLIB_NAME)
+ [ ! -d $(DESTDIR)${datadir}/macports/Tcl/registry1.0 ] || rm -vrf $(DESTDIR)${datadir}/macports/Tcl/registry1.0
+ $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 ${SHLIB_NAME} ${INSTALLDIR}
+ $(SILENT) set -x; for file in ${SRCS}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $(srcdir)/$$file ${INSTALLDIR}/$$file; \
+ done
+ $(SILENT) set -x; for file in ${SRCS_AUTOCONF}; do \
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 $$file ${INSTALLDIR}/$$file; \
+ done
+ $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 pkgIndex.tcl ${INSTALLDIR}
</ins></span></pre></div>
<a id="trunkbasesrcthread26diff"></a>
<div class="delfile"><h4>Deleted: trunk/base/src/thread2.6.diff (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/thread2.6.diff 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/src/thread2.6.diff 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,79 +0,0 @@
</span><del>-diff -ru src/thread2.6/Makefile.in src/thread2.6.mine/Makefile.in
---- src/thread2.6/Makefile.in Sat Dec 18 09:26:02 2004
-+++ src/thread2.6.mine/Makefile.in Mon Apr 17 02:42:43 2006
-@@ -67,12 +67,12 @@
-
- srcdir = @srcdir@
- prefix = @prefix@
--exec_prefix = @exec_prefix@
-+exec_prefix = @prefix@
-
- bindir = @bindir@
--libdir = @libdir@
-+libdir = @prefix@/share/macports/Tcl
- datadir = @datadir@
--mandir = @mandir@
-+mandir = @prefix@/share/macports/man
- includedir = @includedir@
-
- DESTDIR =
-diff -ru src/thread2.6/configure src/thread2.6.mine/configure
---- src/thread2.6/configure Thu Dec 23 05:48:44 2004
-+++ src/thread2.6.mine/configure Mon Apr 17 02:27:46 2006
-@@ -6374,13 +6374,11 @@
- { (exit 1); exit 1; }; }
- fi
- else
-- # Check order: pkg --prefix location, Tcl's --prefix location,
-+ # Check order:
- # directory of tclConfig.sh, and Tcl source directory.
- # Looking in the source dir is not ideal, but OK.
-
-- eval "temp_includedir=${includedir}"
-- list="`ls -d ${temp_includedir} 2>/dev/null` \
-- `ls -d ${TCL_PREFIX}/include 2>/dev/null` \
-+ list="`ls -d ${TCL_PREFIX}/include 2>/dev/null` \
- `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null` \
- `ls -d ${TCL_SRC_DIR}/generic 2>/dev/null`"
- if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then
-diff -ru src/thread2.6/lib/ttrace.tcl src/thread2.6.mine/lib/ttrace.tcl
---- src/thread2.6/lib/ttrace.tcl Fri Jul 30 01:37:50 2004
-+++ src/thread2.6.mine/lib/ttrace.tcl Mon Apr 17 02:27:46 2006
-@@ -50,8 +50,8 @@
- variable mutex ns_mutex
- variable elock [$mutex create traceepochmutex]
- variable store nsv_
-- } elseif {![catch {package require Thread} version]} {
-- variable tvers $version
-+ } elseif {![catch {package require Thread} thread_pkg_version]} {
-+ variable tvers $thread_pkg_version
- variable mutex thread::mutex
- variable elock [$mutex create]
- variable store tsv::
-# tcl-64/tcl_ext/thread/thread.diff
---- src/thread2.6/generic/threadPoolCmd.c.orig 2003-11-27 11:54:19.000000000 -0800
-+++ src/thread2.6/generic/threadPoolCmd.c 2005-07-20 23:10:12.000000000 -0700
-@@ -1710,18 +1710,21 @@
- *
- *----------------------------------------------------------------------
- */
-+#ifdef __WIN32__
-+#include <sys/timeb.h>
-+#else
-+#include <sys/time.h>
-+#endif
- static void
- GetTime(timePtr)
- Tcl_Time *timePtr;
- {
- #ifdef __WIN32__
--#include <sys/timeb.h>
- struct timeb tb;
- (void)ftime(&tb);
- timePtr->sec = tb.time;
- timePtr->usec = tb.millitm * 1000;
- #else
--#include <sys/time.h>
- struct timeval tv;
- (void)gettimeofday(&tv, NULL);
- timePtr->sec = tv.tv_sec;
</del></span></pre></div>
<a id="trunkbasesrcthread26targz"></a>
<div class="binary"><h4>Deleted: trunk/base/src/thread2.6.tar.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkbasetests"></a>
<div class="propset"><h4>Property changes: trunk/base/tests</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<a id="trunkbasetestsMakefile"></a>
<div class="delfile"><h4>Deleted: trunk/base/tests/Makefile (117620 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/Makefile 2014-03-05 20:54:19 UTC (rev 117620)
+++ trunk/base/tests/Makefile 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -1,14 +0,0 @@
</span><del>-include ../Mk/macports.autoconf.mk
-
-all:: ../Mk/macports.autoconf.mk
-
-install::
-
-# Run all regression tests
-# tclsh test.tcl -h for more options.
-test::
- $(TCLSH) test.tcl -nocolor
-
-clean::
-
-distclean:: clean
</del></span></pre></div>
<a id="trunkbasetestsMakefileinfromrev117487trunkbasetestsMakefile"></a>
<div class="copfile"><h4>Copied: trunk/base/tests/Makefile.in (from rev 117487, trunk/base/tests/Makefile) (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/tests/Makefile.in (rev 0)
+++ trunk/base/tests/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+srcdir = @srcdir@
+VPATH = @srcdir@
+
+include ../Mk/macports.autoconf.mk
+
+all:: ../Mk/macports.autoconf.mk
+
+install::
+
+# Run all regression tests
+# tclsh test.tcl -h for more options.
+test::
+ $(TCLSH) $(srcdir)/test.tcl -nocolor
+
+clean::
+
+distclean:: clean
</ins></span></pre></div>
<a id="trunkbasevendor"></a>
<div class="propset"><h4>Property changes: trunk/base/vendor</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnignore"></a>
<div class="addfile"><h4>Added: svn:ignore</h4></div>
<span class="cx">tcl8.5.[0-9]*
</span><span class="cx">tcllib-1.[0-9]*
</span><span class="cx">thread2.[0-9]*.[0-9]*
</span><span class="cx">vendor-destroot
</span><a id="trunkbasevendorMakefilein"></a>
<div class="addfile"><h4>Added: trunk/base/vendor/Makefile.in (0 => 117621)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/vendor/Makefile.in (rev 0)
+++ trunk/base/vendor/Makefile.in 2014-03-05 22:19:14 UTC (rev 117621)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+TCL_SUBDIR= @VENDOR_TCL_SUBDIR@
+TCL_TARGETS= @VENDOR_TCL_INSTALL@
+
+TCLTHREAD_SUBDIR= @VENDOR_TCLTHREAD_SUBDIR@
+TCLTREHAD_TARGETS= @VENDOR_TCLTHREAD_INSTALL@
+
+TCLLIB_SUBDIR= @VENDOR_TCLLIB_SUBDIR@
+TCLLIB_TARGETS= @VENDOR_TCLLIB_INSTALL@
+
+DESTROOT= @abs_top_builddir@/vendor/vendor-destroot
+
+.PHONY: all clean distclean install destroot test
+.PHONY: destroot-tcl destroot-tcllthread destroot-tcllib
+.PHONY: install-tcl install-tcllthread install-tcllib
+.PHONY: %-tcl %-tcllthread %-tcllib
+
+# for make all, run destroot (where destroot will depend on all of each
+# subpackage)
+all: destroot
+
+%-tcl:
+ @echo ===\> making $(@:%-tcl=%) in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCL_SUBDIR@ $(@:%-tcl=%)
+
+%-tclthread:
+ @echo ===\> making $(@:%-tclthrad=%) in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ $(@:%-tclthread=%)
+
+%-tcllib:
+ @echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ $(@:%-tcllib=%)
+
+destroot: destroot-tcl destroot-tclthread destroot-tcllib
+destroot-tcl: all-tcl
+ @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCL_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCL_INSTALL@
+
+destroot-tclthread: all-tclthread
+ @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCLTHREAD_INSTALL@
+
+destroot-tcllib: all-tcllib
+ @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCLLIB_INSTALL@
+
+install: install-tcl install-tclthread install-tcllib
+install-tcl:
+ @echo ===\> making $(@:%-tcl=%) in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCL_SUBDIR@ @VENDOR_TCL_INSTALL@
+
+install-tclthread:
+ @echo ===\> making $(@:%-tclthrad=%) in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ @VENDOR_TCLTHREAD_INSTALL@
+
+install-tcllib:
+ @echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ @VENDOR_TCLLIB_INSTALL@
+
+test:
+
+clean: clean-tcl clean-tcllib clean-tclthread
+ rm -rf ${DESTROOT}
+
+distclean:
+ rm -f Makefile
+ rm -rf $(TCL_SUBDIR:/unix=) $(TCLTHREAD_SUBDIR) $(TCLLIB_SUBDIR)
</ins></span></pre></div>
<a id="trunkbasevendortcl8515srctargz"></a>
<div class="binary"><h4>Added: trunk/base/vendor/tcl8.5.15-src.tar.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/base/vendor/tcl8.5.15-src.tar.gz
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkbasevendortcllib115targz"></a>
<div class="binary"><h4>Added: trunk/base/vendor/tcllib-1.15.tar.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/base/vendor/tcllib-1.15.tar.gz
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkbasevendorthread270targz"></a>
<div class="binary"><h4>Added: trunk/base/vendor/thread2.7.0.tar.gz</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/base/vendor/thread2.7.0.tar.gz
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
</div>
</body>
</html>