Date: Mon, 30 Sep 2013 20:37:58 +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: r328867 - in head/ports-mgmt/pkg_jail: . files Message-ID: <201309302037.r8UKbwiS018604@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Mon Sep 30 20:37:58 2013 New Revision: 328867 URL: http://svnweb.freebsd.org/changeset/ports/328867 Log: - update to 1.73 support for packages with STAGEDIR 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 Mon Sep 30 20:25:47 2013 (r328866) +++ head/ports-mgmt/pkg_jail/Makefile Mon Sep 30 20:37:58 2013 (r328867) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg_jail -PORTVERSION= 1.72 +PORTVERSION= 1.73 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 Mon Sep 30 20:25:47 2013 (r328866) +++ head/ports-mgmt/pkg_jail/files/pkg_update Mon Sep 30 20:37:58 2013 (r328867) @@ -346,12 +346,31 @@ port_uptodate() { yes|YES) ;; *) - echo "=====================================" >&2 - echo "=== package ${pkgname} was not installed" >&2 - echo "=====================================" >&2 - echo "=== package ${pkgname} was not installed" \ - >> ${logdir}/err,${log} - return 2 + nostage=`cd "${base}" && make -V NO_STAGE` + case "${nostage}" in + yes|YES) + echo "=====================================" >&2 + echo "=== package ${pkgname} was not installed" >&2 + echo "=====================================" >&2 + echo "=== package ${pkgname} was not installed" \ + >> ${logdir}/err,${log} + return 2 + ;; + *) + # install staged package + pkgfile=`cd "${base}" && make -V PKGFILE` + ${local_env} pkg_add ${pkgfile} + if test ! -e ${pkg_dbdir}/${pkgname}/+CONTENTS + then + echo "=====================================" >&2 + echo "pkg_add ${pkgfile} failed, no ${pkgname}!" >&2 + echo "=====================================" >&2 + echo "=== package ${pkgname} can not be installed" \ + >> ${logdir}/err,${log} + fi + ;; + esac + ;; esac fi pkgfile=`cd "${base}" && make -V PKGFILE`
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309302037.r8UKbwiS018604>