- Update to 0.9.2

PR:		130446
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 52 insertions, 82 deletions

diff --git a/science/gerris/Makefile b/science/gerris/Makefile
index cf6034bee73c..b10a6cfb0408 100644
--- a/science/gerris/Makefile
+++ b/science/gerris/Makefile
@@ -6,48 +6,29 @@
 # $FreeBSD$
 #
 
-PORTNAME=		gerris
-PORTVERSION=		0.6.0
-PORTREVISION=	7
-CATEGORIES=		science math
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gfs
+PORTNAME=	gerris
+PORTVERSION=	0.9.2
+CATEGORIES=	science math
+MASTER_SITES=	SF/gfs
 
-PATCH_SITES=		${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
-			http://members.aon.at/odi/downloads/patches/:odunkl
-PATCH_SITE_SUBDIR=	gfs/:sf
-PATCHFILES=		gerris-0.6-patch-1.gz:sf,odunkl \
-			gerris-0.6-patch-2.gz:odunkl
-PATCH_DIST_STRIP=	-p1
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	A scientific CFD simulator
 
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		A scientific CFD simulator
+LIB_DEPENDS=	gts.5:${PORTSDIR}/graphics/gts
 
-LIB_DEPENDS=		gts.5:${PORTSDIR}/graphics/gts
+USE_GNOME=	glib20 gnomehack pkgconfig
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-mpi
+USE_LDCONFIG=	yes
 
-.if !defined(WITHOUT_DX)
+.if defined(WITHOUT_DX)
+CONFIGURE_ARGS+=	--disable-dx
+PLIST_SUB+=	DX="@comment "
+.else
 BUILD_DEPENDS+=		dx:${PORTSDIR}/graphics/opendx
 RUN_DEPENDS+=		dx:${PORTSDIR}/graphics/opendx
-.else
-CONFIGURE_ARGS+=	--disable-dx
-.endif
-
-USE_GMAKE=		yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=		yes
-USE_GNOME=		pkgconfig
-
-CONFIGURE_ARGS+=	--disable-mpi
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=	does not compile
+PLIST_SUB+=	DX=""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|'	\
-		${WRKSRC}/src/Makefile.in
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/science/gerris/distinfo b/science/gerris/distinfo
index 27e949eb69ba..41e08707287b 100644
--- a/science/gerris/distinfo
+++ b/science/gerris/distinfo
@@ -1,9 +1,3 @@
-MD5 (gerris-0.6.0.tar.gz) = c16d9d26bc4233eae416dea325ae3d36
-SHA256 (gerris-0.6.0.tar.gz) = 85ff1e37f588b7826d1e54d95f5b17166bb25b09fdf53918ee57990c50a475ee
-SIZE (gerris-0.6.0.tar.gz) = 4264414
-MD5 (gerris-0.6-patch-1.gz) = 71b271798a665d4fe057c8b19f079d86
-SHA256 (gerris-0.6-patch-1.gz) = 5f5b4e3aefba958f35ef5dea300a722cd13d6785815a2cebc112436c9a0e12e5
-SIZE (gerris-0.6-patch-1.gz) = 17342
-MD5 (gerris-0.6-patch-2.gz) = ed07a997ddf15da034c585c55225ed27
-SHA256 (gerris-0.6-patch-2.gz) = 4a735107f831841c3a815036df2789a8f9298dce2e82d6604d6c98666e616883
-SIZE (gerris-0.6-patch-2.gz) = 191
+MD5 (gerris-0.9.2.tar.gz) = 94e0fe2089052a3e6c689f85148388bc
+SHA256 (gerris-0.9.2.tar.gz) = ab605863bc2ce872c03f1f88fd4de4d7782f49734f2fe9c01bfbbfd16b68069d
+SIZE (gerris-0.9.2.tar.gz) = 4180547
diff --git a/science/gerris/pkg-plist b/science/gerris/pkg-plist
index f26bb9cbe438..d9260371453e 100644
--- a/science/gerris/pkg-plist
+++ b/science/gerris/pkg-plist
@@ -1,20 +1,18 @@
+bin/bat2gts
+bin/darcs2dist
 bin/gerris2D
 bin/gerris2D3
-bin/gerris2D_dir
 bin/gerris3D
-bin/gerris3D_dir
 bin/gfs-config
+bin/gfs2doc
 bin/gfs2oogl2D
 bin/gfs2oogl2D3
 bin/gfs2oogl3D
-bin/gfs2other2D
-bin/gfs2other3D
-bin/gfs2vtk2D
-bin/gfs2vtk3D
 bin/gfscompare2D
 bin/gfscompare2D3
 bin/gfscompare3D
 bin/ppmcombine
+bin/shapes
 bin/streamanime
 include/gerris/adaptive.h
 include/gerris/advection.h
@@ -35,49 +33,46 @@ include/gerris/source.h
 include/gerris/tension.h
 include/gerris/timestep.h
 include/gerris/utils.h
+include/gerris/variable.h
 include/gerris/vof.h
 include/gfs.h
 include/gfsconfig.h
-lib/gerris/dx2D.mdf
-lib/gerris/dx3D.mdf
-lib/gerris/libdx2D-0.6.so
-lib/gerris/libdx2D-0.6.so.1
-lib/gerris/libdx2D.a
-lib/gerris/libdx2D.la
-lib/gerris/libdx2D.so
-lib/gerris/libdx3D-0.6.so
-lib/gerris/libdx3D-0.6.so.1
-lib/gerris/libdx3D.a
-lib/gerris/libdx3D.la
-lib/gerris/libdx3D.so
-lib/gerris/libperiodic_flow2D.a
-lib/gerris/libperiodic_flow2D.la
-lib/gerris/libperiodic_flow2D.so
-lib/gerris/libperiodic_flow2D.so.0
-lib/gerris/libtesting2D.a
-lib/gerris/libtesting2D.la
-lib/gerris/libtesting2D.so
-lib/gerris/libtesting2D.so.0
-lib/gerris/libvorticity_spectrum2D.a
-lib/gerris/libvorticity_spectrum2D.la
-lib/gerris/libvorticity_spectrum2D.so
-lib/gerris/libvorticity_spectrum2D.so.0
-lib/libgfs2D-0.6.so
-lib/libgfs2D-0.6.so.1
+%%DX%%lib/gerris/dx2D.mdf
+%%DX%%lib/gerris/dx2D3.mdf
+%%DX%%lib/gerris/dx3D.mdf
+lib/gerris/gfs2tex.py
+%%DX%%lib/gerris/libdx2D-0.9.so
+%%DX%%lib/gerris/libdx2D-0.9.so.2
+%%DX%%lib/gerris/libdx2D.a
+%%DX%%lib/gerris/libdx2D.la
+%%DX%%lib/gerris/libdx2D.so
+%%DX%%lib/gerris/libdx2D3-0.9.so
+%%DX%%lib/gerris/libdx2D3-0.9.so.2
+%%DX%%lib/gerris/libdx2D3.a
+%%DX%%lib/gerris/libdx2D3.la
+%%DX%%lib/gerris/libdx2D3.so
+%%DX%%lib/gerris/libdx3D-0.9.so
+%%DX%%lib/gerris/libdx3D-0.9.so.2
+%%DX%%lib/gerris/libdx3D.a
+%%DX%%lib/gerris/libdx3D.la
+%%DX%%lib/gerris/libdx3D.so
+lib/libgfs2D-0.9.so
+lib/libgfs2D-0.9.so.2
 lib/libgfs2D.a
 lib/libgfs2D.la
 lib/libgfs2D.so
-lib/libgfs2D3-0.6.so
-lib/libgfs2D3-0.6.so.1
+lib/libgfs2D3-0.9.so
+lib/libgfs2D3-0.9.so.2
 lib/libgfs2D3.a
 lib/libgfs2D3.la
 lib/libgfs2D3.so
-lib/libgfs3D-0.6.so
-lib/libgfs3D-0.6.so.1
+lib/libgfs3D-0.9.so
+lib/libgfs3D-0.9.so.2
 lib/libgfs3D.a
 lib/libgfs3D.la
 lib/libgfs3D.so
 libdata/pkgconfig/gerris2D.pc
+libdata/pkgconfig/gerris2D3.pc
 libdata/pkgconfig/gerris3D.pc
 @dirrm lib/gerris
 @dirrm include/gerris