2 files changed, 19 insertions, 18 deletions

diff --git a/x11-toolkits/ruby-pango/Makefile b/x11-toolkits/ruby-pango/Makefile
index 2ade70770e1d..144b781c32cb 100644
--- a/x11-toolkits/ruby-pango/Makefile
+++ b/x11-toolkits/ruby-pango/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	pango
 PORTVERSION=	${RUBY_GNOME_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	x11-toolkits ruby
 MASTER_SITES=	${RUBY_GNOME_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${RUBY_GNOME_MASTER_SITE_SUBDIR}
@@ -19,9 +18,9 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	mezz@FreeBSD.org
 COMMENT=	Ruby binding for Pango
 
-BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
-RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
-		${RUBY_SITEARCHLIBDIR}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+BUILD_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
+RUN_DEPENDS=	${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/glib2.so:${PORTSDIR}/devel/ruby-glib2 \
+		${RUBY_SITEARCHLIBDIR:S/${PREFIX}/${LOCALBASE}/}/cairo.so:${PORTSDIR}/graphics/ruby-cairo
 
 USE_RUBY=	yes
 USE_GNOME=	pango
@@ -40,9 +39,11 @@ 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}/
+.endif
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
diff --git a/x11-toolkits/ruby-pango/pkg-plist b/x11-toolkits/ruby-pango/pkg-plist
index c70da7a73d2c..5656c6e912f3 100644
--- a/x11-toolkits/ruby-pango/pkg-plist
+++ b/x11-toolkits/ruby-pango/pkg-plist
@@ -5,19 +5,19 @@
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/COPYING.LIB
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/ChangeLog
 %%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/attribute.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/break.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/gdk_layout.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/glyphstring.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/item.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/label.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/layout.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/pango_cairo.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/parse.rb
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/sample.txt
-%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/script.rb
-%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
-%%PORTDOCS%%@dirrmtry %%RUBY_EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/attribute.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/break.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/gdk_layout.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/glyphstring.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/item.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/label.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/layout.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/pango_cairo.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/parse.rb
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/sample.txt
+%%PORTEXAMPLES%%%%RUBY_MODEXAMPLESDIR%%/script.rb
+%%PORTEXAMPLES%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrmtry %%RUBY_EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%
 %%PORTDOCS%%@dirrmtry %%RUBY_DOCDIR%%
 @dirrmtry %%RUBY_SITEARCHLIBDIR%%