Properly find umfpack.

math/eigen3/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2015/07/20 23:15:14 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2015/07/21 02:38:40 ajacoutot Exp $
 
 PKG_ARCH =	*
 COMMENT =	lightweight C++ template library for linear algebra
@@ -9,7 +9,7 @@ VERSION =	3.2.2
 DISTNAME =	${VERSION}
 PKGNAME =	eigen3-${VERSION}
 WRKDIST =	${WRKDIR}/eigen-eigen-1306d75b4a21
-REVISION =	2
+REVISION =	3
 
 MAINTAINER =	Vadim Zhukov <zhuk@openbsd.org>
 

math/eigen3/patches/patch-cmake_FindUmfpack_cmake

@@ -1,32 +0,0 @@
-$OpenBSD: patch-cmake_FindUmfpack_cmake,v 1.1.1.1 2014/07/10 08:59:52 zhuk Exp $
-1. Allow to find UMFPACK headers.
-2. Make sure AMD (math/amd) headers location is also picked up.
---- cmake/FindUmfpack.cmake.orig	Wed Feb 26 19:35:18 2014
-+++ cmake/FindUmfpack.cmake	Mon Jun 30 12:13:02 2014
-@@ -5,7 +5,7 @@ if (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
-   set(UMFPACK_FIND_QUIETLY TRUE)
- endif (UMFPACK_INCLUDES AND UMFPACK_LIBRARIES)
- 
--find_path(UMFPACK_INCLUDES
-+find_path(UMFPACK_INCLUDE_DIR
-   NAMES
-   umfpack.h
-   PATHS
-@@ -14,7 +14,17 @@ find_path(UMFPACK_INCLUDES
-   PATH_SUFFIXES
-   suitesparse
-   ufsparse
-+  umfpack
- )
-+
-+find_path(AMD_INCLUDE_DIR
-+  NAMES
-+  amd/amd.h
-+)
-+
-+if(UMFPACK_INCLUDE_DIR)
-+  set(UMFPACK_INCLUDES ${UMFPACK_INCLUDE_DIR} ${AMD_INCLUDE_DIR})
-+endif()
- 
- find_library(UMFPACK_LIBRARIES umfpack PATHS $ENV{UMFPACKDIR} ${LIB_INSTALL_DIR})
-