From sunpoet@sunpoet.net  Sat Oct 19 16:43:04 2013
Return-Path: <sunpoet@sunpoet.net>
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 6E192BB1;
	Sat, 19 Oct 2013 16:43:04 +0000 (UTC)
	(envelope-from sunpoet@sunpoet.net)
Received: from sunpoet.net (sunpoet.net [220.135.71.135])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 3931723D1;
	Sat, 19 Oct 2013 16:43:03 +0000 (UTC)
Received: by sunpoet.net (Postfix, from userid 1000)
	id 4B7DE46DA; Sun, 20 Oct 2013 00:42:36 +0800 (CST)
Message-Id: <20131019164236.4B7DE46DA@sunpoet.net>
Date: Sun, 20 Oct 2013 00:42:36 +0800 (CST)
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: ale@FreeBSD.org
Subject: [PATCH] ports-mgmt/portconf: work with bmake
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183104
>Category:       ports
>Synopsis:       [PATCH] ports-mgmt/portconf: work with bmake
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sunpoet
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 19 16:50:02 UTC 2013
>Closed-Date:    Wed Nov 06 20:10:06 UTC 2013
>Last-Modified:  Wed Nov 06 20:10:06 UTC 2013
>Originator:     Sunpoet Po-Chuan Hsieh
>Release:        FreeBSD 10.0-BETA1 amd64
>Organization:
The FreeBSD Project
>Environment:
System: FreeBSD bonjour.sunpoet.net 10.0-BETA1 FreeBSD 10.0-BETA1 #0 r256445: Tue Oct 15 04:48:04 CST
>Description:
It's a dirty hack for portconf to work with bmake which is default make on FreeBSD 10 and above.
Patch is also available at http://people.freebsd.org/~sunpoet/portconf.patch

Port maintainer (ale@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_8 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- portconf-1.6_1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 330908)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	portconf
 PORTVERSION=	1.6
+PORTREVISION=	1
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# none
 DISTFILES=	# none
Index: files/portconf.sh.in
===================================================================
--- files/portconf.sh.in	(revision 330908)
+++ files/portconf.sh.in	(working copy)
@@ -29,6 +29,7 @@
 #
 
 _conf=%%PREFIX%%/etc/ports.conf
+echo -n "|"
 if [ ! -r "${_conf}" ]; then
     exit
 fi
Index: pkg-install
===================================================================
--- pkg-install	(revision 330908)
+++ pkg-install	(working copy)
@@ -10,10 +10,12 @@
 # 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."
--- portconf-1.6_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->ale 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Oct 19 16:50:17 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183104 
Responsible-Changed-From-To: ale->sunpoet 
Responsible-Changed-By: sunpoet 
Responsible-Changed-When: Wed Nov 6 19:35:46 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183104 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183104: commit references a PR
Date: Wed,  6 Nov 2013 20:03:45 +0000 (UTC)

 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."
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sunpoet 
State-Changed-When: Wed Nov 6 20:10:06 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183104 
>Unformatted:
