From c39570e298ddc654251558492e27077a0ee06255 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Fri, 1 Jun 2001 01:26:59 +0000
Subject: Silence some warnings. Patch submitted by Ben Collver in pkg/13029.

---
 pkgtools/bsdpak/distinfo         |  4 ++--
 pkgtools/bsdpak/patches/patch-aa | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/bsdpak/distinfo b/pkgtools/bsdpak/distinfo
index efe37cf23b5..8c32d657ffb 100644
--- a/pkgtools/bsdpak/distinfo
+++ b/pkgtools/bsdpak/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/18 15:16:01 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/06/01 01:26:59 wiz Exp $
 
 SHA1 (bsdpak-0.40.tar.gz) = 5e09a536271faea56693642aeb3b168f13ce98be
 Size (bsdpak-0.40.tar.gz) = 2852 bytes
-SHA1 (patch-aa) = 93314c8e2ec83531264a8304c5ae6bf7ddd3f797
+SHA1 (patch-aa) = 0452ac2b37896831a6fc7f07c28ab136ff3f3ae6
diff --git a/pkgtools/bsdpak/patches/patch-aa b/pkgtools/bsdpak/patches/patch-aa
index 7ee8938ff39..d4c29c8c17c 100644
--- a/pkgtools/bsdpak/patches/patch-aa
+++ b/pkgtools/bsdpak/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/12/09 00:44:05 wiz Exp $
+$NetBSD: patch-aa,v 1.2 2001/06/01 01:26:59 wiz Exp $
 
---- bsdpak.pl.orig	Thu Nov  9 08:32:49 2000
-+++ bsdpak.pl	Fri Nov 10 10:36:04 2000
+--- bsdpak.pl.orig	Tue Sep 12 01:57:06 2000
++++ bsdpak.pl	Thu May 24 07:22:09 2001
 @@ -16,7 +16,23 @@
  my @indexPackagesOutput;
  
@@ -107,16 +107,20 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/12/09 00:44:05 wiz Exp $
    print @printOut;
  }
  
-@@ -336,10 +377,11 @@
+@@ -336,10 +377,15 @@
    while(1) {
      ($p1, $v1) = split(/\./, $v1, 2);
      ($p2, $v2) = split(/\./, $v2, 2);
 -  
++    if (!defined($v1)) { $v1 = "" };
++    if (!defined($v2)) { $v2 = "" };
++    if (!defined($p1)) { $p1 = "" };
++    if (!defined($p2)) { $p2 = "" };
 + 
      if (($p1 eq "") && ($p2 eq "")) { return 0; }
 -    elsif ($p1 != $p2) { return $p1 <=> $p2; }
 -    elsif ($p1 ne $p2) { return $p1 cmp $p2; }
-+    if (($p1 =~ /^\d*$/) && ($p2 =~ /^\d*$/)) {
++    if (($p1 =~ /^\d+$/) && ($p2 =~ /^\d+$/)) {
 +      if ($p1 != $p2) { return $p1 <=> $p2; }
 +    } elsif ($p1 ne $p2) { return $p1 cmp $p2; }
    }
-- 
cgit v1.2.3