Update ruby-tk pacakge to 1.8.1 with new framework for Ruby packages.

4 files changed, 233 insertions, 38 deletions

diff --git a/x11/ruby-tk/Makefile b/x11/ruby-tk/Makefile
index d2485273528..a206ce19cd3 100644
--- a/x11/ruby-tk/Makefile
+++ b/x11/ruby-tk/Makefile
@@ -1,30 +1,36 @@
-# $NetBSD: Makefile,v 1.9 2004/03/17 04:13:46 taca Exp $
+# $NetBSD: Makefile,v 1.10 2004/11/27 14:50:45 taca Exp $
 # FreeBSD: ports/x11-toolkits/ruby-tk/Makefile,v 1.21 2000/10/20 19:56:04 knu Exp
 
 DISTNAME=	${RUBY_DISTNAME}
-PKGNAME=	${RUBY_PKGNAMEPREFIX}tk-${RUBY_VERSION}
-PKGREVISION=	2
+PKGNAME=	${RUBY_PKGPREFIX}-tk-${RUBY_VERSION}
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${MASTER_SITE_RUBY}
 
 MAINTAINER=	taca@NetBSD.org
-HOMEPAGE=	http://www.ruby-lang.org/en/
+HOMEPAGE=	${RUBY_HOMEPAGE}
 COMMENT=	Ruby interface to the Tk widget set
 
-DEPENDS+=	${RUBY_PKGNAMEPREFIX}tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib
+DEPENDS+=	${RUBY_PKGPREFIX}-tcltklib>=${RUBY_VERSION}:../../x11/ruby-tcltklib
 
-WRKSRC=		${RUBY_WRKSRC}/ext/tk
-DIST_SUBDIR=	ruby
+RUBY_VERSION_SUPPORTED=	18
+USE_BUILDLINK3=		yes
+USE_RUBY_EXTCONF=	yes
+USE_X11=		yes
+EXTRACT_ELEMENTS=	${RUBY_DISTNAME}/ext/tk
+WRKSRC=			${RUBY_WRKSRC}/ext/tk
 
-EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tk
-USE_RUBY_EXTCONF= yes
+REPLACE_RUBY_DIRS=	sample
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.orig' -exec rm -f {} \;
+	@${FIND} ${WRKSRC} \( -name '*.orig' -o -name '*.bak' \) \
+		-exec rm -f {} \;
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/tk
-	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/tk
+	${CP} -r ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}/tk
 
-.include "../../lang/ruby-base/Makefile.common"
+.include "../../lang/ruby/modules.mk"
+.include "../../lang/ruby/Makefile.common"
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../x11/tk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-tk/PLIST b/x11/ruby-tk/PLIST
index 52ad9bcd7cf..02f985fccac 100644
--- a/x11/ruby-tk/PLIST
+++ b/x11/ruby-tk/PLIST
@@ -1,24 +1,207 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:35 zuntum Exp $
-${RUBY_ARCHLIBDIR}/tkutil.so
-${RUBY_LIBDIR}/tk.rb
-${RUBY_LIBDIR}/tkafter.rb
-${RUBY_LIBDIR}/tkbgerror.rb
-${RUBY_LIBDIR}/tkcanvas.rb
-${RUBY_LIBDIR}/tkclass.rb
-${RUBY_LIBDIR}/tkdialog.rb
-${RUBY_LIBDIR}/tkentry.rb
-${RUBY_LIBDIR}/tkfont.rb
-${RUBY_LIBDIR}/tkmenubar.rb
-${RUBY_LIBDIR}/tkmngfocus.rb
-${RUBY_LIBDIR}/tkpalette.rb
-${RUBY_LIBDIR}/tkscrollbox.rb
-${RUBY_LIBDIR}/tktext.rb
-${RUBY_LIBDIR}/tkvirtevent.rb
+@comment $NetBSD: PLIST,v 1.2 2004/11/27 14:50:45 taca Exp $
+${RUBY_SITEARCHLIBDIR}/tkutil.so
+${RUBY_SITELIBDIR}/multi-tk.rb
+${RUBY_SITELIBDIR}/tk.rb
+${RUBY_SITELIBDIR}/tkafter.rb
+${RUBY_SITELIBDIR}/tkbgerror.rb
+${RUBY_SITELIBDIR}/tkcanvas.rb
+${RUBY_SITELIBDIR}/tkclass.rb
+${RUBY_SITELIBDIR}/tkconsole.rb
+${RUBY_SITELIBDIR}/tkdialog.rb
+${RUBY_SITELIBDIR}/tkentry.rb
+${RUBY_SITELIBDIR}/tkfont.rb
+${RUBY_SITELIBDIR}/tkmacpkg.rb
+${RUBY_SITELIBDIR}/tkmenubar.rb
+${RUBY_SITELIBDIR}/tkmngfocus.rb
+${RUBY_SITELIBDIR}/tkpalette.rb
+${RUBY_SITELIBDIR}/tkscrollbox.rb
+${RUBY_SITELIBDIR}/tktext.rb
+${RUBY_SITELIBDIR}/tkvirtevent.rb
+${RUBY_SITELIBDIR}/tkwinpkg.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/ChangeLog
+${RUBY_EXAMPLESDIR}/tk/demos-en/ChangeLog.prev
+${RUBY_EXAMPLESDIR}/tk/demos-en/README
+${RUBY_EXAMPLESDIR}/tk/demos-en/README.tkencoding
+${RUBY_EXAMPLESDIR}/tk/demos-en/arrow.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/bind.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/bitmap.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/browse1
+${RUBY_EXAMPLESDIR}/tk/demos-en/browse2
+${RUBY_EXAMPLESDIR}/tk/demos-en/button.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/check.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/clrpick.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/colors.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/cscroll.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/ctext.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/dialog1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/dialog2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/doc.org/README
+${RUBY_EXAMPLESDIR}/tk/demos-en/doc.org/README.JP
+${RUBY_EXAMPLESDIR}/tk/demos-en/doc.org/README.tk80
+${RUBY_EXAMPLESDIR}/tk/demos-en/doc.org/license.terms
+${RUBY_EXAMPLESDIR}/tk/demos-en/doc.org/license.terms.tk80
+@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-en/doc.org
+${RUBY_EXAMPLESDIR}/tk/demos-en/entry1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/entry2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/entry3.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/filebox.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/floor.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/form.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/hello
+${RUBY_EXAMPLESDIR}/tk/demos-en/hscale.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/icon.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/image1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/image2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/image3.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/earth.gif
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/earthris.gif
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/face.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/flagdown.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/flagup.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/gray25.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/grey.25
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/grey.5
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/letters.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/noletter.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/pattern.xbm
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/tcllogo.gif
+${RUBY_EXAMPLESDIR}/tk/demos-en/images/teapot.ppm
+@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-en/images
+${RUBY_EXAMPLESDIR}/tk/demos-en/items.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/ixset
+${RUBY_EXAMPLESDIR}/tk/demos-en/ixset2
+${RUBY_EXAMPLESDIR}/tk/demos-en/label.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/labelframe.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/menu.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/menu84.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/menubu.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/msgbox.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/paned1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/paned2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/patch_1.1c1
+${RUBY_EXAMPLESDIR}/tk/demos-en/plot.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/puzzle.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/radio.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/radio2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/rmt
+${RUBY_EXAMPLESDIR}/tk/demos-en/rolodex
+${RUBY_EXAMPLESDIR}/tk/demos-en/rolodex-j
+${RUBY_EXAMPLESDIR}/tk/demos-en/ruler.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/sayings.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/search.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/spin.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/square
+${RUBY_EXAMPLESDIR}/tk/demos-en/states.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/style.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/tcolor
+${RUBY_EXAMPLESDIR}/tk/demos-en/text.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/timer
+${RUBY_EXAMPLESDIR}/tk/demos-en/tkencoding.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/twind.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/unicodeout.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/vscale.rb
+${RUBY_EXAMPLESDIR}/tk/demos-en/widget
+@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-en
+${RUBY_EXAMPLESDIR}/tk/demos-jp/README
+${RUBY_EXAMPLESDIR}/tk/demos-jp/arrow.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/bind.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/bitmap.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/browse1
+${RUBY_EXAMPLESDIR}/tk/demos-jp/browse2
+${RUBY_EXAMPLESDIR}/tk/demos-jp/button.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/check.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/clrpick.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/colors.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/cscroll.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/ctext.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/dialog1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/dialog2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/doc.org/README
+${RUBY_EXAMPLESDIR}/tk/demos-jp/doc.org/README.JP
+${RUBY_EXAMPLESDIR}/tk/demos-jp/doc.org/README.tk80
+${RUBY_EXAMPLESDIR}/tk/demos-jp/doc.org/license.terms
+${RUBY_EXAMPLESDIR}/tk/demos-jp/doc.org/license.terms.tk80
+@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-jp/doc.org
+${RUBY_EXAMPLESDIR}/tk/demos-jp/entry1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/entry2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/entry3.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/filebox.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/floor.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/form.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/hello
+${RUBY_EXAMPLESDIR}/tk/demos-jp/hscale.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/icon.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/image1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/image2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/image3.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/earth.gif
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/earthris.gif
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/face.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/flagdown.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/flagup.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/gray25.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/grey.25
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/grey.5
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/letters.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/noletter.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/pattern.bmp
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/tcllogo.gif
+${RUBY_EXAMPLESDIR}/tk/demos-jp/images/teapot.ppm
+@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-jp/images
+${RUBY_EXAMPLESDIR}/tk/demos-jp/items.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/ixset
+${RUBY_EXAMPLESDIR}/tk/demos-jp/ixset2
+${RUBY_EXAMPLESDIR}/tk/demos-jp/label.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/labelframe.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/menu.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/menu84.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/menu8x.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/menubu.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/msgbox.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/paned1.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/paned2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/plot.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/puzzle.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/radio.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/radio2.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/rmt
+${RUBY_EXAMPLESDIR}/tk/demos-jp/rolodex
+${RUBY_EXAMPLESDIR}/tk/demos-jp/rolodex-j
+${RUBY_EXAMPLESDIR}/tk/demos-jp/ruler.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/sayings.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/search.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/spin.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/square
+${RUBY_EXAMPLESDIR}/tk/demos-jp/states.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/style.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/tcolor
+${RUBY_EXAMPLESDIR}/tk/demos-jp/text.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/timer
+${RUBY_EXAMPLESDIR}/tk/demos-jp/twind.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/unicodeout.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/vscale.rb
+${RUBY_EXAMPLESDIR}/tk/demos-jp/widget
+@dirrm ${RUBY_EXAMPLESDIR}/tk/demos-jp
+${RUBY_EXAMPLESDIR}/tk/resource.en
+${RUBY_EXAMPLESDIR}/tk/resource.ja
+${RUBY_EXAMPLESDIR}/tk/safe-tk.rb
+${RUBY_EXAMPLESDIR}/tk/tkalignbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkballoonhelp.rb
 ${RUBY_EXAMPLESDIR}/tk/tkbiff.rb
 ${RUBY_EXAMPLESDIR}/tk/tkbrowse.rb
+${RUBY_EXAMPLESDIR}/tk/tkcombobox.rb
 ${RUBY_EXAMPLESDIR}/tk/tkdialog.rb
 ${RUBY_EXAMPLESDIR}/tk/tkfrom.rb
 ${RUBY_EXAMPLESDIR}/tk/tkhello.rb
 ${RUBY_EXAMPLESDIR}/tk/tkline.rb
+${RUBY_EXAMPLESDIR}/tk/tkmenubutton.rb
+${RUBY_EXAMPLESDIR}/tk/tkmulticolumnlist.rb
+${RUBY_EXAMPLESDIR}/tk/tkmultilistbox.rb
+${RUBY_EXAMPLESDIR}/tk/tkmultilistframe.rb
+${RUBY_EXAMPLESDIR}/tk/tkoptdb-safeTk.rb
+${RUBY_EXAMPLESDIR}/tk/tkoptdb.rb
+${RUBY_EXAMPLESDIR}/tk/tktextframe.rb
 ${RUBY_EXAMPLESDIR}/tk/tktimer.rb
+${RUBY_EXAMPLESDIR}/tk/tktimer2.rb
+${RUBY_EXAMPLESDIR}/tk/tktimer3.rb
 @dirrm ${RUBY_EXAMPLESDIR}/tk
diff --git a/x11/ruby-tk/distinfo b/x11/ruby-tk/distinfo
index 9f97627b2a5..cbbd98cb505 100644
--- a/x11/ruby-tk/distinfo
+++ b/x11/ruby-tk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/03/24 15:01:16 taca Exp $
+$NetBSD: distinfo,v 1.5 2004/11/27 14:50:45 taca Exp $
 
-SHA1 (ruby/ruby-1.6.8.tar.gz) = 4b475ac1c837cd62b6dfe85359e1502a71b08cd1
-Size (ruby/ruby-1.6.8.tar.gz) = 1023403 bytes
-SHA1 (patch-aa) = 5475a1e164c8b77ba82309ca0a3104abd3a4e78f
+SHA1 (ruby/ruby-1.8.1.tar.gz) = 894cb1e7624b74e699d127344ce5600fc3a7d515
+Size (ruby/ruby-1.8.1.tar.gz) = 2671875 bytes
+SHA1 (patch-aa) = 7d402edea1e05172e586f5b3a7a3a230237c0058
diff --git a/x11/ruby-tk/patches/patch-aa b/x11/ruby-tk/patches/patch-aa
index 053ae465b9a..2d976986ccc 100644
--- a/x11/ruby-tk/patches/patch-aa
+++ b/x11/ruby-tk/patches/patch-aa
@@ -1,13 +1,19 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/30 08:20:26 taca Exp $
+$NetBSD: patch-aa,v 1.2 2004/11/27 14:50:45 taca Exp $
 
---- sample/tkbiff.rb.orig	Fri Aug 13 14:37:52 1999
+--- sample/tkbiff.rb.orig	2003-08-02 15:42:44.000000000 +0900
 +++ sample/tkbiff.rb
-@@ -12,7 +12,7 @@
+@@ -11,8 +11,12 @@ end
+ if ARGV.length == 0
    if ENV['MAIL']
      $spool = ENV['MAIL']
-   else  
--    $spool = '/usr/spool/mail/' + ENV['USER']
-+    $spool = '/var/mail/' + ENV['USER']
+-  else  
+-    $spool = '/var/spool/mail/' + ENV['USER']
++  else
++    dir = '/var/spool/mail'
++    unless FileTest.directory?(dir)
++      dir = '/var/mail'
++    end
++    $spool = dir + '/' + ENV['USER']
    end
  else 
    $spool = ARGV[0]