Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main

1 files changed, 0 insertions, 46 deletions

diff --git a/net/netatalk3/files/patch-config_meson.build b/net/netatalk3/files/patch-config_meson.build
deleted file mode 100644
index 16883e06495e..000000000000
--- a/net/netatalk3/files/patch-config_meson.build
+++ /dev/null
@@ -1,46 +0,0 @@
---- config/meson.build.orig	2024-09-24 08:58:45 UTC
-+++ config/meson.build
-@@ -7,39 +7,17 @@ custom_target(
- custom_target(
-     'dbus_session',
-     input: 'dbus-session.conf.tmpl',
--    output: 'dbus-session.conf',
-+    output: 'dbus-session.conf.netatalk',
-     command: sed_command,
-     capture: true,
-     install: true,
-     install_dir: pkgconfdir,
- )
- 
--if (
--    fs.exists(pkgconfdir / 'afp.conf')
--    and not get_option('with-overwrite')
--)
--    message('will not replace existing', pkgconfdir / 'afp.conf')
--else
--    install_data(afp_conf, install_dir: pkgconfdir)
--endif
-+install_data(afp_conf, rename: 'afp.conf.sample', install_dir: pkgconfdir)
-+install_data('extmap.conf', rename: 'extmap.conf.sample', install_dir: pkgconfdir)
- 
--if (
--    fs.exists(pkgconfdir / 'extmap.conf')
--    and not get_option('with-overwrite')
--)
--    message('will not replace existing', pkgconfdir / 'extmap.conf')
--else
--    install_data('extmap.conf', install_dir: pkgconfdir)
--endif
--
--if (
--    fs.exists(dbus_sysconfpath / 'netatalk-dbus.conf')
--    and not get_option('with-overwrite')
--)
--    message('will not replace existing', dbus_sysconfpath / 'netatalk-dbus.conf')
--else
--    install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath)
--endif
-+install_data('netatalk-dbus.conf', install_dir: dbus_sysconfpath)
- 
- if (
-     fs.exists('/etc/ld.so.conf.d')