CVS commit: pkgsrc/pkgtools/url2pkg/files

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Fri Sep 13 05:38:28 UTC 2019

Modified Files:
        pkgsrc/pkgtools/url2pkg/files: url2pkg.pl

Log Message:
pkgtools/url2pkg: refactor code for determining WRKSRC into separate sub


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/pkgtools/url2pkg/files/url2pkg.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/url2pkg/files/url2pkg.pl
diff -u pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.70 pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.71
--- pkgsrc/pkgtools/url2pkg/files/url2pkg.pl:1.70       Thu Sep 12 18:23:00 2019
+++ pkgsrc/pkgtools/url2pkg/files/url2pkg.pl    Fri Sep 13 05:38:27 2019
@@ -1,5 +1,5 @@
 #! @PERL5@
-# $NetBSD: url2pkg.pl,v 1.70 2019/09/12 18:23:00 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.71 2019/09/13 05:38:27 rillig Exp $
 #
 
 # Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -333,8 +333,8 @@ sub read_dependencies($$$) {
                        push(@dep_lines, [ $1, $2, $3 || ">=0", $4 || "" ]);
                } elsif ($line =~ qr"^var\t(\S+)\t(.+)$") {
                        $main::update_vars{$1} = $2;
-               } else {
-                       printf STDERR "url2pkg: unknown dependency line: %s\n", $line;
+               } elsif ($line ne "") {
+                       printf STDERR "url2pkg: info: unknown dependency line: %s\n", $line;
                }
        }
 
@@ -716,15 +716,8 @@ sub adjust_lines_python_module($$) {
        }
 }
 
-sub adjust_package_from_extracted_distfiles($) {
-       my ($url) = @_;
-
-       chomp($abs_wrkdir = `$make show-var VARNAME=WRKDIR`);
-
-       #
-       # Determine the value of WRKSRC.
-       #
-
+# sets $abs_wrksrc depending on $abs_wrkdir and the files found there.
+sub determine_wrksrc() {
        my @files = ();
        opendir(WRKDIR, $abs_wrkdir) or die;
        while (defined(my $f = readdir(WRKDIR))) {
@@ -746,7 +739,13 @@ sub adjust_package_from_extracted_distfi
                    ((@files > 1) ? " # More than one possibility -- please check manually." : "")));
                $abs_wrksrc = $abs_wrkdir;
        }
+}
+
+sub adjust_package_from_extracted_distfiles($) {
+       my ($url) = @_;
 
+       chomp($abs_wrkdir = `$make show-var VARNAME=WRKDIR`);
+       determine_wrksrc();
        chomp(@wrksrc_files = `cd "$abs_wrksrc" && find * -type f -print`);
        chomp(@wrksrc_dirs = `cd "$abs_wrksrc" && find * -type d -print`);