3 files changed, 50 insertions, 132 deletions

diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index 57327f3d7e8b..ce31a77859c6 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -6,17 +6,15 @@
 #
 
 PORTNAME=	muparser
-PORTVERSION=	1.30
-PORTREVISION=	1
+PORTVERSION=	1.32
 CATEGORIES=	math devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_v130
+DISTNAME=	${PORTNAME}_v${PORTVERSION:S/.//}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Mathematical expressions parser library written in C++
 
-RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkg-config
-
+USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared=no
 .if defined(NOPORTEXAMPLES)
@@ -27,8 +25,6 @@ CONFIGURE_ARGS+=	--docdir=${DOCSDIR}
 .endif
 USE_GMAKE=	yes
 
-WRKSRC=	${WRKDIR}/muparser
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
@@ -37,8 +33,6 @@ CFLAGS+=	-fPIC
 
 # taken from audio/taglib
 post-patch:
-	@${REINPLACE_CMD} -e "s#\$$(libdir)/pkgconfig#${PREFIX}/libdata/pkgconfig#g" \
-		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E 's,^(CXXFLAGS|LDFLAGS) = ,\1 ?= ,g' \
 		${WRKSRC}/Makefile.in
 
diff --git a/math/muparser/distinfo b/math/muparser/distinfo
index 0ee64388b22b..05771167362b 100644
--- a/math/muparser/distinfo
+++ b/math/muparser/distinfo
@@ -1,3 +1,3 @@
-MD5 (muparser_v130.tar.gz) = f6b4d79aa0f762fd4bfeb38f47cf1d15
-SHA256 (muparser_v130.tar.gz) = 4423db166ef58d46d3e5ddfc89f9e862fa6bc38f2c5b35f04edfa8adc5549c98
-SIZE (muparser_v130.tar.gz) = 820801
+MD5 (muparser_v132.tar.gz) = 9eda5ba73cae7dce09daa6bef6b7c49b
+SHA256 (muparser_v132.tar.gz) = 49dec550c0a5bddf506c3ce80e3d98c92f83dd021acb0e0d57ce4d3ea9df8f47
+SIZE (muparser_v132.tar.gz) = 1009309
diff --git a/math/muparser/pkg-plist b/math/muparser/pkg-plist
index cf05e7dece21..8c69d0c6b75b 100644
--- a/math/muparser/pkg-plist
+++ b/math/muparser/pkg-plist
@@ -1,8 +1,8 @@
-@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
@@ -14,146 +14,62 @@ include/muParserToken.h
 include/muParserTokenReader.h
 lib/libmuparser.a
 libdata/pkgconfig/muparser.pc
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/calc_8cpp-example.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classes.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Parser-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Parser.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Parser.png
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserBase-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserBase.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserBase.png
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserByteCode-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserByteCode.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserCallback-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserCallback.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserComplex-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserComplex.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserComplex.png
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserError-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserError.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserErrorMsg-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserErrorMsg.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserInt-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserInt.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserInt.png
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserStack-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserStack.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserToken-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserToken.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserTokenReader-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1ParserTokenReader.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Parser_1_1change__dec__sep-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Parser_1_1change__dec__sep.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Test_1_1ParserTester-members.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/classmu_1_1Test_1_1ParserTester.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/examples.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/files.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x63.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x64.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x65.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x67.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x6f.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x75.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x76.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_0x7e.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_type.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/hierarchy.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/index.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/list__expr__var_8cpp-example.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/listvar_8cpp-example.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserBase_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserBase_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserBase_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserBytecode_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserBytecode_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserBytecode_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserCallback_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserCallback_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserCallback_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserComplex_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserComplex_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserComplex_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserDLL_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserDLL_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserDef_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserDef_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserError_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserError_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserFixes_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserFixes_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserInt_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserInt_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserInt_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserStack_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserStack_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserTest_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserTest_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserTest_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserTokenReader_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserTokenReader_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserTokenReader_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserToken_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParserToken_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParser_8cpp.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParser_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/muParser_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemembers.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemembers_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemembers_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemembers_func.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemembers_type.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemu.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespacemu_1_1Test.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/namespaces.html
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/tab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/classdocu/tabs.css
+%%PORTDOCS%%%%DOCSDIR%%/images/Crystal_Clear_app_utilities.png
+%%PORTDOCS%%%%DOCSDIR%%/images/api.png
+%%PORTDOCS%%%%DOCSDIR%%/images/api_dark.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/osi.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/question.png
+%%PORTDOCS%%%%DOCSDIR%%/images/related.png
+%%PORTDOCS%%%%DOCSDIR%%/images/run.png
 %%PORTDOCS%%%%DOCSDIR%%/images/sflogo.png
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_geodes.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_kst.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_matrix.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_meshlab.jpg
+%%PORTDOCS%%%%DOCSDIR%%/images/thumb_pasimodo.jpg
 %%PORTDOCS%%%%DOCSDIR%%/images/thumb_qtiplot.jpg
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/misc/example.txt
+%%PORTDOCS%%%%DOCSDIR%%/misc/footer.html
 %%PORTDOCS%%%%DOCSDIR%%/misc/header.html
 %%PORTDOCS%%%%DOCSDIR%%/misc/list_expr_var.cpp
 %%PORTDOCS%%%%DOCSDIR%%/misc/listvar.cpp
@@ -162,25 +78,34 @@ libdata/pkgconfig/muparser.pc
 %%PORTDOCS%%%%DOCSDIR%%/mup_intro.html
 %%PORTDOCS%%%%DOCSDIR%%/mup_licence.html
 %%PORTDOCS%%%%DOCSDIR%%/mup_links.html
+%%PORTDOCS%%%%DOCSDIR%%/mup_locale.html
 %%PORTDOCS%%%%DOCSDIR%%/mup_usage.html
 %%PORTDOCS%%%%DOCSDIR%%/mup_version.html
 %%PORTDOCS%%%%DOCSDIR%%/script/functions.js
 %%PORTDOCS%%%%DOCSDIR%%/sources/build_page.sh
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_features.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_features_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_interface.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_interface_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_intro.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_intro_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_licence.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_licence_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_links.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_links_meta.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_locale.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_locale_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_usage.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_usage_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/mup_version.html
+%%PORTDOCS%%%%DOCSDIR%%/sources/mup_version_meta.html
 %%PORTDOCS%%%%DOCSDIR%%/sources/navigation.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/stat_counter.html
 %%PORTDOCS%%%%DOCSDIR%%/style/formate.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1/Example1.cpp
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1/example1
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3/Example3.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example3/example3.c
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example3
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/Readme.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example2/example2.c
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example2
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/example1
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/style
@@ -188,5 +113,4 @@ libdata/pkgconfig/muparser.pc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/script
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/images
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/classdocu
 %%PORTDOCS%%@dirrm %%DOCSDIR%%