Date: Sun, 16 Apr 2017 06:33:05 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r438617 - in branches/2017Q2/math/amath: . files Message-ID: <201704160633.v3G6X58q060531@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Apr 16 06:33:05 2017 New Revision: 438617 URL: https://svnweb.freebsd.org/changeset/ports/438617 Log: MFH: r438586 Update to upstream version 1.8.0 Detailed log: - Update to upstream version 1.8.0 - New default OPTION TESTS: Build with regression tests - Now choice possible between different math libs: SYSLIBM (-lm) OPENLIBM (math/openlibm) APPLIBM (bundled), default PR: 218612 Submitted by: cs@innolan.dk (maintainer) Approved by: ports-secteam (junovitch) Modified: branches/2017Q2/math/amath/Makefile branches/2017Q2/math/amath/distinfo branches/2017Q2/math/amath/files/patch-configure branches/2017Q2/math/amath/pkg-plist Directory Properties: branches/2017Q2/ (props changed) Modified: branches/2017Q2/math/amath/Makefile ============================================================================== --- branches/2017Q2/math/amath/Makefile Sun Apr 16 06:31:28 2017 (r438616) +++ branches/2017Q2/math/amath/Makefile Sun Apr 16 06:33:05 2017 (r438617) @@ -1,9 +1,10 @@ # $FreeBSD$ PORTNAME= amath -PORTVERSION= 1.7.0 +PORTVERSION= 1.8.0 CATEGORIES= math -MASTER_SITES= http://suyai.innolan.net/ +MASTER_SITES= http://suyai.innolan.net/ \ + https://amath.innolan.net/ MAINTAINER= cs@innolan.dk COMMENT= Simple command line calculator @@ -11,18 +12,39 @@ COMMENT= Simple command line calculator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +OPTIONS_DEFINE= TESTS +TESTS_DESC= Build with regression tests +OPTIONS_RADIO= LIBM +OPTIONS_RADIO_LIBM= APPLIBM OPENLIBM SYSLIBM +LIBM_DESC= Math libraries +APPLIBM_DESC= Build and install application libraries +OPENLIBM_DESC= Build with OpenLibm +SYSLIBM_DESC= System (-lm) +OPTIONS_DEFAULT= APPLIBM TESTS +OPTIONS_SUB= yes + +SYSLIBM_CONFIGURE_WITH= libm +OPENLIBM_CONFIGURE_WITH= openlibm +OPENLIBM_LIB_DEPENDS= libopenlibm.so:math/openlibm +TESTS_CONFIGURE_ENABLE= test + USES= gmake HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --pkgconfig=libdata/pkgconfig +CONFIGURE_ARGS= --prefix=${PREFIX} --pkgconfig=libdata/pkgconfig \ + --mandir=man LDFLAGS="-L${LOCALBASE}/lib" USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} MAKE_ARGS= CC=${CC} CXX=${CXX} ALL_TARGET= static TEST_TARGET= test -post-install: +post-install-APPLIBM-on: ${LN} -sf libamathapp.so ${STAGEDIR}${PREFIX}/lib/amath/libamathapp.so.1 ${LN} -sf libamathcplex.so ${STAGEDIR}${PREFIX}/lib/amath/libamathcplex.so.1 ${LN} -sf libamathc.so ${STAGEDIR}${PREFIX}/lib/amath/libamathc.so.1 ${LN} -sf libamath.so ${STAGEDIR}${PREFIX}/lib/amath/libamath.so.1 +do-install-APPLIBM-off: + ${INSTALL_PROGRAM} ${WRKSRC}/amath ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/amath.1 ${STAGEDIR}${PREFIX}/man/man1/ + .include <bsd.port.mk> Modified: branches/2017Q2/math/amath/distinfo ============================================================================== --- branches/2017Q2/math/amath/distinfo Sun Apr 16 06:31:28 2017 (r438616) +++ branches/2017Q2/math/amath/distinfo Sun Apr 16 06:33:05 2017 (r438617) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489273516 -SHA256 (amath-1.7.0.tar.gz) = 7ee5271e67a0091061b30658437080360a6e81f7e019e34d70ef739009ccca8a -SIZE (amath-1.7.0.tar.gz) = 301232 +TIMESTAMP = 1492032535 +SHA256 (amath-1.8.0.tar.gz) = 63a32ac5512fac5421147c04f2fd500dc7b63c209706f225cfbf28ff90da6b0d +SIZE (amath-1.8.0.tar.gz) = 258709 Modified: branches/2017Q2/math/amath/files/patch-configure ============================================================================== --- branches/2017Q2/math/amath/files/patch-configure Sun Apr 16 06:31:28 2017 (r438616) +++ branches/2017Q2/math/amath/files/patch-configure Sun Apr 16 06:33:05 2017 (r438617) @@ -1,115 +1,20 @@ ---- configure.orig 2017-03-11 22:56:45 UTC +--- configure.orig 2017-04-03 12:17:53 UTC +++ configure -@@ -567,7 +567,7 @@ echo " \${MKDIR} static" - echo " \${MKDIR} shared" - echo - echo "\${solib}: build ${files2}" --echo " \${CXX} \${CXXFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${files2}" -+echo " \${CXX} \${CXXFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${files2}" - echo - echo "\${alib}: build ${files}" - echo " \${AR} rcs static/\${alib} ${files}" -@@ -589,7 +589,6 @@ echo " \${INSTALL} nnumb.h \${INSTDIRI}/ - echo " \${INSTALL} ntext.h \${INSTDIRI}/ntext.h" - echo " \${INSTALL} numb.h \${INSTDIRI}/numb.h" - echo " \${INSTALL} real.h \${INSTDIRI}/real.h" --echo " \${LDCONFIG} \${INSTDIR}" - echo - echo ".PHONY: uninstall" - echo "uninstall:" -@@ -626,7 +625,7 @@ echo "PREFIX = ${prefix}" - echo "INSTDIR = \${DESTDIR}\${PREFIX}/lib/amath" - echo "INSTDIRI = \${DESTDIR}\${PREFIX}/include/amath" - echo "INSTDIRPC = \${DESTDIR}\${PREFIX}/${pkgconfigdir}" --echo "INSTDIRM = \${DESTDIR}\${PREFIX}/share/man/man3" -+echo "INSTDIRM = \${DESTDIR}\${PREFIX}/man/man3" - echo "alib = lib${amathc}.a" - echo "solib = lib${amathc}.so" - echo "pkgconfig = amathc.pc" -@@ -660,7 +659,7 @@ echo " \${MKDIR} static" - echo " \${MKDIR} shared" - echo - echo "\${solib}: build ${libcs}" --echo " \${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${libcs} -lc" -+echo " \${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${libcs} -lc" - echo - echo "\${alib}: build ${libc}" - echo " \${AR} rcs static/\${alib} ${libc}" -@@ -677,7 +676,6 @@ echo " \${INSTALL} \${pkgconfig} \${INST - echo " \${INSTALL} \${manpage} \${INSTDIRM}/\${manpage}" - echo " \${INSTALL} ../amath.h \${INSTDIRI}" - echo " \${INSTALL} ../amathc.h \${INSTDIRI}" --echo " \${LDCONFIG} \${INSTDIR}" - echo - echo ".PHONY: uninstall" - echo "uninstall:" -@@ -710,7 +708,7 @@ echo "PREFIX = ${prefix}" - echo "INSTDIR = \${DESTDIR}\${PREFIX}/lib/amath" - echo "INSTDIRI = \${DESTDIR}\${PREFIX}/include/amath" - echo "INSTDIRPC = \${DESTDIR}\${PREFIX}/${pkgconfigdir}" --echo "INSTDIRM = \${DESTDIR}\${PREFIX}/share/man/man3" -+echo "INSTDIRM = \${DESTDIR}\${PREFIX}/man/man3" - echo "alib = lib${amath}.a" - echo "solib = lib${amath}.so" - echo "pkgconfig = amathr.pc" -@@ -744,7 +742,7 @@ echo " \${MKDIR} static" - echo " \${MKDIR} shared" - echo - echo "\${solib}: build ${libamaths}" --echo " \${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${libamaths}" -+echo " \${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${libamaths}" - echo - echo "\${alib}: build ${libamath}" - echo " \${AR} rcs static/\${alib} ${libamath}" -@@ -760,7 +758,6 @@ echo " \${INSTALL} \${solib} \${INSTDIR} - echo " \${INSTALL} \${pkgconfig} \${INSTDIRPC}/\${pkgconfig}" - echo " \${INSTALL} \${manpage} \${INSTDIRM}/\${manpage}" - echo " \${INSTALL} ../math.h \${INSTDIRI}/amathr.h" --echo " \${LDCONFIG} \${INSTDIR}" - echo - echo ".PHONY: uninstall" - echo "uninstall:" -@@ -791,7 +788,7 @@ echo "PREFIX = ${prefix}" - echo "INSTDIR = \${DESTDIR}\${PREFIX}/lib/amath" - echo "INSTDIRI = \${DESTDIR}\${PREFIX}/include/amath" - echo "INSTDIRPC = \${DESTDIR}\${PREFIX}/${pkgconfigdir}" --echo "INSTDIRM = \${DESTDIR}\${PREFIX}/share/man/man3" -+echo "INSTDIRM = \${DESTDIR}\${PREFIX}/man/man3" - echo "alib = lib${amathcplex}.a" - echo "solib = lib${amathcplex}.so" - echo "pkgconfig = amathi.pc" -@@ -825,7 +822,7 @@ echo " \${MKDIR} static" - echo " \${MKDIR} shared" - echo - echo "\${solib}: build ${libcomplexs}" --echo " \${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${libcomplexs}" -+echo " \${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${libcomplexs}" - echo - echo "\${alib}: build ${libcomplex}" - echo " \${AR} rcs static/\${alib} ${libcomplex}" -@@ -841,7 +838,6 @@ echo " \${INSTALL} \${solib} \${INSTDIR} - echo " \${INSTALL} \${pkgconfig} \${INSTDIRPC}/\${pkgconfig}" - echo " \${INSTALL} \${manpage} \${INSTDIRM}/\${manpage}" - echo " \${INSTALL} ../complex.h \${INSTDIRI}/amathi.h" --echo " \${LDCONFIG} \${INSTDIR}" - echo - echo ".PHONY: uninstall" - echo "uninstall:" -@@ -878,7 +874,7 @@ echo "INSTALLP = install -m 0755" - echo "INSTALLM = install -m 0644" - echo "PREFIX = ${prefix}" - echo "INSTDIRP = \${DESTDIR}\${PREFIX}/bin" --echo "INSTDIRM = \${DESTDIR}\${PREFIX}/share/man/man1" -+echo "INSTDIRM = \${DESTDIR}\${PREFIX}/man/man1" - echo - echo "all: shared-app" - echo "app: ${appmain} ${appfunction} ${appstatement} ${appsystem}" -@@ -953,7 +949,7 @@ echo " LD_LIBRARY_PATH=src/clib/:src/lib - echo " ./amath test" - echo - echo ".PHONY: install" --echo "install: shared-app" -+echo "install:" - echo " cd src/lib && \${MAKE} install" - echo " cd src/clib && \${MAKE} install" - echo " cd src/real && \${MAKE} install" +@@ -465,8 +465,6 @@ catanh.c + ccos.c + ccosh.c + cexp.c +-clog.c +-cpow.c + csin.c + csinh.c + csqrt.c +@@ -485,6 +483,8 @@ ccot.c + ccoth.c + ccsc.c + ccsch.c ++clog.c ++cpow.c + clogb.c + clog10.c + csec.c Modified: branches/2017Q2/math/amath/pkg-plist ============================================================================== --- branches/2017Q2/math/amath/pkg-plist Sun Apr 16 06:31:28 2017 (r438616) +++ branches/2017Q2/math/amath/pkg-plist Sun Apr 16 06:33:05 2017 (r438617) @@ -1,33 +1,35 @@ bin/amath -include/amath/aengine.h -include/amath/amath.h -include/amath/amathc.h -include/amath/amathi.h -include/amath/amathr.h -include/amath/charbuf.h -include/amath/cplex.h -include/amath/integer.h -include/amath/nnumb.h -include/amath/ntext.h -include/amath/numb.h -include/amath/real.h -lib/amath/libamath.a -lib/amath/libamath.so -lib/amath/libamath.so.1 -lib/amath/libamathapp.a -lib/amath/libamathapp.so -lib/amath/libamathapp.so.1 -lib/amath/libamathc.a -lib/amath/libamathc.so -lib/amath/libamathc.so.1 -lib/amath/libamathcplex.a -lib/amath/libamathcplex.so -lib/amath/libamathcplex.so.1 -libdata/pkgconfig/amatha.pc -libdata/pkgconfig/amathc.pc -libdata/pkgconfig/amathi.pc -libdata/pkgconfig/amathr.pc +%%APPLIBM%%include/amath/aengine.h +%%APPLIBM%%include/amath/bigint.h +%%APPLIBM%%include/amath/amath.h +%%APPLIBM%%include/amath/amathc.h +%%APPLIBM%%include/amath/mathi.h +%%APPLIBM%%include/amath/mathr.h +%%APPLIBM%%include/amath/charbuf.h +%%APPLIBM%%include/amath/cplex.h +%%APPLIBM%%include/amath/nnumb.h +%%APPLIBM%%include/amath/ntext.h +%%APPLIBM%%include/amath/ntextd.h +%%APPLIBM%%include/amath/ntextp.h +%%APPLIBM%%include/amath/numb.h +%%APPLIBM%%include/amath/real.h +%%APPLIBM%%lib/amath/libamath.a +%%APPLIBM%%lib/amath/libamath.so +%%APPLIBM%%lib/amath/libamath.so.1 +%%APPLIBM%%lib/amath/libamathapp.a +%%APPLIBM%%lib/amath/libamathapp.so +%%APPLIBM%%lib/amath/libamathapp.so.1 +%%APPLIBM%%lib/amath/libamathc.a +%%APPLIBM%%lib/amath/libamathc.so +%%APPLIBM%%lib/amath/libamathc.so.1 +%%APPLIBM%%lib/amath/libamathcplex.a +%%APPLIBM%%lib/amath/libamathcplex.so +%%APPLIBM%%lib/amath/libamathcplex.so.1 +%%APPLIBM%%libdata/pkgconfig/amatha.pc +%%APPLIBM%%libdata/pkgconfig/amathc.pc +%%APPLIBM%%libdata/pkgconfig/amathi.pc +%%APPLIBM%%libdata/pkgconfig/amathr.pc man/man1/amath.1.gz -man/man3/amathc.3.gz -man/man3/amathi.3.gz -man/man3/amathr.3.gz +%%APPLIBM%%man/man3/amathc.3.gz +%%APPLIBM%%man/man3/amathi.3.gz +%%APPLIBM%%man/man3/amathr.3.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704160633.v3G6X58q060531>