3 files changed, 15 insertions, 34 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index ded5138ae4bb..2d78abd8d4a3 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	2.0.8
+PORTVERSION=	2.1.0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -19,13 +19,6 @@ RUN_DEPENDS=	getdp:${PORTSDIR}/science/getdp
 LIB_DEPENDS=	gsl.10:${PORTSDIR}/math/gsl \
 		fltk.1:${PORTSDIR}/x11-toolkits/fltk
 
-.if !defined(WITHOUT_TRIANGLE)
-NO_CDROM=		Triangle must not be sold for profit
-EXTRACT_DEPENDS+=	${NONEXISTENT}:${TRIANGLE_PORTDIR}:patch \
-			unzip:${PORTSDIR}/archivers/unzip
-TRIANGLE_PORTDIR=	${PORTSDIR}/math/triangle
-.endif
-
 .if !defined(WITHOUT_TETGEN)
 EXTRACT_DEPENDS+=	${NONEXISTENT}:${TETGEN_PORTDIR}:patch
 TETGEN_PORTDIR=		${PORTSDIR}/math/tetgen
@@ -38,6 +31,7 @@ CONFIGURE_ARGS=	--with-fltk-prefix=${X11BASE} \
 		--with-gsl-prefix=${LOCALBASE} \
 		--with-jpeg-prefix=${LOCALBASE} \
 		--with-png-prefix=${LOCALBASE}
+USE_GMAKE=	yes
 ALL_TARGET=	all utils
 
 .if !defined(WITHOUT_HDF5) && defined(WITH_OCC)
@@ -80,11 +74,6 @@ MAN1=		gmsh.1
 
 pre-everything::
 	@${ECHO_MSG} ""
-.if !defined(WITHOUT_TRIANGLE)
-	@${ECHO_MSG} "Define WITHOUT_TRIANGLE to disable Triangle as an alternative"
-	@${ECHO_MSG} "isotropic 2D mesh generator."
-	@${ECHO_MSG} ""
-.endif
 .if !defined(WITHOUT_TETGEN)
 	@${ECHO_MSG} "Define WITHOUT_TETGEN to disable Tetgen as an alternative"
 	@${ECHO_MSG} "3D mesh generator."
@@ -110,14 +99,6 @@ pre-everything::
 
 post-extract:
 	${TOUCH} ${PKGMESSAGE}
-.if !defined(WITHOUT_TRIANGLE)
-	${CP} `cd ${TRIANGLE_PORTDIR}; ${MAKE} -V WRKSRC`/triangle.*	\
-		${WRKSRC}/contrib/Triangle
-	@${ECHO} >> ${PKGMESSAGE}
-	@${ECHO} "This package of Gmsh has been built with Triangle, then" >> ${PKGMESSAGE}
-	@${ECHO} "distribution of this code as part of a commercial system" >> ${PKGMESSAGE}
-	@${ECHO} "is permissible only by direct arrangement with the Triangle's author." >> ${PKGMESSAGE}
-.endif
 .if !defined(WITHOUT_TETGEN)
 	${CP} ${TETGEN_SRC:S|^|`cd ${TETGEN_PORTDIR}; ${MAKE} -V WRKSRC`/|}	\
 		${WRKSRC}/contrib/Tetgen
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index 1af21afd7f9e..bfa4297ec6b1 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-2.0.8-source.tgz) = 123e7f40dedcc0f2ec33ff1af4b8d127
-SHA256 (gmsh-2.0.8-source.tgz) = 944988ba39b79dee1c84576918384670ff99ac54f864e33c4130b0565e1484f7
-SIZE (gmsh-2.0.8-source.tgz) = 2244709
+MD5 (gmsh-2.1.0-source.tgz) = 3df1f35f9f38f44ff10414b39707c29a
+SHA256 (gmsh-2.1.0-source.tgz) = 1924c0c731d1dd92468496565ae3fee2f13039871a4e11f9fac8cc7eb9c3fdb7
+SIZE (gmsh-2.1.0-source.tgz) = 2329015
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
index d1729b700667..9df5a80da6c2 100644
--- a/cad/gmsh/files/patch-configure
+++ b/cad/gmsh/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Thu Jul 12 18:08:39 2007
-+++ configure	Mon Jul 23 22:45:54 2007
-@@ -3192,7 +3192,7 @@
+--- configure.orig	2008-02-22 07:49:32.000000000 +0100
++++ configure	2008-02-24 16:13:08.000000000 +0100
+@@ -3631,7 +3631,7 @@
    GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
-   GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
-   GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshPost -lGmshCommon -lGmshDataStr -lGmshNumeric"
--  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
-+  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel ${LDFLAGS}"
+   GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin"
+   GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
+-  GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
++  GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel ${LDFLAGS}"
    FLAGS="-DHAVE_FLTK ${FLAGS}"
  
    if test "x${FLTK_PREFIX}" != "x" ; then
-@@ -4541,7 +4541,7 @@
+@@ -4890,7 +4890,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4604,7 +4604,7 @@
+@@ -4950,7 +4950,7 @@
        GMSH_LIBS="${GMSH_LIBS} -lcgns"
        FLAGS="${FLAGS} -DHAVE_LIBCGNS"
      else
@@ -27,7 +27,7 @@
        FLAGS="${FLAGS} -DHAVE_LIBCGNS -I${CGNS_PREFIX}/include"
      fi
    fi
-@@ -4698,7 +4698,7 @@
+@@ -5041,7 +5041,7 @@
        FLAGS="${FLAGS} -DHAVE_OCC"
      else
        GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"