2 files changed, 20 insertions, 5 deletions

diff --git a/x11-toolkits/ruby-gtk2/Makefile b/x11-toolkits/ruby-gtk2/Makefile
index 6daf8c31fb38..e9794526fa3b 100644
--- a/x11-toolkits/ruby-gtk2/Makefile
+++ b/x11-toolkits/ruby-gtk2/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	gtk2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -18,12 +17,12 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	Ruby binding for GTK+2
 
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango
 RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/atk.so:${PORTSDIR}/accessibility/ruby-atk \
 		${RUBY_SITEARCHLIBDIR}/gdk_pixbuf2.so:${PORTSDIR}/graphics/ruby-gdk_pixbuf2 \
 		${RUBY_SITEARCHLIBDIR}/pango.so:${PORTSDIR}/x11-toolkits/ruby-pango
 
 USE_RUBY=	yes
-USE_XLIB=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 USE_RUBY_EXTCONF=	yes
@@ -38,8 +37,11 @@ DOCS=		COPYING.LIB ChangeLog README
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share|${X11BASE}/share|g' \
 		${WRKSRC}/sample/gtk-demo/common.rb
-	@${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g' \
-		${WRKSRC}/sample/testgtk/testgtkrc
+	@${REINPLACE_CMD} -e 's|local/bin/ruby|bin/env ruby|g' \
+		${WRKSRC}/sample/misc/*.rb
+	@${REINPLACE_CMD} -e 's|/usr/local/share|${X11BASE}/share|g ; \
+		s|local/bin/ruby|bin/env ruby|g' \
+			${WRKSRC}/sample/testgtk/testgtk*
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
diff --git a/x11-toolkits/ruby-gtk2/pkg-plist b/x11-toolkits/ruby-gtk2/pkg-plist
index 0d8041ea1e7a..d6e3db7ccf13 100644
--- a/x11-toolkits/ruby-gtk2/pkg-plist
+++ b/x11-toolkits/ruby-gtk2/pkg-plist
@@ -7,21 +7,29 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/alphatest.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/apple-red.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/appwindow.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/background.jpg
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/button_box.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/changedisplay.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/clipboard.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/colorsel.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/common.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/dialog.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/drawingarea.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/editable_cells.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/entry_completion.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/expander.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/floppybuddy.gif
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-applets.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-calendar.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-foot.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-fs-directory.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-fs-regular.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-gimp.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-gmush.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnome-gsame.png
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gnu-keys.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/gtk-logo-rgb.gif
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/iconview.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/images.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/item_factory.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/list_store.rb
@@ -29,18 +37,20 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/menus.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/panes.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/pixbufs.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/rotated_text.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/ruby-gnome2-logo.png
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/sizegroup.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/stock_browser.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/textview.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gtk-demo/tree_store.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/aboutdialog2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/bindings.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/button2.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/buttonbox.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/calendar.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/checkbutton.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/color_font_button.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/combo_check.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/combobox.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/cursor.rb
@@ -66,6 +76,8 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/label.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/listview.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/menu.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/misc_button.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pangorenderer.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/pointer_grab.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/properties.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/radiobutton.rb
@@ -80,6 +92,7 @@
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/to_drawable.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/togglebutton.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/toolbar.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/tree_progress.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treemodelfilter.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/treeview.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/misc/uimanager.rb