5 files changed, 42 insertions, 42 deletions

diff --git a/x11/ruby-gnome2-all/Makefile b/x11/ruby-gnome2-all/Makefile
index 8a197c283869..46e0a77fc022 100644
--- a/x11/ruby-gnome2-all/Makefile
+++ b/x11/ruby-gnome2-all/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnome2-all
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 ruby gnome
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
@@ -18,16 +17,16 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	The "meta-port" for Ruby/GNOME2
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \
-		${RUBY_SITEARCHLIBDIR}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \
-		${RUBY_SITEARCHLIBDIR}/gtkmozembed.so:${PORTSDIR}/www/ruby-gtkmozembed \
-		${RUBY_SITEARCHLIBDIR}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs \
-		${RUBY_SITEARCHLIBDIR}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \
-		${RUBY_SITEARCHLIBDIR}/gtkglext.so:${PORTSDIR}/x11-toolkits/ruby-gtkglext \
-		${RUBY_SITEARCHLIBDIR}/gtksourceview.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview \
-		${RUBY_SITEARCHLIBDIR}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui \
-		${RUBY_SITEARCHLIBDIR}/panelapplet2.so:${PORTSDIR}/x11-toolkits/ruby-panelapplet \
-		${RUBY_SITEARCHLIBDIR}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gconf2.so:${PORTSDIR}/devel/ruby-gconf2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkhtml2.so:${PORTSDIR}/www/ruby-gtkhtml2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkmozembed.so:${PORTSDIR}/www/ruby-gtkmozembed \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomevfs.so:${PORTSDIR}/devel/ruby-gnomevfs \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/rsvg2.so:${PORTSDIR}/graphics/ruby-rsvg2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtkglext.so:${PORTSDIR}/x11-toolkits/ruby-gtkglext \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtksourceview.so:${PORTSDIR}/x11-toolkits/ruby-gtksourceview \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomeprintui2.so:${PORTSDIR}/x11-toolkits/ruby-gnomeprintui \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/panelapplet2.so:${PORTSDIR}/x11-toolkits/ruby-panelapplet \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libglade2.so:${PORTSDIR}/devel/ruby-libglade2
 
 USE_RUBY=	yes
 
diff --git a/x11/ruby-gnome2/Makefile b/x11/ruby-gnome2/Makefile
index baa7bca5f216..ec06d44df069 100644
--- a/x11/ruby-gnome2/Makefile
+++ b/x11/ruby-gnome2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnome2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 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 set of Ruby bindings for GNOME2
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gnomecanvas2.so:${PORTSDIR}/graphics/ruby-gnomecanvas2
 
 USE_RUBY=	yes
 USE_GNOME=	libgnomeui
@@ -39,10 +38,12 @@ post-build:
 	@${CP} ${RUBY_GNOME_WRKSRC}/README ${WRKSRC}/README.gnome2-all
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${RUBY_MODEXAMPLESDIR}/test-gnome
 	@${INSTALL_DATA} ${WRKSRC}/sample/*.rb ${RUBY_MODEXAMPLESDIR}/
 	@${INSTALL_DATA} ${WRKSRC}/sample/test-gnome/* ${RUBY_MODEXAMPLESDIR}/test-gnome/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS_EN}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common
index 944c059c4755..20c98dac306b 100644
--- a/x11/ruby-gnome2/Makefile.common
+++ b/x11/ruby-gnome2/Makefile.common
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-RUBY_GNOME_VERSION=		0.16.0.20080315 #YYYYMMDD
+RUBY_GNOME_VERSION=		0.16.0.20080706 #YYYYMMDD
 #RUBY_GNOME_SNAPSHOTDATE=	20061130
 .if defined(RUBY_GNOME_SNAPSHOTDATE)
 RUBY_GNOME_PORTVERSION=		${RUBY_GNOME_VERSION}.${RUBY_GNOME_SNAPSHOTDATE}
diff --git a/x11/ruby-gnome2/distinfo b/x11/ruby-gnome2/distinfo
index 2b250d43fdcf..5f327be96afc 100644
--- a/x11/ruby-gnome2/distinfo
+++ b/x11/ruby-gnome2/distinfo
@@ -1,3 +1,3 @@
-MD5 (ruby/ruby-gnome2-all-0.16.0.20080315.tar.gz) = 6bb008df0d5df7289794f9f84046fb8c
-SHA256 (ruby/ruby-gnome2-all-0.16.0.20080315.tar.gz) = cd77a5f62e75d985f6fb864ccf63192bfcdcdd0191250c609740aede50927e40
-SIZE (ruby/ruby-gnome2-all-0.16.0.20080315.tar.gz) = 1390288
+MD5 (ruby/ruby-gnome2-all-0.16.0.20080706.tar.gz) = 3c2eb1ad6f8757d482f0fe8ed065cc27
+SHA256 (ruby/ruby-gnome2-all-0.16.0.20080706.tar.gz) = 9d1a03d8b8b1eec3022cae9dd930aaac3ea6e54c3259d1892d67b2f16e9eff40
+SIZE (ruby/ruby-gnome2-all-0.16.0.20080706.tar.gz) = 1471558
diff --git a/x11/ruby-gnome2/pkg-plist b/x11/ruby-gnome2/pkg-plist
index 7212878e5b30..22e18280246e 100644
--- a/x11/ruby-gnome2/pkg-plist
+++ b/x11/ruby-gnome2/pkg-plist
@@ -5,30 +5,30 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README.gnome2-all
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-app-helper.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-config.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-druid.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-program.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-sound.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-trigger.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/about.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/app-helper.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/bomb.xpm
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/color-picker.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/dateedit.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/file-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/font-picker.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/href.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-list.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/pixmap-entry.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome-app.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test-gnome
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-app-helper.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-config.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-druid.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-program.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-sound.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-trigger.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/about.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/app-helper.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/bomb.xpm
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/color-picker.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/dateedit.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/entry.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/file-entry.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/font-picker.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/href.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-entry.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/icon-list.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/pixmap-entry.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome-app.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/test-gnome/test-gnome.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%/test-gnome
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%