diff options
| author | joerg <joerg> | 2016-04-10 17:00:33 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2016-04-10 17:00:33 +0000 |
| commit | cf2c57a6d65a232f15541d13c6c7ea152d43e808 (patch) | |
| tree | b9923c50711f7fdf6f2c18c698691dda45774ff1 | |
| parent | ea6f7aa63a4ff6dd307569818e348de42640f5db (diff) | |
| download | pkgsrc-cf2c57a6d65a232f15541d13c6c7ea152d43e808.tar.gz | |
Drop support for USE_DESTDIR=no. Bump version.
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 30 |
2 files changed, 11 insertions, 23 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 7e1461721bc..518d7227a15 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.75 2015/10/18 13:32:13 joerg Exp $ +# $NetBSD: Makefile,v 1.76 2016/04/10 17:00:33 joerg Exp $ -PKGNAME= pbulk-0.59 +PKGNAME= pbulk-0.60 COMMENT= Modular bulk build framework .include "../../pkgtools/pbulk/Makefile.common" diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 86091654571..1fc6fc903d7 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pkg-build,v 1.28 2015/10/15 11:47:47 joerg Exp $ +# $NetBSD: pkg-build,v 1.29 2016/04/10 17:00:33 joerg Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -79,7 +79,6 @@ run_make() { } run_usergroup() { - [ "${use_destdir}" != no ] || return 0 case "${usergroup_phase}" in *configure) [ "$1" != "configure" ] || ${make} create-usergroup clean @@ -126,20 +125,13 @@ if [ "$use_unprivileged_checksum" != "no" ]; then else run_checksum=run_direct fi -case "$use_destdir" in -user-destdir) +if [ "$use_destdir" = user-destdir ]; then run_build=run_su run_install=run_su - ;; -destdir) +else run_build=run_su run_install=run_direct - ;; -*) - run_build=run_direct - run_install=run_direct - ;; -esac +fi if [ `@ID@ -u` -ne 0 ]; then run_checksum=run_direct @@ -157,10 +149,8 @@ set -e mkdir -p ${bulklog}/${pkgname} rm -f ${bulklog}/${pkgname}/* -if [ "$use_destdir" = "destdir" -o "$use_destdir" = "user-destdir" ]; then - touch ${bulklog}/${pkgname}/work.log - @CHOWN@ ${unprivileged_user} ${bulklog}/${pkgname}/work.log -fi +touch ${bulklog}/${pkgname}/work.log +@CHOWN@ ${unprivileged_user} ${bulklog}/${pkgname}/work.log pkg_add_normal() { PKG_PATH=${packages}/All ${pkg_add} -K ${cur_pkgdb} "$@" @@ -207,11 +197,9 @@ run_make run_direct stage-package-create > ${bulklog}/${pkgname}/package.log 2>& pkgfile=$(run_make run_direct show-var VARNAME=STAGE_PKGFILE) -# When using DESTDIR build, add the package once to test install rules. -# This is not done for potential bootstrap packages as they might already -# be installed. -if [ "${use_destdir}" != "no" ] && \ - [ -z "${is_bootstrap}" ]; then +# Add the package once to test install rules. This is not done for +# potential bootstrap packages as they might already be installed. +if [ -z "${is_bootstrap}" ]; then if ! ${pkg_add_cmd} ${pkgfile} \ >> ${bulklog}/${pkgname}/package.log 2>&1; then cleanup |