From owner-svn-ports-all@freebsd.org Wed Jan 22 13:38:51 2020 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 D2A831F0BCF; Wed, 22 Jan 2020 13:38:51 +0000 (UTC) (envelope-from tijl@freebsd.org) Received: from mailrelay110.isp.belgacom.be (mailrelay110.isp.belgacom.be [195.238.20.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "relay.skynet.be", Issuer "GlobalSign RSA OV SSL CA 2018" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482mhW19bZz43QY; Wed, 22 Jan 2020 13:38:51 +0000 (UTC) (envelope-from tijl@freebsd.org) IronPort-SDR: 2QTOKyORbeGJ5qGqBOMkXp3secVzyV7RU61kBKoxq4Cwp1I7rWquo0oRyAInwL4QozLKu7DnqY q8VE1JcAukLvzt3kDEmmEdKS6F+Itn4f68xc6+FTzNHjiNBtESDzY4m2aI2NAG9TrInnBEk16C Rki19XPVoBA11+EGFbIJtgYoP1Gw/YfXxUcsM3nHCMLx7EJ1lFcxiEgXjh5tnoFYfI8yMUeSwR nnlsLXBXIFnQ2l4wiZCnvGtbOpdybbn+1wce/dyadM0H5wwyAz8mFATnx8tpBGX2cTfkG63t6q WqQ= X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: =?us-ascii?q?A2CfAgDzTyhe/8Ub9FFlHQEBAQkBEQU?= =?us-ascii?q?FAYFoBwELAQGCJ1kTVSASFhSNFYYbAYIQiDuCII5hgXsJAQEBAQEBAQEBKww?= =?us-ascii?q?BAYRAAoIXJzUIDgIDAQELAQEFAQEBAQEFBG2Ea0wMQgEMAYUPAQU6HCMQCw4?= =?us-ascii?q?GBAklD0gGE4Mngn8LsAmENQELAYEIg21/BoE4AYwvggCDbzU+hEmFTCIElzK?= =?us-ascii?q?YIIJDhz+OaCead4REknyUIQE3gVhNMAiDJ1AYDYgNF4hkhUBAAzCEcIkBAQE?= X-IPAS-Result: =?us-ascii?q?A2CfAgDzTyhe/8Ub9FFlHQEBAQkBEQUFAYFoBwELAQGCJ?= =?us-ascii?q?1kTVSASFhSNFYYbAYIQiDuCII5hgXsJAQEBAQEBAQEBKwwBAYRAAoIXJzUID?= =?us-ascii?q?gIDAQELAQEFAQEBAQEFBG2Ea0wMQgEMAYUPAQU6HCMQCw4GBAklD0gGE4Mng?= =?us-ascii?q?n8LsAmENQELAYEIg21/BoE4AYwvggCDbzU+hEmFTCIElzKYIIJDhz+OaCead?= =?us-ascii?q?4REknyUIQE3gVhNMAiDJ1AYDYgNF4hkhUBAAzCEcIkBAQE?= Received: from 197.27-244-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.244.27.197]) by relay.skynet.be with ESMTP; 22 Jan 2020 14:38:49 +0100 Received: from localhost (localhost [127.0.0.1]) by kalimero.tijl.coosemans.org (8.15.2/8.15.2) with ESMTP id 00MDcmqG085464; Wed, 22 Jan 2020 14:38:48 +0100 (CET) (envelope-from tijl@FreeBSD.org) Date: Wed, 22 Jan 2020 14:38:47 +0100 From: =?UTF-8?B?VMSzbA==?= Coosemans To: Stefan Esser Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r523745 - in head/ports-mgmt/portmaster: . files Message-ID: <20200122143847.7db0f63e@FreeBSD.org> In-Reply-To: <202001212105.00LL5JSF095048@repo.freebsd.org> References: <202001212105.00LL5JSF095048@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 482mhW19bZz43QY X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.86 / 15.00]; local_wl_from(0.00)[freebsd.org]; NEURAL_HAM_MEDIUM(-0.96)[-0.958,0]; NEURAL_HAM_LONG(-0.91)[-0.907,0]; ASN(0.00)[asn:5432, ipnet:195.238.0.0/19, country:BE] 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: Wed, 22 Jan 2020 13:38:51 -0000 On Tue, 21 Jan 2020 21:05:19 +0000 (UTC) Stefan Esser wrote: > Author: se > Date: Tue Jan 21 21:05:19 2020 > New Revision: 523745 > URL: https://svnweb.freebsd.org/changeset/ports/523745 > > Log: > Attempt to fix a problem that leads to repeated building of some ports > > There are build dependencies, that were compiled again and again even > though the latest version was already installed. > > This fix is based on a patch suggested by Tatsuki Makino, with a small > change to better comply with the existing style used in this program. > > An extended patch has been provided by Walter Schwarzenfeld, but in my > tests it did not make a difference. If further testing shows a need for > the additional commands suggested by Walter, I'll add them (or a variation) > in a follow-up commit. > > PR: 241227, 242086, 243432 > Submitted by: Tatsuki Makino > Approved by: antoine (implicit) > > Modified: > head/ports-mgmt/portmaster/Makefile > head/ports-mgmt/portmaster/files/patch-portmaster > > Modified: head/ports-mgmt/portmaster/Makefile > ============================================================================== > --- head/ports-mgmt/portmaster/Makefile Tue Jan 21 20:57:45 2020 (r523744) > +++ head/ports-mgmt/portmaster/Makefile Tue Jan 21 21:05:19 2020 (r523745) > @@ -2,7 +2,7 @@ > > PORTNAME= portmaster > PORTVERSION= 3.19 > -PORTREVISION= 18 > +PORTREVISION= 19 > CATEGORIES= ports-mgmt > > MAINTAINER= se@FreeBSD.org > > Modified: head/ports-mgmt/portmaster/files/patch-portmaster > ============================================================================== > --- head/ports-mgmt/portmaster/files/patch-portmaster Tue Jan 21 20:57:45 2020 (r523744) > +++ head/ports-mgmt/portmaster/files/patch-portmaster Tue Jan 21 21:05:19 2020 (r523745) > @@ -207,11 +207,14 @@ > #=============== Begin functions relevant to --features and main =============== > > # find installed port for given origin (with optional @flavor) in the pkg DB > -@@ -938,11 +968,11 @@ iport_from_origin () { > +@@ -938,11 +968,14 @@ iport_from_origin () { > > origin=$(dir_part "$1") > flavor=$(flavor_part "$1") > - pkgname_l=$(echo $(pkg query '%n-%v' $origin)) || return 1 > ++ if [ -z "$flavor" ]; then > ++ flavor=$(pm_make -C "${pd}/${origin}" -V FLAVOR) When you I run "portmaster firefox" it wants to reinstall many non-flavored ports now. I think the problem is that portmaster has a variable named FLAVOR that is exported to the environment, which is probably used to select a flavor, but this variable is still set in some cases when calling make here and "FLAVOR=py27 make -V FLAVOR" returns py27 even if the port doesn't have flavors.