Received: by mail.netbsd.org (Postfix, from userid 605) id 5AB1D84DE1; Thu, 14 Dec 2017 14:11:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DAAFD84DA6 for ; Thu, 14 Dec 2017 14:11:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id a5Hp1JW3EyFH for ; Thu, 14 Dec 2017 14:11:40 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 694B384C2E for ; Thu, 14 Dec 2017 14:11:40 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5FD3AFB40; Thu, 14 Dec 2017 14:11:40 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151326070088700" MIME-Version: 1.0 Date: Thu, 14 Dec 2017 14:11:40 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20171214141140.5FD3AFB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_151326070088700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Dec 14 14:11:40 UTC 2017 Modified Files: pkgsrc/pkgtools/lintpkgsrc: Makefile pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl Log Message: lintpkgsrc: updated to 4.93 4.93: Allow alternative location of mk.conf: if /etc/mk.conf does not exist, try PREFIX/etc/mk.conf. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 pkgsrc/pkgtools/lintpkgsrc/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151326070088700 Content-Disposition: inline Content-Length: 1532 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/lintpkgsrc/Makefile diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.26 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.27 --- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.26 Thu Jun 22 06:11:25 2017 +++ pkgsrc/pkgtools/lintpkgsrc/Makefile Thu Dec 14 14:11:40 2017 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.26 2017/06/22 06:11:25 markd Exp $ +# $NetBSD: Makefile,v 1.27 2017/12/14 14:11:40 adam Exp $ -PKGNAME= lintpkgsrc-4.92 -PKGREVISION= 2 +PKGNAME= lintpkgsrc-4.93 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.12 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.13 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.12 Thu Jun 22 06:11:25 2017 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Thu Dec 14 14:11:40 2017 @@ -1,6 +1,6 @@ #! @PERL@ -# $NetBSD: lintpkgsrc.pl,v 1.12 2017/06/22 06:11:25 markd Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.13 2017/12/14 14:11:40 adam Exp $ # Written by David Brownlee . # @@ -613,6 +613,12 @@ sub get_default_makefile_vars() { $default_vars->{$var} = $vars->{$var}; } } + elsif ( -f ${conf_prefix} . '/etc/mk.conf' && ( $vars = parse_makefile_vars(${conf_prefix} . '/etc/mk.conf') ) ) + { + foreach my $var ( keys %{$vars} ) { + $default_vars->{$var} = $vars->{$var}; + } + } if ( $opt{P} ) { $default_vars->{PKGSRCDIR} = realpath($opt{P}); --_----------=_151326070088700--