[pkgsrc/trunk]: pkgsrc/devel/giblib devel/giblib: Fix for graphics/imlib2 update

[rin <rin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4562db65e19a
branches:  trunk
changeset: 382458:4562db65e19a
user:      rin <rin%pkgsrc.org@localhost>
date:      Fri Jul 29 05:58:10 2022 +0000

description:
devel/giblib: Fix for graphics/imlib2 update

Add minimal support to `pkg-config imlib2`; imlib2-config has been
dropped since imlib2-1.7.5.

Bump revision.

diffstat:

 devel/giblib/Makefile                |   5 +-
 devel/giblib/distinfo                |   3 +-
 devel/giblib/patches/patch-configure |  58 ++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 3 deletions(-)

diffs (96 lines):

diff -r 639367c0d077 -r 4562db65e19a devel/giblib/Makefile
--- a/devel/giblib/Makefile     Fri Jul 29 05:56:08 2022 +0000
+++ b/devel/giblib/Makefile     Fri Jul 29 05:58:10 2022 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2020/11/24 17:10:43 nia Exp $
+# $NetBSD: Makefile,v 1.38 2022/07/29 05:58:10 rin Exp $
 
 DISTNAME=              giblib-1.2.4
-PKGREVISION=           16
+PKGREVISION=           17
 CATEGORIES=            devel
 MASTER_SITES=          http://linuxbrit.co.uk/downloads/
 
@@ -13,6 +13,7 @@
 GNU_CONFIGURE=         YES
 PKGCONFIG_OVERRIDE=    giblib.pc.in
 USE_LIBTOOL=           YES
+USE_TOOLS+=            pkg-config
 
 .include "../../graphics/imlib2/buildlink3.mk"
 
diff -r 639367c0d077 -r 4562db65e19a devel/giblib/distinfo
--- a/devel/giblib/distinfo     Fri Jul 29 05:56:08 2022 +0000
+++ b/devel/giblib/distinfo     Fri Jul 29 05:58:10 2022 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:14:41 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/07/29 05:58:10 rin Exp $
 
 BLAKE2s (giblib-1.2.4.tar.gz) = c9d66be3b0621f2c0d9882bb0e7f5ca79fd84f7247bcf77c061a41adb19e548e
 SHA512 (giblib-1.2.4.tar.gz) = 4866df223e6d219a5c9a327874bcd67260c83fba8f99862222df41ef86fb31efa0172a777bf46c853ca380dc2a64bbd41bf4fd658fcb84a924cab4e0f525dcfd
 Size (giblib-1.2.4.tar.gz) = 287653 bytes
 SHA1 (patch-aa) = 19e3d89366a6455df891fb843f6682d623023b0d
+SHA1 (patch-configure) = f2da73648586410c2e8334e64581a3761dbd6009
 SHA1 (patch-giblib_Makefile.in) = c2e844ea064a755ff62ca65529cd8ca581c13fc9
diff -r 639367c0d077 -r 4562db65e19a devel/giblib/patches/patch-configure
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/giblib/patches/patch-configure      Fri Jul 29 05:58:10 2022 +0000
@@ -0,0 +1,58 @@
+$NetBSD: patch-configure,v 1.1 2022/07/29 05:58:10 rin Exp $
+
+Add minimal support to `pkg-config imlib2`; imlib2-config has been
+dropped since imlib2-1.7.5.
+
+--- configure.orig     2004-09-05 00:01:41.000000000 +0900
++++ configure  2022-07-29 04:18:07.334548485 +0900
+@@ -19773,12 +19773,21 @@
+ fi
+ IMLIB2_CONFIG=$ac_cv_path_IMLIB2_CONFIG
+ 
+-if test -n "$IMLIB2_CONFIG"; then
++if test -n "$IMLIB2_CONFIG" && test "$IMLIB2_CONFIG" != "no"; then
+   echo "$as_me:$LINENO: result: $IMLIB2_CONFIG" >&5
+ echo "${ECHO_T}$IMLIB2_CONFIG" >&6
++  imlib2_version=--version
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
++  if pkg-config imlib2; then
++    IMLIB2_CONFIG=pkg-config
++    imlib2_config_args=imlib2
++    imlib2_version=--modversion
++    echo "$as_me:$LINENO: result: $IMLIB2_CONFIG" >&5
++  echo "${ECHO_T}$IMLIB2_CONFIG" >&6
++  else
++    echo "$as_me:$LINENO: result: no" >&5
++  echo "${ECHO_T}no" >&6
++  fi
+ fi
+ 
+   echo "$as_me:$LINENO: checking for imlib2 - version >= 1.0.0" >&5
+@@ -19792,11 +19801,11 @@
+      IMLIB2_LIBS="`$IMLIB2_CONFIG $imlib2_config_args --libs`"
+ 
+         imlib2_config_major_version=`$IMLIB2_CONFIG $imlib2_config_args \
+-         --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++         $imlib2_version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+         imlib2_config_minor_version=`$IMLIB2_CONFIG $imlib2_config_args \
+-         --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++         $imlib2_version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+         imlib2_config_micro_version=`$IMLIB2_CONFIG $imlib2_config_args \
+-         --version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++         $imlib2_version | sed 's/[^0-9]*\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+         imlib2_wanted_major_version="1"
+         imlib2_wanted_minor_version="0"
+         imlib2_wanted_micro_version="0"
+@@ -19866,8 +19875,8 @@
+ 
+ 
+ 
+-IMLIB_LIBS=`imlib2-config --libs`
+-IMLIB_CFLAGS=`imlib2-config --cflags`
++IMLIB_LIBS=$IMLIB2_LIBS
++IMLIB_CFLAGS=$IMLIB2_CFLAGS
+ 
+ 
+