CVS commit: pkgsrc/lang/ruby24-base

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

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Tue Jun 27 15:25:19 UTC 2017

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

Log Message:
Ruby changed the primary -std flag for enabling C99 from iso9899:1999 to
gnu99 but left an existing SunOS test to only check for iso9899:1999.  This
resulted in CPPFLAGS not being set correctly for modules which require
native compilation - those should now all be fixed.  Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/ruby24-base/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ruby24-base/distinfo
cvs rdiff -u -r1.1 -r1.2 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.2 pkgsrc/lang/ruby24-base/Makefile:1.3
--- pkgsrc/lang/ruby24-base/Makefile:1.2        Mon Jun 19 11:11:34 2017
+++ pkgsrc/lang/ruby24-base/Makefile    Tue Jun 27 15:25:19 2017
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2017/06/19 11:11:34 jperkin Exp $
+# $NetBSD: Makefile,v 1.3 2017/06/27 15:25:19 jperkin Exp $
 
 DISTNAME=      ${RUBY_DISTNAME}
 PKGNAME=       ${RUBY_PKGPREFIX}-base-${RUBY_VERSION}
+PKGREVISION=   1
 CATEGORIES=    lang ruby
 MASTER_SITES=  ${MASTER_SITE_RUBY}
 
@@ -11,7 +12,7 @@ COMMENT=      Ruby ${RUBY_VERSION} release mi
 
 RUBY_VERSIONS_ACCEPTED=        24
 
-USE_LANGUAGES=         c99
+USE_LANGUAGES=         c
 USE_TOOLS+=            pax yacc pkg-config
 GNU_CONFIGURE=         yes
 TEST_TARGET=           test

Index: pkgsrc/lang/ruby24-base/distinfo
diff -u pkgsrc/lang/ruby24-base/distinfo:1.1 pkgsrc/lang/ruby24-base/distinfo:1.2
--- pkgsrc/lang/ruby24-base/distinfo:1.1        Sun Jun 18 13:45:11 2017
+++ pkgsrc/lang/ruby24-base/distinfo    Tue Jun 27 15:25:19 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.1 2017/06/18 13:45:11 taca Exp $
+$NetBSD: distinfo,v 1.2 2017/06/27 15:25:19 jperkin Exp $
 
 SHA1 (ruby-2.4.1.tar.bz2) = b0bec75c260dcb81ca386fafef27bd718f8c28ad
 RMD160 (ruby-2.4.1.tar.bz2) = 02f0be92b3fb3fbb4bd1f945359c0d45297cefc6
 SHA512 (ruby-2.4.1.tar.bz2) = 1c80d4c30ecb51758a193b26b76802a06d214de7f15570f1e85b5fae4cec81bda7237f086b81f6f2b5767f2e93d347ad1fa3f49d7b5c2e084d5f57c419503f74
 Size (ruby-2.4.1.tar.bz2) = 12571597 bytes
-SHA1 (patch-configure) = f5fbb20692a9655382a4144abc7ffea9365fef2e
+SHA1 (patch-configure) = 680a13e6405a8aab61eba078f6d88488b426885c
 SHA1 (patch-ext_dbm_extconf.rb) = c998f8735db54b1ae2bc8b6caa359ce88bc7a45b
 SHA1 (patch-ext_openssl_ossl__ssl.c) = 03ec33b438f3269910d10fb221d1cfe8df33c9ee
 SHA1 (patch-lib_mkmf.rb) = 75d2261a8282a00cd5f811a5e629302d1667207e

Index: pkgsrc/lang/ruby24-base/patches/patch-configure
diff -u pkgsrc/lang/ruby24-base/patches/patch-configure:1.1 pkgsrc/lang/ruby24-base/patches/patch-configure:1.2
--- pkgsrc/lang/ruby24-base/patches/patch-configure:1.1 Sun Jun 18 13:45:11 2017
+++ pkgsrc/lang/ruby24-base/patches/patch-configure     Tue Jun 27 15:25:19 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.1 2017/06/18 13:45:11 taca Exp $
+$NetBSD: patch-configure,v 1.2 2017/06/27 15:25:19 jperkin Exp $
 
 * Adding Interix support.
 * Ignore doxygen.
@@ -15,6 +15,15 @@ $NetBSD: patch-configure,v 1.1 2017/06/1
  
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for real target cpu" >&5
  $as_echo_n "checking for real target cpu... " >&6; }
+@@ -9234,7 +9234,7 @@ rm -f core conftest.err conftest.$ac_obj
+                 # is often also needed in CPPFLAGS, because some feature
+                 # definitions vary depending on such standards options.
+                 case "${ansi_options}" in #(
+-  *-std=iso9899:1999*) :
++  *-std=iso9899:1999*|*-std=gnu99*) :
+ 
+                   # RUBY_APPEND_OPTIONS(CPPFLAGS)
+       for rb_opt in ${ansi_options}; do
 @@ -9464,6 +9464,10 @@ esac
        LIBS="-lm $LIBS"
                ac_cv_func_round=no
@@ -90,7 +99,7 @@ $NetBSD: patch-configure,v 1.1 2017/06/1
  else
      RDOCTARGET="nodoc"
      CAPITARGET="nodoc"
-@@ -28372,19 +28381,7 @@ which seems to be undefined.  Please mak
+@@ -28372,19 +28383,7 @@ which seems to be undefined.  Please mak
      "Makefile":F)
      tmpmk=confmk$$.tmp
      {