diff options
| author | jperkin <jperkin@pkgsrc.org> | 2012-06-19 13:40:07 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2012-06-19 13:40:07 +0000 |
| commit | 0351f8f979c0775e941ee67171e31df079854760 (patch) | |
| tree | 8bae38ea5ca4ab6a13cc25d556b7b1ae4a9b2671 /pkgtools | |
| parent | de480131d47bd6731d6431f35647b206e6986b05 (diff) | |
| download | pkgsrc-0351f8f979c0775e941ee67171e31df079854760.tar.gz | |
pbulk-0.50: Portability fix, use 'id' instead of 'whoami'.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 6 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 2572ca0751d..49d0cdcf24f 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.63 2012/05/20 20:12:02 joerg Exp $ +# $NetBSD: Makefile,v 1.64 2012/06/19 13:40:07 jperkin Exp $ -DISTNAME= pbulk-0.49 +DISTNAME= pbulk-0.50 COMMENT= Modular bulk build framework PKG_DESTDIR_SUPPORT= user-destdir @@ -33,7 +33,7 @@ SUBST_FILES.tools= pbulk.conf scripts/build scripts/build-client-start \ scripts/compute-packages.awk scripts/create-broken-graph.awk \ scripts/create-report-html.awk scripts/create-report-txt.awk \ scripts/create-report.awk -SUBST_VARS.tools= AWK BZIP2 CHOWN DIGEST GZIP_CMD MAIL_CMD NEATO \ +SUBST_VARS.tools= AWK BZIP2 CHOWN DIGEST GZIP_CMD ID MAIL_CMD NEATO \ PBULK_CONFIG PBULK_CONFIG_VERSION PKG_ADD_CMD \ PKG_DELETE_CMD PKG_INFO_CMD PREFIX SED SH TAR \ TARGET_MAKE diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build index 8ce6c4a19e8..b95edba1a53 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.23 2011/09/21 11:55:15 joerg Exp $ +# $NetBSD: pkg-build,v 1.24 2012/06/19 13:40:07 jperkin Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -124,7 +124,7 @@ destdir) ;; esac -if [ `whoami` != "root" ]; then +if [ `@ID@ -u` -ne 0 ]; then run_build=run_direct run_install=run_direct fi |