From owner-svn-ports-all@freebsd.org Sun Dec 1 08:19:02 2019 Return-Path: Delivered-To: svn-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 B79811C36A9; Sun, 1 Dec 2019 08:19:02 +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 47Qh3V49hrz4ZW6; Sun, 1 Dec 2019 08:19:02 +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 73BDCBF0A; Sun, 1 Dec 2019 08:19:02 +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 xB18J2SI080142; Sun, 1 Dec 2019 08:19:02 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xB18J2hJ080141; Sun, 1 Dec 2019 08:19:02 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912010819.xB18J2hJ080141@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 08:19:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518756 - head/x11/squeekboard X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/x11/squeekboard X-SVN-Commit-Revision: 518756 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2019 08:19:02 -0000 Author: jbeich Date: Sun Dec 1 08:19:02 2019 New Revision: 518756 URL: https://svnweb.freebsd.org/changeset/ports/518756 Log: x11/squeekboard: unbreak if LDFLAGS contain comma $ LDFLAGS=-Wl,--as-needed make [...] sed: 1: "/^cargo/ { s,^,cmd=$1; ...": bad flag in substitute command: '-' Modified: head/x11/squeekboard/Makefile (contents, props changed) Modified: head/x11/squeekboard/Makefile ============================================================================== --- head/x11/squeekboard/Makefile Sun Dec 1 08:18:55 2019 (r518755) +++ head/x11/squeekboard/Makefile Sun Dec 1 08:19:02 2019 (r518756) @@ -25,6 +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*}' PLIST_FILES= bin/${PORTNAME} \ bin/${PORTNAME}-real \ share/applications/sm.puri.Squeekboard.desktop @@ -79,7 +80,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;${CARGO_ENV:N*TARGET_DIR*} ,; \ + s,^,cmd=$$1; shift; eval export $${CARGO_ENV}; ,; \ s,"$$@","$$cmd" --verbose &,; }' \ -e '/OUT_PATH=/s,=.*,=$$PWD/$$1,' \ ${WRKSRC}/cargo*.sh