diff options
| author | sunpoet <sunpoet@FreeBSD.org> | 2013-11-07 04:03:31 +0800 |
|---|---|---|
| committer | sunpoet <sunpoet@FreeBSD.org> | 2013-11-07 04:03:31 +0800 |
| commit | 410a1bcb3edee2914e8e554700f9d8c4f3293d53 (patch) | |
| tree | 2ed780f5040f110ed1c6c31263d0aea2cb3a9db2 /ports-mgmt/portconf | |
| parent | 6e547c206b1f4bc6ca1d313effa49d2964591457 (diff) | |
| download | freebsd-ports-gnome-410a1bcb3edee2914e8e554700f9d8c4f3293d53.tar.gz freebsd-ports-gnome-410a1bcb3edee2914e8e554700f9d8c4f3293d53.tar.zst freebsd-ports-gnome-410a1bcb3edee2914e8e554700f9d8c4f3293d53.zip | |
- 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)
Diffstat (limited to 'ports-mgmt/portconf')
| -rw-r--r-- | ports-mgmt/portconf/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portconf/files/portconf.sh.in | 1 | ||||
| -rw-r--r-- | ports-mgmt/portconf/pkg-install | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ports-mgmt/portconf/Makefile b/ports-mgmt/portconf/Makefile index e3b5ce2a593c..a93f8cb89d83 100644 --- a/ports-mgmt/portconf/Makefile +++ b/ports-mgmt/portconf/Makefile @@ -3,6 +3,7 @@ PORTNAME= portconf PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/portconf/files/portconf.sh.in b/ports-mgmt/portconf/files/portconf.sh.in index bce47ff5c650..17bb141dcc17 100644 --- a/ports-mgmt/portconf/files/portconf.sh.in +++ b/ports-mgmt/portconf/files/portconf.sh.in @@ -29,6 +29,7 @@ # _conf=%%PREFIX%%/etc/ports.conf +echo -n "|" if [ ! -r "${_conf}" ]; then exit fi diff --git a/ports-mgmt/portconf/pkg-install b/ports-mgmt/portconf/pkg-install index 8ff3f06e37ef..2c673fdd3800 100644 --- a/ports-mgmt/portconf/pkg-install +++ b/ports-mgmt/portconf/pkg-install @@ -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." |