diff --git a/cad/gmsh-occ/Makefile b/cad/gmsh-occ/Makefile index b297335041a8..8df68d505443 100644 --- a/cad/gmsh-occ/Makefile +++ b/cad/gmsh-occ/Makefile @@ -1,11 +1,8 @@ # Created by: Thierry Thomas # $FreeBSD$ -PORTREVISION= 1 - PKGNAMESUFFIX= -occ -MAINTAINER= jrm@FreeBSD.org COMMENT= Automatic 3D finite element mesh generator with OpenCascade support MASTERDIR= ${.CURDIR}/../../cad/gmsh diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index b9cdbd36d607..cf799cc88a8b 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= gmsh -PORTVERSION= 2.13.2 +PORTVERSION= 2.14.0 CATEGORIES= cad MASTER_SITES= http://gmsh.info/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-source DIST_SUBDIR= gmsh -MAINTAINER?= jrm@FreeBSD.org +MAINTAINER= jrm@FreeBSD.org COMMENT?= Automatic 3D finite element mesh generator LICENSE= AGPLv3+ APACHE20 GPLv3+ GPLv2+ LGPL21 @@ -63,7 +63,8 @@ OCC_CMAKE_BOOL= ENABLE_OCC OCC_CMAKE_ON= -DOCC_INC=${LOCALBASE}/include/OpenCASCADE OCC_CONFLICTS= gmsh-2.* OCC_CONFLICTS_OFF= gmsh-occ-2.* -OCC_LIB_DEPENDS= libTKernel.so:cad/opencascade +OCC_LIB_DEPENDS= libopenblas.so:math/openblas libTKernel.so:cad/opencascade +OCC_USE= gnome=cairo SHARED_ALL_TARGET= shared SHARED_CMAKE_BOOL= ENABLE_BUILD_SHARED SHARED_VARS= USE_LDCONFIG=yes diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo index 37f19eb70c32..2a8d901a5c9e 100644 --- a/cad/gmsh/distinfo +++ b/cad/gmsh/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1472424237 -SHA256 (gmsh/gmsh-2.13.2-source.tgz) = d68e1569f7ccf61cfd70d6845defe8dd73676745beafcf1de60ba9874ad15f26 -SIZE (gmsh/gmsh-2.13.2-source.tgz) = 11415014 -SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911 -SIZE (gmsh/manual.pdf) = 206713 +TIMESTAMP = 1476119505 +SHA256 (gmsh/gmsh-2.14.0-source.tgz) = 8b344f29ace99167578158fcc4854461630b26808cff9e2dea134ab4267991cd +SIZE (gmsh/gmsh-2.14.0-source.tgz) = 10869233 diff --git a/cad/gmsh/files/patch-contrib_taucs_config_taucs__config__build.h b/cad/gmsh/files/patch-contrib_taucs_config_taucs__config__build.h deleted file mode 100644 index 424a7cf222ae..000000000000 --- a/cad/gmsh/files/patch-contrib_taucs_config_taucs__config__build.h +++ /dev/null @@ -1,10 +0,0 @@ ---- contrib/taucs/config/taucs_config_build.h.orig 2016-09-28 15:41:06 UTC -+++ contrib/taucs/config/taucs_config_build.h -@@ -3,7 +3,6 @@ - #define TAUCS_CONFIG_DCOMPLEX - #define TAUCS_CONFIG_SCOMPLEX - #define TAUCS_CONFIG_GENERIC_COMPLEX --#define TAUCS_CONFIG_TIMING - #define TAUCS_CONFIG_BASE - #define TAUCS_CONFIG_MATRIX_IO - #define TAUCS_CONFIG_METIS