2 files changed, 148 insertions, 145 deletions

diff --git a/x11-toolkits/ruby-gtk/Makefile b/x11-toolkits/ruby-gtk/Makefile
index 7d21456728c2..2b7f8114137e 100644
--- a/x11-toolkits/ruby-gtk/Makefile
+++ b/x11-toolkits/ruby-gtk/Makefile
@@ -5,25 +5,26 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ruby-gtk
+PORTNAME=	gtk
 PORTVERSION= 	0.23
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	http://www.ruby-lang.org/gtk/download/
+PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
+DISTNAME=	ruby-${PORTNAME}-${PORTVERSION}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	yasuf@bsdclub.org
 
-BUILD_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
-RUN_DEPENDS=	ruby:${PORTSDIR}/lang/ruby
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
+USE_RUBY=	yes
+USE_RUBY_EXTCONF=	yes
+
 USE_XLIB=	yes
-WRKSRC=		${WRKDIR}/gtk-${PORTVERSION}
-PLIST_SUB=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
-RUBY?=		${LOCALBASE}/bin/ruby
-RUBY_VER?=	1.4
-RUBY_ARCH?=	${ARCH}-freebsd${OSREL}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+CONFIGURE_ARGS=	${GTK_CONFIG}
+INSTALL_TARGET=	site-install
 
 .if defined(WITHOUT_IMLIB)
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
@@ -32,23 +33,25 @@ LIB_DEPENDS+=	Imlib.5:${PORTSDIR}/graphics/imlib
 GTK_CONFIG?=	${X11BASE}/bin/imlib-config
 .endif
 
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${RUBY} extconf.rb ${GTK_CONFIG}
+post-configure:
+	${PERL} -i -pe 's/\binstall\b/site-install/g' ${WRKSRC}/Makefile
 
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${PREFIX}/lib/ruby/${RUBY_VER}
+	${INSTALL_DATA} ${WRKSRC}/lib/*.rb ${RUBY_SITELIBDIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/ruby/gtk
-	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${PREFIX}/share/examples/ruby/gtk
-	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/browser
-	${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${PREFIX}/share/examples/ruby/gtk/browser
+	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk
+	${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_EXAMPLESDIR}/gtk
+	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/browser
+	${INSTALL_DATA} ${WRKSRC}/doc/*.rb ${RUBY_EXAMPLESDIR}/gtk/browser
 .if !defined(NO_IMLIB)
-	${MKDIR} ${PREFIX}/share/examples/ruby/gtk/gdkimlib
-	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${PREFIX}/share/examples/ruby/gtk/gdkimlib
+	${MKDIR} ${RUBY_EXAMPLESDIR}/gtk/gdkimlib
+	${INSTALL_DATA} ${WRKSRC}/sample/gdkimlib/*.rb ${RUBY_EXAMPLESDIR}/gtk/gdkimlib
 .endif
-	${MKDIR} ${PREFIX}/share/doc/ruby/gtk/ja
-	${INSTALL_DATA} ${WRKSRC}/doc/api/* ${PREFIX}/share/doc/ruby/gtk
-	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${PREFIX}/share/doc/ruby/gtk/ja
+	${MKDIR} ${RUBY_DOCDIR}/gtk/ja
+	${INSTALL_DATA} ${WRKSRC}/doc/api/* ${RUBY_DOCDIR}/gtk
+	${INSTALL_DATA} ${WRKSRC}/doc/api-ja/* ${RUBY_DOCDIR}/gtk/ja
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/Mk/bsd.ruby.mk"
+.include <bsd.port.post.mk>
diff --git a/x11-toolkits/ruby-gtk/pkg-plist b/x11-toolkits/ruby-gtk/pkg-plist
index c8ecbc8bc51d..bcd4aa4b3a75 100644
--- a/x11-toolkits/ruby-gtk/pkg-plist
+++ b/x11-toolkits/ruby-gtk/pkg-plist
@@ -1,124 +1,124 @@
-lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/gtk.so
-lib/ruby/%%RUBY_VER%%/gtkcompat.rb
-share/examples/ruby/gtk/calendar.rb
-share/examples/ruby/gtk/drawing.rb
-share/examples/ruby/gtk/helloworld.rb
-share/examples/ruby/gtk/testim.rb
-share/examples/ruby/gtk/text.rb
-share/examples/ruby/gtk/texthook.rb
-share/examples/ruby/gtk/browser/gtkbrows.rb
-share/examples/ruby/gtk/browser/rbbr_gtk.rb
-share/examples/ruby/gtk/browser/rbbr_rb.rb
-share/examples/ruby/gtk/browser/rbdump.rb
-@dirrm share/examples/ruby/gtk/browser
-share/examples/ruby/gtk/gdkimlib/sample1.rb
-share/examples/ruby/gtk/gdkimlib/sample2.rb
-share/examples/ruby/gtk/gdkimlib/sample3.rb
-share/examples/ruby/gtk/gdkimlib/sample4.rb
-share/examples/ruby/gtk/gdkimlib/sample5.rb
-@dirrm share/examples/ruby/gtk/gdkimlib
-@dirrm share/examples/ruby/gtk
-share/doc/ruby/gtk/Gdk.html
-share/doc/ruby/gtk/GdkImlib.html
-share/doc/ruby/gtk/GdkImlib__Image.html
-share/doc/ruby/gtk/Gdk__Color.html
-share/doc/ruby/gtk/Gdk__Colormap.html
-share/doc/ruby/gtk/Gdk__Drawable.html
-share/doc/ruby/gtk/Gdk__Font.html
-share/doc/ruby/gtk/Gdk__GC.html
-share/doc/ruby/gtk/Gdk__IC.html
-share/doc/ruby/gtk/Gdk__ICAttr.html
-share/doc/ruby/gtk/Gdk__IM.html
-share/doc/ruby/gtk/Gdk__Image.html
-share/doc/ruby/gtk/Gdk__Point.html
-share/doc/ruby/gtk/Gdk__Rectangle.html
-share/doc/ruby/gtk/Gdk__Region.html
-share/doc/ruby/gtk/Gdk__Window.html
-share/doc/ruby/gtk/Gtk.html
-share/doc/ruby/gtk/GtkExt__Canvas.html
-share/doc/ruby/gtk/Gtk__AccelGroup.html
-share/doc/ruby/gtk/Gtk__Bin.html
-share/doc/ruby/gtk/Gtk__Box.html
-share/doc/ruby/gtk/Gtk__Button.html
-share/doc/ruby/gtk/Gtk__CList.html
-share/doc/ruby/gtk/Gtk__CTree.html
-share/doc/ruby/gtk/Gtk__Calendar.html
-share/doc/ruby/gtk/Gtk__CheckMenuItem.html
-share/doc/ruby/gtk/Gtk__ColorSelection.html
-share/doc/ruby/gtk/Gtk__ColorSelectionDialog.html
-share/doc/ruby/gtk/Gtk__Container.html
-share/doc/ruby/gtk/Gtk__Curve.html
-share/doc/ruby/gtk/Gtk__DrawingArea.html
-share/doc/ruby/gtk/Gtk__Editable.html
-share/doc/ruby/gtk/Gtk__FileSelection.html
-share/doc/ruby/gtk/Gtk__HBox.html
-share/doc/ruby/gtk/Gtk__ItemFactory.html
-share/doc/ruby/gtk/Gtk__Label.html
-share/doc/ruby/gtk/Gtk__Layout.html
-share/doc/ruby/gtk/Gtk__Notebook.html
-share/doc/ruby/gtk/Gtk__Object.html
-share/doc/ruby/gtk/Gtk__Progress.html
-share/doc/ruby/gtk/Gtk__ProgressBar.html
-share/doc/ruby/gtk/Gtk__ScrolledWindow.html
-share/doc/ruby/gtk/Gtk__TearoffMenuItem.html
-share/doc/ruby/gtk/Gtk__TipsQuery.html
-share/doc/ruby/gtk/Gtk__Toolbar.html
-share/doc/ruby/gtk/Gtk__Tree.html
-share/doc/ruby/gtk/Gtk__VBox.html
-share/doc/ruby/gtk/Gtk__Widget.html
-share/doc/ruby/gtk/Gtk__Window.html
-share/doc/ruby/gtk/gtk-index.html
-share/doc/ruby/gtk/rubyapi.css
-share/doc/ruby/gtk/ja/Gdk.html
-share/doc/ruby/gtk/ja/GdkImlib.html
-share/doc/ruby/gtk/ja/GdkImlib__Image.html
-share/doc/ruby/gtk/ja/Gdk__Color.html
-share/doc/ruby/gtk/ja/Gdk__Colormap.html
-share/doc/ruby/gtk/ja/Gdk__Drawable.html
-share/doc/ruby/gtk/ja/Gdk__Font.html
-share/doc/ruby/gtk/ja/Gdk__GC.html
-share/doc/ruby/gtk/ja/Gdk__IC.html
-share/doc/ruby/gtk/ja/Gdk__ICAttr.html
-share/doc/ruby/gtk/ja/Gdk__IM.html
-share/doc/ruby/gtk/ja/Gdk__Image.html
-share/doc/ruby/gtk/ja/Gdk__Point.html
-share/doc/ruby/gtk/ja/Gdk__Rectangle.html
-share/doc/ruby/gtk/ja/Gdk__Region.html
-share/doc/ruby/gtk/ja/Gdk__Window.html
-share/doc/ruby/gtk/ja/Gtk.html
-share/doc/ruby/gtk/ja/GtkExt__Canvas.html
-share/doc/ruby/gtk/ja/Gtk__AccelGroup.html
-share/doc/ruby/gtk/ja/Gtk__Bin.html
-share/doc/ruby/gtk/ja/Gtk__Box.html
-share/doc/ruby/gtk/ja/Gtk__Button.html
-share/doc/ruby/gtk/ja/Gtk__CList.html
-share/doc/ruby/gtk/ja/Gtk__CTree.html
-share/doc/ruby/gtk/ja/Gtk__Calendar.html
-share/doc/ruby/gtk/ja/Gtk__CheckMenuItem.html
-share/doc/ruby/gtk/ja/Gtk__ColorSelection.html
-share/doc/ruby/gtk/ja/Gtk__ColorSelectionDialog.html
-share/doc/ruby/gtk/ja/Gtk__Container.html
-share/doc/ruby/gtk/ja/Gtk__Curve.html
-share/doc/ruby/gtk/ja/Gtk__DrawingArea.html
-share/doc/ruby/gtk/ja/Gtk__Editable.html
-share/doc/ruby/gtk/ja/Gtk__FileSelection.html
-share/doc/ruby/gtk/ja/Gtk__HBox.html
-share/doc/ruby/gtk/ja/Gtk__ItemFactory.html
-share/doc/ruby/gtk/ja/Gtk__Label.html
-share/doc/ruby/gtk/ja/Gtk__Layout.html
-share/doc/ruby/gtk/ja/Gtk__Notebook.html
-share/doc/ruby/gtk/ja/Gtk__Object.html
-share/doc/ruby/gtk/ja/Gtk__Progress.html
-share/doc/ruby/gtk/ja/Gtk__ProgressBar.html
-share/doc/ruby/gtk/ja/Gtk__ScrolledWindow.html
-share/doc/ruby/gtk/ja/Gtk__TearoffMenuItem.html
-share/doc/ruby/gtk/ja/Gtk__TipsQuery.html
-share/doc/ruby/gtk/ja/Gtk__Toolbar.html
-share/doc/ruby/gtk/ja/Gtk__Tree.html
-share/doc/ruby/gtk/ja/Gtk__VBox.html
-share/doc/ruby/gtk/ja/Gtk__Widget.html
-share/doc/ruby/gtk/ja/Gtk__Window.html
-share/doc/ruby/gtk/ja/gtk-index.html
-share/doc/ruby/gtk/ja/rubyapi.css
-@dirrm share/doc/ruby/gtk/ja
-@dirrm share/doc/ruby/gtk
+%%RUBY_SITEARCHLIBDIR%%/gtk.so
+%%RUBY_SITELIBDIR%%/gtkcompat.rb
+%%RUBY_EXAMPLESDIR%%/gtk/calendar.rb
+%%RUBY_EXAMPLESDIR%%/gtk/drawing.rb
+%%RUBY_EXAMPLESDIR%%/gtk/helloworld.rb
+%%RUBY_EXAMPLESDIR%%/gtk/testim.rb
+%%RUBY_EXAMPLESDIR%%/gtk/text.rb
+%%RUBY_EXAMPLESDIR%%/gtk/texthook.rb
+%%RUBY_EXAMPLESDIR%%/gtk/browser/gtkbrows.rb
+%%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr_gtk.rb
+%%RUBY_EXAMPLESDIR%%/gtk/browser/rbbr_rb.rb
+%%RUBY_EXAMPLESDIR%%/gtk/browser/rbdump.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/gtk/browser
+%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample1.rb
+%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample2.rb
+%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample3.rb
+%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample4.rb
+%%RUBY_EXAMPLESDIR%%/gtk/gdkimlib/sample5.rb
+@dirrm %%RUBY_EXAMPLESDIR%%/gtk/gdkimlib
+@dirrm %%RUBY_EXAMPLESDIR%%/gtk
+%%RUBY_DOCDIR%%/gtk/Gdk.html
+%%RUBY_DOCDIR%%/gtk/GdkImlib.html
+%%RUBY_DOCDIR%%/gtk/GdkImlib__Image.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Color.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Colormap.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Drawable.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Font.html
+%%RUBY_DOCDIR%%/gtk/Gdk__GC.html
+%%RUBY_DOCDIR%%/gtk/Gdk__IC.html
+%%RUBY_DOCDIR%%/gtk/Gdk__ICAttr.html
+%%RUBY_DOCDIR%%/gtk/Gdk__IM.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Image.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Point.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Rectangle.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Region.html
+%%RUBY_DOCDIR%%/gtk/Gdk__Window.html
+%%RUBY_DOCDIR%%/gtk/Gtk.html
+%%RUBY_DOCDIR%%/gtk/GtkExt__Canvas.html
+%%RUBY_DOCDIR%%/gtk/Gtk__AccelGroup.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Bin.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Box.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Button.html
+%%RUBY_DOCDIR%%/gtk/Gtk__CList.html
+%%RUBY_DOCDIR%%/gtk/Gtk__CTree.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Calendar.html
+%%RUBY_DOCDIR%%/gtk/Gtk__CheckMenuItem.html
+%%RUBY_DOCDIR%%/gtk/Gtk__ColorSelection.html
+%%RUBY_DOCDIR%%/gtk/Gtk__ColorSelectionDialog.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Container.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Curve.html
+%%RUBY_DOCDIR%%/gtk/Gtk__DrawingArea.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Editable.html
+%%RUBY_DOCDIR%%/gtk/Gtk__FileSelection.html
+%%RUBY_DOCDIR%%/gtk/Gtk__HBox.html
+%%RUBY_DOCDIR%%/gtk/Gtk__ItemFactory.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Label.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Layout.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Notebook.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Object.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Progress.html
+%%RUBY_DOCDIR%%/gtk/Gtk__ProgressBar.html
+%%RUBY_DOCDIR%%/gtk/Gtk__ScrolledWindow.html
+%%RUBY_DOCDIR%%/gtk/Gtk__TearoffMenuItem.html
+%%RUBY_DOCDIR%%/gtk/Gtk__TipsQuery.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Toolbar.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Tree.html
+%%RUBY_DOCDIR%%/gtk/Gtk__VBox.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Widget.html
+%%RUBY_DOCDIR%%/gtk/Gtk__Window.html
+%%RUBY_DOCDIR%%/gtk/gtk-index.html
+%%RUBY_DOCDIR%%/gtk/rubyapi.css
+%%RUBY_DOCDIR%%/gtk/ja/Gdk.html
+%%RUBY_DOCDIR%%/gtk/ja/GdkImlib.html
+%%RUBY_DOCDIR%%/gtk/ja/GdkImlib__Image.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Color.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Colormap.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Drawable.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Font.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__GC.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__IC.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__ICAttr.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__IM.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Image.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Point.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Rectangle.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Region.html
+%%RUBY_DOCDIR%%/gtk/ja/Gdk__Window.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk.html
+%%RUBY_DOCDIR%%/gtk/ja/GtkExt__Canvas.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__AccelGroup.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Bin.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Box.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Button.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__CList.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__CTree.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Calendar.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__CheckMenuItem.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__ColorSelection.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__ColorSelectionDialog.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Container.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Curve.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__DrawingArea.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Editable.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__FileSelection.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__HBox.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__ItemFactory.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Label.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Layout.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Notebook.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Object.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Progress.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__ProgressBar.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__ScrolledWindow.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__TearoffMenuItem.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__TipsQuery.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Toolbar.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Tree.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__VBox.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Widget.html
+%%RUBY_DOCDIR%%/gtk/ja/Gtk__Window.html
+%%RUBY_DOCDIR%%/gtk/ja/gtk-index.html
+%%RUBY_DOCDIR%%/gtk/ja/rubyapi.css
+@dirrm %%RUBY_DOCDIR%%/gtk/ja
+@dirrm %%RUBY_DOCDIR%%/gtk