Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Aug 1999 07:08:44 +0900
From:      yasuf@big.or.jp
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/13304: Update: lang/ruby
Message-ID:  <19990822070844M.yasuf@big.or.jp>

next in thread | raw e-mail | index | archive | help

>Number:         13304
>Category:       ports
>Synopsis:       Update: lang/ruby
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 21 15:10:02 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Yasuhiro Fukuma
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

	

>Description:

This patch contains:

  - Updates for ruby-1.4.0.

New file:	patches/patch-bd
Removed file:	patches/patch-bc

>How-To-Repeat:

	

>Fix:
Index: ruby/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile	1999/04/22 00:17:02	1.11
+++ Makefile	1999/08/13 17:47:27
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.2.5
+# Version required:     1.4.0
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $Id: Makefile,v 1.11 1999/04/22 00:17:02 scrappy Exp $
 #
 
-DISTNAME=	ruby-1.2.5
+DISTNAME=	ruby-1.4.0
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -18,18 +18,15 @@
 MAINTAINER=	yasuf@big.or.jp
 
 GNU_CONFIGURE=	yes
-#USE_AUTOCONF=	yes
+CONFIGURE_ARGS+= --enable-shared
 MAN1=		ruby.1
-PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+PLIST_SUB+=	RUBY_VER="${RUBY_VER}" RUBY_ARCH="${RUBY_ARCH}"
 
+RUBY_VER=	1.4
 RUBY_ARCH=	${ARCH}-freebsd${OSREL}
 
-# lib/mkmf.rb requires that the name of the install program will be
-# specified with absolute path.
-INSTALL=	/usr/bin/install
+BRANCH_NAME=	.
 
-BRANCH_NAME=	1.2
-
 post-patch:
 	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
 	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
@@ -38,6 +35,9 @@
 	strip ${PREFIX}/bin/ruby
 	${MKDIR} ${PREFIX}/share/examples/ruby
 	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby
+	${MKDIR} ${PREFIX}/share/examples/ruby/misc
+	${INSTALL_DATA} ${WRKSRC}/misc/* ${PREFIX}/share/examples/ruby/misc
+	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 test:
 	@(cd ${WRKSRC}; make test)
Index: ruby/files/md5
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/files/md5,v
retrieving revision 1.6
diff -u -r1.6 md5
--- md5	1999/04/19 03:55:55	1.6
+++ md5	1999/08/13 17:47:47
@@ -1 +1 @@
-MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6
+MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea
Index: ruby/patches/patch-bc
===================================================================
RCS file: patch-bc
diff -N patch-bc
--- /tmp/cvsY53042	Sun Aug 22 05:27:13 1999
+++ /dev/null	Sun Aug 22 05:20:01 1999
@@ -1,23 +0,0 @@
---- numeric.c.orig	Wed Jul 15 15:12:51 1998
-+++ numeric.c	Sun Mar  7 02:07:26 1999
-@@ -13,6 +13,9 @@
- #include "ruby.h"
- #include <math.h>
- #include <stdio.h>
-+#ifdef __FreeBSD__
-+#include <floatingpoint.h>
-+#endif
- 
- static ID coerce;
- static ID to_i;
-@@ -1348,6 +1351,10 @@
- void
- Init_Numeric()
- {
-+#ifdef __FreeBSD__
-+    /* allow divide by zero -- Inf */
-+    fpsetmask(fpgetmask() & ~(FP_X_DZ|FP_X_INV|FP_X_OFL));
-+#endif
-     coerce = rb_intern("coerce");
-     to_i = rb_intern("to_i");
- 
Index: ruby/patches/patch-bd
===================================================================
RCS file: patch-bd
diff -N patch-bd
--- /dev/null	Sun Aug 22 05:20:01 1999
+++ patch-bd	Sun Aug 22 05:15:20 1999
@@ -0,0 +1,39 @@
+--- eval.c	1999/08/13 05:45:04	1.2
++++ eval.c	1999/08/21 20:11:51
+@@ -5359,7 +5359,7 @@
+ 	MEMCPY(tmp, block->prev, struct BLOCK, 1);
+ 	if (tmp->frame.argc > 0) {
+ 	    tmp->frame.argv = ALLOC_N(VALUE, tmp->frame.argc);
+-	    MEMCPY(tmp->frame.argv, block->frame.argv, VALUE, tmp->frame.argc);
++	    MEMCPY(tmp->frame.argv, block->prev->frame.argv, VALUE, tmp->frame.argc);
+ 	}
+ 	scope_dup(tmp->scope);
+ 	block->prev = tmp;
+@@ -6016,8 +6016,8 @@
+ 
+ static thread_t main_thread;
+ 
+-#define ADJ(addr) (void*)(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr)
+-#define STACK(addr) (th->stk_pos<(addr) && (addr)<th->stk_pos+th->stk_len)
++#define STACK(addr) (th->stk_pos<(VALUE*)(addr) && (VALUE*)(addr)<th->stk_pos+th->stk_len)
++#define ADJ(addr) (void*)(STACK(addr)?(((VALUE*)(addr)-th->stk_pos)+th->stk_ptr):(VALUE*)(addr))
+ 
+ static void
+ thread_mark(th)
+@@ -6041,6 +6041,7 @@
+     rb_mark_tbl(th->locals);
+ 
+     /* mark data in copied stack */
++    if (th == curr_thread) return;
+     if (th->status == THREAD_KILLED) return;
+     if (th->stk_len == 0) return;  /* stack not active, no need to mark. */
+     if (th->stk_ptr) {
+@@ -6054,7 +6055,7 @@
+ 	frame = ADJ(frame);
+ 	rb_gc_mark_frame(frame);
+ 	if (frame->tmp) {
+-	    struct FRAME *tmp = ADJ(frame->tmp);
++	    struct FRAME *tmp = frame->tmp;
+ 
+ 	    while (tmp && tmp != top_frame) {
+ 		tmp = ADJ(tmp);
Index: ruby/pkg/DESCR
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/pkg/DESCR,v
retrieving revision 1.2
diff -u -r1.2 DESCR
--- DESCR	1999/04/22 00:17:02	1.2
+++ DESCR	1999/07/30 14:54:21
@@ -1,9 +1,9 @@
 Ruby is the interpreted scripting language for quick and
 easy object-oriented programming.  It has many features to
 process text files and to do system management tasks (as in
-perl).  It is simple, straight-forward, and extensible.
+Perl).  It is simple, straight-forward, and extensible.
 
-Features of ruby is shown below.
+Features of Ruby are shown below.
 
   + Simple Syntax
   + *Normal* Object-Oriented features(ex. class, method calls)
@@ -13,8 +13,8 @@
   + Iterators and Closures
   + Garbage Collection
   + Dynamic Loading of Object files(on some architecture)
-  + Highly Portable(works on many UNIX machines)
+  + Highly Portable(works on many UNIX machines, and on DOS,
+    Windows, Mac, BeOS etc.)
 
-The ruby home page is at http://www.netlab.co.jp/ruby/.
-
-WWW: http://www.netlab.co.jp/ruby
+The Ruby home page is at:
+WWW: http://www.netlab.co.jp/ruby/
Index: ruby/pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/pkg/PLIST,v
retrieving revision 1.7
diff -u -r1.7 PLIST
--- PLIST	1999/04/19 03:55:55	1.7
+++ PLIST	1999/08/13 18:01:02
@@ -1,77 +1,88 @@
 bin/ruby
-lib/ruby/%%RUBY_ARCH%%/config.h
-lib/ruby/%%RUBY_ARCH%%/curses.so
-lib/ruby/%%RUBY_ARCH%%/dbm.so
-lib/ruby/%%RUBY_ARCH%%/defines.h
-lib/ruby/%%RUBY_ARCH%%/dln.h
-lib/ruby/%%RUBY_ARCH%%/env.h
-lib/ruby/%%RUBY_ARCH%%/etc.so
-lib/ruby/%%RUBY_ARCH%%/fcntl.so
-lib/ruby/%%RUBY_ARCH%%/fnmatch.h
-lib/ruby/%%RUBY_ARCH%%/intern.h
-lib/ruby/%%RUBY_ARCH%%/kconv.so
-lib/ruby/%%RUBY_ARCH%%/libruby.a
-lib/ruby/%%RUBY_ARCH%%/md5.so
-lib/ruby/%%RUBY_ARCH%%/node.h
-lib/ruby/%%RUBY_ARCH%%/rbconfig.rb
-lib/ruby/%%RUBY_ARCH%%/re.h
-lib/ruby/%%RUBY_ARCH%%/regex.h
-lib/ruby/%%RUBY_ARCH%%/ruby.h
-lib/ruby/%%RUBY_ARCH%%/rubyio.h
-lib/ruby/%%RUBY_ARCH%%/rubysig.h
-lib/ruby/%%RUBY_ARCH%%/socket.so
-lib/ruby/%%RUBY_ARCH%%/st.h
-lib/ruby/%%RUBY_ARCH%%/util.h
-lib/ruby/%%RUBY_ARCH%%/version.h
-lib/ruby/%%RUBY_ARCH%%/y.tab.h
-lib/ruby/English.rb
-lib/ruby/Env.rb
-lib/ruby/base64.rb
-lib/ruby/cgi-lib.rb
-lib/ruby/complex.rb
-lib/ruby/date.rb
-lib/ruby/date2.rb
-lib/ruby/debug.rb
-lib/ruby/delegate.rb
-lib/ruby/e2mmap.rb
-lib/ruby/eregex.rb
-lib/ruby/final.rb
-lib/ruby/finalize.rb
-lib/ruby/find.rb
-lib/ruby/ftools.rb
-lib/ruby/ftplib.rb
-lib/ruby/getoptlong.rb
-lib/ruby/getopts.rb
-lib/ruby/importenv.rb
-lib/ruby/jcode.rb
-lib/ruby/mailread.rb
-lib/ruby/mathn.rb
-lib/ruby/matrix.rb
-lib/ruby/mkmf.rb
-lib/ruby/monitor.rb
-lib/ruby/mutex_m.rb
-lib/ruby/observer.rb
-lib/ruby/open3.rb
-lib/ruby/ostruct.rb
-lib/ruby/parsearg.rb
-lib/ruby/parsedate.rb
-lib/ruby/ping.rb
-lib/ruby/profile.rb
-lib/ruby/pstore.rb
-lib/ruby/rational.rb
-lib/ruby/readbytes.rb
-lib/ruby/shell.rb
-lib/ruby/shellwords.rb
-lib/ruby/singleton.rb
-lib/ruby/sync.rb
-lib/ruby/telnet.rb
-lib/ruby/tempfile.rb
-lib/ruby/thread.rb
-lib/ruby/thwait.rb
-lib/ruby/timeout.rb
-lib/ruby/tracer.rb
-lib/ruby/weakref.rb
-@dirrm lib/ruby/%%RUBY_ARCH%%
+lib/libruby.so
+lib/libruby.so.14
+@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
+@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/config.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/curses.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/defines.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/dln.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/env.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/etc.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/fcntl.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/intern.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/libruby.a
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/md5.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/nkf.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/node.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/pty.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rbconfig.rb
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/re.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/readline.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/regex.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/ruby.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubyio.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/rubysig.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/sdbm.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/socket.so
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/st.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/util.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/version.h
+lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%/y.tab.h
+lib/ruby/%%RUBY_VER%%/English.rb
+lib/ruby/%%RUBY_VER%%/Env.rb
+lib/ruby/%%RUBY_VER%%/base64.rb
+lib/ruby/%%RUBY_VER%%/cgi-lib.rb
+lib/ruby/%%RUBY_VER%%/complex.rb
+lib/ruby/%%RUBY_VER%%/date.rb
+lib/ruby/%%RUBY_VER%%/date2.rb
+lib/ruby/%%RUBY_VER%%/debug.rb
+lib/ruby/%%RUBY_VER%%/delegate.rb
+lib/ruby/%%RUBY_VER%%/e2mmap.rb
+lib/ruby/%%RUBY_VER%%/eregex.rb
+lib/ruby/%%RUBY_VER%%/expect.rb
+lib/ruby/%%RUBY_VER%%/final.rb
+lib/ruby/%%RUBY_VER%%/finalize.rb
+lib/ruby/%%RUBY_VER%%/find.rb
+lib/ruby/%%RUBY_VER%%/ftools.rb
+lib/ruby/%%RUBY_VER%%/ftplib.rb
+lib/ruby/%%RUBY_VER%%/getoptlong.rb
+lib/ruby/%%RUBY_VER%%/getopts.rb
+lib/ruby/%%RUBY_VER%%/importenv.rb
+lib/ruby/%%RUBY_VER%%/jcode.rb
+lib/ruby/%%RUBY_VER%%/kconv.rb
+lib/ruby/%%RUBY_VER%%/mailread.rb
+lib/ruby/%%RUBY_VER%%/mathn.rb
+lib/ruby/%%RUBY_VER%%/matrix.rb
+lib/ruby/%%RUBY_VER%%/mkmf.rb
+lib/ruby/%%RUBY_VER%%/monitor.rb
+lib/ruby/%%RUBY_VER%%/mutex_m.rb
+lib/ruby/%%RUBY_VER%%/observer.rb
+lib/ruby/%%RUBY_VER%%/open3.rb
+lib/ruby/%%RUBY_VER%%/ostruct.rb
+lib/ruby/%%RUBY_VER%%/parsearg.rb
+lib/ruby/%%RUBY_VER%%/parsedate.rb
+lib/ruby/%%RUBY_VER%%/ping.rb
+lib/ruby/%%RUBY_VER%%/profile.rb
+lib/ruby/%%RUBY_VER%%/pstore.rb
+lib/ruby/%%RUBY_VER%%/rational.rb
+lib/ruby/%%RUBY_VER%%/readbytes.rb
+lib/ruby/%%RUBY_VER%%/shellwords.rb
+lib/ruby/%%RUBY_VER%%/singleton.rb
+lib/ruby/%%RUBY_VER%%/sync.rb
+lib/ruby/%%RUBY_VER%%/telnet.rb
+lib/ruby/%%RUBY_VER%%/tempfile.rb
+lib/ruby/%%RUBY_VER%%/thread.rb
+lib/ruby/%%RUBY_VER%%/thwait.rb
+lib/ruby/%%RUBY_VER%%/timeout.rb
+lib/ruby/%%RUBY_VER%%/tracer.rb
+lib/ruby/%%RUBY_VER%%/weakref.rb
+@exec /bin/mkdir -p %D/lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%/site_ruby
+@dirrm lib/ruby/%%RUBY_VER%%/%%RUBY_ARCH%%
+@dirrm lib/ruby/%%RUBY_VER%%
 @dirrm lib/ruby
 share/examples/ruby/README
 share/examples/ruby/biorhythm.rb
@@ -80,6 +91,8 @@
 share/examples/ruby/clnt.rb
 share/examples/ruby/dbmtest.rb
 share/examples/ruby/dir.rb
+share/examples/ruby/dualstack-fetch.rb
+share/examples/ruby/dualstack-httpd.rb
 share/examples/ruby/eval.rb
 share/examples/ruby/export.rb
 share/examples/ruby/exyacc.rb
@@ -94,7 +107,6 @@
 share/examples/ruby/fullpath.rb
 share/examples/ruby/getopts.test
 share/examples/ruby/goodfriday.rb
-share/examples/ruby/inf-ruby.el
 share/examples/ruby/less.rb
 share/examples/ruby/list.rb
 share/examples/ruby/list2.rb
@@ -113,10 +125,9 @@
 share/examples/ruby/rcs.awk
 share/examples/ruby/rcs.dat
 share/examples/ruby/rcs.rb
+share/examples/ruby/rd2html.rb
 share/examples/ruby/regx.rb
-share/examples/ruby/ruby-mode.el
-share/examples/ruby/rubydb2x.el
-share/examples/ruby/rubydb3x.el
+share/examples/ruby/rename.rb
 share/examples/ruby/sieve.rb
 share/examples/ruby/svr.rb
 share/examples/ruby/test.rb
@@ -124,4 +135,10 @@
 share/examples/ruby/trojan.rb
 share/examples/ruby/tsvr.rb
 share/examples/ruby/uumerge.rb
+share/examples/ruby/misc/README
+share/examples/ruby/misc/inf-ruby.el
+share/examples/ruby/misc/ruby-mode.el
+share/examples/ruby/misc/rubydb2x.el
+share/examples/ruby/misc/rubydb3x.el
+@dirrm share/examples/ruby/misc
 @dirrm share/examples/ruby

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990822070844M.yasuf>