CVS commit: pkgsrc/graphics/imlib

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 27 18:38:48 UTC 2022

Modified Files:
        pkgsrc/graphics/imlib: Makefile distinfo
        pkgsrc/graphics/imlib/patches: patch-ag

Log Message:
imlib: fix png library name.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 pkgsrc/graphics/imlib/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/graphics/imlib/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/imlib/patches/patch-ag

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

Modified files:

Index: pkgsrc/graphics/imlib/Makefile
diff -u pkgsrc/graphics/imlib/Makefile:1.129 pkgsrc/graphics/imlib/Makefile:1.130
--- pkgsrc/graphics/imlib/Makefile:1.129        Tue Sep 21 14:27:05 2021
+++ pkgsrc/graphics/imlib/Makefile      Wed Jul 27 18:38:48 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.129 2021/09/21 14:27:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.130 2022/07/27 18:38:48 wiz Exp $
 
 DISTNAME=      imlib-1.9.15
-PKGREVISION=   21
+PKGREVISION=   22
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/imlib/1.9/}
 EXTRACT_SUFX=  .tar.bz2
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE=   imlib.pc.in
 UNLIMIT_RESOURCES=     datasize
 
 CPPFLAGS+=             -DENABLE_NLS
-CONFIGURE_ENV+=                ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert"
+CONFIGURE_ENV+=                ac_cv_path_CONVERT_PROG="${PREFIX}/bin/convert"
 CONFIGURE_ENV+=                X_LDFLAGS=${X_LDFLAGS:Q}
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --disable-shm

Index: pkgsrc/graphics/imlib/distinfo
diff -u pkgsrc/graphics/imlib/distinfo:1.28 pkgsrc/graphics/imlib/distinfo:1.29
--- pkgsrc/graphics/imlib/distinfo:1.28 Tue Oct 26 10:46:19 2021
+++ pkgsrc/graphics/imlib/distinfo      Wed Jul 27 18:38:48 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2021/10/26 10:46:19 nia Exp $
+$NetBSD: distinfo,v 1.29 2022/07/27 18:38:48 wiz Exp $
 
 BLAKE2s (imlib-1.9.15.tar.bz2) = 3122f6ca38839e9df0042d92d98502442914e85ac9e319156632b0274166ba38
 SHA512 (imlib-1.9.15.tar.bz2) = f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a
@@ -8,7 +8,7 @@ SHA1 (patch-ab) = e46a4c5d971819cadac3b4
 SHA1 (patch-ac) = 7dd08bde4e97614777bf4327db2e6045db04692d
 SHA1 (patch-ad) = 1fc310d57c12337cc8ccddb7dd907330127b7112
 SHA1 (patch-ae) = 3ed6fff2e73f04ec83c27dc6e3f2db2fa446abbb
-SHA1 (patch-ag) = 7ef3980a6a3eccba41895ef86eae727cd7dfb1e2
+SHA1 (patch-ag) = 80a4834bf0f2e405ea84a5a541e6a7a9bbd4599a
 SHA1 (patch-ah) = edee5311a47d552f9d1b9dcb96f256518040c538
 SHA1 (patch-ai) = df13b72272f754375348437b99d962cb17732619
 SHA1 (patch-aj) = 60171b7341c65fb6eb0a93738fef4b2c31692bdf

Index: pkgsrc/graphics/imlib/patches/patch-ag
diff -u pkgsrc/graphics/imlib/patches/patch-ag:1.6 pkgsrc/graphics/imlib/patches/patch-ag:1.7
--- pkgsrc/graphics/imlib/patches/patch-ag:1.6  Tue Nov  8 10:58:00 2005
+++ pkgsrc/graphics/imlib/patches/patch-ag      Wed Jul 27 18:38:48 2022
@@ -1,4 +1,8 @@
-$NetBSD: patch-ag,v 1.6 2005/11/08 10:58:00 joerg Exp $
+$NetBSD: patch-ag,v 1.7 2022/07/27 18:38:48 wiz Exp $
+
+Add DragonFly support.
+Fix png library name.
+Fix linking against tiff.
 
 --- configure.orig     2004-09-23 01:15:44.000000000 +0000
 +++ configure
@@ -110,3 +114,32 @@ $NetBSD: patch-ag,v 1.6 2005/11/08 10:58
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBTIFF 1
  _ACEOF
+@@ -24395,13 +24395,13 @@ fi
+ 
+ 
+ 
+-echo "$as_me:$LINENO: checking for png_read_info in -lpng" >&5
+-echo $ECHO_N "checking for png_read_info in -lpng... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for png_read_info in -lpng16" >&5
++echo $ECHO_N "checking for png_read_info in -lpng16... $ECHO_C" >&6
+ if test "${ac_cv_lib_png_png_read_info+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng -lz -lm $GX_LIBS $LIBS"
++LIBS="-lpng16 -lz -lm $GX_LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24670,9 +24670,9 @@ echo "$as_me: error: *** PNG header file
+ fi
+ 
+ if test "$png_ok" = yes; then
+-      PNGLIBS="-lpng -lz"
++      PNGLIBS="-lpng16 -lz"
+ 
+-      SUPPORT_LIBS="$SUPPORT_LIBS -lpng -lz";
++      SUPPORT_LIBS="$SUPPORT_LIBS -lpng16 -lz";
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBPNG 1
+ _ACEOF