diff options
-rw-r--r-- | Mk/bsd.ruby.mk | 11 | ||||
-rw-r--r-- | lang/ruby-devel/distinfo | 2 | ||||
-rw-r--r-- | lang/ruby-devel/pkg-plist | 1 | ||||
-rw-r--r-- | lang/ruby/distinfo | 1 | ||||
-rw-r--r-- | lang/ruby16-shim-ruby18/Makefile | 11 | ||||
-rw-r--r-- | lang/ruby16-shim-ruby18/distinfo | 2 | ||||
-rw-r--r-- | lang/ruby16-shim-ruby18/pkg-plist | 5 | ||||
-rw-r--r-- | lang/ruby16/distinfo | 1 | ||||
-rw-r--r-- | lang/ruby18/distinfo | 2 | ||||
-rw-r--r-- | lang/ruby18/pkg-plist | 1 |
10 files changed, 20 insertions, 17 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 58e1678f825f..e3458d5e8cc5 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -101,19 +101,20 @@ _RUBY_SITEDIR!= ${_RUBY_CONFIG} 'puts C["sitedir"]' RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} .if defined(RUBY_VER) && ${RUBY_VER} == 1.7 -RUBY_VERSION?= 1.7.2 +RUBY_VERSION?= 1.7.3 RUBY_PORT?= lang/ruby${RUBY_R}-devel -RUBY_DISTVERSION?= ${RUBY_VER}-2002.07.15 +RUBY_DISTVERSION?= ${RUBY_VER}-2002.09.12 #RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-yyyy.mm.dd.diff.bz2 -RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.07.15 +RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.09.12 .else RUBY_VERSION?= 1.6.7 RUBY_DISTVERSION?= ${RUBY_VERSION} RUBY_PATCHFILES?= ruby-${RUBY_DISTVERSION}-2002.03.27.diff.bz2 \ ruby-${RUBY_DISTVERSION}-2002.03.27-2002.05.02.diff.bz2 \ ruby-${RUBY_DISTVERSION}-2002.05.02-2002.05.23.diff.bz2 \ - ruby-${RUBY_DISTVERSION}-2002.05.23-2002.07.15.diff.bz2 -RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.07.15 + ruby-${RUBY_DISTVERSION}-2002.05.23-2002.07.15.diff.bz2 \ + ruby-${RUBY_DISTVERSION}-2002.07.15-2002.09.12.diff.bz2 +RUBY_PORTVERSION?= ${RUBY_VERSION}.2002.09.12 .endif # defined(RUBY_VER) && ${RUBY_VER} == 1.7 diff --git a/lang/ruby-devel/distinfo b/lang/ruby-devel/distinfo index 72c9af38f9a1..9fe3c1535866 100644 --- a/lang/ruby-devel/distinfo +++ b/lang/ruby-devel/distinfo @@ -1,2 +1,2 @@ -MD5 (ruby/ruby-1.7-2002.07.15.tar.bz2) = a4274e739c25a503e2d1c651f3b26daa +MD5 (ruby/ruby-1.7-2002.09.12.tar.bz2) = 4f85e9368137db51eab34e14f2301efa MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0 diff --git a/lang/ruby-devel/pkg-plist b/lang/ruby-devel/pkg-plist index 053bca845a95..d5ba0075d618 100644 --- a/lang/ruby-devel/pkg-plist +++ b/lang/ruby-devel/pkg-plist @@ -94,6 +94,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBYLIB%%%%RUBY_LIBDIR%%/readbytes.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv-replace.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv.rb +%%RUBYLIB%%%%RUBY_LIBDIR%%/set.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/sha1.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shell.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo index 344135d3b64d..e1bdd12472e0 100644 --- a/lang/ruby/distinfo +++ b/lang/ruby/distinfo @@ -3,4 +3,5 @@ MD5 (ruby/ruby-1.6.7-2002.03.27.diff.bz2) = 11ad3f19357c5e02cc3a3882ca567f98 MD5 (ruby/ruby-1.6.7-2002.03.27-2002.05.02.diff.bz2) = 8f21e3aeaf6de69862b0ce3b3e44b503 MD5 (ruby/ruby-1.6.7-2002.05.02-2002.05.23.diff.bz2) = a09917ed660deee38aab350ed5a472b3 MD5 (ruby/ruby-1.6.7-2002.05.23-2002.07.15.diff.bz2) = 7d8b554b63e5878d72dbb006a1d39802 +MD5 (ruby/ruby-1.6.7-2002.07.15-2002.09.12.diff.bz2) = db8bf647716995cdc5a79c66c188ee98 MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0 diff --git a/lang/ruby16-shim-ruby18/Makefile b/lang/ruby16-shim-ruby18/Makefile index 18d250c79fa0..ce9c85b12f2b 100644 --- a/lang/ruby16-shim-ruby18/Makefile +++ b/lang/ruby16-shim-ruby18/Makefile @@ -6,9 +6,10 @@ # PORTNAME= shim-ruby18 -PORTVERSION= 1.7.2.2002.07.31 +PORTVERSION= 1.7.3.2002.09.12 CATEGORIES= lang devel ruby -MASTER_SITES= http://www.ruby-lang.org/~knu/ +MASTER_SITES= ${MASTER_SITE_RUBY} +MASTER_SITE_SUBDIR= shim PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= shim-ruby16_18-${PORTVERSION} DIST_SUBDIR= ruby @@ -20,7 +21,7 @@ USE_BZIP2= yes USE_RUBY= yes CONFIGURE_ARGS= RUBY=${RUBY} -#CONFIGURE_ARGS+= CONFIGURE_ARGS="-- --config-opt=--with-opt-dir=/usr/local" +#CONFIGURE_ARGS+= CONFIGURE_ARGS="-- --config-opt=--with-opt-dir=${LOCALBASE}" WRKSRC= ${WRKDIR}/shim/ruby16 .include <bsd.port.pre.mk> @@ -29,10 +30,6 @@ WRKSRC= ${WRKDIR}/shim/ruby16 IGNORE= is only for ruby 1.6, ruby ${RUBY_VER} does not need it .endif -post-extract: - ${MKDIR} ${WRKSRC}/ext-ra - ${MV} ${WRKSRC}/ext/iconv ${WRKDIR}/ - pre-install: ${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/lang/ruby16-shim-ruby18/distinfo b/lang/ruby16-shim-ruby18/distinfo index 2a2c4e68b78a..26f80824102d 100644 --- a/lang/ruby16-shim-ruby18/distinfo +++ b/lang/ruby16-shim-ruby18/distinfo @@ -1 +1 @@ -MD5 (ruby/shim-ruby16_18-1.7.2.2002.07.31.tar.bz2) = dd1a4ff714af87b54ae222c45e3e2466 +MD5 (ruby/shim-ruby16_18-1.7.3.2002.09.12.tar.bz2) = e37c2b17d30966710812c26eec3830f1 diff --git a/lang/ruby16-shim-ruby18/pkg-plist b/lang/ruby16-shim-ruby18/pkg-plist index 0c3d7afad603..3d88fcc2d0b9 100644 --- a/lang/ruby16-shim-ruby18/pkg-plist +++ b/lang/ruby16-shim-ruby18/pkg-plist @@ -1,6 +1,6 @@ @comment features/ruby18 -%%RUBY_SITEARCHLIBDIR%%/features/ruby18/file.so -%%RUBY_SITEARCHLIBDIR%%/features/ruby18/io.so +%%RUBY_SITEARCHLIBDIR%%/features/ruby18/file_ruby18.so +%%RUBY_SITEARCHLIBDIR%%/features/ruby18/io_ruby18.so @dirrm %%RUBY_SITEARCHLIBDIR%%/features/ruby18 @dirrm %%RUBY_SITEARCHLIBDIR%%/features %%RUBY_SITELIBDIR%%/features/ruby18.rb @@ -53,4 +53,5 @@ %%RUBY_SITELIBDIR%%/fileutils.rb %%RUBY_SITELIBDIR%%/pp.rb %%RUBY_SITELIBDIR%%/prettyprint.rb +%%RUBY_SITELIBDIR%%/set.rb %%RUBY_SITELIBDIR%%/tsort.rb diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index 344135d3b64d..e1bdd12472e0 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -3,4 +3,5 @@ MD5 (ruby/ruby-1.6.7-2002.03.27.diff.bz2) = 11ad3f19357c5e02cc3a3882ca567f98 MD5 (ruby/ruby-1.6.7-2002.03.27-2002.05.02.diff.bz2) = 8f21e3aeaf6de69862b0ce3b3e44b503 MD5 (ruby/ruby-1.6.7-2002.05.02-2002.05.23.diff.bz2) = a09917ed660deee38aab350ed5a472b3 MD5 (ruby/ruby-1.6.7-2002.05.23-2002.07.15.diff.bz2) = 7d8b554b63e5878d72dbb006a1d39802 +MD5 (ruby/ruby-1.6.7-2002.07.15-2002.09.12.diff.bz2) = db8bf647716995cdc5a79c66c188ee98 MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0 diff --git a/lang/ruby18/distinfo b/lang/ruby18/distinfo index 72c9af38f9a1..9fe3c1535866 100644 --- a/lang/ruby18/distinfo +++ b/lang/ruby18/distinfo @@ -1,2 +1,2 @@ -MD5 (ruby/ruby-1.7-2002.07.15.tar.bz2) = a4274e739c25a503e2d1c651f3b26daa +MD5 (ruby/ruby-1.7-2002.09.12.tar.bz2) = 4f85e9368137db51eab34e14f2301efa MD5 (ruby/onigd20020424.tar.gz) = d5e6505aa776378a58cdb0fd4ef9cdc0 diff --git a/lang/ruby18/pkg-plist b/lang/ruby18/pkg-plist index 053bca845a95..d5ba0075d618 100644 --- a/lang/ruby18/pkg-plist +++ b/lang/ruby18/pkg-plist @@ -94,6 +94,7 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBYLIB%%%%RUBY_LIBDIR%%/readbytes.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv-replace.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/resolv.rb +%%RUBYLIB%%%%RUBY_LIBDIR%%/set.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/sha1.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shell.rb %%RUBYLIB%%%%RUBY_LIBDIR%%/shellwords.rb |