[148708] trunk/dports/math/octave-devel
mcalhoun at macports.org
mcalhoun at macports.org
Sun May 15 04:02:52 PDT 2016
Revision: 148708
https://trac.macports.org/changeset/148708
Author: mcalhoun at macports.org
Date: 2016-05-15 04:02:52 -0700 (Sun, 15 May 2016)
Log Message:
-----------
octave-devel: update to latest upstream version
Modified Paths:
--------------
trunk/dports/math/octave-devel/Portfile
Added Paths:
-----------
trunk/dports/math/octave-devel/files/patch-configure.diff
Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- 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)
@@ -30,17 +30,21 @@
if { ${name} eq ${subport} } {
version ${version_tip}
- revision 12
- hg.tag 225d88a97104
+ revision 13
+ hg.tag 19e8eddd4773
# see http://savannah.gnu.org/bugs/?41027
patchfiles-append \
octave-bug_41027-half.patch
+ # see http://savannah.gnu.org/bugs/index.php?47886
+ patchfiles-append \
+ patch-configure.diff
+
checksums-append \
${hg.tag}${extract.suffix} \
- rmd160 12db3bfd49342fcf948a47fd8814d2a2aee4779e \
- sha256 e3734195ef42de35953e20c4dec9d741273e35c8a97b4a44777587a1d5e2642d
+ rmd160 bf6d26b12fa1f0e2a8434a54ffa395c2b4e7f31e \
+ sha256 934b7f116018e3f8d97c7bbd2d213a77c823d934a4865155e24eac5cb42a636b
livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\ntip"
}
@@ -73,7 +77,7 @@
subport octave-devel-release {
version ${version_release}
revision 3
- hg.tag 5162cdfb56d8
+ hg.tag acaf1e137c5e
if {${version_release} eq ${version_rc}} {
conflicts-append octave-devel-release
@@ -265,7 +269,6 @@
#configure.args-append --with-shell=???
configure.args-append \
- --with-framework-opengl \
--with-framework-carbon \
--without-x \
--enable-static
@@ -275,14 +278,22 @@
configure.args-append \
--disable-java \
- --disable-gui \
--without-fltk \
+ --without-opengl \
--disable-jit \
--without-sndfile \
--without-portaudio \
--without-magick \
--disable-docs
+if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
+ configure.args-append \
+ --disable-gui
+} else {
+ configure.args-append \
+ --without-qt
+}
+
# in configure.ac, listed as one of "[p]rograms used when running Octave"
depends_lib-append port:python27
configure.python ${prefix}/bin/python2.7
@@ -418,7 +429,12 @@
variant qt4gui description {build the GUI using Qt4} {
PortGroup qt4 1.0
depends_lib-append port:qscintilla
- configure.args-replace --disable-gui --enable-gui
+
+ 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
+ }
}
default_variants-append +qt4gui
Added: trunk/dports/math/octave-devel/files/patch-configure.diff
===================================================================
--- 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)
@@ -0,0 +1,180 @@
+--- 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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/dbae547b/attachment-0001.html>
More information about the macports-changes
mailing list