Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 3 Aug 2016 16:27:21 +0000 (UTC)
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r419533 - in head/math/armadillo: . files
Message-ID:  <201608031627.u73GRLeg063343@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pi
Date: Wed Aug  3 16:27:21 2016
New Revision: 419533
URL: https://svnweb.freebsd.org/changeset/ports/419533

Log:
  math/armadillo: 6.700.7 -> 7.100.3
  
  PR:		210050
  Changes:	http://arma.sourceforge.net/docs.html#version_7100
  Approved by:	danilo (maintainer timeout)

Added:
  head/math/armadillo/files/patch-CMakeLists.txt   (contents, props changed)
Deleted:
  head/math/armadillo/files/patch-include+armadillo_bits+config.hpp
Modified:
  head/math/armadillo/Makefile
  head/math/armadillo/distinfo
  head/math/armadillo/pkg-plist

Modified: head/math/armadillo/Makefile
==============================================================================
--- head/math/armadillo/Makefile	Wed Aug  3 16:21:43 2016	(r419532)
+++ head/math/armadillo/Makefile	Wed Aug  3 16:27:21 2016	(r419533)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	armadillo
-PORTVERSION=	6.700.7
+PORTVERSION=	7.100.3
 CATEGORIES=	math
 MASTER_SITES=	SF/arma
 
@@ -10,14 +10,14 @@ COMMENT=	C++ linear algebra library
 
 LICENSE=	MPL
 
-BROKEN_powerpc64=	Does not build
-
 LIB_DEPENDS=	libboost_date_time.so:devel/boost-libs \
 		libarpack.so:math/arpack \
 		libhdf5.so:science/hdf5 \
 		libsuperlu.so:math/superlu
 
-USES=		cmake blaslapack
+USES=		blaslapack cmake compiler:c++11-lang tar:xz
 USE_LDCONFIG=	yes
 
+BROKEN_powerpc64=	Does not build
+
 .include <bsd.port.mk>

Modified: head/math/armadillo/distinfo
==============================================================================
--- head/math/armadillo/distinfo	Wed Aug  3 16:21:43 2016	(r419532)
+++ head/math/armadillo/distinfo	Wed Aug  3 16:27:21 2016	(r419533)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464054577
-SHA256 (armadillo-6.700.7.tar.gz) = 2a3388ee99d345b3e31c83ea3b0850292ac1a2154ffb785c1f03af9d3b6b7175
-SIZE (armadillo-6.700.7.tar.gz) = 5470594
+TIMESTAMP = 1465123703
+SHA256 (armadillo-7.100.3.tar.xz) = 3fa4a2f84b54d48260efd587d7e6290618bc909d191bec0a3084a890af699d1e
+SIZE (armadillo-7.100.3.tar.xz) = 3715272

Added: head/math/armadillo/files/patch-CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/armadillo/files/patch-CMakeLists.txt	Wed Aug  3 16:27:21 2016	(r419533)
@@ -0,0 +1,21 @@
+--- CMakeLists.txt.orig	2016-05-25 08:46:44 UTC
++++ CMakeLists.txt
+@@ -368,12 +368,12 @@ if(NOT INSTALL_LIB_DIR)
+       message(STATUS "*** Detected 64 bit system")
+       # use "lib64" only on systems that have it (eg. Fedora, Red Hat).
+       # if installing in /usr/local/, the use of lib64 might be unreliable on systems which have /usr/local/lib64 but don't use it
+-      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
+-        unset(INSTALL_LIB_DIR)
+-        set(INSTALL_LIB_DIR "lib64")
+-        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
+-        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
+-      endif()
++#      if(IS_DIRECTORY "${CMAKE_INSTALL_PREFIX}/lib64")
++#        unset(INSTALL_LIB_DIR)
++#        set(INSTALL_LIB_DIR "lib64")
++#        message(STATUS "*** ${CMAKE_INSTALL_PREFIX}/lib64/ exists, so destination directory for the run-time library changed to ${CMAKE_INSTALL_PREFIX}/lib64/")
++#        message(STATUS "*** Your system and/or compiler must search ${CMAKE_INSTALL_PREFIX}/lib64/ during linking")
++#      endif()
+     endif()
+   endif()
+ endif()

Modified: head/math/armadillo/pkg-plist
==============================================================================
--- head/math/armadillo/pkg-plist	Wed Aug  3 16:21:43 2016	(r419532)
+++ head/math/armadillo/pkg-plist	Wed Aug  3 16:27:21 2016	(r419533)
@@ -262,6 +262,25 @@ include/armadillo_bits/mul_gemm_mixed.hp
 include/armadillo_bits/mul_gemv.hpp
 include/armadillo_bits/mul_herk.hpp
 include/armadillo_bits/mul_syrk.hpp
+include/armadillo_bits/newarp_DenseGenMatProd_bones.hpp
+include/armadillo_bits/newarp_DenseGenMatProd_meat.hpp
+include/armadillo_bits/newarp_DoubleShiftQR_bones.hpp
+include/armadillo_bits/newarp_DoubleShiftQR_meat.hpp
+include/armadillo_bits/newarp_EigsSelect.hpp
+include/armadillo_bits/newarp_GenEigsSolver_bones.hpp
+include/armadillo_bits/newarp_GenEigsSolver_meat.hpp
+include/armadillo_bits/newarp_SortEigenvalue.hpp
+include/armadillo_bits/newarp_SparseGenMatProd_bones.hpp
+include/armadillo_bits/newarp_SparseGenMatProd_meat.hpp
+include/armadillo_bits/newarp_SymEigsSolver_bones.hpp
+include/armadillo_bits/newarp_SymEigsSolver_meat.hpp
+include/armadillo_bits/newarp_TridiagEigen_bones.hpp
+include/armadillo_bits/newarp_TridiagEigen_meat.hpp
+include/armadillo_bits/newarp_UpperHessenbergEigen_bones.hpp
+include/armadillo_bits/newarp_UpperHessenbergEigen_meat.hpp
+include/armadillo_bits/newarp_UpperHessenbergQR_bones.hpp
+include/armadillo_bits/newarp_UpperHessenbergQR_meat.hpp
+include/armadillo_bits/newarp_cx_attrib.hpp
 include/armadillo_bits/op_all_bones.hpp
 include/armadillo_bits/op_all_meat.hpp
 include/armadillo_bits/op_any_bones.hpp
@@ -454,8 +473,8 @@ include/armadillo_bits/xtrans_mat_meat.h
 include/armadillo_bits/xvec_htrans_bones.hpp
 include/armadillo_bits/xvec_htrans_meat.hpp
 lib/libarmadillo.so
-lib/libarmadillo.so.6
-lib/libarmadillo.so.6.700.7
+lib/libarmadillo.so.7
+lib/libarmadillo.so.7.100.3
 share/Armadillo/CMake/ArmadilloConfig.cmake
 share/Armadillo/CMake/ArmadilloConfigVersion.cmake
 share/Armadillo/CMake/ArmadilloLibraryDepends-release.cmake



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608031627.u73GRLeg063343>