svn commit: r333038 - in head/ports-mgmt/portconf: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Wed Nov 6 20:03:33 UTC 2013
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."
More information about the svn-ports-all
mailing list