 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.5 2022/07/29 01:24:24 dbj Exp $
+# $NetBSD: Makefile,v 1.6 2022/07/29 13:14:59 wiz Exp $
 DISTNAME=	wxWidgets-3.2.0
 PKGNAME=	${DISTNAME:S/wxWidgets/wxGTK32/}
 PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=wxWidgets/}
 GITHUB_PROJECT=	wxWidgets
 GITHUB_RELEASE=	v${PKGVERSION_NOREV}
 EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	dbj@NetBSD.org
 HOMEPAGE=	https://www.wxwidgets.org/
 COMMENT=	Cross-platform wxWidgets GUI library (3.2 stable branch)
 @@ -39,39 +39,39 @@ REPLACE_SH=		wx-config.in wx-config-inpl
 # We should fix cmake builds to match configure builds
 # and remove support for building with GNU_CONFIGURE
 PKG_OPTIONS_VAR=	PKG_OPTIONS.wxGTK32
 PKG_SUPPORTED_OPTIONS=	cmake
 .include "../../mk/bsd.options.mk"
 .if !empty(PKG_OPTIONS:Mcmake)
 USE_CMAKE=		yes
 PLIST_SRC+=		PLIST.cmake
 CMAKE_ARGS+=		-DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
 CMAKE_ARGS+=		-DCMAKE_INSTALL_BINDIR:PATH=libexec/wx-3.2
-. if ${OPSYS} != "Linux"
+.  if ${OPSYS} != "Linux"
 # https://github.com/wxWidgets/wxWidgets/issues/22646
 CMAKE_ARGS+=		-DwxUSE_JOYSTICK:BOOL=OFF
-. endif
+.  endif
 SUBST_CLASSES+=		unwrap
 SUBST_STAGE.unwrap=	post-build
 SUBST_MESSAGE.unwrap=	Unwrapping wx-config.
-. if ${OPSYS} != "Darwin"
+.  if ${OPSYS} != "Darwin"
 SUBST_FILES.unwrap=	lib/wx/config/gtk3-unicode-3.2
-. else
+.  else
 SUBST_FILES.unwrap=	lib/wx/config/osx_cocoa-unicode-3.2
-. endif
+.  endif
 SUBST_SED.unwrap=	-e 's,EGREP=.*,EGREP=${EGREP},'
 SUBST_SED.unwrap+=	-e 's,echo.*/${CC}",echo "${CC}",'
 SUBST_SED.unwrap+=	-e 's,echo.*/${CXX}",echo "${CXX}",'
 SUBST_SED.unwrap+=	-e 's,echo.*/${CXX} -o",echo "${CXX} -o",'
 .else # empty(PKG_OPTIONS:Mcmake)
 GNU_CONFIGURE=		yes
 PLIST_SRC+=		PLIST.configure
 USE_GNU_CONFIGURE_HOST=	no
 CONFIGURE_ARGS+=	--with-libpng=sys
 CONFIGURE_ARGS+=	--with-libjpeg=sys

 @@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.3 2022/07/28 05:25:22 dbj Exp $
+$NetBSD: distinfo,v 1.4 2022/07/29 13:14:59 wiz Exp $
 BLAKE2s (wxWidgets-3.2.0.tar.bz2) = 4029147a8e77a22e0379eeda11bc26f8fee998862aaa52819adf16a8ed4860ea
 SHA512 (wxWidgets-3.2.0.tar.bz2) = e55e7c5ac7abcacf2ecff7c22e367db17ff5a077d3d5d2aa7589e8ba7cc6695cfa48c0f00bcfdffeda8dc4f974f97a857fb61b4b300a724f7687d710fbb23967
 Size (wxWidgets-3.2.0.tar.bz2) = 25296814 bytes
 SHA1 (patch-build_cmake_config.cmake) = 3f2a53683e212d0fe9be966b7dd887b2240c57eb
 SHA1 (patch-build_cmake_init.cmake) = 5b203660ee4c1376b2d8083be73fdcd0c1d09833
 SHA1 (patch-build_cmake_install.cmake) = 4afe2ec2c6c6e28b941dad3974771da7ed1b41be
 SHA1 (patch-build_cmake_lib_base_CMakeLists.txt) = bec7be2f64bb4629a60d2b4f169e8feb215408e3
 SHA1 (patch-build_cmake_setup.cmake) = 277ae3c5bf4f04d057402f0b626d09d1e9749ca8
 SHA1 (patch-build_cmake_utils_CMakeLists.txt) = ccd342e1b565c942fb61730a91713323fd3d8cb2
-SHA1 (patch-configure) = fd7330fd1d83d42f7b95af61130e4db131de90b6
+SHA1 (patch-configure) = 679580bee6373fd63968f0ee75934cdfc42bd3b8
-SHA1 (patch-configure.in) = ad62f55a628e52de89b43001fc37a179fb50e7b3
+SHA1 (patch-configure.in) = 850221d02799cd875fe917f7e9c2994d0f89db29
 SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7
 SHA1 (patch-src_unix_utilsunx.cpp) = be61cc3931e8aa8cf790cfedf6f916a84970f074

 @@ -1,19 +1,45 @@
-$NetBSD: patch-configure,v 1.1 2022/07/26 02:58:56 dbj Exp $
+$NetBSD: patch-configure,v 1.2 2022/07/29 13:14:59 wiz Exp $
 Fixup invocation of install_name_tool on wxrc
 --- configure.orig	2022-07-06 14:19:50.000000000 +0000
 +++ configure
@@ -26288,13 +26288,13 @@ fi
          if test "$ac_cv_header_png_h" = "yes"; then
 -            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5
 -$as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng16" >&5
 +$as_echo_n "checking for png_sig_cmp in -lpng16... " >&6; }
  if ${ac_cv_lib_png_png_sig_cmp+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpng -lz -lm $LIBS"
 +LIBS="-lpng16 -lz -lm $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -26325,7 +26325,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5
  $as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
  if test "x$ac_cv_lib_png_png_sig_cmp" = xyes; then :
 -  PNG_LINK=" -lpng -lz"
 +  PNG_LINK=" -lpng16 -lz"
  fi
          fi
 @@ -27356,7 +27356,7 @@ $as_echo "$as_me: WARNING: XML library n
      USE_XML=0
  else
      USE_XML=1
 -    echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
 +    echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" > change-install-names.wxrc
  fi
 @@ -33939,6 +33939,7 @@ for i in \${libnames} ; do
      ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
  done
  EOF

 @@ -1,19 +1,29 @@
-$NetBSD: patch-configure.in,v 1.1 2022/07/26 02:58:56 dbj Exp $
+$NetBSD: patch-configure.in,v 1.2 2022/07/29 13:14:59 wiz Exp $
 Fix png library name.
 Fixup invocation of install_name_tool on wxrc
 --- configure.in.orig	2022-07-06 14:19:50.000000000 +0000
 +++ configure.in
@@ -2617,7 +2617,7 @@ if test "$wxUSE_LIBPNG" != "no" ; then
          AC_CHECK_HEADER(png.h,,, [ ])
          if test "$ac_cv_header_png_h" = "yes"; then
 -            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng -lz", , [-lz -lm])
 +            AC_CHECK_LIB(png, png_sig_cmp, PNG_LINK=" -lpng16 -lz", , [-lz -lm])
          fi
          if test "x$PNG_LINK" = "x" ; then
 @@ -2975,7 +2975,7 @@ if test "$wxUSE_XML" != "yes"; then
      USE_XML=0
  else
      USE_XML=1
 -    echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" >> change-install-names
 +    echo "${HOST_PREFIX}install_name_tool \${changes} \${2}/wxrc-${WX_RELEASE}" > change-install-names.wxrc
  fi
 @@ -4047,6 +4047,7 @@ for i in \${libnames} ; do
      ${HOST_PREFIX}install_name_tool \${changes} -id \${3}/\${i} \${1}/\${i}
  done
  EOF