diff options
| -rw-r--r-- | Mk/bsd.ruby.mk | 19 | ||||
| -rw-r--r-- | lang/ruby/Makefile | 2 | ||||
| -rw-r--r-- | lang/ruby/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby/pkg-plist | 1 | ||||
| -rw-r--r-- | lang/ruby16/Makefile | 2 | ||||
| -rw-r--r-- | lang/ruby16/distinfo | 2 | ||||
| -rw-r--r-- | lang/ruby16/pkg-plist | 1 |
7 files changed, 17 insertions, 12 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 83585605a2f2..af16ef07e297 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -40,7 +40,7 @@ Ruby_Include_MAINTAINER= knu@FreeBSD.org # RUBY_DISTNAME - DISTNAME for the standard ruby ports, i.e. the basename of the ruby distribution tarball. # RUBY_DISTVERSION - The version number part of RUBY_DISTNAME. # RUBY_DISTVER - Same as RUBY_DISTVERSION, but converted into PORTVERSION style (preview -> .p etc.) -# RUBY_SNAPSHOTVERSION - Snapshot version. Mostly it is a date. +# RUBY_PATCHLEVEL - Patchlevel, or a snapshot date. # RUBY_WRKSRC - WRKSRC for the ruby port. # # RUBY_SHLIBVER - Major version of libruby (see below for current value). @@ -94,19 +94,26 @@ RUBY?= ${LOCALBASE}/bin/${RUBY_NAME} .if defined(RUBY_VER) && ${RUBY_VER} == 1.4 RUBY_VERSION?= 1.4.6 RUBY_SUFFIX?= ${_RUBY_SUFFIX} +.elif defined(RUBY_VER) && ${RUBY_VER} == 1.7 +RUBY_VERSION?= 1.7.0 +RUBY_SUFFIX?= ${_RUBY_SUFFIX} +RUBY_WRKSRC?= ${WRKDIR}/ruby +RUBY_DISTVERSION?= ${RUBY_VERSION}-alpha-2001.05.03 +RUBY_PATCHLEVEL?= 1 .else RUBY_VERSION?= 1.6.4 RUBY_SUFFIX?= # empty +RUBY_DISTVERSION?= ${RUBY_VERSION}-preview2 +RUBY_PATCHLEVEL?= 2001.05.03 .endif -RUBY_DISTVERSION?= ${RUBY_VERSION}-preview2 -RUBY_SNAPSHOTVERSION?= 2001.05.01 -RUBY_DISTVER= ${RUBY_DISTVERSION:S/-preview/.p/} +RUBY_DISTVERSION?= ${RUBY_VERSION} +RUBY_DISTVER= ${RUBY_DISTVERSION:S/-preview/.p/:S/-alpha-/.a/:S/-beta-/.b/} -.if !defined(RUBY_SNAPSHOTVERSION) || empty(RUBY_SNAPSHOTVERSION) +.if !defined(RUBY_PATCHLEVEL) || empty(RUBY_PATCHLEVEL) RUBY_PORTVERSION= ${RUBY_DISTVER} .else -RUBY_PORTVERSION= ${RUBY_DISTVER}.${RUBY_SNAPSHOTVERSION} +RUBY_PORTVERSION= ${RUBY_DISTVER}.${RUBY_PATCHLEVEL} .endif RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index b77cf78edef5..17666b27724b 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby PATCH_SITES= http://www.ruby-lang.org/~knu/ -PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz +PATCHFILES= ${RUBY_DISTNAME}-${RUBY_PATCHLEVEL}.patch.gz PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org diff --git a/lang/ruby/distinfo b/lang/ruby/distinfo index fdbab05c5857..89c4c4271dfd 100644 --- a/lang/ruby/distinfo +++ b/lang/ruby/distinfo @@ -1,2 +1,2 @@ MD5 (ruby/ruby-1.6.4-preview2.tar.gz) = ff4cb6a7593157938f1766021ff74c2e -MD5 (ruby/ruby-1.6.4-preview2-2001.05.01.patch.gz) = 03bc0b64379e112d4a81d9dc24562bc6 +MD5 (ruby/ruby-1.6.4-preview2-2001.05.03.patch.gz) = fbb1edbde865cb45c33d9fd3d9bea75b diff --git a/lang/ruby/pkg-plist b/lang/ruby/pkg-plist index 138a50acd3f5..3795cb8e87e7 100644 --- a/lang/ruby/pkg-plist +++ b/lang/ruby/pkg-plist @@ -90,7 +90,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/irb/multi-irb.rb %%RUBY_LIBDIR%%/irb/locale.rb %%RUBY_LIBDIR%%/irb/loader.rb -%%RUBY_LIBDIR%%/irb/irb.rb %%RUBY_LIBDIR%%/irb/input-method.rb %%RUBY_LIBDIR%%/irb/init.rb %%RUBY_LIBDIR%%/irb/help.rb diff --git a/lang/ruby16/Makefile b/lang/ruby16/Makefile index b77cf78edef5..17666b27724b 100644 --- a/lang/ruby16/Makefile +++ b/lang/ruby16/Makefile @@ -14,7 +14,7 @@ DISTNAME= ${RUBY_DISTNAME} DIST_SUBDIR= ruby PATCH_SITES= http://www.ruby-lang.org/~knu/ -PATCHFILES= ${RUBY_DISTNAME}-${RUBY_SNAPSHOTVERSION}.patch.gz +PATCHFILES= ${RUBY_DISTNAME}-${RUBY_PATCHLEVEL}.patch.gz PATCH_DIST_STRIP= -p1 MAINTAINER= knu@FreeBSD.org diff --git a/lang/ruby16/distinfo b/lang/ruby16/distinfo index fdbab05c5857..89c4c4271dfd 100644 --- a/lang/ruby16/distinfo +++ b/lang/ruby16/distinfo @@ -1,2 +1,2 @@ MD5 (ruby/ruby-1.6.4-preview2.tar.gz) = ff4cb6a7593157938f1766021ff74c2e -MD5 (ruby/ruby-1.6.4-preview2-2001.05.01.patch.gz) = 03bc0b64379e112d4a81d9dc24562bc6 +MD5 (ruby/ruby-1.6.4-preview2-2001.05.03.patch.gz) = fbb1edbde865cb45c33d9fd3d9bea75b diff --git a/lang/ruby16/pkg-plist b/lang/ruby16/pkg-plist index 138a50acd3f5..3795cb8e87e7 100644 --- a/lang/ruby16/pkg-plist +++ b/lang/ruby16/pkg-plist @@ -90,7 +90,6 @@ lib/lib%%RUBY_NAME%%.so.%%RUBY_SHLIBVER%% %%RUBY_LIBDIR%%/irb/multi-irb.rb %%RUBY_LIBDIR%%/irb/locale.rb %%RUBY_LIBDIR%%/irb/loader.rb -%%RUBY_LIBDIR%%/irb/irb.rb %%RUBY_LIBDIR%%/irb/input-method.rb %%RUBY_LIBDIR%%/irb/init.rb %%RUBY_LIBDIR%%/irb/help.rb |