Index: Makefile =================================================================== --- Makefile +++ Makefile @@ -1,137 +1,126 @@ # Created by: Pedro Giffuni # $FreeBSD$ -PORTNAME= gmsh -PORTVERSION= 2.12.0 -CATEGORIES= cad -MASTER_SITES= http://www.geuz.org/gmsh/src/ \ - http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-source -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DIST_SUBDIR= gmsh -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PORTNAME= gmsh +PORTVERSION= 2.13.2 +CATEGORIES= cad +MASTER_SITES= http://gmsh.info/src/ \ + http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ +DISTNAME= ${PORTNAME}-${PORTVERSION}-source +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} +DIST_SUBDIR= gmsh +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= stephen@FreeBSD.org -COMMENT= Automatic 3D finite element mesh generator +MAINTAINER= stephen@FreeBSD.org +COMMENT= Automatic 3D finite element mesh generator -LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ - libpng.so:graphics/png \ - liblapack.so:math/lapack -RUN_DEPENDS= getdp:science/getdp +LICENSE= GPLv2+ AGPLv3+ +LICENSE_COMB= multi +LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \ + libfontconfig.so:x11-fonts/fontconfig \ + libgmp.so:math/gmp \ + libhdf5.so:science/hdf5 \ + libpng.so:graphics/png \ + libsz.so:science/szip +RUN_DEPENDS= getdp:science/getdp + BROKEN_powerpc64= Does not build on powerpc64 -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source -SLAVEDIRS= cad/gmsh-occ +SLAVEDIRS= cad/gmsh-occ -USES= cmake fortran gmake jpeg tar:tgz -USE_GL= yes -ALL_TARGET= all +USES= blaslapack cmake fortran gmake jpeg tar:tgz +USE_GL= gl glu +USE_XORG= x11 xext xfixes xft +ALL_TARGET= all -MAKE_JOBS_UNSAFE= yes +CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=YES -CMAKE_ARGS+= -DCMAKE_SKIP_RPATH:BOOL=YES +OPTIONS_DEFINE= CGNS GMM MED METIS OCC SHARED_LIB STATIC_LIB TAUCS TETGEN +OPTIONS_DEFAULT= CGNS GMM MED METIS SHARED_LIB STATIC_LIB TETGEN -OPTIONS_DEFINE= STATIC_LIB SHARED_LIB TETGEN METIS TAUCS MED CGNS GMM OCC -OPTIONS_DEFAULT= STATIC_LIB SHARED_LIB TETGEN METIS MED CGNS GMM - +CGNS_DESC= Enable CGNS support +GMM_DESC= Enable gmm++ support +MED_DESC= Enable MED support +METIS_DESC= Enable metis as an alternative 3D mesh generator +OCC_DESC= Enable STEP, IGES and BREP support +SHARED_LIB_DESC= Build shared library STATIC_LIB_DESC= Build static library -SHARED_LIB_DESC= Build shared library -TETGEN_LIB_DESC= Enable tetgen as an alternative 3D mesh generator -METIS_LIB_DESC= Enable metis as an alternative 3D mesh generator -TAUCS_LIB_DESC= Enable the Taucs linear algebra solver -MED_LIB_DESC= Enable MED support -CGNS_LIB_DESC= Enable CGNS support -GMM_LIB_DESC= Enable gmm++ support -OCC_LIB_DESC= Enable STEP, IGES and BREP support +TAUCS_DESC= Enable the Taucs linear algebra solver +TETGEN_DESC= Enable tetgen as an alternative 3D mesh generator OPTIONS_SUB= yes +PLIST_SUB+= SHARED_LIB="" VER=${PORTVERSION} VE=${PORTVERSION:R} -STATIC_LIB_CMAKE_ON= -DENABLE_BUILD_LIB=ON -STATIC_LIB_ALL_TARGET= lib -SHARED_LIB_CMAKE_ON= -DENABLE_BUILD_SHARED=ON -SHARED_LIB_ALL_TARGET= shared -SHARED_LIB_VARS= use_ldconfig=yes -PLIST_SUB+= SHARED_LIB="" VER=${PORTVERSION} VE=${PORTVERSION:R} +CGNS_CMAKE_OFF= -DENABLE_CGNS=OFF +CGNS_CMAKE_ON= -DENABLE_CGNS=ON +CGNS_LIB_DEPENDS= libcgns.so:science/cgnslib DOCS_CMAKE_OFF= -DINSTALL_DOCS=OFF -TETGEN_CMAKE_ON= -DENABLE_TETGEN=ON -TETGEN_CMAKE_OFF= -DENABLE_TETGEN=OFF -TETGEN_VARS= "no_cdrom=Contact appropriate authors for commercial purposes if including Tetgen or Metis" -METIS_CMAKE_ON= -DENABLE_METIS=ON +GMM_CMAKE_OFF= -DENABLE_GMM=OFF +MED_CMAKE_OFF= -DENABLE_MED=OFF +MED_CMAKE_ON= -DENABLE_MED=ON +MED_LIB_DEPENDS= libmed.so:french/med METIS_CMAKE_OFF= -DENABLE_METIS=OFF -METIS_VARS= "no_cdrom=Contact appropriate authors for commercial purposes if including Tetgen or Metis" +METIS_CMAKE_ON= -DENABLE_METIS=ON +METIS_VARS= "no_cdrom=Contact appropriate authors for commercial purposes if including Metis" METIS_VARS= distfiles+=manual.pdf -TAUCS_LIB_DEPENDS= libtaucs.so:math/taucs -TAUCS_CMAKE_ON= -DENABLE_TAUCS=ON -TAUCS_CMAKE_OFF= -DENABLE_TAUCS=OFF -MED_LIB_DEPENDS= libmed.so:french/med -MED_CMAKE_ON= -DENABLE_MED=ON -MED_CMAKE_OFF= -DENABLE_MED=OFF -CGNS_LIB_DEPENDS= libcgns.so:science/cgnslib -CGNS_CMAKE_ON= -DENABLE_CGNS=ON -CGNS_CMAKE_OFF= -DENABLE_CGNS=OFF -GMM_CMAKE_OFF= -DENABLE_GMM=OFF -OCC_LIB_DEPENDS= libTKernel.so:cad/opencascade +OCC_CFLAGS= -DHAVE_CONFIG_H -DHAVE_WOK_CONFIG_H -DFREEBSD +OCC_CMAKE_OFF= -DENABLE_OCC=OFF OCC_CMAKE_ON= -DENABLE_OCC=ON -DOCC_INC=${LOCALBASE}/include/OpenCASCADE -OCC_CFLAGS= -DHAVE_CONFIG_H -DHAVE_WOK_CONFIG_H -DFREEBSD OCC_CONFLICTS= gmsh-2.* -OCC_CMAKE_OFF= -DENABLE_OCC=OFF OCC_CONFLICTS_OFF= gmsh-occ-2.* +OCC_LIB_DEPENDS= libTKernel.so:cad/opencascade +SHARED_LIB_ALL_TARGET= shared +SHARED_LIB_CMAKE_ON= -DENABLE_BUILD_SHARED=ON +SHARED_LIB_VARS= use_ldconfig=yes +STATIC_LIB_ALL_TARGET= lib +STATIC_LIB_CMAKE_ON= -DENABLE_BUILD_LIB=ON +TAUCS_CMAKE_OFF= -DENABLE_TAUCS=OFF +TAUCS_CMAKE_ON= -DENABLE_TAUCS=ON +TAUCS_LIB_DEPENDS= libtaucs.so:math/taucs +TETGEN_CMAKE_OFF= -DENABLE_TETGEN=OFF +TETGEN_CMAKE_ON= -DENABLE_TETGEN=ON -.include +# the license for Metis requires that its documentation is included +METIS_IMPLIES= DOCS # Even though the taucs port pulls in the metis port, we will still need # METIS set when TAUCS is set, otherwise the linker does not find the # libraries installed by the metis port. -.if ${PORT_OPTIONS:MTAUCS} && !${PORT_OPTIONS:MMETIS} -IGNORE= METIS must be set if TAUCS is set -.endif +TAUCS_IMPLIES= METIS -.if !${PORT_OPTIONS:MMETIS} && ${PORT_OPTIONS:MDOCS} -IGNORE= the license for Metis requires that its documentation is included -.endif - # TODO -# Dependencies against PythonLibs, swig and petsc are found and registered if installed -# => add knobs to handle them. +# Dependencies against PythonLibs, swig and petsc are found and registered if +# installed => add knobs to handle them. -PKGMESSAGE= ${WRKDIR}/pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message .include -post-extract: +pre-configure: + ${REINPLACE_CMD} -e s+share/doc/gmsh+${DOCSDIR_REL}+ \ + -e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt + +post-extract-METIS-on: ${CP} ${DISTDIR}/${DIST_SUBDIR}/manual.pdf ${WRKDIR} ${TOUCH} ${PKGMESSAGE} -.if ${PORT_OPTIONS:MTETGEN} @${ECHO} >> ${PKGMESSAGE} @${ECHO} "The FreeBSD project has been granted redistribution rights" >> ${PKGMESSAGE} - @${ECHO} "but anyone attempting to redistribute Gmsh with Tetgen" >> ${PKGMESSAGE} - @${ECHO} "for strict commercial purposes must still contact the author" >> ${PKGMESSAGE} - @${ECHO} "(Hang Si) and license the code." >> ${PKGMESSAGE} -.endif -.if ${PORT_OPTIONS:MMETIS} - @${ECHO} >> ${PKGMESSAGE} - @${ECHO} "The FreeBSD project has been granted redistribution rights" >> ${PKGMESSAGE} @${ECHO} "but anyone attempting to redistribute Gmsh with Metis" >> ${PKGMESSAGE} @${ECHO} "must still contact the author" >> ${PKGMESSAGE} @${ECHO} "http://glaros.dtc.umn.edu/gkhome/metis/metis/faq?q=metis/metis/faq#distribute" >> ${PKGMESSAGE} @${ECHO} "\"A Fast and Highly Quality Multilevel Scheme for Partitioning Irregular Graphs\". George Karypis and Vipin Kumar. SIAM Journal on Scientific Computing, Vol. 20, No. 1, pp. 359-392, 1999." >> ${PKGMESSAGE} -.endif -.if ${PORT_OPTIONS:MTAUCS} + +post-extract-TAUCS-on: + ${TOUCH} ${PKGMESSAGE} @${ECHO} >> ${PKGMESSAGE} @${ECHO} "There might be licensing issues with using Taucs with Gmsh" >> ${PKGMESSAGE} @${ECHO} "because Taucs requires Metis." >> ${PKGMESSAGE} -.endif -pre-configure: - ${REINPLACE_CMD} -e s+share/doc/gmsh+${DOCSDIR_REL}+ \ - -e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt - -post-install: -.if ${PORT_OPTIONS:MMETIS} +post-install-METIS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR}/metis ${INSTALL_DATA} ${WRKDIR}/manual.pdf ${STAGEDIR}${DOCSDIR}/metis -.endif .include Index: distinfo =================================================================== --- distinfo +++ distinfo @@ -1,4 +1,5 @@ -SHA256 (gmsh/gmsh-2.12.0-source.tgz) = 7fbd2ec8071e79725266e72744d21e902d4fe6fa9e7c52340ad5f4be5c159d09 -SIZE (gmsh/gmsh-2.12.0-source.tgz) = 11618737 +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 Index: files/patch-Fltk-Main.cpp =================================================================== --- files/patch-Fltk-Main.cpp +++ files/patch-Fltk-Main.cpp @@ -1,11 +0,0 @@ ---- Fltk/Main.cpp.orig -+++ Fltk/Main.cpp -@@ -3,7 +3,7 @@ - // See the LICENSE.txt file for license information. Please report all - // bugs and problems to the public mailing list . - --#include -+#include - #include - #include "Gmsh.h" - #include "GmshMessage.h" Index: files/patch-Fltk_Main.cpp =================================================================== --- files/patch-Fltk_Main.cpp +++ files/patch-Fltk_Main.cpp @@ -0,0 +1,11 @@ +--- Fltk/Main.cpp.orig 2016-08-28 23:27:04 UTC ++++ Fltk/Main.cpp +@@ -3,7 +3,7 @@ + // See the LICENSE.txt file for license information. Please report all + // bugs and problems to the public mailing list . + +-#include ++#include + #include + #include "Gmsh.h" + #include "GmshMessage.h" Index: files/patch-Geo_CustomContainer.h =================================================================== --- files/patch-Geo_CustomContainer.h +++ files/patch-Geo_CustomContainer.h @@ -0,0 +1,10 @@ +--- Geo/CustomContainer.h.orig 2016-08-28 23:25:55 UTC ++++ Geo/CustomContainer.h +@@ -8,6 +8,7 @@ + #ifndef _CUSTOMCONTAINER_H_ + #define _CUSTOMCONTAINER_H_ + ++#include + #include + #include + #include Index: files/patch-Geo__CustomContainer.h =================================================================== --- files/patch-Geo__CustomContainer.h +++ files/patch-Geo__CustomContainer.h @@ -1,10 +0,0 @@ ---- Geo/CustomContainer.h.orig 2010-10-15 09:35:00.000000000 -0400 -+++ Geo/CustomContainer.h 2011-08-09 05:12:35.000000000 -0400 -@@ -8,6 +8,7 @@ - #ifndef _CUSTOMCONTAINER_H_ - #define _CUSTOMCONTAINER_H_ - -+#include - #include - #include - Index: pkg-plist =================================================================== --- pkg-plist +++ pkg-plist @@ -192,6 +192,7 @@ %%PORTDOCS%%%%DOCSDIR%%/demos/sphere-surf.stl %%PORTDOCS%%%%DOCSDIR%%/demos/sphere.geo %%PORTDOCS%%%%DOCSDIR%%/demos/splines.geo +%%PORTDOCS%%%%DOCSDIR%%/demos/square_regular.geo %%PORTDOCS%%%%DOCSDIR%%/demos/title.script %%PORTDOCS%%%%DOCSDIR%%/demos/tower.geo %%PORTDOCS%%%%DOCSDIR%%/demos/tower.i1