[pkgsrc/trunk]: pkgsrc/pkgtools/lintpkgsrc lintpkgsrc: updated to 4.93

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0386d0e8db92
branches:  trunk
changeset: 372700:0386d0e8db92
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Dec 14 14:11:40 2017 +0000

description:
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.

diffstat:

 pkgtools/lintpkgsrc/Makefile            |  5 ++---
 pkgtools/lintpkgsrc/files/lintpkgsrc.pl |  8 +++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 057020f50a70 -r 0386d0e8db92 pkgtools/lintpkgsrc/Makefile
--- a/pkgtools/lintpkgsrc/Makefile      Thu Dec 14 13:54:57 2017 +0000
+++ b/pkgtools/lintpkgsrc/Makefile      Thu Dec 14 14:11:40 2017 +0000
@@ -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@localhost
diff -r 057020f50a70 -r 0386d0e8db92 pkgtools/lintpkgsrc/files/lintpkgsrc.pl
--- a/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Thu Dec 14 13:54:57 2017 +0000
+++ b/pkgtools/lintpkgsrc/files/lintpkgsrc.pl   Thu Dec 14 14:11:40 2017 +0000
@@ -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 <abs%netbsd.org@localhost>.
 #
@@ -613,6 +613,12 @@
             $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});