* Remove RUBY_HAS_ARCHLIB.

* Use patches and distinfo from lang/ruby18-base.
* Add support for both ruby18 and ruby19.

4 files changed, 21 insertions, 27 deletions

diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index 679d16b606b..e229d4ddd9e 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.31 2008/06/19 14:37:41 taca Exp $
+# $NetBSD: Makefile,v 1.32 2010/09/10 03:35:58 taca Exp $
 
 DISTNAME=		${RUBY_DISTNAME}
-PKGNAME=		${RUBY_PKGPREFIX}-tk-${RUBY_VERSION_SUFFIX}
+PKGNAME=		${RUBY_PKGPREFIX}-${RUBY_EXTNAME}-${RUBY_VERSION_SUFFIX}
+RUBY_EXTNAME=		tk
 CATEGORIES=		x11 ruby
 MASTER_SITES=		${MASTER_SITE_RUBY}
 
@@ -11,7 +12,6 @@ COMMENT=		Ruby interface to the Tk widget set
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-RUBY_HAS_ARCHLIB=	yes
 USE_LANGUAGES=		c
 USE_TOOLS+=		pax
 USE_RUBY_EXTCONF=	yes
diff --git a/x11/ruby-tk/PLIST b/x11/ruby-tk/PLIST
index 8f59dec069b..f5dbe7b2837 100644
--- a/x11/ruby-tk/PLIST
+++ b/x11/ruby-tk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:25:06 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/09/10 03:35:58 taca Exp $
 ${RUBY_VENDORARCHLIB}/tcltklib.${RUBY_DLEXT}
 ${RUBY_VENDORARCHLIB}/tkutil.${RUBY_DLEXT}
 ${RUBY_VENDORLIB}/multi-tk.rb
@@ -9,6 +9,7 @@ ${RUBY_VENDORLIB}/tk/after.rb
 ${RUBY_VENDORLIB}/tk/autoload.rb
 ${RUBY_VENDORLIB}/tk/bgerror.rb
 ${RUBY_VENDORLIB}/tk/bindtag.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tk/busy.rb
 ${RUBY_VENDORLIB}/tk/button.rb
 ${RUBY_VENDORLIB}/tk/canvas.rb
 ${RUBY_VENDORLIB}/tk/canvastag.rb
@@ -22,6 +23,7 @@ ${RUBY_VENDORLIB}/tk/encodedstr.rb
 ${RUBY_VENDORLIB}/tk/entry.rb
 ${RUBY_VENDORLIB}/tk/event.rb
 ${RUBY_VENDORLIB}/tk/font.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tk/fontchooser.rb
 ${RUBY_VENDORLIB}/tk/frame.rb
 ${RUBY_VENDORLIB}/tk/grid.rb
 ${RUBY_VENDORLIB}/tk/image.rb
@@ -216,20 +218,32 @@ ${RUBY_VENDORLIB}/tkextlib/pkg_checker.rb
 ${RUBY_VENDORLIB}/tkextlib/setup.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/autoscroll.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/calendar.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/canvas_sqmap.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/canvas_zoom.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/chatwidget.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/crosshair.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/ctext.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/cursor.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/dateentry.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/datefield.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/diagrams.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/dialog.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/getstring.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/history.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/ico.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/ip_entry.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/khim.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/menuentry.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/ntext.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/panelframe.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/plotchart.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/ruler.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/screenruler.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/scrolledwindow.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/scrollwin.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/setup.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/statusbar.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/style.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/superframe.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/swaplist.rb
@@ -237,6 +251,7 @@ ${RUBY_VENDORLIB}/tkextlib/tcllib/tablelist.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/tablelist_core.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/tablelist_tile.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/tkpiechart.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tcllib/toolbar.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/tooltip.rb
 ${RUBY_VENDORLIB}/tkextlib/tcllib/widget.rb
 ${RUBY_VENDORLIB}/tkextlib/tclx.rb
@@ -263,6 +278,7 @@ ${RUBY_VENDORLIB}/tkextlib/tile/treeview.rb
 ${RUBY_VENDORLIB}/tkextlib/tile/tscale.rb
 ${RUBY_VENDORLIB}/tkextlib/tile/tscrollbar.rb
 ${RUBY_VENDORLIB}/tkextlib/tile/tseparator.rb
+${PLIST.ruby19}${RUBY_VENDORLIB}/tkextlib/tile/tspinbox.rb
 ${RUBY_VENDORLIB}/tkextlib/tile/tsquare.rb
 ${RUBY_VENDORLIB}/tkextlib/tkDND.rb
 ${RUBY_VENDORLIB}/tkextlib/tkDND/setup.rb
@@ -522,6 +538,7 @@ ${RUBY_EG}/tk/irbtkw.rbw
 ${RUBY_EG}/tk/iso2022-kr.txt
 ${RUBY_EG}/tk/menubar1.rb
 ${RUBY_EG}/tk/menubar2.rb
+${PLIST.ruby19}${RUBY_EG}/tk/menubar3.rb
 ${RUBY_EG}/tk/msgs_rb/README
 ${RUBY_EG}/tk/msgs_rb/cs.msg
 ${RUBY_EG}/tk/msgs_rb/de.msg
diff --git a/x11/ruby-tk/distinfo b/x11/ruby-tk/distinfo
deleted file mode 100644
index 267c0266d46..00000000000
--- a/x11/ruby-tk/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.23 2009/06/16 15:08:38 taca Exp $
-
-SHA1 (ruby-1.8.7-p174.tar.bz2) = 9e84b49ad545ad54b8e7dc3c227eaaefeb1041aa
-RMD160 (ruby-1.8.7-p174.tar.bz2) = f854d456003af1e31d50330c88c3cb152c434249
-Size (ruby-1.8.7-p174.tar.bz2) = 4144807 bytes
-SHA1 (patch-aa) = 3e4795c80ec44b8aade5ce5ed6c2936f9f1d1e09
diff --git a/x11/ruby-tk/patches/patch-aa b/x11/ruby-tk/patches/patch-aa
deleted file mode 100644
index cf78c44be55..00000000000
--- a/x11/ruby-tk/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/01/03 14:41:21 taca Exp $
-
---- sample/tkbiff.rb.orig	2004-10-11 13:51:13.000000000 +0900
-+++ sample/tkbiff.rb
-@@ -12,7 +12,11 @@ if ARGV.length == 0
-   if ENV['MAIL']
-     $spool = ENV['MAIL']
-   else  
--    $spool = '/var/spool/mail/' + ENV['USER']
-+    dir = '/var/mail'
-+    unless FileTest.directory?(dir)
-+      dir = '/var/spool/mail'
-+    end
-+    $spool = dir + '/' + ENV['USER']
-   end
- else 
-   $spool = ARGV[0]