From owner-svn-ports-head@FreeBSD.ORG  Mon Aug 12 13:05:08 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7B82492D;
 Mon, 12 Aug 2013 13:05:08 +0000 (UTC) (envelope-from ale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 68EB62BD8;
 Mon, 12 Aug 2013 13:05:08 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7CD58Oc096603;
 Mon, 12 Aug 2013 13:05:08 GMT (envelope-from ale@svn.freebsd.org)
Received: (from ale@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7CD58rT096600;
 Mon, 12 Aug 2013 13:05:08 GMT (envelope-from ale@svn.freebsd.org)
Message-Id: <201308121305.r7CD58rT096600@svn.freebsd.org>
From: Alex Dupre <ale@FreeBSD.org>
Date: Mon, 12 Aug 2013 13:05:08 +0000 (UTC)
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
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 12 Aug 2013 13:05:08 -0000

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