4 files changed, 24 insertions, 28 deletions

diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index df33f73e4885..ee38e40d26f5 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -6,14 +6,16 @@
 #
 
 PORTNAME=	muparser
-PORTVERSION=	1.34
+PORTVERSION=	2.2.0
 CATEGORIES=	math devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
+DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Mathematical expressions parser library written in C++
 
+LICENSE=	MIT
+
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared=no
@@ -24,6 +26,7 @@ CONFIGURE_ARGS+=	--enable-samples=no
 CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 .endif
 USE_GMAKE=	yes
+USE_ZIP=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/math/muparser/distinfo b/math/muparser/distinfo
index 1d616a1a2c51..c57bc5c64fd4 100644
--- a/math/muparser/distinfo
+++ b/math/muparser/distinfo
@@ -1,2 +1,2 @@
-SHA256 (muparser_v134.tar.gz) = 0e3d3dffe2d0bac9c381fc1320ee1e549993aff554d8c16d719caf23653f2276
-SIZE (muparser_v134.tar.gz) = 1013841
+SHA256 (muparser_v2_2_0.zip) = 3f543c49594dc77536049e837436ad8562a23fcfdb28150f3a63ab5369b77fb5
+SIZE (muparser_v2_2_0.zip) = 1504870
diff --git a/math/muparser/pkg-descr b/math/muparser/pkg-descr
index 0489d93d2591..cdfd4084a17e 100644
--- a/math/muparser/pkg-descr
+++ b/math/muparser/pkg-descr
@@ -3,4 +3,4 @@ It is based on transforming an expression into a bytecode and precalculating
 constant parts of it.
 
 Author:	Ingo Berg <ingo_berg@gmx.de>
-WWW:	http://muparser.sourceforge.net/
+WWW:	http://muparser.beltoforion.de/
diff --git a/math/muparser/pkg-plist b/math/muparser/pkg-plist
index 8c69d0c6b75b..d9650589501e 100644
--- a/math/muparser/pkg-plist
+++ b/math/muparser/pkg-plist
@@ -1,59 +1,50 @@
+@comment $FreeBSD$
 include/muParser.h
 include/muParserBase.h
 include/muParserBytecode.h
 include/muParserCallback.h
-include/muParserComplex.h
 include/muParserDLL.h
 include/muParserDef.h
 include/muParserError.h
 include/muParserFixes.h
 include/muParserInt.h
 include/muParserStack.h
+include/muParserTemplateMagic.h
 include/muParserTest.h
 include/muParserToken.h
 include/muParserTokenReader.h
 lib/libmuparser.a
 libdata/pkgconfig/muparser.pc
-%%PORTDOCS%%%%DOCSDIR%%/images/Crystal_Clear_app_utilities.png
 %%PORTDOCS%%%%DOCSDIR%%/images/api.png
 %%PORTDOCS%%%%DOCSDIR%%/images/api_dark.png
+%%PORTDOCS%%%%DOCSDIR%%/images/back_idx.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bench2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/blocks.png
 %%PORTDOCS%%%%DOCSDIR%%/images/build.png
 %%PORTDOCS%%%%DOCSDIR%%/images/bytecode.png
 %%PORTDOCS%%%%DOCSDIR%%/images/caption.png
 %%PORTDOCS%%%%DOCSDIR%%/images/diff.png
-%%PORTDOCS%%%%DOCSDIR%%/images/download.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/download.png
-%%PORTDOCS%%%%DOCSDIR%%/images/download_dark.png
 %%PORTDOCS%%%%DOCSDIR%%/images/download_muparser.png
 %%PORTDOCS%%%%DOCSDIR%%/images/download_muparser_.png
-%%PORTDOCS%%%%DOCSDIR%%/images/grad1.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/grad2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/grad2.xcf
-%%PORTDOCS%%%%DOCSDIR%%/images/grad3.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/help.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/help.png
 %%PORTDOCS%%%%DOCSDIR%%/images/home.png
 %%PORTDOCS%%%%DOCSDIR%%/images/home_dark.png
 %%PORTDOCS%%%%DOCSDIR%%/images/info.png
 %%PORTDOCS%%%%DOCSDIR%%/images/list.png
-%%PORTDOCS%%%%DOCSDIR%%/images/logo.xcf
 %%PORTDOCS%%%%DOCSDIR%%/images/mathparser.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/mathparser_logo.gif
 %%PORTDOCS%%%%DOCSDIR%%/images/mathparser_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/muParser.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muParserNET.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muParserNET.xcf
-%%PORTDOCS%%%%DOCSDIR%%/images/muParserNET_.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muParserX.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muParserX.xcf
-%%PORTDOCS%%%%DOCSDIR%%/images/muParserX_.png
+%%PORTDOCS%%%%DOCSDIR%%/images/muparsernet.png
+%%PORTDOCS%%%%DOCSDIR%%/images/muparsernet_.png
+%%PORTDOCS%%%%DOCSDIR%%/images/muparsersse.png
+%%PORTDOCS%%%%DOCSDIR%%/images/muparsersse_.png
+%%PORTDOCS%%%%DOCSDIR%%/images/muparserx.png
+%%PORTDOCS%%%%DOCSDIR%%/images/muparserx_.png
 %%PORTDOCS%%%%DOCSDIR%%/images/osi.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/question.png
+%%PORTDOCS%%%%DOCSDIR%%/images/related (Kopie).png
 %%PORTDOCS%%%%DOCSDIR%%/images/related.png
-%%PORTDOCS%%%%DOCSDIR%%/images/run.png
-%%PORTDOCS%%%%DOCSDIR%%/images/sflogo.png
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_gct.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_geodes.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_kst.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_matrix.jpg
@@ -63,8 +54,6 @@ libdata/pkgconfig/muparser.pc
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_tm2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_trini.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/images/xxx .png
-%%PORTDOCS%%%%DOCSDIR%%/images/xxx.xcf
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/misc/Main.txt
 %%PORTDOCS%%%%DOCSDIR%%/misc/calc.cpp
@@ -101,10 +90,14 @@ libdata/pkgconfig/muparser.pc
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_version_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/navigation.html
 %%PORTDOCS%%%%DOCSDIR%%/style/formate.css
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1/Example1.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1/example1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1/example1.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/Readme.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/example2.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/muparser32.dll
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/muparser64.dll
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/muparserd32.dll
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/muparserd64.dll
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example2
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example1
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%