diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-04-25 20:53:29 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-04-25 20:53:29 +0000 |
| commit | e9a5dbb3d4e2d45e5bc40c288ce9d2869c68aebd (patch) | |
| tree | c488be8febd9e554c1e5fce627bedf832d0b7909 /Mk | |
| parent | 95fa9913f79cd0c31f0cc4df2294d934f5368bc5 (diff) | |
| download | ports-e9a5dbb3d4e2d45e5bc40c288ce9d2869c68aebd.tar.gz ports-e9a5dbb3d4e2d45e5bc40c288ce9d2869c68aebd.zip | |
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.ruby.mk | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index f2b90ab0c85e..c72a168bb39a 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -162,8 +162,8 @@ RUBY27= "" # PLIST_SUB helpers # # Ruby 3.0 # -RUBY_DISTVERSION= 3.0.0-preview1 -RUBY_PORTREVISION= 2 +RUBY_VERSION= 3.0.1 +RUBY_PORTREVISION= 0 RUBY_PORTEPOCH= 1 RUBY30= "" # PLIST_SUB helpers @@ -178,16 +178,6 @@ _INVALID_RUBY_VER= 1 . endif .endif # defined(RUBY_VER) -.if defined(RUBY_DISTVERSION) -.if !defined(RUBY_VERSION) -RUBY_VERSION= ${RUBY_DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\1.\2/g:C/:(.)/\1/g:C/[^a-z0-9+]+/./g} -.else -DEV_ERROR+= "Defining both RUBY_VERSION and RUBY_DISTVERSION is wrong, only set one" -.endif -.else -RUBY_DISTVERSION= ${RUBY_VERSION} -.endif - .if !defined(_INVALID_RUBY_VER) RUBY26?= "@comment " @@ -202,7 +192,7 @@ BROKEN= ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} .endif .endif -RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} +RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION} RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ --with-rubylibprefix="${PREFIX}/lib/ruby" \ @@ -227,7 +217,7 @@ RUBY_DEFAULT_SUFFIX?= ${RUBY_DEFAULT_VER:S/.//} RUBY_PORTVERSION?= ${RUBY_VERSION} MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER} -RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} +RUBY_DISTNAME?= ruby-${RUBY_VERSION} RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} |