From owner-svn-ports-all@freebsd.org Fri Dec 15 21:01:16 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1A6D8E8C98D; Fri, 15 Dec 2017 21:01:16 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D8A2865452; Fri, 15 Dec 2017 21:01:15 +0000 (UTC) (envelope-from se@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBFL1EW5083887; Fri, 15 Dec 2017 21:01:14 GMT (envelope-from se@FreeBSD.org) Received: (from se@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBFL1E2g083885; Fri, 15 Dec 2017 21:01:14 GMT (envelope-from se@FreeBSD.org) Message-Id: <201712152101.vBFL1E2g083885@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: se set sender to se@FreeBSD.org using -f From: Stefan Esser Date: Fri, 15 Dec 2017 21:01:14 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: se X-SVN-Commit-Paths: in head/ports-mgmt/portmaster: . files X-SVN-Commit-Revision: 456417 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Fri, 15 Dec 2017 21:01:16 -0000 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'; } +