diff options
| author | knu <knu@FreeBSD.org> | 2002-12-12 20:53:03 +0800 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2002-12-12 20:53:03 +0800 |
| commit | fc89ee6b273b2ed0628b0e9067107e3e1f94a3ce (patch) | |
| tree | f63c23c577fa85b226b57b1d01bc177755544f59 /lang/ruby16-shim-ruby18 | |
| parent | 57691fe03c6c47bd1549b8c3d8a65ac9780e12f2 (diff) | |
| download | freebsd-ports-gnome-fc89ee6b273b2ed0628b0e9067107e3e1f94a3ce.tar.gz freebsd-ports-gnome-fc89ee6b273b2ed0628b0e9067107e3e1f94a3ce.tar.zst freebsd-ports-gnome-fc89ee6b273b2ed0628b0e9067107e3e1f94a3ce.zip | |
Update lang/ruby to 1.6.8-preview3, lang/ruby16-shim-ruby18 to
1.7.3.2002.12.11, and lang/ruby-devel to 1.7.3-2002.12.12.
- Fix a few bugs that lead to core dump, one in the ruby interpreter
and another in the syslog module.
Reported by: ume (net/dtcp was a victim)
- Fix an installation problem occasionally seen on bento. (a bug in
Makefile that caused race)
Submitted by: bento
- Fix a problem that irb(1) didn't work because the symlink was wrong.
Submitted by: Jos Backus <jos@catnook.com>
- Get rid of move & symlink spaghetti completely from the installation
process.
Discussed with: portmgr (will)
Diffstat (limited to 'lang/ruby16-shim-ruby18')
| -rw-r--r-- | lang/ruby16-shim-ruby18/Makefile | 20 | ||||
| -rw-r--r-- | lang/ruby16-shim-ruby18/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby16-shim-ruby18/pkg-plist | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile index dcc7367d0fa4..d5a6bab51f13 100644 --- a/lang/ruby16-shim-ruby18/Makefile +++ b/lang/ruby16-shim-ruby18/Makefile @@ -6,7 +6,7 @@ # PORTNAME= shim-ruby18 -PORTVERSION= 1.7.3.2002.11.10 +PORTVERSION= 1.7.3.2002.12.11 CATEGORIES= lang devel ruby MASTER_SITES= ${MASTER_SITE_RUBY} MASTER_SITE_SUBDIR= shim @@ -30,7 +30,25 @@ WRKSRC= ${WRKDIR}/shim/ruby16 IGNORE= is only for ruby 1.6, ruby ${RUBY_VER} does not need it .endif +.if ${RUBY_VER} == ${RUBY_DEFAULT_VER} +IF_DEFAULT= "" +.else +IF_DEFAULT= "@comment " +.endif + +INSTALLED_SCRIPTS= ${PREFIX}/bin/erb + +PLIST_SUB+= IF_DEFAULT=${IF_DEFAULT} \ + pre-install: ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL +post-install: +.if ${RUBY_VER} == ${RUBY_DEFAULT_VER} + for f in ${INSTALLED_SCRIPTS}; do \ + ${LN} -f $${f}${RUBY_R} $${f}${_RUBY_SUFFIX}; \ + done +.endif + + .include <bsd.port.post.mk> diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo index 5398c13066a9..a39230c5c5a0 100644 --- a/lang/ruby16-shim-ruby18/distinfo +++ b/lang/ruby16-shim-ruby18/distinfo @@ -1 +1 @@ -MD5 (ruby/shim-ruby16_18-1.7.3.2002.11.10.tar.bz2) = 04ff91afa6db0b33153b871d64bbb453 +MD5 (ruby/shim-ruby16_18-1.7.3.2002.12.11.tar.bz2) = 66b2e02c5d64b4c684d0e0ff39039d65 diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist index b3234ef33adf..00e950195a68 100644 --- a/lang/ruby16-shim-ruby18/pkg-plist +++ b/lang/ruby16-shim-ruby18/pkg-plist @@ -1,3 +1,5 @@ +%%IF_DEFAULT%%bin/erb%%RUBY_R%% +bin/erb%%_RUBY_SUFFIX%% @comment features/ruby18 %%RUBY_SITEARCHLIBDIR%%/features/ruby18/file_ruby18.so %%RUBY_SITEARCHLIBDIR%%/features/ruby18/io_ruby18.so |