CVS commit: pkgsrc/x11/fltk13

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul 27 18:46:49 UTC 2022

Modified Files:
        pkgsrc/x11/fltk13: Makefile distinfo
        pkgsrc/x11/fltk13/patches: patch-configure

Log Message:
fltk: fix png library name.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/fltk13/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/fltk13/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/fltk13/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/x11/fltk13/Makefile
diff -u pkgsrc/x11/fltk13/Makefile:1.42 pkgsrc/x11/fltk13/Makefile:1.43
--- pkgsrc/x11/fltk13/Makefile:1.42     Mon Nov 22 10:49:08 2021
+++ pkgsrc/x11/fltk13/Makefile  Wed Jul 27 18:46:49 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2021/11/22 10:49:08 micha Exp $
+# $NetBSD: Makefile,v 1.43 2022/07/27 18:46:49 wiz Exp $
 
 DISTNAME=      fltk-1.3.8-source
 PKGNAME=       ${DISTNAME:S/-source//}
+PKGREVISION=   1
 VERS=          ${DISTNAME:S/fltk-//:S/-source//}
 CATEGORIES=    x11
 MASTER_SITES=  https://fltk.org/pub/fltk/${VERS}/

Index: pkgsrc/x11/fltk13/distinfo
diff -u pkgsrc/x11/fltk13/distinfo:1.16 pkgsrc/x11/fltk13/distinfo:1.17
--- pkgsrc/x11/fltk13/distinfo:1.16     Mon Nov 22 10:49:08 2021
+++ pkgsrc/x11/fltk13/distinfo  Wed Jul 27 18:46:49 2022
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.16 2021/11/22 10:49:08 micha Exp $
+$NetBSD: distinfo,v 1.17 2022/07/27 18:46:49 wiz Exp $
 
 BLAKE2s (fltk-1.3.8-source.tar.bz2) = c94fe7f4ce7afbc5c1c8968f19a944d36ddb85c73bcf80c91039f74c46f9b039
 SHA512 (fltk-1.3.8-source.tar.bz2) = a836ad5069de7461ab3d791a587237a64efded9328bc89f46f71f02b3576000f5386bb17d2e8ee693435752fe99b0fb6566ebd34e4038c270c1801b9f360cd8b
 Size (fltk-1.3.8-source.tar.bz2) = 4574725 bytes
 SHA1 (patch-Makefile) = c10e99516649e8fc02b6041be162229baec7a550
-SHA1 (patch-configure) = 4bc9690d9a18c1b3eca9c40dbe01d952cc3194a6
+SHA1 (patch-configure) = 1b8ad181047144d7adf610a3ca73c01ea94e2315
 SHA1 (patch-documentation_Makefile) = 4c0c4243311c170d6c645db41b8bb1821d053712
 SHA1 (patch-fluid_Makefile) = 6033e485a8ea7590fe68d9049645a1035326f8ce
 SHA1 (patch-makeinclude.in) = e353cdc721c856e9c8839eb6334de59981e70d90

Index: pkgsrc/x11/fltk13/patches/patch-configure
diff -u pkgsrc/x11/fltk13/patches/patch-configure:1.1 pkgsrc/x11/fltk13/patches/patch-configure:1.2
--- pkgsrc/x11/fltk13/patches/patch-configure:1.1       Mon May 17 10:38:48 2021
+++ pkgsrc/x11/fltk13/patches/patch-configure   Wed Jul 27 18:46:49 2022
@@ -1,9 +1,10 @@
-$NetBSD: patch-configure,v 1.1 2021/05/17 10:38:48 micha Exp $
+$NetBSD: patch-configure,v 1.2 2022/07/27 18:46:49 wiz Exp $
 
 Add libtool support.
 Upstream will not merge this (libtool is listed as not acceptable).
+Fix png library name.
 
---- configure.orig     2021-05-04 18:40:48.000000000 +0000
+--- configure.orig     2021-11-20 18:12:26.000000000 +0000
 +++ configure
 @@ -3830,7 +3830,22 @@ if test "${enable_shared+set}" = set; th
    enableval=$enable_shared;
@@ -50,3 +51,60 @@ Upstream will not merge this (libtool is
  
  
  
+@@ -6355,13 +6384,13 @@ fi
+ syspnglib_ok=no
+ syspnginc_ok=no
+ if test x$enable_localpng != xyes; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng" >&5
+-$as_echo_n "checking for png_read_info in -lpng... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_read_info in -lpng16" >&5
++$as_echo_n "checking for png_read_info in -lpng16... " >&6; }
+ if ${ac_cv_lib_png_png_read_info+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6437,17 +6466,17 @@ $as_echo "$as_me: WARNING: Cannot find s
+ else
+     PNGINC=""
+     PNG=""
+-    IMAGELIBS="-lpng $IMAGELIBS"
+-    STATICIMAGELIBS="-lpng $STATICIMAGELIBS"
++    IMAGELIBS="-lpng16 $IMAGELIBS"
++    STATICIMAGELIBS="-lpng16 $STATICIMAGELIBS"
+     $as_echo "#define HAVE_LIBPNG 1" >>confdefs.h
+ 
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_valid in -lpng" >&5
+-$as_echo_n "checking for png_get_valid in -lpng... " >&6; }
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_valid in -lpng16" >&5
++$as_echo_n "checking for png_get_valid in -lpng16... " >&6; }
+ if ${ac_cv_lib_png_png_get_valid+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6482,13 +6511,13 @@ if test "x$ac_cv_lib_png_png_get_valid" 
+ 
+ fi
+ 
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_tRNS_to_alpha in -lpng" >&5
+-$as_echo_n "checking for png_set_tRNS_to_alpha in -lpng... " >&6; }
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_tRNS_to_alpha in -lpng16" >&5
++$as_echo_n "checking for png_set_tRNS_to_alpha in -lpng16... " >&6; }
+ if ${ac_cv_lib_png_png_set_tRNS_to_alpha+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng  $LIBS"
++LIBS="-lpng16  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+