diff options
| author | se <se@FreeBSD.org> | 2018-01-13 05:59:51 +0800 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 2018-01-13 05:59:51 +0800 |
| commit | 0d8a473be437ea98c6b948ddb78b65600c849701 (patch) | |
| tree | 7db4f29ebecc959d349f5377160db44bcfe1aacb /ports-mgmt | |
| parent | 6f5955952a1dab199077a486afc2f38d246915a0 (diff) | |
| download | freebsd-ports-graphics-0d8a473be437ea98c6b948ddb78b65600c849701.tar.gz freebsd-ports-graphics-0d8a473be437ea98c6b948ddb78b65600c849701.tar.zst freebsd-ports-graphics-0d8a473be437ea98c6b948ddb78b65600c849701.zip | |
Fix display of license acceptance menu if build logs are hidden with -H.
PR: 206738
Reported by: torsten.eichstaedt@web.de
Approved by: antoine (implicit)
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index c18ae5af01d..854bf7df20e 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.18 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index d262b2a681f..0c30feee794 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -328,7 +328,17 @@ latest_pv=${latest_pv##*/} else pm_v "===>>> No local package for ${new_port}, attempting fetch" -@@ -3753,6 +3769,7 @@ if [ -z "$use_package" ]; then +@@ -3622,6 +3638,9 @@ pkg_flavor () { + pm_make pretty-flavors-package-names | sed -ne 's!^\([A-Za-z0-9_]*\): *'$pkg'$!\1!p'; + } + export_flavor=$(pkg_flavor $new_port) ++ if [ -n "$HIDE_BUILD" ] && [ -n "$(pm_make -V LICENSE)" ]; then ++ pm_make extract ask-license || fail "make extract ask-license failed for $portdir" ++ fi + eval pm_make build $port_log_args || fail "make build failed for $portdir" + + pm_sv Running make stage +@@ -3753,6 +3772,7 @@ if [ -z "$use_package" ]; then unset np_orphan # Defining NO_DEPENDS ensures that we will control the installation # of the depends, not bsd.port.mk. @@ -336,7 +346,7 @@ eval pm_make_s -DNO_DEPENDS install $port_log_args || install_failed $new_port else [ -n "$local_package" ] && ppd=${LOCAL_PACKAGEDIR}/All -@@ -3850,7 +3867,7 @@ fi +@@ -3850,7 +3870,7 @@ fi if [ -n "$MAKE_PACKAGE" ]; then if [ -z "$use_package" ]; then echo "===>>> Creating a package for new version $new_port" @@ -345,7 +355,7 @@ echo " ===>>> Package saved to $PACKAGES/All" ; echo '' else pm_pkg_create $PACKAGES $new_port -@@ -3858,6 +3875,7 @@ if [ -n "$MAKE_PACKAGE" ]; then +@@ -3858,6 +3878,7 @@ if [ -n "$MAKE_PACKAGE" ]; then fi if [ -z "$use_package" -a -z "$DONT_POST_CLEAN" ]; then |