CVS commit: pkgsrc/multimedia/ruby-ming

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

Module Name:    pkgsrc
Committed By:   taca
Date:           Tue Jan 14 14:40:43 UTC 2020

Modified Files:
        pkgsrc/multimedia/ruby-ming: Makefile distinfo
        pkgsrc/multimedia/ruby-ming/patches: patch-setup.rb

Log Message:
multimedia/ruby-ming: fix build problem on native X

Fix build problem on native X with CHECK_SHLIBS is enabled.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/ruby-ming/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/multimedia/ruby-ming/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ruby-ming/patches/patch-setup.rb

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

Modified files:

Index: pkgsrc/multimedia/ruby-ming/Makefile
diff -u pkgsrc/multimedia/ruby-ming/Makefile:1.26 pkgsrc/multimedia/ruby-ming/Makefile:1.27
--- pkgsrc/multimedia/ruby-ming/Makefile:1.26   Mon Sep  4 18:00:58 2017
+++ pkgsrc/multimedia/ruby-ming/Makefile        Tue Jan 14 14:40:42 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2017/09/04 18:00:58 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2020/01/14 14:40:42 taca Exp $
 
 DISTNAME=      ming-ruby-${VER}
 PKGNAME=       ${RUBY_PKGPREFIX}-ming-${VER}
@@ -22,6 +22,8 @@ REPLACE_RUBY_DIRS=    ${WRKSRC}/examples
 CONFIGURE_ARGS+=       --siteruby=${PREFIX}/${RUBY_VENDORLIB_BASE}
 CONFIGURE_ARGS+=       --siterubyver=${PREFIX}/${RUBY_VENDORLIB}
 CONFIGURE_ARGS+=       --siterubyverarch=${PREFIX}/${RUBY_VENDORARCHLIB}
+# pass more options to extconf.rb
+CONFIGURE_ARGS+=       -- --with-freetype-dir=${BUILDLINK_PREFIX.freetype2}
 
 SUBST_CLASSES+=                giflib
 SUBST_STAGE.giflib=    pre-configure

Index: pkgsrc/multimedia/ruby-ming/distinfo
diff -u pkgsrc/multimedia/ruby-ming/distinfo:1.11 pkgsrc/multimedia/ruby-ming/distinfo:1.12
--- pkgsrc/multimedia/ruby-ming/distinfo:1.11   Tue Nov  3 23:54:32 2015
+++ pkgsrc/multimedia/ruby-ming/distinfo        Tue Jan 14 14:40:42 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 23:54:32 agc Exp $
+$NetBSD: distinfo,v 1.12 2020/01/14 14:40:42 taca Exp $
 
 SHA1 (ming-ruby-0.2.1.tar.gz) = 942829a4085afb2645e6b098b72bd24badb8f0ef
 RMD160 (ming-ruby-0.2.1.tar.gz) = 7ddde8b9912bdd1608a7af8b23464a5fc63b9306
@@ -10,4 +10,4 @@ SHA1 (patch-ac) = c6604cb8856ea42d108389
 SHA1 (patch-ad) = 6a62e023b934f528f9247bae24c28829f35d1c25
 SHA1 (patch-ext_ming_mingc_swfcxform.c) = fae47d061d2088c27c056b66cec3ea45fc8bfe4b
 SHA1 (patch-ext_ming_mingc_swfdisplayitem.c) = 134f713c96454b9dec4851ccdcd2310ef24cc540
-SHA1 (patch-setup.rb) = d64c1babfae090cf8868a66c0bcd220ccba9a0a2
+SHA1 (patch-setup.rb) = 7afde44f83425905ecdcef273bf0948d9f62d468

Index: pkgsrc/multimedia/ruby-ming/patches/patch-setup.rb
diff -u pkgsrc/multimedia/ruby-ming/patches/patch-setup.rb:1.1 pkgsrc/multimedia/ruby-ming/patches/patch-setup.rb:1.2
--- pkgsrc/multimedia/ruby-ming/patches/patch-setup.rb:1.1      Mon Jun  8 14:55:17 2015
+++ pkgsrc/multimedia/ruby-ming/patches/patch-setup.rb  Tue Jan 14 14:40:42 2020
@@ -1,6 +1,7 @@
-$NetBSD: patch-setup.rb,v 1.1 2015/06/08 14:55:17 taca Exp $
+$NetBSD: patch-setup.rb,v 1.2 2020/01/14 14:40:42 taca Exp $
 
-Fix build problem on Ruby 2.2 and later.
+* Fix build problem on Ruby 2.2 and later.
+* Remove duplicated line.
 
 --- setup.rb.orig      2004-10-30 14:17:39.000000000 +0000
 +++ setup.rb
@@ -13,7 +14,15 @@ Fix build problem on Ruby 2.2 and later.
  
  rubypath = c['bindir'] + '/' + c['ruby_install_name']
  
-@@ -1246,7 +1246,7 @@ class Installer
+@@ -355,7 +355,6 @@ class ConfigTable_class   # open again
+     'site-ruby-common' => 'siteruby',     # For backward compatibility
+     'site-ruby'        => 'siterubyver',  # For backward compatibility
+     'bin-dir'          => 'bindir',
+-    'bin-dir'          => 'bindir',
+     'rb-dir'           => 'rbdir',
+     'so-dir'           => 'sodir',
+     'data-dir'         => 'datadir',
+@@ -1246,7 +1245,7 @@ class Installer
  
    def ruby_extentions(dir)
      Dir.open(dir) {|d|