CVS commit: pkgsrc/pkgtools/lintpkgsrc

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

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.

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@localhost

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 <abs%netbsd.org@localhost>.
 #
@@ -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});