[137793] trunk/dports/math/eigen3
eborisch at macports.org
eborisch at macports.org
Fri Jun 19 16:59:57 PDT 2015
Revision: 137793
https://trac.macports.org/changeset/137793
Author: eborisch at macports.org
Date: 2015-06-19 16:59:57 -0700 (Fri, 19 Jun 2015)
Log Message:
-----------
eigen3: Update to 3.2.5. Add eigen3-devel subport. Closes #48105.
Modified Paths:
--------------
trunk/dports/math/eigen3/Portfile
trunk/dports/math/eigen3/files/unsupported.patch
Added Paths:
-----------
trunk/dports/math/eigen3/files/ftv2node.png
trunk/dports/math/eigen3/files/ftv2pnode.png
Modified: trunk/dports/math/eigen3/Portfile
===================================================================
--- trunk/dports/math/eigen3/Portfile 2015-06-19 19:51:45 UTC (rev 137792)
+++ trunk/dports/math/eigen3/Portfile 2015-06-19 23:59:57 UTC (rev 137793)
@@ -4,10 +4,11 @@
PortSystem 1.0
PortGroup compilers 1.0
PortGroup cmake 1.0
+PortGroup bitbucket 1.0
name eigen3
-version 3.2.4
revision 0
+
license MPL-2 LGPL-3+
categories math science
maintainers eborisch \
@@ -15,47 +16,44 @@
description A C++ template library for linear algebra: vectors, \
matrices, and related algorithms.
long_description ${description}
-homepage http://eigen.tuxfamily.org/
platforms darwin
-master_sites http://bitbucket.org/eigen/eigen/get/
-distname ${version}
-
-# Eigen seems to like to stealth update; keeping this around for the next time
-# 3.0.4 was stealth updated; see #32613
-#dist_subdir ${name}/${version}_32613
-
use_bzip2 yes
-checksums \
- rmd160 6f91d659c386a9bb2c54f2dc7508ac37577b7be7 \
- sha256 d64332c92e31803d2c59f6646ed893965c666acfc7c284e4f5e9ffbb4d148922
+depends_build-append port:pkgconfig
-conflicts eigen3-devel
+subport eigen3-devel {}
-depends_build-append port:pkgconfig
+if {${subport} eq ${name}} {
+ bitbucket.setup eigen eigen 3.2.5
+ name eigen3
+ conflicts eigen3-devel
-livecheck.type regex
-livecheck.url ${homepage}index.php?title=Main_Page
-livecheck.regex {stable release.*Eigen (\d+(?:\.\d+)*).}
+ # Eigen seems to like to stealth update; keeping this around for the next
+ # time 3.0.4 was stealth updated; see #32613
+ #dist_subdir ${name}/${version}_32613
+ checksums \
+ rmd160 46d5604ef279a50562771a7492ee3a6d570705d6 \
+ sha256 5f6e6cb88188e34185f43cb819d7dab9b48ef493774ff834e568f4805d3dc2f9
-patchfiles unsupported.patch
-
-subport eigen3-devel {
+ patchfiles unsupported.patch
+} else {
+ # No current development version (other than rolling snapshot)
+ bitbucket.setup eigen eigen 90c881e
+ name eigen3-devel
conflicts eigen3
- # No current development version (other than rolling snapshot)
- version 3.2.4
+
+ version 3.2.90.20150619
revision 0
# rc version seen as older than beta
epoch 1
- distname ${version}
checksums \
- rmd160 6f91d659c386a9bb2c54f2dc7508ac37577b7be7 \
- sha256 d64332c92e31803d2c59f6646ed893965c666acfc7c284e4f5e9ffbb4d148922
- livecheck.regex \
- {development release.*Eigen (([\d]|\.|beta|rc|-)+)\.}
+ rmd160 e1f4144d5841f7c9ee146439b6804125fd4a0e5f \
+ sha256 0c40b0c8829ba6b72f19336583abfcdb6a0bc20a2fd09430b6c5efc138bad6df
}
+homepage http://eigen.tuxfamily.org/
+
variant doc description \
{Place local documentation into <prefix>/share/doc/eigen3/html} {
depends_build-append port:doxygen \
@@ -132,7 +130,7 @@
}
foreach sfx ${build_suffix} {
- set docdir ${destroot}${sfx}${prefix}/share/doc/${name}
+ set docdir ${destroot}${sfx}${prefix}/share/doc/eigen3
xinstall -d ${docdir}
xinstall -m 644 -W ${workpath}/eigen_src \
COPYING.GPL COPYING.LGPL ${docdir}
@@ -144,6 +142,11 @@
# which makes muniversal hiccup. Just copy one set of docs
# into destroot directories.
file copy ${worksrcpath}${sfx}/doc/html ${docdir}
+ # Temporary fix for doxygen changes
+ file copy ${filespath}/ftv2node.png ${docdir}/html
+ file copy ${filespath}/ftv2pnode.png ${docdir}/html
+ file copy ${filespath}/ftv2node.png ${docdir}/html/unsupported
+ file copy ${filespath}/ftv2pnode.png ${docdir}/html/unsupported
}
}
@@ -160,7 +163,7 @@
# Grab extra items install doesn't out of unsupported
foreach n {README.txt bench doc test} {
file copy ${workpath}/eigen_src/unsupported/${n} \
- ${destroot}${prefix}/include/${name}/unsupported
+ ${destroot}${prefix}/include/eigen3/unsupported
}
# Install FindEigen3.cmake file
Added: trunk/dports/math/eigen3/files/ftv2node.png
===================================================================
(Binary files differ)
Property changes on: trunk/dports/math/eigen3/files/ftv2node.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Added: trunk/dports/math/eigen3/files/ftv2pnode.png
===================================================================
(Binary files differ)
Property changes on: trunk/dports/math/eigen3/files/ftv2pnode.png
___________________________________________________________________
Added: svn:mime-type
+ image/png
Modified: trunk/dports/math/eigen3/files/unsupported.patch
===================================================================
--- trunk/dports/math/eigen3/files/unsupported.patch 2015-06-19 19:51:45 UTC (rev 137792)
+++ trunk/dports/math/eigen3/files/unsupported.patch 2015-06-19 23:59:57 UTC (rev 137793)
@@ -1,32 +1,27 @@
--- unsupported/Eigen/CMakeLists.txt.orig 2014-03-14 10:36:53.000000000 -0500
+++ unsupported/Eigen/CMakeLists.txt 2014-03-14 10:38:30.000000000 -0500
@@ -1,6 +1,6 @@
--set(Eigen_HEADERS AdolcForward BVH IterativeSolvers MatrixFunctions MoreVectorization AutoDiff AlignedVector3 Polynomials
-+set(Eigen_HEADERS AdolcForward ArpackSupport BVH IterativeSolvers MatrixFunctions MoreVectorization AutoDiff AlignedVector3 Polynomials
- FFT NonLinearOptimization SparseExtra IterativeSolvers
-- NumericalDiff Skyline MPRealSupport OpenGLSupport KroneckerProduct Splines LevenbergMarquardt
-+ NumericalDiff Skyline SVD MPRealSupport OpenGLSupport KroneckerProduct Splines LevenbergMarquardt
+ set(Eigen_HEADERS AdolcForward AlignedVector3 ArpackSupport AutoDiff BVH FFT IterativeSolvers KroneckerProduct LevenbergMarquardt
+ MatrixFunctions MoreVectorization MPRealSupport NonLinearOptimization NumericalDiff OpenGLSupport Polynomials
+- Skyline SparseExtra Splines
++ Skyline SparseExtra Splines SVD
)
-
+
install(FILES
--- unsupported/Eigen/src/CMakeLists.txt.orig 2014-03-14 10:39:42.000000000 -0500
+++ unsupported/Eigen/src/CMakeLists.txt 2014-03-14 10:44:53.000000000 -0500
-@@ -1,7 +1,9 @@
+@@ -1,5 +1,6 @@
ADD_SUBDIRECTORY(AutoDiff)
ADD_SUBDIRECTORY(BVH)
+ADD_SUBDIRECTORY(Eigenvalues)
ADD_SUBDIRECTORY(FFT)
ADD_SUBDIRECTORY(IterativeSolvers)
-+ADD_SUBDIRECTORY(LevenbergMarquardt)
- ADD_SUBDIRECTORY(MatrixFunctions)
- ADD_SUBDIRECTORY(MoreVectorization)
- ADD_SUBDIRECTORY(NonLinearOptimization)
-@@ -9,5 +11,6 @@
+ ADD_SUBDIRECTORY(KroneckerProduct)
+@@ -11,4 +12,5 @@
ADD_SUBDIRECTORY(Polynomials)
ADD_SUBDIRECTORY(Skyline)
ADD_SUBDIRECTORY(SparseExtra)
+ADD_SUBDIRECTORY(SVD)
- ADD_SUBDIRECTORY(KroneckerProduct)
ADD_SUBDIRECTORY(Splines)
--- unsupported/Eigen/src/SVD/CMakeLists.txt.orig 2014-03-14 10:56:38.000000000 -0500
+++ unsupported/Eigen/src/SVD/CMakeLists.txt 2014-03-14 10:56:51.000000000 -0500
@@ -39,12 +34,9 @@
)
--- unsupported/Eigen/src/LevenbergMarquardt/CMakeLists.txt.orig 2014-03-14 10:57:24.000000000 -0500
+++ unsupported/Eigen/src/LevenbergMarquardt/CMakeLists.txt 2014-03-14 10:57:06.000000000 -0500
-@@ -1,6 +1,6 @@
+@@ -1,4 +1,4 @@
-FILE(GLOB Eigen_LevenbergMarquardt_SRCS "*.h")
+FILE(GLOB Eigen_LevenbergMarquardt_SRCS "*.h" "Copyright*.txt")
INSTALL(FILES
${Eigen_LevenbergMarquardt_SRCS}
-- DESTINATION ${INCLUDE_INSTALL_DIR}/Eigen/src/LevenbergMarquardt COMPONENT Devel
-+ DESTINATION ${INCLUDE_INSTALL_DIR}/unsupported/Eigen/src/LevenbergMarquardt COMPONENT Devel
- )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150619/33b76a21/attachment-0001.html>
More information about the macports-changes
mailing list