diff options
| author | dinoex <dinoex@FreeBSD.org> | 2013-10-01 04:37:58 +0800 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2013-10-01 04:37:58 +0800 |
| commit | 73a67fd610cd13dc33415d183201fdd0361218e7 (patch) | |
| tree | 4d4bf54d514837b0ca807df3e9fab4050de1c226 | |
| parent | 820dcceef248ee579f07b3b0917029541bb8039c (diff) | |
| download | freebsd-ports-gnome-73a67fd610cd13dc33415d183201fdd0361218e7.tar.gz freebsd-ports-gnome-73a67fd610cd13dc33415d183201fdd0361218e7.tar.zst freebsd-ports-gnome-73a67fd610cd13dc33415d183201fdd0361218e7.zip | |
- update to 1.73
support for packages with STAGEDIR
| -rw-r--r-- | ports-mgmt/pkg_jail/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/pkg_jail/files/pkg_update | 31 |
2 files changed, 26 insertions, 7 deletions
diff --git a/ports-mgmt/pkg_jail/Makefile b/ports-mgmt/pkg_jail/Makefile index 1f5d54d285fc..3797974fdb04 100644 --- a/ports-mgmt/pkg_jail/Makefile +++ b/ports-mgmt/pkg_jail/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg_jail -PORTVERSION= 1.72 +PORTVERSION= 1.73 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 2798196cf877..489257cf0635 100644 --- a/ports-mgmt/pkg_jail/files/pkg_update +++ b/ports-mgmt/pkg_jail/files/pkg_update @@ -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` |