summaryrefslogtreecommitdiff
path: root/math/bcal
diff options
context:
space:
mode:
authorsjmulder <sjmulder@pkgsrc.org>2020-01-09 12:21:37 +0000
committersjmulder <sjmulder@pkgsrc.org>2020-01-09 12:21:37 +0000
commit9127bac25ad7a0c4246954ae88a09508e57153ba (patch)
treea2bd10e83e5e424b7c6922b332381a9ed49bc05f /math/bcal
parent476edef0aaad97462a93d76ed5328cad685df670 (diff)
downloadpkgsrc-9127bac25ad7a0c4246954ae88a09508e57153ba.tar.gz
bcal: Update to 2.2
Changes: - Support calc for multi-base expressions - To use calc, export BCAL_USE_CALC=1 - Fix lint issues - Fix issue #30 - Updated auto-generated packages - More portable Makefile
Diffstat (limited to 'math/bcal')
-rw-r--r--math/bcal/Makefile7
-rw-r--r--math/bcal/distinfo11
-rw-r--r--math/bcal/patches/patch-Makefile32
3 files changed, 10 insertions, 40 deletions
diff --git a/math/bcal/Makefile b/math/bcal/Makefile
index 06cda80c393..468dd5e695f 100644
--- a/math/bcal/Makefile
+++ b/math/bcal/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2019/06/12 20:57:07 sjmulder Exp $
+# $NetBSD: Makefile,v 1.4 2020/01/09 12:21:37 sjmulder Exp $
-DISTNAME= bcal-2.1
+DISTNAME= bcal-2.2
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GITHUB:=jarun/}
GITHUB_TAG= v${PKGVERSION_NOREV}
@@ -16,6 +16,9 @@ ONLY_FOR_PLATFORM= ${LP64PLATFORMS}
USE_TOOLS+= gmake
DEPENDS+= bc-[0-9]*:../../math/bc
MAKE_FLAGS+= MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+# No -O3 and -Werror
+MAKE_FLAGS+= CFLAGS_OPTIMIZATION=
+MAKE_FLAGS+= CFLAGS_WARNINGS="-Wall -Wextra -Wno-unused-parameter"
.include "../../mk/readline.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/bcal/distinfo b/math/bcal/distinfo
index 68905af91dd..42d2473190d 100644
--- a/math/bcal/distinfo
+++ b/math/bcal/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2018/12/15 17:25:15 leot Exp $
+$NetBSD: distinfo,v 1.2 2020/01/09 12:21:37 sjmulder Exp $
-SHA1 (bcal-2.1.tar.gz) = 7d2740ee9abd18370449b4b3e46b8ecac77d7072
-RMD160 (bcal-2.1.tar.gz) = ad91e17d1dd2cf86c670929495eefc0b9cd3e468
-SHA512 (bcal-2.1.tar.gz) = 38965b0f27289e283ed9193c14cd962ec29ed401e8d60e7f012098cb62dacd357d8eac6a5e29f001c0ecf9541fdb55166b0ed2b2ac5c6bc98622244249cff03d
-Size (bcal-2.1.tar.gz) = 34175 bytes
-SHA1 (patch-Makefile) = 10df94f072e4d08e73458f690ec8df1cce356320
+SHA1 (bcal-2.2.tar.gz) = 83a07e924f70894e8cfa5bc5883aa1ba27a7323e
+RMD160 (bcal-2.2.tar.gz) = b2eb4c9effe6b73ad986c961e14409559c060f7a
+SHA512 (bcal-2.2.tar.gz) = ee9911f9770ed8124a652253f10c8bd5adac6f89086b01e58eef19b5cc4e4f166b45efc1b3104a9de746763fd37a99ef6753b0e7a20047a0f34fb730b1e0e901
+Size (bcal-2.2.tar.gz) = 34437 bytes
diff --git a/math/bcal/patches/patch-Makefile b/math/bcal/patches/patch-Makefile
deleted file mode 100644
index fc47a45a29a..00000000000
--- a/math/bcal/patches/patch-Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD: patch-Makefile,v 1.1 2018/12/15 17:25:15 leot Exp $
-
- - Respect LDFLAGS
- - Respect existing LDLIBS
- - Remove default -O3
-
---- Makefile
-+++ Makefile
-@@ -4,20 +4,19 @@ MANDIR = $(DESTDIR)$(PREFIX)/share/man/man1
- DOCDIR = $(DESTDIR)$(PREFIX)/share/doc/bcal
- STRIP ?= strip
-
--CFLAGS ?= -O3
- CFLAGS += -Wall -Wextra -Wno-unused-parameter -Werror
--LDLIBS = -lreadline
-+LDLIBS += -lreadline
-
- SRC = $(wildcard src/*.c)
- INCLUDE = -Iinc
-
- bcal: $(SRC)
-- $(CC) $(CFLAGS) $(INCLUDE) -o bcal $(SRC) $(LDLIBS)
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o bcal $(SRC) $(LDLIBS)
-
- all: bcal
-
- x86: $(SRC)
-- $(CC) -m64 $(CFLAGS) $(INCLUDE) -o bcal $(SRC) $(LDLIBS)
-+ $(CC) -m64 $(CFLAGS) $(LDFLAGS) $(INCLUDE) -o bcal $(SRC) $(LDLIBS)
- strip bcal
-
- distclean: clean