Date: Mon, 01 Nov 1999 06:05:50 +0900 From: yasuf@big.or.jp To: FreeBSD-gnats-submit@freebsd.org Subject: ports/14628: Update: lang/ruby Message-ID: <19991101060550N.yasuf@big.or.jp>
next in thread | raw e-mail | index | archive | help
>Number: 14628 >Category: ports >Synopsis: Update: lang/ruby >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Oct 31 13:10:01 PST 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.2 (this also fixes ``unfetchable'' error). New file: pkg/MESSAGE Removed file: patches/patch-bd >How-To-Repeat: >Fix: Index: ruby/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/ruby/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- Makefile 1999/08/26 21:10:22 1.13 +++ Makefile 1999/10/29 12:10:56 @@ -1,12 +1,12 @@ # New ports collection makefile for: ruby -# Version required: 1.4.0 +# Version required: 1.4.2 # Date created: 04 September 1997 # Whom: Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp> # # $FreeBSD: ports/lang/ruby/Makefile,v 1.13 1999/08/26 21:10:22 cpiazza Exp $ # -DISTNAME= ruby-1.4.0 +DISTNAME= ruby-1.4.2 CATEGORIES= lang MASTER_SITES= ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \ ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \ @@ -25,19 +25,40 @@ RUBY_VER= 1.4 RUBY_ARCH= ${ARCH}-freebsd${OSREL} -BRANCH_NAME= . +BRANCH_NAME= 1.4 +DOCDIR= ${PREFIX}/share/doc/ruby +EXAMPLESDIR= ${PREFIX}/share/examples/ruby + post-patch: ${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST ${RM} -f ${WRKSRC}/ext/tk/MANIFEST + ${RM} -rf ${WRKSRC}/lib/irb ${WRKSRC}/sample/irb.rb post-install: 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 + ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/sample/* ${EXAMPLESDIR} + ${MKDIR} ${EXAMPLESDIR}/misc + ${INSTALL_DATA} ${WRKSRC}/misc/* ${EXAMPLESDIR}/misc + ${MKDIR} ${EXAMPLESDIR}/curses + ${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${EXAMPLESDIR}/curses + ${MKDIR} ${EXAMPLESDIR}/pty + ${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${EXAMPLESDIR}/pty +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/README* ${DOCDIR} + ${MKDIR} ${DOCDIR}/etc + ${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${DOCDIR}/etc + ${MKDIR} ${DOCDIR}/md5 + ${INSTALL_DATA} ${WRKSRC}/ext/md5/md5.txt* ${DOCDIR}/md5 + ${MKDIR} ${DOCDIR}/pty + ${INSTALL_DATA} ${WRKSRC}/ext/pty/README* ${DOCDIR}/pty + ${MKDIR} ${DOCDIR}/readline + ${INSTALL_DATA} ${WRKSRC}/ext/readline/README ${DOCDIR}/readline +.endif ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + @${CAT} ${PKGMESSAGE} test: @(cd ${WRKSRC}; make test) Index: ruby/files/md5 =================================================================== RCS file: /home/ncvs/ports/lang/ruby/files/md5,v retrieving revision 1.7 diff -u -r1.7 md5 --- md5 1999/08/26 21:10:22 1.7 +++ md5 1999/09/21 05:11:01 @@ -1 +1 @@ -MD5 (ruby-1.4.0.tar.gz) = e093dcd834caeedd84459d62e09e72ea +MD5 (ruby-1.4.2.tar.gz) = 13c18f8cfa0cb0bf1268942cfc04c462 Index: ruby/patches/patch-bd =================================================================== RCS file: patch-bd diff -N patch-bd --- /tmp/cvsA77906 Mon Nov 1 04:59:10 1999 +++ /dev/null Mon Nov 1 04:53:06 1999 @@ -1,39 +0,0 @@ ---- 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.3 diff -u -r1.3 DESCR --- DESCR 1999/08/26 21:10:23 1.3 +++ DESCR 1999/10/29 12:13:19 @@ -17,4 +17,4 @@ Windows, Mac, BeOS etc.) The Ruby home page is at: -WWW: http://www.netlab.co.jp/ruby/ +WWW: http://www.ruby-lang.org/ Index: ruby/pkg/MESSAGE =================================================================== RCS file: MESSAGE diff -N MESSAGE --- /dev/null Mon Nov 1 04:53:06 1999 +++ MESSAGE Sat Oct 30 01:00:56 1999 @@ -0,0 +1,5 @@ +==== +NOTE: This package does NOT contain irb (the interactive Ruby) + and Ruby/Tk (an interface to Tk GUI toolkits); You need to + install separate packages to use them. +==== Index: ruby/pkg/PLIST =================================================================== RCS file: /home/ncvs/ports/lang/ruby/pkg/PLIST,v retrieving revision 1.8 diff -u -r1.8 PLIST --- PLIST 1999/08/26 21:10:23 1.8 +++ PLIST 1999/10/27 12:45:20 @@ -34,6 +34,7 @@ lib/ruby/%%RUBY_VER%%/Env.rb lib/ruby/%%RUBY_VER%%/base64.rb lib/ruby/%%RUBY_VER%%/cgi-lib.rb +lib/ruby/%%RUBY_VER%%/cgi.rb lib/ruby/%%RUBY_VER%%/complex.rb lib/ruby/%%RUBY_VER%%/date.rb lib/ruby/%%RUBY_VER%%/date2.rb @@ -78,12 +79,34 @@ lib/ruby/%%RUBY_VER%%/timeout.rb lib/ruby/%%RUBY_VER%%/tracer.rb lib/ruby/%%RUBY_VER%%/weakref.rb +lib/ruby/%%RUBY_VER%%/net/pop.rb +lib/ruby/%%RUBY_VER%%/net/session.rb +lib/ruby/%%RUBY_VER%%/net/smtp.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%%/net @dirrm lib/ruby/%%RUBY_VER%% @dirrm lib/ruby +share/doc/ruby/README +share/doc/ruby/README.EXT +share/doc/ruby/README.EXT.jp +share/doc/ruby/README.jp +share/doc/ruby/etc/etc.txt +share/doc/ruby/etc/etc.txt.jp +share/doc/ruby/md5/md5.txt +share/doc/ruby/md5/md5.txt.jp +share/doc/ruby/pty/README +share/doc/ruby/pty/README.expect +share/doc/ruby/pty/README.expect.jp +share/doc/ruby/pty/README.jp +share/doc/ruby/readline/README +@dirrm share/doc/ruby/etc +@dirrm share/doc/ruby/md5 +@dirrm share/doc/ruby/pty +@dirrm share/doc/ruby/readline +@dirrm share/doc/ruby share/examples/ruby/README share/examples/ruby/biorhythm.rb share/examples/ruby/cal.rb @@ -121,7 +144,6 @@ share/examples/ruby/occur2.rb share/examples/ruby/philos.rb share/examples/ruby/pi.rb -share/examples/ruby/rbc.rb share/examples/ruby/rcs.awk share/examples/ruby/rcs.dat share/examples/ruby/rcs.rb @@ -140,5 +162,13 @@ share/examples/ruby/misc/ruby-mode.el share/examples/ruby/misc/rubydb2x.el share/examples/ruby/misc/rubydb3x.el +share/examples/ruby/curses/hello.rb +share/examples/ruby/curses/rain.rb +share/examples/ruby/curses/view.rb +share/examples/ruby/pty/expect_sample.rb +share/examples/ruby/pty/script.rb +share/examples/ruby/pty/shl.rb @dirrm share/examples/ruby/misc +@dirrm share/examples/ruby/curses +@dirrm share/examples/ruby/pty @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?19991101060550N.yasuf>