 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.25 2022/07/30 06:25:51 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.26 2022/07/30 06:56:40 rillig Exp $
 # Written by David Brownlee <abs@netbsd.org>.
+#
 # Caveats:
 #	The 'Makefile parsing' algorithm used to obtain package versions and
 #	DEPENDS information is geared towards speed rather than perfection,
 #	though it has gotten somewhat better over time, it only parses the
 #	simpler Makefile conditionals.
+#
 # TODO: Handle fun DEPENDS like avifile-devel with
 #			{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 use locale;
 @@ -35,27 +35,27 @@ my (
     %opt,                      # Command line options
     @matched_prebuiltpackages, # List of obsolete prebuilt package paths
     @prebuilt_pkgdirs,         # Use to follow symlinks in prebuilt pkgdirs
     %prebuilt_pkgdir_cache,    # To avoid symlink loops in prebuilt_pkgdirs
 );
 sub usage_and_exit();
 sub listdir($$);
 sub get_default_makefile_vars();
 sub fail($);
 sub parse_makefile_pkgsrc($);
 $ENV{PATH} .=
-    ":/bin:/usr/bin:/sbin:/usr/sbin:${conf_prefix}/sbin:${conf_prefix}/bin";
+    ":/bin:/usr/bin:/sbin:/usr/sbin:$conf_prefix/sbin:$conf_prefix/bin";
 if (
     !getopts('BDE:I:K:LM:OP:RSVdg:himopruyz', \%opt)
 	|| $opt{h}
 	|| !(defined $opt{d}
 	|| defined $opt{g}
 	|| defined $opt{i}
 	|| defined $opt{m}
 	|| defined $opt{o}
 	|| defined $opt{p}
 	|| defined $opt{r}
 	|| defined $opt{u}
 	|| defined $opt{B}
 @@ -334,38 +334,38 @@ sub main() {
 						if (/Required by:/) {
 							$list = 1;
 						} elsif ($list) {
 							chomp;
 							s/-\d.*//;
 							print " $_";
+						}
+					}
 					close(PKGINFO);
+				}
 				print "\n";
+			}
-			print "\nRunning '${conf_make} fetch-list | sh' for each package:\n";
+			print "\nRunning '$conf_make fetch-list | sh' for each package:\n";
 			foreach my $pkgver (@update) {
 				my ($pkgdir);
 				$pkgdir = $pkgver->var('dir');
 				if (!defined($pkgdir)) {
 					fail('Unable to determine ' . $pkgver->pkg . ' directory');
+				}
 				print "$pkgsrcdir/$pkgdir\n";
 				safe_chdir("$pkgsrcdir/$pkgdir");
-				system("${conf_make} fetch-list | sh");
+				system("$conf_make fetch-list | sh");
+			}
+		}
+	}
 	if ($opt{E}) {
 		scan_pkgsrc_makefiles($pkgsrcdir);
 		store_pkgsrc_makefiles($opt{E});
+	}
+}
 sub canonicalize_pkgname($) {
 	my ($pkgname) = @_;
 @@ -561,28 +561,28 @@ sub get_default_makefile_vars() {
 	} else {
 		$default_vars->{PKGSRCDIR} = $conf_pkgsrcdir;
+	}
 	$default_vars->{DESTDIR} = '';
 	$default_vars->{LOCALBASE} = '/usr/pkg';
 	$default_vars->{X11BASE} = '/usr/X11R6';
 	my ($vars);
 	if (-f '/etc/mk.conf' && ($vars = parse_makefile_vars('/etc/mk.conf'))) {
 		foreach my $var (keys %{$vars}) {
 			$default_vars->{$var} = $vars->{$var};
+		}
-	} elsif (-f ${conf_sysconfdir} . '/mk.conf' &&
+	} elsif (-f "$conf_sysconfdir/mk.conf" &&
-	    ($vars = parse_makefile_vars(${conf_sysconfdir} . '/mk.conf'))) {
+	    ($vars = parse_makefile_vars("$conf_sysconfdir/mk.conf"))) {
 		foreach my $var (keys %{$vars}) {
 			$default_vars->{$var} = $vars->{$var};
+		}
+	}
 	if ($opt{P}) {
 		$default_vars->{PKGSRCDIR} = realpath($opt{P});
+	}
 	if ($opt{M}) {
 		$default_vars->{DISTDIR} = realpath($opt{M});
 	} else {
 		$default_vars->{DISTDIR} ||= $default_vars->{PKGSRCDIR} . '/distfiles';
 @@ -892,27 +892,27 @@ sub parse_makefile_pkgsrc($) {
 	if (defined $vars->{PKGNAME}) {
 		debug("$file: PKGNAME=$vars->{PKGNAME}\n");
+	}
 	if (defined $vars->{DISTNAME}) {
 		debug("$file: DISTNAME=$vars->{DISTNAME}\n");
+	}
 	if (!defined $pkgname || $pkgname =~ /\$/ || $pkgname !~ /(.*)-(\d.*)/) {
 		# invoke make here as a last resort
 		my ($pkgsrcdir) = ($file =~ m:(/.*)/:);
 		debug("Running '$conf_make' in '$pkgsrcdir'\n");
 		my $pid = open3(\*WTR, \*RDR, \*ERR,
-		    "cd $pkgsrcdir || exit 1; ${conf_make} show-vars VARNAMES=PKGNAME");
+		    "cd $pkgsrcdir || exit 1; $conf_make show-vars VARNAMES=PKGNAME");
 		if (!$pid) {
 			warn "$file: Unable to run make: $!";
 		} else {
 			close(WTR);
 			my @errors = <ERR>;
 			close(ERR);
 			my ($makepkgname) = <RDR>;
 			close(RDR);
 			wait;
 			chomp @errors;
 			if (@errors) { warn "\n$file: @errors\n"; }
 			if ($makepkgname =~ /(.*)-(\d.*)/) {