CVS commit: pkgsrc/lang/ruby31-base

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Jan 16 15:14:53 UTC 2024

Modified Files:
        pkgsrc/lang/ruby31-base: Makefile hacks.mk options.mk

Log Message:
lang/ruby31-base: a few clean up

* RUBY_SUFFIX is always defined.
* Avoid use "!empty()".

NFC.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ruby31-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby31-base/hacks.mk \
    pkgsrc/lang/ruby31-base/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ruby31-base/Makefile
diff -u pkgsrc/lang/ruby31-base/Makefile:1.11 pkgsrc/lang/ruby31-base/Makefile:1.12
--- pkgsrc/lang/ruby31-base/Makefile:1.11       Tue Oct 24 22:09:39 2023
+++ pkgsrc/lang/ruby31-base/Makefile    Tue Jan 16 15:14:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/10/24 22:09:39 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2024/01/16 15:14:53 taca Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
@@ -29,12 +29,10 @@ USE_CC_FEATURES+=   c11
 .include "options.mk"
 .include "../../lang/ruby/platform.mk"
 
-.if !empty(RUBY_SUFFIX)
 CONFIGURE_ARGS+=       --program-suffix=${RUBY_SUFFIX}
 CONFIGURE_ARGS+=       --with-soname=${RUBY_NAME}
 CONFIGURE_ARGS+=       --with-ruby-version=${RUBY_VER_DIR}
 CONFIGURE_ARGS+=       --with-ruby-pc="ruby-${RUBY_VERSION}.pc"
-.endif
 
 CONFIGURE_ENV+=                ac_cv_path_MJIT_CC=${CC:Q}
 CONFIGURE_ENV.Darwin+= ac_cv_prog_dsymutil=

Index: pkgsrc/lang/ruby31-base/hacks.mk
diff -u pkgsrc/lang/ruby31-base/hacks.mk:1.1 pkgsrc/lang/ruby31-base/hacks.mk:1.2
--- pkgsrc/lang/ruby31-base/hacks.mk:1.1        Sun Jan 16 13:57:10 2022
+++ pkgsrc/lang/ruby31-base/hacks.mk    Tue Jan 16 15:14:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.1 2022/01/16 13:57:10 taca Exp $
+# $NetBSD: hacks.mk,v 1.2 2024/01/16 15:14:53 taca Exp $
 
 .if !defined(RUBY31_BASE_HACKS_MK)
 RUBY31_BASE_HACKS_MK=  defined
@@ -11,15 +11,15 @@ RUBY31_BASE_HACKS_MK=       defined
 ### Also note that `-O' level optimisation produces a miniruby
 ### binary that loops while running the installation scripts.
 ###
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64)
-.  if !empty(CC_VERSION:Mgcc-3.3.*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-sparc64}
+.  if ${CC_VERSION:Mgcc-3.3.*}
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-O[0-9]*
 .  endif
 ### ruby193 binary built on NetBSD/sparc64 with gcc 4.5.1 and the default -O2
 ### dumps core during generating RDocs.
 ### Using -O1 works around.
-.  if !empty(CC_VERSION:Mgcc-4.5.*)
+.  if ${CC_VERSION:Mgcc-4.5.*}
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  opt:-O2:-O1
 .  endif
@@ -29,14 +29,14 @@ BUILDLINK_TRANSFORM+=       opt:-O2:-O1
 #  {standard input}: Assembler messages: {standard input}:1458: \
 #  Error: pcrel too far
 # and -O1 works around.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-sh3*) && !empty(CC_VERSION:Mgcc-4.5.*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-sh3*} && ${CC_VERSION:Mgcc-4.5.*}
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  opt:-Os:-O1 rm:-freorder-blocks
 .endif
 
 # On NetBSD/aarch64, GCC before GCC 10 optimisation produces segmentation
 # faulting miniruby binary.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64*) && !empty(CC_VERSION:Mgcc-[2-9]*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-aarch64*} && ${CC_VERSION:Mgcc-[2-9]*}
 PKG_HACKS+=            optimisation
 BUILDLINK_TRANSFORM+=  rm:-fomit-frame-pointer
 .endif
Index: pkgsrc/lang/ruby31-base/options.mk
diff -u pkgsrc/lang/ruby31-base/options.mk:1.1 pkgsrc/lang/ruby31-base/options.mk:1.2
--- pkgsrc/lang/ruby31-base/options.mk:1.1      Sun Jan 16 13:57:10 2022
+++ pkgsrc/lang/ruby31-base/options.mk  Tue Jan 16 15:14:53 2024
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2022/01/16 13:57:10 taca Exp $
+# $NetBSD: options.mk,v 1.2 2024/01/16 15:14:53 taca Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ruby
 PKG_SUPPORTED_OPTIONS= ruby-build-ri-db
@@ -6,7 +6,7 @@ PKG_SUGGESTED_OPTIONS=  ruby-build-ri-db
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Mruby-build-ri-db)
+.if ${PKG_OPTIONS:Mruby-build-ri-db}
 RUBY_DYNAMIC_DIRS+=    ${RUBY_SYSRIDIR}
 # Use huge memory.
 UNLIMIT_RESOURCES+=    datasize