<!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>[139560] trunk/dports/math/calc/files/patch-Makefile.diff</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/139560">139560</a></dd>
<dt>Author</dt> <dd>khindenburg@macports.org</dd>
<dt>Date</dt> <dd>2015-08-20 07:49:28 -0700 (Thu, 20 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>calc: revert patch to previous state</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathcalcfilespatchMakefilediff">trunk/dports/math/calc/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathcalcfilespatchMakefilediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/calc/files/patch-Makefile.diff (139559 => 139560)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/calc/files/patch-Makefile.diff 2015-08-20 14:26:00 UTC (rev 139559)
+++ trunk/dports/math/calc/files/patch-Makefile.diff 2015-08-20 14:49:28 UTC (rev 139560)
</span><span class="lines">@@ -1,11 +1,11 @@
</span><del>---- Makefile 2015-08-20 09:42:29.000000000 -0400
-+++ Makefile 2015-08-20 09:51:11.000000000 -0400
</del><ins>+--- Makefile.orig 2014-10-06 10:45:15.000000000 +0200
++++ Makefile 2015-02-24 21:16:31.000000000 +0100
</ins><span class="cx"> @@ -573,7 +573,7 @@
</span><span class="cx">
</span><span class="cx"> #INCDIR= /usr/local/include
</span><span class="cx"> #INCDIR= /dev/env/DJDIR/include
</span><span class="cx"> -INCDIR= /usr/include
</span><del>-+INCDIR= /opt/local/include
</del><ins>++INCDIR= ___PREFIX___/include
</ins><span class="cx">
</span><span class="cx"> # Where to install calc related things
</span><span class="cx"> #
</span><span class="lines">@@ -14,17 +14,17 @@
</span><span class="cx"> #BINDIR= /usr/local/bin
</span><span class="cx"> #BINDIR= /dev/env/DJDIR/bin
</span><span class="cx"> -BINDIR= /usr/bin
</span><del>-+BINDIR= /opt/local/bin
</del><ins>++BINDIR= ___PREFIX___/bin
</ins><span class="cx">
</span><span class="cx"> #LIBDIR= /usr/local/lib
</span><span class="cx"> #LIBDIR= /dev/env/DJDIR/lib
</span><span class="cx"> -LIBDIR= /usr/lib
</span><del>-+LIBDIR= /opt/local/lib
</del><ins>++LIBDIR= ___PREFIX___/lib
</ins><span class="cx">
</span><span class="cx"> #CALC_SHAREDIR= /usr/local/lib/calc
</span><span class="cx"> #CALC_SHAREDIR= /dev/env/DJDIR/share/calc
</span><span class="cx"> -CALC_SHAREDIR= /usr/share/calc
</span><del>-+CALC_SHAREDIR= /opt/local/share/calc
</del><ins>++CALC_SHAREDIR= ___PREFIX___/share/calc
</ins><span class="cx">
</span><span class="cx"> # NOTE: Do not set CALC_INCDIR to /usr/include or /usr/local/include!!!
</span><span class="cx"> # Always be sure that the CALC_INCDIR path ends in /calc to avoid
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> # If in doubt, use T=
</span><span class="cx"> #
</span><span class="cx"> -T=
</span><del>-+T=/opt/local/var/macports/build/_Volumes_Projects_OtherSoftware_macports-trunk_dports_math_calc/calc/work/destroot
</del><ins>++T=___DESTROOT___
</ins><span class="cx">
</span><span class="cx"> # where man pages are installed
</span><span class="cx"> #
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> #MANDIR= /usr/local/man/man1
</span><span class="cx"> #MANDIR= /usr/man/man1
</span><span class="cx"> -MANDIR= /usr/share/man/man1
</span><del>-+MANDIR= /opt/local/share/man/man1
</del><ins>++MANDIR= ___PREFIX___/share/man/man1
</ins><span class="cx"> #MANDIR= /dev/env/DJDIR/man/man1
</span><span class="cx"> #MANDIR= /usr/man/u_man/man1
</span><span class="cx"> #MANDIR= /usr/contrib/man/man1
</span><span class="lines">@@ -66,20 +66,9 @@
</span><span class="cx"> #READLINE_LIB= -L/usr/local/lib -lreadline
</span><span class="cx"> #READLINE_EXTRAS= -lhistory -lncurses
</span><span class="cx"> #
</span><del>-+READLINE_LIB= -L/opt/local/lib -lreadline
</del><ins>++READLINE_LIB= -L___PREFIX___/lib -lreadline
</ins><span class="cx"> +READLINE_EXTRAS= -lhistory -lncurses
</span><span class="cx"> +#
</span><span class="cx"> # For Apple OS X: install fink from http://fink.sourceforge.net
</span><span class="cx"> # and then do a 'fink install readline' and then use:
</span><span class="cx"> #
</span><del>-@@ -1209,8 +1212,8 @@
- CCOPT= ${DEBUG}
- CCMISC= ${DARWIN_ARCH}
- #
--LCC= clang
--CC= ${PURIFY} ${LCC} ${CCWERR}
-+LCC= ${CC}
-+#CC= ${PURIFY} ${LCC} ${CCWERR}
- #
- # Darwin dynamic shared lib filenames
- LIB_EXT:= .dylib
</del></span></pre>
</div>
</div>
</body>
</html>