6 files changed, 27 insertions, 67 deletions

diff --git a/science/getdp/Makefile b/science/getdp/Makefile
index 475cd6ae212c..81b5fcbcf7d6 100644
--- a/science/getdp/Makefile
+++ b/science/getdp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	getdp
-PORTVERSION=	2.2.1
-PORTREVISION=	5
+PORTVERSION=	2.7.0
 CATEGORIES=	science
 MASTER_SITES=	http://www.geuz.org/getdp/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
@@ -14,28 +13,11 @@ COMMENT=	Rather general finite element solver using mixed finite elements
 LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl	\
 		liblapack.so:${PORTSDIR}/math/lapack
 
-USES=		fortran gmake tar:tgz
-GNU_CONFIGURE=	yes
-# Using --enable-sparskit instead of math/petsc.  The maintainer couldn't get
-# the math/petsc to work.  This is a bmake/gmake clash.
-CONFIGURE_ARGS=	--with-gsl-prefix=${LOCALBASE}	\
-		--with-blas-lapack-prefix=${LOCALBASE} \
-		--enable-sparskit
-MAKE_ARGS=	bindir=${STAGEDIR}${PREFIX}/bin mandir=${STAGEDIR}${PREFIX}/man
+USES=		fortran gmake tar:tgz cmake
 WANT_PERL=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} -e 's/-lgfortran/& $${LDFLAGS}/' ${WRKSRC}/configure
-
-post-install:
-	cd ${WRKSRC}/doc && ${FIND} -s ${WRKSRC}/doc/* | ${SED} -e 's#${WRKSRC}/doc/##' | ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/demos && ${FIND} -s ${WRKSRC}/demos/* | ${SED} -e 's#${WRKSRC}/demos/##' | ${CPIO} -pmud -R ${BINOWN}:${BINGRP} ${STAGEDIR}${EXAMPLESDIR}
-
 .include <bsd.port.pre.mk>
 
 .if defined(MAINTAINER_MODE)
diff --git a/science/getdp/distinfo b/science/getdp/distinfo
index 469fb8ac3622..e25c79ec56c3 100644
--- a/science/getdp/distinfo
+++ b/science/getdp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (getdp-2.2.1-source.tgz) = a76cc7a774ffdd7172bead4e9e5d7791d6e071dfd676452e14384779e42edca7
-SIZE (getdp-2.2.1-source.tgz) = 1464022
+SHA256 (getdp-2.7.0-source.tgz) = 122830b700e4535be3ccba025bad5c7702324639a937b5e79fee6a1e92bd34b2
+SIZE (getdp-2.7.0-source.tgz) = 1523017
diff --git a/science/getdp/files/patch-CMakeLists.txt b/science/getdp/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..79d95efc21cb
--- /dev/null
+++ b/science/getdp/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2015-11-07 18:29:23 UTC
++++ CMakeLists.txt
+@@ -850,7 +850,7 @@ else(WIN32 OR CYGWIN)
+   set(GETDP_BIN bin)
+   set(GETDP_LIB lib)
+   set(GETDP_DOC share/doc/getdp)
+-  set(GETDP_MAN share/man/man1)
++  set(GETDP_MAN man/man1)
+ endif(WIN32 OR CYGWIN)
+ 
+ # mark targets as optional so we can install them separately if needed
diff --git a/science/getdp/files/patch-doc__texinfo__texinfo.tex b/science/getdp/files/patch-doc__texinfo__texinfo.tex
index b8d8a16c8b3c..fd9c825a7500 100644
--- a/science/getdp/files/patch-doc__texinfo__texinfo.tex
+++ b/science/getdp/files/patch-doc__texinfo__texinfo.tex
@@ -1,7 +1,7 @@
---- doc/texinfo/texinfo.tex.orig	Mon Feb 21 01:11:47 2005
-+++ doc/texinfo/texinfo.tex	Mon Feb 21 01:19:52 2005
+--- doc/texinfo/texinfo.tex.orig	2009-10-18 12:35:14 UTC
++++ doc/texinfo/texinfo.tex
 @@ -1,3 +1,4 @@
 +\let\pdfoutput\undefined
- % modified for gmsh -- see 'gmsh' tags
- %
  % texinfo.tex -- TeX macros to handle Texinfo files.
+ %
+ % Load plain if necessary, i.e., if running under initex.
diff --git a/science/getdp/pkg-descr b/science/getdp/pkg-descr
index a013977a785b..18941ce830a6 100644
--- a/science/getdp/pkg-descr
+++ b/science/getdp/pkg-descr
@@ -5,4 +5,4 @@ The main feature of GetDP is the closeness between the input data defining
 discrete problems (written by the user in ASCII data files) and the symbolic
 mathematical expressions of these problems.
 
-WWW:  http://www.geuz.org/getdp/
+WWW: http://www.geuz.org/getdp/
diff --git a/science/getdp/pkg-plist b/science/getdp/pkg-plist
index 123035321173..cafc726e1ef1 100644
--- a/science/getdp/pkg-plist
+++ b/science/getdp/pkg-plist
@@ -2,43 +2,10 @@ bin/getdp
 man/man1/getdp.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/README.win32
-%%PORTDOCS%%%%DOCSDIR%%/VERSIONS.txt
-%%PORTDOCS%%%%DOCSDIR%%/getdp.1
-%%PORTDOCS%%%%DOCSDIR%%/getdp.bib
-%%PORTDOCS%%%%DOCSDIR%%/getdp.html
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Core.fig
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Core.geo
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Core.jpg
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Core.pdf
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Core.txt
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/CoreMassive.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/CoreSta.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/EleSta_v.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Integration_Lib.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Jacobian_Lib.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/MagDyn_av_2D.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/MagSta_a_2D.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Strip.fig
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Strip.jpg
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Strip.pdf
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/Strip.txt
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/getdp.texi
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/mStrip.geo
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/mStrip.pro
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/objects-wrap.jpg
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/objects-wrap.pdf
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/objects-wrap.tex
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/objects-wrap.txt
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/objects.fig
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/objects.tex
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/texinfo.tex
-%%PORTDOCS%%%%DOCSDIR%%/texinfo/texinfo.tex.orig
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Magnetostatics.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/magnet.geo
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/magnet.msh
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/magnet.pro
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/magnet.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/demos/BH.pro
+%%PORTDOCS%%%%DOCSDIR%%/demos/Magnetostatics.pro
+%%PORTDOCS%%%%DOCSDIR%%/demos/magnet.geo
+%%PORTDOCS%%%%DOCSDIR%%/demos/magnet.msh
+%%PORTDOCS%%%%DOCSDIR%%/demos/magnet.pro
+%%PORTDOCS%%%%DOCSDIR%%/demos/magnet_data.pro