- Upgrade to 2.2.3

	Changelog at <http://geuz.org/gmsh/doc/VERSIONS.txt>

- Set USE_FORTRAN to fix blas & lacpack detection;

- Respetct NOPORTEXAMPLES.

4 files changed, 67 insertions, 55 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index f7636b0c270a..1747d5b79f2e 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	2.2.2
+PORTVERSION=	2.2.3
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -25,6 +25,7 @@ TETGEN_PORTDIR=		${PORTSDIR}/math/tetgen
 TETGEN_SRC=		predicates.cxx tetgen.cxx tetgen.h
 .endif
 
+USE_FORTRAN=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-fltk-prefix=${LOCALBASE}	\
@@ -32,6 +33,7 @@ CONFIGURE_ARGS=	--with-fltk-prefix=${LOCALBASE}	\
 		--with-med-prefix=${LOCALBASE}	\
 		--with-jpeg-prefix=${LOCALBASE}	\
 		--with-png-prefix=${LOCALBASE}
+CONFIGURE_ENV=	F77=${F77}
 USE_GMAKE=	yes
 ALL_TARGET=	all utils
 
@@ -60,6 +62,14 @@ CONFIGURE_ARGS+=	--enable-cgns --with-cgns-prefix=${LOCALBASE}
 CONFIGURE_ARGS+=	--disable-cgns
 .endif
 
+# For FourierModel
+.if defined(WITH_FFTW3)
+LIB_DEPENDS+=		fftw3.4:${PORTSDIR}/math/fftw3
+CONFIGURE_ARGS+=	--enable-fftw3 --with-fftw3-prefix=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--disable-fftw3
+.endif
+
 .if defined(WITH_OCC)
 LIB_DEPENDS+=		TKernel.0:${PORTSDIR}/cad/opencascade
 CONFIGURE_ARGS+=	--enable-occ --with-occ-prefix=${LOCALBASE}/OpenCAS/ros
@@ -71,6 +81,8 @@ CONFIGURE_ARGS+=	--disable-occ
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+PORTDOCS=	CREDITS.txt FAQ.txt VERSIONS.txt gmsh.html
+
 MAN1=		gmsh.1
 
 pre-everything::
@@ -123,9 +135,11 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/gmsh.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
 	cd ${WRKSRC} && ${FIND} tutorial | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${FIND} demos ! -name "*.bak" | \
 		${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${EXAMPLESDIR}
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index b8c04a054e8b..543a809bc7c1 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-2.2.2-source.tgz) = 7365e510bad0d04429d505fb6749cd95
-SHA256 (gmsh-2.2.2-source.tgz) = 3cf91294b9b495699bddba1adcd0c2336f405ab20e04f533017728be21ad431e
-SIZE (gmsh-2.2.2-source.tgz) = 2411237
+MD5 (gmsh-2.2.3-source.tgz) = a9683f6033fe39b45d0c30462efb4ee1
+SHA256 (gmsh-2.2.3-source.tgz) = e79c565d1e73cea141341e947921e19e1b913372069ebd2fa697008bd600d001
+SIZE (gmsh-2.2.3-source.tgz) = 2394624
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
index e941945e5a54..2d3f16d41c23 100644
--- a/cad/gmsh/files/patch-configure
+++ b/cad/gmsh/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	2008-06-08 00:43:58.000000000 +0200
-+++ configure	2008-06-18 19:16:58.000000000 +0200
-@@ -3652,7 +3652,7 @@
+--- configure.orig	2008-07-07 15:13:33.000000000 +0200
++++ configure	2008-07-22 17:36:11.000000000 +0200
+@@ -3668,7 +3668,7 @@
  
-   GMSH_DIRS="Common Geo Mesh Post Numeric Parser Plugin Graphics Fltk"
-   GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin -lGmshMesh"
--  GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshPost -lGmshCommon -lGmshNumeric"
-+  GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshPost -lGmshCommon -lGmshNumeric ${LDFLAGS}"
+   GMSH_DIRS="Common Geo Mesh Post Plugin Numeric Parser Graphics Fltk"
+   GMSH_LIBS="-Llib -lGmshFltk -lGmshCommon -lGmshGeo -lGmshMesh -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
-@@ -4918,7 +4918,7 @@
+@@ -4943,7 +4943,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
-@@ -4978,7 +4978,7 @@
+@@ -5003,7 +5003,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
-@@ -5069,7 +5069,7 @@
+@@ -5094,7 +5094,7 @@
        FLAGS="${FLAGS} -DHAVE_OCC"
      else
        GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"
diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist
index b964651fbff1..82fdcc55a215 100644
--- a/cad/gmsh/pkg-plist
+++ b/cad/gmsh/pkg-plist
@@ -1,7 +1,6 @@
 bin/dxf2geo
 bin/gmsh
 bin/mshsort
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/bgmesh.pos
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/t1.geo
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/t2.geo
@@ -17,43 +16,42 @@ bin/mshsort
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/view2.pos
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/view3.pos
 %%PORTDOCS%%%%DOCSDIR%%/tutorial/view4.pos
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/anim.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/antenna.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/antenna.i1
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/component8.step
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/component8_in_a_box.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/cone.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/cube.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/encode.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/fields.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/filter.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/gen_earth_100km.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/hex.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/isosurf.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/lowmem-anim.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/machine.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/machine.i1
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/machine.i2
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/multislice.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/piece-extr-rec.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/piece-extr.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/piece.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/primitives.pos
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/pripyrtet.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/rotate.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-discrete.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere-surf.stl
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/sphere.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/splines.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/title.script
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/tower.geo
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/tower.i1
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/tower.i2
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/tower.i3
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/tower.i4
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/tower.i5
-%%PORTDOCS%%%%EXAMPLESDIR%%/demos/transfinite.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/anim.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/antenna.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/antenna.i1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/component8.step
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/component8_in_a_box.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/cone.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/cube.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/encode.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/fields.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/filter.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/gen_earth_100km.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/hex.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/isosurf.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/lowmem-anim.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/machine.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/machine.i1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/machine.i2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/multislice.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/piece-extr-rec.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/piece-extr.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/piece.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/primitives.pos
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/pripyrtet.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/rotate.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/sphere-discrete.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/sphere-surf.stl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/sphere.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/splines.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/title.script
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/tower.geo
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/tower.i1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/tower.i2
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/tower.i3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/tower.i4
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/tower.i5
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/demos/transfinite.geo
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/demos
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/demos
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%