<!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>[148708] trunk/dports/math/octave-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/148708">148708</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-05-15 04:02:52 -0700 (Sun, 15 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-devel: update to latest upstream version</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelPortfile">trunk/dports/math/octave-devel/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelfilespatchconfigurediff">trunk/dports/math/octave-devel/files/patch-configure.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavedevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-devel/Portfile (148707 => 148708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/Portfile 2016-05-15 10:54:30 UTC (rev 148707)
+++ trunk/dports/math/octave-devel/Portfile 2016-05-15 11:02:52 UTC (rev 148708)
</span><span class="lines">@@ -30,17 +30,21 @@
</span><span class="cx">
</span><span class="cx"> if { ${name} eq ${subport} } {
</span><span class="cx"> version ${version_tip}
</span><del>- revision 12
- hg.tag 225d88a97104
</del><ins>+ revision 13
+ hg.tag 19e8eddd4773
</ins><span class="cx">
</span><span class="cx"> # see http://savannah.gnu.org/bugs/?41027
</span><span class="cx"> patchfiles-append \
</span><span class="cx"> octave-bug_41027-half.patch
</span><span class="cx">
</span><ins>+ # see http://savannah.gnu.org/bugs/index.php?47886
+ patchfiles-append \
+ patch-configure.diff
+
</ins><span class="cx"> checksums-append \
</span><span class="cx"> ${hg.tag}${extract.suffix} \
</span><del>- rmd160 12db3bfd49342fcf948a47fd8814d2a2aee4779e \
- sha256 e3734195ef42de35953e20c4dec9d741273e35c8a97b4a44777587a1d5e2642d
</del><ins>+ rmd160 bf6d26b12fa1f0e2a8434a54ffa395c2b4e7f31e \
+ sha256 934b7f116018e3f8d97c7bbd2d213a77c823d934a4865155e24eac5cb42a636b
</ins><span class="cx">
</span><span class="cx"> livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\ntip"
</span><span class="cx"> }
</span><span class="lines">@@ -73,7 +77,7 @@
</span><span class="cx"> subport octave-devel-release {
</span><span class="cx"> version ${version_release}
</span><span class="cx"> revision 3
</span><del>- hg.tag 5162cdfb56d8
</del><ins>+ hg.tag acaf1e137c5e
</ins><span class="cx">
</span><span class="cx"> if {${version_release} eq ${version_rc}} {
</span><span class="cx"> conflicts-append octave-devel-release
</span><span class="lines">@@ -265,7 +269,6 @@
</span><span class="cx"> #configure.args-append --with-shell=???
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><del>- --with-framework-opengl \
</del><span class="cx"> --with-framework-carbon \
</span><span class="cx"> --without-x \
</span><span class="cx"> --enable-static
</span><span class="lines">@@ -275,14 +278,22 @@
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><span class="cx"> --disable-java \
</span><del>- --disable-gui \
</del><span class="cx"> --without-fltk \
</span><ins>+ --without-opengl \
</ins><span class="cx"> --disable-jit \
</span><span class="cx"> --without-sndfile \
</span><span class="cx"> --without-portaudio \
</span><span class="cx"> --without-magick \
</span><span class="cx"> --disable-docs
</span><span class="cx">
</span><ins>+if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
+ configure.args-append \
+ --disable-gui
+} else {
+ configure.args-append \
+ --without-qt
+}
+
</ins><span class="cx"> # in configure.ac, listed as one of "[p]rograms used when running Octave"
</span><span class="cx"> depends_lib-append port:python27
</span><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><span class="lines">@@ -418,7 +429,12 @@
</span><span class="cx"> variant qt4gui description {build the GUI using Qt4} {
</span><span class="cx"> PortGroup qt4 1.0
</span><span class="cx"> depends_lib-append port:qscintilla
</span><del>- configure.args-replace --disable-gui --enable-gui
</del><ins>+
+ if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
+ configure.args-replace --disable-gui --enable-gui
+ } else {
+ configure.args-replace --without-qt --with-qt
+ }
</ins><span class="cx"> }
</span><span class="cx"> default_variants-append +qt4gui
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsmathoctavedevelfilespatchconfigurediff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/octave-devel/files/patch-configure.diff (0 => 148708)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/files/patch-configure.diff (rev 0)
+++ trunk/dports/math/octave-devel/files/patch-configure.diff 2016-05-15 11:02:52 UTC (rev 148708)
</span><span class="lines">@@ -0,0 +1,180 @@
</span><ins>+--- configure.ac.orig 2016-05-08 13:35:28.000000000 -0700
++++ configure.ac 2016-05-10 06:04:35.000000000 -0700
+@@ -1266,84 +1266,6 @@
+ fi
+ fi
+
+-## Check for FreeType 2 library
+-
+-warn_freetype=""
+-PKG_CHECK_MODULES([FT2], [freetype2], [
+- min_ft2_version=9.03
+- AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
+- $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
+- ac_status=$?
+- if test "$ac_status" = 0; then
+- AC_MSG_RESULT(yes)
+- AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
+- save_LIBS="$LIBS"
+- LIBS="$FT2_LIBS $LIBS"
+- AC_CHECK_FUNCS([FT_Reference_Face])
+- LIBS="$save_LIBS"
+- else
+- AC_MSG_RESULT(no)
+- warn_freetype="FreeType library >= 9.03 not found. OpenGL graphics will not be fully functional."
+- fi])
+-
+-if test -n "$warn_freetype"; then
+- OCTAVE_CONFIGURE_WARNING([warn_freetype])
+-else
+- FT2_CPPFLAGS="$FT2_CFLAGS"
+- ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
+- ## of `pkg-config --cflags` output.
+- FT2_CPPFLAGS="$FT2_CFLAGS"
+- AC_SUBST(FT2_CPPFLAGS)
+-fi
+-
+-## Check for Xft library (when using X11)
+-
+-warn_xft=""
+-if test "$have_x" = yes; then
+- PKG_CHECK_MODULES(XFT, [xft],
+- [AC_DEFINE(HAVE_XFT, 1, [Define to 1 if Xft is present.])],
+- [warn_xft="Xft library not found. OpenGL graphics will not be fully functional."])
+-fi
+-
+-if test -n "$warn_xft"; then
+- OCTAVE_CONFIGURE_WARNING([warn_xft])
+-fi
+-
+-## Check for fontconfig library
+-
+-warn_fontconfig=""
+-PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
+- [AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
+- [warn_fontconfig="Fontconfig library not found. OpenGL graphics will not be fully functional."])
+-
+-if test -n "$warn_fontconfig"; then
+- OCTAVE_CONFIGURE_WARNING([warn_fontconfig])
+-else
+- FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
+- ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
+- ## of `pkg-config --cflags` output.
+- FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
+- AC_SUBST(FONTCONFIG_CPPFLAGS)
+-fi
+-
+-## Check for OSMesa which is needed for offscreen rendering with OpenGL
+-## FIXME: Check for version >= 9.0.0
+-OCTAVE_CHECK_LIB(OSMesa, OSMesa,
+- [OSMesa library not found. Offscreen rendering with OpenGL will be disabled.],
+- [osmesa.h GL/osmesa.h], [OSMesaCreateContext])
+-
+-## Check for gl2ps which is required for printing with OpenGL graphics
+-
+-AC_CHECK_HEADERS([gl2ps.h],
+- [GL2PS_LIBS="-lgl2ps"],
+- [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
+-
+-if test -n "$warn_gl2ps"; then
+- OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
+-fi
+-
+-AC_SUBST(GL2PS_LIBS)
+-
+ ### GUI/Qt related tests.
+
+ QT_CPPFLAGS=
+@@ -1652,6 +1574,92 @@
+ opengl_graphics=yes
+ fi
+
++## Check for FreeType 2 library
++
++warn_freetype=""
++if test "$opengl_graphics" = yes; then
++ PKG_CHECK_MODULES([FT2], [freetype2], [
++ min_ft2_version=9.03
++ AC_MSG_CHECKING([for FreeType2 version >= $min_ft2_version])
++ $PKG_CONFIG freetype2 --atleast-version=$min_ft2_version
++ ac_status=$?
++ if test "$ac_status" = 0; then
++ AC_MSG_RESULT(yes)
++ AC_DEFINE(HAVE_FREETYPE, 1, [Define to 1 if you have Freetype library.])
++ save_LIBS="$LIBS"
++ LIBS="$FT2_LIBS $LIBS"
++ AC_CHECK_FUNCS([FT_Reference_Face])
++ LIBS="$save_LIBS"
++ else
++ AC_MSG_RESULT(no)
++ warn_freetype="FreeType library >= 9.03 not found. OpenGL graphics will not be fully functional."
++ fi])
++fi
++
++if test -n "$warn_freetype"; then
++ OCTAVE_CONFIGURE_WARNING([warn_freetype])
++else
++ FT2_CPPFLAGS="$FT2_CFLAGS"
++ ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
++ ## of `pkg-config --cflags` output.
++ FT2_CPPFLAGS="$FT2_CFLAGS"
++ AC_SUBST(FT2_CPPFLAGS)
++fi
++
++## Check for Xft library (when using X11)
++
++warn_xft=""
++if test "$opengl_graphics" = yes && "$have_x" = yes; then
++ PKG_CHECK_MODULES(XFT, [xft],
++ [AC_DEFINE(HAVE_XFT, 1, [Define to 1 if Xft is present.])],
++ [warn_xft="Xft library not found. OpenGL graphics will not be fully functional."])
++fi
++
++if test -n "$warn_xft"; then
++ OCTAVE_CONFIGURE_WARNING([warn_xft])
++fi
++
++## Check for fontconfig library
++
++warn_fontconfig=""
++if test "$opengl_graphics" = yes; then
++ PKG_CHECK_MODULES(FONTCONFIG, [fontconfig],
++ [AC_DEFINE(HAVE_FONTCONFIG, 1, [Define to 1 if fontconfig is present.])],
++ [warn_fontconfig="Fontconfig library not found. OpenGL graphics will not be fully functional."])
++fi
++
++if test -n "$warn_fontconfig"; then
++ OCTAVE_CONFIGURE_WARNING([warn_fontconfig])
++else
++ FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
++ ## Alias CPPFLAGS to CFLAGS. This is closer to the true meaning
++ ## of `pkg-config --cflags` output.
++ FONTCONFIG_CPPFLAGS="$FONTCONFIG_CFLAGS"
++ AC_SUBST(FONTCONFIG_CPPFLAGS)
++fi
++
++## Check for OSMesa which is needed for offscreen rendering with OpenGL
++## FIXME: Check for version >= 9.0.0
++if test "$opengl_graphics" = yes; then
++ OCTAVE_CHECK_LIB(OSMesa, OSMesa,
++ [OSMesa library not found. Offscreen rendering with OpenGL will be disabled.],
++ [osmesa.h GL/osmesa.h], [OSMesaCreateContext])
++fi
++
++## Check for gl2ps which is required for printing with OpenGL graphics
++
++if test "$opengl_graphics" = yes; then
++ AC_CHECK_HEADERS([gl2ps.h],
++ [GL2PS_LIBS="-lgl2ps"],
++ [warn_gl2ps="gl2ps library not found. Printing of OpenGL graphics will be disabled."])
++fi
++
++if test -n "$warn_gl2ps"; then
++ OCTAVE_CONFIGURE_WARNING([warn_gl2ps])
++fi
++
++AC_SUBST(GL2PS_LIBS)
++
+ ### Start determination of shared vs. static libraries
+
+ ## Use -static if compiling on Alpha OSF/1 1.3 systems.
</ins></span></pre>
</div>
</div>
</body>
</html>