From 7be480ee5d74ff048498affc4b642d0be5142347 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA 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-shim-ruby18/Makefile | 2 +- lang/ruby16-shim-ruby18/pkg-plist | 6 +++--- lang/ruby16/Makefile | 11 ++++++----- lang/ruby16/pkg-plist | 4 ++-- lang/ruby16_static/Makefile | 4 ++-- lang/ruby16_static/pkg-plist | 2 +- lang/ruby18/Makefile | 12 ++++++------ lang/ruby18/pkg-plist | 14 +++++++------- 8 files changed, 28 insertions(+), 27 deletions(-) (limited to 'lang') diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile index 292afe44110d..eac37967966c 100644 --- a/lang/ruby16-shim-ruby18/Makefile +++ b/lang/ruby16-shim-ruby18/Makefile @@ -50,7 +50,7 @@ pre-install: post-install: .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} for f in ${INSTALLED_SCRIPTS}; do \ - ${LN} -f $${f}${RUBY_R} $${f}${_RUBY_SUFFIX}; \ + ${LN} -f $${f}${RUBY_SUFFIX} $${f}${RUBY_R}; \ done .endif diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist index 8f9e1edbe966..60e87b19803e 100644 --- a/lang/ruby16-shim-ruby18/pkg-plist +++ b/lang/ruby16-shim-ruby18/pkg-plist @@ -1,9 +1,9 @@ %%IF_DEFAULT%%bin/erb%%RUBY_R%% -bin/erb%%_RUBY_SUFFIX%% +bin/erb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/h2rb%%RUBY_R%% -bin/h2rb%%_RUBY_SUFFIX%% +bin/h2rb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/rdoc%%RUBY_R%% -bin/rdoc%%_RUBY_SUFFIX%% +bin/rdoc%%RUBY_SUFFIX%% @comment features/ruby18 %%RUBY_SITEARCHLIBDIR%%/features/ruby18/file_ruby18.so %%RUBY_SITEARCHLIBDIR%%/features/ruby18/io_ruby18.so 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 @@ -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 diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile index f53a67d07e0f..5e42cc3efecb 100644 --- a/lang/ruby16_static/Makefile +++ b/lang/ruby16_static/Makefile @@ -7,7 +7,7 @@ PORTNAME= ruby_static PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= lang ruby ipv6 MASTER_SITES= # none DISTFILES= # none @@ -128,7 +128,7 @@ do-extract: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${RUBY_NAME} ${RUBY_WITH_SUFFIX}_s .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} - ${LN} -fs ruby${_RUBY_SUFFIX}_s ${RUBY_WITHOUT_SUFFIX}_s + ${LN} -fs ${RUBY_NAME}_s ${RUBY_WITHOUT_SUFFIX}_s .endif .include diff --git a/lang/ruby16_static/pkg-plist b/lang/ruby16_static/pkg-plist index e8e4eb369d6f..68ba1db162d4 100644 --- a/lang/ruby16_static/pkg-plist +++ b/lang/ruby16_static/pkg-plist @@ -1,2 +1,2 @@ %%IF_DEFAULT%%bin/ruby_s -bin/ruby%%_RUBY_SUFFIX%%_s +bin/ruby%%RUBY_SUFFIX%%_s diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile index ca18bc1447d0..5e352c21b0f5 100644 --- a/lang/ruby18/Makefile +++ b/lang/ruby18/Makefile @@ -7,7 +7,7 @@ PORTNAME= ruby${RUBY_R} PORTVERSION= ${RUBY_PORTVERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang ruby ipv6 MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= ${MASTER_SITE_SUBDIR_RUBY} @@ -53,7 +53,7 @@ STRIP= # none .endif INSTALLS_SHLIB= yes -MAN1= ruby${_RUBY_SUFFIX}.1 +MAN1= ${RUBY_NAME}.1 LATEST_LINK= ruby-devel @@ -66,7 +66,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 " @@ -141,10 +141,10 @@ post-install: .endif .if ${RUBY_VER} == ${RUBY_DEFAULT_VER} # Link just installed "ruby" to "ruby18", 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/ruby18/pkg-plist b/lang/ruby18/pkg-plist index 80c48e78faae..04b57386b200 100644 --- a/lang/ruby18/pkg-plist +++ b/lang/ruby18/pkg-plist @@ -1,17 +1,17 @@ %%IF_DEFAULT%%bin/erb%%RUBY_R%% -bin/erb%%_RUBY_SUFFIX%% +bin/erb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/h2rb%%RUBY_R%% -bin/h2rb%%_RUBY_SUFFIX%% +bin/h2rb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/irb%%RUBY_R%% -bin/irb%%_RUBY_SUFFIX%% +bin/irb%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/rdoc%%RUBY_R%% -bin/rdoc%%_RUBY_SUFFIX%% +bin/rdoc%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/ri%%RUBY_R%% -bin/ri%%_RUBY_SUFFIX%% +bin/ri%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/ruby%%RUBY_R%% -bin/ruby%%_RUBY_SUFFIX%% +bin/ruby%%RUBY_SUFFIX%% %%IF_DEFAULT%%bin/testrb%%RUBY_R%% -bin/testrb%%_RUBY_SUFFIX%% +bin/testrb%%RUBY_SUFFIX%% lib/lib%%RUBY_NAME%%-static.a lib/lib%%RUBY_NAME%%.so lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% -- cgit v1.2.3