From owner-svn-ports-head@freebsd.org Mon Nov 11 14:33:59 2019 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EACEE1B69F5; Mon, 11 Nov 2019 14:33:59 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47BYKM5xQzz4DpK; Mon, 11 Nov 2019 14:33:59 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AF25D18C5B; Mon, 11 Nov 2019 14:33:59 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xABEXxHv092374; Mon, 11 Nov 2019 14:33:59 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xABEXxp5092371; Mon, 11 Nov 2019 14:33:59 GMT (envelope-from se@FreeBSD.org) Message-Id: <201911111433.xABEXxp5092371@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Mon, 11 Nov 2019 14:33:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r517263 - in head/math/gh-bc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/math/gh-bc: . files X-SVN-Commit-Revision: 517263 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Nov 2019 14:34:00 -0000 Author: se Date: Mon Nov 11 14:33:58 2019 New Revision: 517263 URL: https://svnweb.freebsd.org/changeset/ports/517263 Log: Update to version 2.3.0 Approved by: antoine (implicit) Modified: head/math/gh-bc/Makefile head/math/gh-bc/distinfo head/math/gh-bc/files/patch-locale__install.sh Modified: head/math/gh-bc/Makefile ============================================================================== --- head/math/gh-bc/Makefile Mon Nov 11 13:52:07 2019 (r517262) +++ head/math/gh-bc/Makefile Mon Nov 11 14:33:58 2019 (r517263) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= bc -PORTVERSION= 2.1.0 +PORTVERSION= 2.3.0 CATEGORIES= math PKGNAMEPREFIX= gh- @@ -11,16 +11,25 @@ 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 @@ -34,4 +43,4 @@ do-install: do-test: ${MAKE} -C ${WRKSRC} test -.include +.include Modified: head/math/gh-bc/distinfo ============================================================================== --- head/math/gh-bc/distinfo Mon Nov 11 13:52:07 2019 (r517262) +++ head/math/gh-bc/distinfo Mon Nov 11 14:33:58 2019 (r517263) @@ -1,3 +1,3 @@ -TIMESTAMP = 1562335308 -SHA256 (gavinhoward-bc-2.1.0_GH0.tar.gz) = bc39c11cd91d2df079f9d7a7bae90f681cfe055b7ad58010c11020625bf1d8a9 -SIZE (gavinhoward-bc-2.1.0_GH0.tar.gz) = 237162 +TIMESTAMP = 1573478768 +SHA256 (gavinhoward-bc-2.3.0_GH0.tar.gz) = c3d6d86e8ffc3c6b657d0ca1a02c4499d760aa869ba9ff813c83f731493ee8e8 +SIZE (gavinhoward-bc-2.3.0_GH0.tar.gz) = 241071 Modified: head/math/gh-bc/files/patch-locale__install.sh ============================================================================== --- head/math/gh-bc/files/patch-locale__install.sh Mon Nov 11 13:52:07 2019 (r517262) +++ head/math/gh-bc/files/patch-locale__install.sh Mon Nov 11 14:33:58 2019 (r517263) @@ -1,6 +1,6 @@ ---- locale_install.sh.orig 2019-05-29 01:32:06 UTC +--- locale_install.sh.orig 2019-11-09 19:04:17 UTC +++ locale_install.sh -@@ -114,6 +114,7 @@ for file in $locales_dir/*.msg; do +@@ -193,6 +193,7 @@ for file in $locales_dir/*.msg; do continue fi @@ -8,11 +8,18 @@ gencatfile "$loc" "$file" done -@@ -143,7 +144,8 @@ for file in $locales_dir/*.msg; do +@@ -217,14 +218,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 -s "$linksrc" "$loc" +- ln -fs "$rel" "$loc" + echo ln "$linksrc" "$loc" + ln "$linksrc" "$loc" fi