Date: Wed, 11 Mar 2020 18:51:07 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r528245 - head/emulators/wine-devel Message-ID: <202003111851.02BIp7Gd037826@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003111851.02BIp7Gd037826>