diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2013-09-30 20:37:58 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2013-09-30 20:37:58 +0000 |
| commit | f589798dd1dd81fee1c373fb29fea872fa55b5cd (patch) | |
| tree | 4d4bf54d514837b0ca807df3e9fab4050de1c226 /ports-mgmt/pkg_jail | |
| parent | d0d208cd218074e87ea21bd98d25ad4f4463b4c7 (diff) | |
| download | ports-f589798dd1dd81fee1c373fb29fea872fa55b5cd.tar.gz ports-f589798dd1dd81fee1c373fb29fea872fa55b5cd.zip | |
- update to 1.73
support for packages with STAGEDIR
Notes
Notes:
svn path=/head/; revision=328867
Diffstat (limited to 'ports-mgmt/pkg_jail')
| -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` |