3 files changed, 38 insertions, 37 deletions
diff --git a/archivers/p5-Compress-Bzip2/Makefile b/archivers/p5-Compress-Bzip2/Makefile
index 01c2e34bbbc..f909b17c7d0 100644
--- a/archivers/p5-Compress-Bzip2/Makefile
+++ b/archivers/p5-Compress-Bzip2/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:04 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/12/05 16:29:15 he Exp $
 #
 
-DISTNAME=	Compress-Bzip2-1.01
+DISTNAME=	Compress-Bzip2-1.02
 PKGNAME=	p5-${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	archivers perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/Z/ZO/ZOOVY/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../by-authors/id/K/KC/KCARNUT/}
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Compress-Bzip2/
diff --git a/archivers/p5-Compress-Bzip2/distinfo b/archivers/p5-Compress-Bzip2/distinfo
index 9a35b02cde2..a7526194c16 100644
--- a/archivers/p5-Compress-Bzip2/distinfo
+++ b/archivers/p5-Compress-Bzip2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.2 2004/11/13 21:11:18 seb Exp $
+$NetBSD: distinfo,v 1.3 2004/12/05 16:29:15 he Exp $
 
-SHA1 (Compress-Bzip2-1.01.tar.gz) = f4007dc7f800f9bea1198bc2376830913cee43f6
-Size (Compress-Bzip2-1.01.tar.gz) = 18334 bytes
-SHA1 (patch-aa) = fc6a172067643aeb58e484f4d8b0568b8746106f
+SHA1 (Compress-Bzip2-1.02.tar.gz) = f1e0a59dfbc9f6684a522a685531f10cbd56180a
+Size (Compress-Bzip2-1.02.tar.gz) = 11501 bytes
+SHA1 (patch-aa) = 0f8d4311b11c95af7e17437c4f9b180bfecef613
diff --git a/archivers/p5-Compress-Bzip2/patches/patch-aa b/archivers/p5-Compress-Bzip2/patches/patch-aa
index 41021507402..295a5fcd929 100644
--- a/archivers/p5-Compress-Bzip2/patches/patch-aa
+++ b/archivers/p5-Compress-Bzip2/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2004/11/13 21:11:19 seb Exp $
+$NetBSD: patch-aa,v 1.2 2004/12/05 16:29:15 he Exp $
 
---- t/test.t.orig	2000-11-02 20:26:16.000000000 +0000
+--- t/test.t.orig	Tue Feb 16 15:24:51 1999
 +++ t/test.t
-@@ -1,44 +1,28 @@
+@@ -1,45 +1,26 @@
 -#! /usr/bin/env perl
 -##
 -## vi:ts=4
@@ -16,51 +16,52 @@ $NetBSD: patch-aa,v 1.1 2004/11/13 21:11:19 seb Exp $
  my $SourceString;
  my $TargetString;
  my $TargetOutString;
+-my $InputFile;
 -my $OutputFile;
--my $InputFile = "";
 -
--if ($ARGV[0]) { $InputFile=$ARGV[0]; }
--else { $InputFile='t/test.t'; }
-+my $InputFile;
- 
+-if ($ARGV[0] ne '') { $InputFile=$ARGV[0]; }
+-else { $InputFile='test.t'; }
+-
 -$OutputFile=">".$InputFile.".dek";
-+if (-d 't') {
-+	$InputFile='t/test.t';
-+} else {
-+	$InputFile='test.t';
-+}
- 
+-
 -if (-e $InputFile) {
 -    open(INPUT, $InputFile);
 -    while(<INPUT>) {
-+open(INPUT, $InputFile);
-+while(<INPUT>) {
- 	$SourceString.=$_;
+-	$SourceString.=$_;
 -    }
 -    print "\n\nDie Datei wurde eingelesen.\n";
 -    print "Die OrginalDatei hat die Groesse: ".length($SourceString)."\n\n";
 -
 -    $TargetString=Compress::Bzip2::compress($SourceString);
--
+ 
 -    print "Bzip-Com: ".length($TargetString)."\n";
 -
 -    $TargetOutString=Compress::Bzip2::decompress($TargetString);
-+}
-+ok(length($SourceString), 'test file');
- 
+-
+-
 -    print "Bzip-Dec: ".length($TargetOutString)."\n";
-+$TargetString=Compress::Bzip2::compress($SourceString);
-+ok($TargetString, 'compression');
-+#    print "Bzip-Com: ".length($TargetString)."\n";
- 
+-
 -    open(OUTPUT, $OutputFile);
 -    print OUTPUT $TargetOutString;
-+$TargetOutString=Compress::Bzip2::decompress($TargetString);
-+ok($TargetOutString, 'decompression');
++my $inputFile;
  
--}
++if (-d 't') {
++    $InputFile='t/test.t';
++} else {
++    $InputFile='test.t';
+ }
 -else {
 -    print "Datei ".$InputFile." konnte nicht geoeffnet werden.";
--}
++
++open(INPUT, $InputFile);
++while(<INPUT>) {
++    $SourceString.=$_;
+ }
 -#Ende
-+ok(length($TargetOutString) eq length($SourceString), 'compression/decompression');
++ok(length($SourceString), 'test file');
++$TargetString=Compress::Bzip2::compress($SourceString);
++ok($TargetString, 'compression');
++#    print "Bzip-Com ".length($TargetString)."\n";
++$TargetOutString=Compress::Bzip2::decompress($TargetString);
++ok($TargetOutString, 'decompression');
++ok(length($TargetOutString) eq length($SourceString), 'compress/decompress');