Received: by mail.netbsd.org (Postfix, from userid 605) id 01B2484DB1; Thu, 14 Mar 2019 09:57:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7CC7884DAF for ; Thu, 14 Mar 2019 09:57:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id doZX6pt0ak0R for ; Thu, 14 Mar 2019 09:57:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id B6EE284CE2 for ; Thu, 14 Mar 2019 09:57:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id B1894FB16; Thu, 14 Mar 2019 09:57:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1552557474269650" MIME-Version: 1.0 Date: Thu, 14 Mar 2019 09:57:54 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/lang/ruby26-base To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20190314095754.B1894FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1552557474269650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Thu Mar 14 09:57:54 UTC 2019 Modified Files: pkgsrc/lang/ruby26-base: distinfo pkgsrc/lang/ruby26-base/patches: patch-configure Log Message: ruby26-base: Fix install on Darwin. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby26-base/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby26-base/patches/patch-configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1552557474269650 Content-Disposition: inline Content-Length: 4938 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/ruby26-base/distinfo diff -u pkgsrc/lang/ruby26-base/distinfo:1.2 pkgsrc/lang/ruby26-base/distinfo:1.3 --- pkgsrc/lang/ruby26-base/distinfo:1.2 Tue Mar 12 04:19:09 2019 +++ pkgsrc/lang/ruby26-base/distinfo Thu Mar 14 09:57:54 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2019/03/12 04:19:09 taca Exp $ +$NetBSD: distinfo,v 1.3 2019/03/14 09:57:54 jperkin Exp $ SHA1 (ruby-2.6.1-rubygems.patch) = a12386ef79715b4693e02ad0c00034558b669181 RMD160 (ruby-2.6.1-rubygems.patch) = f733d14223b8e4270b1114524b0e33f634a822ab @@ -8,7 +8,7 @@ SHA1 (ruby-2.6.1.tar.xz) = ba5f4338bb642 RMD160 (ruby-2.6.1.tar.xz) = adccca8036dfc34d00ea71d5a59a2a968de5187b SHA512 (ruby-2.6.1.tar.xz) = fb36289a955f0596c683cdadf1e4a9a9fd35222b1e1c6160c2e7cd82e5befd40a7aa4361e55f7a8f83c06ee899ec493821c7db34a60c4ac3bca0e874d33ef1a9 Size (ruby-2.6.1.tar.xz) = 11872964 bytes -SHA1 (patch-configure) = 428084d430a1dd0368ec457cad48333ca7d6975b +SHA1 (patch-configure) = d66204877531fe147361adf843819c3db6d40919 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e SHA1 (patch-lib_rdoc_encoding.rb) = 0e82d2942d9bfcb67dc7c994889d7bc5ec2ae85a Index: pkgsrc/lang/ruby26-base/patches/patch-configure diff -u pkgsrc/lang/ruby26-base/patches/patch-configure:1.1 pkgsrc/lang/ruby26-base/patches/patch-configure:1.2 --- pkgsrc/lang/ruby26-base/patches/patch-configure:1.1 Sun Feb 3 13:41:33 2019 +++ pkgsrc/lang/ruby26-base/patches/patch-configure Thu Mar 14 09:57:54 2019 @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.1 2019/02/03 13:41:33 taca Exp $ +$NetBSD: patch-configure,v 1.2 2019/03/14 09:57:54 jperkin Exp $ * Adding Interix support. * Ignore doxygen. @@ -7,7 +7,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 * Put -std= in CFLAGS not CPPFLAGS. * Fix argument for pthread_self() on NetBSD. ---- configure.orig 2018-12-25 06:28:23.000000000 +0000 +--- configure.orig 2019-01-30 10:41:14.000000000 +0000 +++ configure @@ -6048,7 +6048,7 @@ else if test x"$target_alias" = x; then : @@ -37,7 +37,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 *) : ;; esac -@@ -21598,6 +21603,8 @@ else +@@ -21600,6 +21605,8 @@ else # ifdef _MSC_VER # include # define alloca _alloca @@ -46,7 +46,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 # else # ifdef HAVE_ALLOCA_H # include -@@ -26149,11 +26156,11 @@ if ${rb_cv_func_pthread_setname_np_argum +@@ -26151,11 +26158,11 @@ if ${rb_cv_func_pthread_setname_np_argum else rb_cv_func_pthread_setname_np_arguments= # Linux,AIX, (pthread_self(), name) @@ -60,7 +60,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 "(name)" \ ; do cat confdefs.h - <<_ACEOF >conftest.$ac_ext -@@ -26747,7 +26754,9 @@ fi +@@ -26749,7 +26756,9 @@ fi interix*) : : ${LDSHARED='$(CC) -shared'} XLDFLAGS="$XLDFLAGS -Wl,-E" @@ -70,7 +70,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 rb_cv_dlopen=yes ;; #( freebsd*|dragonfly*) : -@@ -27989,7 +27998,7 @@ fi +@@ -27991,7 +28000,7 @@ fi ;; #( freebsd*|dragonfly*) : @@ -79,15 +79,20 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 LIBRUBY_SONAME='$(LIBRUBY_SO)' if test "$rb_cv_binary_elf" != "yes" ; then : -@@ -28068,6 +28077,7 @@ esac +@@ -28070,9 +28079,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)' -@@ -28091,7 +28101,12 @@ fi +- 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 : + + libprefix="@executable_path/../${libdir_basename}" +@@ -28093,7 +28103,12 @@ fi ;; #( interix*) : @@ -101,7 +106,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 ;; #( mingw*|cygwin*|mswin*) : -@@ -28273,7 +28288,7 @@ if test "$enable_rpath" = yes; then : +@@ -28275,7 +28290,7 @@ if test "$enable_rpath" = yes; then : esac rpathflag=`IFS="$PATH_SEPARATOR" echo x "$rpathflag" | @@ -110,7 +115,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 ` LIBRUBY_RPATHFLAGS="$LIBRUBY_RPATHFLAGS${rpathflag}" LIBRUBYARG_SHARED="$LIBRUBY_RPATHFLAGS $LIBRUBYARG_SHARED" -@@ -28815,15 +28830,7 @@ fi +@@ -28817,15 +28832,7 @@ fi if test "$install_doc" != no; then : @@ -127,7 +132,7 @@ $NetBSD: patch-configure,v 1.1 2019/02/0 if test "$install_capi" != no -a -n "$DOXYGEN"; then : CAPITARGET="capi" -@@ -30977,31 +30984,7 @@ which seems to be undefined. Please mak +@@ -30979,31 +30988,7 @@ which seems to be undefined. Please mak "Makefile":F) tmpmk=confmk$$.tmp { --_----------=_1552557474269650--