svn commit: r308906 - in head/sysutils/bsdadminscripts: . files

[Emanuel Haupt]

On 14.12.2012, at 17:29, Bryan Drewery <bdrewery at FreeBSD.org> wrote:

> On 12/14/2012 10:24 AM, Bryan Drewery wrote:
>> On 12/14/2012 8:38 AM, Emanuel Haupt wrote:
>>> Author: ehaupt
>>> Date: Fri Dec 14 14:38:15 2012
>>> New Revision: 308906
>>> URL: http://svnweb.freebsd.org/changeset/ports/308906
>>> 
>>> Log:
>>>  Provide a patch to make pkg_libchk pkgng aware.
>>> 
>>>  PR:        174387
>>>  Approved by:    Dominic Fandrey <kamikaze at bsdforen.de> (maintainer, implicit)
>>> 
>>> Added:
>>>  head/sysutils/bsdadminscripts/files/patch-pkg_libchk
>>>     - copied, changed from r308904, head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk
>>> Deleted:
>>>  head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk
>>> Modified:
>>>  head/sysutils/bsdadminscripts/Makefile
>>> 
>>> Modified: head/sysutils/bsdadminscripts/Makefile
>>> ==============================================================================
>>> --- head/sysutils/bsdadminscripts/Makefile    Fri Dec 14 14:30:28 2012    (r308905)
>>> +++ head/sysutils/bsdadminscripts/Makefile    Fri Dec 14 14:38:15 2012    (r308906)
>>> @@ -1,13 +1,9 @@
>>> -# New ports collection makefile for:    bsdadminscripts
>>> -# Date created:        15 May 2006
>>> -# Whom:            Dominic Fandrey <lon_kamikaze at gmx.de>
>>> -#
>>> +# Created by: Dominic Fandrey <lon_kamikaze at gmx.de>
>>> # $FreeBSD$
>>> -#
>>> 
>>> PORTNAME=    bsdadminscripts
>>> PORTVERSION=    6.1.1
>>> -PORTREVISION=    1
>>> +PORTREVISION=    2
>>> CATEGORIES=    sysutils ports-mgmt
>>> MASTER_SITES=    SF/${PORTNAME}/${PORTNAME}
>>> 
>>> 
>>> Copied and modified: head/sysutils/bsdadminscripts/files/patch-pkg_libchk (from r308904, head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk)
>>> ==============================================================================
>>> --- head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk    Fri Dec 14 14:18:50 2012    (r308904, copy source)
>>> +++ head/sysutils/bsdadminscripts/files/patch-pkg_libchk    Fri Dec 14 14:38:15 2012    (r308906)
>>> @@ -1,14 +1,15 @@
>>> ---- pkg_libchk.orig    2011-07-16 21:42:34.990085774 +0400
>>> -+++ pkg_libchk    2011-07-16 21:45:53.405082081 +0400
>>> -@@ -23,6 +23,7 @@
>>> +--- ./pkg_libchk.orig    2012-12-12 19:38:36.000000000 +0100
>>> ++++ ./pkg_libchk    2012-12-12 19:40:22.000000000 +0100
>>> +@@ -23,6 +23,8 @@
>>> 
>>>  readonly name=pkg_libchk
>>>  readonly version=1.6.1
>>> +readonly osname=`uname -s`
>>> ++readonly pkgng=`make -VWITH_PKGNG`
>> 
>> 
>> This, as I understand, only reads /etc/make.conf. On CURRENT, WITH_PKGNG
>> is defined in bsd.port.mk. This should then be:
>>    make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG
>> 
>> Then it will work with /etc/make.conf, and bsd.port.mk, and respect
>> PORTSDIR.
>> 
> 
> And if there is no ports checked out, and it is binary package only,
> checking for the existence of /var/db/pkg/local.sqlite is advised, but
> it has its own problems as well, since the file may incorrectly exist,
> or its location overridden. This may become a broader discussion, but
> IMHO checking WITH_PKGNG through /usr/share/mk/bsd.port.mk is the safest.

Good point. I'll commit an updated version shortly.

Emanuel



> 
> -- 
> Regards,
> Bryan Drewery
> bdrewery at freenode/EFNet
>