From owner-svn-ports-all@FreeBSD.ORG Thu Jul 4 17:00:45 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id 02C828AC; Thu, 4 Jul 2013 17:00:45 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oa0-x22e.google.com (mail-oa0-x22e.google.com [IPv6:2607:f8b0:4003:c02::22e]) by mx1.freebsd.org (Postfix) with ESMTP id 9E91F1160; Thu, 4 Jul 2013 17:00:44 +0000 (UTC) Received: by mail-oa0-f46.google.com with SMTP id h1so2208421oag.19 for ; Thu, 04 Jul 2013 10:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type; bh=4kmfsZznU5sQ++nZZbzqGx9XmPsKr5hziYzt3mSaVik=; b=rrFEEPPI8V45aXRQ16QfYdkbQBGg4lGdoukG39hEsG5znTMX4P2xh2A9BvBaZM4+BP ZYH4T+2h2Bv1hDP5Pyj8OOCIkv9ZGfcxZotEvGNw44HRsjkhxzur4qYcomVSmG1qGbKo i7w9yT8YsTxBl8ywSY4+TFDXEIwk35U30YmqLfvRO0uaNJIOMXVOHB4Pkpc2R58jp4AI LKfBOE/ezAFJ33bxqnpL1PSE4Nmrbqt/v/0XcM25N6vFV+SneC/ggl+4oEb4mqiH1eNw Pgrx8Wc7VC3rMi9UWCZBb4T5DA7T5S+2+liaPZSVyDmd7R2zP78NA4ym5JyW59b2KO+7 c9DA== MIME-Version: 1.0 X-Received: by 10.60.45.103 with SMTP id l7mr7059791oem.25.1372957244246; Thu, 04 Jul 2013 10:00:44 -0700 (PDT) Sender: uspoerlein@gmail.com Received: by 10.76.105.164 with HTTP; Thu, 4 Jul 2013 10:00:44 -0700 (PDT) In-Reply-To: <201307030548.r635mPu1041408@svn.freebsd.org> References: <201307030548.r635mPu1041408@svn.freebsd.org> Date: Thu, 4 Jul 2013 19:00:44 +0200 X-Google-Sender-Auth: I92VniWsBd7ZtHFtvcqinukFOpM Message-ID: Subject: Re: svn commit: r322214 - head/Mk From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= To: Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2013 17:00:45 -0000 Hey bapt 2013/7/3 Baptiste Daroussin > 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 > > 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