From owner-svn-ports-head@freebsd.org Sat Mar 19 11:00:58 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 85980AD546C; Sat, 19 Mar 2016 11:00:58 +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 mx1.freebsd.org (Postfix) with ESMTPS id 61F76F95; Sat, 19 Mar 2016 11:00:58 +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 u2JB0vh3039060; Sat, 19 Mar 2016 11:00:57 GMT (envelope-from dinoex@FreeBSD.org) Received: (from dinoex@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u2JB0v8R039058; Sat, 19 Mar 2016 11:00:57 GMT (envelope-from dinoex@FreeBSD.org) Message-Id: <201603191100.u2JB0v8R039058@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dinoex set sender to dinoex@FreeBSD.org using -f From: Dirk Meyer Date: Sat, 19 Mar 2016 11:00:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411390 - in head/ports-mgmt/pkg_jail: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Mar 2016 11:00:58 -0000 Author: dinoex Date: Sat Mar 19 11:00:57 2016 New Revision: 411390 URL: https://svnweb.freebsd.org/changeset/ports/411390 Log: - update to 1.89 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 Mar 19 10:59:47 2016 (r411389) +++ head/ports-mgmt/pkg_jail/Makefile Sat Mar 19 11:00:57 2016 (r411390) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg_jail -PORTVERSION= 1.88 +PORTVERSION= 1.89 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 Mar 19 10:59:47 2016 (r411389) +++ head/ports-mgmt/pkg_jail/files/pkg_update Sat Mar 19 11:00:57 2016 (r411390) @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: pkg_update,v 1.88 2015/10/23 07:52:22 cvs Exp $ +# $Id: pkg_update,v 1.89 2016/03/19 10:56:41 cvs Exp $ # $FreeBSD$ # # Copyright (c) 2001-2006 @@ -2071,19 +2071,24 @@ update_pkg() { env "PKG_DBDIR=/var/db/pkgng" ${pkg} delete -y -a -f fi /etc/rc.d/ldconfig start - ( cd "${portsdir}/ports-mgmt/pkg" && env "PKG_DBDIR=/var/db/pkgng" make clean deinstall PREFIX=/usr/pkgng PKGNAMESUFFIX=-pkgng package install ) + ( cd "${portsdir}/ports-mgmt/pkg" && env "FORCE_PKG_REGISTER=yes" "PKG_DBDIR=/var/db/pkgng" make clean deinstall PREFIX=/usr/pkgng PKGNAMESUFFIX=-pkgng package install ) if test ! -L /usr/sbin/pkg then mv -f /usr/sbin/pkg /usr/sbin/pkg.orig ln -s "${pkg}" /usr/sbin/pkg fi - ( cd "${portsdir}/ports-mgmt/pkg" && make clean package install ) + ( cd "${portsdir}/ports-mgmt/pkg" && env "FORCE_PKG_REGISTER=yes" make clean package install ) ${pkg} delete -y -f pkg } # # # update if pkg tools have changed check_update_pkg() { + defaultdata="${localdir}/data/make-packages.${hostname}" + if test ! -f "${defaultdata}" + then + return + fi if test -f "${pkg}" then old=`env "PKG_DBDIR=/var/db/pkgng" ${pkg} query -e '%p == /usr/pkgng' %n-%v` @@ -2096,6 +2101,19 @@ check_update_pkg() { update_pkg } # +# check if we run in build jail +check_buildjail() { + defaultdata="${localdir}/data/make-packages.${hostname}" + if test ! -f "${defaultdata}" + then + echo "${defaultdata}: no such file, aborted." >&2 + echo "!!WARNNING!! Such a file should only exist for your build jail" >&2 + echo "!!WARNNING!! This will uninstall all packages." >&2 + echo "!!WARNNING!! This will delete your config in /usr/local." >&2 + exit 64 + fi +} +# # inform usage usage() { echo "Usage:" >&2 @@ -2191,16 +2209,8 @@ repo) fi ;; make-packages) - defaultdata="${localdir}/data/make-packages.${hostname}" - if test ! -f "${defaultdata}" - then - echo "${defaultdata}: no such file, make-packages aborted." >&2 - echo "!!WARNNING!! Such a file should only exist for your build jail" >&2 - echo "!!WARNNING!! This will uninstall all packages." >&2 - echo "!!WARNNING!! This will delete your config in /usr/local." >&2 - exit 64 - fi shift + check_buildjail validate_make_conf check_update_pkg parse_default "${#}" @@ -2344,6 +2354,7 @@ clean-packages) pkgall="${packages}/All" pkgold="${packages}/Old" quiet_mkdir "${pkgold}" + check_update_pkg # # save pwd ( @@ -2357,6 +2368,7 @@ clean-openssl-packages) pkgall="${packages}/All" pkgold="${packages}/Old" quiet_mkdir "${pkgold}" + check_update_pkg # # save pwd ( @@ -2647,15 +2659,11 @@ check-update) /bin/sh "${0}" show-missing-installed next_target "${@}" ;; +diff) + diff -u "${portsdir}/ports-mgmt/pkg_jail/files/pkg_update" "${0}" + ;; update-pkg) - defaultdata="${localdir}/data/make-packages.${hostname}" - if test ! -f "${defaultdata}" - then - echo "!!WARNNING!! Such a file should only exist for your build jail" >&2 - echo "!!WARNNING!! This will uninstall all packages." >&2 - echo "!!WARNNING!! This will delete your config in /usr/local." >&2 - exit 64 - fi + check_buildjail update_pkg ;; *)