CVS commit: pkgsrc/pkgtools/pkg_p5up2date

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 20 08:09:56 UTC 2022

Modified Files:
        pkgsrc/pkgtools/pkg_p5up2date: Makefile
        pkgsrc/pkgtools/pkg_p5up2date/files: pkg_p5up2date.pl

Log Message:
pkg_p5up2date: update to 0.07.

Write more useful entries in case 'make show-vars' fails.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/pkgtools/pkg_p5up2date/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/pkg_p5up2date/files/pkg_p5up2date.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/pkg_p5up2date/Makefile
diff -u pkgsrc/pkgtools/pkg_p5up2date/Makefile:1.21 pkgsrc/pkgtools/pkg_p5up2date/Makefile:1.22
--- pkgsrc/pkgtools/pkg_p5up2date/Makefile:1.21 Mon May 24 19:53:42 2021
+++ pkgsrc/pkgtools/pkg_p5up2date/Makefile      Sun Mar 20 08:09:55 2022
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2021/05/24 19:53:42 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2022/03/20 08:09:55 wiz Exp $
 
-PKGNAME=       pkg_p5up2date-0.06
-PKGREVISION=   7
+PKGNAME=       pkg_p5up2date-0.07
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl
diff -u pkgsrc/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl:1.5 pkgsrc/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl:1.6
--- pkgsrc/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl:1.5    Sat Apr 26 16:31:42 2014
+++ pkgsrc/pkgtools/pkg_p5up2date/files/pkg_p5up2date.pl        Sun Mar 20 08:09:56 2022
@@ -146,8 +146,10 @@ sub is_ne
 sub get_pkg_vars
 {
     my $varnames = join( " ", @_ );
-    my @vals = qx($make_bin show-vars VARNAMES="$varnames");  chomp @vals;
-    return @vals;
+    my @vals = qx($make_bin show-vars VARNAMES="$varnames");
+    my $retval = $?;
+    chomp @vals;
+    return $?, @vals;
 }
 
 sub get_inst_pkgs
@@ -300,7 +302,12 @@ my @p5_pkg_dirs = find( directory => nam
 foreach my $dn (@p5_pkg_dirs)
 {
     chdir( $dn );
-    my ($distnm, $extract_sufx, $pkgnm, $maint ) = get_pkg_vars( qw(DISTNAME EXTRACT_SUFX PKGNAME MAINTAINER) );
+    my ( $result, $distnm, $extract_sufx, $pkgnm, $maint ) = get_pkg_vars( qw(DISTNAME EXTRACT_SUFX PKGNAME MAINTAINER) );
+    if ( $result != 0) {
+       $writer->write_entry( $dn, "", "out of sync?", "n/a", "!=", "n/a", "" );
+       ++$pkgcrank;
+       next;
+    }
     my $pkgver = 0;
     if( $distnm =~ m/^(.*)-(v?[0-9].*?)$/ )
     {