v1.8.0

- Fixed bugs in numeral systems.
- Fixed bugs related to infinity (Inf).
- Fixed bugs related to Not a Number (NaN).
- Updated and cleanup documentation.
- Cleaned up code structure.
- OpenLibm support.

5 files changed, 27 insertions, 128 deletions

diff --git a/math/amath/Makefile b/math/amath/Makefile
index 576f2f40221..3750037737a 100644
--- a/math/amath/Makefile
+++ b/math/amath/Makefile
@@ -1,25 +1,33 @@
-# $NetBSD: Makefile,v 1.2 2017/02/17 17:09:16 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2017/04/22 07:29:53 adam Exp $
 
-DISTNAME=	amath-1.6.2
-PKGREVISION=	1
+DISTNAME=	amath-1.8.0
 CATEGORIES=	math
-MASTER_SITES=	http://suyai.innolan.net/
+MASTER_SITES=	https://amath.innolan.net/
+MASTER_SITES+=	http://suyai.innolan.net/
 
-MAINTAINER=	cs@innolan.dk
-HOMEPAGE=	http://amath.innolan.net/
+MAINTAINER=	cs@innolan.net
+HOMEPAGE=	https://amath.innolan.net/
 COMMENT=	Simple command line calculator
 LICENSE=	2-clause-bsd
 
-HAS_CONFIGURE=	yes
-USE_LANGUAGES=	c c++
+USE_LANGUAGES=		c c++
+USE_TOOLS+=		gmake
+HAS_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--mandir=man
+CONFIGURE_ARGS+=	--with-libm
+CONFIGURE_ARGS+=	CFLAGS=${CFLAGS:Q}
+CONFIGURE_ARGS+=	CXXFLAGS=${CXXFLAGS:Q}
+CONFIGURE_ARGS+=	LDFLAGS=${LDFLAGS:Q}
 
-INSTALLATION_DIRS=	bin
-BINNAME=		amath
+BUILD_TARGET=		static
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${BINNAME} ${DESTDIR}${PREFIX}/bin/${BINNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/amath ${DESTDIR}${PREFIX}/bin/
+	${INSTALL_MAN} ${WRKSRC}/amath.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
 
 do-test:
-	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ./${BINNAME} test
+	${RUN} cd ${WRKSRC}; ${SETENV} ${TEST_ENV} ./amath test
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/amath/PLIST b/math/amath/PLIST
index 3094387cde1..b3983d99717 100644
--- a/math/amath/PLIST
+++ b/math/amath/PLIST
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2017/01/30 19:49:26 leot Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/04/22 07:29:53 adam Exp $
 bin/amath
+man/man1/amath.1
diff --git a/math/amath/distinfo b/math/amath/distinfo
index 9df4fa4224c..0a8576057f2 100644
--- a/math/amath/distinfo
+++ b/math/amath/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2017/02/17 17:09:16 joerg Exp $
+$NetBSD: distinfo,v 1.3 2017/04/22 07:29:53 adam Exp $
 
-SHA1 (amath-1.6.2.tar.gz) = 9efdf46ddb70128d920abd92c20c65c3ef700f00
-RMD160 (amath-1.6.2.tar.gz) = 101b5692ac6f77d0e05edff52736f4587b0313e2
-SHA512 (amath-1.6.2.tar.gz) = f05691da9930a209224846a014a5cb19b5c7ea1ac0a5b73db5f74905f741d800b3b4ddf5df0a8caceed15b291bd327a6bb1ff72b68764c269fa08c1ed427390b
-Size (amath-1.6.2.tar.gz) = 494838 bytes
-SHA1 (patch-app_main.cpp) = 52427c8a29cbe8f1c0157acbff48dc786baa88d8
-SHA1 (patch-lib_platform.h) = 0b97085d673cd2b077a0bcc5db8a4c253d7f0bea
+SHA1 (amath-1.8.0.tar.gz) = 2d0908f5d0cc72d9d3b8b695381b4be292e85f1e
+RMD160 (amath-1.8.0.tar.gz) = 08943bfdbf9fb7b23b118eb7bbc5a8e56143eb2a
+SHA512 (amath-1.8.0.tar.gz) = bc2f659cbeb043d488735ef34d83e6e51b62efb7c858ba2e9fb8c07796c325b6afbdca18f3d8779cb64daba6abe33081d728bf37ce1e59dcf25c312b6d65e2c0
+Size (amath-1.8.0.tar.gz) = 258709 bytes
diff --git a/math/amath/patches/patch-app_main.cpp b/math/amath/patches/patch-app_main.cpp
deleted file mode 100644
index 1fe5521a801..00000000000
--- a/math/amath/patches/patch-app_main.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-$NetBSD: patch-app_main.cpp,v 1.1 2017/02/17 17:09:17 joerg Exp $
-
-Replace operators must be global.
-
---- app/main.cpp.orig	2017-02-17 12:12:18.536908981 +0000
-+++ app/main.cpp
-@@ -27,6 +27,43 @@
- #include "system/program.h"
- #include "system/base/io.h"
- 
-+#if (__GNUC__ == 2 && __GNUC_MINOR__ == 95)
-+void* operator new (size_t size) {
-+    return AllocMemSafe(size);
-+}
-+
-+void* operator new[] (size_t size) {
-+    return AllocMemSafe(size);
-+}
-+
-+void  operator delete (void* ptr) {
-+    FreeMemSafe(ptr);
-+}
-+
-+void  operator delete[] (void* ptr) {
-+    FreeMemSafe(ptr);
-+}
-+#endif
-+
-+#if (__GNUC__ > 2) || defined (_WIN32)
-+#include <new>
-+void* operator new (size_t size) throw(std::bad_alloc) {
-+    return AllocMemSafe(size);
-+}
-+
-+void* operator new[] (size_t size) throw(std::bad_alloc) {
-+    return AllocMemSafe(size);
-+}
-+
-+void  operator delete (void* ptr) throw() {
-+    FreeMemSafe(ptr);
-+}
-+
-+void  operator delete[] (void* ptr) throw() {
-+    FreeMemSafe(ptr);
-+}
-+#endif
-+
- int main(int argc, char **argv)
- {
-     Program = CreateProgram(argc, argv);
diff --git a/math/amath/patches/patch-lib_platform.h b/math/amath/patches/patch-lib_platform.h
deleted file mode 100644
index 786928c0c8a..00000000000
--- a/math/amath/patches/patch-lib_platform.h
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-lib_platform.h,v 1.1 2017/02/17 17:09:17 joerg Exp $
-
-Replace operators must be global.
-
---- lib/platform.h.orig	2017-02-17 12:09:25.174210005 +0000
-+++ lib/platform.h
-@@ -138,21 +138,10 @@ typedef u_int32_t   uint32_t;
- typedef u_int64_t   uint64_t;
- # define IPTR LONG*
- #ifdef __cplusplus
--inline void* operator new (size_t size) {
--    return AllocMemSafe(size);
--}
--
--inline void* operator new[] (size_t size) {
--    return AllocMemSafe(size);
--}
--
--inline void  operator delete (void* ptr) {
--    FreeMemSafe(ptr);
--}
--
--inline void  operator delete[] (void* ptr) {
--    FreeMemSafe(ptr);
--}
-+void* operator new (size_t size);
-+void* operator new[] (size_t size);
-+void  operator delete (void* ptr);
-+void  operator delete[] (void* ptr);
- #endif
- #endif
- 
-@@ -164,21 +153,10 @@ inline void  operator delete[] (void* pt
- #ifdef __cplusplus
- #if (__GNUC__ > 2) || defined (_WIN32)
- #include <new>
--inline void* operator new (size_t size) throw(std::bad_alloc) {
--    return AllocMemSafe(size);
--}
--
--inline void* operator new[] (size_t size) throw(std::bad_alloc) {
--    return AllocMemSafe(size);
--}
--
--inline void  operator delete (void* ptr) throw() {
--    FreeMemSafe(ptr);
--}
--
--inline void  operator delete[] (void* ptr) throw() {
--    FreeMemSafe(ptr);
--}
-+void* operator new (size_t size) throw(std::bad_alloc);
-+void* operator new[] (size_t size) throw(std::bad_alloc);
-+void  operator delete (void* ptr) throw();
-+void  operator delete[] (void* ptr) throw();
- #endif
- #endif
-