Date: Fri, 14 Dec 2012 10:29:25 -0600 From: Bryan Drewery <bdrewery@freebsd.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, Emanuel Haupt <ehaupt@freebsd.org>, ports-committers@freebsd.org Subject: Re: svn commit: r308906 - in head/sysutils/bsdadminscripts: . files Message-ID: <50CB53E5.1090208@FreeBSD.org> In-Reply-To: <50CB52D8.80401@FreeBSD.org> References: <201212141438.qBEEcGeZ079018@svn.freebsd.org> <50CB52D8.80401@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig22224C7C5346F5827D5856DF Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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. >> =20 >> PR: 174387 >> Approved by: Dominic Fandrey <kamikaze@bsdforen.de> (maintainer, imp= licit) >> >> Added: >> head/sysutils/bsdadminscripts/files/patch-pkg_libchk >> - copied, changed from r308904, head/sysutils/bsdadminscripts/fil= es/patch-src::pkg_libchk >> Deleted: >> head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk >> Modified: >> head/sysutils/bsdadminscripts/Makefile >> >> Modified: head/sysutils/bsdadminscripts/Makefile >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/sysutils/bsdadminscripts/Makefile Fri Dec 14 14:30:28 2012 (r= 308905) >> +++ head/sysutils/bsdadminscripts/Makefile Fri Dec 14 14:38:15 2012 (r= 308906) >> @@ -1,13 +1,9 @@ >> -# New ports collection makefile for: bsdadminscripts >> -# Date created: 15 May 2006 >> -# Whom: Dominic Fandrey <lon_kamikaze@gmx.de> >> -# >> +# Created by: Dominic Fandrey <lon_kamikaze@gmx.de> >> # $FreeBSD$ >> -# >> =20 >> PORTNAME=3D bsdadminscripts >> PORTVERSION=3D 6.1.1 >> -PORTREVISION=3D 1 >> +PORTREVISION=3D 2 >> CATEGORIES=3D sysutils ports-mgmt >> MASTER_SITES=3D SF/${PORTNAME}/${PORTNAME} >> =20 >> >> Copied and modified: head/sysutils/bsdadminscripts/files/patch-pkg_lib= chk (from r308904, head/sysutils/bsdadminscripts/files/patch-src::pkg_lib= chk) >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- 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 @@ >> =20 >> readonly name=3Dpkg_libchk >> readonly version=3D1.6.1 >> +readonly osname=3D`uname -s` >> ++readonly pkgng=3D`make -VWITH_PKGNG` >=20 >=20 > This, as I understand, only reads /etc/make.conf. On CURRENT, WITH_PKGN= G > is defined in bsd.port.mk. This should then be: > make -f /usr/share/mk/bsd.port.mk -V WITH_PKGNG >=20 > Then it will work with /etc/make.conf, and bsd.port.mk, and respect > PORTSDIR. >=20 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.= --=20 Regards, Bryan Drewery bdrewery@freenode/EFNet --------------enig22224C7C5346F5827D5856DF Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (MingW32) Comment: Using GnuPG with undefined - http://www.enigmail.net/ iQIcBAEBAgAGBQJQy1PlAAoJEG54KsA8mwz5npsP/jVBzo+q2cE8ths+89p4yEC0 yZrtEHh268LNpvPtR3GYrQC63LEpjBK5acz4Q0ruMHvegI/LPS9oVQ89EOprmM9l bApSltrGq6mZCJm/wuroR1O0uScAtAOO+21Wa9QTcdxtXt+LTqL05oJ3qGmnoojI NfMKYNgCYZjrOSUn3k+NyvcbCUTKJttdgm1EP+6BNYkbbFL+88MG3qjG4bCzPbDx 0YRpxfDrvNg3rSunj5ORJHtpVpsijtV+A0qBSZo3DCAU42EoF0RzI3am/iZ6rdOs W3nKVk39UbT0HfgK7q08MqKFsrwOj5FqxBRQlUJQnuM3jSpuDmNhEZmtmk1GK5fX Rw0EUWIa3/dRjMVjCKSBkXVNlwZfvAzJIOhj+ixh2g5yLidrcMC3GqkqFI5mM49t e6FrE0BeKC5gjBufqdL/VRifsM546x7ytNTjhHHAfI8gOlhNfGeM+IeQ1Bzc82qx RRLS8SNTBRe3FAr94UCHWDnEDes0mfAlvdLvIGG4gZ5hhMaaVCm50Qkx32pArF2J s3OgNtkBdsPZsDaMf1XRw7U8o75tjf3xnKUtvwIROPMbIkdATR+Se80HAomcxP72 BPDU58mi2c77NhzSya0zrCslY5X0u69pn3M6UH1geoh0yAnwciYBm0TX89H2h2xo nNe9OHlO26s0OHWiY0Zg =MfiX -----END PGP SIGNATURE----- --------------enig22224C7C5346F5827D5856DF--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50CB53E5.1090208>