From fc89ee6b273b2ed0628b0e9067107e3e1f94a3ce Mon Sep 17 00:00:00 2001
From: knu <knu@FreeBSD.org>
Date: Thu, 12 Dec 2002 12:53:03 +0000
Subject: Update lang/ruby to 1.6.8-preview3, lang/ruby16-shim-ruby18 to
 1.7.3.2002.12.11, and lang/ruby-devel to 1.7.3-2002.12.12.

- Fix a few bugs that lead to core dump, one in the ruby interpreter
  and another in the syslog module.

  Reported by:	ume (net/dtcp was a victim)

- Fix an installation problem occasionally seen on bento. (a bug in
  Makefile that caused race)

  Submitted by:	bento

- Fix a problem that irb(1) didn't work because the symlink was wrong.

  Submitted by:	Jos Backus <jos@catnook.com>

- Get rid of move & symlink spaghetti completely from the installation
  process.

Discussed with:	portmgr (will)
---
 lang/ruby18/Makefile | 31 +++++++------------------------
 lang/ruby18/distinfo |  2 +-
 2 files changed, 8 insertions(+), 25 deletions(-)

(limited to 'lang/ruby18')

diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 33e6f238e06a..d919b28864e2 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	${RUBY_PORTVERSION}
 CATEGORIES=	lang ruby ipv6
 MASTER_SITES=		${MASTER_SITE_RUBY} \
 			${ONIGURUMA_MASTER_SITES:S,$,:oniguruma,}
-MASTER_SITE_SUBDIR=	snapshots \
+MASTER_SITE_SUBDIR=	${MASTER_SITE_SUBDIR_RUBY} \
 			${ONIGURUMA_MASTER_SITE_SUBDIR:S,$,/:oniguruma,}
 DISTFILES=		${RUBY_DISTNAME}${EXTRACT_SUFX} \
 			${ONIGURUMA_DISTFILE:S,$,:oniguruma,}
@@ -115,34 +115,17 @@ 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
-
 post-install:
 .if defined(STRIP) && ${STRIP} == -s
 	${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
-	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
+# Link just installed "ruby" to "ruby17", 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 \
+		${LN} -f $${f}${RUBY_R} $${f}${_RUBY_SUFFIX}; \
+	done
 .endif
 	${LDCONFIG} -m ${PREFIX}/lib
 	${MKDIR} ${RUBY_ELISPDIR}
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index c274e83098fa..49443af3684c 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,2 +1,2 @@
-MD5 (ruby/ruby-1.7.3-2002.11.22.tar.bz2) = fafe9cbd17e49dbf356710bc5751d78a
+MD5 (ruby/ruby-1.7.3-2002.12.12.tar.bz2) = d200f52d1f7c3a624408b2ebabc66823
 MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0
-- 
cgit