From 6365cf55b827ee76102be4be80b9fb8c3c195e55 Mon Sep 17 00:00:00 2001 From: Alex Dupre Date: Mon, 12 Aug 2013 13:05:07 +0000 Subject: 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 , Gea-Suan Lin --- ports-mgmt/portconf/Makefile | 2 +- ports-mgmt/portconf/files/portconf.sh.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ports-mgmt') diff --git a/ports-mgmt/portconf/Makefile b/ports-mgmt/portconf/Makefile index ae4f353849e6..73545bb40277 100644 --- a/ports-mgmt/portconf/Makefile +++ b/ports-mgmt/portconf/Makefile @@ -8,7 +8,7 @@ # PORTNAME= portconf -PORTVERSION= 1.5 +PORTVERSION= 1.6 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none 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 -- cgit v1.2.3