mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00
Code Issues Releases Activity

Mk/bsd.ruby.mk: Remove RUBY_NAME

Browse Source 
Use ruby${RUBY_SUFFIX} or libruby${RUBY_SHLIBVER} directly.
It also fixes the inconsistency in lang/ruby{26,27,30}/{Makefile,pkg-plist}.
This commit is contained in:
Po-Chuan Hsieh 2021-11-02 05:19:25 +08:00
parent 770631f591
commit 4d163e8a81
No known key found for this signature in database
GPG Key ID: 9A4BD10F002DD04B
12 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Mk/bsd.ruby.mk
View File

@ -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} \

2
irc/iroffer-dinoex/Makefile
View File

@ -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

2
lang/ruby26/Makefile
View File

@ -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

4
lang/ruby26/pkg-plist
View File

@ -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

2
lang/ruby27/Makefile
View File

@ -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

2
lang/ruby27/pkg-plist
View File

@ -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

2
lang/ruby30/Makefile
View File

@ -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

2
security/arirang/Makefile
View File

@ -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

2
www/redmine4/Makefile
View File

@ -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

2
www/redmine4/files/redmine.in
View File

@ -17,7 +17,7 @@
name="redmine"
rcvar=redmine_enable
command=%%RUBY_NAME%%
command=ruby%%RUBY_SUFFIX%%
pidfile="%%WWWDIR%%/tmp/pids/thin.pid"

2
www/redmine42/Makefile
View File

@ -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

2
www/redmine42/files/redmine.in
View File

@ -17,7 +17,7 @@
name="redmine"
rcvar=redmine_enable
command=%%RUBY_NAME%%
command=ruby%%RUBY_SUFFIX%%
pidfile="%%WWWDIR%%/tmp/pids/thin.pid"