Update ruby-zip package to 0.9.5.

Exact changes are unknown.

6 files changed, 62 insertions, 54 deletions

diff --git a/archivers/ruby-zip/Makefile b/archivers/ruby-zip/Makefile
index 25f59d342e1..cc637e50066 100644
--- a/archivers/ruby-zip/Makefile
+++ b/archivers/ruby-zip/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/10/06 12:27:24 taca Exp $
+# $NetBSD: Makefile,v 1.7 2011/12/14 17:01:13 taca Exp $
 
-DISTNAME=	rubyzip-0.9.4
+DISTNAME=	rubyzip-0.9.5
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby//}
-PKGREVISION=	1
 CATEGORIES=	archivers
 
 MAINTAINER=	minskim@NetBSD.org
diff --git a/archivers/ruby-zip/PLIST b/archivers/ruby-zip/PLIST
index 5b9e4e6d784..a932213ecd6 100644
--- a/archivers/ruby-zip/PLIST
+++ b/archivers/ruby-zip/PLIST
@@ -1,36 +1,38 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:03:11 joerg Exp $
-${GEM_HOME}/cache/rubyzip-${PKGVERSION}.gem
-${GEM_LIBDIR}/ChangeLog
+@comment $NetBSD: PLIST,v 1.6 2011/12/14 17:01:13 taca Exp $
+${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/NEWS
-${GEM_LIBDIR}/README
+${GEM_LIBDIR}/README.md
 ${GEM_LIBDIR}/Rakefile
 ${GEM_LIBDIR}/TODO
-${GEM_LIBDIR}/install.rb
+${GEM_LIBDIR}/lib/zip/compressor.rb
+${GEM_LIBDIR}/lib/zip/constants.rb
+${GEM_LIBDIR}/lib/zip/decompressor.rb
+${GEM_LIBDIR}/lib/zip/deflater.rb
+${GEM_LIBDIR}/lib/zip/inflater.rb
 ${GEM_LIBDIR}/lib/zip/ioextras.rb
+${GEM_LIBDIR}/lib/zip/null_compressor.rb
+${GEM_LIBDIR}/lib/zip/null_decompressor.rb
+${GEM_LIBDIR}/lib/zip/null_input_stream.rb
+${GEM_LIBDIR}/lib/zip/pass_thru_compressor.rb
+${GEM_LIBDIR}/lib/zip/pass_thru_decompressor.rb
 ${GEM_LIBDIR}/lib/zip/stdrubyext.rb
 ${GEM_LIBDIR}/lib/zip/tempfile_bugfixed.rb
 ${GEM_LIBDIR}/lib/zip/zip.rb
+${GEM_LIBDIR}/lib/zip/zip_central_directory.rb
+${GEM_LIBDIR}/lib/zip/zip_entry.rb
+${GEM_LIBDIR}/lib/zip/zip_entry_set.rb
+${GEM_LIBDIR}/lib/zip/zip_extra_field.rb
+${GEM_LIBDIR}/lib/zip/zip_file.rb
+${GEM_LIBDIR}/lib/zip/zip_input_stream.rb
+${GEM_LIBDIR}/lib/zip/zip_output_stream.rb
+${GEM_LIBDIR}/lib/zip/zip_streamable_directory.rb
+${GEM_LIBDIR}/lib/zip/zip_streamable_stream.rb
 ${GEM_LIBDIR}/lib/zip/zipfilesystem.rb
-${GEM_LIBDIR}/lib/zip/ziprequire.rb
 ${GEM_LIBDIR}/samples/example.rb
 ${GEM_LIBDIR}/samples/example_filesystem.rb
+${GEM_LIBDIR}/samples/example_recursive.rb
 ${GEM_LIBDIR}/samples/gtkRubyzip.rb
 ${GEM_LIBDIR}/samples/qtzip.rb
 ${GEM_LIBDIR}/samples/write_simple.rb
 ${GEM_LIBDIR}/samples/zipfind.rb
-${GEM_LIBDIR}/test/alltests.rb
-${GEM_LIBDIR}/test/data/file1.txt
-${GEM_LIBDIR}/test/data/file1.txt.deflatedData
-${GEM_LIBDIR}/test/data/file2.txt
-${GEM_LIBDIR}/test/data/notzippedruby.rb
-${GEM_LIBDIR}/test/data/rubycode.zip
-${GEM_LIBDIR}/test/data/rubycode2.zip
-${GEM_LIBDIR}/test/data/testDirectory.bin
-${GEM_LIBDIR}/test/data/zipWithDirs.zip
-${GEM_LIBDIR}/test/gentestfiles.rb
-${GEM_LIBDIR}/test/ioextrastest.rb
-${GEM_LIBDIR}/test/stdrubyexttest.rb
-${GEM_LIBDIR}/test/zipfilesystemtest.rb
-${GEM_LIBDIR}/test/ziprequiretest.rb
-${GEM_LIBDIR}/test/ziptest.rb
-${GEM_HOME}/specifications/rubyzip-${PKGVERSION}.gemspec
+${GEM_HOME}/specifications/${GEM_NAME}.gemspec
diff --git a/archivers/ruby-zip/distinfo b/archivers/ruby-zip/distinfo
index b2b5cdb84b5..8c46cebc8e3 100644
--- a/archivers/ruby-zip/distinfo
+++ b/archivers/ruby-zip/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/10/06 12:27:24 taca Exp $
+$NetBSD: distinfo,v 1.6 2011/12/14 17:01:13 taca Exp $
 
-SHA1 (rubyzip-0.9.4.gem) = ac20083eef1903cc5e4044ebb1ea3aad39a49e4a
-RMD160 (rubyzip-0.9.4.gem) = b6b46d44d20bb26562e39d114191f6334ea707a0
-Size (rubyzip-0.9.4.gem) = 66048 bytes
+SHA1 (rubyzip-0.9.5.gem) = e67461e38cf98ee6b5b9fd954c0081dae5cbc8f5
+RMD160 (rubyzip-0.9.5.gem) = 79b03642189d59da0d48f0643c4fcc7d04157b60
+Size (rubyzip-0.9.5.gem) = 30720 bytes
 SHA1 (patch-aa) = cf4a2adb1af57fdcb579ce2c32223bf30ca23504
-SHA1 (patch-ab) = 1de9812d6ec77594d0ee83b6aad94ec7346bfd94
+SHA1 (patch-lib_zip_deflater.rb) = 92617f7d1930e613e6f899718a0c4c69206e2c18
+SHA1 (patch-lib_zip_pass__thru__compressor.rb) = 9920116d4a76f90f43021f0521667eaabeed1580
diff --git a/archivers/ruby-zip/patches/patch-ab b/archivers/ruby-zip/patches/patch-ab
deleted file mode 100644
index 9e5aebc177e..00000000000
--- a/archivers/ruby-zip/patches/patch-ab
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2010/10/06 12:27:25 taca Exp $
-
-* Fix for Ruby 1.9 from http://gist.github.com/611956.
-
---- lib/zip/zip.rb.orig	2010-10-06 01:16:09.000000000 +0000
-+++ lib/zip/zip.rb
-@@ -1080,7 +1080,7 @@ module Zip
-     def << (data)
-       val = data.to_s
-       @crc = Zlib::crc32(val, @crc)
--      @size += val.size
-+      @size += val.bytesize
-       @outputStream << val
-     end
- 
-@@ -1109,7 +1109,7 @@ module Zip
-     def << (data)
-       val = data.to_s
-       @crc = Zlib::crc32(val, @crc)
--      @size += val.size
-+      @size += val.bytesize
-       @outputStream << @zlibDeflater.deflate(data)
-     end
- 
diff --git a/archivers/ruby-zip/patches/patch-lib_zip_deflater.rb b/archivers/ruby-zip/patches/patch-lib_zip_deflater.rb
new file mode 100644
index 00000000000..e2d98e1886b
--- /dev/null
+++ b/archivers/ruby-zip/patches/patch-lib_zip_deflater.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_zip_deflater.rb,v 1.1 2011/12/14 17:01:13 taca Exp $
+
+o Use bytesize.
+
+--- lib/zip/deflater.rb.orig	2011-12-13 22:22:33.000000000 +0000
++++ lib/zip/deflater.rb
+@@ -11,7 +11,7 @@ module Zip
+     def << (data)
+       val = data.to_s
+       @crc = Zlib::crc32(val, @crc)
+-      @size += val.size
++      @size += val.bytesize
+       @outputStream << @zlibDeflater.deflate(data)
+     end
+ 
diff --git a/archivers/ruby-zip/patches/patch-lib_zip_pass__thru__compressor.rb b/archivers/ruby-zip/patches/patch-lib_zip_pass__thru__compressor.rb
new file mode 100644
index 00000000000..9da2cc445bc
--- /dev/null
+++ b/archivers/ruby-zip/patches/patch-lib_zip_pass__thru__compressor.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_zip_pass__thru__compressor.rb,v 1.1 2011/12/14 17:01:13 taca Exp $
+
+o Use bytesize.
+
+--- lib/zip/pass_thru_compressor.rb.orig	2011-12-13 22:22:33.000000000 +0000
++++ lib/zip/pass_thru_compressor.rb
+@@ -10,7 +10,7 @@ module Zip
+     def << (data)
+       val = data.to_s
+       @crc = Zlib::crc32(val, @crc)
+-      @size += val.size
++      @size += val.bytesize
+       @outputStream << val
+     end
+