Date: Thu, 4 Jul 2013 19:00:44 +0200 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@FreeBSD.org> To: Baptiste Daroussin <bapt@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r322214 - head/Mk Message-ID: <CAJ9axoTar9p5UFPg%2BZyyUf_hRNkREKrcUWb%2BUef5_SKjXRKZ9A@mail.gmail.com> In-Reply-To: <201307030548.r635mPu1041408@svn.freebsd.org> References: <201307030548.r635mPu1041408@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hey bapt 2013/7/3 Baptiste Daroussin <bapt@freebsd.org> > Author: bapt > Date: Wed Jul 3 05:48:25 2013 > New Revision: 322214 > URL: http://svnweb.freebsd.org/changeset/ports/322214 > > Log: > pkg2ng is calling directly bsd.pkgng.mk if present which will fail > because of the lack of UID. > Define it if not already defined earlier > > Submitted by: Yar Tikhiy <yar.tikhiy@gmail.com> > > Modified: > head/Mk/bsd.pkgng.mk > > Modified: head/Mk/bsd.pkgng.mk > > ============================================================================== > --- head/Mk/bsd.pkgng.mk Wed Jul 3 03:01:20 2013 (r322213) > +++ head/Mk/bsd.pkgng.mk Wed Jul 3 05:48:25 2013 (r322214) > @@ -36,6 +36,11 @@ ACTUAL-PACKAGE-DEPENDS?= \ > ${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " > ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || > : ; \ > fi > > +# Redifine pkg2ng calls durectly bsd.pkgng.mk and needs it > Umm, spellcheck please? A proper sentence would also be appreciated. > + > +.if !defined(UID) > +UID!= ${ID} -u > +.endif > This is ridiculous and I'd put the fix in pkg2ng. It already verifies that it's run by root, so you just need to pass UID=0 on the make(1) command line there. Furthermore, ${ID} is not defined here, so I'm not quite sure if this fix does anything at all (or if you can override this in any way, in which case "id -u" would have sufficed). Cheers, Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoTar9p5UFPg%2BZyyUf_hRNkREKrcUWb%2BUef5_SKjXRKZ9A>