diff options
| author | se <se@FreeBSD.org> | 2017-12-16 01:55:49 +0800 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 2017-12-16 01:55:49 +0800 |
| commit | 6e1cdfcc7fe6e3ee8d9a724e5f8511ca891b9807 (patch) | |
| tree | f03b1d503acca249e027b40489c4d90a907c7bc1 /ports-mgmt | |
| parent | eb881fea79f1ab911d6fa87f7c1cee3e3e7bc597 (diff) | |
| download | freebsd-ports-gnome-6e1cdfcc7fe6e3ee8d9a724e5f8511ca891b9807.tar.gz freebsd-ports-gnome-6e1cdfcc7fe6e3ee8d9a724e5f8511ca891b9807.tar.zst freebsd-ports-gnome-6e1cdfcc7fe6e3ee8d9a724e5f8511ca891b9807.zip | |
Fix regression: The find_new_port function is now invoked from an earlier
place than before flavor support was added. Move its definition to an
appropriate place.
Silence one pkq query command that may be called for a non-existing
package name.
Approved by: antoine (implicit)
Reported by: Milan Obuch, Paul Beard
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 1 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 67 |
2 files changed, 68 insertions, 0 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index 7b9b2229b6da..685755b82fc6 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -2,6 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.17.11 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster new file mode 100644 index 000000000000..5b246b71203a --- /dev/null +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -0,0 +1,67 @@ +--- portmaster.orig 2017-12-15 12:40:13.818570000 +0100 ++++ portmaster 2017-12-15 16:49:11.583821000 +0100 +@@ -1,4 +1,4 @@ +-#!/bin/sh ++#!/bin/sh -x + + # Copyright (c) 2005-2012 Douglas Barton, All rights reserved + # Please see detailed copyright below +@@ -1449,6 +1449,24 @@ + fi + } + ++find_new_port () { ++ # Global: new_port ++ local portdir flavor flavor_option ++ ++ [ -n "$new_port" ] && return ++ ++ portdir=$(dir_part "$1") ++ flavor=$(flavor_part "$1") ++ flavor_option=${flavor:+FLAVOR=$flavor} ++# export_flavor $flavor ++ if pm_cd_pd $portdir; then ++ new_port=`pm_make -V PKGNAME ${flavor_option}` ++ else ++ new_port=`parse_index $portdir name` || ++ fail "No entry for $portdir in $PM_INDEX" ++ fi ++} ++ + check_for_updates () { + # Global: num_updates + local nf iport originflavor flavor origin port_ver do_update skip +@@ -2148,24 +2166,6 @@ + PM_NEEDS_UPDATE="${PM_NEEDS_UPDATE}${1} " + } + +-find_new_port () { +- # Global: new_port +- local portdir flavor flavor_option +- +- [ -n "$new_port" ] && return +- +- portdir=$(dir_part "$1") +- flavor=$(flavor_part "$1") +- flavor_option=${flavor:+FLAVOR=$flavor} +-# export_flavor $flavor +- if pm_cd_pd $portdir; then +- new_port=`pm_make -V PKGNAME ${flavor_option}` +- else +- new_port=`parse_index $portdir name` || +- fail "No entry for $portdir in $PM_INDEX" +- fi +-} +- + update_build_l () { + local originflavor origin flavor iport + +@@ -3129,7 +3129,7 @@ + dir=$(dir_part $1) + flavor=$(flavor_part $1) + pkgname=$(make -C "$pd/$dir" -V PKGNAME FLAVOR=$flavor) || return 1 +- pkg info -x ${pkgname%-*}'-[^-]*' ++ pkg info -qx ${pkgname%-*}'-[^-]*' + } + + if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then |