Index: head/math/gh-bc/Makefile =================================================================== --- head/math/gh-bc/Makefile (revision 556343) +++ head/math/gh-bc/Makefile (revision 556344) @@ -1,46 +1,46 @@ # $FreeBSD$ PORTNAME= bc -PORTVERSION= 3.1.6 +PORTVERSION= 3.2.0 CATEGORIES= math lang PKGNAMEPREFIX= gh- MAINTAINER= se@FreeBSD.org COMMENT= GNU compatible bc/dc calculator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.md USES= compiler USE_GITHUB= yes GH_ACCOUNT= gavinhoward HAS_CONFIGURE= yes CONFIGURE_SCRIPT= configure.sh CONFIGURE_ARGS= -G .include .if ${CHOSEN_COMPILER_TYPE} == gcc && ${COMPILER_VERSION} <= 42 CFLAGS+= --std=c99 .endif CONFLICTS_INSTALL= gnubc-[0-9]* 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}/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/ ${RMDIR} ${STAGEDIR}${PREFIX}/share/nls/en_US do-test: ${MAKE} -C ${WRKSRC} test .include Index: head/math/gh-bc/distinfo =================================================================== --- head/math/gh-bc/distinfo (revision 556343) +++ head/math/gh-bc/distinfo (revision 556344) @@ -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 Index: head/math/gh-bc/files/patch-gen_strgen.sh =================================================================== --- head/math/gh-bc/files/patch-gen_strgen.sh (nonexistent) +++ head/math/gh-bc/files/patch-gen_strgen.sh (revision 556344) @@ -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" Property changes on: head/math/gh-bc/files/patch-gen_strgen.sh ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/gh-bc/files/patch-locale__install.sh =================================================================== --- head/math/gh-bc/files/patch-locale__install.sh (revision 556343) +++ head/math/gh-bc/files/patch-locale__install.sh (revision 556344) @@ -1,27 +1,27 @@ ---- 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") - relloc="${loc##$destdir/}" - rel=$(relpath "$linksrc" "$relloc") if [ ! -f "$destdir/$linksrc" ]; then gencatfile "$destdir/$linksrc" "$linkdir/$link" fi - ln -fs "$rel" "$loc" + echo ln "$linksrc" "$loc" + ln "$linksrc" "$loc" fi done Index: head/math/gh-bc/pkg-plist =================================================================== --- head/math/gh-bc/pkg-plist (revision 556343) +++ head/math/gh-bc/pkg-plist (revision 556344) @@ -1,76 +1,76 @@ 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 share/nls/de_AT.UTF-8/bc.cat share/nls/de_CH.ISO8859-1/bc.cat share/nls/de_CH.ISO8859-15/bc.cat share/nls/de_CH.UTF-8/bc.cat share/nls/de_DE.ISO8859-1/bc.cat share/nls/de_DE.ISO8859-15/bc.cat share/nls/de_DE.UTF-8/bc.cat share/nls/en_AU.ISO8859-1/bc.cat share/nls/en_AU.ISO8859-15/bc.cat share/nls/en_AU.US-ASCII/bc.cat share/nls/en_AU.UTF-8/bc.cat share/nls/en_CA.ISO8859-1/bc.cat share/nls/en_CA.ISO8859-15/bc.cat share/nls/en_CA.US-ASCII/bc.cat share/nls/en_CA.UTF-8/bc.cat share/nls/en_GB.ISO8859-1/bc.cat share/nls/en_GB.ISO8859-15/bc.cat share/nls/en_GB.US-ASCII/bc.cat share/nls/en_GB.UTF-8/bc.cat share/nls/en_IE.ISO8859-1/bc.cat share/nls/en_IE.ISO8859-15/bc.cat share/nls/en_IE.UTF-8/bc.cat share/nls/en_NZ.ISO8859-1/bc.cat share/nls/en_NZ.ISO8859-15/bc.cat share/nls/en_NZ.US-ASCII/bc.cat share/nls/en_NZ.UTF-8/bc.cat share/nls/en_US.ISO8859-1/bc.cat share/nls/en_US.ISO8859-15/bc.cat share/nls/en_US.US-ASCII/bc.cat share/nls/en_US.UTF-8/bc.cat share/nls/es_ES.ISO8859-1/bc.cat share/nls/es_ES.ISO8859-15/bc.cat share/nls/es_ES.UTF-8/bc.cat share/nls/fr_BE.ISO8859-1/bc.cat share/nls/fr_BE.ISO8859-15/bc.cat share/nls/fr_BE.UTF-8/bc.cat share/nls/fr_CA.ISO8859-1/bc.cat share/nls/fr_CA.ISO8859-15/bc.cat share/nls/fr_CA.UTF-8/bc.cat share/nls/fr_CH.ISO8859-1/bc.cat share/nls/fr_CH.ISO8859-15/bc.cat share/nls/fr_CH.UTF-8/bc.cat share/nls/fr_FR.ISO8859-1/bc.cat share/nls/fr_FR.ISO8859-15/bc.cat share/nls/fr_FR.UTF-8/bc.cat share/nls/ja_JP.UTF-8/bc.cat share/nls/ja_JP.eucJP/bc.cat share/nls/nl_BE.ISO8859-1/bc.cat share/nls/nl_BE.ISO8859-15/bc.cat share/nls/nl_NL.ISO8859-1/bc.cat share/nls/nl_NL.ISO8859-15/bc.cat share/nls/nl_NL.UTF-8/bc.cat share/nls/pl_PL.ISO8859-2/bc.cat share/nls/pl_PL.UTF-8/bc.cat share/nls/pt_BR.ISO8859-1/bc.cat share/nls/pt_BR.UTF-8/bc.cat share/nls/pt_PT.ISO8859-1/bc.cat share/nls/pt_PT.ISO8859-15/bc.cat share/nls/pt_PT.UTF-8/bc.cat share/nls/ru_RU.CP1251/bc.cat share/nls/ru_RU.CP866/bc.cat share/nls/ru_RU.ISO8859-5/bc.cat share/nls/ru_RU.KOI8-R/bc.cat share/nls/ru_RU.UTF-8/bc.cat share/nls/zh_CN.GB18030/bc.cat share/nls/zh_CN.GB2312/bc.cat share/nls/zh_CN.GBK/bc.cat share/nls/zh_CN.UTF-8/bc.cat share/nls/zh_CN.eucCN/bc.cat