From owner-dev-commits-ports-all@freebsd.org Mon Jul 26 09:56:21 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 E37866699CD; Mon, 26 Jul 2021 09:56:21 +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 4GYFgT61K3z4nNl; Mon, 26 Jul 2021 09:56:21 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B519515110; Mon, 26 Jul 2021 09:56:21 +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 16Q9uLTc096008; Mon, 26 Jul 2021 09:56:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16Q9uL95096007; Mon, 26 Jul 2021 09:56:21 GMT (envelope-from git) Date: Mon, 26 Jul 2021 09:56:21 GMT Message-Id: <202107260956.16Q9uL95096007@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: ad15b0e748b6 - main - emulators/wine: Fix up pkg32.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ad15b0e748b6bd93ef1e36b1c605c1da29d10565 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Jul 2021 09:56:22 -0000 The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=ad15b0e748b6bd93ef1e36b1c605c1da29d10565 commit ad15b0e748b6bd93ef1e36b1c605c1da29d10565 Author: Gerald Pfeifer AuthorDate: 2021-07-26 09:53:22 +0000 Commit: Gerald Pfeifer CommitDate: 2021-07-26 09:56:08 +0000 emulators/wine: Fix up pkg32.sh In my original commit I missed the last line actually invoking pkg. Fix this up and add a comment above. PR: 257284 Reported by: Alex S --- emulators/wine/Makefile | 1 + emulators/wine/pkg32.sh | 2 ++ 2 files changed, 3 insertions(+) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index 7af4e43d8a44..6386fa7b18b8 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -2,6 +2,7 @@ PORTNAME= wine DISTVERSION= 6.0.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine/pkg32.sh b/emulators/wine/pkg32.sh index a26ee5b5d7f6..267fb8b38ca4 100644 --- a/emulators/wine/pkg32.sh +++ b/emulators/wine/pkg32.sh @@ -10,4 +10,6 @@ I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}" mkdir -p "$I386_ROOT" ABI=$(pkg config ABI | sed s/amd64/i386/) +# Show what we're going to do, then do it. echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@" +exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"