4 files changed, 69 insertions, 25 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 582862fbc3ff..4d5db696addb 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	2.2.6
-PORTREVISION=	2
+PORTVERSION=	2.3.0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.sfr-fresh.com/unix/privat/ \
 				http://www.geuz.org/gmsh/src/
@@ -30,11 +29,14 @@ TETGEN_SRC=		predicates.cxx tetgen.cxx tetgen.h
 .endif
 
 USE_FORTRAN=	yes
+FORTRANLIBDIR=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``
+FORTRANLIBDIR2=	`${DIRNAME} \\`${FC} -print-libgcc-file-name\\``/../../../
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-fltk-prefix=${LOCALBASE}	\
 		--with-gsl-prefix=${LOCALBASE}	\
 		--with-med-prefix=${LOCALBASE}	\
 		--with-jpeg-prefix=${LOCALBASE}	\
+		--with-blas-lapack-prefix=${LOCALBASE} \
 		--with-png-prefix=${LOCALBASE}
 USE_GMAKE=	yes
 ALL_TARGET=	all utils
@@ -64,6 +66,10 @@ CONFIGURE_ARGS+=	--enable-cgns --with-cgns-prefix=${LOCALBASE}
 CONFIGURE_ARGS+=	--disable-cgns
 .endif
 
+.if !defined(WITHOUT_GMM)
+CONFIGURE_ARGS+=	--disable-gmm
+.endif
+
 # For FourierModel
 .if defined(WITH_FFTW3)
 LIB_DEPENDS+=		fftw3.4:${PORTSDIR}/math/fftw3
@@ -89,6 +95,24 @@ PORTDOCS=	CREDITS.txt FAQ.txt VERSIONS.txt gmsh.html
 
 MAN1=		gmsh.1
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
+WITH_ATLAS=	yes
+.endif
+.if defined(WITH_ATLAS)
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
+BLAS=		-lcblas -lf77blas -latlas -L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} -lgfortranbegin -lgfortran
+LAPACK=		-lalapack ${BLAS}
+ARPACK=		-larpack
+.else
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
+BLAS=		-lblas
+LAPACK=		-llapack ${BLAS}
+ARPACK=		-larpack
+.endif
+
 pre-everything::
 	@${ECHO_MSG} ""
 .if !defined(WITHOUT_TETGEN)
@@ -108,6 +132,10 @@ pre-everything::
 	@${ECHO_MSG} "Define WITHOUT_CGNS to disable CGNS support."
 	@${ECHO_MSG} ""
 .endif
+.if !defined(WITHOUT_GMM)
+	@${ECHO_MSG} "Define WITHOUT_GMM to disable gmm++ support."
+	@${ECHO_MSG} ""
+.endif
 .if !defined(WITH_OCC)
 	@${ECHO_MSG} "Define WITH_OCC to enable STEP, IGES and BREP support"
 	@${ECHO_MSG} "(through OpenCascade)."
@@ -131,6 +159,9 @@ pre-configure:
 	@${REINPLACE_CMD} -e "s|../tutorial|${DOCSDIR}/tutorial|"	\
 		${WRKSRC}/demos/${demo}
 .endfor
+	${REINPLACE_CMD} -e 's|-lcblas -latlas|%%BLAS%%|;		\
+		s|-lcblas|${BLAS}|; s|%%BLAS%%|${BLAS}|;		\
+		s|-llapack|${LAPACK}|' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
 .for f in dxf2geo gmsh mshsort
@@ -154,4 +185,4 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index 9508a3ab7971..e41befba5b2f 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-2.2.6-source.tgz) = aa97daa6dc4b037e99aa8d49e6d8eea6
-SHA256 (gmsh-2.2.6-source.tgz) = 4ddfdf29756efa5b9afae6bc4f97a8d13b6bc1d88893ee05fafbbdfdd09d574a
-SIZE (gmsh-2.2.6-source.tgz) = 2735677
+MD5 (gmsh-2.3.0-source.tgz) = 3e60c159764579fcb5437b138ef00eb9
+SHA256 (gmsh-2.3.0-source.tgz) = 6a3fa13b719b173af45997ff51e95c2ed8d2a375225319f82e108f74beaa1f27
+SIZE (gmsh-2.3.0-source.tgz) = 2793685
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
index a23298cd4450..5bc1a8dc7b3d 100644
--- a/cad/gmsh/files/patch-configure
+++ b/cad/gmsh/files/patch-configure
@@ -1,15 +1,24 @@
---- configure.orig	2008-11-08 19:30:00.000000000 +0100
-+++ configure	2008-11-22 09:25:38.000000000 +0100
-@@ -3688,7 +3688,7 @@
+--- configure.orig	2009-01-09 08:13:50.000000000 +0100
++++ configure	2009-01-27 19:27:36.000000000 +0100
+@@ -3714,7 +3714,7 @@
  
    GMSH_DIRS="Common Geo Mesh Post Plugin Numeric Parser Graphics Fltk"
    GMSH_LIBS="-Llib -lGmshFltk -lGmshCommon -lGmshMesh -lGmshGeo -lGmshPost -lGmshPlugin"
 -  GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshGraphics -lGmshParser -lGmshNumeric"
 +  GMSH_LIBS="${GMSH_LIBS} -lGmshCommon -lGmshGraphics -lGmshParser -lGmshNumeric ${LDFLAGS}"
-   FLAGS="-DHAVE_FLTK ${FLAGS}"
- 
-   if test "x${FLTK_PREFIX}" != "x" ; then
-@@ -4895,7 +4895,7 @@
+   cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FLTK 1
+ _ACEOF
+@@ -4884,7 +4884,7 @@
+       GMSH_LIBS="${GMSH_LIBS} ${OCC_LIBS}"
+     else
+       GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
+-      FLAGS="${FLAGS} -I${OCC_PREFIX}/inc"
++      FLAGS="${FLAGS} -DHAVE_WOK_CONFIG_H -DFREEBSD -D${ARCH} -I${OCC_PREFIX}/inc"
+     fi
+   fi
+ fi
+@@ -5012,7 +5012,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,21 +27,12 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4955,7 +4955,7 @@
+@@ -5074,7 +5074,7 @@
+     if test "x${CGNS_PREFIX}" = "x"; then
        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
-@@ -5046,7 +5046,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"
+       FLAGS="${FLAGS} -I${CGNS_PREFIX}/include"
      fi
    fi
- fi
diff --git a/cad/gmsh/files/patch-utils_misc_mshsort.cpp b/cad/gmsh/files/patch-utils_misc_mshsort.cpp
new file mode 100644
index 000000000000..6e3366d26339
--- /dev/null
+++ b/cad/gmsh/files/patch-utils_misc_mshsort.cpp
@@ -0,0 +1,13 @@
+--- utils/misc/mshsort.cpp.orig	2008-12-29 10:43:51.000000000 +0100
++++ utils/misc/mshsort.cpp	2009-02-04 10:41:41.000000000 +0100
+@@ -6,8 +6,9 @@
+ // A small utility that reads a Gmsh mesh file and makes the numbering
+ // dense (without gaps in the node/element number sequences)
+ 
++#include <stdlib.h>
+ #include <stdio.h>
+-#include <strings.h>
++#include <string.h>
+ #include <vector>
+ #include <map>
+