fltk: fix png library name.

Bump PKGREVISION.

3 files changed, 89 insertions, 5 deletions

diff --git a/x11/fltk/distinfo b/x11/fltk/distinfo
index 94071746292..c729a4df8a3 100644
--- a/x11/fltk/distinfo
+++ b/x11/fltk/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.28 2021/10/26 11:33:48 nia Exp $
+$NetBSD: distinfo,v 1.29 2022/07/27 18:42:42 wiz Exp $
 
 BLAKE2s (fltk-1.1.10-source.tar.bz2) = 64883d2b8ad915a4922bbc3d3c799f5efbd751c77ff9ac3b8fd49d235578f301
 SHA512 (fltk-1.1.10-source.tar.bz2) = 5bdece6855f190e56ea57a54ebe38172f177e9a4ac40d834f7a646a1d419bf92cfda46a30a1434a952c81a2ad14a22a7a02961c8a24d0cfc352f4d80dc3319a6
 Size (fltk-1.1.10-source.tar.bz2) = 2214382 bytes
 SHA1 (patch-aa) = 661dcac75cf50c791c2edcc14ec93e9ee83b062a
-SHA1 (patch-ab) = cb8500a9169c899ae332adc8672e814e4ba13304
-SHA1 (patch-ac) = 65e9fd364d5154904fa864e0550cf712fae6d569
+SHA1 (patch-ab) = 6c7b22664d0cc474ec3c26a1afa9150e535061a4
+SHA1 (patch-ac) = 6aa8efbb4bf9d9e49662d30ec02f02725220dfd8
 SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
 SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c
 SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b
diff --git a/x11/fltk/patches/patch-ab b/x11/fltk/patches/patch-ab
index a0834d04eca..a79a8e06829 100644
--- a/x11/fltk/patches/patch-ab
+++ b/x11/fltk/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.13 2010/04/09 13:35:42 obache Exp $
+$NetBSD: patch-ab,v 1.14 2022/07/27 18:42:42 wiz Exp $
 
 --- configure.in.orig	2009-09-20 17:25:25.000000000 +0000
 +++ configure.in
@@ -48,3 +48,28 @@ $NetBSD: patch-ab,v 1.13 2010/04/09 13:35:42 obache Exp $
  
  AC_SUBST(DSOCOMMAND)
  AC_SUBST(DSOFLAGS)
+@@ -611,7 +636,7 @@ AC_ARG_ENABLE(localpng, [  --enable-loca
+ syspnglib_ok=no
+ syspnginc_ok=no
+ if test x$enable_localpng != xyes; then
+-  AC_CHECK_LIB(png, png_read_info, 
++  AC_CHECK_LIB(png16, png_read_info, 
+     [AC_CHECK_HEADER(png.h, 
+ 	AC_DEFINE(HAVE_PNG_H)
+ 	syspnginc_ok=yes)
+@@ -640,11 +665,11 @@ if test x$enable_localpng = xyes -o x$sy
+ else
+     PNGINC=""
+     PNG=""
+-    IMAGELIBS="-lpng $IMAGELIBS"
+-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
++    IMAGELIBS="-lpng16 $IMAGELIBS"
++    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
+     AC_DEFINE(HAVE_LIBPNG)
+-    AC_CHECK_LIB(png,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
+-    AC_CHECK_LIB(png,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
++    AC_CHECK_LIB(png16,png_get_valid, AC_DEFINE(HAVE_PNG_GET_VALID))
++    AC_CHECK_LIB(png16,png_set_tRNS_to_alpha, AC_DEFINE(HAVE_PNG_SET_TRNS_TO_ALPHA))
+ fi
+ 
+ AC_SUBST(JPEG)
diff --git a/x11/fltk/patches/patch-ac b/x11/fltk/patches/patch-ac
index ce1c1c6fe62..d5f115e2364 100644
--- a/x11/fltk/patches/patch-ac
+++ b/x11/fltk/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.11 2010/04/09 13:35:42 obache Exp $
+$NetBSD: patch-ac,v 1.12 2022/07/27 18:42:42 wiz Exp $
 
 --- configure.orig	2009-12-27 15:24:34.000000000 +0000
 +++ configure
@@ -58,3 +58,62 @@ $NetBSD: patch-ac,v 1.11 2010/04/09 13:35:42 obache Exp $
  
  
  
+@@ -8794,13 +8823,13 @@ fi
+ syspnglib_ok=no
+ syspnginc_ok=no
+ if test x$enable_localpng != xyes; then
+-  { 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  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9161,19 +9190,19 @@ echo "$as_me: WARNING: Cannot find syste
+ else
+     PNGINC=""
+     PNG=""
+-    IMAGELIBS="-lpng $IMAGELIBS"
+-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
++    IMAGELIBS="-lpng16 $IMAGELIBS"
++    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
+     cat >>confdefs.h <<\_ACEOF
+ #define HAVE_LIBPNG 1
+ _ACEOF
+ 
+-    { echo "$as_me:$LINENO: checking for png_get_valid in -lpng" >&5
+-echo $ECHO_N "checking for png_get_valid in -lpng... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for png_get_valid in -lpng16" >&5
++echo $ECHO_N "checking for png_get_valid in -lpng16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png_png_get_valid+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -9235,13 +9264,13 @@ _ACEOF
+ 
+ fi
+ 
+-    { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng" >&5
+-echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng... $ECHO_C" >&6; }
++    { echo "$as_me:$LINENO: checking for png_set_tRNS_to_alpha in -lpng16" >&5
++echo $ECHO_N "checking for png_set_tRNS_to_alpha in -lpng16... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_png_png_set_tRNS_to_alpha+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF