From owner-svn-ports-all@FreeBSD.ORG  Wed Nov  6 20:03:33 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 78318F34;
 Wed,  6 Nov 2013 20:03:32 +0000 (UTC)
 (envelope-from sunpoet@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 7547E29FA;
 Wed,  6 Nov 2013 20:03:32 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA6K3WO9024647;
 Wed, 6 Nov 2013 20:03:32 GMT (envelope-from sunpoet@svn.freebsd.org)
Received: (from sunpoet@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA6K3V1w024644;
 Wed, 6 Nov 2013 20:03:31 GMT (envelope-from sunpoet@svn.freebsd.org)
Message-Id: <201311062003.rA6K3V1w024644@svn.freebsd.org>
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Wed, 6 Nov 2013 20:03:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333038 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Nov 2013 20:03:33 -0000

Author: sunpoet
Date: Wed Nov  6 20:03:31 2013
New Revision: 333038
URL: http://svnweb.freebsd.org/changeset/ports/333038

Log:
  - Allow use with bmake (default make on 10 and above)
  - Bump PORTREVISION for package change
  
  PR:		ports/183104
  Submitted by:	sunpoet (myself)
  Approved by:	maintainer (timeout, 18 days)

Modified:
  head/ports-mgmt/portconf/Makefile   (contents, props changed)
  head/ports-mgmt/portconf/files/portconf.sh.in   (contents, props changed)
  head/ports-mgmt/portconf/pkg-install   (contents, props changed)

Modified: head/ports-mgmt/portconf/Makefile
==============================================================================
--- head/ports-mgmt/portconf/Makefile	Wed Nov  6 20:03:16 2013	(r333037)
+++ head/ports-mgmt/portconf/Makefile	Wed Nov  6 20:03:31 2013	(r333038)
@@ -3,6 +3,7 @@
 
 PORTNAME=	portconf
 PORTVERSION=	1.6
+PORTREVISION=	1
 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	Wed Nov  6 20:03:16 2013	(r333037)
+++ head/ports-mgmt/portconf/files/portconf.sh.in	Wed Nov  6 20:03:31 2013	(r333038)
@@ -29,6 +29,7 @@
 #
 
 _conf=%%PREFIX%%/etc/ports.conf
+echo -n "|"
 if [ ! -r "${_conf}" ]; then
     exit
 fi

Modified: head/ports-mgmt/portconf/pkg-install
==============================================================================
--- head/ports-mgmt/portconf/pkg-install	Wed Nov  6 20:03:16 2013	(r333037)
+++ head/ports-mgmt/portconf/pkg-install	Wed Nov  6 20:03:31 2013	(r333038)
@@ -10,10 +10,12 @@ cat >> ${MAKE_CONF} << EOF
 # Do not touch these lines
 .if !empty(.CURDIR:M${PORTS_DIR}*) && exists(${PKG_PREFIX}/libexec/portconf)
 _PORTCONF!=${PKG_PREFIX}/libexec/portconf
-.for i in \${_PORTCONF:S/|/ /g}
-\${i:S/%/ /g}
+.if \${_PORTCONF} != "|"
+.for i in \${_PORTCONF:S/^|//:S/|/ /g}
+\${i:C/^([^=]*)=.*/\1/}=\${i:C/^[^=]*=//:S/%/ /g}
 .endfor
 .endif
+.endif
 # End portconf settings
 EOF
 echo " Done."