From 7be480ee5d74ff048498affc4b642d0be5142347 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Thu, 26 Feb 2004 19:20:09 +0000
Subject: Change the default version of ruby to 1.8 for i386 as well, finally.

Always put a version suffix to the ruby name (no matter if ruby is the
default version) to avoid mess in future.

[Notes for i386 users]

If you are a ruby developer and still want to stick with ruby 1.6 as
default, please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.

If you are a ruby developer and want to keep ruby 1.6 as default,
please add RUBY_DEFAULT_VER=1.6 to /etc/make.conf.  Otherwise, please
run the following series of commands to migrate to ruby 1.8:

  1) Reinstall portupgrade manually (and ruby 1.8 will be installed)
	pkg_delete portupgrade-\*
        (cd /usr/ports/sysutils/portupgrade; make install clean)

  2) Reinstall everything that depends on ruby 1.6 (to use ruby 1.8)
	portupgrade -fr lang/ruby16

  3) Reinstall ruby 1.8 (because the previous step kills symlinks)
	portupgrade -f lang/ruby18

  4) Deinstall ruby 1.6 stuff (if you are paranoia)
        pkg_deinstall -ri lang/ruby16
---
 lang/ruby16/Makefile  | 11 ++++++-----
 lang/ruby16/pkg-plist |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'lang/ruby16')

diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index b2b3679a12fe..c87b5ef388df 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ruby${RUBY_R}
 PORTVERSION=	${RUBY_PORTVERSION}
+PORTREVISION=	1
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY}
 MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY}
@@ -56,7 +57,7 @@ STRIP=		# none
 .endif
 
 INSTALLS_SHLIB=	yes
-MAN1=		ruby${_RUBY_SUFFIX}.1
+MAN1=		${RUBY_NAME}.1
 
 .include <bsd.port.pre.mk>
 
@@ -67,7 +68,7 @@ CONFIGURE_ARGS+=	--enable-ipv6
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
-MLINKS=		ruby${_RUBY_SUFFIX}.1 ruby${RUBY_R}.1
+MLINKS=		${RUBY_NAME}.1 ruby${RUBY_R}.1
 IF_DEFAULT=	""
 .else
 IF_DEFAULT=	"@comment "
@@ -114,10 +115,10 @@ post-install:
 .endif
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 # 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
+	${LN} -f ${RUBY_WITH_SUFFIX} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}
+	${LN} -f ${PREFIX}/man/man1/${RUBY_NAME}.1 ${PREFIX}/man/man1/ruby${RUBY_R}.1
 	for f in ${INSTALLED_SCRIPTS}; do \
-		${LN} -f $${f}${RUBY_R} $${f}${_RUBY_SUFFIX}; \
+		${LN} -f $${f}${RUBY_SUFFIX} $${f}${RUBY_R}; \
 	done
 .endif
 	${LDCONFIG} -m ${PREFIX}/lib
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index f1d200a04290..ece180bb53e8 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -1,7 +1,7 @@
 %%IF_DEFAULT%%bin/irb%%RUBY_R%%
-bin/irb%%_RUBY_SUFFIX%%
+bin/irb%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby%%RUBY_R%%
-bin/ruby%%_RUBY_SUFFIX%%
+bin/ruby%%RUBY_SUFFIX%%
 lib/lib%%RUBY_NAME%%.so
 lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
 %%RUBY_ARCHLIBDIR%%/config.h
-- 
cgit v1.2.3