From owner-svn-ports-all@freebsd.org Wed Mar 25 22:13:07 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 17E1C264F6F; Wed, 25 Mar 2020 22:13:07 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48nj6n605wz3G3Q; Wed, 25 Mar 2020 22:13:05 +0000 (UTC) (envelope-from salvadore@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00CF922B28; Wed, 25 Mar 2020 22:04:17 +0000 (UTC) (envelope-from salvadore@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02PM4GFA009389; Wed, 25 Mar 2020 22:04:16 GMT (envelope-from salvadore@FreeBSD.org) Received: (from salvadore@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02PM4Gmi009388; Wed, 25 Mar 2020 22:04:16 GMT (envelope-from salvadore@FreeBSD.org) Message-Id: <202003252204.02PM4Gmi009388@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: salvadore set sender to salvadore@FreeBSD.org using -f From: Lorenzo Salvadore Date: Wed, 25 Mar 2020 22:04:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r529132 - head/emulators/wine-devel X-SVN-Group: ports-head X-SVN-Commit-Author: salvadore X-SVN-Commit-Paths: head/emulators/wine-devel X-SVN-Commit-Revision: 529132 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.29 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: Wed, 25 Mar 2020 22:13:07 -0000 Author: salvadore Date: Wed Mar 25 22:04:16 2020 New Revision: 529132 URL: https://svnweb.freebsd.org/changeset/ports/529132 Log: emulators/wine-devel: Change tested variable for master port detection It has been observed that the target config-recursive for emulators/i386-wine-devel can cause bsd.port.mk to be included twice when run in i386 jails. This seems to be due to the fact that config recursive ignores PKGNAMEPREFIX definiton, which is used in emulators/wine-devel to test whether bsd.port.[pre.|post.]mk needs to be included or bsd.port.mk has already been included by i386-wine-devel. We change the testing variable to WINE_SLAVE_BUILD, defined in i386-wine-devel/Makefile.i386. Approved by: gerald (maintainer, mentor) Differential Revision: https://reviews.freebsd.org/D24167 Modified: head/emulators/wine-devel/Makefile Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Wed Mar 25 21:39:53 2020 (r529131) +++ head/emulators/wine-devel/Makefile Wed Mar 25 22:04:16 2020 (r529132) @@ -130,7 +130,7 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig # Include this only if it has not been already included by the # i386-wine-devel slave port. -.ifndef PKGNAMEPREFIX +.ifndef WINE_SLAVE_BUILD .include .endif @@ -185,6 +185,6 @@ check-wine-devel-vs-staging: fi \ done -.ifndef PKGNAMEPREFIX +.ifndef WINE_SLAVE_BUILD .include .endif