diff --git a/netbsd/pkgsrc/lang/ruby/Makefile b/netbsd/pkgsrc/lang/ruby/Makefile index bc54be9c60..4e59857caf 100644 --- a/netbsd/pkgsrc/lang/ruby/Makefile +++ b/netbsd/pkgsrc/lang/ruby/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.8 2000/01/15 18:46:29 jlam 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/netbsd/pkgsrc/lang/ruby/files/md5 b/netbsd/pkgsrc/lang/ruby/files/md5 index 480bf35559..501b6d99f2 100644 --- a/netbsd/pkgsrc/lang/ruby/files/md5 +++ b/netbsd/pkgsrc/lang/ruby/files/md5 @@ -1,4 +1,3 @@ $NetBSD$ -MD5 (ruby-1.2.5.tar.gz) = 3ec298b7697843733ea0230f23b626b6 -MD5 (ruby-125-v6-19990509.diff.gz) = 5e636425ca5680a52e7fa9f687303f42 +MD5 (ruby-1.4.4.tar.gz) = 066f5270077eac7737426a688354017f diff --git a/netbsd/pkgsrc/lang/ruby/patches/patch-aa b/netbsd/pkgsrc/lang/ruby/patches/patch-aa deleted file mode 100644 index 9686d4a183..0000000000 --- a/netbsd/pkgsrc/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/netbsd/pkgsrc/lang/ruby/patches/patch-ab b/netbsd/pkgsrc/lang/ruby/patches/patch-ab deleted file mode 100644 index ce1c8b1817..0000000000 --- a/netbsd/pkgsrc/lang/ruby/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ab,v 1.1 1999/09/22 12:33:30 sakamoto Exp $ - ---- ./configure.in.orig Mon Aug 30 16:00:47 1999 -+++ ./configure.in Wed Sep 22 19:51:42 1999 -@@ -680,9 +680,11 @@ - 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 -+ rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__` -+ 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*) diff --git a/netbsd/pkgsrc/lang/ruby/patches/patch-ac b/netbsd/pkgsrc/lang/ruby/patches/patch-ac deleted file mode 100644 index 23c32abde0..0000000000 --- a/netbsd/pkgsrc/lang/ruby/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.1 1999/09/22 12:33:30 sakamoto Exp $ - ---- ./configure.orig Mon Aug 30 23:14:28 1999 -+++ ./configure Wed Sep 22 19:53:16 1999 -@@ -4581,9 +4581,11 @@ - 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 -+ rb_cv_netbsd_elf=`echo|cc -E -v - 2>&1 |grep __ELF__` -+ 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*) diff --git a/netbsd/pkgsrc/lang/ruby/pkg/PLIST b/netbsd/pkgsrc/lang/ruby/pkg/PLIST index f8a503de0a..4b901068e0 100644 --- a/netbsd/pkgsrc/lang/ruby/pkg/PLIST +++ b/netbsd/pkgsrc/lang/ruby/pkg/PLIST @@ -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}