git: 4d163e8a8140 - main - Mk/bsd.ruby.mk: Remove RUBY_NAME

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Mon, 01 Nov 2021 21:30:00 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=4d163e8a81407f90efa39db5a9ca58389ecea3a3

commit 4d163e8a81407f90efa39db5a9ca58389ecea3a3
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-11-01 21:19:25 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2021-11-01 21:28:58 +0000

    Mk/bsd.ruby.mk: Remove RUBY_NAME
    
    Use ruby${RUBY_SUFFIX} or libruby${RUBY_SHLIBVER} directly.
    It also fixes the inconsistency in lang/ruby{26,27,30}/{Makefile,pkg-plist}.
---
 Mk/bsd.ruby.mk                 | 12 ++++--------
 irc/iroffer-dinoex/Makefile    |  2 +-
 lang/ruby26/Makefile           |  2 +-
 lang/ruby26/pkg-plist          |  4 ++--
 lang/ruby27/Makefile           |  2 +-
 lang/ruby27/pkg-plist          |  2 +-
 lang/ruby30/Makefile           |  2 +-
 security/arirang/Makefile      |  2 +-
 www/redmine4/Makefile          |  2 +-
 www/redmine4/files/redmine.in  |  2 +-
 www/redmine42/Makefile         |  2 +-
 www/redmine42/files/redmine.in |  2 +-
 12 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk
index b933608d0f6b..c76bb856a06f 100644
--- a/Mk/bsd.ruby.mk
+++ b/Mk/bsd.ruby.mk
@@ -20,7 +20,7 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.org
 # RUBY			- Set to full path of ruby.  If you set this, the values
 #			  of the following variables are automatically obtained
 #			  from the ruby executable: RUBY_VER, RUBY_VERSION,
-#			  RUBY_NAME, RUBY_ARCH, RUBY_LIBDIR, RUBY_ARCHLIBDIR,
+#			  RUBY_ARCH, RUBY_LIBDIR, RUBY_ARCHLIBDIR,
 #			  RUBY_SITELIBDIR, and RUBY_SITEARCHLIBDIR.
 # RUBY_VER		- Set to the alternative short version of ruby in the
 #			  form of `x.y' (see below for current value).
@@ -66,7 +66,6 @@ Ruby_Include_MAINTAINER=	ruby@FreeBSD.org
 #			  (${RUBY_VER:S/.//}).
 # RUBY_WITHOUT_SUFFIX	- Always ${LOCALBASE}/bin/ruby.
 # RUBY_WITH_SUFFIX	- Always ${RUBY_WITHOUT_SUFFIX}${RUBY_SUFFIX}.
-# RUBY_NAME		- Ruby's name with trailing suffix.
 #
 # RUBY_MODNAME		- Set to the module name (default: ${PORTNAME}).
 #
@@ -120,13 +119,12 @@ RUBY_VERSION!=		${_RUBY_CONFIG} 'puts C["ruby_version"]'
 RUBY_SUFFIX?=		# empty
 
 RUBY_ARCH!=		${_RUBY_CONFIG} 'puts C["target"]'
-RUBY_NAME!=		${_RUBY_CONFIG} 'puts C["ruby_install_name"]'
 
 _RUBY_SYSLIBDIR!=	${_RUBY_CONFIG} 'puts C["libdir"]'
 _RUBY_SITEDIR!=		${_RUBY_CONFIG} 'puts C["sitedir"]'
 _RUBY_VENDORDIR!=	${_RUBY_CONFIG} 'puts C["vendordir"]'
 .else
-RUBY?=			${LOCALBASE}/bin/${RUBY_NAME}
+RUBY?=			${LOCALBASE}/bin/ruby${RUBY_SUFFIX}
 
 .if defined(RUBY_VER)
 # When adding a version, please keep the comment in
@@ -193,7 +191,6 @@ RUBY_CONFIGURE_ARGS+=	--with-rubyhdrdir="${PREFIX}/include/ruby-${RUBY_VER}/" \
 CONFIGURE_TARGET?=	${ARCH}-portbld-${OPSYS:tl}${OSREL:C/\..*//}
 
 RUBY_ARCH?=		${ARCH}-${OPSYS:tl}${OSREL:C/\..*//}
-RUBY_NAME?=		ruby${RUBY_SUFFIX}
 
 _RUBY_SYSLIBDIR?=	${PREFIX}/lib
 _RUBY_SITEDIR?=		${_RUBY_SYSLIBDIR}/ruby/site_ruby
@@ -254,8 +251,8 @@ RUBY_SITELIBDIR?=	${_RUBY_SITEDIR}/${RUBY_VER}
 RUBY_SITEARCHLIBDIR?=	${RUBY_SITELIBDIR}/${RUBY_ARCH}
 RUBY_VENDORLIBDIR?=	${_RUBY_VENDORDIR}/${RUBY_VER}
 RUBY_VENDORARCHLIBDIR?=	${RUBY_VENDORLIBDIR}/${RUBY_ARCH}
-RUBY_DOCDIR?=		${PREFIX}/share/doc/${RUBY_NAME}
-RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/${RUBY_NAME}
+RUBY_DOCDIR?=		${PREFIX}/share/doc/ruby${RUBY_SUFFIX}
+RUBY_EXAMPLESDIR?=	${PREFIX}/share/examples/ruby${RUBY_SUFFIX}
 RUBY_RIDIR?=		${PREFIX}/share/ri/${RUBY_VER}/system
 RUBY_SITERIDIR?=	${PREFIX}/share/ri/${RUBY_VER}/site
 RUBY_MODDOCDIR?=	${RUBY_DOCDIR}/${RUBY_MODNAME}
@@ -281,7 +278,6 @@ PLIST_SUB+=		${PLIST_RUBY_DIRS:C,DIR="(${LOCALBASE}|${PREFIX})/,DIR=",} \
 			RUBY_SHLIBVER="${RUBY_SHLIBVER}" \
 			RUBY_ARCH="${RUBY_ARCH}" \
 			RUBY_SUFFIX="${RUBY_SUFFIX}" \
-			RUBY_NAME="${RUBY_NAME}" \
 			RUBY_DEFAULT_SUFFIX="${RUBY_DEFAULT_SUFFIX}" \
 			RUBY26=${RUBY26} \
 			RUBY27=${RUBY27} \
diff --git a/irc/iroffer-dinoex/Makefile b/irc/iroffer-dinoex/Makefile
index 845c7dda10be..a03fe830c8c8 100644
--- a/irc/iroffer-dinoex/Makefile
+++ b/irc/iroffer-dinoex/Makefile
@@ -46,7 +46,7 @@ OPTIONS_DEFAULT=CURL RUBY UPNP GEOIP
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_ON=	-curl
 RUBY_USE=		RUBY=yes
-RUBY_LIB_DEPENDS=	lib${RUBY_NAME}.so:${RUBY_PORT}
+RUBY_LIB_DEPENDS=	libruby${RUBY_SHLIBVER}.so:${RUBY_PORT}
 RUBY_CONFIGURE_ON=	-ruby
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CONFIGURE_ON=	-upnp
diff --git a/lang/ruby26/Makefile b/lang/ruby26/Makefile
index ed561d943283..a4953620cbeb 100644
--- a/lang/ruby26/Makefile
+++ b/lang/ruby26/Makefile
@@ -193,7 +193,7 @@ post-install-DEBUG-off:
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
diff --git a/lang/ruby26/pkg-plist b/lang/ruby26/pkg-plist
index cadbbcf8eed4..1afeb333cf0d 100644
--- a/lang/ruby26/pkg-plist
+++ b/lang/ruby26/pkg-plist
@@ -7,7 +7,7 @@ bin/rdoc%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ri
 bin/ri%%RUBY_SUFFIX%%
 %%IF_DEFAULT%%bin/ruby
-bin/%%RUBY_NAME%%
+bin/ruby%%RUBY_SUFFIX%%
 include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/rb_mjit_min_header-%%RUBY_VERSION%%.h
 include/ruby-%%RUBY_VER%%/%%RUBY_ARCH%%/ruby/config.h
 include/ruby-%%RUBY_VER%%/ruby.h
@@ -901,7 +901,7 @@ man/man1/irb%%RUBY_SUFFIX%%.1.gz
 %%IF_DEFAULT%%man/man1/ri.1.gz
 man/man1/ri%%RUBY_SUFFIX%%.1.gz
 %%IF_DEFAULT%%man/man1/ruby.1.gz
-man/man1/%%RUBY_NAME%%.1.gz
+man/man1/ruby%%RUBY_SUFFIX%%.1.gz
 %%DOCS%%%%RUBY_DOCDIR%%/COPYING
 %%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
 %%DOCS%%%%RUBY_DOCDIR%%/ChangeLog
diff --git a/lang/ruby27/Makefile b/lang/ruby27/Makefile
index 9bb23502ef61..46c576e409bb 100644
--- a/lang/ruby27/Makefile
+++ b/lang/ruby27/Makefile
@@ -189,7 +189,7 @@ post-install-DEBUG-off:
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
diff --git a/lang/ruby27/pkg-plist b/lang/ruby27/pkg-plist
index e7f1bf54f25a..7e05dfd62ef9 100644
--- a/lang/ruby27/pkg-plist
+++ b/lang/ruby27/pkg-plist
@@ -967,7 +967,7 @@ libdata/pkgconfig/ruby-%%RUBY_VER%%.pc
 %%IF_DEFAULT%%man/man1/erb.1.gz
 man/man1/erb%%RUBY_SUFFIX%%.1.gz
 %%IF_DEFAULT%%man/man1/ruby.1.gz
-man/man1/%%RUBY_NAME%%.1.gz
+man/man1/ruby%%RUBY_SUFFIX%%.1.gz
 %%DOCS%%%%RUBY_DOCDIR%%/COPYING
 %%DOCS%%%%RUBY_DOCDIR%%/COPYING.ja
 %%DOCS%%%%RUBY_DOCDIR%%/ChangeLog
diff --git a/lang/ruby30/Makefile b/lang/ruby30/Makefile
index ced14b11cad7..dfc2650c2b2f 100644
--- a/lang/ruby30/Makefile
+++ b/lang/ruby30/Makefile
@@ -181,7 +181,7 @@ post-install-DEBUG-off:
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${RUBY_NAME}
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
diff --git a/security/arirang/Makefile b/security/arirang/Makefile
index 7d138bf8799c..fd201e1c2a7f 100644
--- a/security/arirang/Makefile
+++ b/security/arirang/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Powerful webserver security scanner for network
 
 LICENSE=	BSD3CLAUSE
 
-LIB_DEPENDS=	lib${RUBY_NAME}.so:${RUBY_PORT}
+LIB_DEPENDS=	libruby${RUBY_SHLIBVER}.so:${RUBY_PORT}
 
 USES=		compiler:c11 ssl
 USE_RUBY=	yes
diff --git a/www/redmine4/Makefile b/www/redmine4/Makefile
index a1f9719a64e9..dc45d0e7d5d9 100644
--- a/www/redmine4/Makefile
+++ b/www/redmine4/Makefile
@@ -40,7 +40,7 @@ NO_BUILD=	yes
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-SUB_LIST=	RUBY_NAME=${RUBY_NAME}
+SUB_LIST=	RUBY_SUFFIX=${RUBY_SUFFIX}
 
 OPTIONS_DEFINE=	MYSQL POSTGRESQL MARKDOWN RMAGIC THIN
 OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN
diff --git a/www/redmine4/files/redmine.in b/www/redmine4/files/redmine.in
index 769e5b26f6c4..9e3c6d276b3c 100644
--- a/www/redmine4/files/redmine.in
+++ b/www/redmine4/files/redmine.in
@@ -17,7 +17,7 @@
 
 name="redmine"
 rcvar=redmine_enable
-command=%%RUBY_NAME%%
+command=ruby%%RUBY_SUFFIX%%
 
 pidfile="%%WWWDIR%%/tmp/pids/thin.pid"
 
diff --git a/www/redmine42/Makefile b/www/redmine42/Makefile
index 2087dab5e5fe..889c127d2e71 100644
--- a/www/redmine42/Makefile
+++ b/www/redmine42/Makefile
@@ -40,7 +40,7 @@ NO_BUILD=	yes
 USERS=		${WWWOWN}
 GROUPS=		${WWWGRP}
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
-SUB_LIST=	RUBY_NAME=${RUBY_NAME}
+SUB_LIST=	RUBY_SUFFIX=${RUBY_SUFFIX}
 
 OPTIONS_DEFINE=	MYSQL POSTGRESQL MARKDOWN RMAGIC THIN
 OPTIONS_DEFAULT=MYSQL MARKDOWN RMAGIC THIN
diff --git a/www/redmine42/files/redmine.in b/www/redmine42/files/redmine.in
index 769e5b26f6c4..9e3c6d276b3c 100644
--- a/www/redmine42/files/redmine.in
+++ b/www/redmine42/files/redmine.in
@@ -17,7 +17,7 @@
 
 name="redmine"
 rcvar=redmine_enable
-command=%%RUBY_NAME%%
+command=ruby%%RUBY_SUFFIX%%
 
 pidfile="%%WWWDIR%%/tmp/pids/thin.pid"