- Update to 0.16.0.20080706, it's more than 0.17 RC1.

- ${RUBY_SITEARCHLIBDIR} -> ${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}
  in the *_DEPENDS, that way it will finding correct file when I tweak the
  PREFIX.
- NOPORTDOCS -> NOPORTEXAMPLES on example/demo/test files.

2 files changed, 22 insertions, 21 deletions

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%%