head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.30
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.28
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.26
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.24
	pkgsrc-2025Q2-base:1.1
	pkgsrc-2025Q1:1.1.0.22
	pkgsrc-2025Q1-base:1.1
	pkgsrc-2024Q4:1.1.0.20
	pkgsrc-2024Q4-base:1.1
	pkgsrc-2024Q3:1.1.0.18
	pkgsrc-2024Q3-base:1.1
	pkgsrc-2024Q2:1.1.0.16
	pkgsrc-2024Q2-base:1.1
	pkgsrc-2024Q1:1.1.0.14
	pkgsrc-2024Q1-base:1.1
	pkgsrc-2023Q4:1.1.0.12
	pkgsrc-2023Q4-base:1.1
	pkgsrc-2023Q3:1.1.0.10
	pkgsrc-2023Q3-base:1.1
	pkgsrc-2023Q2:1.1.0.8
	pkgsrc-2023Q2-base:1.1
	pkgsrc-2023Q1:1.1.0.6
	pkgsrc-2023Q1-base:1.1
	pkgsrc-2022Q4:1.1.0.4
	pkgsrc-2022Q4-base:1.1
	pkgsrc-2022Q3:1.1.0.2
	pkgsrc-2022Q3-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2022.07.29.05.58.10;	author rin;	state Exp;
branches;
next	;
commitid	SZvrn6BStFbMKKND;


desc
@@


1.1
log
@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.
@
text
@$NetBSD$

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
 
 
 
@