Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 25 Mar 2020 22:04:16 +0000 (UTC)
From:      Lorenzo Salvadore <salvadore@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529132 - head/emulators/wine-devel
Message-ID:  <202003252204.02PM4Gmi009388@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.pre.mk>
 .endif
 
@@ -185,6 +185,6 @@ check-wine-devel-vs-staging:
 	  fi \
 	done
 
-.ifndef PKGNAMEPREFIX
+.ifndef WINE_SLAVE_BUILD
 .include <bsd.port.post.mk>
 .endif



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003252204.02PM4Gmi009388>