1 files changed, 26 insertions, 10 deletions

diff --git a/lang/ruby-devel/Makefile b/lang/ruby-devel/Makefile
index 260ba8865fd3..f76c8e9dac76 100644
--- a/lang/ruby-devel/Makefile
+++ b/lang/ruby-devel/Makefile
@@ -74,10 +74,11 @@ RUBYLIB=	""
 PLIST_SUB+=	IF_DEFAULT=${IF_DEFAULT} \
 		RUBYLIB=${RUBYLIB}
 
-IRB_WITHOUT_SUFFIX=	${LOCALBASE}/bin/irb
-IRB_WITH_SUFFIX=	${IRB_WITHOUT_SUFFIX}${_RUBY_SUFFIX}
+INSTALLED_SCRIPTS=	${PREFIX}/bin/irb \
+			${PREFIX}/bin/h2rb
 
 OBSOLETED_MODULES=	bigfloat \
+			dl \
 			fileutils \
 			racc-runtime \
 			sha1 \
@@ -112,31 +113,41 @@ pre-configure:
 pre-install:
 	${RM} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} \
 		${PREFIX}/man/man1/ruby${RUBY_R}.1 \
-		${PREFIX}/man/man1/ruby${RUBY_R}.1.gz \
-		${IRB_WITHOUT_SUFFIX}${RUBY_R}
+		${PREFIX}/man/man1/ruby${RUBY_R}.1.gz
+	for f in ${INSTALLED_SCRIPTS}; do \
+		${RM} -f $${f}${RUBY_R}; \
+	done
 
 post-install:
 .if ${STRIP} == -s
 	strip ${RUBY}
 .endif
+	${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${PREFIX}/bin/
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 	${MV} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ${RUBY_WITH_SUFFIX}
 	${MV} -f ${PREFIX}/man/man1/ruby${RUBY_R}.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1
 .endif
-	${MV} -f ${IRB_WITHOUT_SUFFIX} ${IRB_WITH_SUFFIX}
+	for f in ${INSTALLED_SCRIPTS}; do \
+		${MV} -f $${f} $${f}${_RUBY_SUFFIX}; \
+	done
 	if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ]; then \
 		${LN} -fs ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}; \
 		${LN} -fs ruby${RUBY_DEFAULT_SUFFIX}${RUBY_R}.1${MANEXT} ${PREFIX}/man/man1/ruby${RUBY_R}.1${MANEXT}; \
 	fi
 	if [ -x ${RUBY_WITHOUT_SUFFIX} ]; then \
-		${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX}; \
+		for f in ${INSTALLED_SCRIPTS}; do \
+			${LN} -fs $${f}${RUBY_DEFAULT_SUFFIX} $${f}; \
+		done; \
 	fi
 .if !empty(RUBY_R)
 	if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ]; then \
-		${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}; \
+		for f in ${INSTALLED_SCRIPTS}; do \
+			${LN} -fs $${f}${_RUBY_SUFFIX} $${f}${RUBY_R}; \
+		done; \
 	fi
 .endif
-	${LDCONFIG} -m ${LOCALBASE}/lib
+	${LDCONFIG} -m ${PREFIX}/lib
+.for f in ${INSTALLED_SCRIPTS}
 	${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
 		-e 'if $$. == 1; ' \
 		-e ' if /^#!/; ' \
@@ -145,8 +156,9 @@ post-install:
 		-e '  $$_ = "#!${RUBY_WITH_SUFFIX}\n" + $$_;' \
 		-e ' end;' \
 		-e 'end' \
-		${IRB_WITH_SUFFIX}
-	${CHMOD} ${BINMODE} ${IRB_WITH_SUFFIX}
+		${f}${_RUBY_SUFFIX}
+	${CHMOD} ${BINMODE} ${f}${_RUBY_SUFFIX}
+.endfor
 	${MKDIR} ${RUBY_ELISPDIR}
 	${TOUCH} ${RUBY_ELISPDIR}/.keep_me
 	${MKDIR} ${RUBY_EXAMPLESDIR}
@@ -157,6 +169,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
 	${MKDIR} ${RUBY_EXAMPLESDIR}/curses
 	${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
+	${MKDIR} ${RUBY_EXAMPLESDIR}/dl
+	${INSTALL_DATA} ${WRKSRC}/ext/dl/sample/*.rb ${RUBY_EXAMPLESDIR}/dl
 	${MKDIR} ${RUBY_EXAMPLESDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${RUBY_EXAMPLESDIR}/pty
 	${INSTALL_DATA} ${WRKSRC}/COPYING* ${RUBY_DOCDIR}
@@ -164,6 +178,8 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
 	${MKDIR} ${RUBY_DOCDIR}/digest
 	${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}/digest
+	${MKDIR} ${RUBY_DOCDIR}/dl
+	${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}/dl
 	${MKDIR} ${RUBY_DOCDIR}/etc
 	${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
 	${MKDIR} ${RUBY_DOCDIR}/pty