gdal-lib: use pkgsrc png library name

This should probably use pkg-config instead.

Bump PKGREVISION.

3 files changed, 54 insertions, 3 deletions

diff --git a/geography/gdal-lib/Makefile b/geography/gdal-lib/Makefile
index 0e6916786bb..2dacf9fce4c 100644
--- a/geography/gdal-lib/Makefile
+++ b/geography/gdal-lib/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.147 2022/05/08 12:47:20 gdt Exp $
+# $NetBSD: Makefile,v 1.148 2022/07/27 18:32:11 wiz Exp $
 
 .include "../../geography/gdal-lib/Makefile.common"
 PKGNAME=	${DISTNAME:S/gdal/gdal-lib/}
-#PKGREVISION=	0
+PKGREVISION=	1
 
 COMMENT=	Translator library for raster geospatial data formats
 
diff --git a/geography/gdal-lib/distinfo b/geography/gdal-lib/distinfo
index e5bd82ab4e1..4818540d95f 100644
--- a/geography/gdal-lib/distinfo
+++ b/geography/gdal-lib/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.57 2022/07/08 13:22:57 gdt Exp $
+$NetBSD: distinfo,v 1.58 2022/07/27 18:32:11 wiz Exp $
 
 BLAKE2s (gdal-3.5.1.tar.xz) = c84b17844c99ee83fe1946b5dced2f0e15763775f577ba3d36a86d5ebdf80e99
 SHA512 (gdal-3.5.1.tar.xz) = d731b2b2bd5d300786e2e0eca296d302fda8bc9c76b41d7e78b728f82bb857c55a0d0ba65ae0ccd3b03c6b5812d0afee07940e4133b4b2c852a384c9fe00a8bc
 Size (gdal-3.5.1.tar.xz) = 8844808 bytes
+SHA1 (patch-configure) = 86eae1d146161752ba9468d0aca7f2bb7f3b121b
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
diff --git a/geography/gdal-lib/patches/patch-configure b/geography/gdal-lib/patches/patch-configure
new file mode 100644
index 00000000000..35af72f6e2d
--- /dev/null
+++ b/geography/gdal-lib/patches/patch-configure
@@ -0,0 +1,50 @@
+$NetBSD: patch-configure,v 1.5 2022/07/27 18:32:11 wiz Exp $
+
+Fix png library name.
+
+--- configure.orig	2022-06-30 09:26:31.000000000 +0000
++++ configure
+@@ -29988,13 +29988,13 @@ if test "$with_png" = "no" ; then
+ 
+ elif test "$with_png" = "yes" -o "$with_png" = "" ; then
+ 
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_IHDR in -lpng" >&5
+-$as_echo_n "checking for png_set_IHDR in -lpng... " >&6; }
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_set_IHDR in -lpng16" >&5
++$as_echo_n "checking for png_set_IHDR in -lpng16... " >&6; }
+ if ${ac_cv_lib_png_png_set_IHDR+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lpng $LIBS $LIBS"
++LIBS="-lpng16 $LIBS $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -30047,7 +30047,7 @@ done
+     PNG_SETTING=internal
+   fi
+   if test "$PNG_SETTING" = "external" ; then
+-    LIBS="-lpng $LIBS"
++    LIBS="-lpng16 $LIBS"
+     echo "using pre-installed libpng."
+   else
+     echo "using internal png code."
+@@ -30062,7 +30062,7 @@ elif test "$with_png" = "internal" ; the
+ else
+ 
+   PNG_SETTING=external
+-  LIBS="-L$with_png -L$with_png/lib -lpng $LIBS"
++  LIBS="-L$with_png -L$with_png/lib -lpng16 $LIBS"
+   EXTRA_INCLUDES="-I$with_png -I$with_png/include $EXTRA_INCLUDES"
+ 
+   echo "using libpng from $with_png."
+@@ -39039,7 +39039,7 @@ if test "$with_pdfium" != "no" -a "$with
+         PDFIUM_LIB="-L$with_pdfium/lib -lpdfium"
+     fi
+ 
+-    PDFIUM_LIB="$PDFIUM_LIB -lopenjp2 -ljpeg -lpng -lz -llcms2 -lpthread -lm -lstdc++"
++    PDFIUM_LIB="$PDFIUM_LIB -lopenjp2 -ljpeg -lpng16 -lz -llcms2 -lpthread -lm -lstdc++"
+ 
+     if test ! -z "`uname | grep Darwin`" ; then
+         PDFIUM_LIB="-stdlib=libstdc++ $PDFIUM_LIB"