Migrate ruby-gtk to use new framework for Ruby packages.

4 files changed, 24 insertions, 37 deletions

diff --git a/x11/ruby-gtk/Makefile b/x11/ruby-gtk/Makefile
index a1f91429ddc..9a40eee22ee 100644
--- a/x11/ruby-gtk/Makefile
+++ b/x11/ruby-gtk/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2004/10/03 00:18:38 tv Exp $
+# $NetBSD: Makefile,v 1.28 2004/11/28 05:57:21 taca Exp $
 # FreeBSD: ports/x11-toolkits/ruby-gtk/Makefile,v 1.16 2000/10/15 15:45:59 knu Exp
 
-DISTNAME=	ruby-gtk-0.25
-PKGNAME=	${RUBY_PKGNAMEPREFIX}gtk-0.25
-PKGREVISION=	6
+DISTNAME=	ruby-gtk-${VERSION}
+PKGNAME=	${RUBY_PKGPREFIX}-gtk-${VERSION}
 CATEGORIES=	x11 ruby
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ruby-gnome/}
 
@@ -11,19 +10,13 @@ MAINTAINER=	taca@NetBSD.org
 HOMEPAGE=	http://ruby-gnome.sourceforge.net/
 COMMENT=	Ruby interface to Gtk+ toolkits
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/ruby-//}
-USE_BUILDLINK3=	yes
-
-DIST_SUBDIR=	ruby
-USE_RUBY_EXTCONF= yes
-
-INSTALL_TARGET=	site-install
-
-DOCS_EN=	README README.EXT doc/rbbr.rb
-DOCS_JA=	README.ja README.EXT.ja
-
-do-configure:
-	@(cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb)
+VERSION=		0.34
+USE_BUILDLINK3=		yes
+USE_RUBY_EXTCONF=	yes
+USE_X11=		yes
+INSTALL_TARGET=		site-install
+DOCS_EN=		README README.EXT doc/rbbr.rb
+DOCS_JA=		README.ja README.EXT.ja
 
 post-install:
 	${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/gtk
@@ -37,8 +30,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/testgtk/* \
 		${RUBY_EXAMPLESDIR}/gtk/testgtk
 
-.include "../../lang/ruby-base/buildlink3.mk"
+.include "../../lang/ruby/modules.mk"
 .include "../../graphics/imlib/buildlink3.mk"
-
-.include "../../lang/ruby-base/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/ruby-gtk/PLIST b/x11/ruby-gtk/PLIST
index cda8af7b451..679d6f09094 100644
--- a/x11/ruby-gtk/PLIST
+++ b/x11/ruby-gtk/PLIST
@@ -1,10 +1,17 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:11:34 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/11/28 05:57:21 taca Exp $
 ${RUBY_SITEARCHLIBDIR}/gtk.so
 ${RUBY_EXAMPLESDIR}/gtk/calendar.rb
 ${RUBY_EXAMPLESDIR}/gtk/doc/rbbr.rb
 @dirrm ${RUBY_EXAMPLESDIR}/gtk/doc
+${RUBY_EXAMPLESDIR}/gtk/cursor.rb
+${RUBY_EXAMPLESDIR}/gtk/dnd.rb
 ${RUBY_EXAMPLESDIR}/gtk/drawing.rb
 ${RUBY_EXAMPLESDIR}/gtk/helloworld.rb
+${RUBY_EXAMPLESDIR}/gtk/item_factory.rb
+${RUBY_EXAMPLESDIR}/gtk/keyboard_grab.rb
+${RUBY_EXAMPLESDIR}/gtk/pointer_grab.rb
+${RUBY_EXAMPLESDIR}/gtk/t-gtkplug.rb
+${RUBY_EXAMPLESDIR}/gtk/t-gtksocket.rb
 ${RUBY_EXAMPLESDIR}/gtk/test/test.rb
 ${RUBY_EXAMPLESDIR}/gtk/test/test.xpm
 ${RUBY_EXAMPLESDIR}/gtk/test/test0.rb
@@ -43,6 +50,7 @@ ${RUBY_EXAMPLESDIR}/gtk/testgtk/dialog.rb
 ${RUBY_EXAMPLESDIR}/gtk/testgtk/dnd.rb
 ${RUBY_EXAMPLESDIR}/gtk/testgtk/entry.rb
 ${RUBY_EXAMPLESDIR}/gtk/testgtk/filesel.rb
+${RUBY_EXAMPLESDIR}/gtk/testgtk/fontselection.rb
 ${RUBY_EXAMPLESDIR}/gtk/testgtk/gammacurve.rb
 ${RUBY_EXAMPLESDIR}/gtk/testgtk/graypreview.rb
 ${RUBY_EXAMPLESDIR}/gtk/testgtk/handlebox.rb
@@ -90,4 +98,5 @@ ${RUBY_EXAMPLESDIR}/gtk/testgtk/wmhints.rb
 ${RUBY_EXAMPLESDIR}/gtk/testim.rb
 ${RUBY_EXAMPLESDIR}/gtk/text.rb
 ${RUBY_EXAMPLESDIR}/gtk/texthook.rb
+${RUBY_EXAMPLESDIR}/gtk/xbm_cursor.rb
 @dirrm ${RUBY_EXAMPLESDIR}/gtk
diff --git a/x11/ruby-gtk/distinfo b/x11/ruby-gtk/distinfo
index 10248728ece..f52e3715bf2 100644
--- a/x11/ruby-gtk/distinfo
+++ b/x11/ruby-gtk/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2001/12/16 08:18:18 jmc Exp $
+$NetBSD: distinfo,v 1.5 2004/11/28 05:57:21 taca Exp $
 
-SHA1 (ruby/ruby-gtk-0.25.tar.gz) = 8ccf112fd7c760a3bed9e9c59addb48735be22c0
-Size (ruby/ruby-gtk-0.25.tar.gz) = 257279 bytes
+SHA1 (ruby/ruby-gtk-0.34.tar.gz) = 395ed0396e5df0ae41383163b2ae2bdd51903604
+Size (ruby/ruby-gtk-0.34.tar.gz) = 283056 bytes
 SHA1 (patch-aa) = b9aa5335a9c5563b00c01559c4d047458a87339d
diff --git a/x11/ruby-gtk/patches/patch-aa b/x11/ruby-gtk/patches/patch-aa
deleted file mode 100644
index 9dc2fbb01dc..00000000000
--- a/x11/ruby-gtk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/12/16 08:18:18 jmc Exp $
-
---- extconf.rb.orig	Thu Feb 15 17:49:31 2001
-+++ extconf.rb
-@@ -21,7 +21,7 @@
-       version = `#{config_cmd} --version`
-       if not version.chomp.empty?
- 	config_libs, config_cflags = "--libs", "--cflags"
--	$LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.split(/(-l.*)/)
-+	$LDFLAGS, *libs = `#{config_cmd} #{config_libs}`.chomp.gsub("-Wl,", "").split(/( -l.*)/)
- 	$libs = libs.join(' ') + ' ' + $libs
- 	$CFLAGS = `#{config_cmd} #{config_cflags}`.chomp
- 	break