From owner-svn-ports-head@freebsd.org  Wed Mar 11 18:51:08 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 B55B7267622;
 Wed, 11 Mar 2020 18:51:08 +0000 (UTC)
 (envelope-from gerald@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 48d1JD2GPnz4QYW;
 Wed, 11 Mar 2020 18:51:08 +0000 (UTC)
 (envelope-from gerald@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 AB63118FBE;
 Wed, 11 Mar 2020 18:51:07 +0000 (UTC)
 (envelope-from gerald@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 02BIp75n037827;
 Wed, 11 Mar 2020 18:51:07 GMT (envelope-from gerald@FreeBSD.org)
Received: (from gerald@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 02BIp7Gd037826;
 Wed, 11 Mar 2020 18:51:07 GMT (envelope-from gerald@FreeBSD.org)
Message-Id: <202003111851.02BIp7Gd037826@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gerald set sender to
 gerald@FreeBSD.org using -f
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Wed, 11 Mar 2020 18:51:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r528245 - head/emulators/wine-devel
X-SVN-Group: ports-head
X-SVN-Commit-Author: gerald
X-SVN-Commit-Paths: head/emulators/wine-devel
X-SVN-Commit-Revision: 528245
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Mar 2020 18:51:08 -0000

Author: gerald
Date: Wed Mar 11 18:51:07 2020
New Revision: 528245
URL: https://svnweb.freebsd.org/changeset/ports/528245

Log:
  Enhance my hack to catch (more of the) false negatives of
  Mk/Scripts/check-stagedir.sh in the presence of options to
  also handle %%DATADIR%% in pkg-plist.
  
  This would have caught what I fixed with r525543 | gerald | 2020-02-08.
  
  PR:		220950

Modified:
  head/emulators/wine-devel/Makefile

Modified: head/emulators/wine-devel/Makefile
==============================================================================
--- head/emulators/wine-devel/Makefile	Wed Mar 11 18:13:16 2020	(r528244)
+++ head/emulators/wine-devel/Makefile	Wed Mar 11 18:51:07 2020	(r528245)
@@ -175,8 +175,8 @@ post-install:
 
 check-wine-devel-vs-staging:
 	@${GREP} %%STAGING%% pkg-plist | while read f; do \
-	  f=`echo $$f | ${SED} -e 's/%%STAGING%%//'`; \
-	  if [ -f "$$STAGEDIR/$$PREFIX/$$f" ]; then \
+	  f=`echo $$f | ${SED} -e 's:%%STAGING%%::' -e "s:%%DATADIR%%:${DATADIR}:"`; \
+	  if [ -f "$$STAGEDIR/$$PREFIX/$$f" ] || [ -f "$$STAGEDIR/$$f" ]; then \
 	    ${PRINTF} "%s no longer contingent on %%STAGING%%?\n" "$$f"; \
 	  fi \
 	done