<!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>[118297] 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/118297">118297</a></dd>
<dt>Author</dt> <dd>cal@macports.org</dd>
<dt>Date</dt> <dd>2014-03-29 08:44:08 -0700 (Sat, 29 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>base: bundle TclX extension to support signal handling</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbaseaclocalm4">trunk/base/aclocal.m4</a></li>
<li><a href="#trunkbaseconfigure">trunk/base/configure</a></li>
<li><a href="#trunkbaseconfigureac">trunk/base/configure.ac</a></li>
<li><a href="#trunkbasevendorMakefilein">trunk/base/vendor/Makefile.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbasevendortclx841tarbz2">trunk/base/vendor/tclx8.4.1.tar.bz2</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkbasevendor">trunk/base/vendor/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: trunk/base/aclocal.m4 (118296 => 118297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/aclocal.m4 2014-03-29 14:30:30 UTC (rev 118296)
+++ trunk/base/aclocal.m4 2014-03-29 15:44:08 UTC (rev 118297)
</span><span class="lines">@@ -96,9 +96,10 @@
</span><span class="cx"> $1=$(AS_ECHO([$2]) | sed -E 's/^--?([[^=]]+)=.*$/\1/')dnl
</span><span class="cx"> ])
</span><span class="cx">
</span><del>-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.
</del><ins>+dnl Configure a project contained in a .tar.gz, .tgz or .tar.bz2 tarball,
+dnl extracting it previously, if necessary. Different from AC_CONFIG_SUBDIRS
+dnl (on which this macro is based), you can pass parameters to the
+dnl sub-configure script.
</ins><span class="cx"> dnl
</span><span class="cx"> dnl Parameters:
</span><span class="cx"> dnl - The relative path to the tarball
</span><span class="lines">@@ -116,7 +117,19 @@
</span><span class="cx"> mp_tarball_vendordir="$(dirname "$mp_tarball")"
</span><span class="cx"> AS_MKDIR_P(["$mp_tarball_vendordir"])
</span><span class="cx"> AC_MSG_NOTICE([=== extracting $mp_tarball])
</span><del>- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
</del><ins>+ mp_tarball_extract_cmd=
+ case "$mp_tarball" in
+ *.tar.gz | *.tgz)
+ mp_tarball_extract_cmd="gzip"
+ ;
+ *.tar.bz2 | *.tbz2)
+ mp_tarball_extract_cmd="bzip2"
+ ;
+ *)
+ AC_MSG_ERROR([Don't know how to extract tarball $mp_tarball])
+ ;
+ esac
+ (cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || AC_MSG_ERROR([failed to extract $mp_tarball]))
</ins><span class="cx"> fi
</span><span class="cx"> if ! test -d "$ac_dir"; then
</span><span class="cx"> AC_MSG_ERROR([tarball $mp_tarball did not extract to $ac_dir])
</span></span></pre></div>
<a id="trunkbaseconfigure"></a>
<div class="modfile"><h4>Modified: trunk/base/configure (118296 => 118297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure 2014-03-29 14:30:30 UTC (rev 118296)
+++ trunk/base/configure 2014-03-29 15:44:08 UTC (rev 118297)
</span><span class="lines">@@ -645,6 +645,8 @@
</span><span class="cx"> TCL_VERSION
</span><span class="cx"> VENDOR_TCLLIB_INSTALL
</span><span class="cx"> VENDOR_TCLLIB_SUBDIR
</span><ins>+VENDOR_TCLX_INSTALL
+VENDOR_TCLX_SUBDIR
</ins><span class="cx"> VENDOR_TCLTHREAD_INSTALL
</span><span class="cx"> VENDOR_TCLTHREAD_SUBDIR
</span><span class="cx"> VENDOR_DESTROOT
</span><span class="lines">@@ -9503,12 +9505,10 @@
</span><span class="cx"> prefix=$oldprefix
</span><span class="cx"> exec_prefix=$oldexec_prefix
</span><span class="cx">
</span><del>-# Determine if we need to install some bundled packages
-VENDOR_PACKAGES=
-
</del><span class="cx"> ## Tcl package
</span><span class="cx"> tcl_version=8.5.15
</span><span class="cx"> tcl_thread_version=2.7.0
</span><ins>+tclx_version=8.4.1
</ins><span class="cx"> tcllib_version=1.15
</span><span class="cx"> mp_fn_var_prepend() {
</span><span class="cx"> eval "$1=\"$2\$$1\""
</span><span class="lines">@@ -9524,7 +9524,19 @@
</span><span class="cx"> as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
</span><span class="cx"> $as_echo "$as_me: === extracting $mp_tarball" >&6;}
</span><del>- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
</del><ins>+ mp_tarball_extract_cmd=
+ case "$mp_tarball" in
+ *.tar.gz | *.tgz)
+ mp_tarball_extract_cmd="gzip"
+ ;
+ *.tar.bz2 | *.tbz2)
+ mp_tarball_extract_cmd="bzip2"
+ ;
+ *)
+ as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
+ ;
+ esac
+ (cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
</ins><span class="cx"> fi
</span><span class="cx"> if ! test -d "$ac_dir"; then
</span><span class="cx"> as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
</span><span class="lines">@@ -9842,7 +9854,19 @@
</span><span class="cx"> as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
</span><span class="cx"> $as_echo "$as_me: === extracting $mp_tarball" >&6;}
</span><del>- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
</del><ins>+ mp_tarball_extract_cmd=
+ case "$mp_tarball" in
+ *.tar.gz | *.tgz)
+ mp_tarball_extract_cmd="gzip"
+ ;
+ *.tar.bz2 | *.tbz2)
+ mp_tarball_extract_cmd="bzip2"
+ ;
+ *)
+ as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
+ ;
+ esac
+ (cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
</ins><span class="cx"> fi
</span><span class="cx"> if ! test -d "$ac_dir"; then
</span><span class="cx"> as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
</span><span class="lines">@@ -10143,6 +10167,331 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+## TclX package
+# TclX is required for signal handling
+
+ mp_tarball="vendor/tclx${tclx_version}.tar.bz2"
+ ac_dir=vendor/tclx8.4
+
+ mp_popdir=$(pwd)
+ if ! test -d "$ac_dir"; then
+ mp_tarball_vendordir="$(dirname "$mp_tarball")"
+ as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
+$as_echo "$as_me: === extracting $mp_tarball" >&6;}
+ mp_tarball_extract_cmd=
+ case "$mp_tarball" in
+ *.tar.gz | *.tgz)
+ mp_tarball_extract_cmd="gzip"
+ ;
+ *.tar.bz2 | *.tbz2)
+ mp_tarball_extract_cmd="bzip2"
+ ;
+ *)
+ as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
+ ;
+ esac
+ (cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
+ fi
+ if ! test -d "$ac_dir"; then
+ as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
+ fi
+
+ as_dir="$ac_dir"; as_fn_mkdir_p
+ ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+ # A ".." for each directory in $ac_dir_suffix.
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+ case $ac_top_builddir_sub in
+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+ esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+ .) # We are building in place.
+ ac_srcdir=.
+ ac_top_srcdir=$ac_top_builddir_sub
+ ac_abs_top_srcdir=$ac_pwd ;;
+ [\\/]* | ?:[\\/]* ) # Absolute name.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir
+ ac_abs_top_srcdir=$srcdir ;;
+ *) # Relative name.
+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_build_prefix$srcdir
+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+ cd "$ac_dir"
+
+ if test "$no_recursion" != yes || test ! -f "$ac_srcdir/config.status"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+ 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 --prefix=${macports_libexec_dir}; do
+ case $mp_arg in
+ --*=* | -*=*)
+ mp_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
+ case $mp_arg_key in
+ *\'*)
+ mp_arg_key=$($as_echo "$mp_arg_key" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg_key="'$mp_arg_key'"
+ as_fn_append mp_sub_configure_keys " $mp_arg_key"
+
+ ;
+ esac
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append 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_arg_key=$($as_echo "$mp_arg" | sed -E 's/^--?([^=]+)=.*$/\1/')
+ mp_list_contains_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_keys\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ fi
+
+ ;
+ *)
+ # always pass positional arguments
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append 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_present=
+ eval "mp_list_contains_list=\"$mp_sub_configure_args\""
+ for mp_list_contains_entry in $mp_list_contains_list; do
+ test -z "$mp_list_contains_entry" && continue
+ if test "x$mp_arg_key" = "x$mp_list_contains_entry"; then
+ mp_list_contains_present=1
+ break
+ fi
+ done
+ if test "x$mp_list_contains_present" = "x"; then
+ :
+ else
+ mp_arg="--prefix=$prefix"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ fi
+
+
+ # Pass --silent
+ if test "$silent" = yes; then
+ mp_arg="--silent"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend 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"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend 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"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ mp_fn_var_prepend mp_sub_configure_args "$mp_arg "
+
+
+
+ mp_arg="--srcdir=$ac_srcdir"
+ case $mp_arg in
+ *\'*)
+ mp_arg=$($as_echo "$mp_arg" | sed "s/'/'\\\\\\\\''/g")
+ ;
+ esac
+ mp_arg="'$mp_arg'"
+ as_fn_append mp_sub_configure_args " $mp_arg"
+
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&5
+$as_echo "$as_me: running $SHELL $ac_srcdir/configure $mp_sub_configure_args in $ac_dir" >&6;}
+ eval "\$SHELL \$ac_srcdir/configure $mp_sub_configure_args" || as_fn_error $? "configure failed for $ac_dir" "$LINENO" 5
+ else
+ as_fn_error $? "no configure script found in $ac_dir" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&5
+$as_echo "$as_me: === finished configuring in $ac_dir ($mp_popdir/$ac_dir)" >&6;}
+ fi
+ cd "$mp_popdir"
+
+VENDOR_TCLX_SUBDIR=tclx8.4
+VENDOR_TCLX_INSTALL="install-binaries install-libraries"
+
+
+
</ins><span class="cx"> ## Tcllib package
</span><span class="cx"> # Note that Tcllib needs a Tcl interpreter during installation; it will *not*
</span><span class="cx"> # be the one we configure above, because that one isn't built yet. That's not
</span><span class="lines">@@ -10157,7 +10506,19 @@
</span><span class="cx"> as_dir="$mp_tarball_vendordir"; as_fn_mkdir_p
</span><span class="cx"> { $as_echo "$as_me:${as_lineno-$LINENO}: === extracting $mp_tarball" >&5
</span><span class="cx"> $as_echo "$as_me: === extracting $mp_tarball" >&6;}
</span><del>- (cd "$mp_tarball_vendordir"; gzip -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
</del><ins>+ mp_tarball_extract_cmd=
+ case "$mp_tarball" in
+ *.tar.gz | *.tgz)
+ mp_tarball_extract_cmd="gzip"
+ ;
+ *.tar.bz2 | *.tbz2)
+ mp_tarball_extract_cmd="bzip2"
+ ;
+ *)
+ as_fn_error $? "Don't know how to extract tarball $mp_tarball" "$LINENO" 5
+ ;
+ esac
+ (cd "$mp_tarball_vendordir"; "$mp_tarball_extract_cmd" -d < "$ac_abs_confdir/$mp_tarball" | tar xf - || as_fn_error $? "failed to extract $mp_tarball" "$LINENO" 5)
</ins><span class="cx"> fi
</span><span class="cx"> if ! test -d "$ac_dir"; then
</span><span class="cx"> as_fn_error $? "tarball $mp_tarball did not extract to $ac_dir" "$LINENO" 5
</span><span class="lines">@@ -10453,7 +10814,6 @@
</span><span class="cx"> fi
</span><span class="cx"> cd "$mp_popdir"
</span><span class="cx">
</span><del>-VENDOR_PACKAGES="$VENDOR_PACKAGES tcllib-${tcllib_version}"
</del><span class="cx"> VENDOR_TCLLIB_SUBDIR=tcllib-${tcllib_version}
</span><span class="cx"> VENDOR_TCLLIB_INSTALL="install-libraries"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbaseconfigureac"></a>
<div class="modfile"><h4>Modified: trunk/base/configure.ac (118296 => 118297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/configure.ac 2014-03-29 14:30:30 UTC (rev 118296)
+++ trunk/base/configure.ac 2014-03-29 15:44:08 UTC (rev 118297)
</span><span class="lines">@@ -320,12 +320,10 @@
</span><span class="cx"> prefix=$oldprefix
</span><span class="cx"> exec_prefix=$oldexec_prefix
</span><span class="cx">
</span><del>-# Determine if we need to install some bundled packages
-VENDOR_PACKAGES=
-
</del><span class="cx"> ## Tcl package
</span><span class="cx"> tcl_version=8.5.15
</span><span class="cx"> tcl_thread_version=2.7.0
</span><ins>+tclx_version=8.4.1
</ins><span class="cx"> tcllib_version=1.15
</span><span class="cx"> MP_CONFIG_TARBALL([vendor/tcl${tcl_version}-src.tar.gz], [vendor/tcl${tcl_version}/unix], [--prefix=${macports_libexec_dir} --enable-threads])
</span><span class="cx"> VENDOR_TCL_SUBDIR=tcl${tcl_version}/unix
</span><span class="lines">@@ -346,12 +344,19 @@
</span><span class="cx"> AC_SUBST(VENDOR_TCLTHREAD_SUBDIR)
</span><span class="cx"> AC_SUBST(VENDOR_TCLTHREAD_INSTALL)
</span><span class="cx">
</span><ins>+## TclX package
+# TclX is required for signal handling
+MP_CONFIG_TARBALL([vendor/tclx${tclx_version}.tar.bz2], [vendor/tclx8.4], [--prefix=${macports_libexec_dir}])
+VENDOR_TCLX_SUBDIR=tclx8.4
+VENDOR_TCLX_INSTALL="install-binaries install-libraries"
+AC_SUBST(VENDOR_TCLX_SUBDIR)
+AC_SUBST(VENDOR_TCLX_INSTALL)
+
</ins><span class="cx"> ## Tcllib package
</span><span class="cx"> # Note that Tcllib needs a Tcl interpreter during installation; it will *not*
</span><span class="cx"> # be the one we configure above, because that one isn't built yet. That's not
</span><span class="cx"> # a problem, though -- it's only used during installation.
</span><span class="cx"> MP_CONFIG_TARBALL([vendor/tcllib-${tcllib_version}.tar.gz], [vendor/tcllib-${tcllib_version}], [--prefix=${macports_libexec_dir}])
</span><del>-VENDOR_PACKAGES="$VENDOR_PACKAGES tcllib-${tcllib_version}"
</del><span class="cx"> VENDOR_TCLLIB_SUBDIR=tcllib-${tcllib_version}
</span><span class="cx"> VENDOR_TCLLIB_INSTALL="install-libraries"
</span><span class="cx"> AC_SUBST(VENDOR_TCLLIB_SUBDIR)
</span></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="modfile"><h4>Modified: 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><span class="cx"> + Makefile
</span><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">tclx8.[0-9]*
</span><span class="cx">vendor-destroot
</span><a id="trunkbasevendorMakefilein"></a>
<div class="modfile"><h4>Modified: trunk/base/vendor/Makefile.in (118296 => 118297)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/vendor/Makefile.in 2014-03-29 14:30:30 UTC (rev 118296)
+++ trunk/base/vendor/Makefile.in 2014-03-29 15:44:08 UTC (rev 118297)
</span><span class="lines">@@ -4,15 +4,18 @@
</span><span class="cx"> TCLTHREAD_SUBDIR= @VENDOR_TCLTHREAD_SUBDIR@
</span><span class="cx"> TCLTREHAD_TARGETS= @VENDOR_TCLTHREAD_INSTALL@
</span><span class="cx">
</span><ins>+TCLX_SUBDIR= @VENDOR_TCLX_SUBDIR@
+TCLX_TARGETS= @VENDOR_TCLX_INSTALL@
+
</ins><span class="cx"> TCLLIB_SUBDIR= @VENDOR_TCLLIB_SUBDIR@
</span><span class="cx"> TCLLIB_TARGETS= @VENDOR_TCLLIB_INSTALL@
</span><span class="cx">
</span><span class="cx"> DESTROOT= @abs_top_builddir@/vendor/vendor-destroot
</span><span class="cx">
</span><span class="cx"> .PHONY: all clean distclean install destroot test
</span><del>-.PHONY: destroot-tcl destroot-tcllthread destroot-tcllib
-.PHONY: install-tcl install-tcllthread install-tcllib
-.PHONY: %-tcl %-tcllthread %-tcllib
</del><ins>+.PHONY: destroot-tcl destroot-tcllthread destroot-tclx destroot-tcllib
+.PHONY: install-tcl install-tcllthread install-tclx install-tcllib
+.PHONY: %-tcl %-tcllthread %-tclx %-tcllib
</ins><span class="cx">
</span><span class="cx"> # for make all, run destroot (where destroot will depend on all of each
</span><span class="cx"> # subpackage)
</span><span class="lines">@@ -26,11 +29,15 @@
</span><span class="cx"> @echo ===\> making $(@:%-tclthrad=%) in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ $(@:%-tclthread=%)
</span><span class="cx">
</span><ins>+%-tclx:
+ @echo ===\> making $(@:%-tclx=%) in ${DIRPRFX}@VENDOR_TCLX_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLX_SUBDIR@ $(@:%-tclx=%)
+
</ins><span class="cx"> %-tcllib:
</span><span class="cx"> @echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ $(@:%-tcllib=%)
</span><span class="cx">
</span><del>-destroot: destroot-tcl destroot-tclthread destroot-tcllib
</del><ins>+destroot: destroot-tcl destroot-tclthread destroot-tclx destroot-tcllib
</ins><span class="cx"> destroot-tcl: all-tcl
</span><span class="cx"> @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCL_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCL_INSTALL@
</span><span class="lines">@@ -39,11 +46,15 @@
</span><span class="cx"> @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCLTHREAD_INSTALL@
</span><span class="cx">
</span><ins>+destroot-tclx: all-tclx
+ @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLX_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLX_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCLX_INSTALL@
+
</ins><span class="cx"> destroot-tcllib: all-tcllib
</span><span class="cx"> @echo ===\> staging to destroot in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ DESTDIR=${DESTROOT} @VENDOR_TCLLIB_INSTALL@
</span><span class="cx">
</span><del>-install: install-tcl install-tclthread install-tcllib
</del><ins>+install: install-tcl install-tclthread install-tclx install-tcllib
</ins><span class="cx"> install-tcl:
</span><span class="cx"> @echo ===\> making $(@:%-tcl=%) in ${DIRPRFX}@VENDOR_TCL_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCL_SUBDIR@ @VENDOR_TCL_INSTALL@
</span><span class="lines">@@ -52,16 +63,20 @@
</span><span class="cx"> @echo ===\> making $(@:%-tclthrad=%) in ${DIRPRFX}@VENDOR_TCLTHREAD_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCLTHREAD_SUBDIR@ @VENDOR_TCLTHREAD_INSTALL@
</span><span class="cx">
</span><ins>+install-tclx:
+ @echo ===\> making $(@:%-tclx=%) in ${DIRPRFX}@VENDOR_TCLX_SUBDIR@
+ @$(MAKE) -C @VENDOR_TCLX_SUBDIR@ @VENDOR_TCLX_INSTALL@
+
</ins><span class="cx"> install-tcllib:
</span><span class="cx"> @echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
</span><span class="cx"> @$(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ @VENDOR_TCLLIB_INSTALL@
</span><span class="cx">
</span><span class="cx"> test:
</span><span class="cx">
</span><del>-clean: clean-tcl clean-tcllib clean-tclthread
</del><ins>+clean: clean-tcl clean-tcllib clean-tclx clean-tclthread
</ins><span class="cx"> rm -rf ${DESTROOT}
</span><span class="cx">
</span><span class="cx"> distclean:
</span><span class="cx"> rm -f Makefile
</span><del>- rm -rf $(TCL_SUBDIR:/unix=) $(TCLTHREAD_SUBDIR) $(TCLLIB_SUBDIR)
</del><ins>+ rm -rf $(TCL_SUBDIR:/unix=) $(TCLTHREAD_SUBDIR) $(TCLX_SUBDIR) $(TCLLIB_SUBDIR)
</ins><span class="cx"> rm -rf vendor-destroot
</span></span></pre></div>
<a id="trunkbasevendortclx841tarbz2"></a>
<div class="binary"><h4>Added: trunk/base/vendor/tclx8.4.1.tar.bz2</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/base/vendor/tclx8.4.1.tar.bz2
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
</div>
</body>
</html>