diff options
| author | Stefan Eßer <se@FreeBSD.org> | 2017-12-16 15:17:58 +0000 |
|---|---|---|
| committer | Stefan Eßer <se@FreeBSD.org> | 2017-12-16 15:17:58 +0000 |
| commit | 29314a7c31c018a3103383c8fc111b3b1a1c7793 (patch) | |
| tree | b2f1fc46e999adb41dece34cff31e69b5b834b40 /ports-mgmt | |
| parent | 9fc744cb07cf3a779a06ec9966c78cf58ef0e14e (diff) | |
| download | ports-29314a7c31c018a3103383c8fc111b3b1a1c7793.tar.gz ports-29314a7c31c018a3103383c8fc111b3b1a1c7793.zip | |
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)
Notes
Notes:
svn path=/head/; revision=456473
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/portmaster/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portmaster/files/patch-portmaster | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ports-mgmt/portmaster/Makefile b/ports-mgmt/portmaster/Makefile index c930ba833ce8..2304c96f98dd 100644 --- a/ports-mgmt/portmaster/Makefile +++ b/ports-mgmt/portmaster/Makefile @@ -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}/ \ diff --git a/ports-mgmt/portmaster/files/patch-portmaster b/ports-mgmt/portmaster/files/patch-portmaster index cab438a66097..2b3c5dc49b5c 100644 --- a/ports-mgmt/portmaster/files/patch-portmaster +++ b/ports-mgmt/portmaster/files/patch-portmaster @@ -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 |