kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add regexps capacity to PLIST_SUB.

Browse source 
This adds the possibility to use regular expressions for the makeplist
stage of the PLIST_SUB life.

From time to time, the values are too generic, and they get in the way of other
stuff.

This adds the possibility to have a `VAR_regex=regex` that will be used instead
of the `VAR=string` to search for possible replacements.

For example, in lang/perl5*, there is PERL_ARCH=mach, which will get
replaced in paths if a file is called, say "machine", will end up being
"%%PERL_ARCH%%ine".  Adding PERL_ARCH_regex="\bmach\b" will ensure only
full words are replaced, so machine will stay machine, but "lib/mach/foo
"will still be replaced by "lib/%%PERL_ARCH%%/foo".

Reviewed by:	bdrewery
Sponsored by:	Absolight
Differential Revision:	https://reviews.freebsd.org/D7335
This commit is contained in:
Mathieu Arnold 2016-08-17 09:11:08 +00:00
parent ebdae4c240
commit 642bf72f27
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=420328
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
CHANGES
View file

@ -10,6 +10,24 @@ in the release notes and/or placed into UPDATING.
All ports committers are allowed to commit to this file.
20160317:
AUTHOR: mat@FreeBSD.org
This adds the possibility to use regular expressions for the makeplist stage
of the PLIST_SUB life.
From time to time, the values are too generic, and they get in the way of
other stuff.
This adds the possibility to have a `VAR_regex=regex` that will be used
instead of the `VAR=string` to search for possible replacements.
For example, in lang/perl5*, there is PERL_ARCH=mach, which will get replaced
in paths if a file is called, say "machine", will end up being
"%%PERL_ARCH%%ine". Adding PERL_ARCH_regex="\bmach\b" will ensure only full
words are replaced, so machine will stay machine, but "lib/mach/foo "will
still be replaced by "lib/%%PERL_ARCH%%/foo".
20160803:
AUTHOR: mat@FreeBSD.org

4
Mk/bsd.port.mk
View file

@ -1611,9 +1611,11 @@ PLIST_SUB_SED_tmp1= ${PLIST_SUB:C/.*=.{1,${PLIST_SUB_SED_MIN}}$//g}
# Remove empty values
# Remove @comment values
PLIST_SUB_SED_tmp2= ${PLIST_SUB_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/}
# Remove quotes
# Replace . with \. for later sed(1) usage
PLIST_SUB_SED?= ${PLIST_SUB_SED_tmp2:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\./\\./g}
PLIST_SUB_SED?= ${PLIST_SUB_SED_tmp3:C/([^=]*)="?([^"]*)"?/s!\2!%%\1%%!g;/g:C/\./\\./g}
# kludge to strip trailing whitespace from CFLAGS;
# sub-configure will not # survive double space