From owner-svn-ports-head@freebsd.org Sun Dec 1 09:04:43 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 D63451C48A7; Sun, 1 Dec 2019 09:04:43 +0000 (UTC) (envelope-from jbeich@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 47Qj4C59Ztz4cRS; Sun, 1 Dec 2019 09:04:43 +0000 (UTC) (envelope-from jbeich@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 90965C7E6; Sun, 1 Dec 2019 09:04:43 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xB194hQo009429; Sun, 1 Dec 2019 09:04:43 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB194hsG009428; Sun, 1 Dec 2019 09:04:43 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912010904.xB194hsG009428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 1 Dec 2019 09:04:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518762 - head/x11/squeekboard X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/x11/squeekboard X-SVN-Commit-Revision: 518762 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: Sun, 01 Dec 2019 09:04:43 -0000 Author: jbeich Date: Sun Dec 1 09:04:43 2019 New Revision: 518762 URL: https://svnweb.freebsd.org/changeset/ports/518762 Log: x11/squeekboard: drop CARGO_ENV hack All cargo variables are prefixed, and USES=meson already passes environ(7) to ninja. No need to exclude variables anymore as cargo.sh adjusts cargo variables for meson to find build artifacts. Idea from: games/jaggedalliance2 Modified: head/x11/squeekboard/Makefile (contents, props changed) Modified: head/x11/squeekboard/Makefile ============================================================================== --- head/x11/squeekboard/Makefile Sun Dec 1 08:44:57 2019 (r518761) +++ head/x11/squeekboard/Makefile Sun Dec 1 09:04:43 2019 (r518762) @@ -25,7 +25,7 @@ USE_GNOME= cairo gdkpixbuf2 gtk30 GL_SITE= https://source.puri.sm GL_ACCOUNT= Librem5 GL_COMMIT= 579ba8ab87f395c550eede40922b498feb245300 -MAKE_ENV= CARGO_ENV='${CARGO_ENV:N*TARGET_DIR*}' +MAKE_ENV= ${CARGO_ENV} PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-real \ share/applications/sm.puri.Squeekboard.desktop @@ -83,7 +83,7 @@ post-patch: # Add --verbose after each cargo subcommand # Don't use BSD realpath(1) against non-existing files @${REINPLACE_CMD} -e '/^cargo/ { \ - s,^,cmd=$$1; shift; eval export $$CARGO_ENV; ,; \ + s,^,cmd=$$1; shift; ,; \ s,"$$@","$$cmd" --verbose &,; }' \ -e '/OUT_PATH=/s,=.*,=$$PWD/$$1,' \ ${WRKSRC}/cargo*.sh