- Upgrade to 2.0.6

- Enable support for MED, HDF5, CGNS, STEP, IGES and BREP (OCC).

3 files changed, 106 insertions, 12 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 49659836e755..89923283af73 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.6
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -36,8 +36,6 @@ TETGEN_PORTDIR=		${PORTSDIR}/math/tetgen
 TETGEN_SRC=		predicates.cxx tetgen.cxx tetgen.h
 .endif
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-fltk-prefix=${X11BASE} \
@@ -46,13 +44,71 @@ CONFIGURE_ARGS=	--with-fltk-prefix=${X11BASE} \
 		--with-png-prefix=${LOCALBASE}
 ALL_TARGET=	all utils
 
-MAN1=		gmsh.1
+.if !defined(WITHOUT_HDF5) && !defined(WITHOUT_OCC)
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
+.endif
+
+.if !defined(WITHOUT_MED)
+LIB_DEPENDS+=		med.2:${PORTSDIR}/french/med
+CONFIGURE_ARGS+=	--enable-med --with-med-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--disable-med
+.endif
+
+.if !defined(WITHOUT_HDF5)
+LIB_DEPENDS+=		hdf5.0:${PORTSDIR}/science/hdf5
+CONFIGURE_ARGS+=	--enable-hdf5 --with-hdf5-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--disable-hdf5
+.endif
+
+.if !defined(WITHOUT_CGNS)
+LIB_DEPENDS+=		cgns.0:${PORTSDIR}/science/cgnslib
+CONFIGURE_ARGS+=	--enable-cgns --with-cgns-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--disable-cgns
+.endif
+
+.if !defined(WITHOUT_OCC)
+LIB_DEPENDS+=		TKernel.0:${PORTSDIR}/cad/opencascade
+CONFIGURE_ARGS+=	--enable-occ --with-occ-prefix=${LOCALBASE}/OpenCAS/ros
+CONFIGURE_ENV+=		ARCH="${ARCH}"
+.else
+CONFIGURE_ARGS+=	--disable-occ
+.endif
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-.include <bsd.port.pre.mk>
+MAN1=		gmsh.1
 
-.if ${OSVERSION} < 500000
-CONFIGURE_ARGS+=	--disable-netgen	# Problem with Netgen & gcc-295
-BROKEN=		Does not compile with gcc-295
+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."
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITHOUT_MED)
+	@${ECHO_MSG} "Define WITHOUT_MED to disable MED support."
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITHOUT_MED)
+	@${ECHO_MSG} "Define WITHOUT_HDF5 to disable HDF5 support."
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITHOUT_CGNS)
+	@${ECHO_MSG} "Define WITHOUT_CGNS to disable CGNS support."
+	@${ECHO_MSG} ""
+.endif
+.if !defined(WITHOUT_OCC)
+	@${ECHO_MSG} "Define WITHOUT_OCC to disable STEP, IGES and BREP support"
+	@${ECHO_MSG} "(through OpenCascade)."
+	@${ECHO_MSG} ""
 .endif
 
 post-extract:
@@ -86,4 +142,4 @@ do-install:
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index a73f958ad622..d5b1f102dda2 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-2.0.5-source.tgz) = fa80c95e62a60733ddcccb3898013caa
-SHA256 (gmsh-2.0.5-source.tgz) = d07ebdb4132e674296736e8952825acabd78409816aa1f35b26a82bea3b349fc
-SIZE (gmsh-2.0.5-source.tgz) = 2172624
+MD5 (gmsh-2.0.6-source.tgz) = 9a0fc59a8106050540337d5af6eff41e
+SHA256 (gmsh-2.0.6-source.tgz) = 01807f53de0a8ff8516e718306424f4904969c3c1874133e788f56efd9489173
+SIZE (gmsh-2.0.6-source.tgz) = 2172595
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
new file mode 100644
index 000000000000..169777176897
--- /dev/null
+++ b/cad/gmsh/files/patch-configure
@@ -0,0 +1,38 @@
+--- configure.orig	Sat Mar 31 11:38:03 2007
++++ configure	Sun Apr  1 10:24:31 2007
+@@ -3174,7 +3174,7 @@
+   GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
+   GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshMesh -lGmshGeo"
+   GMSH_LIBS="${GMSH_LIBS} -lGmshPlugin -lGmshCommon -lGmshDataStr -lGmshNumeric"
+-  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel"
++  GMSH_LIBS="${GMSH_LIBS} -lGmshParallel ${LDFLAGS}"
+   FLAGS="-DHAVE_FLTK ${FLAGS}"
+ 
+   if test "x${FLTK_PREFIX}" != "x" ; then
+@@ -4521,7 +4521,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcgns  $LIBS"
++LIBS="-lcgns -lhdf5 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -4584,7 +4584,7 @@
+       GMSH_LIBS="${GMSH_LIBS} -lcgns"
+       FLAGS="${FLAGS} -DHAVE_LIBCGNS"
+     else
+-      GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns"
++      GMSH_LIBS="${GMSH_LIBS} -L${CGNS_PREFIX}/lib -lcgns -lhdf5"
+       FLAGS="${FLAGS} -DHAVE_LIBCGNS -I${CGNS_PREFIX}/include"
+     fi
+   fi
+@@ -4678,7 +4678,7 @@
+       FLAGS="${FLAGS} -DHAVE_OCC"
+     else
+       GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
+-      FLAGS="${FLAGS} -DHAVE_OCC -I${OCC_PREFIX}/inc"
++      FLAGS="${FLAGS} -DHAVE_OCC -DHAVE_WOK_CONFIG_H -DFREEBSD -D${ARCH} -I${OCC_PREFIX}/inc"
+     fi
+   fi
+ fi