svn commit: r523745 - in head/ports-mgmt/portmaster: . files

[Tijl Coosemans]

On Tue, 21 Jan 2020 21:05:19 +0000 (UTC) Stefan Esser <se at FreeBSD.org>
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 at 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.