head 1.4; access; symbols pkgsrc-2023Q2:1.3.0.6 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.4 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.2 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.2.0.4 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.2 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.1.0.10 pkgsrc-2022Q1-base:1.1 pkgsrc-2021Q4:1.1.0.8 pkgsrc-2021Q4-base:1.1 pkgsrc-2021Q3:1.1.0.6 pkgsrc-2021Q3-base:1.1 pkgsrc-2021Q2:1.1.0.4 pkgsrc-2021Q2-base:1.1 pkgsrc-2021Q1:1.1.0.2 pkgsrc-2021Q1-base:1.1; locks; strict; comment @# @; 1.4 date 2023.09.09.14.18.19; author taca; state dead; branches; next 1.3; commitid Csz9YcXeSzGDr6EE; 1.3 date 2022.11.26.13.07.52; author taca; state Exp; branches; next 1.2; commitid 5I9AMLGNB1Pqhd3E; 1.2 date 2022.05.04.15.49.16; author jperkin; state Exp; branches 1.2.4.1; next 1.1; commitid FcK2x0hJBe8tMKCD; 1.1 date 2021.02.14.14.32.41; author taca; state Exp; branches 1.1.10.1; next ; commitid 0KHbRcD9KrJKDGHC; 1.2.4.1 date 2022.11.30.17.25.43; author bsiegert; state Exp; branches; next ; commitid 7NkUOOmDQq7XzK3E; 1.1.10.1 date 2022.05.08.14.53.38; author bsiegert; state Exp; branches; next ; commitid mJP2DyHiy9IjmgDD; desc @@ 1.4 log @lang/ruby30-base: remove package Removing Ruby 3.0 package. * There is no need to use Ruby 3.0, Ruby 3.1 has enough compatibility. * Ruby 3.0 dose not support OpenSSL 3. So it cost to keep it now. @ text @$NetBSD: patch-configure,v 1.3 2022/11/26 13:07:52 taca Exp $ * Adding Interix support. * Ignore doxygen. * Ignore VCS. * Handle SSP in pkgsrc. * Retain _XOPEN_SOURCE, fixes eventmachine. * Fix argument for pthread_self() on NetBSD. --- configure.orig 2022-11-24 11:04:58.000000000 +0000 +++ configure @@@@ -9270,7 +9270,7 @@@@ else $as_nop then : case "$target_os" in #( - darwin*) : + nodarwin*) : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 printf %s "checking for real target cpu... " >&6; } @@@@ -11095,6 +11095,7 @@@@ fi stack_protector=no ;; #( *) : + stack_protector=no ;; esac if test -z "${stack_protector+set}" @@@@ -12893,18 +12894,6 @@@@ then : CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; esac done - # _XOPEN_SOURCE should not be defined for C++ on Solaris. - # RUBY_APPEND_OPTIONS(CXXFLAGS) - for rb_opt in -U_XOPEN_SOURCE; do - case " ${CXXFLAGS-} " in #( - *" ${rb_opt} "*) : - ;; #( - ' ') : - CXXFLAGS="${rb_opt}" ;; #( - *) : - CXXFLAGS="$CXXFLAGS ${rb_opt}" ;; -esac - done fi @@@@ -13060,6 +13049,10 @@@@ esac ac_cv_func___builtin_setjmp=no ;; #( + interix*) : + LIBS="-lm $LIBS" + ac_cv_func_getpgrp_void=yes + ;; #( *) : ;; esac @@@@ -24715,7 +24708,9 @@@@ else #include #include #ifndef alloca -# ifdef __GNUC__ +# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include +# elif defined __GNUC__ # define alloca __builtin_alloca # elif defined _MSC_VER # include @@@@ -29662,7 +29657,9 @@@@ fi interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" + DLDFLAGS="$DLDFLAGS "'-Wl,-h,$(.TARGET) -Wl,--image-base,$$(($$RANDOM %4096/2*262144+1342177280))' LIBPATHFLAG=" -L%1\$-s" + RPATHFLAG=' -Wl,-R%1$-s' rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : @@@@ -29833,7 +29830,7 @@@@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5 printf %s "checking whether $flag is accepted for bundle... " >&6; } : > conftest.c - if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && + if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && test ! -s conftest.err then : @@@@ -30991,7 +30988,7 @@@@ fi ;; #( freebsd*|dragonfly*) : - LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)$(TEENY)' LIBRUBY_SONAME='$(LIBRUBY_SO)' if test "$rb_cv_binary_elf" != "yes" then : @@@@ -31072,9 +31069,10 @@@@ esac ;; #( darwin*) : + RUBY_SO_NAME="${RUBY_SO_NAME}"'.$(RUBY_PROGRAM_VERSION)' LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)' - LIBRUBY_SONAME='$(LIBRUBY_SO)' - LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' + LIBRUBY_SONAME='lib$(RUBY_BASE_NAME).$(RUBY_API_VERSION).$(SOEXT)' + LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_INSTALL_NAME).$(SOEXT)' if test "$load_relative" = yes then : @@@@ -31097,7 +31095,12 @@@@ fi ;; #( interix*) : - LIBRUBYARG_SHARED='-L. -L${libdir} -l$(RUBY_SO_NAME)' + SOLIBS='$(LIBS)' + LIBRUBY_SO='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR).$(TEENY)' + # link explicitly to 0x48000000 + LIBRUBY_DLDFLAGS='-Wl,-h,lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) -Wl,--image-base,1207959552' + LIBRUBYARG_SHARED='-Wl,-R -Wl,${PREFIX}/lib} -L${libdir} -L. -l$(RUBY_SO_NAME)' + LIBRUBY_ALIASES='lib$(RUBY_SO_NAME).so.$(MAJOR)$(MINOR) lib$(RUBY_SO_NAME).so' ;; #( mingw*|cygwin*|mswin*) : @@@@ -31290,7 +31293,7 @@@@ then : esac rpathflag=`IFS="$PATH_SEPARATOR" echo x "$rpathflag" | - sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${libprefix}${IFS}g" + sed "s/^x *//;s${IFS}"'%1\\$-s'"${IFS}${libprefix}${IFS}g;s${IFS}%s${IFS}${PREFIX}/lib${IFS}g" ` LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" @@@@ -34101,21 +34104,7 @@@@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { - if test ${VCS+set} -then : - - : - -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` -then : - - VCS='$(GIT)' - -else $as_nop - VCS='echo cannot' - -fi case "$VCS" in #( '$(GIT)'|git) : VCSUP='$(VCS) pull --rebase $(GITPULLOPTIONS)' ;; #( @ 1.3 log @lang/ruby30-base: update to 3.0.5 Ruby 3.0.5 Released (2022-11-24) Ruby 3.0.5 has been released. This release includes a security fix. Please check the topics below for details. * CVE-2021-33621: HTTP response splitting in CGI This release also includes some bug fixes. See the commit logs for further details. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ @ 1.2 log @ruby30-base: Retain _XOPEN_SOURCE on SunOS. Fixes build of eventmachine (which assumes the XPG4.2 "void *" type for iov_base), and mirrors settings of ruby 2.x. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2021/02/14 14:32:41 taca Exp $ d10 1 a10 1 --- configure.orig 2022-04-12 11:48:57.000000000 +0000 d12 2 a13 2 @@@@ -8381,7 +8381,7 @@@@ else if test x"$target_alias" = x; then : d19 3 a21 3 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 $as_echo_n "checking for real target cpu... " >&6; } @@@@ -10094,6 +10094,7 @@@@ fi d28 2 a29 2 if test -z "${stack_protector+set}"; then : @@@@ -11794,18 +11795,6 @@@@ fi d48 1 a48 1 @@@@ -11970,6 +11959,10 @@@@ esac d59 10 a68 2 @@@@ -23324,6 +23317,8 @@@@ else # ifdef _MSC_VER d70 1 a70 7 # define alloca _alloca +# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) +# include # else # ifdef HAVE_ALLOCA_H # include @@@@ -28622,7 +28617,9 @@@@ fi d80 10 a89 1 @@@@ -29890,7 +29887,7 @@@@ fi d96 3 a98 3 if test "$rb_cv_binary_elf" != "yes" ; then : @@@@ -29969,9 +29966,10 @@@@ esac d108 2 a109 1 if test "$load_relative" = yes; then : d111 1 a111 2 libprefix="@@executable_path/../${libdir_basename}" @@@@ -29992,7 +29990,12 @@@@ fi d125 1 a125 1 @@@@ -30174,7 +30177,7 @@@@ if test "$enable_rpath" = yes; then : d134 1 a134 1 @@@@ -32906,19 +32909,7 @@@@ which seems to be undefined. Please mak d138 2 a139 1 - if test ${VCS+set}; then : d143 2 a144 1 -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null`; then : d148 1 a148 1 -else @ 1.2.4.1 log @Pullup ticket #6707 - requested by taca lang/ruby30-base: security fix Revisions pulled up: - lang/ruby/Makefile 1.74 - lang/ruby/rubyversion.mk 1.257 - lang/ruby30-base/Makefile 1.9 - lang/ruby30-base/distinfo 1.11 - lang/ruby30-base/patches/patch-configure 1.3 --- Module Name: pkgsrc Committed By: taca Date: Sat Nov 26 13:07:52 UTC 2022 Modified Files: pkgsrc/lang/ruby: Makefile rubyversion.mk pkgsrc/lang/ruby30-base: Makefile distinfo pkgsrc/lang/ruby30-base/patches: patch-configure Log Message: lang/ruby30-base: update to 3.0.5 Ruby 3.0.5 Released (2022-11-24) Ruby 3.0.5 has been released. This release includes a security fix. Please check the topics below for details. * CVE-2021-33621: HTTP response splitting in CGI This release also includes some bug fixes. See the commit logs for further details. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.2 2022/05/04 15:49:16 jperkin Exp $ d10 1 a10 1 --- configure.orig 2022-11-24 11:04:58.000000000 +0000 d12 2 a13 2 @@@@ -9270,7 +9270,7 @@@@ else $as_nop then : d19 3 a21 3 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5 printf %s "checking for real target cpu... " >&6; } @@@@ -11095,6 +11095,7 @@@@ fi d28 2 a29 2 if test -z "${stack_protector+set}" @@@@ -12893,18 +12894,6 @@@@ then : d48 1 a48 1 @@@@ -13060,6 +13049,10 @@@@ esac d59 5 a63 6 @@@@ -24715,7 +24708,9 @@@@ else #include #include #ifndef alloca -# ifdef __GNUC__ +# if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) d65 4 a68 5 +# elif defined __GNUC__ # define alloca __builtin_alloca # elif defined _MSC_VER # include @@@@ -29662,7 +29657,9 @@@@ fi d78 1 a78 10 @@@@ -29833,7 +29830,7 @@@@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $flag is accepted for bundle" >&5 printf %s "checking whether $flag is accepted for bundle... " >&6; } : > conftest.c - if ${LDSHARED/'$(CC)'/$CC} -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && + if $(echo ${LDSHARED} | sed -e "s/'$(CC)'/$CC/g") -o conftest.bundle $flag conftest.c >/dev/null 2>conftest.err && test ! -s conftest.err then : @@@@ -30991,7 +30988,7 @@@@ fi d85 3 a87 3 if test "$rb_cv_binary_elf" != "yes" then : @@@@ -31072,9 +31069,10 @@@@ esac d97 1 a97 2 if test "$load_relative" = yes then : d99 2 a100 1 @@@@ -31097,7 +31095,12 @@@@ fi d114 1 a114 1 @@@@ -31290,7 +31293,7 @@@@ then : d123 1 a123 1 @@@@ -34101,21 +34104,7 @@@@ which seems to be undefined. Please mak d127 1 a127 2 - if test ${VCS+set} -then : d131 1 a131 2 -elif git_dir=`$GIT --work-tree="$srcdir" --git-dir="$srcdir/.git" rev-parse --git-dir 2>/dev/null` -then : d135 1 a135 1 -else $as_nop @ 1.1 log @lang/ruby30-base: add version 3.0.0 package Ruby is the interpreted scripting language for quick and easy Object Oriented Programming. It has many features to process text files and to do system management tasks (as in Perl). It is simple, straight-forward, and extensible. Features of Ruby are shown below. + Simple Syntax + *Normal* Object-Oriented features (ex. class, method calls) + *Advanced* Object-Oriented features (ex. Mix-in, Singleton-method) + Operator Overloading + Exception Handling + Iterators and Closures + Garbage Collection + Dynamic Loading of Object files (on some architecture) + Highly Portable (works on many UNIX machines, and on DOS, Windows, Mac, etc.) Ruby 3.0 introduces a number of new features and performance improvements, most notably: * Performance - MJIT * Concurrency - Ractor - Fiber Scheduler * Typing (Static Analysis) - RBS - TypeProf This package is Ruby 3.0 release minimum base package. @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.1 2020/03/15 15:26:22 taca Exp $ d7 1 a7 1 * Put -std= in CFLAGS not CPPFLAGS. d10 1 a10 1 --- configure.orig 2020-12-08 09:02:33.000000000 +0000 d12 1 a12 1 @@@@ -7991,7 +7991,7 @@@@ else d21 1 a21 1 @@@@ -10048,6 +10048,7 @@@@ fi d29 20 a48 1 @@@@ -11912,6 +11913,10 @@@@ esac d59 1 a59 1 @@@@ -23493,6 +23498,8 @@@@ else d68 1 a68 1 @@@@ -28791,7 +28798,9 @@@@ fi d78 1 a78 1 @@@@ -29988,7 +29997,7 @@@@ fi d87 1 a87 1 @@@@ -30067,9 +30076,10 @@@@ esac d100 1 a100 1 @@@@ -30090,7 +30100,12 @@@@ fi d114 1 a114 1 @@@@ -30272,7 +30287,7 @@@@ if test "$enable_rpath" = yes; then : d123 1 a123 1 @@@@ -32996,19 +33011,7 @@@@ which seems to be undefined. Please mak @ 1.1.10.1 log @Pullup tickets #6626 and #6627 - requested by taca ruby30-base: build fix ruby31-base: build fix Revisions pulled up: - lang/ruby/platform.mk 1.10-1.12 - lang/ruby/rubyversion.mk 1.251 - lang/ruby30-base/Makefile 1.7 - lang/ruby30-base/distinfo 1.9-1.10 - lang/ruby30-base/patches/patch-configure 1.2 - lang/ruby30-base/patches/patch-include_ruby_internal_static__assert.h 1.1 - lang/ruby31-base/Makefile 1.4-1.5 - lang/ruby31-base/distinfo 1.4-1.7 - lang/ruby31-base/patches/patch-configure 1.2 - lang/ruby31-base/patches/patch-include_ruby_internal_static__assert.h 1.1 - lang/ruby31-base/patches/patch-template_Makefile.in 1.1 - lang/ruby31-base/patches/patch-tool_runruby.rb 1.1 --- Module Name: pkgsrc Committed By: jperkin Date: Wed May 4 15:49:51 UTC 2022 Modified Files: pkgsrc/lang/ruby31-base: Makefile distinfo pkgsrc/lang/ruby31-base/patches: patch-configure Log Message: ruby31-base: Retain _XOPEN_SOURCE on SunOS. Fixes build of eventmachine (which assumes the XPG4.2 "void *" type for iov_base), and mirrors settings of ruby 2.x. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: taca Date: Wed May 4 16:16:49 UTC 2022 Modified Files: pkgsrc/lang/ruby: platform.mk Log Message: lang/ruby: fix build problem of Ruby 3.1 on NetBSD 8 Fix build problem of Ruby 3.1 on NetBSD 8 by disabling dtrace. Ruby 3.1 dtrace(1) to modify compiled object files during build process. But something wrong on NetBSD 8, includeing 8.2_STABLE. For example, vm.o contains these symbols on NetBSD 9: 0000000000000000 A __dtrace_ruby___array__create 0000000000000000 A __dtrace_ruby___cmethod__entry 0000000000000000 A __dtrace_ruby___cmethod__return 0000000000000000 A __dtrace_ruby___hash__create 0000000000000000 A __dtrace_ruby___method__entry 0000000000000000 A __dtrace_ruby___method__return 0000000000000000 A __dtraceenabled_ruby___array__create 0000000000000000 A __dtraceenabled_ruby___cmethod__entry 0000000000000000 A __dtraceenabled_ruby___cmethod__return 0000000000000000 A __dtraceenabled_ruby___hash__create 0000000000000000 A __dtraceenabled_ruby___method__entry 0000000000000000 A __dtraceenabled_ruby___method__return But on NetBSD 8: 0000000000000000 A __dtrace_ruby___array-create 0000000000000000 A __dtrace_ruby___cmethod-entry 0000000000000000 A __dtrace_ruby___cmethod-return 0000000000000000 A __dtrace_ruby___hash-create 0000000000000000 A __dtrace_ruby___method-entry 0000000000000000 A __dtrace_ruby___method-return 0000000000000000 A __dtraceenabled_ruby___array-create 0000000000000000 A __dtraceenabled_ruby___cmethod-entry 0000000000000000 A __dtraceenabled_ruby___cmethod-return 0000000000000000 A __dtraceenabled_ruby___hash-create 0000000000000000 A __dtraceenabled_ruby___method-entry 0000000000000000 A __dtraceenabled_ruby___method-return --- Module Name: pkgsrc Committed By: jperkin Date: Wed May 4 15:49:16 UTC 2022 Modified Files: pkgsrc/lang/ruby30-base: Makefile distinfo pkgsrc/lang/ruby30-base/patches: patch-configure Log Message: ruby30-base: Retain _XOPEN_SOURCE on SunOS. Fixes build of eventmachine (which assumes the XPG4.2 "void *" type for iov_base), and mirrors settings of ruby 2.x. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: taca Date: Wed May 4 16:44:53 UTC 2022 Modified Files: pkgsrc/lang/ruby: platform.mk pkgsrc/lang/ruby30-base: distinfo pkgsrc/lang/ruby31-base: distinfo Added Files: pkgsrc/lang/ruby30-base/patches: patch-include_ruby_internal_static__assert.h pkgsrc/lang/ruby31-base/patches: patch-include_ruby_internal_static__assert.h Log Message: lang/ruby: fix Ruby 3.0 build problem on NetBSD 8.0 Something wrong with expantion of static_assert macro in on NetBSD 8.0. So, avoid use of static_assert on NetBSD 8.0. NetBSD 8.1 and later dose not have this problem. --- Module Name: pkgsrc Committed By: jperkin Date: Thu May 5 10:15:17 UTC 2022 Modified Files: pkgsrc/lang/ruby: rubyversion.mk Log Message: ruby: Handle ruby31 changing the config triple for arm64 macOS. --- Module Name: pkgsrc Committed By: jperkin Date: Thu May 5 10:25:06 UTC 2022 Modified Files: pkgsrc/lang/ruby31-base: distinfo Added Files: pkgsrc/lang/ruby31-base/patches: patch-tool_runruby.rb Log Message: ruby31-base: Fix install on macOS arm64. --- Module Name: pkgsrc Committed By: taca Date: Sat May 7 09:36:16 UTC 2022 Modified Files: pkgsrc/lang/ruby: platform.mk pkgsrc/lang/ruby31-base: Makefile distinfo Added Files: pkgsrc/lang/ruby31-base/patches: patch-template_Makefile.in Log Message: lang/ruby31-base: better fix than privious one Instead of disabling DTrace, process object file yjit.o with "dtrace -G". Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD$ d7 1 a7 1 * Retain _XOPEN_SOURCE, fixes eventmachine. d10 1 a10 1 --- configure.orig 2022-04-12 11:48:57.000000000 +0000 d12 1 a12 1 @@@@ -8381,7 +8381,7 @@@@ else d21 1 a21 1 @@@@ -10094,6 +10094,7 @@@@ fi d29 1 a29 20 @@@@ -11794,18 +11795,6 @@@@ fi CPPFLAGS="$CPPFLAGS ${rb_opt}" ;; esac done - # _XOPEN_SOURCE should not be defined for C++ on Solaris. - # RUBY_APPEND_OPTIONS(CXXFLAGS) - for rb_opt in -U_XOPEN_SOURCE; do - case " ${CXXFLAGS-} " in #( - *" ${rb_opt} "*) : - ;; #( - ' ') : - CXXFLAGS="${rb_opt}" ;; #( - *) : - CXXFLAGS="$CXXFLAGS ${rb_opt}" ;; -esac - done fi @@@@ -11970,6 +11959,10 @@@@ esac d40 1 a40 1 @@@@ -23324,6 +23317,8 @@@@ else d49 1 a49 1 @@@@ -28622,7 +28617,9 @@@@ fi d59 1 a59 1 @@@@ -29890,7 +29887,7 @@@@ fi d68 1 a68 1 @@@@ -29969,9 +29966,10 @@@@ esac d81 1 a81 1 @@@@ -29992,7 +29990,12 @@@@ fi d95 1 a95 1 @@@@ -30174,7 +30177,7 @@@@ if test "$enable_rpath" = yes; then : d104 1 a104 1 @@@@ -32906,19 +32909,7 @@@@ which seems to be undefined. Please mak @