diff --git a/math/gh-bc/Makefile b/math/gh-bc/Makefile index 06d05ca64cc3..b4b832082c10 100644 --- a/math/gh-bc/Makefile +++ b/math/gh-bc/Makefile @@ -1,51 +1,51 @@ PORTNAME= bc -PORTVERSION= 6.2.2 +PORTVERSION= 6.2.4 CATEGORIES= math lang MASTER_SITES= https://github.com/gavinhoward/bc/releases/download/${PORTVERSION}/ PKGNAMEPREFIX= gh- MAINTAINER= se@FreeBSD.org COMMENT= GNU compatible bc/dc calculator -WWW= https://git.yzena.com/gavin/bc +WWW= https://git.gavinhoward.com/gavin/bc LICENSE= BSD2CLAUSE MIT LICENSE_COMB= multi LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= compiler:c11 tar:xz HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh CONFIGURE_ARGS+= --predefined-build-type=BSD --disable-problematic-tests TEST_TARGET= test CONFLICTS_INSTALL= gnubc OPTIONS_DEFAULT= LIBEDIT OPTIONS_RADIO= HISTORY OPTIONS_RADIO_HISTORY= LIBEDIT READLINE INTERNAL INTERNAL_DESC= Command line editing via private functions INTERNAL_CONFIGURE_ON= --enable-internal-history LIBEDIT_USES= libedit LIBEDIT_CONFIGURE_ON= --enable-editline READLINE_USES= readline READLINE_CONFIGURE_ON= --enable-readline pre-build: ${INSTALL_SCRIPT} ${WRKSRC}/gen/strgen.sh ${WRKSRC}/gen/strgen 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}/share/man/man1 ${INSTALL_MAN} ${WRKSRC}/manuals/dc.1 ${STAGEDIR}${MANPREFIX}/share/man/man1 ${MKDIR} ${STAGEDIR}${PREFIX}/share/nls/C ${WRKSRC}/scripts/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/ ${RMDIR} ${STAGEDIR}${PREFIX}/share/nls/en_US .include diff --git a/math/gh-bc/distinfo b/math/gh-bc/distinfo index cd420e9e8c32..8c5951273fc7 100644 --- a/math/gh-bc/distinfo +++ b/math/gh-bc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1674331624 -SHA256 (bc-6.2.2.tar.xz) = 5b6fe23b720ab898c9c9c9cbdc83e124791b0b575005ec91a63175d3b69b90f2 -SIZE (bc-6.2.2.tar.xz) = 456672 +TIMESTAMP = 1675634839 +SHA256 (bc-6.2.4.tar.xz) = 2b9f712e1e02473ca0e01979dd026e818dafc169a3cf63887d91bdaafeb812b5 +SIZE (bc-6.2.4.tar.xz) = 457272 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..f74536abb160 --- /dev/null +++ b/math/gh-bc/files/patch-gen_strgen.sh @@ -0,0 +1,10 @@ +--- gen/strgen.sh.orig 2023-02-02 08:17:32 UTC ++++ gen/strgen.sh +@@ -62,7 +62,6 @@ remove_tabs="$7" + label="$5" + define="$6" + remove_tabs="$7" +-check_bool_arg "$remove_tabs" + + tmpinput=$(mktemp -t "${input##*/}_XXXXXX") + diff --git a/math/gh-bc/files/patch-scripts_locale__install.sh b/math/gh-bc/files/patch-scripts_locale__install.sh index 4d452bd0b101..b3587849ec51 100644 --- a/math/gh-bc/files/patch-scripts_locale__install.sh +++ b/math/gh-bc/files/patch-scripts_locale__install.sh @@ -1,29 +1,29 @@ ---- scripts/locale_install.sh.orig 2021-06-28 18:10:45 UTC +--- scripts/locale_install.sh.orig 2023-02-02 08:17:33 UTC +++ scripts/locale_install.sh -@@ -243,6 +243,7 @@ for file in $locales_dir/*.msg; do +@@ -246,6 +246,7 @@ for file in $locales_dir/*.msg; do # Generate the proper location for the cat file. loc=$(gen_nlspath "$destdir/$nlspath" "$locale" "$main_exec") + echo gencatfile "$loc" "$file" gencatfile "$loc" "$file" - done -@@ -282,8 +283,6 @@ for file in $locales_dir/*.msg; do + printf 'done\n' +@@ -289,8 +290,6 @@ for file in $locales_dir/*.msg; do linkdir=$(dirname "$file") locale=$(basename "$link" .msg) linksrc=$(gen_nlspath "$nlspath" "$locale" "$main_exec") - relloc="${loc##$destdir/}" - rel=$(relpath "$linksrc" "$relloc") # If the target file doesn't exist (because it's for a locale that is # not installed), generate it anyway. It's easier this way. -@@ -293,7 +292,8 @@ for file in $locales_dir/*.msg; do +@@ -300,7 +299,8 @@ for file in $locales_dir/*.msg; do # Finally, symlink to the install of the generated cat file that # corresponds to the correct msg file. - ln -fs "$rel" "$loc" + echo ln "$linksrc" "$loc" + ln "$linksrc" "$loc" - fi - done + printf 'done\n' + fi