Date: Fri, 15 Dec 2017 21:01:14 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456417 - in head/ports-mgmt/portmaster: . files Message-ID: <201712152101.vBFL1E2g083885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Fri Dec 15 21:01:14 2017 New Revision: 456417 URL: https://svnweb.freebsd.org/changeset/ports/456417 Log: Add another check for a flavor passed attached to the port directory. Without this fix, the default flavor was built in specific situations. 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 Dec 15 20:21:27 2017 (r456416) +++ head/ports-mgmt/portmaster/Makefile Fri Dec 15 21:01:14 2017 (r456417) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.17.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Fri Dec 15 20:21:27 2017 (r456416) +++ head/ports-mgmt/portmaster/files/patch-portmaster Fri Dec 15 21:01:14 2017 (r456417) @@ -1,4 +1,4 @@ ---- portmaster.orig 2017-12-15 12:40:13.818570000 +0100 +1;95;0c--- portmaster.orig 2017-12-15 12:40:13.818570000 +0100 +++ portmaster 2017-12-15 16:49:11.583821000 +0100 @@ -1449,6 +1449,24 @@ fi @@ -59,3 +59,11 @@ } if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then +@@ -3594,6 +3594,7 @@ + fi + + pm_cd_pd $portdir ++ export_flavor $(flavor_part $portdir) + [ -z "$DONT_PRE_CLEAN" ] && { pm_make clean NOCLEANDEPENDS=ncd || + fail 'make clean failed'; } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712152101.vBFL1E2g083885>