Revision: 83439 http://trac.macports.org/changeset/83439 Author: eborisch@macports.org Date: 2011-09-01 07:26:04 -0700 (Thu, 01 Sep 2011) Log Message: ----------- eigen3: Upgrade to 3.0.2; handle documentation issues Modified Paths: -------------- trunk/dports/math/eigen3/Portfile Added Paths: ----------- trunk/dports/math/eigen3/files/ trunk/dports/math/eigen3/files/Eigen_src_Core_Fuzzy.h-patch trunk/dports/math/eigen3/files/doc_Doxyfile.in-patch Modified: trunk/dports/math/eigen3/Portfile =================================================================== --- trunk/dports/math/eigen3/Portfile 2011-09-01 13:58:45 UTC (rev 83438) +++ trunk/dports/math/eigen3/Portfile 2011-09-01 14:26:04 UTC (rev 83439) @@ -3,8 +3,7 @@ PortSystem 1.0 name eigen3 -version 3.0.1 -revision 2 +version 3.0.2 license {{GPL-2+} {LGPL-3+}} categories math science maintainers eborisch \ @@ -17,21 +16,29 @@ master_sites http://bitbucket.org/eigen/eigen/get/ distname ${version} -# 3.0.1 was stealth updated; see #30684 -dist_subdir ${name}/${version}_30684 +# Eigen seems to like to stealth update; keeping this around for the next time +# 3.0.2 was stealth updated; see #XXXXX +#dist_subdir ${name}/${version}_XXXXX use_bzip2 yes -checksums md5 69004f4d04fa6e49bf9fbeb957cfb97e \ - sha1 6fe629cd1eaef1a44430a068ff7202fc27209ee4 \ - rmd160 ac3343dddc208cada82d316b78b1b34d7031eafe +checksums md5 45ee4ac26b25ae7152bf1e7754497971 \ + sha1 2bcc7a6b415f5c75b5e061a399c3f9ab9aadb708 \ + rmd160 7686dc72ac8ee96cb055d4bca8cd6da526d5780c universal_variant yes configure.universal_args "" # Install via CMake by default. Slower than a header-only install, but makes other CMake-based builds happy -default_variants +cmake +default_variants +cmake + +# Fix documentation (LaTeX) error +patchfiles Eigen_src_Core_Fuzzy.h-patch + +# Enable to make LaTeX continue on error when run from Doxygen +#patchfiles-append doc_Doxyfile.in-patch + # Variants variant gcc44 description {Use MacPorts' gcc44 compilers} conflicts gcc45 { configure.compiler macports-gcc-4.4 @@ -112,7 +119,13 @@ # Phase modifications # Move source into eigen_src; configure & build (out-of-source) in ${worksrcpath} post-extract { - move ${workpath}/eigen-eigen-3.0.1 ${workpath}/eigen_src + # Rename extracted directory + move ${workpath}/eigen-eigen-3.0.2 ${worksrcpath} +} + +post-patch { + # Move directory for out-of-source build + move ${worksrcpath} ${workpath}/eigen_src file mkdir ${worksrcpath} } @@ -135,7 +148,12 @@ # Install documentation if requested if {[variant_isset doc]} { - file copy ${worksrcpath}${sfx}/doc/html ${docdir} + if {[string equal ${sfx} [lindex ${build_suffix} 0]]} { + # The documentation created is slightly different for each arch + # which makes muniversal hiccup. Just copy one set of docs + # into destroot directories. + file copy ${worksrcpath}${sfx}/doc/html ${docdir} + } } if {[variant_isset blas]} { Added: trunk/dports/math/eigen3/files/Eigen_src_Core_Fuzzy.h-patch =================================================================== --- trunk/dports/math/eigen3/files/Eigen_src_Core_Fuzzy.h-patch (rev 0) +++ trunk/dports/math/eigen3/files/Eigen_src_Core_Fuzzy.h-patch 2011-09-01 14:26:04 UTC (rev 83439) @@ -0,0 +1,11 @@ +--- Eigen/src/Core/Fuzzy.h.orig 2011-09-01 08:28:29.000000000 -0500 ++++ Eigen/src/Core/Fuzzy.h 2011-09-01 08:29:31.000000000 -0500 +@@ -94,7 +94,7 @@ + * + * \note The fuzzy compares are done multiplicatively. Two vectors \f$ v \f$ and \f$ w \f$ + * are considered to be approximately equal within precision \f$ p \f$ if +- * \f[ \Vert v - w \Vert \leqslant p\,\(min)(\Vert v\Vert, \Vert w\Vert). \f] ++ * \f[ \Vert v - w \Vert \leqslant p \times \min(\Vert v\Vert, \Vert w\Vert). \f] + * For matrices, the comparison is done using the Hilbert-Schmidt norm (aka Frobenius norm + * L2 norm). + * Added: trunk/dports/math/eigen3/files/doc_Doxyfile.in-patch =================================================================== --- trunk/dports/math/eigen3/files/doc_Doxyfile.in-patch (rev 0) +++ trunk/dports/math/eigen3/files/doc_Doxyfile.in-patch 2011-09-01 14:26:04 UTC (rev 83439) @@ -0,0 +1,11 @@ +--- doc/Doxyfile.in.orig 2011-09-01 07:56:44.000000000 -0500 ++++ doc/Doxyfile.in 2011-09-01 07:57:02.000000000 -0500 +@@ -1002,7 +1002,7 @@ + # running if errors occur, instead of asking the user for help. + # This option is also used when generating formulas in HTML. + +-LATEX_BATCHMODE = NO ++LATEX_BATCHMODE = YES + + # If LATEX_HIDE_INDICES is set to YES then doxygen will not + # include the index chapters (such as File Index, Compound Index, etc.)