1 files changed, 6 insertions, 42 deletions

diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile
index a98a37f92e3f..e17bcabb2967 100644
--- a/lang/ruby/Makefile
+++ b/lang/ruby/Makefile
@@ -7,11 +7,10 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
-PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY} \
 			${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,}
-MASTER_SITE_SUBDIR=	${RUBY_VER} \
+MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY} \
 			${ONIGURUMA_MASTER_SITE_SUBDIR:S,$,/:oniguruma,}
 DISTFILES=		${RUBY_DISTNAME}${EXTRACT_SUFX} \
 			${ONIGURUMA_DISTFILE:S,$,:oniguruma,}
@@ -98,54 +97,19 @@ post-patch:
 	${MV} ${WRKSRC}/ext/${d} ${WRKDIR}/
 .endfor
 
-pre-install:
-	${RM} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} \
-		${PREFIX}/man/man1/ruby${RUBY_R}.1 \
-		${PREFIX}/man/man1/ruby${RUBY_R}.1.gz
-	for f in ${INSTALLED_SCRIPTS}; do \
-		${RM} -f $${f}${RUBY_R}; \
-	done
-
 post-install:
 .if defined(STRIP) && ${STRIP} == -s
-	strip ${RUBY}
+	${STRIP_CMD} ${RUBY}
 .endif
 .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
+# Link just installed "ruby" to "ruby16", etc.
+	${LN} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ${RUBY_WITH_SUFFIX}
+	${LN} -f ${PREFIX}/man/man1/ruby${RUBY_R}.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1
 	for f in ${INSTALLED_SCRIPTS}; do \
-		${MV} -f $${f} $${f}${_RUBY_SUFFIX}; \
+		${LN} -f $${f}${RUBY_R} $${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 \
-		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 \
-		for f in ${INSTALLED_SCRIPTS}; do \
-			${LN} -fs $${f}${_RUBY_SUFFIX} $${f}${RUBY_R}; \
-		done; \
-	fi
 .endif
 	${LDCONFIG} -m ${PREFIX}/lib
-.for f in ${INSTALLED_SCRIPTS}
-	${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
-		-e 'if $$. == 1; ' \
-		-e ' if /^#!/; ' \
-		-e '  sub /^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY_WITH_SUFFIX}";' \
-		-e ' else;' \
-		-e '  $$_ = "#!${RUBY_WITH_SUFFIX}\n" + $$_;' \
-		-e ' end;' \
-		-e 'end' \
-		${f}${_RUBY_SUFFIX}
-	${CHMOD} ${BINMODE} ${f}${_RUBY_SUFFIX}
-.endfor
 	${MKDIR} ${RUBY_ELISPDIR}
 	${TOUCH} ${RUBY_ELISPDIR}/.keep_me
 	${MKDIR} ${RUBY_EXAMPLESDIR}