Date: Sat, 27 Jan 2018 11:20:47 +0000 (UTC) From: Dirk Meyer <dinoex@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r460107 - in head/ports-mgmt/pkg_jail: . files Message-ID: <201801271120.w0RBKlLC027999@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Sat Jan 27 11:20:47 2018 New Revision: 460107 URL: https://svnweb.freebsd.org/changeset/ports/460107 Log: - update to 1.93 Modified: head/ports-mgmt/pkg_jail/Makefile head/ports-mgmt/pkg_jail/files/pkg_update Modified: head/ports-mgmt/pkg_jail/Makefile ============================================================================== --- head/ports-mgmt/pkg_jail/Makefile Sat Jan 27 11:19:06 2018 (r460106) +++ head/ports-mgmt/pkg_jail/Makefile Sat Jan 27 11:20:47 2018 (r460107) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg_jail -PORTVERSION= 1.92 +PORTVERSION= 1.93 CATEGORIES= ports-mgmt MASTER_SITES= # empty DISTFILES= # empty Modified: head/ports-mgmt/pkg_jail/files/pkg_update ============================================================================== --- head/ports-mgmt/pkg_jail/files/pkg_update Sat Jan 27 11:19:06 2018 (r460106) +++ head/ports-mgmt/pkg_jail/files/pkg_update Sat Jan 27 11:20:47 2018 (r460107) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801271120.w0RBKlLC027999>