diff options
Diffstat (limited to 'lang/ruby')
| -rw-r--r-- | lang/ruby/Makefile | 4 | ||||
| -rw-r--r-- | lang/ruby/files/md5 | 4 | ||||
| -rw-r--r-- | lang/ruby/files/patch-sum | 6 | ||||
| -rw-r--r-- | lang/ruby/patches/patch-aa | 13 | ||||
| -rw-r--r-- | lang/ruby/patches/patch-ab | 46 | ||||
| -rw-r--r-- | lang/ruby/patches/patch-ac | 220 | ||||
| -rw-r--r-- | lang/ruby/patches/patch-ad | 29 | ||||
| -rw-r--r-- | lang/ruby/pkg/PLIST | 14 |
8 files changed, 14 insertions, 322 deletions
diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 717b5f4f76d..ab95405e91a 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2000/04/14 04:20:12 sakamoto Exp $ +# $NetBSD: Makefile,v 1.13 2000/04/18 10:46:08 sakamoto Exp $ # -DISTNAME= ruby-1.4.3 +DISTNAME= ruby-1.4.4 CATEGORIES= lang MASTER_SITES= ftp://ftp.TokyoNet.AD.JP/pub/misc/ruby/ \ ftp://ftp.iij.ad.jp/pub/lang/ruby/ \ diff --git a/lang/ruby/files/md5 b/lang/ruby/files/md5 index fd47d3fad52..e30b9e12f0c 100644 --- a/lang/ruby/files/md5 +++ b/lang/ruby/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 1999/12/14 07:16:05 sakamoto Exp $ +$NetBSD: md5,v 1.6 2000/04/18 10:46:16 sakamoto Exp $ -MD5 (ruby-1.4.3.tar.gz) = ff2df3fa6855e087998bf5d1fb6dfbd9 +MD5 (ruby-1.4.4.tar.gz) = 066f5270077eac7737426a688354017f diff --git a/lang/ruby/files/patch-sum b/lang/ruby/files/patch-sum index c9ecf35369b..a26d4a18bb1 100644 --- a/lang/ruby/files/patch-sum +++ b/lang/ruby/files/patch-sum @@ -1,8 +1,4 @@ -$NetBSD: patch-sum,v 1.4 2000/04/11 07:35:29 sakamoto Exp $ +$NetBSD: patch-sum,v 1.5 2000/04/18 10:46:16 sakamoto Exp $ -MD5 (patch-aa) = 63413152889269cdc5c2cb9f64e537e2 -MD5 (patch-ab) = 54a21b3f994f075cf30391018551c8a5 -MD5 (patch-ac) = f7371976ef7f29dddc1b625c057926d8 -MD5 (patch-ad) = 22dfcd7c0c31c8434c663ffd4c6b607c MD5 (patch-ae) = 9b69e6da375997341a3d3d691dd57393 MD5 (patch-af) = f38f1dc0bb7333800b6844d620018444 diff --git a/lang/ruby/patches/patch-aa b/lang/ruby/patches/patch-aa deleted file mode 100644 index 9686d4a183c..00000000000 --- a/lang/ruby/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/12/14 07:16:05 sakamoto Exp $ - ---- dln.c.orig Wed Nov 10 17:54:41 1999 -+++ dln.c Tue Dec 14 13:12:16 1999 -@@ -80,7 +80,7 @@ - #endif - - #ifndef FUNCNAME_PATTERN --# if defined(__hp9000s300) || (defined(__NetBSD__) && (!defined(__alpha__) && !defined(__mips__))) || defined(__BORLANDC__) || (defined(__FreeBSD__) && __FreeBSD__ < 3) || defined(__OpenBSD__) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__) -+# if defined(__hp9000s300) || (defined(__NetBSD__) && !defined(__ELF__)) || defined(__BORLANDC__) || (defined(__FreeBSD__) && __FreeBSD__ < 3) || defined(__OpenBSD__) || defined(NeXT) || defined(__WATCOMC__) || defined(__APPLE__) - # define FUNCNAME_PATTERN "_Init_%.200s" - # else - # define FUNCNAME_PATTERN "Init_%.200s" diff --git a/lang/ruby/patches/patch-ab b/lang/ruby/patches/patch-ab deleted file mode 100644 index 1d7b692a7c6..00000000000 --- a/lang/ruby/patches/patch-ab +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2000/01/22 13:31:45 itojun Exp $ - ---- configure.in.orig Tue Dec 7 16:01:00 1999 -+++ configure.in Fri Jan 21 00:56:42 2000 -@@ -355,6 +355,9 @@ - else - LDFLAGS="-rdynamic" - fi;; -+netbsd*) -+ rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__` -+ ;; - esac - - AC_SUBST(DLDFLAGS)dnl -@@ -430,10 +433,9 @@ - fi - rb_cv_dlopen=yes ;; - netbsd*) LDSHARED="ld -shared" -- case "$host_cpu" in -- alpha) -- LDFLAGS="-export-dynamic" ;; -- esac -+ if test "x$rb_cv_netbsd_elf" != "x" ; then -+ LDFLAGS="-export-dynamic" -+ fi - rb_cv_dlopen=yes ;; - openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" - rb_cv_dlopen=yes ;; -@@ -684,11 +686,12 @@ - ;; - netbsd*) - LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' -- case "$host_cpu" in -- alpha|mipsel|mipseb|powerpc|sparc64) # ELF platforms -- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' ;; -- *) LIBRUBY_ALIASES= ;; # a.out platforms -- esac -+ if test "x$rb_cv_netbsd_elf" != "x" ; then -+ LIBRUBYARG='$(LIBRUBY_SO)' -+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' -+ else -+ LIBRUBY_ALIASES='' -+ fi - ;; - solaris*) - XLDFLAGS='-R${prefix}/lib' diff --git a/lang/ruby/patches/patch-ac b/lang/ruby/patches/patch-ac deleted file mode 100644 index b6ad08881f0..00000000000 --- a/lang/ruby/patches/patch-ac +++ /dev/null @@ -1,220 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2000/01/22 13:31:45 itojun Exp $ - ---- configure.orig Tue Dec 7 16:38:00 1999 -+++ configure Fri Jan 21 00:56:47 2000 -@@ -3641,7 +3641,7 @@ - int main() { - - /* Ultrix mips cc rejects this. */ --typedef int charset[2]; const charset x = {0,0}; -+typedef int charset[2]; const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; -@@ -4015,6 +4015,9 @@ - else - LDFLAGS="-rdynamic" - fi;; -+netbsd*) -+ rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__` -+ ;; - esac - - -@@ -4024,7 +4027,7 @@ - if test "$with_dln_a_out" != yes; then - rb_cv_dlopen=unknown - echo $ac_n "checking whether OS depend dynamic link works""... $ac_c" 1>&6 --echo "configure:4028: checking whether OS depend dynamic link works" >&5 -+echo "configure:4031: checking whether OS depend dynamic link works" >&5 - if test "$GCC" = yes; then - case "$host_os" in - nextstep*) ;; -@@ -4086,10 +4089,9 @@ - fi - rb_cv_dlopen=yes ;; - netbsd*) LDSHARED="ld -shared" -- case "$host_cpu" in -- alpha) -- LDFLAGS="-export-dynamic" ;; -- esac -+ if test "x$rb_cv_netbsd_elf" != "x" ; then -+ LDFLAGS="-export-dynamic" -+ fi - rb_cv_dlopen=yes ;; - openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" - rb_cv_dlopen=yes ;; -@@ -4146,12 +4148,12 @@ - if test "$with_dln_a_out" = yes || test "$rb_cv_dlopen" = unknown; then - cat confdefs.h > config.h - echo $ac_n "checking whether matz's dln works""... $ac_c" 1>&6 --echo "configure:4150: checking whether matz's dln works" >&5 -+echo "configure:4152: checking whether matz's dln works" >&5 - if eval "test \"`echo '$''{'rb_cv_dln_a_out'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4155 "configure" -+#line 4157 "configure" - #include "confdefs.h" - - #define USE_DLN_A_OUT -@@ -4161,7 +4163,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:4167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - rb_cv_dln_a_out=yes - else -@@ -4268,7 +4270,7 @@ - case "$host_os" in - human*) - echo $ac_n "checking for _harderr in -lsignal""... $ac_c" 1>&6 --echo "configure:4272: checking for _harderr in -lsignal" >&5 -+echo "configure:4274: checking for _harderr in -lsignal" >&5 - ac_lib_var=`echo signal'_'_harderr | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4276,7 +4278,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lsignal $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4280 "configure" -+#line 4282 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4287,7 +4289,7 @@ - _harderr() - ; return 0; } - EOF --if { (eval echo configure:4291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4315,7 +4317,7 @@ - fi - - echo $ac_n "checking for hmemset in -lhmem""... $ac_c" 1>&6 --echo "configure:4319: checking for hmemset in -lhmem" >&5 -+echo "configure:4321: checking for hmemset in -lhmem" >&5 - ac_lib_var=`echo hmem'_'hmemset | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -4323,7 +4325,7 @@ - ac_save_LIBS="$LIBS" - LIBS="-lhmem $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4327 "configure" -+#line 4329 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 -@@ -4334,7 +4336,7 @@ - hmemset() - ; return 0; } - EOF --if { (eval echo configure:4338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" - else -@@ -4364,12 +4366,12 @@ - for ac_func in select - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:4368: checking for $ac_func" >&5 -+echo "configure:4370: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext <<EOF --#line 4373 "configure" -+#line 4375 "configure" - #include "confdefs.h" - /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -@@ -4392,7 +4394,7 @@ - - ; return 0; } - EOF --if { (eval echo configure:4396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" - else -@@ -4417,7 +4419,7 @@ - done - - echo $ac_n "checking whether PD libc _dtos18 fail to convert big number""... $ac_c" 1>&6 --echo "configure:4421: checking whether PD libc _dtos18 fail to convert big number" >&5 -+echo "configure:4423: checking whether PD libc _dtos18 fail to convert big number" >&5 - if eval "test \"`echo '$''{'rb_cv_missing__dtos18'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4425,7 +4427,7 @@ - rb_cv_missing__dtos18=no - else - cat > conftest.$ac_ext <<EOF --#line 4429 "configure" -+#line 4431 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -4437,7 +4439,7 @@ - } - - EOF --if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - rb_cv_missing__dtos18=yes - else -@@ -4459,7 +4461,7 @@ - - fi - echo $ac_n "checking whether PD libc fconvert fail to round""... $ac_c" 1>&6 --echo "configure:4463: checking whether PD libc fconvert fail to round" >&5 -+echo "configure:4465: checking whether PD libc fconvert fail to round" >&5 - if eval "test \"`echo '$''{'rb_cv_missing_fconvert'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -4467,7 +4469,7 @@ - rb_cv_missing_fconvert=no - else - cat > conftest.$ac_ext <<EOF --#line 4471 "configure" -+#line 4473 "configure" - #include "confdefs.h" - - #include <stdio.h> -@@ -4480,7 +4482,7 @@ - } - - EOF --if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:4486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - rb_cv_missing_fconvert=yes - else -@@ -4585,11 +4587,12 @@ - ;; - netbsd*) - LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)' -- case "$host_cpu" in -- alpha|mipsel|mipseb|powerpc|sparc64) # ELF platforms -- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' ;; -- *) LIBRUBY_ALIASES= ;; # a.out platforms -- esac -+ if test "x$rb_cv_netbsd_elf" != "x" ; then -+ LIBRUBYARG='$(LIBRUBY_SO)' -+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so' -+ else -+ LIBRUBY_ALIASES='' -+ fi - ;; - solaris*) - XLDFLAGS='-R${prefix}/lib' diff --git a/lang/ruby/patches/patch-ad b/lang/ruby/patches/patch-ad deleted file mode 100644 index fb913db3135..00000000000 --- a/lang/ruby/patches/patch-ad +++ /dev/null @@ -1,29 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2000/01/22 13:31:46 itojun Exp $ - ---- ext/socket/extconf.rb- Thu Jan 20 02:50:06 2000 -+++ ext/socket/extconf.rb Thu Jan 20 02:52:52 2000 -@@ -41,6 +41,7 @@ - $ipv6type = nil - $ipv6lib = nil - $ipv6libdir = nil -+$ipv6trylibc = nil - if $ipv6 - if egrep_cpp("yes", <<EOF) - #include <netinet/in.h> -@@ -59,6 +60,7 @@ - $ipv6type = "kame" - $ipv6lib="inet6" - $ipv6libdir="/usr/local/v6/lib" -+ $ipv6trylibc=true - $CFLAGS="-DINET6 "+$CFLAGS - elsif File.directory? "/usr/inet6" - $ipv6type = "linux" -@@ -100,7 +102,7 @@ - if $ipv6lib - if File.directory? $ipv6libdir and File.exist? "#{$ipv6libdir}/lib#{$ipv6lib}.a" - $LOCAL_LIBS = " -L#$ipv6libdir -l#$ipv6lib" -- else -+ elsif !$ipv6trylibc - print <<EOS - - Fatal: no #$ipv6lib library found. cannot continue. diff --git a/lang/ruby/pkg/PLIST b/lang/ruby/pkg/PLIST index c554d43b69f..7f5b081314d 100644 --- a/lang/ruby/pkg/PLIST +++ b/lang/ruby/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 1999/12/14 07:16:06 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.5 2000/04/18 10:46:17 sakamoto Exp $ bin/ruby lib/libruby.so.${RUBY_VERSION} lib/ruby/${RUBY_VERSION}/English.rb @@ -71,9 +71,12 @@ lib/ruby/${RUBY_VERSION}/matrix.rb lib/ruby/${RUBY_VERSION}/mkmf.rb lib/ruby/${RUBY_VERSION}/monitor.rb lib/ruby/${RUBY_VERSION}/mutex_m.rb +lib/ruby/${RUBY_VERSION}/net/ftp.rb +lib/ruby/${RUBY_VERSION}/net/http.rb lib/ruby/${RUBY_VERSION}/net/pop.rb -lib/ruby/${RUBY_VERSION}/net/session.rb +lib/ruby/${RUBY_VERSION}/net/protocol.rb lib/ruby/${RUBY_VERSION}/net/smtp.rb +lib/ruby/${RUBY_VERSION}/net/telnet.rb lib/ruby/${RUBY_VERSION}/observer.rb lib/ruby/${RUBY_VERSION}/open3.rb lib/ruby/${RUBY_VERSION}/ostruct.rb @@ -150,11 +153,12 @@ share/examples/ruby/time.rb share/examples/ruby/trojan.rb share/examples/ruby/tsvr.rb share/examples/ruby/uumerge.rb -@exec mkdir -p %D/lib/ruby/${RUBY_VERSION}/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS} +@exec mkdir -p %D/lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS} @dirrm share/examples/ruby/misc @dirrm share/examples/ruby -@dirrm lib/ruby/${RUBY_VERSION}/site_ruby/${MACHINE_ARCH}-${LOWER_OPSYS} -@dirrm lib/ruby/${RUBY_VERSION}/site_ruby +@dirrm lib/ruby/site_ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS} +@dirrm lib/ruby/site_ruby/${RUBY_VERSION} +@dirrm lib/ruby/site_ruby @dirrm lib/ruby/${RUBY_VERSION}/net @dirrm lib/ruby/${RUBY_VERSION}/irb @dirrm lib/ruby/${RUBY_VERSION}/${MACHINE_ARCH}-${LOWER_OPSYS} |