<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[26176] branches/dp2mp-move/base</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.macosforge.org/projects/macports/changeset/26176">26176</a></dd>
<dt>Author</dt> <dd>jmpp@macports.org</dd>
<dt>Date</dt> <dd>2007-06-15 02:27:18 -0700 (Fri, 15 Jun 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merging the necessary part of landonf's r26137: A prototype dynamic Tcl -> Objective-C bridge.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesdp2mpmovebaseMkmacportsautoconfmkin">branches/dp2mp-move/base/Mk/macports.autoconf.mk.in</a></li>
<li><a href="#branchesdp2mpmovebaseMkmacportsteamk">branches/dp2mp-move/base/Mk/macports.tea.mk</a></li>
<li><a href="#branchesdp2mpmovebaseconfigure">branches/dp2mp-move/base/configure</a></li>
<li><a href="#branchesdp2mpmovebaseconfigureac">branches/dp2mp-move/base/configure.ac</a></li>
<li><a href="#branchesdp2mpmovebasesrcMakefilein">branches/dp2mp-move/base/src/Makefile.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesdp2mpmovebaseMkmacportsautoconfmkin"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/Mk/macports.autoconf.mk.in (26175 => 26176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/Mk/macports.autoconf.mk.in 2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/Mk/macports.autoconf.mk.in 2007-06-15 09:27:18 UTC (rev 26176)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> CC = @CC@
</span><span class="cx"> CFLAGS = @CFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) $(CFLAGS_DEBUG) $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
</span><del>-OBJCFLAGS = @OBJCFLAGS@ $(CFLAGS_QUICHEEATERS) $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
</del><ins>+OBJCFLAGS = @OBJCFLAGS@ $(CFLAGS_WERROR) ${CFLAGS_DEBUG} $(CFLAGS_OPTIMIZE) $(CPPFLAGS) $(CFLAGS_LIBCURL)
</ins><span class="cx"> CPPFLAGS = @CPPFLAGS@ @DEFS@ @INCLUDES@ @TCL_INCLUDES@
</span><span class="cx"> TCL_DEFS = @TCL_DEFS@
</span><span class="cx"> SHLIB_CFLAGS = @SHLIB_CFLAGS@
</span></span></pre></div>
<a id="branchesdp2mpmovebaseMkmacportsteamk"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/Mk/macports.tea.mk (26175 => 26176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/Mk/macports.tea.mk 2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/Mk/macports.tea.mk 2007-06-15 09:27:18 UTC (rev 26176)
</span><span class="lines">@@ -1,3 +1,8 @@
</span><ins>+.SUFFIXES: .m
+
+.m.o:
+ ${CC} -c -DUSE_TCL_STUBS ${OBJCFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
+
</ins><span class="cx"> .c.o:
</span><span class="cx"> ${CC} -c -DUSE_TCL_STUBS ${CFLAGS} ${TCL_DEFS} ${SHLIB_CFLAGS} $< -o $@
</span><span class="cx">
</span></span></pre></div>
<a id="branchesdp2mpmovebaseconfigure"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/configure (26175 => 26176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/configure 2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/configure 2007-06-15 09:27:18 UTC (rev 26176)
</span><span class="lines">@@ -11249,7 +11249,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # Output
</span><del>-ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
</del><ins>+ac_config_files="$ac_config_files Makefile Mk/macports.autoconf.mk doc/prefix.mtree doc/macosx.mtree doc/macports.conf src/Makefile src/macports1.0/macports_autoconf.tcl src/tclobjc1.0/Makefile src/port1.0/port_autoconf.tcl src/registry1.0/registry_autoconf.tcl src/programs/Makefile src/macports1.0/macports_fastload.tcl"
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> cat >confcache <<\_ACEOF
</span><span class="lines">@@ -11814,6 +11814,7 @@
</span><span class="cx"> "doc/macports.conf") CONFIG_FILES="$CONFIG_FILES doc/macports.conf" ;;
</span><span class="cx"> "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
</span><span class="cx"> "src/macports1.0/macports_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/macports1.0/macports_autoconf.tcl" ;;
</span><ins>+ "src/tclobjc1.0/Makefile") CONFIG_FILES="$CONFIG_FILES src/tclobjc1.0/Makefile" ;;
</ins><span class="cx"> "src/port1.0/port_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/port1.0/port_autoconf.tcl" ;;
</span><span class="cx"> "src/registry1.0/registry_autoconf.tcl") CONFIG_FILES="$CONFIG_FILES src/registry1.0/registry_autoconf.tcl" ;;
</span><span class="cx"> "src/programs/Makefile") CONFIG_FILES="$CONFIG_FILES src/programs/Makefile" ;;
</span></span></pre></div>
<a id="branchesdp2mpmovebaseconfigureac"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/configure.ac (26175 => 26176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/configure.ac 2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/configure.ac 2007-06-15 09:27:18 UTC (rev 26176)
</span><span class="lines">@@ -275,6 +275,7 @@
</span><span class="cx"> doc/macports.conf
</span><span class="cx"> src/Makefile
</span><span class="cx"> src/macports1.0/macports_autoconf.tcl
</span><ins>+ src/tclobjc1.0/Makefile
</ins><span class="cx"> src/port1.0/port_autoconf.tcl
</span><span class="cx"> src/registry1.0/registry_autoconf.tcl
</span><span class="cx"> src/programs/Makefile
</span></span></pre></div>
<a id="branchesdp2mpmovebasesrcMakefilein"></a>
<div class="modfile"><h4>Modified: branches/dp2mp-move/base/src/Makefile.in (26175 => 26176)</h4>
<pre class="diff"><span>
<span class="info">--- branches/dp2mp-move/base/src/Makefile.in 2007-06-15 08:06:03 UTC (rev 26175)
+++ branches/dp2mp-move/base/src/Makefile.in 2007-06-15 09:27:18 UTC (rev 26176)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> TCLPKG= @OUR_INCLUDED_PACKAGES@ macports1.0 port1.0 package1.0 \
</span><del>- pextlib1.0 registry1.0 darwintracelib1.0
</del><ins>+ pextlib1.0 registry1.0 darwintracelib1.0 tclobjc1.0
</ins><span class="cx"> SUBDIR= ${TCLPKG} port programs
</span><span class="cx">
</span><span class="cx"> all::
</span></span></pre>
</div>
</div>
</body>
</html>