diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2018-01-27 11:20:47 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2018-01-27 11:20:47 +0000 |
| commit | 5f9603e8930e814762aef107235817ab1c2e6316 (patch) | |
| tree | 4d3421e96e5586fffbf683dc42f61c70a000f566 /ports-mgmt | |
| parent | 7789fe84ef110d015e85b0c713168ebed2d38dd2 (diff) | |
| download | ports-5f9603e8930e814762aef107235817ab1c2e6316.tar.gz ports-5f9603e8930e814762aef107235817ab1c2e6316.zip | |
Notes
Diffstat (limited to 'ports-mgmt')
| -rw-r--r-- | ports-mgmt/pkg_jail/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg_jail/files/pkg_update | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile index e505efd62efe..ef3f0de46d2b 100644 --- a/ports-mgmt/pkg_jail/Makefile +++ b/ports-mgmt/pkg_jail/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg_jail -PORTVERSION= 1.92 +PORTVERSION= 1.93 CATEGORIES= ports-mgmt MASTER_SITES= # empty DISTFILES= # empty diff --git a/ports-mgmt/pkg_jail/files/pkg_update b/ports-mgmt/pkg_jail/files/pkg_update index b2c491cbb550..fe4e76ac8e44 100644 --- a/ports-mgmt/pkg_jail/files/pkg_update +++ b/ports-mgmt/pkg_jail/files/pkg_update @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: pkg_update,v 1.92 2017/07/29 05:50:19 cvs Exp $ +# $Id: pkg_update,v 1.93 2018/01/27 11:19:14 cvs Exp $ # $FreeBSD$ # # Copyright (c) 2001-2017 by Dirk Meyer. All rights reserved. @@ -183,7 +183,8 @@ run_pkg_installed() { return 0 fi else - installed=`pkg query -e "%o == ${dir}" '%o'` + # more then one Flavor can be installed + installed=`pkg query -e "%o == ${dir}" '%o' | head -1` if test "${installed}" = "${dir}" then echo "#installed: ${pkgname} from ${dir}" @@ -2121,6 +2122,11 @@ check_update_pkg() { pkgname=`cd "${portsdir}/ports-mgmt/pkg" && make PKGNAMESUFFIX=-pkgng -V PKGNAME` if test "${old}" = "${pkgname}" then + if test ! -L /usr/sbin/pkg + then + mv -f /usr/sbin/pkg /usr/sbin/pkg.orig + ln -s "${pkg}" /usr/sbin/pkg + fi return fi fi |