Date: Mon, 12 Aug 2013 13:05:08 +0000 (UTC) From: Alex Dupre <ale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324628 - in head/ports-mgmt/portconf: . files Message-ID: <201308121305.r7CD58rT096600@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ale Date: Mon Aug 12 13:05:07 2013 New Revision: 324628 URL: http://svnweb.freebsd.org/changeset/ports/324628 Log: 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> Modified: head/ports-mgmt/portconf/Makefile head/ports-mgmt/portconf/files/portconf.sh.in Modified: head/ports-mgmt/portconf/Makefile ============================================================================== --- head/ports-mgmt/portconf/Makefile Mon Aug 12 12:55:03 2013 (r324627) +++ head/ports-mgmt/portconf/Makefile Mon Aug 12 13:05:07 2013 (r324628) @@ -8,7 +8,7 @@ # PORTNAME= portconf -PORTVERSION= 1.5 +PORTVERSION= 1.6 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portconf/files/portconf.sh.in ============================================================================== --- head/ports-mgmt/portconf/files/portconf.sh.in Mon Aug 12 12:55:03 2013 (r324627) +++ head/ports-mgmt/portconf/files/portconf.sh.in Mon Aug 12 13:05:07 2013 (r324628) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308121305.r7CD58rT096600>