summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/gh-bc/Makefile6
-rw-r--r--math/gh-bc/distinfo6
-rw-r--r--math/gh-bc/files/patch-gen_strgen.sh28
-rw-r--r--math/gh-bc/files/patch-locale__install.sh10
-rw-r--r--math/gh-bc/pkg-plist4
5 files changed, 41 insertions, 13 deletions
diff --git a/math/gh-bc/Makefile b/math/gh-bc/Makefile
index 8e69e9c6d78d..29b97fbe3b4b 100644
--- a/math/gh-bc/Makefile
+++ b/math/gh-bc/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
PORTNAME= bc
-PORTVERSION= 3.1.6
+PORTVERSION= 3.2.0
CATEGORIES= math lang
PKGNAMEPREFIX= gh-
@@ -33,8 +33,8 @@ pre-build:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bin/bc ${STAGEDIR}${PREFIX}/bin/
${LN} ${STAGEDIR}${PREFIX}/bin/bc ${STAGEDIR}${PREFIX}/bin/dc
- ${INSTALL_MAN} ${WRKSRC}/manuals/bc.1 ${STAGEDIR}${MANPREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/manuals/dc.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/manuals/bc.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/manuals/dc.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/C
${WRKSRC}/locale_install.sh ${STAGEDIR}${PREFIX}/share/nls/%L/%N.cat ${PORTNAME}
${MV} ${STAGEDIR}${PREFIX}/share/nls/en_US/bc.cat ${STAGEDIR}${PREFIX}/share/nls/C/
diff --git a/math/gh-bc/distinfo b/math/gh-bc/distinfo
index ea98273e1425..346ea3f80f66 100644
--- a/math/gh-bc/distinfo
+++ b/math/gh-bc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1601566362
-SHA256 (gavinhoward-bc-3.1.6_GH0.tar.gz) = c4f37510a9a5f08704d640c9b9e1ffb8bea6abe0f3e2adf2e536a1d88da28694
-SIZE (gavinhoward-bc-3.1.6_GH0.tar.gz) = 1056762
+TIMESTAMP = 1606407249
+SHA256 (gavinhoward-bc-3.2.0_GH0.tar.gz) = f5e5f3ec9dc8a7ca323ff8fceadd00228a8111dd694b3f3230a38014cf25be4c
+SIZE (gavinhoward-bc-3.2.0_GH0.tar.gz) = 1081293
diff --git a/math/gh-bc/files/patch-gen_strgen.sh b/math/gh-bc/files/patch-gen_strgen.sh
new file mode 100644
index 000000000000..0f7b6fb83e42
--- /dev/null
+++ b/math/gh-bc/files/patch-gen_strgen.sh
@@ -0,0 +1,28 @@
+--- gen/strgen.sh.orig 2020-11-26 16:00:16 UTC
++++ gen/strgen.sh
+@@ -32,18 +32,19 @@ export LC_CTYPE=C
+
+ progname=${0##*/}
+
+-if [ $# -lt 4 ]; then
+- echo "usage: $progname input output name header [label [define [remove_tabs]]]"
++if [ $# -lt 3 ]; then
++ echo "usage: $progname input output name [label [define [remove_tabs]]]"
+ exit 1
+ fi
+
++# gen/strgen gen/lib2.bc gen/lib2.c bc_lib2 bc_lib2_name "BC_ENABLED && BC_ENABLE_EXTRA_MATH" 1
++
+ input="$1"
+ output="$2"
+ name="$3"
+-header="$4"
+-label="$5"
+-define="$6"
+-remove_tabs="$7"
++label="$4"
++define="$5"
++remove_tabs="$6"
+
+ exec < "$input"
+ exec > "$output"
diff --git a/math/gh-bc/files/patch-locale__install.sh b/math/gh-bc/files/patch-locale__install.sh
index 1c55c5f99c37..ce93b44a77bc 100644
--- a/math/gh-bc/files/patch-locale__install.sh
+++ b/math/gh-bc/files/patch-locale__install.sh
@@ -1,14 +1,14 @@
---- locale_install.sh.orig 2019-11-09 19:04:17 UTC
+--- locale_install.sh.orig 2020-11-26 16:00:16 UTC
+++ locale_install.sh
-@@ -193,6 +193,7 @@ for file in $locales_dir/*.msg; do
- continue
- fi
+@@ -211,6 +211,7 @@ for file in $locales_dir/*.msg; do
+
+ loc=$(gen_nlspath "$destdir/$nlspath" "$locale" "$main_exec")
+ echo gencatfile "$loc" "$file"
gencatfile "$loc" "$file"
done
-@@ -217,14 +218,13 @@ for file in $locales_dir/*.msg; do
+@@ -239,14 +240,13 @@ for file in $locales_dir/*.msg; do
linkdir=$(dirname "$file")
locale=$(basename "$link" .msg)
linksrc=$(gen_nlspath "$nlspath" "$locale" "$main_exec")
diff --git a/math/gh-bc/pkg-plist b/math/gh-bc/pkg-plist
index adc7377f7a05..ff070334394a 100644
--- a/math/gh-bc/pkg-plist
+++ b/math/gh-bc/pkg-plist
@@ -1,7 +1,7 @@
bin/bc
bin/dc
-man/man1/bc.1.gz
-man/man1/dc.1.gz
+share/man/man1/bc.1.gz
+share/man/man1/dc.1.gz
share/nls/C/bc.cat
share/nls/de_AT.ISO8859-1/bc.cat
share/nls/de_AT.ISO8859-15/bc.cat