 @@ -1,15 +1,15 @@
-$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-ab) = 6c7b22664d0cc474ec3c26a1afa9150e535061a4
-SHA1 (patch-ac) = 65e9fd364d5154904fa864e0550cf712fae6d569
+SHA1 (patch-ac) = 6aa8efbb4bf9d9e49662d30ec02f02725220dfd8
 SHA1 (patch-ad) = b04051b14eb0bc74e8ccfe762e367ab8ccb11b80
 SHA1 (patch-ae) = de29d1be1219c3b17707216a7c54c25a9adb746c
 SHA1 (patch-af) = 791ba33cfc85e41e0f2b75ce0d1b0d6a378d9d0b
 SHA1 (patch-ag) = aaeb376acf79b695e8376e7610534d125dff6a86
 SHA1 (patch-ah) = 876f79b4d0523035307ecc7d76460cad44b40704
 SHA1 (patch-fluid_Fl__Type.h) = b2ea0bebf152ab0755135fbe8cc6179d2f6d79e1
 SHA1 (patch-src_fl__draw.cxx) = 824ee95fe997ed553b88801569b35f3698d11898

 @@ -1,14 +1,14 @@
-$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
 @@ -122,6 +122,7 @@ AC_SUBST(GLLIBNAME)
  AC_SUBST(IMGLIBNAME)
  AC_SUBST(LIBEXT)
  AC_SUBST(LIBNAME)
 +AC_SUBST(LIBTOOL)
  AC_SUBST(LINKFLTK)
  AC_SUBST(LINKFLTKFORMS)
  AC_SUBST(LINKFLTKGL)
 @@ -143,6 +144,15 @@ fi
  AC_ARG_ENABLE(gl, [  --enable-gl             turn on OpenGL support [default=yes]])
 @@ -38,13 +38,38 @@ $NetBSD: patch-ab,v 1.13 2010/04/09 13:3
 +    if test "x$LINKFLTKIMG" != "x"; then
 +        LINKFLTKIMG="../src/libfltk_images.la"
 +    fi
 +    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
 +    DSONAME="libfltk.la"
 +    FLDSONAME="libfltk_forms.la"
 +    GLDSONAME="libfltk_gl.la"
 +    IMGDSONAME="libfltk_images.la"
 +fi
++
  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)

 @@ -1,14 +1,14 @@
-$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
 @@ -1323,6 +1323,8 @@ Optional Features:
    --enable-debug          turn on debugging default=no
    --enable-gl             turn on OpenGL support default=yes
    --enable-shared         turn on shared libraries default=no
 +  --enable-libtool=LIBTOOL_PATH
 +                          turn on building with libtool [default=no]
    --enable-threads        enable multi-threading support
    --enable-quartz         use Quartz instead of Quickdraw (default=no)
    --disable-largefile     omit support for large files
 @@ -1898,7 +1900,22 @@ if test "${enable_shared+set}" = set; th
 @@ -48,13 +48,72 @@ $NetBSD: patch-ac,v 1.11 2010/04/09 13:3
 +    fi
 +    if test "x$LINKFLTKIMG" != "x"; then
 +        LINKFLTKIMG="../src/libfltk_images.la"
 +    fi
 +    LINKSHARED="-lfltk_images -lfltk_forms -lfltk"
 +    DSONAME="libfltk.la"
 +    FLDSONAME="libfltk_forms.la"
 +    GLDSONAME="libfltk_gl.la"
 +    IMGDSONAME="libfltk_images.la"
 +fi
@@ -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