summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authortaca <taca@pkgsrc.org>2001-12-30 16:21:51 +0000
committertaca <taca@pkgsrc.org>2001-12-30 16:21:51 +0000
commit4547b160771e2337f88781fc8a2a8522d310fd13 (patch)
tree5bb4851b4c72a237af4e8632d5d66ae03ae3bee8 /lang
parentc36fa1d38b78df3b78b9722e0fc3ac258aabf0e0 (diff)
downloadpkgsrc-4547b160771e2337f88781fc8a2a8522d310fd13.tar.gz
Update ruby-base package to 1.6.6. Changes from 1.6.4 are too many,
see ${LOCALBASE}/share/doc/ruby/NEWS file. plus two fixes noted on ruby-dev@ruby-lang.org. [ruby-dev:15549] lib/irb/locale.rb [ruby-dev:15551] lib/weakref.rb And some ruby pakcage own changes: - Handle proper RUBY_ARCH variable on current. - REPLACE_RUBY is processed by sed(1) not ruby. - Proper handle with RUBY_EXTCONF. - USE_RUBY_SETUP dosen't implicit define USE_RUBY_AMSTD now.
Diffstat (limited to 'lang')
-rw-r--r--lang/ruby-base/MESSAGE4
-rw-r--r--lang/ruby-base/Makefile32
-rw-r--r--lang/ruby-base/Makefile.common60
-rw-r--r--lang/ruby-base/PLIST35
-rw-r--r--lang/ruby-base/distinfo17
-rw-r--r--lang/ruby-base/patches/patch-aa61
-rw-r--r--lang/ruby-base/patches/patch-ac8
-rw-r--r--lang/ruby-base/patches/patch-ad11
-rw-r--r--lang/ruby-base/patches/patch-af6
-rw-r--r--lang/ruby-base/patches/patch-ag12
-rw-r--r--lang/ruby-base/patches/patch-ah17
-rw-r--r--lang/ruby-base/patches/patch-aj14
12 files changed, 141 insertions, 136 deletions
diff --git a/lang/ruby-base/MESSAGE b/lang/ruby-base/MESSAGE
index 6a6c1b7ef49..58c4877e937 100644
--- a/lang/ruby-base/MESSAGE
+++ b/lang/ruby-base/MESSAGE
@@ -1,11 +1,11 @@
===========================================================================
-$NetBSD: MESSAGE,v 1.2 2001/11/11 06:17:28 hubertf Exp $
+$NetBSD: MESSAGE,v 1.3 2001/12/30 16:21:51 taca Exp $
Note that some stuff that comes with the standard Ruby 1.6
distribution is provided as separate package:
databases/ruby-gdbm: GDBM module
- security/ruby-md5: MD5 module
+ security/ruby-digest: message digest module
devel/ruby-readline: readline module
x11/ruby-tcltklib: Tcl/Tk libraries
x11/ruby-tk: Tk modules
diff --git a/lang/ruby-base/Makefile b/lang/ruby-base/Makefile
index d3f47466f3a..180183aa838 100644
--- a/lang/ruby-base/Makefile
+++ b/lang/ruby-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/06/30 14:11:26 taca Exp $
+# $NetBSD: Makefile,v 1.3 2001/12/30 16:21:51 taca Exp $
# FreeBSD Id: ports/lang/ruby/Makefile,v 1.39 2000/10/20 19:56:03 knu Exp
DISTNAME= ${RUBY_DISTNAME}
@@ -23,13 +23,21 @@ WRKSRC= ${RUBY_WRKSRC}
CONFIGURE_ARGS= --enable-shared
MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1
-DOCS= README README.EXT README.EXT.jp README.jp ToDo \
- doc/NEWS doc/forwardable.rd doc/forwardable.rd.jp \
- doc/shell.rd doc/shell.rd.jp
-DOCS_ETC= etc.txt etc.txt.jp
-DOCS_PTY= README README.expect README.expect.jp README.jp
+DOCS= README README.EXT README.EXT.ja README.ja ToDo \
+ doc/NEWS doc/forwardable.rd doc/forwardable.rd.ja \
+ doc/shell.rd doc/shell.rd.ja
+DOCS_ETC= etc.txt etc.txt.ja
+DOCS_PTY= README README.expect README.expect.ja README.ja
-.include "../../lang/ruby-base/Makefile.common"
+REPLACE_RUBY= ext/curses/hello.rb ext/curses/rain.rb ext/curses/view.rb \
+ lib/matrix.rb sample/biorhythm.rb sample/cal.rb \
+ sample/exyacc.rb sample/from.rb sample/fullpath.rb \
+ sample/goodfriday.rb sample/irb.rb sample/less.rb \
+ sample/mine.rb sample/mpart.rb sample/observ.rb \
+ sample/pi.rb sample/rcs.rb sample/rename.rb sample/test.rb \
+ sample/time.rb sample/trojan.rb sample/uumerge.rb
+
+.include "Makefile.common"
.if !empty(RUBY_SUFFIX)
CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
@@ -41,7 +49,11 @@ CONFIGURE_ARGS+= --enable-ipv6
pre-configure:
${RM} -f ${WRKSRC}/ext/gdbm/MANIFEST
- ${RM} -f ${WRKSRC}/ext/md5/MANIFEST
+ ${RM} -f ${WRKSRC}/ext/digest/MANIFEST
+ ${RM} -f ${WRKSRC}/ext/digest/md5/MANIFEST
+ ${RM} -f ${WRKSRC}/ext/digest/rmd160/MANIFEST
+ ${RM} -f ${WRKSRC}/ext/digest/sha1/MANIFEST
+ ${RM} -f ${WRKSRC}/ext/digest/sha2/MANIFEST
${RM} -f ${WRKSRC}/ext/readline/MANIFEST
${RM} -f ${WRKSRC}/ext/tcltklib/MANIFEST
${RM} -f ${WRKSRC}/ext/tk/MANIFEST
@@ -51,8 +63,7 @@ pre-build:
@${FIND} ${WRKSRC} -name '*.orig' -exec ${RM} -f {} \;
post-build:
- ${SED} -e 's|#!/usr/bin/env ruby|#!${RUBY}|' \
- ${WRKSRC}/sample/irb.rb > ${WRKDIR}/irb.rb
+ ${MV} -f ${WRKSRC}/sample/irb.rb ${WRKDIR}/irb.rb
post-install:
strip ${RUBY}
@@ -66,7 +77,6 @@ post-install:
${LN} -fs ruby${_RUBY_SUFFIX}.1 ${PREFIX}/man/man1/ruby.1
${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}
${INSTALL_SCRIPT} ${WRKDIR}/irb.rb ${PREFIX}/bin/irb
- ${RM} -f ${WRKSRC}/sample/irb.rb
${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/curses
${INSTALL_DATA} ${RUBY_WRKSRC}/ext/curses/hello.rb \
diff --git a/lang/ruby-base/Makefile.common b/lang/ruby-base/Makefile.common
index a0323d76a53..89789cbb748 100644
--- a/lang/ruby-base/Makefile.common
+++ b/lang/ruby-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2001/06/30 15:04:25 taca Exp $
+# $NetBSD: Makefile.common,v 1.3 2001/12/30 16:21:51 taca Exp $
# FreeBSD: ports/Mk/bsd.ruby.mk,v 1.11 2000/11/16 17:59:40 knu Exp
# Makefile.common: ruby common makefile, based on FreeBSD's bsd.ruby.mk.
@@ -64,21 +64,21 @@ RUBY_VER?= 1.6
RUBY?= ${LOCALBASE}/bin/${RUBY_NAME}
-RUBY_ARCH?= ${MACHINE_ARCH}-${LOWER_OPSYS}
-RUBY_NAME?= ruby${RUBY_SUFFIX}
-
.if ${RUBY_VER} < 1.5
RUBY_VERSION?= 1.4.6
RUBY_SUFFIX?= ${_RUBY_SUFFIX}
RUBY_IRB_VERSION= 0.6.1
.elif ${RUBY_VER} < 1.7
-RUBY_VERSION?= 1.6.4
+RUBY_VERSION?= 1.6.6
RUBY_SUFFIX?= # empty
.else
RUBY_VERSION?= 1.7 # current, not tested.
RUBY_SUFFIX?= ${_RUBY_SUFFIX}
.endif
+RUBY_ARCH?= ${MACHINE_GNU_PLATFORM:S/--/-/}
+RUBY_NAME?= ruby${RUBY_SUFFIX}
+
RUBY_DISTNAME?= ruby-${RUBY_VERSION}
RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME}
@@ -98,6 +98,9 @@ RUBY_SITEARCHLIBDIR?= ${RUBY_SITELIBDIR}/${RUBY_ARCH}
RUBY_DOCDIR?= ${LOCALBASE}/share/doc/${RUBY_NAME}
RUBY_EXAMPLESDIR?= ${LOCALBASE}/share/examples/${RUBY_NAME}
+# MAKE_ENV
+MAKE_ENV+= RUBY_VER=${RUBY_VER}
+
# PLIST
PLIST_RUBY_DIRS= RUBY_LIBDIR="${RUBY_LIBDIR}" \
RUBY_ARCHLIBDIR="${RUBY_ARCHLIBDIR}" \
@@ -121,18 +124,22 @@ RUBY_DISTINFO?= ${.CURDIR}/../../lang/ruby${RUBY_SUFFIX}-base/distinfo
# fix shebang lines
.if defined(REPLACE_RUBY) && !empty(REPLACE_RUBY)
-USE_RUBY= yes
-
-post-patch: replace-ruby
+pre-configure: replace-ruby
replace-ruby:
- @for f in ${REPLACE_RUBY}; do \
- case $$f in \
- /*) ;; \
- *) f=${WRKSRC}/$$f;; \
+ @for file in ${REPLACE_RUBY}; do \
+ case $${file} in \
+ /*) f=$${file};; \
+ *) f=${WRKSRC}/$${file};; \
esac; \
- ${ECHO_MSG} "===> Fixing the #! line of $$f"; \
- ${RUBY} -i -pe '$$. == 1 and sub /^#!\s*\S*(\benv\s+)?\bruby/, "#!${RUBY}"' $$f; \
+ ${ECHO_MSG} "===> Fixing the #! line of $${file}"; \
+ ${SED} -e 's| *[a-z0-9_/\.-][a-z0-9_/\.-]*/env *||g' \
+ -e 's| *[a-z0-9_/\.-]*ruby|${RUBY}|' $$f > $$f.tmp; \
+ if ${CMP} -s $$f $$f.tmp; then \
+ ${RM} $$f.tmp; \
+ else \
+ ${MV} $$f.tmp $$f; \
+ fi; \
done
.endif
@@ -145,14 +152,36 @@ CONFIGURE_ARGS+= --with-opt-dir="${LOCALBASE}"
do-configure: ruby-extconf-configure
-ruby-extconf-configure:
.if defined(RUBY_EXTCONF_SUBDIRS)
+ruby-extconf-configure:
.for d in ${RUBY_EXTCONF_SUBDIRS}
@${ECHO_MSG} "===> Running ${RUBY_EXTCONF} in ${d} to configure"
@cd ${WRKSRC}/${d}; \
${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
.endfor
+
+.if !target(do-build)
+do-build: ruby-extconf-build
+
+ruby-extconf-build:
+.for d in ${RUBY_EXTCONF_SUBDIRS}
+ @${ECHO_MSG} "===> Building ${d}"
+ @cd ${WRKSRC}/${d}; ${SETENV} ${MAKE} ${ALL_TARGET}
+.endfor
+.endif
+
+.if !target(do-install)
+do-install: ruby-extconf-install
+
+ruby-extconf-install:
+.for d in ${RUBY_EXTCONF_SUBDIRS}
+ @${ECHO_MSG} "===> Installing ${d}"
+ @cd ${WRKSRC}/${d}; ${SETENV} ${MAKE} ${INSTALL_TARGET}
+.endfor
+.endif
+
.else
+ruby-extconf-configure:
@${ECHO_MSG} "===> Running ${RUBY_EXTCONF} to configure"
@cd ${WRKSRC}; \
${SETENV} ${CONFIGURE_ENV} ${RUBY} ${RUBY_EXTCONF} ${CONFIGURE_ARGS}
@@ -161,7 +190,6 @@ ruby-extconf-configure:
# setup.rb
.if defined(USE_RUBY_SETUP)
-USE_RUBY_AMSTD= yes
USE_RUBY?= yes
RUBY_SETUP?= setup.rb
diff --git a/lang/ruby-base/PLIST b/lang/ruby-base/PLIST
index e725ca65f4b..67e333f8bec 100644
--- a/lang/ruby-base/PLIST
+++ b/lang/ruby-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 00:24:42 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/12/30 16:21:51 taca Exp $
bin/irb
bin/ruby
bin/ruby${_RUBY_SUFFIX}
@@ -27,6 +27,7 @@ ${RUBY_ARCHLIBDIR}/rubysig.h
${RUBY_ARCHLIBDIR}/sdbm.so
${RUBY_ARCHLIBDIR}/socket.so
${RUBY_ARCHLIBDIR}/st.h
+${RUBY_ARCHLIBDIR}/syslog.so
${RUBY_ARCHLIBDIR}/util.h
${RUBY_ARCHLIBDIR}/version.h
${RUBY_LIBDIR}/English.rb
@@ -53,6 +54,7 @@ ${RUBY_LIBDIR}/ftplib.rb
${RUBY_LIBDIR}/getoptlong.rb
${RUBY_LIBDIR}/getopts.rb
${RUBY_LIBDIR}/importenv.rb
+${RUBY_LIBDIR}/irb.rb
${RUBY_LIBDIR}/irb/completion.rb
${RUBY_LIBDIR}/irb/context.rb
${RUBY_LIBDIR}/irb/extend-command.rb
@@ -77,7 +79,6 @@ ${RUBY_LIBDIR}/irb/workspace.rb
${RUBY_LIBDIR}/irb/ws-for-case-2.rb
${RUBY_LIBDIR}/irb/xmp.rb
@dirrm ${RUBY_LIBDIR}/irb
-${RUBY_LIBDIR}/irb.rb
${RUBY_LIBDIR}/jcode.rb
${RUBY_LIBDIR}/kconv.rb
${RUBY_LIBDIR}/mailread.rb
@@ -104,6 +105,8 @@ ${RUBY_LIBDIR}/profile.rb
${RUBY_LIBDIR}/pstore.rb
${RUBY_LIBDIR}/rational.rb
${RUBY_LIBDIR}/readbytes.rb
+${RUBY_LIBDIR}/resolv-replace.rb
+${RUBY_LIBDIR}/resolv.rb
${RUBY_LIBDIR}/shell.rb
${RUBY_LIBDIR}/shell/builtin-command.rb
${RUBY_LIBDIR}/shell/command-processor.rb
@@ -123,33 +126,33 @@ ${RUBY_LIBDIR}/thwait.rb
${RUBY_LIBDIR}/timeout.rb
${RUBY_LIBDIR}/tracer.rb
${RUBY_LIBDIR}/weakref.rb
-@exec /bin/mkdir -p %D/${RUBY_SITEARCHLIBDIR}
-@dirrm ${RUBY_SITEARCHLIBDIR}
-@dirrm ${RUBY_SITELIBDIR}
-@dirrm lib/ruby/site_ruby
+@exec ${MKDIR} -p %D/${RUBY_SITEARCHLIBDIR}
+@unexec ${RMDIR} %D/${RUBY_SITEARCHLIBDIR} 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/${RUBY_SITELIBDIR} 2>/dev/null || ${TRUE}
+@unexec ${RMDIR} %D/lib/ruby/site_ruby 2>/dev/null || ${TRUE}
@dirrm ${RUBY_ARCHLIBDIR}
@dirrm ${RUBY_LIBDIR}
-@dirrm lib/ruby
+@unexec ${RMDIR} %D/lib/ruby 2>/dev/null || ${TRUE}
man/man1/ruby16.1
man/man1/ruby.1
${RUBY_DOCDIR}/NEWS
${RUBY_DOCDIR}/README
${RUBY_DOCDIR}/README.EXT
-${RUBY_DOCDIR}/README.EXT.jp
-${RUBY_DOCDIR}/README.jp
+${RUBY_DOCDIR}/README.EXT.ja
+${RUBY_DOCDIR}/README.ja
${RUBY_DOCDIR}/ToDo
${RUBY_DOCDIR}/etc/etc.txt
-${RUBY_DOCDIR}/etc/etc.txt.jp
+${RUBY_DOCDIR}/etc/etc.txt.ja
+@dirrm ${RUBY_DOCDIR}/etc
${RUBY_DOCDIR}/forwardable.rd
-${RUBY_DOCDIR}/forwardable.rd.jp
+${RUBY_DOCDIR}/forwardable.rd.ja
${RUBY_DOCDIR}/pty/README
${RUBY_DOCDIR}/pty/README.expect
-${RUBY_DOCDIR}/pty/README.expect.jp
-${RUBY_DOCDIR}/pty/README.jp
-${RUBY_DOCDIR}/shell.rd
-${RUBY_DOCDIR}/shell.rd.jp
-@dirrm ${RUBY_DOCDIR}/etc
+${RUBY_DOCDIR}/pty/README.expect.ja
+${RUBY_DOCDIR}/pty/README.ja
@dirrm ${RUBY_DOCDIR}/pty
+${RUBY_DOCDIR}/shell.rd
+${RUBY_DOCDIR}/shell.rd.ja
@dirrm ${RUBY_DOCDIR}
${RUBY_EXAMPLESDIR}/README
${RUBY_EXAMPLESDIR}/biorhythm.rb
diff --git a/lang/ruby-base/distinfo b/lang/ruby-base/distinfo
index bb8153804b7..4babf84e983 100644
--- a/lang/ruby-base/distinfo
+++ b/lang/ruby-base/distinfo
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: distinfo,v 1.2 2001/12/30 16:21:51 taca Exp $
-SHA1 (ruby/ruby-1.6.4.tar.gz) = 8cc989b1beb462e3012744e9f4e6a512e5a1d0f9
-Size (ruby/ruby-1.6.4.tar.gz) = 900164 bytes
-SHA1 (patch-aa) = 2be4d5188da483e61cbcd221830771b83d87697d
-SHA1 (patch-ac) = 9ef79dc53b05a64d388179ef1d7a951b322f2b82
-SHA1 (patch-ad) = a6a7607397eafa12458ed7e4f97941dc24362887
+SHA1 (ruby/ruby-1.6.6.tar.gz) = 922712ae41b51e255e43bcc421b566507b7c8278
+Size (ruby/ruby-1.6.6.tar.gz) = 976606 bytes
+SHA1 (patch-aa) = e1c43ada8f8e8f9add0f70bced30259430db03ba
+SHA1 (patch-ac) = 5b897041345ec4077fa2165e3c4c58a6671b942d
SHA1 (patch-ae) = 294af53a7509372f0d7c17230c605d790f1e7bb2
-SHA1 (patch-af) = f53576f6274fec3312d273dc4dc8129a03e4a419
-SHA1 (patch-aj) = d6462ffd8dd5e3ea3cdca5baeba6073f1f3d8749
+SHA1 (patch-af) = 87d349aa9b5b721eacafba2977f85ec1262fd622
+SHA1 (patch-ag) = 4b5893b55253526af687bc81a9acea3686a00d39
+SHA1 (patch-ah) = bb68957898e4d53d1cc74a971b2c266d181ef3c8
+SHA1 (patch-aj) = c7474ba44f99e368a0cd7a5d7a70464dfc36955f
diff --git a/lang/ruby-base/patches/patch-aa b/lang/ruby-base/patches/patch-aa
index 352048ed7f6..2b56289f4e2 100644
--- a/lang/ruby-base/patches/patch-aa
+++ b/lang/ruby-base/patches/patch-aa
@@ -1,63 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-aa,v 1.2 2001/12/30 16:21:52 taca Exp $
---- configure.in.orig Fri Jun 1 11:34:50 2001
+--- configure.in.orig Tue Dec 4 13:51:50 2001
+++ configure.in
-@@ -501,12 +501,7 @@
- beos*) ;;
- cygwin*) ;;
- mingw*) ;;
-- netbsd*) CCDLFLAGS=-fpic
-- case "$target_cpu" in
-- mips*) CCDLFLAGS=-fPIC ;;
-- sparc) CCDLFLAGS=-fPIC ;;
-- *) ;;
-- esac ;;
-+ netbsd*) CCDLFLAGS=-fPIC;;
- *) CCDLFLAGS=-fPIC;;
- esac
- else
-@@ -553,10 +548,8 @@
- test "$GCC" = yes && `$CC --print-prog-name=ld` -v 2>&1 | grep "GNU ld" > /dev/null || LDSHARED="ld -Bshareable"
- fi
- rb_cv_dlopen=yes ;;
-- netbsd*) LDSHARED="ld -shared"
-- if test "$rb_cv_binary_elf" = yes; then
-- LDFLAGS="-export-dynamic"
-- fi
-+ netbsd*) LDSHARED='${CC} -shared'
-+ LDFLAGS=""
- rb_cv_dlopen=yes ;;
- openbsd*) LDSHARED="ld -Bforcearchive -Bshareable"
- rb_cv_dlopen=yes ;;
-@@ -823,11 +816,13 @@
- ;;
- netbsd*)
- SOLIBS='$(LIBS)'
-- LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR).$(MINOR)'
-+ LIBRUBY_SO='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR).$(TEENY)'
-+ LIBRUBY_DLDFLAGS='-Wl,-soname,lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR)'
-+ LIBRUBYARG='-Wl,-R -Wl,${prefix}/lib -L${prefix}/lib -L. -l$(RUBY_INSTALL_NAME) -Wl,-R -Wl,${X11BASE}/lib -L${X11BASE}/lib'
- if test "$rb_cv_binary_elf" = yes; then # ELF platforms
-- LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR) lib$(RUBY_INSTALL_NAME).so'
-- else
-- LIBRUBY_ALIASES= # a.out platforms
-+ LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_INSTALL_NAME).so'
-+ else # a.out platforms
-+ LIBRUBY_ALIASES=""
- fi
- ;;
- openbsd*)
-@@ -871,6 +866,9 @@
- fi
-
- case "$target_os" in
-+ netbsd*)
-+ CFLAGS="$CFLAGS -pipe"
-+ ;;
- nextstep*)
- CFLAGS="$CFLAGS -pipe"
- ;;
-@@ -938,6 +936,7 @@
+@@ -941,6 +941,7 @@
;;
esac
diff --git a/lang/ruby-base/patches/patch-ac b/lang/ruby-base/patches/patch-ac
index dd51bdb8e94..49dc9c8985e 100644
--- a/lang/ruby-base/patches/patch-ac
+++ b/lang/ruby-base/patches/patch-ac
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-ac,v 1.2 2001/12/30 16:21:52 taca Exp $
---- ext/curses/extconf.rb.orig Wed Mar 21 17:04:11 2001
+--- ext/curses/extconf.rb.orig Mon Dec 3 19:04:46 2001
+++ ext/curses/extconf.rb
@@ -6,17 +6,9 @@
@@ -8,7 +8,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
have_library("mytinfo", "tgetent") if /bow/ =~ RUBY_PLATFORM
-if have_header("ncurses.h") and have_library("ncurses", "initscr")
+have_library("termcap", "tgetent")
-+if have_library("curses", "initscr")
++if have_header("curses.h") and have_library("curses", "initscr")
make=true
-elsif have_header("ncurses/curses.h") and have_library("ncurses", "initscr")
- make=true
@@ -16,7 +16,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
- make=true
-else
- have_library("termcap", "tgetent")
-- if have_library("curses", "initscr")
+- if have_header("curses.h") and have_library("curses", "initscr")
- make=true
- end
end
diff --git a/lang/ruby-base/patches/patch-ad b/lang/ruby-base/patches/patch-ad
deleted file mode 100644
index 5cac9399819..00000000000
--- a/lang/ruby-base/patches/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
-
---- ext/socket/extconf.rb.orig Mon May 21 13:19:49 2001
-+++ ext/socket/extconf.rb
-@@ -1,6 +1,5 @@
- require 'mkmf'
-
--$LIBPATH << "/usr/local/lib" if File.directory?("/usr/local/lib")
- $CPPFLAGS += " -Dss_family=__ss_family -Dss_len=__ss_len"
-
- case RUBY_PLATFORM
diff --git a/lang/ruby-base/patches/patch-af b/lang/ruby-base/patches/patch-af
index 41c4bcb128d..33a68c69091 100644
--- a/lang/ruby-base/patches/patch-af
+++ b/lang/ruby-base/patches/patch-af
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-af,v 1.2 2001/12/30 16:21:52 taca Exp $
---- lib/mkmf.rb.orig Mon May 21 13:19:49 2001
+--- lib/mkmf.rb.orig Fri Dec 21 18:19:47 2001
+++ lib/mkmf.rb
-@@ -160,7 +160,7 @@
+@@ -158,7 +158,7 @@
for f in path
d = '/' + File::dirname(f)
d = '' if d == '/.'
diff --git a/lang/ruby-base/patches/patch-ag b/lang/ruby-base/patches/patch-ag
new file mode 100644
index 00000000000..b582f2319af
--- /dev/null
+++ b/lang/ruby-base/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2001/12/30 16:21:52 taca Exp $
+
+--- lib/irb/locale.rb.orig Fri Jun 29 17:25:29 2001
++++ lib/irb/locale.rb
+@@ -135,6 +135,7 @@
+ end
+ lc_file.close
+ toplevel_load lc_file.path, priv
++ lc_file.close(true)
+ end
+ private :real_load
+
diff --git a/lang/ruby-base/patches/patch-ah b/lang/ruby-base/patches/patch-ah
new file mode 100644
index 00000000000..68dea922a4e
--- /dev/null
+++ b/lang/ruby-base/patches/patch-ah
@@ -0,0 +1,17 @@
+$NetBSD: patch-ah,v 1.1 2001/12/30 16:21:52 taca Exp $
+
+--- lib/weakref.rb.orig Thu Jul 27 18:49:33 2000
++++ lib/weakref.rb
+@@ -60,7 +60,11 @@
+ unless ID_MAP[@__id]
+ raise RefError, "Illegal Reference - probably recycled", caller(2)
+ end
+- ObjectSpace._id2ref(@__id)
++ begin
++ ObjectSpace._id2ref(@__id)
++ rescue RangeError
++ raise RefError, "Illegal Reference - probably recycled", caller(2)
++ end
+ end
+
+ def weakref_alive?
diff --git a/lang/ruby-base/patches/patch-aj b/lang/ruby-base/patches/patch-aj
index 28cb9fd1c18..f85c370659d 100644
--- a/lang/ruby-base/patches/patch-aj
+++ b/lang/ruby-base/patches/patch-aj
@@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.1.1.1 2001/06/30 08:07:10 taca Exp $
+$NetBSD: patch-aj,v 1.2 2001/12/30 16:21:52 taca Exp $
---- ext/extmk.rb.in.orig Tue May 29 17:57:26 2001
-+++ ext/extmk.rb.in Fri Jun 29 00:09:27 2001
-@@ -177,7 +177,7 @@
- mfile.printf "\t@$(RUBY) -r ftools -e 'File::makedirs(*ARGV)' $(DESTDIR)$(pkglibdir)/%s\n", f
+--- ext/extmk.rb.in.orig Fri Jul 27 17:52:19 2001
++++ ext/extmk.rb.in
+@@ -175,7 +175,7 @@
+ end
end
for f in path
-- mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
-+ mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)/%s\n", f, f
+- mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f
++ mfile.printf "\t@$(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0444, true)' $(srcdir)/lib/%s $(DESTDIR)$(pkglibdir)$(target_prefix)/%s\n", f, f
end
end