Date: Mon, 7 Jul 2014 02:42:22 +0000 (UTC) From: Nicola Vitale <nivit@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361018 - head/math/muparser Message-ID: <201407070242.s672gMPQ078915@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nivit Date: Mon Jul 7 02:42:22 2014 New Revision: 361018 URL: http://svnweb.freebsd.org/changeset/ports/361018 QAT: https://qat.redports.org/buildarchive/r361018/ Log: - Update to 2.2.3 - Use options helpers - Build/install dynamic library instead of the static one - Add options DOCS and EXAMPLES - Set MAKE_JOBS_UNSAFE, otherwise the port fails to build when the option EXAMPLES is ON (it tries to compile/link example1 while the library is not yet built/deployed) - Remove build-dependency by devel/gmake - Add support for stage dir - Fix format of WWW line in pkg-descr Release Notes: http://muparser.beltoforion.de/mup_intro.html#idRelNote Modified: head/math/muparser/Makefile head/math/muparser/distinfo head/math/muparser/pkg-descr head/math/muparser/pkg-plist Modified: head/math/muparser/Makefile ============================================================================== --- head/math/muparser/Makefile Mon Jul 7 02:37:16 2014 (r361017) +++ head/math/muparser/Makefile Mon Jul 7 02:42:22 2014 (r361018) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= muparser -PORTVERSION= 2.2.0 +PORTVERSION= 2.2.3 CATEGORIES= math devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION} DISTNAME= ${PORTNAME}_v${PORTVERSION:S/./_/g} @@ -12,38 +12,43 @@ COMMENT= Mathematical expressions parser LICENSE= MIT -USES= pathfix gmake zip +ALL_TARGET= lib + +DOCS_CONFIGURE_ON= --docdir=${DOCSDIR} + +EXAMPLES_CONFIGURE_ENABLE= samples +EXAMPLES_ALL_TARGET= samples + GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-shared=no -.if defined(NOPORTEXAMPLES) -CONFIGURE_ARGS+= --enable-samples=no -.endif -.if !defined(NOPORTDOCS) -CONFIGURE_ARGS+= --docdir=${DOCSDIR} -.endif -NO_STAGE= yes +# otherwise it fails to build when the EXAMPLES option is ON +MAKE_JOBS_UNSAFE=yes + +OPTIONS_DEFINE= DOCS EXAMPLES + +USE_LDCONFIG= yes +USES= pathfix zip + .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" || ${ARCH} == "ia64" CFLAGS+= -fPIC .endif -# taken from audio/taglib post-patch: @${REINPLACE_CMD} -E 's,^(CXXFLAGS|LDFLAGS) = ,\1 ?= ,g' \ ${WRKSRC}/Makefile.in post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} && \ - cd ${WRKSRC}/docs/html && \ - ${COPYTREE_SHARE} . ${DOCSDIR} -.endif -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} && \ - cd ${WRKSRC}/samples && \ - ${COPYTREE_SHARE} . ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/docs/html && \ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) + +.if ${PORT_OPTIONS:MEXAMPLES} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + (cd ${WRKSRC}/samples/example1 && \ + ${INSTALL_PROGRAM} example1 ${STAGEDIR}${EXAMPLESDIR} && \ + ${INSTALL_DATA} example1.cpp ${STAGEDIR}${EXAMPLESDIR}) .endif .include <bsd.port.post.mk> Modified: head/math/muparser/distinfo ============================================================================== --- head/math/muparser/distinfo Mon Jul 7 02:37:16 2014 (r361017) +++ head/math/muparser/distinfo Mon Jul 7 02:42:22 2014 (r361018) @@ -1,2 +1,2 @@ -SHA256 (muparser_v2_2_0.zip) = 3f543c49594dc77536049e837436ad8562a23fcfdb28150f3a63ab5369b77fb5 -SIZE (muparser_v2_2_0.zip) = 1504870 +SHA256 (muparser_v2_2_3.zip) = dfe831b69392ab0b1eb59d3601b7b1575554a85057cf2f234f64f930c4148902 +SIZE (muparser_v2_2_3.zip) = 1481359 Modified: head/math/muparser/pkg-descr ============================================================================== --- head/math/muparser/pkg-descr Mon Jul 7 02:37:16 2014 (r361017) +++ head/math/muparser/pkg-descr Mon Jul 7 02:42:22 2014 (r361018) @@ -2,5 +2,4 @@ muParser is an extensible high performan 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.beltoforion.de/ +WWW: http://muparser.beltoforion.de/ Modified: head/math/muparser/pkg-plist ============================================================================== --- head/math/muparser/pkg-plist Mon Jul 7 02:37:16 2014 (r361017) +++ head/math/muparser/pkg-plist Mon Jul 7 02:42:22 2014 (r361018) @@ -12,7 +12,9 @@ include/muParserTemplateMagic.h include/muParserTest.h include/muParserToken.h include/muParserTokenReader.h -lib/libmuparser.a +lib/libmuparser.so +lib/libmuparser.so.2 +lib/libmuparser.so.2.2.3 libdata/pkgconfig/muparser.pc %%PORTDOCS%%%%DOCSDIR%%/images/api.png %%PORTDOCS%%%%DOCSDIR%%/images/api_dark.png @@ -89,20 +91,12 @@ 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 -%%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%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/style -%%PORTDOCS%%@dirrm %%DOCSDIR%%/sources -%%PORTDOCS%%@dirrm %%DOCSDIR%%/script -%%PORTDOCS%%@dirrm %%DOCSDIR%%/misc -%%PORTDOCS%%@dirrm %%DOCSDIR%%/images -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1 +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.cpp +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/images +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/misc +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/script +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/sources +%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/style +%%PORTDOCS%%@dirrmtry %%DOCSDIR%% +%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407070242.s672gMPQ078915>