From 26b21d0b3ca0ea8065d175e534940a12e4e22a56 Mon Sep 17 00:00:00 2001
From: Akinori MUSHA <knu@FreeBSD.org>
Date: Sun, 14 Apr 2002 12:36:47 +0000
Subject: Update ruby-devel to the latest 1.7 snapshot as of 2002-04-12.
---
lang/ruby18/Makefile | 36 ++++++++++++++++++++++++++----------
lang/ruby18/distinfo | 2 +-
lang/ruby18/pkg-plist | 17 +++++++++++++++++
3 files changed, 44 insertions(+), 11 deletions(-)
(limited to 'lang/ruby18')
diff --git a/lang/ruby18/Makefile b/lang/ruby18/Makefile
index 260ba8865fd3..f76c8e9dac76 100644
--- a/lang/ruby18/Makefile
+++ b/lang/ruby18/Makefile
@@ -74,10 +74,11 @@ RUBYLIB= ""
PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} \
RUBYLIB=${RUBYLIB}
-IRB_WITHOUT_SUFFIX= ${LOCALBASE}/bin/irb
-IRB_WITH_SUFFIX= ${IRB_WITHOUT_SUFFIX}${_RUBY_SUFFIX}
+INSTALLED_SCRIPTS= ${PREFIX}/bin/irb \
+ ${PREFIX}/bin/h2rb
OBSOLETED_MODULES= bigfloat \
+ dl \
fileutils \
racc-runtime \
sha1 \
@@ -112,31 +113,41 @@ pre-configure:
pre-install:
${RM} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} \
${PREFIX}/man/man1/ruby${RUBY_R}.1 \
- ${PREFIX}/man/man1/ruby${RUBY_R}.1.gz \
- ${IRB_WITHOUT_SUFFIX}${RUBY_R}
+ ${PREFIX}/man/man1/ruby${RUBY_R}.1.gz
+ for f in ${INSTALLED_SCRIPTS}; do \
+ ${RM} -f $${f}${RUBY_R}; \
+ done
post-install:
.if ${STRIP} == -s
strip ${RUBY}
.endif
+ ${INSTALL_SCRIPT} ${WRKSRC}/ext/dl/h2rb ${PREFIX}/bin/
.if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
${MV} -f ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ${RUBY_WITH_SUFFIX}
${MV} -f ${PREFIX}/man/man1/ruby${RUBY_R}.1 ${PREFIX}/man/man1/ruby${_RUBY_SUFFIX}.1
.endif
- ${MV} -f ${IRB_WITHOUT_SUFFIX} ${IRB_WITH_SUFFIX}
+ for f in ${INSTALLED_SCRIPTS}; do \
+ ${MV} -f $${f} $${f}${_RUBY_SUFFIX}; \
+ done
if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ]; then \
${LN} -fs ${RUBY_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX}${RUBY_R} ${RUBY_WITHOUT_SUFFIX}${RUBY_R}; \
${LN} -fs ruby${RUBY_DEFAULT_SUFFIX}${RUBY_R}.1${MANEXT} ${PREFIX}/man/man1/ruby${RUBY_R}.1${MANEXT}; \
fi
if [ -x ${RUBY_WITHOUT_SUFFIX} ]; then \
- ${LN} -fs ${IRB_WITHOUT_SUFFIX}${RUBY_DEFAULT_SUFFIX} ${IRB_WITHOUT_SUFFIX}; \
+ for f in ${INSTALLED_SCRIPTS}; do \
+ ${LN} -fs $${f}${RUBY_DEFAULT_SUFFIX} $${f}; \
+ done; \
fi
.if !empty(RUBY_R)
if [ -x ${RUBY_WITHOUT_SUFFIX}${RUBY_R} ]; then \
- ${LN} -fs ${IRB_WITH_SUFFIX} ${IRB_WITHOUT_SUFFIX}${RUBY_R}; \
+ for f in ${INSTALLED_SCRIPTS}; do \
+ ${LN} -fs $${f}${_RUBY_SUFFIX} $${f}${RUBY_R}; \
+ done; \
fi
.endif
- ${LDCONFIG} -m ${LOCALBASE}/lib
+ ${LDCONFIG} -m ${PREFIX}/lib
+.for f in ${INSTALLED_SCRIPTS}
${RUBY_WITH_SUFFIX} ${RUBY_FLAGS} -i -p \
-e 'if $$. == 1; ' \
-e ' if /^#!/; ' \
@@ -145,8 +156,9 @@ post-install:
-e ' $$_ = "#!${RUBY_WITH_SUFFIX}\n" + $$_;' \
-e ' end;' \
-e 'end' \
- ${IRB_WITH_SUFFIX}
- ${CHMOD} ${BINMODE} ${IRB_WITH_SUFFIX}
+ ${f}${_RUBY_SUFFIX}
+ ${CHMOD} ${BINMODE} ${f}${_RUBY_SUFFIX}
+.endfor
${MKDIR} ${RUBY_ELISPDIR}
${TOUCH} ${RUBY_ELISPDIR}/.keep_me
${MKDIR} ${RUBY_EXAMPLESDIR}
@@ -157,6 +169,8 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/sample/* ${RUBY_EXAMPLESDIR}
${MKDIR} ${RUBY_EXAMPLESDIR}/curses
${INSTALL_DATA} ${WRKSRC}/ext/curses/hello.rb ${WRKSRC}/ext/curses/rain.rb ${WRKSRC}/ext/curses/view.rb ${RUBY_EXAMPLESDIR}/curses
+ ${MKDIR} ${RUBY_EXAMPLESDIR}/dl
+ ${INSTALL_DATA} ${WRKSRC}/ext/dl/sample/*.rb ${RUBY_EXAMPLESDIR}/dl
${MKDIR} ${RUBY_EXAMPLESDIR}/pty
${INSTALL_DATA} ${WRKSRC}/ext/pty/expect_sample.rb ${WRKSRC}/ext/pty/script.rb ${WRKSRC}/ext/pty/shl.rb ${RUBY_EXAMPLESDIR}/pty
${INSTALL_DATA} ${WRKSRC}/COPYING* ${RUBY_DOCDIR}
@@ -164,6 +178,8 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/README* ${RUBY_DOCDIR}
${MKDIR} ${RUBY_DOCDIR}/digest
${INSTALL_DATA} ${WRKSRC}/ext/digest/digest.txt* ${RUBY_DOCDIR}/digest
+ ${MKDIR} ${RUBY_DOCDIR}/dl
+ ${INSTALL_DATA} ${WRKSRC}/ext/dl/doc/dl.txt ${RUBY_DOCDIR}/dl
${MKDIR} ${RUBY_DOCDIR}/etc
${INSTALL_DATA} ${WRKSRC}/ext/etc/etc.txt* ${RUBY_DOCDIR}/etc
${MKDIR} ${RUBY_DOCDIR}/pty
diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo
index 7f38aa390345..2b87ba92ab63 100644
--- a/lang/ruby18/distinfo
+++ b/lang/ruby18/distinfo
@@ -1,2 +1,2 @@
MD5 (ruby/ruby-1.7-2002.03.26.tar.bz2) = e5f709818307b1fa051dde784dcbbcd2
-MD5 (ruby/onigd20020325.tar.gz) = 3cfa28bd30b7d2a27fb3f402de4e5e19
+MD5 (ruby/ruby-1.7-2002.03.26-2002.04.12.diff.bz2) = 38f7430590e6a8862027e3b09a4dd30e
diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist
index b06776dc37ce..d56430e3388e 100644
--- a/lang/ruby18/pkg-plist
+++ b/lang/ruby18/pkg-plist
@@ -1,3 +1,5 @@
+%%IF_DEFAULT%%bin/h2rb%%RUBY_R%%
+bin/h2rb%%_RUBY_SUFFIX%%
%%IF_DEFAULT%%bin/irb%%RUBY_R%%
bin/irb%%_RUBY_SUFFIX%%
%%IF_DEFAULT%%bin/ruby%%RUBY_R%%
@@ -10,6 +12,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBY_ARCHLIBDIR%%/dbm.so
%%RUBY_ARCHLIBDIR%%/defines.h
%%RUBY_ARCHLIBDIR%%/digest.so
+%%RUBY_ARCHLIBDIR%%/dl.so
%%RUBY_ARCHLIBDIR%%/dln.h
%%RUBY_ARCHLIBDIR%%/env.h
%%RUBY_ARCHLIBDIR%%/etc.so
@@ -105,6 +108,10 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%RUBYLIB%%%%RUBY_LIBDIR%%/uri.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/weakref.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/cgi/session.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/import.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/struct.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/types.rb
+%%RUBYLIB%%%%RUBY_LIBDIR%%/dl/win32.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/xmp.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/ws-for-case-2.rb
%%RUBYLIB%%%%RUBY_LIBDIR%%/irb/workspace.rb
@@ -154,6 +161,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
@dirrm %%RUBY_ARCHLIBDIR%%
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/cgi
+%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/dl
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc/ja
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb/lc
%%RUBYLIB%%@dirrm %%RUBY_LIBDIR%%/irb
@@ -178,6 +186,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/forwardable.rd.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd
%%PORTDOCS%%%%RUBY_DOCDIR%%/shell.rd.ja
+%%PORTDOCS%%%%RUBY_DOCDIR%%/dl/dl.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt
%%PORTDOCS%%%%RUBY_DOCDIR%%/digest/digest.txt.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/etc/etc.txt
@@ -193,6 +202,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_DOCDIR%%/readline/README.ja
%%PORTDOCS%%%%RUBY_DOCDIR%%/syslog/syslog.txt
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/digest
+%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/dl
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/etc
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/irb
%%PORTDOCS%%@dirrm %%RUBY_DOCDIR%%/pty
@@ -252,10 +262,17 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/hello.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/rain.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/curses/view.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dl/drives.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dl/getch.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dl/libc.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dl/msgbox.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dl/msgbox2.rb
+%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/dl/stream.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/expect_sample.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/script.rb
%%PORTDOCS%%%%RUBY_EXAMPLESDIR%%/pty/shl.rb
%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/curses
+%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/dl
%%PORTDOCS%%@dirrm %%RUBY_EXAMPLESDIR%%/pty
%%RUBY_EXAMPLESDIR%%/.keep_me
@unexec rmdir %D/%%RUBY_EXAMPLESDIR%% 2>/dev/null || true
--
cgit v1.2.3