Add ruby 1.9 support (and drop 1.8 support).

PR 46764 by Miwa Susumu.

11 files changed, 151 insertions, 37 deletions

diff --git a/mail/quickml/Makefile b/mail/quickml/Makefile
index 41c602a3f5e..44133ddfb26 100644
--- a/mail/quickml/Makefile
+++ b/mail/quickml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/10/03 03:42:58 taca Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/11 13:51:20 obache Exp $
 #
 
 DISTNAME=	quickml-0.7
@@ -16,8 +16,7 @@ GNU_CONFIGURE=	yes
 USE_LANGUAGES=	# none
 RCD_SCRIPTS+=	quickml
 
-# Dose not care for Ruby 1.9's character encoding for now.
-RUBY_VERSION_SUPPORTED= 18
+RUBY_VERSION_SUPPORTED= 192 193
 
 QUICKML_USER=	quickml
 QUICKML_GROUP=	quickml
diff --git a/mail/quickml/distinfo b/mail/quickml/distinfo
index a3acffef643..b0898e8efb0 100644
--- a/mail/quickml/distinfo
+++ b/mail/quickml/distinfo
@@ -1,7 +1,14 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/06/19 10:01:53 obache Exp $
+$NetBSD: distinfo,v 1.2 2012/08/11 13:51:20 obache Exp $
 
 SHA1 (quickml-0.7.tar.gz) = 7122a100840d16762e101e62993752401e95e5bb
 RMD160 (quickml-0.7.tar.gz) = bc34b93676eb342a450bc1a2d3b92d7a06603872
 Size (quickml-0.7.tar.gz) = 94147 bytes
-SHA1 (patch-Makefile.in) = e451853e4c0542a948b9772f308fa5087e994a3c
-SHA1 (patch-quickml-analog.in) = 83f385a9eb84ace4dbb0b1d0527caad3810c6efa
+SHA1 (patch-Makefile.in) = d1c73befff63dac3f76dad27d70460527f2a1e2a
+SHA1 (patch-lib_quickml_config.rb) = f47e92e2cd2c89c2d400cca8813c5a82466cec18
+SHA1 (patch-lib_quickml_core.rb) = 21cb461fb98ca369934e05941be009ca82bcd73b
+SHA1 (patch-lib_quickml_gettext.rb) = 47f693fb71830781e28dac0e318da03c0caf684b
+SHA1 (patch-lib_quickml_mail.rb) = b80ea8007b73a7e2b736a08392f5e2153356c6b3
+SHA1 (patch-lib_quickml_utils.rb) = 1cb00ffacb3045504b1af59113a5a93327b0bad7
+SHA1 (patch-messages.ja) = bf82d499b0498844fcdd1371e240870d5c1a17f0
+SHA1 (patch-quickml-analog.in) = 834d549051bad5495cac7677eb56f4c0c0f38f2e
+SHA1 (patch-quickml.in) = cab3c2b7d4357f4b3870819cbde21faa1fd39944
diff --git a/mail/quickml/patches/patch-Makefile.in b/mail/quickml/patches/patch-Makefile.in
index d8d3a2ad245..67f2d86af44 100644
--- a/mail/quickml/patches/patch-Makefile.in
+++ b/mail/quickml/patches/patch-Makefile.in
@@ -1,10 +1,20 @@
-$NetBSD: patch-Makefile.in,v 1.1.1.1 2011/06/19 10:01:53 obache Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2012/08/11 13:51:20 obache Exp $
 
-(1) fix copy&paste&modify error?
-(2) $(quickmlstatedir) will be handled by pkgsrc framework.
+(1) exactly specify KANJI code for ruby-1.9
+(2) fix copy&paste&modify error?
+(3) $(quickmlstatedir) will be handled by pkgsrc framework.
 
 --- Makefile.in.orig	2004-06-07 10:21:36.000000000 +0000
 +++ Makefile.in
+@@ -605,7 +605,7 @@ uninstall-info: uninstall-info-recursive
+ 
+ quickml: quickml.in
+ 	for i in $(MESSAGES); do\
+-	  $(RUBY) lib/quickml/gettext.rb $$i quickml.in lib/quickml/*.rb;\
++	  $(RUBY) -Ke lib/quickml/gettext.rb $$i quickml.in lib/quickml/*.rb;\
+ 	done
+ 	rm -f quickml
+ 	sed -e 's!%RUBY%!$(RUBY)!g' \
 @@ -626,7 +626,7 @@ quickml-ctl: quickml-ctl.in Makefile
  		-e 's!%PIDFILE%!$(PIDFILE)!g' \
  		quickml-ctl.in > quickml-ctl
diff --git a/mail/quickml/patches/patch-lib_quickml_config.rb b/mail/quickml/patches/patch-lib_quickml_config.rb
new file mode 100644
index 00000000000..14d47f54569
--- /dev/null
+++ b/mail/quickml/patches/patch-lib_quickml_config.rb
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_quickml_config.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* for ruby-1.9
+
+--- lib/quickml/config.rb.orig	2004-06-07 08:50:59.000000000 +0000
++++ lib/quickml/config.rb
+@@ -62,7 +62,7 @@ module QuickML
+       @confirm_ml_creation = (config[:confirm_ml_creation] or false)
+ 
+       instance_variables.each {|name|
+-	self.class.class_eval { attr_reader name.delete('@') }
++	self.class.class_eval { attr_reader name.to_s.delete('@') }
+       }
+     end
+ 
diff --git a/mail/quickml/patches/patch-lib_quickml_core.rb b/mail/quickml/patches/patch-lib_quickml_core.rb
new file mode 100644
index 00000000000..f625b6bcd81
--- /dev/null
+++ b/mail/quickml/patches/patch-lib_quickml_core.rb
@@ -0,0 +1,19 @@
+$NetBSD: patch-lib_quickml_core.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* specify character coding system with ruby-1.9 way
+
+--- lib/quickml/core.rb.orig	2004-06-08 20:15:11.000000000 +0000
++++ lib/quickml/core.rb
+@@ -1,3 +1,4 @@
++#coding: euc-jp
+ #
+ # quickml/core - a part of quickml server
+ #
+@@ -8,7 +9,6 @@
+ # You can redistribute it and/or modify it under the terms of 
+ # the GNU General Public License version 2.
+ #
+-$KCODE='e'
+ require 'quickml/utils'
+ require 'quickml/gettext'
+ 
diff --git a/mail/quickml/patches/patch-lib_quickml_gettext.rb b/mail/quickml/patches/patch-lib_quickml_gettext.rb
new file mode 100644
index 00000000000..792da91b63d
--- /dev/null
+++ b/mail/quickml/patches/patch-lib_quickml_gettext.rb
@@ -0,0 +1,11 @@
+$NetBSD: patch-lib_quickml_gettext.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* specify character coding system with ruby-1.9 way
+
+--- lib/quickml/gettext.rb.orig	2004-06-07 08:50:59.000000000 +0000
++++ lib/quickml/gettext.rb
+@@ -1,3 +1,4 @@
++#coding: euc-jp
+ #
+ # quickml/gettext - a part of quickml server
+ #
diff --git a/mail/quickml/patches/patch-lib_quickml_mail.rb b/mail/quickml/patches/patch-lib_quickml_mail.rb
new file mode 100644
index 00000000000..44567dfe869
--- /dev/null
+++ b/mail/quickml/patches/patch-lib_quickml_mail.rb
@@ -0,0 +1,11 @@
+$NetBSD: patch-lib_quickml_mail.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* specify character coding system with ruby-1.9 way
+
+--- lib/quickml/mail.rb.orig	2004-06-07 08:50:59.000000000 +0000
++++ lib/quickml/mail.rb
+@@ -1,3 +1,4 @@
++#coding: euc-jp
+ #
+ # quickml/mail - a part of quickml server
+ #
diff --git a/mail/quickml/patches/patch-lib_quickml_utils.rb b/mail/quickml/patches/patch-lib_quickml_utils.rb
new file mode 100644
index 00000000000..fac5211f4ac
--- /dev/null
+++ b/mail/quickml/patches/patch-lib_quickml_utils.rb
@@ -0,0 +1,24 @@
+$NetBSD: patch-lib_quickml_utils.rb,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* specify character coding system with ruby-1.9 way
+* use fileutils instead of deprecated ftools
+
+--- lib/quickml/utils.rb.orig	2004-06-07 08:50:59.000000000 +0000
++++ lib/quickml/utils.rb
+@@ -1,3 +1,4 @@
++#coding: euc-jp
+ #
+ # quickml/utils - a part of quickml server
+ #
+@@ -8,10 +9,9 @@
+ # You can redistribute it and/or modify it under the terms of 
+ # the GNU General Public License version 2.
+ #
+-$KCODE = 'e'
+ require 'kconv'
+ require 'net/smtp'
+-require 'ftools'
++require 'fileutils'
+ 
+ class TooLongLine < Exception; end
+ class IO
diff --git a/mail/quickml/patches/patch-messages.ja b/mail/quickml/patches/patch-messages.ja
new file mode 100644
index 00000000000..3181a7bfbc4
--- /dev/null
+++ b/mail/quickml/patches/patch-messages.ja
@@ -0,0 +1,11 @@
+$NetBSD: patch-messages.ja,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* specify character coding system with ruby-1.9 way
+
+--- messages.ja.orig	2004-06-07 08:50:58.000000000 +0000
++++ messages.ja
+@@ -1,3 +1,4 @@
++#coding: euc-jp
+ # -*- mode: ruby -*-
+ Messages = {
+   "<%s> was removed from the mailing list:\n<%s>\n" =>
diff --git a/mail/quickml/patches/patch-quickml-analog.in b/mail/quickml/patches/patch-quickml-analog.in
index 93338323c54..4cfa5727112 100644
--- a/mail/quickml/patches/patch-quickml-analog.in
+++ b/mail/quickml/patches/patch-quickml-analog.in
@@ -1,52 +1,39 @@
-$NetBSD: patch-quickml-analog.in,v 1.1.1.1 2011/06/19 10:01:53 obache Exp $
+$NetBSD: patch-quickml-analog.in,v 1.2 2012/08/11 13:51:20 obache Exp $
 
+* for ruby-1.9 (use fileutils instead of deprecated ftools)
 * gnuplot>=4.0 support.
 
 --- quickml-analog.in.orig	2004-06-07 08:50:59.000000000 +0000
 +++ quickml-analog.in
-@@ -15,6 +15,7 @@ require 'getoptlong'
- require 'ftools'
+@@ -12,9 +12,10 @@
+ #
+ 
+ require 'getoptlong'
+-require 'ftools'
++require 'fileutils'
  require 'time'
  require 'cgi'
 +require 'open3'
  
  class Array
    def tail (n)
-@@ -395,19 +396,40 @@ class QuickMLPlot
+@@ -395,6 +396,12 @@ class QuickMLPlot
    end
  
    def add_basic (f)
--    f.print '
--    set grid
--    set timefmt "%y%m%d%H"
--    set xdata time
--    set size ratio 0.76
--    set linestyle 1 linetype 1 linewidth 5
--    set linestyle 2 linetype 3 linewidth 5
--    set linestyle 3 linetype 2 linewidth 5
--    set linestyle 4 linetype 4 linewidth 5
--    set linestyle 5 linetype 5 linewidth 5
--    set linestyle 6 linetype 7 linewidth 5
 +    Open3.popen3( "gnuplot" ) { |stdin, stdout, stderr|
 +      stdin.puts "show version"
 +      stdin.close
 +      stderr.read[/[Vv]ersion (\d+\.\d+)/]
 +    }
 +    if ( Float( $1 ) < 4.0 ) then
-+      f.print '
-+      set grid
-+      set timefmt "%y%m%d%H"
-+      set xdata time
-+      set size ratio 0.76
-+      set linestyle 1 linetype 1 linewidth 5
-+      set linestyle 2 linetype 3 linewidth 5
-+      set linestyle 3 linetype 2 linewidth 5
-+      set linestyle 4 linetype 4 linewidth 5
-+      set linestyle 5 linetype 5 linewidth 5
-+      set linestyle 6 linetype 7 linewidth 5
+     f.print '
+     set grid
+     set timefmt "%y%m%d%H"
+@@ -408,6 +415,21 @@ class QuickMLPlot
+     set linestyle 6 linetype 7 linewidth 5
  
--    '.gsub(/^    /, "")
-+      '.gsub(/^    /, "")
+     '.gsub(/^    /, "")
 +    else
 +       f.print '
 +       set grid
diff --git a/mail/quickml/patches/patch-quickml.in b/mail/quickml/patches/patch-quickml.in
new file mode 100644
index 00000000000..6c1a4a48e89
--- /dev/null
+++ b/mail/quickml/patches/patch-quickml.in
@@ -0,0 +1,20 @@
+$NetBSD: patch-quickml.in,v 1.1 2012/08/11 13:51:20 obache Exp $
+
+* sepcify character coding system with ruby-1.9 way
+
+--- quickml.in.orig	2004-06-07 08:50:58.000000000 +0000
++++ quickml.in
+@@ -1,4 +1,5 @@
+ #! %RUBY%
++#coding: euc-jp
+ # -*- mode: ruby -*-
+ #
+ # quickml - an easy-to-use mailing list server
+@@ -11,7 +12,6 @@
+ # the GNU General Public License version 2.
+ #
+ 
+-$KCODE = "e"
+ require 'quickml'
+ 
+ def error (msg)