6 files changed, 8 insertions, 58 deletions
diff --git a/archivers/ruby-zip/Makefile b/archivers/ruby-zip/Makefile
index cc637e50066..3552dadaeda 100644
--- a/archivers/ruby-zip/Makefile
+++ b/archivers/ruby-zip/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2011/12/14 17:01:13 taca Exp $
+# $NetBSD: Makefile,v 1.8 2012/03/18 09:10:21 taca Exp $
 
-DISTNAME=	rubyzip-0.9.5
+DISTNAME=	rubyzip-0.9.6.1
 PKGNAME=	${RUBY_PKGPREFIX}-${DISTNAME:S/ruby//}
 CATEGORIES=	archivers
 
@@ -10,9 +10,6 @@ COMMENT=	Ruby module for reading and writing zip files
 LICENSE=	ruby-license
 
 pre-configure:
-	rm -f ${WRKSRC}/lib/download_quizzes.rb
-	rm -fr ${WRKSRC}/lib/quiz1
-	${CHMOD} -R g-w ${WRKSRC}
 	${CHMOD} -R -x ${WRKSRC}/Rakefile ${WRKSRC}/lib/zip/*.rb
 
 .include "../../lang/ruby/gem.mk"
diff --git a/archivers/ruby-zip/PLIST b/archivers/ruby-zip/PLIST
index a932213ecd6..d6b56ac1131 100644
--- a/archivers/ruby-zip/PLIST
+++ b/archivers/ruby-zip/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2011/12/14 17:01:13 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/03/18 09:10:21 taca Exp $
 ${GEM_HOME}/cache/${GEM_NAME}.gem
 ${GEM_LIBDIR}/NEWS
 ${GEM_LIBDIR}/README.md
@@ -8,6 +8,7 @@ ${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/dos_time.rb
 ${GEM_LIBDIR}/lib/zip/inflater.rb
 ${GEM_LIBDIR}/lib/zip/ioextras.rb
 ${GEM_LIBDIR}/lib/zip/null_compressor.rb
@@ -15,7 +16,6 @@ ${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
diff --git a/archivers/ruby-zip/distinfo b/archivers/ruby-zip/distinfo
index 8c46cebc8e3..24283c4e472 100644
--- a/archivers/ruby-zip/distinfo
+++ b/archivers/ruby-zip/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2011/12/14 17:01:13 taca Exp $
+$NetBSD: distinfo,v 1.7 2012/03/18 09:10:21 taca Exp $
 
-SHA1 (rubyzip-0.9.5.gem) = e67461e38cf98ee6b5b9fd954c0081dae5cbc8f5
-RMD160 (rubyzip-0.9.5.gem) = 79b03642189d59da0d48f0643c4fcc7d04157b60
-Size (rubyzip-0.9.5.gem) = 30720 bytes
+SHA1 (rubyzip-0.9.6.1.gem) = a2e708ab70238a262964646057c7551b55bb8ec1
+RMD160 (rubyzip-0.9.6.1.gem) = ec9c0717a844c4e1205266b0201cef014ce3895c
+Size (rubyzip-0.9.6.1.gem) = 30720 bytes
 SHA1 (patch-aa) = cf4a2adb1af57fdcb579ce2c32223bf30ca23504
 SHA1 (patch-lib_zip_deflater.rb) = 92617f7d1930e613e6f899718a0c4c69206e2c18
 SHA1 (patch-lib_zip_pass__thru__compressor.rb) = 9920116d4a76f90f43021f0521667eaabeed1580
diff --git a/archivers/ruby-zip/patches/patch-aa b/archivers/ruby-zip/patches/patch-aa
deleted file mode 100644
index ecf9c13e78f..00000000000
--- a/archivers/ruby-zip/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2010/10/06 12:27:25 taca Exp $
-
-* Fix for Ruby 1.9 from http://gist.github.com/611956.
-
---- lib/zip/stdrubyext.rb.orig	2010-10-06 01:16:09.000000000 +0000
-+++ lib/zip/stdrubyext.rb
-@@ -48,6 +48,10 @@ class String  #:nodoc:all
-   def lchop
-     slice(1, length)
-   end
-+
-+  if "".respond_to?(:bytesize)
-+    alias :bytesize :size
-+  end
- end
- 
- class Time  #:nodoc:all
diff --git a/archivers/ruby-zip/patches/patch-lib_zip_deflater.rb b/archivers/ruby-zip/patches/patch-lib_zip_deflater.rb
deleted file mode 100644
index e2d98e1886b..00000000000
--- a/archivers/ruby-zip/patches/patch-lib_zip_deflater.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
deleted file mode 100644
index 9da2cc445bc..00000000000
--- a/archivers/ruby-zip/patches/patch-lib_zip_pass__thru__compressor.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
-