Bug 183104 - [PATCH] ports-mgmt/portconf: work with bmake
Summary: [PATCH] ports-mgmt/portconf: work with bmake
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Po-Chuan Hsieh
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-10-19 17:50 UTC by Po-Chuan Hsieh
Modified: 2013-11-06 20:10 UTC (History)
1 user (show)

See Also:

Attachments
portconf-1.6_1.patch (1.10 KB, patch)
2013-10-19 17:50 UTC, Po-Chuan Hsieh 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-10-19 17:50:02 UTC 
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)
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-10-19 17:50:17 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->ale

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-11-06 19:35:46 UTC 
Responsible Changed
From-To: ale->sunpoet

I'll take it.
Comment 3 dfilter service freebsd_committer freebsd_triage 2013-11-06 20:03:45 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"
Comment 4 Po-Chuan Hsieh freebsd_committer freebsd_triage 2013-11-06 20:10:06 UTC 
State Changed
From-To: open->closed

Committed. Thanks!