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

8 files changed, 55 insertions, 50 deletions

diff --git a/graphics/ruby-gdk_pixbuf2/Makefile b/graphics/ruby-gdk_pixbuf2/Makefile
index 9ae4192a168a..41ad6399883d 100644
--- a/graphics/ruby-gdk_pixbuf2/Makefile
+++ b/graphics/ruby-gdk_pixbuf2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gdk_pixbuf2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics 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 GdkPixbuf2
 
-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=	gtk20
@@ -35,9 +34,11 @@ 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}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/graphics/ruby-gdk_pixbuf2/pkg-plist b/graphics/ruby-gdk_pixbuf2/pkg-plist
index 05f047db0ae8..d0023ca6d0d3 100644
--- a/graphics/ruby-gdk_pixbuf2/pkg-plist
+++ b/graphics/ruby-gdk_pixbuf2/pkg-plist
@@ -3,23 +3,23 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/anim.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/composite.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flip.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/floppybuddy.gif
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/format.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-foot.png
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/inline.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/loader.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pixdata.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rotate.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/save.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/scale.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/simpleanim.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/xpm.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/anim.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/composite.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/flip.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/floppybuddy.gif
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/format.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-foot.png
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/inline.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/loader.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pixdata.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/rotate.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/save.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/scale.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/simpleanim.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/utils.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/xpm.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%
diff --git a/graphics/ruby-gnomecanvas2/Makefile b/graphics/ruby-gnomecanvas2/Makefile
index 4e810f245f43..a92d0c6d046c 100644
--- a/graphics/ruby-gnomecanvas2/Makefile
+++ b/graphics/ruby-gnomecanvas2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gnomecanvas2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics ruby gnome
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,8 +18,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	Ruby binding for GnomeCanvas2
 
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
-		${RUBY_SITEARCHLIBDIR}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/libart2.so:${PORTSDIR}/graphics/ruby-libart2
 
 USE_RUBY=	yes
 USE_GNOME=	libgnomecanvas
@@ -36,9 +35,11 @@ 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}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/graphics/ruby-gnomecanvas2/pkg-plist b/graphics/ruby-gnomecanvas2/pkg-plist
index add7ef67ea46..4e7c5e944666 100644
--- a/graphics/ruby-gnomecanvas2/pkg-plist
+++ b/graphics/ruby-gnomecanvas2/pkg-plist
@@ -3,18 +3,18 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-arrowhead.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-curve.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-features.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-fifteen.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-primitives.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas-rich-text.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/canvas.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/flower.png
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/toroid.png
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas-arrowhead.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas-curve.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas-features.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas-fifteen.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas-primitives.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas-rich-text.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/canvas.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/flower.png
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/toroid.png
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%
diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile
index c5ff6b2cb77d..6e004d2aab63 100644
--- a/graphics/ruby-libart2/Makefile
+++ b/graphics/ruby-libart2/Makefile
@@ -35,9 +35,11 @@ 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}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/graphics/ruby-libart2/pkg-plist b/graphics/ruby-libart2/pkg-plist
index 91f55084735e..70e32c8e6dc4 100644
--- a/graphics/ruby-libart2/pkg-plist
+++ b/graphics/ruby-libart2/pkg-plist
@@ -4,11 +4,11 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gnome-canvas.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/rose.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/testlibart2.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gnome-canvas.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/rose.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/testlibart2.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%
diff --git a/graphics/ruby-rsvg2/Makefile b/graphics/ruby-rsvg2/Makefile
index 66ac6d66cda3..68064fd8a844 100644
--- a/graphics/ruby-rsvg2/Makefile
+++ b/graphics/ruby-rsvg2/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	rsvg2
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,8 +18,8 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	Ruby binding for librsvg2
 
-BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/gtk2.so:${PORTSDIR}/x11-toolkits/ruby-gtk2
 
 USE_RUBY=	yes
 USE_GNOME=	librsvg2
@@ -36,9 +35,11 @@ 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}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/graphics/ruby-rsvg2/pkg-plist b/graphics/ruby-rsvg2/pkg-plist
index fb35b5155f17..e312c19bfdaa 100644
--- a/graphics/ruby-rsvg2/pkg-plist
+++ b/graphics/ruby-rsvg2/pkg-plist
@@ -3,10 +3,10 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/svg-viewer.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/svg2.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/svg-viewer.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/svg2.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%