diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-08-12 13:05:07 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-08-12 13:05:07 +0000 |
| commit | 6365cf55b827ee76102be4be80b9fb8c3c195e55 (patch) | |
| tree | 033dd88e9a726a44dac9766922467836e9b2ffa7 /ports-mgmt/portconf/files | |
| parent | 2780a2d6cc68876762af73084816c581d0f0b4cc (diff) | |
| download | ports-6365cf55b827ee76102be4be80b9fb8c3c195e55.tar.gz ports-6365cf55b827ee76102be4be80b9fb8c3c195e55.zip | |
Add dash (-) and plus (+) symbols to allowed characters in variable names:
Dash symbols are required when using OptionsNG and $UNIQUENAME_SET/UNSET. e.g. apache22-event-mpm_SET=...
Plus symbols can be used to extend existing variables. e.g. OPTIONS_SET+=...
PR: ports/172355, ports/181119
Submitted by: Manuel <manuel-freebsd@mausz.at>,
Gea-Suan Lin <gslin@gslin.org>
Notes
Notes:
svn path=/head/; revision=324628
Diffstat (limited to 'ports-mgmt/portconf/files')
| -rw-r--r-- | ports-mgmt/portconf/files/portconf.sh.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ports-mgmt/portconf/files/portconf.sh.in b/ports-mgmt/portconf/files/portconf.sh.in index 5a3ac83df3f9..bce47ff5c650 100644 --- a/ports-mgmt/portconf/files/portconf.sh.in +++ b/ports-mgmt/portconf/files/portconf.sh.in @@ -36,7 +36,7 @@ _pwd=`pwd` sed '/^#/d;/^[[:space:]]*$/d' "${_conf}" | while read _line; do for _port in ${_line%%:*}; do if [ "${_pwd%%${_port}}" != "${_pwd}" ]; then - echo ${_line#*:} | sed -E 's/([A-Za-z0-9_]+)(=([^|]+))?/\1=\3/g;s/!([A-Za-z0-9_]+)=([^|]+)?/.undef \1/g;s/ *\| */|/g;s/ /%/g' + echo ${_line#*:} | sed -E 's/([A-Za-z0-9_\-]+\+?)(=([^|]+))?/\1=\3/g;s/!([A-Za-z0-9_]+)=([^|]+)?/.undef \1/g;s/ *\| */|/g;s/ /%/g' fi done done |