From owner-svn-ports-all@FreeBSD.ORG Fri Dec 14 16:42:24 2012 Return-Path: Delivered-To: svn-ports-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4125EB1D; Fri, 14 Dec 2012 16:42:24 +0000 (UTC) (envelope-from ehaupt@critical.ch) Received: from mx.critical.ch (cl-8.zrh-02.ch.sixxs.net [IPv6:2001:1620:f00:7::2]) by mx1.freebsd.org (Postfix) with ESMTP id A1FCA8FC1A; Fri, 14 Dec 2012 16:42:23 +0000 (UTC) Received: from [10.135.225.136] (113-232.197-178.cust.bluewin.ch [178.197.232.113]) (authenticated bits=0) by mx.critical.ch (8.14.4/8.14.4/critical-1.0) with ESMTP id qBEGgIMe048190; Fri, 14 Dec 2012 17:42:19 +0100 (CET) (envelope-from ehaupt@critical.ch) References: <201212141438.qBEEcGeZ079018@svn.freebsd.org> <50CB52D8.80401@FreeBSD.org> <50CB53E5.1090208@FreeBSD.org> In-Reply-To: <50CB53E5.1090208@FreeBSD.org> Mime-Version: 1.0 (1.0) Content-Type: text/plain; charset=us-ascii Message-Id: <4F3A8AFF-BAE7-414E-9004-D629563E1EA0@critical.ch> Content-Transfer-Encoding: quoted-printable X-Mailer: iPhone Mail (9A405) From: Emanuel Haupt Subject: Re: svn commit: r308906 - in head/sysutils/bsdadminscripts: . files Date: Fri, 14 Dec 2012 17:42:09 +0100 To: Bryan Drewery Cc: "svn-ports-head@FreeBSD.org" , "svn-ports-all@FreeBSD.org" , Emanuel Haupt , "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: Fri, 14 Dec 2012 16:42:24 -0000 On 14.12.2012, at 17:29, Bryan Drewery 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 >>>=20 >>> Log: >>> Provide a patch to make pkg_libchk pkgng aware. >>>=20 >>> PR: 174387 >>> Approved by: Dominic Fandrey (maintainer, imp= licit) >>>=20 >>> 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 >>>=20 >>> 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 = (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 >>> -# >>> +# Created by: Dominic Fandrey >>> # $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 >>>=20 >>> Copied and modified: head/sysutils/bsdadminscripts/files/patch-pkg_libch= k (from r308904, head/sysutils/bsdadminscripts/files/patch-src::pkg_libchk) >>> =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 1= 4: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_PKGNG >> 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 >=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. Good point. I'll commit an updated version shortly. Emanuel >=20 > --=20 > Regards, > Bryan Drewery > bdrewery@freenode/EFNet >=20