CVS commit: pkgsrc/graphics/zphoto

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

Module Name:    pkgsrc
Committed By:   rin
Date:           Fri Jul 29 06:01:21 UTC 2022

Modified Files:
        pkgsrc/graphics/zphoto: Makefile distinfo
Added Files:
        pkgsrc/graphics/zphoto/patches: patch-configure

Log Message:
graphics/zphoto: Fix for graphics/imlib2 update

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

Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 pkgsrc/graphics/zphoto/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/graphics/zphoto/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/zphoto/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/graphics/zphoto/Makefile
diff -u pkgsrc/graphics/zphoto/Makefile:1.85 pkgsrc/graphics/zphoto/Makefile:1.86
--- pkgsrc/graphics/zphoto/Makefile:1.85        Tue Jun 28 11:34:08 2022
+++ pkgsrc/graphics/zphoto/Makefile     Fri Jul 29 06:01:21 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.85 2022/06/28 11:34:08 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2022/07/29 06:01:21 rin Exp $
 
 DISTNAME=      zphoto-1.2
-PKGREVISION=   75
+PKGREVISION=   76
 CATEGORIES=    graphics
 MASTER_SITES=  http://0xcc.net/zphoto/
 
@@ -14,7 +14,7 @@ LICENSE=      gnu-lgpl-v2.1
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
-USE_TOOLS+=            gmake perl
+USE_TOOLS+=            gmake perl pkg-config
 USE_LANGUAGES=         c c++
 
 CONFIGURE_ARGS+=       --with-libiconv-prefix=${BUILDLINK_PREFIX.libiconv}

Index: pkgsrc/graphics/zphoto/distinfo
diff -u pkgsrc/graphics/zphoto/distinfo:1.8 pkgsrc/graphics/zphoto/distinfo:1.9
--- pkgsrc/graphics/zphoto/distinfo:1.8 Tue Oct 26 10:47:26 2021
+++ pkgsrc/graphics/zphoto/distinfo     Fri Jul 29 06:01:21 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:47:26 nia Exp $
+$NetBSD: distinfo,v 1.9 2022/07/29 06:01:21 rin Exp $
 
 BLAKE2s (zphoto-1.2.tar.gz) = a516e0cde5977c72eb028d19529c443c7f601ea634b45a6ab28e046aecf336a7
 SHA512 (zphoto-1.2.tar.gz) = 9af3ae5f699b87e9184e9efa663f13451b52de80569b96e6ec3c6a107bc3bef5bb9396e8fd82382c48d96c4e8a65e584c70f8d7366f762c0ff3e9e7f7e998302
@@ -7,3 +7,4 @@ SHA1 (patch-aa) = 4c15d45ecfbefadc4b9b21
 SHA1 (patch-ab) = d365aeba430374b3ba6b4f1f88731f3b809fca31
 SHA1 (patch-ac) = 5f23d2b9611f403409902fdc7cb4ac2218b1cafb
 SHA1 (patch-ad) = cda6e504d5d88cdf1ae202ce1bad786313546f3d
+SHA1 (patch-configure) = 4882567200e22583308895868ddd594283b96980

Added files:

Index: pkgsrc/graphics/zphoto/patches/patch-configure
diff -u /dev/null pkgsrc/graphics/zphoto/patches/patch-configure:1.1
--- /dev/null   Fri Jul 29 06:01:21 2022
+++ pkgsrc/graphics/zphoto/patches/patch-configure      Fri Jul 29 06:01:21 2022
@@ -0,0 +1,19 @@
+$NetBSD: patch-configure,v 1.1 2022/07/29 06:01:21 rin Exp $
+
+Add minimal support to `pkg-config imlib2`; imlib2-config has been
+dropped since imlib2-1.7.5.
+
+--- configure.orig     2022-07-29 03:07:43.424974273 +0900
++++ configure  2022-07-29 03:14:20.811192103 +0900
+@@ -4868,6 +4868,11 @@
+ fi
+ IMLIB2CONFIG=$ac_cv_path_IMLIB2CONFIG
+ 
++if test -z "$IMLIB2CONFIG"; then
++  if pkg-config imlib2; then
++    IMLIB2CONFIG="pkg-config imlib2"
++  fi
++fi
+ if test -n "$IMLIB2CONFIG"; then
+   echo "$as_me:$LINENO: result: $IMLIB2CONFIG" >&5
+ echo "${ECHO_T}$IMLIB2CONFIG" >&6