2 files changed, 13 insertions, 15 deletions

diff --git a/devel/ruby-flex_rb/Makefile b/devel/ruby-flex_rb/Makefile
index 957a514d63f7..722be52a7227 100644
--- a/devel/ruby-flex_rb/Makefile
+++ b/devel/ruby-flex_rb/Makefile
@@ -28,13 +28,13 @@ post-patch:
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${RUBY_EXAMPLESDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODEXAMPLESDIR}
 .for f in ${EXAMPLES}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_EXAMPLESDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODEXAMPLESDIR}/
 .endfor
-	${MKDIR} ${RUBY_DOCDIR}/${PORTNAME}
+	${MKDIR} ${RUBY_MODDOCDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_DOCDIR}/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f} ${RUBY_MODDOCDIR}/
 .endfor
 .endif
 
diff --git a/devel/ruby-flex_rb/pkg-plist b/devel/ruby-flex_rb/pkg-plist
index 5f8da93ad059..6a1debff58f4 100644
--- a/devel/ruby-flex_rb/pkg-plist
+++ b/devel/ruby-flex_rb/pkg-plist
@@ -1,13 +1,11 @@
 %%RUBY_SITEARCHLIBDIR%%/flex.so
 %%RUBY_SITELIBDIR%%/flex2.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/ex_fr.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/ex_rr.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test01.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test02.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test03.rb
-%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/flex_rb/test04.rb
-%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/flex_rb
-%%PORTDOCS%%@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
-%%PORTDOCS%%%%RUBY_DOCDIR%%/flex_rb/README
-%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/flex_rb
-%%PORTDOCS%%@unexec rmdir %D/%%RUBY_DOCDIR%% 2>/dev/null || true
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ex_fr.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/ex_rr.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test01.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test02.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test03.rb
+%%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/test04.rb
+%%PORTDOCS%%@dirrm %%RUBY_MODEXAMPLESDIR%%
+%%PORTDOCS%%%%RUBY_MODDOCDIR%%/README
+%%PORTDOCS%%@dirrm %%RUBY_MODDOCDIR%%