[pkgsrc/trunk]: pkgsrc/x11/wxGTK32 x11/wxGTK: have cmake include(GNUInstallDi...

[dbj <dbj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76ff0972f5a1
branches:  trunk
changeset: 382978:76ff0972f5a1
user:      dbj <dbj%pkgsrc.org@localhost>
date:      Wed Aug 10 05:19:57 2022 +0000

description:
x11/wxGTK: have cmake include(GNUInstallDirs) when using ${CMAKE_INSTALL_BINDIR}

diffstat:

 x11/wxGTK32/Makefile                                       |   6 +-----
 x11/wxGTK32/distinfo                                       |   8 ++++----
 x11/wxGTK32/patches/patch-build_cmake_config.cmake         |  10 ++++++++--
 x11/wxGTK32/patches/patch-build_cmake_install.cmake        |  10 ++++++----
 x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt |   9 ++++++---
 5 files changed, 25 insertions(+), 18 deletions(-)

diffs (124 lines):

diff -r 151122a7e634 -r 76ff0972f5a1 x11/wxGTK32/Makefile
--- a/x11/wxGTK32/Makefile      Wed Aug 10 01:25:37 2022 +0000
+++ b/x11/wxGTK32/Makefile      Wed Aug 10 05:19:57 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2022/08/08 10:39:46 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2022/08/10 05:19:57 dbj Exp $
 
 DISTNAME=      wxWidgets-3.2.0
 PKGNAME=       ${DISTNAME:S/wxWidgets/wxGTK32/}
@@ -49,10 +49,6 @@
 PLIST_SRC+=            PLIST.cmake
 
 CMAKE_ARGS+=           -DCMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON
-# Note that this CMAKE_INSTALL_BINDIR override is probably
-# not the correct way to do this.  In particular if you remove
-# this option, it doesn't fall back to "bin" as I expected.
-# I will hopefully figure out a better fix for this -- dbj@
 CMAKE_ARGS+=           -DCMAKE_INSTALL_BINDIR:PATH=libexec/wx-3.2
 .  if ${OPSYS} != "Linux"
 # https://github.com/wxWidgets/wxWidgets/issues/22646
diff -r 151122a7e634 -r 76ff0972f5a1 x11/wxGTK32/distinfo
--- a/x11/wxGTK32/distinfo      Wed Aug 10 01:25:37 2022 +0000
+++ b/x11/wxGTK32/distinfo      Wed Aug 10 05:19:57 2022 +0000
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.5 2022/07/29 18:36:06 wiz Exp $
+$NetBSD: distinfo,v 1.6 2022/08/10 05:19:57 dbj 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_config.cmake) = 5d5b37a7a0811ac7732db5cc071813784ee3d3d6
 SHA1 (patch-build_cmake_init.cmake) = 341f632aa7062af4c5bc4ca2695f59d2b7254ede
-SHA1 (patch-build_cmake_install.cmake) = 4afe2ec2c6c6e28b941dad3974771da7ed1b41be
+SHA1 (patch-build_cmake_install.cmake) = 4b228cbab621ef98d93ccd2c338b7e0e9d53a9ad
 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-build_cmake_utils_CMakeLists.txt) = 44efa30750b2a6048c0c32bf16d4825c4cb9d790
 SHA1 (patch-configure) = 679580bee6373fd63968f0ee75934cdfc42bd3b8
 SHA1 (patch-configure.in) = 850221d02799cd875fe917f7e9c2994d0f89db29
 SHA1 (patch-src_unix_dialup.cpp) = 1c62d37508e45a0095ef062f7d450529e9b557e7
diff -r 151122a7e634 -r 76ff0972f5a1 x11/wxGTK32/patches/patch-build_cmake_config.cmake
--- a/x11/wxGTK32/patches/patch-build_cmake_config.cmake        Wed Aug 10 01:25:37 2022 +0000
+++ b/x11/wxGTK32/patches/patch-build_cmake_config.cmake        Wed Aug 10 05:19:57 2022 +0000
@@ -1,10 +1,16 @@
-$NetBSD: patch-build_cmake_config.cmake,v 1.1 2022/07/28 05:25:22 dbj Exp $
+$NetBSD: patch-build_cmake_config.cmake,v 1.2 2022/08/10 05:19:57 dbj Exp $
 
 Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
 
 --- build/cmake/config.cmake.orig      2022-07-06 14:19:50.000000000 +0000
 +++ build/cmake/config.cmake
-@@ -87,7 +87,7 @@ function(wx_write_config)
+@@ -83,11 +83,13 @@ endfunction()
+ 
+ function(wx_write_config)
+ 
++    include(GNUInstallDirs)
++
+     set(prefix ${CMAKE_INSTALL_PREFIX})
      set(exec_prefix "\${prefix}")
      set(includedir "\${prefix}/include")
      set(libdir "\${exec_prefix}/lib")
diff -r 151122a7e634 -r 76ff0972f5a1 x11/wxGTK32/patches/patch-build_cmake_install.cmake
--- a/x11/wxGTK32/patches/patch-build_cmake_install.cmake       Wed Aug 10 01:25:37 2022 +0000
+++ b/x11/wxGTK32/patches/patch-build_cmake_install.cmake       Wed Aug 10 05:19:57 2022 +0000
@@ -1,17 +1,19 @@
-$NetBSD: patch-build_cmake_install.cmake,v 1.1 2022/07/28 05:25:22 dbj Exp $
+$NetBSD: patch-build_cmake_install.cmake,v 1.2 2022/08/10 05:19:57 dbj Exp $
 
 Fix use of DESTDIR
 https://github.com/wxWidgets/wxWidgets/issues/22610
 
 Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
 
---- build/cmake/install.cmake.orig     2022-07-28 04:31:27.000000000 +0000
+--- build/cmake/install.cmake.orig     2022-07-06 14:19:50.000000000 +0000
 +++ build/cmake/install.cmake
-@@ -39,11 +39,11 @@ else()
+@@ -39,11 +39,13 @@ else()
                      WORLD_EXECUTE WORLD_READ
          )
  
 -    install(DIRECTORY DESTINATION "bin")
++    include(GNUInstallDirs)
++
 +    install(DIRECTORY DESTINATION "${CMAKE_INSTALL_BINDIR}")
      install(CODE "execute_process( \
          COMMAND ${CMAKE_COMMAND} -E create_symlink \
@@ -21,7 +23,7 @@
          )"
      )
  endif()
-@@ -96,8 +96,8 @@ if(NOT TARGET ${UNINST_NAME})
+@@ -96,8 +98,8 @@ if(NOT TARGET ${UNINST_NAME})
          endif()
  
          set(WX_EXTRA_UNINSTALL_FILES
diff -r 151122a7e634 -r 76ff0972f5a1 x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt
--- a/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt        Wed Aug 10 01:25:37 2022 +0000
+++ b/x11/wxGTK32/patches/patch-build_cmake_utils_CMakeLists.txt        Wed Aug 10 05:19:57 2022 +0000
@@ -1,15 +1,18 @@
-$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.1 2022/07/28 05:25:22 dbj Exp $
+$NetBSD: patch-build_cmake_utils_CMakeLists.txt,v 1.2 2022/08/10 05:19:57 dbj Exp $
 
 Fix use of DESTDIR
 https://github.com/wxWidgets/wxWidgets/issues/22610
 
 Respect ${CMAKE_INSTALL_BINDIR} instead of assuming bin
 
---- build/cmake/utils/CMakeLists.txt.orig      2022-07-28 04:31:27.000000000 +0000
+--- build/cmake/utils/CMakeLists.txt.orig      2022-07-06 14:19:50.000000000 +0000
 +++ build/cmake/utils/CMakeLists.txt
-@@ -26,21 +26,22 @@ if(wxUSE_XRC)
+@@ -25,22 +25,25 @@ if(wxUSE_XRC)
+ 
      set_target_properties(wxrc PROPERTIES FOLDER "Utilities")
  
++    include(GNUInstallDirs)
++
      wx_install(TARGETS wxrc
 -        RUNTIME DESTINATION "bin"
 -        BUNDLE DESTINATION "bin"