CVS commit: pkgsrc/graphics/ruby-imlib2

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Jul 29 06:00:31 UTC 2022

Modified Files:
        pkgsrc/graphics/ruby-imlib2: Makefile distinfo
Added Files:
        pkgsrc/graphics/ruby-imlib2/patches: patch-extconf.rb

Log Message:
graphics/ruby-imlib2: Fix for graphics/imlib2 update

Switch to `pkg-config imlib2`.

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/ruby-imlib2/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/graphics/ruby-imlib2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/ruby-imlib2/patches/patch-extconf.rb

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

Modified files:

Index: pkgsrc/graphics/ruby-imlib2/Makefile
diff -u pkgsrc/graphics/ruby-imlib2/Makefile:1.37 pkgsrc/graphics/ruby-imlib2/Makefile:1.38
--- pkgsrc/graphics/ruby-imlib2/Makefile:1.37   Sat Nov  2 22:38:04 2019
+++ pkgsrc/graphics/ruby-imlib2/Makefile        Fri Jul 29 06:00:31 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2019/11/02 22:38:04 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2022/07/29 06:00:31 rin Exp $
 
 DISTNAME=      imlib2-ruby-0.5.2
 PKGNAME=       ${RUBY_PKGPREFIX}-${DISTNAME:S/ruby-//}
-PKGREVISION=   20
+PKGREVISION=   21
 CATEGORIES=    graphics
 MASTER_SITES=  http://pablotron.org/files/gems/
 
@@ -11,9 +11,11 @@ MAINTAINER=  pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Imlib2 bindings for Ruby
 LICENSE=       mit
 
+USE_TOOLS+=    pkg-config
+
 GEM_CLEANBUILD=                        Makefile *.o imlib2.${RUBY_DLEXT} mkmf.log .*.time
 OVERRIDE_GEMSPEC=              :name=imlib2-ruby
-BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.2.0nb2
+BUILDLINK_API_DEPENDS.imlib2+= imlib2>=1.9.1
 
 pre-configure:
        ${CHMOD} -R g-w ${WRKSRC}

Index: pkgsrc/graphics/ruby-imlib2/distinfo
diff -u pkgsrc/graphics/ruby-imlib2/distinfo:1.10 pkgsrc/graphics/ruby-imlib2/distinfo:1.11
--- pkgsrc/graphics/ruby-imlib2/distinfo:1.10   Tue Oct 26 10:46:52 2021
+++ pkgsrc/graphics/ruby-imlib2/distinfo        Fri Jul 29 06:00:31 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 10:46:52 nia Exp $
+$NetBSD: distinfo,v 1.11 2022/07/29 06:00:31 rin Exp $
 
 BLAKE2s (imlib2-ruby-0.5.2.gem) = 173168f4189924d746b9098e1cb22af363a1f5763083148e94b9051337c1b82f
 SHA512 (imlib2-ruby-0.5.2.gem) = 9524760581bfd2d97c66a2578ca0972f41955a20040394389d2ebd2172bcc9dd3f834d397195ae8a6f8d57664c501fbf105cee594b4dad22e90359cf9ec20031
 Size (imlib2-ruby-0.5.2.gem) = 119296 bytes
 SHA1 (patch-ab) = 04f72f6b839756c00b65feddc8bbec6ac6703642
+SHA1 (patch-extconf.rb) = 5d07f03669acb9bda546d8a53907fb20a8da08b7

Added files:

Index: pkgsrc/graphics/ruby-imlib2/patches/patch-extconf.rb
diff -u /dev/null pkgsrc/graphics/ruby-imlib2/patches/patch-extconf.rb:1.1
--- /dev/null   Fri Jul 29 06:00:31 2022
+++ pkgsrc/graphics/ruby-imlib2/patches/patch-extconf.rb        Fri Jul 29 06:00:31 2022
@@ -0,0 +1,24 @@
+$NetBSD: patch-extconf.rb,v 1.1 2022/07/29 06:00:31 rin Exp $
+
+Switch to `pkg-config imlib2`.
+
+--- extconf.rb.orig    2022-07-29 03:18:47.822900074 +0900
++++ extconf.rb 2022-07-29 03:20:08.407656008 +0900
+@@ -1,13 +1,13 @@
+ require 'mkmf'
+ 
+-imlib2_config = with_config("imlib2-config", "imlib2-config")
++pkg_config = with_config("pkg-config", "pkg-config")
+ 
+-$CFLAGS << ' -DX_DISPLAY_MISSING ' << `#{imlib2_config} --cflags`.chomp
+-$LDFLAGS << ' ' << `#{imlib2_config} --libs`.chomp
++$CFLAGS << ' -DX_DISPLAY_MISSING ' << `#{pkg_config} imlib2 --cflags`.chomp
++$LDFLAGS << ' ' << `#{pkg_config} imlib2 --libs`.chomp
+ 
+ if have_library("Imlib2", "imlib_create_image")
+   # test for faulty versions of imlib2
+-  ver = `imlib2-config --version`.chomp.split(/\./)
++  ver = `pkg-config imlib2 --modversion`.chomp.split(/\./)
+   major, minor, revision = ver[0].to_i, ver[1].to_i, ver[2].to_i
+   if ((major > 1)               ||
+       (major == 1 && minor > 0) ||