Thu Dec 14 14:11:40 2017 UTC ()

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.


(adam)

diff -r1.26 -r1.27 pkgsrc/pkgtools/lintpkgsrc/Makefile
diff -r1.12 -r1.13 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl

--- pkgsrc/pkgtools/lintpkgsrc/Makefile 2017/06/22 06:11:25 1.26
+++ pkgsrc/pkgtools/lintpkgsrc/Makefile 2017/12/14 14:11:40 1.27

 @@ -1,17 +1,16 @@
-# $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
+PKGNAME=	lintpkgsrc-4.93
 PKGREVISION=	2
 CATEGORIES=	pkgtools
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.NetBSD.org/Documentation/pkgsrc/
 COMMENT=	Sanity checks on the complete pkgsrc tree
 DEPENDS+=	digest>=20010101:../../pkgtools/digest
 CONFLICTS+=	pkglint<4.82
 USE_TOOLS+=	perl:run
 WRKSRC=		${WRKDIR}
 NO_BUILD=	yes

--- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2017/06/22 06:11:25 1.12
+++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl 2017/12/14 14:11:40 1.13

	@@ -1,16 +1,16 @@			@@ -1,16 +1,16 @@
1	#! @PERL@		1	#! @PERL@
2			2
3	# $NetBSD: lintpkgsrc.pl,v 1.12 2017/06/22 06:11:25 markd Exp $		3	# $NetBSD: lintpkgsrc.pl,v 1.13 2017/12/14 14:11:40 adam Exp $
4			4
5	# Written by David Brownlee <abs@netbsd.org>.		5	# Written by David Brownlee <abs@netbsd.org>.
6	#		6	#
7	# Caveats:		7	# Caveats:
8	# The 'Makefile parsing' algorithm used to obtain package versions and		8	# The 'Makefile parsing' algorithm used to obtain package versions and
9	# DEPENDS information is geared towards speed rather than perfection,		9	# DEPENDS information is geared towards speed rather than perfection,
10	# though it has gotten somewhat better over time, it only parses the		10	# though it has gotten somewhat better over time, it only parses the
11	# simpler Makefile conditionals.		11	# simpler Makefile conditionals.
12	#		12	#
13	# TODO: Handle fun DEPENDS like avifile-devel with		13	# TODO: Handle fun DEPENDS like avifile-devel with
14	# {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}		14	# {qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
15			15
16	$^W = 1;		16	$^W = 1;
	@@ -603,26 +603,32 @@ sub get_default_makefile_vars() {			@@ -603,26 +603,32 @@ sub get_default_makefile_vars() {
603	}		603	}
604			604
605	$default_vars->{DESTDIR} = '';		605	$default_vars->{DESTDIR} = '';
606	$default_vars->{LOCALBASE} = '/usr/pkg';		606	$default_vars->{LOCALBASE} = '/usr/pkg';
607	$default_vars->{X11BASE} = '/usr/X11R6';		607	$default_vars->{X11BASE} = '/usr/X11R6';
608			608
609	my ($vars);		609	my ($vars);
610	if ( -f '/etc/mk.conf' && ( $vars = parse_makefile_vars('/etc/mk.conf') ) )		610	if ( -f '/etc/mk.conf' && ( $vars = parse_makefile_vars('/etc/mk.conf') ) )
611	{		611	{
612	foreach my $var ( keys %{$vars} ) {		612	foreach my $var ( keys %{$vars} ) {
613	$default_vars->{$var} = $vars->{$var};		613	$default_vars->{$var} = $vars->{$var};
614	}		614	}
615	}		615	}
			616	elsif ( -f ${conf_prefix} . '/etc/mk.conf' && ( $vars = parse_makefile_vars(${conf_prefix} . '/etc/mk.conf') ) )
			617	{
			618	foreach my $var ( keys %{$vars} ) {
			619	$default_vars->{$var} = $vars->{$var};
			620	}
			621	}
616			622
617	if ( $opt{P} ) {		623	if ( $opt{P} ) {
618	$default_vars->{PKGSRCDIR} = realpath($opt{P});		624	$default_vars->{PKGSRCDIR} = realpath($opt{P});
619	}		625	}
620			626
621	if ( $opt{M} ) {		627	if ( $opt{M} ) {
622	$default_vars->{DISTDIR} = realpath($opt{M});		628	$default_vars->{DISTDIR} = realpath($opt{M});
623	}		629	}
624	else {		630	else {
625	$default_vars->{DISTDIR} \|\|= $default_vars->{PKGSRCDIR} . '/distfiles';		631	$default_vars->{DISTDIR} \|\|= $default_vars->{PKGSRCDIR} . '/distfiles';
626	}		632	}
627			633
628	if ( $opt{K} ) {		634	if ( $opt{K} ) {