From cece14281b4127d1dc909bbbf28b3a9bd6b0b56c Mon Sep 17 00:00:00 2001 From: Yasuhiro Kimura Date: Mon, 21 Apr 2025 13:29:00 +0900 Subject: [PATCH] Mk/Uses/ruby.mk: Remove RUBY_WRKSRC Currently it is only used to set WRKSRC in ruby ports (lang/ruby3[2-5]). But it is unnecessary to set it explicitly as default value of WRKSRC is same as that of RUBY_WRKSRC. --- Mk/Uses/ruby.mk | 5 ----- lang/ruby32/Makefile | 2 -- lang/ruby33/Makefile | 2 -- lang/ruby34/Makefile | 2 -- lang/ruby35/Makefile | 2 -- 5 files changed, 13 deletions(-) diff --git a/Mk/Uses/ruby.mk b/Mk/Uses/ruby.mk index 27be28871861..9ee29b56e945 100644 --- a/Mk/Uses/ruby.mk +++ b/Mk/Uses/ruby.mk @@ -53,7 +53,6 @@ # basename of the ruby distribution tarball. # RUBY_PATCHFILES - PATCHFILES for the standard ruby ports, i.e. the # basename of the ruby distribution tarball. -# RUBY_WRKSRC - WRKSRC for the ruby port. # MASTER_SITE_SUBDIR_RUBY - MASTER_SITE_SUBDIR for the ruby distfiles. # # RUBY_SHLIBVER - Major version of libruby (see below for current @@ -202,8 +201,6 @@ BROKEN= ${BROKEN_RUBY${RUBY_VER:R}${RUBY_VER:E}} . endif . endif -RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_DISTVERSION} - RUBY_CONFIGURE_ARGS+= --with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \ --with-rubylibprefix="${PREFIX}/lib/ruby" \ --docdir="${RUBY_DOCDIR}" \ @@ -228,8 +225,6 @@ RUBY_PORTVERSION?= ${RUBY_DISTVERSION:tl:C/([a-z])[a-z]+/\1/g:C/([0-9])([a-z])/\ MASTER_SITE_SUBDIR_RUBY?= ${RUBY_VER} RUBY_DISTNAME?= ruby-${RUBY_DISTVERSION} -RUBY_WRKSRC?= ${WRKDIR}/${RUBY_DISTNAME} - RUBY_RELVERSION_CODE?= ${RUBY_RELVERSION:S/.//g} RUBY_VERSION_CODE?= ${RUBY_VERSION:S/.//g} RUBY_VER= ${RUBY_VERSION:C/([[:digit:]]+\.[[:digit:]]+).*/\1/} diff --git a/lang/ruby32/Makefile b/lang/ruby32/Makefile index 8f3dc3ea326d..a1bcf3bf35e8 100644 --- a/lang/ruby32/Makefile +++ b/lang/ruby32/Makefile @@ -48,8 +48,6 @@ EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ --exclude ${DISTNAME}/man/ri.1 \ --no-same-owner --no-same-permissions -WRKSRC= ${RUBY_WRKSRC} - RUBY_VER= 3.2 OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT diff --git a/lang/ruby33/Makefile b/lang/ruby33/Makefile index bbc971a936ff..ae4b0ebd7f73 100644 --- a/lang/ruby33/Makefile +++ b/lang/ruby33/Makefile @@ -47,8 +47,6 @@ EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ --exclude ${DISTNAME}/man/ri.1 \ --no-same-owner --no-same-permissions -$RKSRC= ${RUBY_WRKSRC} - RUBY_VER= 3.3 EXTDOCS= ripper/README stringio/README.md syslog/syslog.txt diff --git a/lang/ruby34/Makefile b/lang/ruby34/Makefile index ab114f67d9fc..4c5dd61e8df8 100644 --- a/lang/ruby34/Makefile +++ b/lang/ruby34/Makefile @@ -49,8 +49,6 @@ EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ --exclude ${DISTNAME}/sample/win32ole \ --no-same-owner --no-same-permissions -WRKSRC= ${RUBY_WRKSRC} - RUBY_VER= 3.4 OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT diff --git a/lang/ruby35/Makefile b/lang/ruby35/Makefile index f2fd340dcdc7..564bb8fface9 100644 --- a/lang/ruby35/Makefile +++ b/lang/ruby35/Makefile @@ -50,8 +50,6 @@ EXTRACT_AFTER_ARGS= --exclude ${DISTNAME}/bin/gem \ --exclude ${DISTNAME}/sample/win32ole \ --no-same-owner --no-same-permissions -WRKSRC= ${RUBY_WRKSRC} - RUBY_VER= 3.5 OPTIONS_DEFINE= CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT