Date: Wed, 2 Jan 2013 14:00:42 +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: r309818 - in head/ports-mgmt/pkg_jail: . files Message-ID: <201301021400.r02E0gFg099325@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dinoex Date: Wed Jan 2 14:00:42 2013 New Revision: 309818 URL: http://svnweb.freebsd.org/changeset/ports/309818 Log: - update to 1.72 Modified: head/ports-mgmt/pkg_jail/Makefile head/ports-mgmt/pkg_jail/files/pkg_jail head/ports-mgmt/pkg_jail/files/pkg_update Modified: head/ports-mgmt/pkg_jail/Makefile ============================================================================== --- head/ports-mgmt/pkg_jail/Makefile Wed Jan 2 13:46:49 2013 (r309817) +++ head/ports-mgmt/pkg_jail/Makefile Wed Jan 2 14:00:42 2013 (r309818) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg_jail -PORTVERSION= 1.71 +PORTVERSION= 1.72 CATEGORIES= ports-mgmt MASTER_SITES= # empty DISTFILES= # empty Modified: head/ports-mgmt/pkg_jail/files/pkg_jail ============================================================================== --- head/ports-mgmt/pkg_jail/files/pkg_jail Wed Jan 2 13:46:49 2013 (r309817) +++ head/ports-mgmt/pkg_jail/files/pkg_jail Wed Jan 2 14:00:42 2013 (r309818) @@ -125,22 +125,17 @@ pkg_jail_create_devfs() then pkg_jail_create_dev_links ${jail_devdir} null console fi - if test ! -L "${jail_devdir}/mem" + if test ! -e "${jail_devdir}/mem" then # for libkvm (ab)users pkg_jail_create_dev_links ${jail_devdir} null mem pkg_jail_create_dev_links ${jail_devdir} null kmem fi - if test ! -L ${jail_devdir}/log + if test ! -e ${jail_devdir}/log then # Transitional symlink for old binaries pkg_jail_create_dev_links ${jail_devdir} ../var/run/log log fi - if test ! -L "${pkg_jail_dir}/var/log/console" - then - # Jail console output - pkg_jail_create_dev_links ${jail_devdir} ../var/log/console console - fi } pkg_jail_create_jail_mount() { @@ -221,7 +216,7 @@ pkg_jail_init() pkg_jail_create_devfs pkg_jail_create_jail_mount "${pkg_jail_dir}" /usr/sbin/jail -n "${pkg_jail_short}" "${pkg_jail_dir}" "${pkg_jail_hostname}" "${pkg_jail_ip}" \ - /bin/sh -c "/usr/ports/ports-mgmt/pkg_jail && make install-ports" + /bin/sh -c "cd /usr/ports/ports-mgmt/pkg_jail && make install-ports" pkg_jail_umount fi } Modified: head/ports-mgmt/pkg_jail/files/pkg_update ============================================================================== --- head/ports-mgmt/pkg_jail/files/pkg_update Wed Jan 2 13:46:49 2013 (r309817) +++ head/ports-mgmt/pkg_jail/files/pkg_update Wed Jan 2 14:00:42 2013 (r309818) @@ -1,6 +1,6 @@ #!/bin/sh -# $Id: pkg_update,v 1.70 2012/01/15 10:55:12 cvs Exp $ -# $FreeBSD$ +# $Id: pkg_update,v 1.72 2013/01/02 13:46:24 cvs Exp $ +# $FreeBSD$ # # Copyright (c) 2001-2006 # by Dirk Meyer, All rights reserved. @@ -2220,7 +2220,7 @@ check-installed-ports) pkgname=`cd "${portsdir}/${origin}" && make -V PKGNAME 2>/dev/null` if test -e "${pkg_dbdir}/${pkgname}/+CONTENTS" then - if test -e "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" + if test -s "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" then echo "${origin} (dependency)" continue @@ -2229,7 +2229,7 @@ check-installed-ports) continue fi pkgname=`pkg_info -qO ${origin}` - if test -e "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" + if test -s "${pkg_dbdir}/${pkgname}/+REQUIRED_BY" then echo "${origin} (old version, dependency)" continue
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301021400.r02E0gFg099325>