- update to 1.89

2 files changed, 29 insertions, 21 deletions

diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile
index 14e952952753..e435f49b1b63 100644
--- a/ports-mgmt/pkg_jail/Makefile
+++ b/ports-mgmt/pkg_jail/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pkg_jail
-PORTVERSION=	1.88
+PORTVERSION=	1.89
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/ports-mgmt/pkg_jail/files/pkg_update b/ports-mgmt/pkg_jail/files/pkg_update
index 422e552af933..ec357a076958 100644
--- a/ports-mgmt/pkg_jail/files/pkg_update
+++ b/ports-mgmt/pkg_jail/files/pkg_update
@@ -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
 	;;
 *)