<!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>[134549] trunk/dports/editors/TeXmacs</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/134549">134549</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-03-29 18:55:26 -0700 (Sun, 29 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>TeXmacs: update to 1.99.2 (#43428)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportseditorsTeXmacsPortfile">trunk/dports/editors/TeXmacs/Portfile</a></li>
<li><a href="#trunkdportseditorsTeXmacsfilespatchMakefile9diff">trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff</a></li>
<li><a href="#trunkdportseditorsTeXmacsfilespatchconfigureindiff">trunk/dports/editors/TeXmacs/files/patch-configure.in.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportseditorsTeXmacsfilespatchaclocalm4diff">trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff</a></li>
<li><a href="#trunkdportseditorsTeXmacsfilespatchsrcSchemeGuileguile_tmhppdiff">trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportseditorsTeXmacsPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/TeXmacs/Portfile (134548 => 134549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/TeXmacs/Portfile 2015-03-30 00:13:23 UTC (rev 134548)
+++ trunk/dports/editors/TeXmacs/Portfile 2015-03-30 01:55:26 UTC (rev 134549)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx">
</span><span class="cx"> name TeXmacs
</span><span class="cx"> conflicts fig2ps
</span><del>-version 1.0.7.10
</del><ins>+version 1.99.2
</ins><span class="cx"> distname ${distname}-src
</span><span class="cx"> categories editors
</span><span class="cx"> maintainers nomaintainer
</span><span class="lines">@@ -40,29 +40,28 @@
</span><span class="cx"> # function.
</span><span class="cx">
</span><span class="cx"> homepage http://www.texmacs.org/
</span><del>-master_sites ftp://ftp.texmacs.org/pub/${name}/targz/:source \
</del><ins>+master_sites ${homepage}Download/ftp/tmftp/source/:source \
</ins><span class="cx"> ftp://ftp.texmacs.org/pub/${name}/fonts/:fonts
</span><span class="cx">
</span><span class="cx"> distfiles ${name}-${version}-src${extract.suffix}:source \
</span><span class="cx"> ${name}-extra-fonts-1.0-noarch${extract.suffix}:fonts
</span><span class="cx">
</span><del>-checksums ${name}-${version}-src.tar.gz \
- md5 ad1ba010be2d7149f25be43178728bbf \
- sha1 12491496e68b62aa07369748770771a8c2378129 \
- rmd160 972d225bc2ce8836de02d7312b822ed6d248e91a \
- ${name}-extra-fonts-1.0-noarch.tar.gz \
</del><ins>+checksums ${name}-${version}-src${extract.suffix} \
+ md5 544ee0ada9a7fe0ea39e33d94e8d5ff5 \
+ sha1 5298e9bd3f61cd8f2117fe1d96a7435f8a788cc8 \
+ rmd160 f4dbbbd80832f3527e4e0c58f651da1adf8a0df5 \
+ ${name}-extra-fonts-1.0-noarch${extract.suffix} \
</ins><span class="cx"> md5 4666d29252da18bbc3fa7e162bb00b17 \
</span><span class="cx"> sha1 c7a1af56b1af4c18c0792cec69330bd6daea002b \
</span><span class="cx"> rmd160 ae539c873f16463a3c19fcaf69fd338a1eadd7ce
</span><span class="cx">
</span><del>-patchfiles patch-Makefile.9.diff \
- patch-configure.in.diff
-
-depends_lib port:guile \
</del><ins>+depends_lib port:freetype \
+ port:guile18 \
</ins><span class="cx"> port:libiconv \
</span><span class="cx"> port:texlive \
</span><span class="cx"> port:xorg-libXext \
</span><del>- port:freetype
</del><ins>+ port:zlib
+
</ins><span class="cx"> depends_run bin:gs:ghostscript
</span><span class="cx">
</span><span class="cx"> extract.only ${name}-${version}-src${extract.suffix}
</span><span class="lines">@@ -70,12 +69,17 @@
</span><span class="cx"> post-extract { system "${extract.cmd} ${extract.pre_args} ${distpath}/${name}-extra-fonts-1.0-noarch${extract.suffix} ${extract.post_args} -C ${worksrcpath}/${name}"
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+patchfiles-append patch-Makefile.in.diff
+patchfiles-append patch-aclocal.m4.diff
+patchfiles-append patch-configure.in.diff
+patchfiles-append patch-src-Scheme-Guile-guile_tm.hpp.diff
+
</ins><span class="cx"> use_autoconf yes
</span><del>-configure.args --mandir=${prefix}/share/man
</del><span class="cx">
</span><del>-# TeXmacs is ignorant of "make all", so we just "make" with no target:
-build.target { }
</del><ins>+configure.ldflags-append -lz
</ins><span class="cx">
</span><ins>+build.target
+
</ins><span class="cx"> post-destroot { file mkdir ${destroot}${prefix}/share/${name}
</span><span class="cx"> system "chown -R root:admin ${destroot}${prefix}/share/${name}"
</span><span class="cx">
</span><span class="lines">@@ -83,6 +87,14 @@
</span><span class="cx"> ${destroot}${prefix}/share/${name}/plugins/cadabra.texmacs
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+post-activate {
+ system "${prefix}/bin/update-mime-database ${prefix}/share/mime || true"
+}
+
+post-deactivate {
+ system "${prefix}/bin/update-mime-database ${prefix}/share/mime || true"
+}
+
</ins><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${homepage}tmweb/download/sources.en.html
</span><span class="cx"> livecheck.regex /${name}-(\[0-9.\]+)-src${extract.suffix}">latest stable version
</span></span></pre></div>
<a id="trunkdportseditorsTeXmacsfilespatchMakefile9diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff (134548 => 134549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff 2015-03-30 00:13:23 UTC (rev 134548)
+++ trunk/dports/editors/TeXmacs/files/patch-Makefile.9.diff 2015-03-30 01:55:26 UTC (rev 134549)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- plugins/maple/Makefile.9.sav 2007-08-18 21:26:23.000000000 -0400
-+++ plugins/maple/Makefile.9 2007-08-18 21:29:41.000000000 -0400
-@@ -12,7 +12,7 @@
</del><ins>+--- plugins/maple/Makefile.9.orig 2013-11-03 17:09:23.000000000 -0600
++++ plugins/maple/Makefile.9 2014-04-18 21:20:47.000000000 -0500
+@@ -14,7 +14,7 @@
</ins><span class="cx"> #TEXMACS_MAPLE_DIR = $(shell realpath `which maple` | sed -e 's%/bin/maple$$%%')
</span><span class="cx">
</span><del>- MAPLECPPFLAGS = -I$(TEXMACS_MAPLE_DIR)/extern/include
--MAPLELDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,-rpath,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
-+MAPLELDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
</del><ins>+ #MAPLE_CPPFLAGS = -I$(TEXMACS_MAPLE_DIR)/extern/include
+-#MAPLE_LDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,-rpath,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
++#MAPLE_LDFLAGS = -L$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -Wl,$(TEXMACS_MAPLE_DIR)/bin.IBM_INTEL_LINUX -lmaplec
</ins><span class="cx">
</span><span class="cx"> all: $(TEXMACS_HOME_PATH)/bin/tm_maple_9.sh $(TEXMACS_HOME_PATH)/bin/tm_maple_9
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportseditorsTeXmacsfilespatchaclocalm4diff"></a>
<div class="addfile"><h4>Added: trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff (0 => 134549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff (rev 0)
+++ trunk/dports/editors/TeXmacs/files/patch-aclocal.m4.diff 2015-03-30 01:55:26 UTC (rev 134549)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- aclocal.m4.orig 2014-03-06 10:43:02.000000000 -0600
++++ aclocal.m4 2015-03-29 20:18:58.000000000 -0500
+@@ -8,15 +8,15 @@
+ ## The GUILE_FLAGS macro.
+ ## First, let's just see if we can find Guile at all.
+ AC_MSG_CHECKING(for Guile)
+- guile-config link > /dev/null || {
+- echo "configure: cannot find guile-config; is Guile installed?" 1>&2
++ guile18-config link > /dev/null || {
++ echo "configure: cannot find guile18-config; is Guile installed?" 1>&2
+ exit 1
+ }
+- GUILE_ORIGINAL_CFLAGS="`guile-config compile`"
++ GUILE_ORIGINAL_CFLAGS="`guile18-config compile`"
+ GUILE_CFLAGS="$GUILE_ORIGINAL_CFLAGS"
+ GUILE_VARIANT_CFLAGS="$GUILE_ORIGINAL_CFLAGS $GUILE_ORIGINAL_CFLAGS/guile $GUILE_ORIGINAL_CFLAGS/libguile"
+- GUILE_LDFLAGS="`guile-config link`"
+- GUILE_VARIANT_LDFLAGS="-L`guile-config info libdir` -lguile -lreadline -ltermcap"
++ GUILE_LDFLAGS="`guile18-config link`"
++ GUILE_VARIANT_LDFLAGS="-L`guile18-config info libdir` -lguile -lreadline -ltermcap"
+ AC_SUBST(GUILE_CFLAGS)
+ AC_SUBST(GUILE_LDFLAGS)
+ AC_MSG_RESULT(yes)
+@@ -28,7 +28,7 @@
+
+ AC_DEFUN(TEXMACS_LINK_GUILE,
+ [AC_TRY_LINK([
+-#include <guile/gh.h>
++#include <guile18/gh.h>
+ $CONFIG_DOTS
+ ],[
+ struct dummy {
</ins></span></pre></div>
<a id="trunkdportseditorsTeXmacsfilespatchconfigureindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/editors/TeXmacs/files/patch-configure.in.diff (134548 => 134549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/TeXmacs/files/patch-configure.in.diff 2015-03-30 00:13:23 UTC (rev 134548)
+++ trunk/dports/editors/TeXmacs/files/patch-configure.in.diff 2015-03-30 01:55:26 UTC (rev 134549)
</span><span class="lines">@@ -1,14 +1,40 @@
</span><del>---- configure.in.orig 2011-03-05 21:46:37.000000000 +1100
-+++ configure.in 2012-04-25 06:30:19.000000000 +1000
-@@ -436,6 +436,7 @@
</del><ins>+--- configure.in.orig 2014-07-18 10:11:43.000000000 -0500
++++ configure.in 2015-03-29 20:18:03.000000000 -0500
+@@ -102,12 +102,12 @@
+ fi
+ AC_MSG_CHECKING(version of guile)
+ if test -z "$GUILE_EFFECTIVE_VERSION" ; then
+- GUILE_EFFECTIVE_VERSION=`guile -c '(display (version))'`
++ GUILE_EFFECTIVE_VERSION=`guile18 -c '(display (version))'`
+ fi
+ AC_MSG_RESULT($GUILE_EFFECTIVE_VERSION)
+ AC_MSG_CHECKING(guile data path)
+ if test -z "$GUILE_DATA_PATH" ; then
+- GUILE_DATA_PATH=`guile-config info pkgdatadir`
++ GUILE_DATA_PATH=`guile18-config info pkgdatadir`
+ fi
+ AC_MSG_RESULT($GUILE_DATA_PATH)
+
+@@ -596,14 +596,15 @@
</ins><span class="cx"> #--------------------------------------------------------------------
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING(whether ... arguments behave correctly)
</span><span class="cx"> +SAVE_CXXFLAGS="$CXXFLAGS"
</span><span class="cx"> if test -z "$GUILE_CFLAGS"; then
</span><del>- CXXFLAGS="`guile-config compile`"
</del><ins>+- CXXFLAGS="`guile-config compile`"
++ CXXFLAGS="`guile18-config compile`"
</ins><span class="cx"> else
</span><del>-@@ -454,7 +455,6 @@
</del><ins>+ CXXFLAGS="$GUILE_CFLAGS"
+ fi
+ AC_TRY_COMPILE([
+- #include <guile/gh.h>
+- #include <libguile.h>
++ #include <guile18/gh.h>
++ #include <libguile18.h>
+ typedef SCM (*FN)(...);
+ static SCM identity (SCM x) { return x; }
+ void declare () { gh_new_procedure ("identity", (FN) identity, 1, 0, 0); }
+@@ -614,17 +615,16 @@
</ins><span class="cx"> ],[
</span><span class="cx"> AC_MSG_RESULT(no)
</span><span class="cx"> ])
</span><span class="lines">@@ -16,7 +42,20 @@
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING(the size_t of guile strings)
</span><span class="cx"> if test -z "$GUILE_CFLAGS"; then
</span><del>-@@ -476,7 +476,7 @@
</del><ins>+- CXXFLAGS="`guile-config compile`"
++ CXXFLAGS="`guile18-config compile`"
+ else
+ CXXFLAGS="$GUILE_CFLAGS"
+ fi
+ AC_TRY_COMPILE([
+- #include <guile/gh.h>
+- #include <libguile.h>
++ #include <guile18/gh.h>
++ #include <libguile18.h>
+ void print_string (SCM s) {
+ int len_r;
+ char* r= gh_scm2newstr (s, &len_r); }
+@@ -636,7 +636,7 @@
</ins><span class="cx"> AC_DEFINE(guile_str_size_t, size_t, [Guile string size type])
</span><span class="cx"> AC_MSG_RESULT(size_t)
</span><span class="cx"> ])
</span><span class="lines">@@ -25,15 +64,15 @@
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([if statically linking with guile works])
</span><span class="cx"> SAVE_CPPFLAGS="$CPPFLAGS"
</span><del>-@@ -932,6 +932,7 @@
- STD_DEBUG_FLAGS="-fno-exceptions"
</del><ins>+@@ -1178,6 +1178,7 @@
+ STD_DEBUG_FLAGS=""
</ins><span class="cx"> fi
</span><span class="cx">
</span><span class="cx"> +SAVE_CXXFLAGS="$CXXFLAGS"
</span><span class="cx"> AC_MSG_CHECKING(if compiler supports $STD_DEBUG_FLAGS)
</span><span class="cx"> CXXFLAGS="$STD_DEBUG_FLAGS"
</span><span class="cx"> AC_TRY_COMPILE([
</span><del>-@@ -944,7 +945,7 @@
</del><ins>+@@ -1190,7 +1191,7 @@
</ins><span class="cx"> CONFIG_CXXDIALECT=""
</span><span class="cx"> AC_MSG_RESULT(no)
</span><span class="cx"> ])
</span><span class="lines">@@ -41,4 +80,4 @@
</span><span class="cx"> +CXXFLAGS="$SAVE_CXXFLAGS"
</span><span class="cx"> AC_SUBST(CONFIG_CXXDIALECT)
</span><span class="cx">
</span><del>- AC_ARG_ENABLE(debug,
</del><ins>+ AC_ARG_ENABLE(profile,
</ins></span></pre></div>
<a id="trunkdportseditorsTeXmacsfilespatchsrcSchemeGuileguile_tmhppdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff (0 => 134549)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff (rev 0)
+++ trunk/dports/editors/TeXmacs/files/patch-src-Scheme-Guile-guile_tm.hpp.diff 2015-03-30 01:55:26 UTC (rev 134549)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- src/Scheme/Guile/guile_tm.hpp.orig 2014-03-03 05:44:14.000000000 -0600
++++ src/Scheme/Guile/guile_tm.hpp 2015-03-29 20:19:29.000000000 -0500
+@@ -37,9 +37,9 @@
+ #endif // __MINGW32__
+
+ #if defined(GUILE_D) || defined(GUILE_C)
+-#include <libguile.h>
++#include <libguile18.h>
+ #else
+-#include <guile/gh.h>
++#include <guile18/gh.h>
+ #endif
+
+ #ifdef __MINGW32__
</ins></span></pre>
</div>
</div>
</body>
</html>