Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Nov 2013 20:03:31 +0000 (UTC)
From:      Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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
Message-ID:  <201311062003.rA6K3V1w024644@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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."



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311062003.rA6K3V1w024644>