CVS commit: pkgsrc/lang/ruby24-base

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jan 26 13:22:58 UTC 2018

Modified Files:
        pkgsrc/lang/ruby24-base: Makefile distinfo
        pkgsrc/lang/ruby24-base/patches: patch-configure

Log Message:
ruby24-base: Put -std= in CFLAGS not CPPFLAGS.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/lang/ruby24-base/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/ruby24-base/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/ruby24-base/patches/patch-configure

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

Modified files:

Index: pkgsrc/lang/ruby24-base/Makefile
diff -u pkgsrc/lang/ruby24-base/Makefile:1.5 pkgsrc/lang/ruby24-base/Makefile:1.6
--- pkgsrc/lang/ruby24-base/Makefile:1.5        Fri Sep 15 00:39:46 2017
+++ pkgsrc/lang/ruby24-base/Makefile    Fri Jan 26 13:22:58 2018
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2017/09/15 00:39:46 taca Exp $
+# $NetBSD: Makefile,v 1.6 2018/01/26 13:22:58 jperkin Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 

Index: pkgsrc/lang/ruby24-base/distinfo
diff -u pkgsrc/lang/ruby24-base/distinfo:1.6 pkgsrc/lang/ruby24-base/distinfo:1.7
--- pkgsrc/lang/ruby24-base/distinfo:1.6        Tue Jan 16 14:53:28 2018
+++ pkgsrc/lang/ruby24-base/distinfo    Fri Jan 26 13:22:58 2018
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2018/01/16 14:53:28 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2018/01/26 13:22:58 jperkin Exp $
 
 SHA1 (ruby-2.4.3.tar.bz2) = 3ca96536320b915762d57fe1ee540df6810bf631
 RMD160 (ruby-2.4.3.tar.bz2) = f02b5ca6b577351c8852a99eecaa4d4a3dda026f
 SHA512 (ruby-2.4.3.tar.bz2) = fb4339e30c04d03b1422b6c32ede45902e072cd26325b36f3fc05c341d42eea6431d88718242dcc9ce24d9cad26f3d26772f2e806bd7d93f40be50268c318409
 Size (ruby-2.4.3.tar.bz2) = 12615068 bytes
-SHA1 (patch-configure) = 8efaac42f4441c1ea8075c1a0272b08f24c67bed
+SHA1 (patch-configure) = a4013e4674be0060d2b0d43569b7695f6df7b4a7
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e
 SHA1 (patch-lib_rdoc_ri_driver.rb) = f4d3e59e35b608acd4edc17916142c7f033e6198

Index: pkgsrc/lang/ruby24-base/patches/patch-configure
diff -u pkgsrc/lang/ruby24-base/patches/patch-configure:1.3 pkgsrc/lang/ruby24-base/patches/patch-configure:1.4
--- pkgsrc/lang/ruby24-base/patches/patch-configure:1.3 Tue Jan 16 14:53:28 2018
+++ pkgsrc/lang/ruby24-base/patches/patch-configure     Fri Jan 26 13:22:58 2018
@@ -1,9 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2018/01/16 14:53:28 jperkin Exp $
+$NetBSD: patch-configure,v 1.4 2018/01/26 13:22:58 jperkin Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
 * Ignore VCS.
 * Handle SSP in pkgsrc.
+* Put -std= in CFLAGS not CPPFLAGS.
 
 --- configure.orig     2017-12-14 14:36:11.000000000 +0000
 +++ configure
@@ -33,6 +34,18 @@ $NetBSD: patch-configure,v 1.3 2018/01/1
  
                    # RUBY_APPEND_OPTIONS(CPPFLAGS)
        for rb_opt in ${ansi_options}; do
+@@ -9333,9 +9334,9 @@ rm -f core conftest.err conftest.$ac_obj
+   *" ${rb_opt} "*) :
+      ;; #(
+   '  ') :
+-     CPPFLAGS="${rb_opt}" ;; #(
++     CFLAGS="${rb_opt}" ;; #(
+   *) :
+-     CPPFLAGS="$CPPFLAGS ${rb_opt}" ;;
++     CFLAGS="$CFLAGS ${rb_opt}" ;;
+ esac
+       done
+                  ;; #(
 @@ -9555,6 +9556,10 @@ esac
        LIBS="-lm $LIBS"
                ac_cv_func_round=no