Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 02 Apr 1999 02:31:54 +0900
From:      yasuf@big.or.jp
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/10906: Update: lang/ruby
Message-ID:  <19990402023154I.yasuf@big.or.jp>

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

>Number:         10906
>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:   Thu Apr  1 09:40:01 PST 1999
>Closed-Date:
>Last-Modified:
>Originator:     Yasuhiro Fukuma
>Release:        FreeBSD 4.0-CURRENT i386
>Organization:
>Environment:

	

>Description:

	Updates for ruby-1.2.3.
	This also fixes a failure of "make package" with no Tcl/Tk packages
	installed.

	New file: patches/patch-bc

>How-To-Repeat:

	

>Fix:

Index: ruby/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	1999/02/22 04:11:48	1.9
+++ Makefile	1999/04/01 15:51:08
@@ -1,12 +1,12 @@
 # New ports collection makefile for:    ruby
-# Version required:     1.2.2
+# Version required:     1.2.3
 # Date created:         04 September 1997
 # Whom:                 Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $Id: Makefile,v 1.9 1999/02/22 04:11:48 steve Exp $
 #
 
-DISTNAME=	ruby-1.2.2
+DISTNAME=	ruby-1.2.3
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.netlab.co.jp/pub/lang/ruby/${BRANCH_NAME}/ \
 		ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/${BRANCH_NAME}/ \
@@ -17,14 +17,29 @@
 
 MAINTAINER=	yasuf@big.or.jp
 
+WWW_SITE=	http://www.netlab.co.jp/ruby/
+
 GNU_CONFIGURE=	yes
 #USE_AUTOCONF=	yes
 MAN1=		ruby.1
+PLIST_SUB+=	RUBY_ARCH="${RUBY_ARCH}"
+
+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=	1.2
 
+post-patch:
+	${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
+	${RM} -f ${WRKSRC}/ext/tk/MANIFEST
+
 post-install:
 	strip ${PREFIX}/bin/ruby
+	${MKDIR} ${PREFIX}/share/examples/ruby
+	${INSTALL_DATA} ${WRKSRC}/sample/* ${PREFIX}/share/examples/ruby
 
 test:
 	@(cd ${WRKSRC}; make test)
Index: ruby/files/md5
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/files/md5,v
retrieving revision 1.5
diff -u -r1.5 md5
--- md5	1999/02/22 04:11:51	1.5
+++ md5	1999/03/25 07:01:03
@@ -1 +1 @@
-MD5 (ruby-1.2.2.tar.gz) = bf31e25ff94cfc2b3a7cae8c9f552364
+MD5 (ruby-1.2.3.tar.gz) = 8a6b13a9751d83bba5c638a718ffaad2
Index: ruby/patches/patch-ba
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/patches/patch-ba,v
retrieving revision 1.1
diff -u -r1.1 patch-ba
--- patch-ba	1999/02/22 10:19:39	1.1
+++ patch-ba	1999/03/25 07:01:03
@@ -1,17 +1,13 @@
---- configure.in.orig	Mon Jan 18 18:54:30 1999
-+++ configure.in	Sat Feb  6 00:58:27 1999
-@@ -375,10 +375,10 @@
- 			rb_cv_dlopen=yes ;;
+--- configure.in.orig	Tue Feb  9 11:56:40 1999
++++ configure.in	Tue Feb 23 11:05:32 1999
+@@ -376,8 +376,8 @@
  	linux*) 	LDSHARED="gcc -shared"
  			rb_cv_dlopen=yes ;;
--	freebsd3*)      LDSHARED="ld -Bshareable"   
--			LDFLAGS="-rdynamic"
--			rb_cv_dlopen=yes ;;
--	freebsd*) 	LDSHARED="ld -Bshareable"
-+	freebsd*)	LDSHARED="gcc -shared"
+ 	freebsd*)	LDSHARED="gcc -shared"
+-			if test -x /usr/bin/objformat -a \
+-				`/usr/bin/objformat` = "elf" ; then
 +			if test -x /usr/bin/objformat && \
 +			   test `/usr/bin/objformat` = "elf" ; then
-+			    LDFLAGS="-rdynamic" ; fi
- 			rb_cv_dlopen=yes ;;
- 	netbsd*) 	LDSHARED="ld -Bshareable"
+ 			    LDFLAGS="-rdynamic"
+ 			fi
  			rb_cv_dlopen=yes ;;
Index: ruby/patches/patch-bb
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/patches/patch-bb,v
retrieving revision 1.1
diff -u -r1.1 patch-bb
--- patch-bb	1999/02/22 10:19:39	1.1
+++ patch-bb	1999/03/25 07:01:03
@@ -1,17 +1,13 @@
---- configure.orig	Mon Jan 18 19:03:57 1999
-+++ configure	Sat Feb  6 00:58:33 1999
-@@ -3472,10 +3472,10 @@
- 			rb_cv_dlopen=yes ;;
+--- configure.orig	Tue Feb  9 11:56:46 1999
++++ configure	Tue Feb 23 11:06:07 1999
+@@ -3473,8 +3473,8 @@
  	linux*) 	LDSHARED="gcc -shared"
  			rb_cv_dlopen=yes ;;
--	freebsd3*)      LDSHARED="ld -Bshareable"   
--			LDFLAGS="-rdynamic"
--			rb_cv_dlopen=yes ;;
--	freebsd*) 	LDSHARED="ld -Bshareable"
-+	freebsd*)	LDSHARED="gcc -shared"
+ 	freebsd*)	LDSHARED="gcc -shared"
+-			if test -x /usr/bin/objformat -a \
+-				`/usr/bin/objformat` = "elf" ; then
 +			if test -x /usr/bin/objformat && \
 +			   test `/usr/bin/objformat` = "elf" ; then
-+			    LDFLAGS="-rdynamic" ; fi
- 			rb_cv_dlopen=yes ;;
- 	netbsd*) 	LDSHARED="ld -Bshareable"
+ 			    LDFLAGS="-rdynamic"
+ 			fi
  			rb_cv_dlopen=yes ;;
Index: ruby/patches/patch-bc
===================================================================
RCS file: patch-bc
diff -N patch-bc
--- /dev/null	Fri Apr  2 01:12:22 1999
+++ patch-bc	Thu Mar 25 16:01:03 1999
@@ -0,0 +1,23 @@
+--- 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/pkg/PLIST
===================================================================
RCS file: /home/ncvs/ports/lang/ruby/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- PLIST	1999/02/22 04:11:52	1.6
+++ PLIST	1999/04/01 16:02:06
@@ -1,44 +1,27 @@
 bin/ruby
-lib/ruby/i386-freebsd%%OSREL%%/tkutil.so
-lib/ruby/i386-freebsd%%OSREL%%/tcltklib.so
-lib/ruby/i386-freebsd%%OSREL%%/socket.so
-lib/ruby/i386-freebsd%%OSREL%%/md5.so
-lib/ruby/i386-freebsd%%OSREL%%/kconv.so
-lib/ruby/i386-freebsd%%OSREL%%/fcntl.so
-lib/ruby/i386-freebsd%%OSREL%%/etc.so
-lib/ruby/i386-freebsd%%OSREL%%/dbm.so
-lib/ruby/i386-freebsd%%OSREL%%/curses.so
-lib/ruby/i386-freebsd%%OSREL%%/defines.h
-lib/ruby/i386-freebsd%%OSREL%%/dln.h
-lib/ruby/i386-freebsd%%OSREL%%/env.h
-lib/ruby/i386-freebsd%%OSREL%%/fnmatch.h
-lib/ruby/i386-freebsd%%OSREL%%/intern.h
-lib/ruby/i386-freebsd%%OSREL%%/node.h
-lib/ruby/i386-freebsd%%OSREL%%/re.h
-lib/ruby/i386-freebsd%%OSREL%%/regex.h
-lib/ruby/i386-freebsd%%OSREL%%/ruby.h
-lib/ruby/i386-freebsd%%OSREL%%/rubyio.h
-lib/ruby/i386-freebsd%%OSREL%%/rubysig.h
-lib/ruby/i386-freebsd%%OSREL%%/st.h
-lib/ruby/i386-freebsd%%OSREL%%/util.h
-lib/ruby/i386-freebsd%%OSREL%%/version.h
-lib/ruby/i386-freebsd%%OSREL%%/config.h
-lib/ruby/i386-freebsd%%OSREL%%/rbconfig.rb
-lib/ruby/tkvirtevent.rb
-lib/ruby/tktext.rb
-lib/ruby/tkscrollbox.rb
-lib/ruby/tkpalette.rb
-lib/ruby/tkmngfocus.rb
-lib/ruby/tkmenubar.rb
-lib/ruby/tkfont.rb
-lib/ruby/tkentry.rb
-lib/ruby/tkdialog.rb
-lib/ruby/tkclass.rb
-lib/ruby/tkcanvas.rb
-lib/ruby/tkbgerror.rb
-lib/ruby/tkafter.rb
-lib/ruby/tk.rb
-lib/ruby/tcltk.rb
+lib/ruby/%%RUBY_ARCH%%/socket.so
+lib/ruby/%%RUBY_ARCH%%/md5.so
+lib/ruby/%%RUBY_ARCH%%/kconv.so
+lib/ruby/%%RUBY_ARCH%%/fcntl.so
+lib/ruby/%%RUBY_ARCH%%/etc.so
+lib/ruby/%%RUBY_ARCH%%/dbm.so
+lib/ruby/%%RUBY_ARCH%%/curses.so
+lib/ruby/%%RUBY_ARCH%%/defines.h
+lib/ruby/%%RUBY_ARCH%%/dln.h
+lib/ruby/%%RUBY_ARCH%%/env.h
+lib/ruby/%%RUBY_ARCH%%/fnmatch.h
+lib/ruby/%%RUBY_ARCH%%/intern.h
+lib/ruby/%%RUBY_ARCH%%/node.h
+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%%/st.h
+lib/ruby/%%RUBY_ARCH%%/util.h
+lib/ruby/%%RUBY_ARCH%%/version.h
+lib/ruby/%%RUBY_ARCH%%/config.h
+lib/ruby/%%RUBY_ARCH%%/rbconfig.rb
 lib/ruby/English.rb
 lib/ruby/Env.rb
 lib/ruby/README
@@ -85,5 +68,57 @@
 lib/ruby/timeout.rb
 lib/ruby/tracer.rb
 lib/ruby/weakref.rb
-@dirrm lib/ruby/i386-freebsd%%OSREL%%
+@dirrm lib/ruby/%%RUBY_ARCH%%
 @dirrm lib/ruby
+share/examples/ruby/README
+share/examples/ruby/biorhythm.rb
+share/examples/ruby/cal.rb
+share/examples/ruby/cbreak.rb
+share/examples/ruby/clnt.rb
+share/examples/ruby/dbmtest.rb
+share/examples/ruby/dir.rb
+share/examples/ruby/eval.rb
+share/examples/ruby/export.rb
+share/examples/ruby/exyacc.rb
+share/examples/ruby/fact.rb
+share/examples/ruby/fib.awk
+share/examples/ruby/fib.pl
+share/examples/ruby/fib.py
+share/examples/ruby/fib.rb
+share/examples/ruby/fib.scm
+share/examples/ruby/freq.rb
+share/examples/ruby/from.rb
+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
+share/examples/ruby/list3.rb
+share/examples/ruby/mine.rb
+share/examples/ruby/mkproto.rb
+share/examples/ruby/mpart.rb
+share/examples/ruby/mrshtest.rb
+share/examples/ruby/observ.rb
+share/examples/ruby/occur.pl
+share/examples/ruby/occur.rb
+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
+share/examples/ruby/regx.rb
+share/examples/ruby/ruby-mode.el
+share/examples/ruby/rubydb2x.el
+share/examples/ruby/rubydb3x.el
+share/examples/ruby/sieve.rb
+share/examples/ruby/svr.rb
+share/examples/ruby/test.rb
+share/examples/ruby/time.rb
+share/examples/ruby/trojan.rb
+share/examples/ruby/tsvr.rb
+share/examples/ruby/uumerge.rb
+@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?19990402023154I.yasuf>