Date: Mon, 22 Oct 2018 12:06:40 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r482743 - in head/ports-mgmt/portmaster: . files Message-ID: <201810221206.w9MC6eeM036581@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Mon Oct 22 12:06:40 2018 New Revision: 482743 URL: https://svnweb.freebsd.org/changeset/ports/482743 Log: Fix upgrades of moved ports. Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Mon Oct 22 11:32:12 2018 (r482742) +++ head/ports-mgmt/portmaster/Makefile Mon Oct 22 12:06:40 2018 (r482743) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.19 -PORTREVISION= 16 +PORTREVISION= 17 CATEGORIES= ports-mgmt MAINTAINER= se@FreeBSD.org Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Mon Oct 22 11:32:12 2018 (r482742) +++ head/ports-mgmt/portmaster/files/patch-portmaster Mon Oct 22 12:06:40 2018 (r482743) @@ -693,15 +693,22 @@ if [ "$?" -eq 1 ]; then echo '' echo "===>>> The second argument to -o can be a package name," -@@ -3142,8 +3169,9 @@ iport_from_pkgname () { +@@ -3133,6 +3160,7 @@ if [ -z "$PM_INDEX_ONLY" ] && ! pm_isdir_pd "$portdir" + pm_isdir_pd "$moved_npd" || no_valid_port + [ "$$" -eq "$PM_PARENT_PID" ] && parent_exit ++ [ -z "$upg_port" ] && upg_port="$portdir" + exec "$program" $ARGS -o $moved_npd $upg_port + # NOT REACHED + fi +@@ -3142,8 +3170,8 @@ iport_from_pkgname () { + dir=$(dir_part $1) flavor=$(flavor_part $1) - pkgname=$(FLAVOR=$flavor make -C "$pd/$dir" -V PKGNAME) || return 1 - pkg info -x "^${pkgname%-*}"'-[^-]*' 2>/dev/null + pkgname=$(FLAVOR=$flavor pm_make -C "$pd/$dir" -V PKGNAME) && + $PKG_CMD query "%n-%v" "${pkgname%-*}" -+# $PKG_CMD info -xC "^${pkgname%-*}\$" 2>/dev/null } if [ -z "$upg_port" -a -z "$REPLACE_ORIGIN" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810221206.w9MC6eeM036581>