From nobody Thu Jun 30 19:13:28 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 40B908A11A9; Thu, 30 Jun 2022 19:13:29 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYnzs1G7Hz4hxP; Thu, 30 Jun 2022 19:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656616409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xNyAKxshY6AMcGnJOxeZeoUkLppZJlasxdB3ei+GQ1A=; b=n2SMdJvDEta/n43YBiIF3Or/kGcnnUpfkUIWrs9WqJ/DPyDlereZbZspklTM/hLHNaRl/d dpaiowmRo2W6mE/IUWuuuIsVFC+HoATbtkJwRoDlAyBNptm/HepcPCVslF9D0w36z7jngD NCIkzScsAT+EltkGrB0NnSgNO+cTkT8r89IVBuRQI/QotiUeNuW+5QA0Uap1L1+LpCuath GNcjoT+inwdg8x4Lar2RIihUssAFkBF+WmKZMy2qrAH0dJHyAwMdIMlWqASPdsuXZ6LRKp kB7gOpx6EedvNWKJ+Uarl3Ca/D9t1wQ/8yO7ZTTzET48syY45uiI5eOLvLB0Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0B7764655; Thu, 30 Jun 2022 19:13:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25UJDSWH058437; Thu, 30 Jun 2022 19:13:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25UJDS5Q058436; Thu, 30 Jun 2022 19:13:28 GMT (envelope-from git) Date: Thu, 30 Jun 2022 19:13:28 GMT Message-Id: <202206301913.25UJDS5Q058436@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: f500b9d07c81 - main - Uses/cabal.mk: Replace all occurencies of '-' instead of only one. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f500b9d07c812cef4a2e84a9f3ee9ed26806bfe8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656616409; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xNyAKxshY6AMcGnJOxeZeoUkLppZJlasxdB3ei+GQ1A=; b=OVoESCoe3j4FE6UfCxQ3RNnNhB9d9K++HmdvfSf84Ts+2TKD6VckzvbnRh3ZWXQaIEjk5K wyDOUuYfTkT3J/08JlJjLyIpRKQXa++Fx4wPscm3nVYC6623VXOq37a+M27mLuN4iL7im/ jIUltqK+S3YFIj70OwLTQA9AjUmivgXTdegIFptXT5XRuGgQYYRO+5LqSbSydII1SalThZ MyVYzdpGEgRiZ+B8f8E9peO0eCPoCdaBHCjPhicWBVZK4vQhAmHexHXGKZbe4mci85w6vs /dBC1usi2jPmW2L8neE8LkajtYix6U1dSRDlAyShto6T+vr3O5YT3NoU2N+j8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656616409; a=rsa-sha256; cv=none; b=rruy7OV+YsO8qgymQAR0+oby6CGArfnKZWcx4/txH1DG4QMNR0EOWMfOSerlmQZH1zfRWi m8p2ht78SFua1uzSKyZ4beO5iOE9uiHeJfFI/OiJ471hQQMN+IGvZeHeKLF0Uwj92C9whV Vf0I5cDnAlzuL/DfG5l9tTVof7K+jwLpaiKdGEXbuVmBEIypNfrZtOmWYEoHmHj6yFm45E 3Fb/Y7ZH2WwrA/pe9xdt2q878hvJiNp2IWRr3e7t5vFi6Dax85kl2/5kTM0TiyI9ZCp0eg v1Lh20TLcz9xm4jiwiBKcF5LnlmJ2/RxsPuYMj2c9svZGCy6w8tOUb9fz/JIug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f500b9d07c812cef4a2e84a9f3ee9ed26806bfe8 commit f500b9d07c812cef4a2e84a9f3ee9ed26806bfe8 Author: Gleb Popov AuthorDate: 2022-06-30 15:50:45 +0000 Commit: Gleb Popov CommitDate: 2022-06-30 19:13:20 +0000 Uses/cabal.mk: Replace all occurencies of '-' instead of only one. Executables named "foo-bar-baz" are now correctly handled. --- Mk/Uses/cabal.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/cabal.mk b/Mk/Uses/cabal.mk index 6c6872eb0024..b01e53d309ef 100644 --- a/Mk/Uses/cabal.mk +++ b/Mk/Uses/cabal.mk @@ -246,9 +246,9 @@ do-install: ${STAGEDIR}${PREFIX}/${CABAL_LIBEXEC}/${exe} ${ECHO_CMD} '#!/bin/sh' > ${STAGEDIR}${PREFIX}/bin/${exe} ${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe} - ${ECHO_CMD} 'export ${exe:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} + ${ECHO_CMD} 'export ${exe:S/-/_/g}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} . for dep in ${${exe}_DATADIR_VARS} - ${ECHO_CMD} 'export ${dep:S/-/_/}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} + ${ECHO_CMD} 'export ${dep:S/-/_/g}_datadir=${DATADIR}' >> ${STAGEDIR}${PREFIX}/bin/${exe} . endfor ${ECHO_CMD} '' >> ${STAGEDIR}${PREFIX}/bin/${exe} ${ECHO_CMD} 'exec ${PREFIX}/${CABAL_LIBEXEC}/${exe} "$$@"' >> ${STAGEDIR}${PREFIX}/bin/${exe}