[97995] trunk/dports/math/octave-devel
michaelld at macports.org
michaelld at macports.org
Fri Sep 21 09:35:12 PDT 2012
Revision: 97995
http://trac.macports.org//changeset/97995
Author: michaelld at macports.org
Date: 2012-09-21 09:35:11 -0700 (Fri, 21 Sep 2012)
Log Message:
-----------
octave-devel :
* addresses tickets #32702, #36146, #36232, and #36233;
* upgrade to 3.6.3_0;
* add dependency texlive-latex to +doc variant;
* fix detection of use of "-framework Carbon" by using APPLE_CXX=/usr/bin/g++ instead of the selected compiler (e.g., CXX=${prefix}/bin/g++-mp-4.7);
* fix a problem with framework accelerate flags in mkoctfile.
Modified Paths:
--------------
trunk/dports/math/octave-devel/Portfile
trunk/dports/math/octave-devel/files/patch-configure.diff
trunk/dports/math/octave-devel/files/patch-src-display.cc.diff
Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile 2012-09-21 15:43:47 UTC (rev 97994)
+++ trunk/dports/math/octave-devel/Portfile 2012-09-21 16:35:11 UTC (rev 97995)
@@ -4,8 +4,7 @@
PortSystem 1.0
name octave-devel
-version 3.6.2
-revision 1
+version 3.6.3
conflicts octave
categories math science
maintainers michaelld openmaintainer
@@ -24,8 +23,8 @@
distname octave-${version}
use_bzip2 yes
-checksums rmd160 1bf26b238d2bba461c5902d091088533c733439b \
- sha256 0bb69b93d0bee872308a7944f1ebbe948f55cd4ae55beab38f05950e1b45c4ae
+checksums rmd160 1b0f75da1efc77cef0698a7affe56a477430cc1f \
+ sha256 e37d09550f1cb406745619a5602aa3e8a97d2fe056b5c770db9984e2fc162886
depends_build port:bison \
port:flex \
@@ -69,8 +68,6 @@
--with-cholmod="-lcholmod -lmetis" \
--with-umfpack="-lumfpack -lSuiteSparse"
-# --without-framework-carbon
-
# octave uses a number of other ports to create sources from template:
# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the
# MacPorts' versions. Python is not used if perl is available, so
@@ -83,10 +80,18 @@
FLTK_CONFIG=no \
SED="${prefix}/bin/gsed" \
TEXI2DVI="${prefix}/bin/texi2dvi" \
- TEXI2PDF="${prefix}/bin/texi2pdf"
+ TEXI2PDF="${prefix}/bin/texi2pdf" \
+ APPLE_CXX="/usr/bin/g++"
configure.cppflags
configure.ldflags
+pre-build {
+ reinplace "/'display\.cc'/s@\$(CXX)@\$(APPLE_CXX)@g" \
+ ${worksrcpath}/src/Makefile
+}
+
+build.env-append APPLE_CXX="/usr/bin/g++"
+
test.run yes
test.target check
@@ -129,8 +134,8 @@
variant accelerate description {use BLAS from Apple's Accelerate.framework} conflicts atlas {
depends_lib-append port:dotwrp
- configure.args-append --with-blas="-ldotwrp -framework Accelerate"
- configure.args-append --with-lapack="-framework Accelerate"
+ configure.args-append --with-blas="-ldotwrp -Wl,-framework -Wl,Accelerate"
+ configure.args-append --with-lapack="-Wl,-framework -Wl,Accelerate"
}
if {[variant_isset g95]} {
@@ -181,6 +186,8 @@
variant docs description {Enable creation and installation of documentation} {
depends_run-append port:texlive-basic
+ # latex needed for lcircle10 font etc.
+ depends_build-append port:texlive-latex
configure.args-replace s|--disable-docs|--enable-docs|
}
Modified: trunk/dports/math/octave-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-configure.diff 2012-09-21 15:43:47 UTC (rev 97994)
+++ trunk/dports/math/octave-devel/files/patch-configure.diff 2012-09-21 16:35:11 UTC (rev 97995)
@@ -1,7 +1,18 @@
---- configure.orig 2011-06-25 10:04:48.000000000 +0200
-+++ configure 2011-06-25 10:05:19.000000000 +0200
-@@ -33171,6 +33171,21 @@
+--- configure.orig 2012-09-21 11:41:47.000000000 -0400
++++ configure 2012-09-21 11:42:36.000000000 -0400
+@@ -32450,8 +32450,8 @@
+ LDFLAGS="$LDFLAGS -framework Carbon"
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compile='$APPLE_CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$APPLE_CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -37034,6 +37034,21 @@
+
## fltk (www.fltk.org)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fltk..." >&5
@@ -22,7 +33,7 @@
# Check whether --with-fltk-prefix was given.
if test "${with_fltk_prefix+set}" = set; then :
-@@ -33247,6 +33262,7 @@
+@@ -37110,6 +37125,7 @@
$as_echo "no" >&6; }
fi
Modified: trunk/dports/math/octave-devel/files/patch-src-display.cc.diff
===================================================================
--- trunk/dports/math/octave-devel/files/patch-src-display.cc.diff 2012-09-21 15:43:47 UTC (rev 97994)
+++ trunk/dports/math/octave-devel/files/patch-src-display.cc.diff 2012-09-21 16:35:11 UTC (rev 97995)
@@ -1,6 +1,6 @@
---- src/display.cc.orig 2011-12-14 15:03:12.000000000 -0500
-+++ src/display.cc 2011-12-14 15:25:30.000000000 -0500
-@@ -39,6 +39,29 @@
+--- src/display.cc.orig 2012-09-21 11:29:13.000000000 -0400
++++ src/display.cc 2012-09-21 11:29:27.000000000 -0400
+@@ -41,6 +41,29 @@
display_info *display_info::instance = 0;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120921/52f92977/attachment.html>
More information about the macports-changes
mailing list