From 97fd6e8f0fc1ffbdc817d675c72cadb8cb485423 Mon Sep 17 00:00:00 2001 From: jrm Date: Sat, 18 Mar 2017 14:42:11 +0000 Subject: math/amath: Update to version 1.7.0. - Also switch to using the configure script included upstream (with patches). PR: 217724 Submitted by: cs@innolan.dk (maintainer) Approved by: swills (mentor, implicit) --- math/amath/Makefile | 22 ++++---- math/amath/distinfo | 6 +- math/amath/files/patch-configure | 115 +++++++++++++++++++++++++++++++++++++++ math/amath/pkg-plist | 33 +++++++++++ 4 files changed, 163 insertions(+), 13 deletions(-) create mode 100644 math/amath/files/patch-configure create mode 100644 math/amath/pkg-plist diff --git a/math/amath/Makefile b/math/amath/Makefile index e6dd29137218..f703c4f1b6c7 100644 --- a/math/amath/Makefile +++ b/math/amath/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= amath -PORTVERSION= 1.6.4 +PORTVERSION= 1.7.0 CATEGORIES= math MASTER_SITES= http://suyai.innolan.net/ @@ -11,16 +11,18 @@ COMMENT= Simple command line calculator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE +USES= gmake HAS_CONFIGURE= yes +CONFIGURE_ARGS= --prefix=${PREFIX} --pkgconfig=libdata/pkgconfig +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} MAKE_ARGS= CC=${CC} CXX=${CXX} -PLIST_FILES= bin/${PORTNAME} - -BROKEN_aarch64= Fails to compile: must define endianness - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME} - -do-test: - ${WRKSRC}/${PORTNAME} test +ALL_TARGET= static +TEST_TARGET= test + +post-install: + ${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 .include diff --git a/math/amath/distinfo b/math/amath/distinfo index b9a7d713d9c2..13eb89cdd331 100644 --- a/math/amath/distinfo +++ b/math/amath/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1486229315 -SHA256 (amath-1.6.4.tar.gz) = e060bbac00fe8cad0681494b33f8fdef62553e6153ab3f4195df56aaf5faa38f -SIZE (amath-1.6.4.tar.gz) = 256074 +TIMESTAMP = 1489273516 +SHA256 (amath-1.7.0.tar.gz) = 7ee5271e67a0091061b30658437080360a6e81f7e019e34d70ef739009ccca8a +SIZE (amath-1.7.0.tar.gz) = 301232 diff --git a/math/amath/files/patch-configure b/math/amath/files/patch-configure new file mode 100644 index 000000000000..683a08ba2e11 --- /dev/null +++ b/math/amath/files/patch-configure @@ -0,0 +1,115 @@ +--- configure.orig 2017-03-11 22:56:45 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" diff --git a/math/amath/pkg-plist b/math/amath/pkg-plist new file mode 100644 index 000000000000..73898d128204 --- /dev/null +++ b/math/amath/pkg-plist @@ -0,0 +1,33 @@ +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 +man/man1/amath.1.gz +man/man3/amathc.3.gz +man/man3/amathi.3.gz +man/man3/amathr.3.gz -- cgit