summaryrefslogtreecommitdiffstats
path: root/science
diff options
context:
space:
mode:
authorIsmael Luceno2021-04-23 19:24:22 +0200
committerIsmael Luceno2021-04-23 19:42:49 +0200
commite421c9df735f15b5cb44161c57a011c7c9d648e1 (patch)
treea24a3242a19e04b6530d073784deae8d408ac5d1 /science
parentcf079a63ceaf70fb7cc164aec4fa7ba29f55b476 (diff)
calc: Fix handling of flags and dependencies
Diffstat (limited to 'science')
-rwxr-xr-xscience/calc/BUILD6
-rwxr-xr-xscience/calc/DEPENDS11
-rw-r--r--science/calc/HISTORY2
-rwxr-xr-xscience/calc/PRE_BUILD10
4 files changed, 15 insertions, 14 deletions
diff --git a/science/calc/BUILD b/science/calc/BUILD
index bf16c64d19..ede25e812b 100755
--- a/science/calc/BUILD
+++ b/science/calc/BUILD
@@ -1,2 +1,4 @@
-export PAGER=""
-make -j1
+make -j1 $OPTS \
+ DEBUG= \
+ EXTRA_CFLAGS="$CFLAGS" \
+ EXTRA_LDFLAGS="$LDFLAGS"
diff --git a/science/calc/DEPENDS b/science/calc/DEPENDS
index a4e768dd8e..c2bd9d2f5e 100755
--- a/science/calc/DEPENDS
+++ b/science/calc/DEPENDS
@@ -1,2 +1,9 @@
-optional_depends "readline" "--enable-readline" "--disable-readline" "for readline support" &&
-optional_depends "less" "--enable-less" "--disable-less" "for enabline less as the default pager (more otherwise)"
+optional_depends readline \
+ 'USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS=-lhistory READLINE_EXTRAS+=-lncurses' \
+ '' \
+ 'for line editing support' &&
+
+optional_depends less \
+ 'CALCPAGER=less' \
+ 'CALCPAGER=more' \
+ 'use "less" instead of "more" as the default pager'
diff --git a/science/calc/HISTORY b/science/calc/HISTORY
index 7a78d6900e..dfe491f5c1 100644
--- a/science/calc/HISTORY
+++ b/science/calc/HISTORY
@@ -1,5 +1,7 @@
2021-04-22 Ismael Luceno <ismael@sourcemage.org>
* DETAILS: updated spell to 2.13.0.1
+ * DEPENDS, BUILD: fixed handling of flags and dependencies
+ * PRE_BUILD: removed, no longer needed
2015-05-25 Thomas Orgis <sobukus@sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)
diff --git a/science/calc/PRE_BUILD b/science/calc/PRE_BUILD
deleted file mode 100755
index 9d044a6b5b..0000000000
--- a/science/calc/PRE_BUILD
+++ /dev/null
@@ -1,10 +0,0 @@
-default_pre_build &&
-sedit 's:^DEBUG:#&:' $SOURCE_DIRECTORY/Makefile &&
-sedit "s:EXTRA_CFLAGS=:&${CFLAGS}:" $SOURCE_DIRECTORY/Makefile &&
-sedit "s:EXTRA_LDFLAGS=:&${LDFLAGS}:" $SOURCE_DIRECTORY/Makefile &&
-
-if is_depends_enabled $SPELL readline; then
- sedit 's:^USE_READLINE=:&-DUSE_READLINE:' $SOURCE_DIRECTORY/Makefile &&
- sedit 's:^READLINE_LIB=:&-lreadline:' $SOURCE_DIRECTORY/Makefile &&
- sedit 's:^READLINE_EXTRAS=:&-lhistory -lncurses:' $SOURCE_DIRECTORY/Makefile
-fi