1 files changed, 23 insertions, 17 deletions
diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build
index 69f07446f567..cb4803b883bd 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,25 +1,25 @@
 Use bind-tools option to ease the server/tools package split
 
---- meson.build.orig	2025-09-04 15:54:02 UTC
+--- meson.build.orig	2025-11-07 09:34:27 UTC
 +++ meson.build
-@@ -69,6 +69,8 @@ zlib_opt = get_option('zlib')
+@@ -72,6 +72,8 @@ zlib_opt = get_option('zlib').enable_auto_if(developer
  tracing_opt = get_option('tracing')
- zlib_opt = get_option('zlib')
+ zlib_opt = get_option('zlib').enable_auto_if(developer_mode)
  
 +bind_tools = get_option('bind-tools').enabled()
 +
- if meson.version().version_compare('>=1.1.0')
-     build_options = meson.build_options()
-     if build_options == ''
-@@ -1159,6 +1175,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
- 
- named_srcconf = named_srcset.apply(config, strict: false)
+ build_options = meson.build_options()
+ if build_options == ''
+     build_options = 'default'
+@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency(
+     include_directories: isccfg_inc,
+ )
  
 +if bind_tools
  executable(
      'arpaname',
      arpaname_src,
-@@ -1371,7 +1388,9 @@ executable(
+@@ -1427,7 +1430,9 @@ executable(
          libisc_dep,
      ],
  )
@@ -29,7 +29,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'named-checkconf',
      named_checkconf_src,
-@@ -1444,7 +1463,9 @@ endif
+@@ -1501,7 +1506,9 @@ endif
          ],
      )
  endif
@@ -39,17 +39,23 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'named-rrchecker',
      named_rrchecker_src,
-@@ -1457,7 +1478,9 @@ executable(
+@@ -1514,6 +1521,7 @@ executable(
      ],
  
  )
 +endif
  
+ named_deps = []
+ 
+@@ -1551,6 +1559,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
+ 
+ named_srcconf = named_srcset.apply(config, strict: false)
+ 
 +if not bind_tools
  executable(
      'named',
      named_srcconf.sources(),
-@@ -1487,7 +1510,9 @@ executable(
+@@ -1578,7 +1587,9 @@ executable(
          named_srcconf.dependencies(),
      ],
  )
@@ -59,7 +65,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'nsec3hash',
      nsec3hash_src,
-@@ -1532,7 +1557,9 @@ executable(
+@@ -1623,7 +1634,9 @@ executable(
          edit_dep,
      ],
  )
@@ -69,7 +75,7 @@ Use bind-tools option to ease the server/tools package split
  executable(
      'rndc-confgen',
      rndc_confgen_src,
-@@ -1613,6 +1640,7 @@ shared_library(
+@@ -1719,6 +1732,7 @@ shared_library(
          libns_dep,
      ],
  )
@@ -77,7 +83,7 @@ Use bind-tools option to ease the server/tools package split
  
  subdir('doc')
  subdir('tests')
-@@ -1680,7 +1708,6 @@ print(release_date, end="")
+@@ -1795,7 +1809,6 @@ print(release_date, end="")
  print(release_date, end="")
  '''
  
@@ -85,7 +91,7 @@ Use bind-tools option to ease the server/tools package split
      release_date = ''
      if python.found()
          release_date = run_command(python, ['-c', get_release_date], check: true).stdout()
-@@ -1701,6 +1728,7 @@ if doc_opt.allowed()
+@@ -1816,6 +1829,7 @@ if doc_opt.allowed()
  
      install_man(man_pages)