svn commit: r322214 - head/Mk

[Bryan Drewery]

On 7/4/2013 12:00 PM, Ulrich Spörlein wrote:
> Hey bapt
> 
> 2013/7/3 Baptiste Daroussin <bapt at freebsd.org <mailto:bapt at 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 <http://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 at gmail.com
>     <mailto:yar.tikhiy at gmail.com>>
> 
>     Modified:
>       head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>
> 
>     Modified: head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>
>     ==============================================================================
>     --- head/Mk/bsd.pkgng.mk <http://bsd.pkgng.mk>        Wed Jul  3
>     03:01:20 2013        (r322213)
>     +++ head/Mk/bsd.pkgng.mk <http://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 <http://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.

I've just committed a fix to both pkg and bsd.pkgng.mk.

The fix is required in bsd.pkgng.mk to be backwards compatible with
older pkg releases. It can eventually come out though.

> 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


-- 
Regards,
Bryan Drewery

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 899 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20130705/6ffd86a0/attachment.sig>