<!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>[140042] trunk/dports/science/magic-devel</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/140042">140042</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2015-09-07 17:47:09 -0700 (Mon, 07 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>magic-devel: update to 8.1.79</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencemagicdevelPortfile">trunk/dports/science/magic-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportssciencemagicdevelfilespatchtextiotxCommandscdiff">trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff</a></li>
<li><a href="#trunkdportssciencemagicdevelfilespatchutilsmagichdiff">trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportssciencemagicdevelfilespatchscriptsconfigureindiff">trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencemagicdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/magic-devel/Portfile (140041 => 140042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/magic-devel/Portfile 2015-09-08 00:10:22 UTC (rev 140041)
+++ trunk/dports/science/magic-devel/Portfile 2015-09-08 00:47:09 UTC (rev 140042)
</span><span class="lines">@@ -9,7 +9,7 @@
</span><span class="cx">
</span><span class="cx"> name magic-devel
</span><span class="cx"> conflicts magic
</span><del>-version 8.0.208
</del><ins>+version 8.1.79
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories science
</span><span class="cx"> # mostly very permissively licensed, but includes a copy of GNU readline
</span><span class="lines">@@ -36,10 +36,11 @@
</span><span class="cx">
</span><span class="cx"> require_active_variants tk x11
</span><span class="cx">
</span><del>-checksums rmd160 90a1a4202964543d198462528f533393c407e062 \
- sha256 b3ef7982028c902d2ea8646b3f0af22f06e66a6ef9b776406b7e7c330aa90e14
</del><ins>+checksums rmd160 846e83315fd47fb0b8d914cf349637fb74f0cd12 \
+ sha256 c26270f813260df2fe168f24e087f87206459559295410937e7ae6c350ee0b7b
</ins><span class="cx">
</span><del>-patchfiles patch-scripts-configure.in.diff
</del><ins>+patchfiles patch-textio-txCommands.c.diff \
+ patch-utils-magic.h.diff
</ins><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencemagicdevelfilespatchscriptsconfigureindiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff (140041 => 140042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff 2015-09-08 00:10:22 UTC (rev 140041)
+++ trunk/dports/science/magic-devel/files/patch-scripts-configure.in.diff 2015-09-08 00:47:09 UTC (rev 140042)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>---- scripts/configure.in.orig 2012-11-14 08:16:52.000000000 -0600
-+++ scripts/configure.in 2012-11-15 15:11:14.000000000 -0600
-@@ -23,6 +23,7 @@
- dnl Checks for programs.
- AC_PROG_CC
- AC_PROG_CPP
-+AC_PROG_CXX
- AC_ISC_POSIX
- AC_PROG_INSTALL
- AC_PROG_RANLIB
-@@ -251,7 +252,6 @@
- LD_RUN_PATH=""
- WISH_EXE=""
- TCLSH_EXE=""
--CXX=
-
- modules=""
- unused=""
-@@ -1381,7 +1381,7 @@
- SHDLIB_EXT=".dylib"
- LDDL_FLAGS="-dynamiclib -flat_namespace -undefined suppress -noprebind"
- LDFLAGS="${LDFLAGS} ${LIB_SPECS}"
-- CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -I/sw/include -fno-common"
-+ CFLAGS="${CFLAGS} ${X_CFLAGS} ${INC_SPECS} -fno-common"
- ;;
-
- *cygwin*)
-@@ -1620,9 +1620,6 @@
- DEPEND_FLAG="-MM"
- fi
-
--if test $usingOA ; then
-- AC_PROG_CXX
--fi
-
- dnl Substitute all variables
-
</del></span></pre></div>
<a id="trunkdportssciencemagicdevelfilespatchtextiotxCommandscdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff (0 => 140042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff (rev 0)
+++ trunk/dports/science/magic-devel/files/patch-textio-txCommands.c.diff 2015-09-08 00:47:09 UTC (rev 140042)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+--- textio/txCommands.c.orig 2015-04-16 11:48:14.000000000 -0500
++++ textio/txCommands.c 2015-09-07 19:42:06.000000000 -0500
+@@ -1141,7 +1141,7 @@
+ if (argc > TX_MAXARGS)
+ {
+ TxError("Error: number of command arguments exceeds %d!\n", TX_MAXARGS);
+- return;
++ return 0;
+ }
+
+ SigIOReady = FALSE;
+@@ -1158,7 +1158,7 @@
+ {
+ TxError("Error: command length exceeds %d characters!\n", TX_MAX_CMDLEN);
+ TxFreeCommand(tclcmd);
+- return;
++ return 0;
+ }
+ strcpy(&tclcmd->tx_argstring[asize], argv[n]);
+ tclcmd->tx_argv[n] = &tclcmd->tx_argstring[asize];
</ins></span></pre></div>
<a id="trunkdportssciencemagicdevelfilespatchutilsmagichdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff (0 => 140042)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff (rev 0)
+++ trunk/dports/science/magic-devel/files/patch-utils-magic.h.diff 2015-09-08 00:47:09 UTC (rev 140042)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+--- utils/magic.h.orig 2014-10-25 08:57:08.000000000 -0500
++++ utils/magic.h 2015-09-07 19:30:15.000000000 -0500
+@@ -179,10 +179,8 @@
+
+ /*
+ * Select system call
+- *
+- * Note: Errors here may be caused by not including <sys/types.h>
+- * before "magic.h"
+ */
++#include <sys/select.h>
+ #ifndef FD_SET
+ #define fd_set int
+ #define FD_SET(n, p) ((*(p)) |= (1 << (n)))
</ins></span></pre>
</div>
</div>
</body>
</html>