Date: Wed, 17 Aug 2016 09:11:00 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420327 - head/Mk Message-ID: <201608170911.u7H9B0Tm048483@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Aug 17 09:11:00 2016 New Revision: 420327 URL: https://svnweb.freebsd.org/changeset/ports/420327 Log: Split the PLIST_SUB_SED variable in smaller logical groups. This will allow expanding it more easily. Sponsored by: Absolight Modified: head/Mk/bsd.port.mk (contents, props changed) Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Wed Aug 17 09:02:56 2016 (r420326) +++ head/Mk/bsd.port.mk Wed Aug 17 09:11:00 2016 (r420327) @@ -1604,13 +1604,16 @@ SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${ WWWDIR=${WWWDIR} ETCDIR=${ETCDIR} # This is used for check-stagedir.sh and check_leftover.sh to replace # directories/files with PLIST_SUB %%KEYS%%. +# Remove VARS which values are PLIST_SUB_SED_MIN long or shorter +PLIST_SUB_SED_MIN?= 2 +PLIST_SUB_SED_tmp1= ${PLIST_SUB:C/.*=.{1,${PLIST_SUB_SED_MIN}}$//g} # 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*} # Remove quotes # Replace . with \. for later sed(1) usage -PLIST_SUB_SED_MIN?= 2 -PLIST_SUB_SED?= ${PLIST_SUB:C/.*=.{1,${PLIST_SUB_SED_MIN}}$//g:NEXTRACT_SUFX=*:NOSREL=*:NLIB32DIR=*:NPREFIX=*:NLOCALBASE=*:NRESETPREFIX=*:N*="":N*="@comment*:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\./\\./g} +PLIST_SUB_SED?= ${PLIST_SUB_SED_tmp2:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\./\\./g} # kludge to strip trailing whitespace from CFLAGS; # sub-configure will not # survive double space
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608170911.u7H9B0Tm048483>