svn commit: r420461 - head/Mk

[Mathieu Arnold]

Author: mat
Date: Fri Aug 19 13:09:28 2016
New Revision: 420461
URL: https://svnweb.freebsd.org/changeset/ports/420461

Log:
  Fixup the PLIST_SUB_SED creation.
  
  PR:		211995
  Reported by:	koobs
  Sponsored by:	Absolight

Modified:
  head/Mk/bsd.port.mk   (contents, props changed)

Modified: head/Mk/bsd.port.mk
==============================================================================
--- head/Mk/bsd.port.mk	Fri Aug 19 13:01:25 2016	(r420460)
+++ head/Mk/bsd.port.mk	Fri Aug 19 13:09:28 2016	(r420461)
@@ -1606,9 +1606,9 @@ PLIST_SUB_SED_tmp1= ${PLIST_SUB:C/.*=.{1
 #  Remove VARS that are too generic
 #  Remove empty values
 #  Remove @comment values
-PLIST_SUB_SED_tmp2= ${PLIST_SUB_tmp1:NEXTRACT_SUFX=*:NOSREL=*:NLIB32DIR=*:NPREFIX=*:NLOCALBASE=*:NRESETPREFIX=*:N*="":N*="@comment*}
+PLIST_SUB_SED_tmp2= ${PLIST_SUB_SED_tmp1:NEXTRACT_SUFX=*:NOSREL=*:NLIB32DIR=*:NPREFIX=*:NLOCALBASE=*:NRESETPREFIX=*:N*="":N*="@comment*}
 #  Handle VARS for which there is a _regex entry
-PLIST_SUB_SED_tmp3?= ${PLIST_SUB_SED_tmp1:C/(${PLIST_SUB:M*_regex=*:C/_regex=.*/=.*/:Q:S/\\ /|/g:S/\\//g})//:C/(.*)_regex=(.*)/\1=\2/}
+PLIST_SUB_SED_tmp3?= ${PLIST_SUB_SED_tmp2:C/(${PLIST_SUB:M*_regex=*:C/_regex=.*/=.*/:Q:S/\\ /|/g:S/\\//g})//:C/(.*)_regex=(.*)/\1=\2/}
 #  Remove quotes
 #  Replace . with \. for later sed(1) usage
 PLIST_SUB_SED?= ${PLIST_SUB_SED_tmp3:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\./\\./g}