From owner-svn-ports-head@FreeBSD.ORG  Mon Sep 30 20:37:59 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 005C3CA5;
 Mon, 30 Sep 2013 20:37:58 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C85EC235F;
 Mon, 30 Sep 2013 20:37:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r8UKbwr0018606;
 Mon, 30 Sep 2013 20:37:58 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r8UKbwiS018604;
 Mon, 30 Sep 2013 20:37:58 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201309302037.r8UKbwiS018604@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Mon, 30 Sep 2013 20:37:58 +0000 (UTC)
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
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 30 Sep 2013 20:37:59 -0000

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`