Date: Sat, 16 Dec 2017 15:17:58 +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: r456473 - in head/ports-mgmt/portmaster: . files Message-ID: <201712161517.vBGFHwq3045415@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Sat Dec 16 15:17:58 2017 New Revision: 456473 URL: https://svnweb.freebsd.org/changeset/ports/456473 Log: Fix query for package to be replaced: This could lead to a wrong package being identified and replaced when the new package is installed. Add library dependencies to the list of build dependencies to consider. Reported by: Robert Huff Approved by: antoine (implicit) Modified: head/ports-mgmt/portmaster/Makefile head/ports-mgmt/portmaster/files/patch-portmaster Modified: head/ports-mgmt/portmaster/Makefile ============================================================================== --- head/ports-mgmt/portmaster/Makefile Sat Dec 16 15:01:07 2017 (r456472) +++ head/ports-mgmt/portmaster/Makefile Sat Dec 16 15:17:58 2017 (r456473) @@ -2,7 +2,7 @@ PORTNAME= portmaster PORTVERSION= 3.17.11 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= ports-mgmt MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Modified: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- head/ports-mgmt/portmaster/files/patch-portmaster Sat Dec 16 15:01:07 2017 (r456472) +++ head/ports-mgmt/portmaster/files/patch-portmaster Sat Dec 16 15:17:58 2017 (r456473) @@ -59,6 +59,15 @@ update_build_l () { local originflavor origin flavor iport +@@ -2281,7 +2281,7 @@ + for dep_type in $*; do + case $dep_type in + build-depends-list) +- var_opt="$var_opt -V BUILD_DEPENDS" ;; ++ var_opt="$var_opt -V BUILD_DEPENDS -V LIB_DEPENDS" ;; + run-depends-list) + var_opt="$var_opt -V RUN_DEPENDS" ;; + *) @@ -2797,7 +2797,8 @@ numports=$(( $numports - 1 )) continue @@ -83,7 +92,7 @@ flavor=$(flavor_part $1) pkgname=$(make -C "$pd/$dir" -V PKGNAME FLAVOR=$flavor) || return 1 - pkg info -x ${pkgname%-*}'-[^-]*' -+ pkg info -x ${pkgname%-*}'-[^-]*' 2>/dev/null ++ pkg info -x "^${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?201712161517.vBGFHwq3045415>