aboutsummaryrefslogtreecommitdiffstats
path: root/lang/ruby16
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2000-09-19 23:20:16 +0800
committerknu <knu@FreeBSD.org>2000-09-19 23:20:16 +0800
commit9199ae53b9dfd3be71b375683be31566cc6455a1 (patch)
tree62917478fe44216333654d37234e190910d2fbdb /lang/ruby16
parent2db2a0ee9b8e7bdd114bef95249aad3cab4b6bdf (diff)
downloadfreebsd-ports-gnome-9199ae53b9dfd3be71b375683be31566cc6455a1.tar.gz
freebsd-ports-gnome-9199ae53b9dfd3be71b375683be31566cc6455a1.tar.zst
freebsd-ports-gnome-9199ae53b9dfd3be71b375683be31566cc6455a1.zip
Update to Ruby 1.6.0 official release.
lang/ruby: - Do not force lib/ruby/site_ruby and lib/ruby removals, because a user may have his/her stuff installed there. x11-toolkits/ruby-tk: - Fix duplicated PKGNAMEPREFIX.
Diffstat (limited to 'lang/ruby16')
-rw-r--r--lang/ruby16/Makefile9
-rw-r--r--lang/ruby16/distinfo2
-rw-r--r--lang/ruby16/pkg-plist5
3 files changed, 7 insertions, 9 deletions
diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile
index 0d9b8baaa5ff..9caefa4adf95 100644
--- a/lang/ruby16/Makefile
+++ b/lang/ruby16/Makefile
@@ -6,11 +6,10 @@
#
PORTNAME= ruby
-PORTVERSION= ${RUBY_VERSION}.p3
+PORTVERSION= ${RUBY_VERSION}
CATEGORIES= lang ruby ipv6
MASTER_SITES= ${MASTER_SITE_RUBY}
-#MASTER_SITE_SUBDIR= ${RUBY_VER}
-DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-preview/}
+MASTER_SITE_SUBDIR= ${RUBY_VER}
DIST_SUBDIR= ruby
MAINTAINER= yasuf@bsdclub.org
@@ -21,8 +20,6 @@ CONFIGURE_ARGS= --enable-shared
MAN1= ruby${_RUBY_SUFFIX}.1
MLINKS= ruby${_RUBY_SUFFIX}.1 ruby.1
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
-
ELISP_FILES= inf-ruby.el ruby-mode.el rubydb3x.el
EMACSLISPDIR= ${PREFIX}/share/emacs/site-lisp
@@ -36,7 +33,7 @@ CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}"
.endif
.if ${OSVERSION} >= 400014
-CONFIGURE_ARGS+= --enable-ipv6
+CONFIGURE_ARGS+= --enable-ipv6
.endif
post-patch:
diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo
index bb24aba206df..78be989c6959 100644
--- a/lang/ruby16/distinfo
+++ b/lang/ruby16/distinfo
@@ -1 +1 @@
-MD5 (ruby/ruby-1.6.0-preview3.tar.gz) = 22b0c65d4bbc71232f07265ad0a4a0c4
+MD5 (ruby/ruby-1.6.0.tar.gz) = fc35bbdc50c7512b838f45558744f75d
diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist
index 860e3e7d896b..b2326e16f8b8 100644
--- a/lang/ruby16/pkg-plist
+++ b/lang/ruby16/pkg-plist
@@ -102,13 +102,13 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
@exec /bin/mkdir -p %D/%%RUBY_SITEARCHLIBDIR%%
@dirrm %%RUBY_SITEARCHLIBDIR%%
@dirrm %%RUBY_SITELIBDIR%%
-@dirrm lib/ruby/site_ruby
+@unexec rmdir %D/lib/ruby/site_ruby 2>/dev/null || true
@dirrm %%RUBY_ARCHLIBDIR%%
@dirrm %%RUBY_LIBDIR%%/cgi
@dirrm %%RUBY_LIBDIR%%/irb
@dirrm %%RUBY_LIBDIR%%/net
@dirrm %%RUBY_LIBDIR%%
-@dirrm lib/ruby
+@unexec rmdir %D/lib/ruby 2>/dev/null || true
%%RUBY_DOCDIR%%/README
%%RUBY_DOCDIR%%/README.EXT
%%RUBY_DOCDIR%%/README.EXT.jp
@@ -195,6 +195,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%%
share/emacs/site-lisp/inf-ruby.el
share/emacs/site-lisp/ruby-mode.el
share/emacs/site-lisp/rubydb3x.el
+@comment share/emacs/site-lisp is created by mtree
lib/xemacs/site-lisp/inf-ruby.el
lib/xemacs/site-lisp/ruby-mode.el
lib/xemacs/site-lisp/rubydb3x.el