svn commit: r473017 - in head/ports-mgmt/portmaster: . files
Stefan Esser
se at FreeBSD.org
Fri Jun 22 06:44:45 UTC 2018
Author: se
Date: Fri Jun 22 06:44:44 2018
New Revision: 473017
URL: https://svnweb.freebsd.org/changeset/ports/473017
Log:
Fix building of specific qt4 ports after qt5 has become the default flavor.
The ports infrastructure does not consistently deal with FLAVOR environment
variables set to an empty string. This caused the dependency check in
portmaster to fail for multimedia/phonon.
With FLAVOR="" in the environment, "make -V FLAVOR" returns "qt4", but the
dependency list produced by "make build-depends-list" assumes "qt5", even
though no user preferences for qt5 have been set.
Reported by: Walter Schwarzenfeld <w.schwarzenfeld at utanet.at>
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 Fri Jun 22 06:28:47 2018 (r473016)
+++ head/ports-mgmt/portmaster/Makefile Fri Jun 22 06:44:44 2018 (r473017)
@@ -2,7 +2,7 @@
PORTNAME= portmaster
PORTVERSION= 3.19
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= ports-mgmt
MAINTAINER= se at FreeBSD.org
Modified: head/ports-mgmt/portmaster/files/patch-portmaster
==============================================================================
--- head/ports-mgmt/portmaster/files/patch-portmaster Fri Jun 22 06:28:47 2018 (r473016)
+++ head/ports-mgmt/portmaster/files/patch-portmaster Fri Jun 22 06:44:44 2018 (r473017)
@@ -53,7 +53,7 @@
+target_part () { [ -z "${1##*:*}" ] && echo "${1#*:}" || echo install; }
+flavor_part () { local tmp="${1%%:*}"; [ -z "${tmp##*@*}" ] && echo "${tmp#*@}"; }
+dir_part () { local tmp="${1%%:*}"; echo "${tmp%%@*}"; }
-+export_flavor () { [ "$FLAVOR" != "$1" ] && export FLAVOR="$1"; }
++export_flavor () { if [ -n "$1" ]; then export FLAVOR="$1"; else unset FLAVOR; fi; }
+
pm_cd () { builtin cd $1 2>/dev/null || return 1; }
pm_cd_pd () { [ -n "$PM_INDEX_ONLY" ] && return 2;
@@ -459,18 +459,19 @@
$PM_SU_CMD /etc/rc.d/ldconfig start > /dev/null
fi
unset temp file files
-@@ -3876,9 +3911,12 @@ if [ -n "$MAKE_PACKAGE" ]; then
+@@ -3876,9 +3911,13 @@ if [ -n "$MAKE_PACKAGE" ]; then
fi
if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then
-# export_flavor $(flavor_part $portdir)
++ flavor=$(flavor_part $portdir)
+ for dir in $post_clean_l; do
+ pm_v "===>>> Running 'make clean' for special build dependency $dir"
-+ (FLAVOR=$(flavor_part $portdir) pm_make_s -C "$pd/$dir" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
++ (pm_make_s -C "$pd/$dir" "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
+ done
pm_v "===>>> Running 'make clean' in the background"
- (pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
-+ (FLAVOR=$(flavor_part $portdir) pm_make_s clean NOCLEANDEPENDS=ncd2 >/dev/null)&
++ (pm_make_s "${flavor:+FLAVOR=$flavor}" clean NOCLEANDEPENDS=ncd2 >/dev/null)&
pm_v
fi
if [ -n "$ro_opd" ]; then
More information about the svn-ports-all
mailing list