From owner-svn-ports-all@freebsd.org Sat Jan 27 11:20:48 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03253E7F2FE; Sat, 27 Jan 2018 11:20:48 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA01F83276; Sat, 27 Jan 2018 11:20:47 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A4E811ADC; Sat, 27 Jan 2018 11:20:47 +0000 (UTC) (envelope-from dinoex@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0RBKlu6028000; Sat, 27 Jan 2018 11:20:47 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0RBKlLC027999; Sat, 27 Jan 2018 11:20:47 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201801271120.w0RBKlLC027999@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 27 Jan 2018 11:20:47 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: dinoex X-SVN-Commit-Paths: in head/ports-mgmt/pkg_jail: . files X-SVN-Commit-Revision: 460107 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jan 2018 11:20:48 -0000 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