1 files changed, 49 insertions, 73 deletions

diff --git a/dns/bind9-devel/files/patch-meson.build b/dns/bind9-devel/files/patch-meson.build
index ff19913b1a32..cb4803b883bd 100644
--- a/dns/bind9-devel/files/patch-meson.build
+++ b/dns/bind9-devel/files/patch-meson.build
@@ -1,75 +1,25 @@
---- meson.build.orig	2025-07-04 09:34:56 UTC
+Use bind-tools option to ease the server/tools package split
+
+--- 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 == ''
-@@ -956,9 +958,15 @@ isc_srcconf = isc_srcset.apply(config, strict: false)
- 
- isc_srcconf = isc_srcset.apply(config, strict: false)
- 
-+project_version = meson.project_version()
-+soversion_parts = project_version.split('.')  # ['1', '2', '3']
-+soversion = '@0@.@1@'.format(soversion_parts[0], soversion_parts[1])
-+
- libisc = library(
-     'isc',
-     isc_srcconf.sources(),
-+    version: project_version,
-+    soversion: soversion,
-     objects: isc_probe_objects,
-     install: true,
-     install_rpath: libdir,
-@@ -986,6 +994,8 @@ libdns = library(
- libdns = library(
-     'dns',
-     dns_srcconf.sources(),
-+    version: project_version,
-+    soversion: soversion,
-     include_directories: dns_inc,
-     install: true,
-     install_rpath: libdir,
-@@ -1020,6 +1030,8 @@ libns = library(
- libns = library(
-     'ns',
-     ns_srcconf.sources(),
-+    version: project_version,
-+    soversion: soversion,
-     objects: ns_probe_objects,
-     install: true,
-     install_rpath: libdir,
-@@ -1046,6 +1058,8 @@ libisccc = library(
- libisccc = library(
-     'isccc',
-     isccc_srcconf.sources(),
-+    version: project_version,
-+    soversion: soversion,
-     implicit_include_directories: false,
-     include_directories: isccc_inc,
-     install: true,
-@@ -1067,6 +1081,8 @@ libisccfg = library(
- libisccfg = library(
-     'isccfg',
-     isccfg_srcconf.sources(),
-+    version: project_version,
-+    soversion: soversion,
-     implicit_include_directories: false,
+ build_options = meson.build_options()
+ if build_options == ''
+     build_options = 'default'
+@@ -1215,6 +1217,7 @@ libisccfg_dep = declare_dependency(
      include_directories: isccfg_inc,
-     install: true,
-@@ -1087,6 +1103,7 @@ named_srcconf = named_srcset.apply(config, strict: fal
- 
- named_srcconf = named_srcset.apply(config, strict: false)
+ )
  
 +if bind_tools
  executable(
      'arpaname',
      arpaname_src,
-@@ -1315,7 +1332,9 @@ executable(
+@@ -1427,7 +1430,9 @@ executable(
          libisc_dep,
      ],
  )
@@ -79,7 +29,33 @@
  executable(
      'named-checkconf',
      named_checkconf_src,
-@@ -1438,7 +1457,9 @@ executable(
+@@ -1501,7 +1506,9 @@ endif
+         ],
+     )
+ endif
++endif
+ 
++if bind_tools
+ executable(
+     'named-rrchecker',
+     named_rrchecker_src,
+@@ -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(),
+@@ -1578,7 +1587,9 @@ executable(
          named_srcconf.dependencies(),
      ],
  )
@@ -89,7 +65,7 @@
  executable(
      'nsec3hash',
      nsec3hash_src,
-@@ -1486,7 +1507,9 @@ executable(
+@@ -1623,7 +1634,9 @@ executable(
          edit_dep,
      ],
  )
@@ -99,7 +75,7 @@
  executable(
      'rndc-confgen',
      rndc_confgen_src,
-@@ -1572,6 +1595,7 @@ shared_library(
+@@ -1719,6 +1732,7 @@ shared_library(
          libns_dep,
      ],
  )
@@ -107,19 +83,19 @@
  
  subdir('doc')
  subdir('tests')
-@@ -1632,7 +1656,6 @@ alias_target('doc-misc', doc_misc_targets)
- 
- alias_target('doc-misc', doc_misc_targets)
+@@ -1795,7 +1809,6 @@ print(release_date, end="")
+ print(release_date, end="")
+ '''
  
 -if doc_opt.allowed()
-     man_srcconf = man_srcset.apply(config, strict: false)
-     foreach man : man_srcconf.sources()
-         man_pages += configure_file(
-@@ -1647,6 +1670,7 @@ if doc_opt.allowed()
+     release_date = ''
+     if python.found()
+         release_date = run_command(python, ['-c', get_release_date], check: true).stdout()
+@@ -1816,6 +1829,7 @@ if doc_opt.allowed()
  
      install_man(man_pages)
  
 +if doc_opt.allowed()
      if sphinx_build.found()
-         meson.add_dist_script(
-             'util' / 'meson-dist-package.sh',
+         alias_target('doc-misc', doc_misc_targets)
+