8 files changed, 73 insertions, 62 deletions

diff --git a/devel/ruby-gconf2/Makefile b/devel/ruby-gconf2/Makefile
index a34014fec16f..0db73633ced5 100644
--- a/devel/ruby-gconf2/Makefile
+++ b/devel/ruby-gconf2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gconf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	devel gnome ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,7 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	A Ruby interface to GConf2
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 USE_RUBY=	yes
 USE_GNOME=	gconf2
@@ -35,10 +34,12 @@ DOCS=		COPYING.LIB ChangeLog README
 post-patch: general-patch
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-gconf2/pkg-plist b/devel/ruby-gconf2/pkg-plist
index 4fe61e07cd40..d28c3cdfdfd9 100644
--- a/devel/ruby-gconf2/pkg-plist
+++ b/devel/ruby-gconf2/pkg-plist
@@ -3,13 +3,13 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/basic-gconf-app.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple-controller.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simple-view.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/unittest.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/basic-gconf-app.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/simple-controller.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/simple-view.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/unittest.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%
diff --git a/devel/ruby-glib2/Makefile b/devel/ruby-glib2/Makefile
index 597c9e003f31..cada4bb54776 100644
--- a/devel/ruby-glib2/Makefile
+++ b/devel/ruby-glib2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	glib2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	devel ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -36,10 +35,12 @@ post-patch: general-patch
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_MODEXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/test/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-glib2/pkg-plist b/devel/ruby-glib2/pkg-plist
index 2eef6481204d..2fd269f2ee13 100644
--- a/devel/ruby-glib2/pkg-plist
+++ b/devel/ruby-glib2/pkg-plist
@@ -10,27 +10,34 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/bookmarkfile.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/completion.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/idle.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/iochannel.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/keyfile.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/run-test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/shell.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/spawn.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_enum.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_glib2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_iochannel.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_mkenums.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test_unicode.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/timeout.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/timeout2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/timer.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/type-register.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/type-register2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/bookmarkfile.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/completion.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/glib-test-init.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/glib-test-utils.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/idle.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/iochannel.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/keyfile.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/run-test.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/shell.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/spawn.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_enum.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_file_utils.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_glib2.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_iochannel.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_key_file.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_mkenums.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_signal.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_unicode.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_utils.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test_win32.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/timeout.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/timeout2.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/timer.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/type-register.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/type-register2.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%
diff --git a/devel/ruby-gnomevfs/Makefile b/devel/ruby-gnomevfs/Makefile
index 72d96d1530dc..209d0f81c37f 100644
--- a/devel/ruby-gnomevfs/Makefile
+++ b/devel/ruby-gnomevfs/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnomevfs
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,7 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	Ruby binding for GnomeVFS
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2
 
 USE_RUBY=	yes
 USE_GNOME=	gnomevfs2
@@ -38,9 +37,11 @@ post-patch: general-patch
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/tests/* ${RUBY_MODEXAMPLESDIR}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-gnomevfs/pkg-plist b/devel/ruby-gnomevfs/pkg-plist
index 8219e1efde27..0fd423b7e829 100644
--- a/devel/ruby-gnomevfs/pkg-plist
+++ b/devel/ruby-gnomevfs/pkg-plist
@@ -3,11 +3,11 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test3.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test1.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test2.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test3.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%
diff --git a/devel/ruby-libglade2/Makefile b/devel/ruby-libglade2/Makefile
index 19b4558db1a8..d8e6fb5f517f 100644
--- a/devel/ruby-libglade2/Makefile
+++ b/devel/ruby-libglade2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	libglade2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	devel ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,7 +18,7 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	Ruby binding for Libglade2
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 
 USE_RUBY=	yes
 USE_GNOME=	libglade2
@@ -37,13 +36,15 @@ DOCS=		COPYING.LIB ChangeLog README
 post-patch: general-patch
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}/po/ja
 	@${INSTALL_DATA} ${WRKSRC}/sample/README ${RUBY_MODEXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/sample/*.glade ${RUBY_MODEXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/sample/po/*.pot ${RUBY_MODEXAMPLESDIR}/po/
 	@${INSTALL_DATA} ${WRKSRC}/sample/po/ja/*.po ${RUBY_MODEXAMPLESDIR}/po/ja/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/devel/ruby-libglade2/pkg-plist b/devel/ruby-libglade2/pkg-plist
index 24598190eb3c..5fa08f41f56b 100644
--- a/devel/ruby-libglade2/pkg-plist
+++ b/devel/ruby-libglade2/pkg-plist
@@ -4,24 +4,24 @@ bin/ruby-glade-create-template
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/buffer.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/custom.glade
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/custom.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/l10n.glade
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/l10n_gui.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/l10n_main.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/makemo.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/ja/l10n.po
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/po/l10n.pot
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.glade
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/treeview.glade
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/treeview.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/buffer.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/custom.glade
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/custom.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/l10n.glade
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/l10n_gui.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/l10n_main.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/makemo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/po/ja/l10n.po
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/po/l10n.pot
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test.glade
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/treeview.glade
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/treeview.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po/ja
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%/po
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%