<!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>[144720] trunk/dports/math/glpk</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/144720">144720</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-01-15 19:47:34 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>glpk: update version 4.48->4.57 (fixes #38645)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathglpkPortfile">trunk/dports/math/glpk/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/math/glpk/files/</li>
<li><a href="#trunkdportsmathglpkfilespatchconfigurediff">trunk/dports/math/glpk/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathglpkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/glpk/Portfile (144719 => 144720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/glpk/Portfile 2016-01-16 03:41:22 UTC (rev 144719)
+++ trunk/dports/math/glpk/Portfile 2016-01-16 03:47:34 UTC (rev 144720)
</span><span class="lines">@@ -1,13 +1,11 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup archcheck 1.0
</del><span class="cx"> PortGroup muniversal 1.0
</span><span class="cx">
</span><span class="cx"> name glpk
</span><span class="cx"> epoch 1
</span><del>-# 4.49 removes the old API; don't update until ports using glpk have been rewritten to use the new API.
-version 4.48
</del><ins>+version 4.57
</ins><span class="cx"> license GPL-3+
</span><span class="cx"> categories math lang
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -24,24 +22,17 @@
</span><span class="cx"> homepage http://www.gnu.org/software/${name}/
</span><span class="cx"> master_sites gnu
</span><span class="cx">
</span><del>-checksums rmd160 269cb1f2b63b5a2f0a0f42b7af3ff52e8f95edfa \
- sha256 abc2c8f895b20a91cdfcfc04367a0bc8677daf8b4ec3f3e86c5b71c79ac6adb1
</del><ins>+checksums rmd160 10cbe9f5c681d5893739cde1fd9d8c16cf468c73 \
+ sha256 7323b2a7cc1f13e45fc845f0fdca74f4daea2af716f5ad2d4d55b41e8394275c
</ins><span class="cx">
</span><del>-depends_lib port:gmp port:zlib
</del><ins>+depends_lib port:gmp
</ins><span class="cx">
</span><del>-archcheck.files \
- lib/libgmp.dylib \
- lib/libz.dylib
</del><ins>+configure.args --with-gmp
</ins><span class="cx">
</span><del>-configure.args --with-gmp --with-zlib
-
-if { [variant_isset odbc] || [variant_isset mysql] } {
</del><ins>+if { [variant_isset odbc] || [variant_isset iodbc] || [variant_isset mysql5] || [variant_isset mysql56] } {
</ins><span class="cx"> depends_lib-append port:libtool
</span><del>-
- archcheck.files-append \
- lib/libltdl.dylib
-
</del><span class="cx"> configure.args-append --enable-dl
</span><ins>+ patchfiles-append patch-configure.diff
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_parallel_build yes
</span><span class="lines">@@ -49,21 +40,12 @@
</span><span class="cx"> test.run yes
</span><span class="cx"> test.target check
</span><span class="cx">
</span><del>-post-patch {
- # glpk uses nmedit to make certain symbols local.
- # octave 3.0.3 relies on the obsolete __glp_lib_print_hook and __glp_lib_fault_hook symbols, so they must be kept global.
- # See http://www.nabble.com/octave-3.0.3-build-problem-due-to-glpk-td19945239.html for a discussion.
- reinplace \
- "s|export-symbols-regex '^(glp_\\|_glp_lpx_).*'|export-symbols-regex '^(glp_\\|_glp_lpx_\\|_glp_lib_fault_hook\\|_glp_lib_print_hook).*'|g" \
- ${worksrcpath}/src/Makefile.in
-}
-
</del><span class="cx"> set docdir ${prefix}/share/doc/${name}
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span><span class="cx"> xinstall -d ${destroot}${docdir}
</span><span class="cx"> xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \
</span><del>- doc/glpk.pdf doc/gmpl.pdf doc/glpk_faq.txt \
</del><ins>+ doc/glpk.pdf doc/gmpl.pdf doc/cnfsat.pdf doc/gmpl_es.pdf doc/graphs.pdf \
</ins><span class="cx"> ${destroot}${docdir}
</span><span class="cx">
</span><span class="cx"> set examplesdir ${prefix}/share/examples/${name}
</span><span class="lines">@@ -78,33 +60,54 @@
</span><span class="cx"> ${destroot}${examplesdir}/sql
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant odbc description {enable MathProg ODBC support} {
</del><ins>+variant odbc conflicts iodbc description {enable MathProg ODBC support using unixODBC} {
</ins><span class="cx"> depends_lib-append port:unixODBC
</span><span class="cx">
</span><del>- archcheck.files-append \
- lib/libodbc.dylib
-
</del><span class="cx"> configure.args-append --enable-odbc=unix
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace \
</span><del>- "s|libodbc.so|${prefix}/lib/libodbc.dylib|g" \
</del><ins>+ "s|__MACPORTS__ODBC__LIB__|${prefix}/lib|g" \
</ins><span class="cx"> ${worksrcpath}/configure
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mysql description {enable MathProg MySQL support} {
</del><ins>+variant iodbc description {enable MathProg ODBC support using iODBC} {
+ depends_lib-append port:libiodbc
+
+ configure.args-append --enable-odbc
+ post-patch {
+ reinplace \
+ "s|__MACPORTS__IODBC__LIB__|${prefix}/lib|g" \
+ ${worksrcpath}/configure
+ }
+}
+
+variant mysql requires mysql5 description {legacy variant, use +mysql5 instead} {}
+
+variant mysql5 conflicts mysql56 description {enable MathProg MySQL support using MySQL 5.1} {
</ins><span class="cx"> depends_lib-append path:bin/mysql_config5:mysql5
</span><span class="cx">
</span><del>- archcheck.files-append \
- lib/mysql5/mysql/libmysqlclient.dylib
</del><ins>+ configure.args-append --enable-mysql
+ post-patch {
+ reinplace \
+ "s|__MACPORTS__MYSQL__INCLUDE__|${prefix}/include/mysql5/mysql|g" \
+ ${worksrcpath}/configure
+ reinplace \
+ "s|__MACPORTS__MYSQL__LIB__|${prefix}/lib/mysql5/mysql|g" \
+ ${worksrcpath}/configure
+ }
+}
</ins><span class="cx">
</span><ins>+variant mysql56 conflicts mysql5 description {enable MathProg MySQL support using MySQL 5.6} {
+ depends_lib-append port:mysql56
+
</ins><span class="cx"> configure.args-append --enable-mysql
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace \
</span><del>- "s|/usr/include/mysql|${prefix}/include/mysql5/mysql|g" \
</del><ins>+ "s|__MACPORTS__MYSQL__INCLUDE__|${prefix}/include/mysql56/mysql|g" \
</ins><span class="cx"> ${worksrcpath}/configure
</span><span class="cx"> reinplace \
</span><del>- "s|libmysqlclient.so|${prefix}/lib/mysql5/mysql/libmysqlclient.dylib|g" \
</del><ins>+ "s|__MACPORTS__MYSQL__LIB__|${prefix}/lib/mysql56/mysql|g" \
</ins><span class="cx"> ${worksrcpath}/configure
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportsmathglpkfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/glpk/files/patch-configure.diff (0 => 144720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/glpk/files/patch-configure.diff (rev 0)
+++ trunk/dports/math/glpk/files/patch-configure.diff 2016-01-16 03:47:34 UTC (rev 144720)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+--- configure.orig 2015-11-08 00:00:00.000000000 -0700
++++ configure 2015-11-15 06:54:33.000000000 -0700
+@@ -11410,9 +11410,9 @@
+
+ case $host_os in
+ darwin* | macosx*)
+- LIBIODBC="libiodbc.dylib"
+- LIBODBC="libodbc.dylib"
+- LIBMYSQL="libmysqlclient.dylib"
++ LIBIODBC="__MACPORTS__IODBC__LIB__/libiodbc.dylib"
++ LIBODBC="__MACPORTS__ODBC__LIB__/libodbc.dylib"
++ LIBMYSQL="__MACPORTS__MYSQL__LIB__/libmysqlclient.dylib"
+ ;;
+ *)
+ LIBIODBC="libiodbc.so"
+@@ -11459,7 +11459,7 @@
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+- CPPFLAGS="-I/usr/include/mysql $CPPFLAGS"
++ CPPFLAGS="-I__MACPORTS__MYSQL__INCLUDE__ $CPPFLAGS"
+
+ cat >>confdefs.h <<_ACEOF
+ #define MYSQL_DLNAME "$LIBMYSQL"
</ins></span></pre>
</div>
</div>
</body>
</html>