git: 5465a2abd290 - main - net/netatalk4: Update to 4.6.0

From: Joe Marcus Clarke <marcus_at_FreeBSD.org>
Date: Sat, 19 Sep 2026 15:21:55 UTC
The branch main has been updated by marcus:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5465a2abd29033afe8b5dcd46841fedc77f30c33

commit 5465a2abd29033afe8b5dcd46841fedc77f30c33
Author:     Joe Marcus Clarke <marcus@FreeBSD.org>
AuthorDate: 2026-09-19 15:20:47 +0000
Commit:     Joe Marcus Clarke <marcus@FreeBSD.org>
CommitDate: 2026-09-19 15:20:47 +0000

    net/netatalk4: Update to 4.6.0
    
    See https://github.com/Netatalk/netatalk/releases/tag/netatalk-4-6-0 for
    a list of changes in this release.
---
 net/netatalk4/Makefile                           |  3 +--
 net/netatalk4/distinfo                           |  6 +++---
 net/netatalk4/files/patch-config_meson.build     | 19 ++++++++---------
 net/netatalk4/files/patch-config_pam_meson.build |  4 ++--
 net/netatalk4/files/patch-meson.build            | 26 ++++++++----------------
 net/netatalk4/pkg-plist                          |  7 +++++--
 6 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/net/netatalk4/Makefile b/net/netatalk4/Makefile
index d113e6b3af43..4aad62fd8f49 100644
--- a/net/netatalk4/Makefile
+++ b/net/netatalk4/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	netatalk
-PORTVERSION=	4.5.2
-PORTREVISION=	1
+PORTVERSION=	4.6.0
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/
 PKGNAMESUFFIX=	4
diff --git a/net/netatalk4/distinfo b/net/netatalk4/distinfo
index ab30a82d3dbc..475338d407c0 100644
--- a/net/netatalk4/distinfo
+++ b/net/netatalk4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1789236823
-SHA256 (netatalk-4.5.2.tar.xz) = 2cdfd5420e8e91c85c82dda66a92dcdd5974eef076feb169b279c600133f38b2
-SIZE (netatalk-4.5.2.tar.xz) = 1307800
+TIMESTAMP = 1789828896
+SHA256 (netatalk-4.6.0.tar.xz) = 5d5756c55935df84098cfb5a2c3a90b8864a46d3c1671aa164481bced0724add
+SIZE (netatalk-4.6.0.tar.xz) = 1558368
diff --git a/net/netatalk4/files/patch-config_meson.build b/net/netatalk4/files/patch-config_meson.build
index 7476947d04ea..eae42bed99f0 100644
--- a/net/netatalk4/files/patch-config_meson.build
+++ b/net/netatalk4/files/patch-config_meson.build
@@ -1,10 +1,10 @@
---- config/meson.build.orig	2026-05-30 12:42:34 UTC
+--- config/meson.build.orig	2026-09-15 04:49:45 UTC
 +++ config/meson.build
-@@ -4,65 +4,21 @@ afp_conf = configure_file(
+@@ -4,62 +4,21 @@ afp_conf = configure_file(
      configuration: cdata,
  )
  
--if (fs.exists(pkgconfdir / 'afp.conf') and not get_option('with-overwrite'))
+-if fs.exists(pkgconfdir / 'afp.conf') and not overwrite_config
 -    message('will not replace existing', pkgconfdir / 'afp.conf')
 -else
 -    install_data(afp_conf, install_dir: pkgconfdir, install_tag: 'config')
@@ -21,10 +21,7 @@
          configuration: cdata,
      )
  
--    if (
--        fs.exists(pkgconfdir / 'dbus-session.conf')
--        and not get_option('with-overwrite')
--    )
+-    if (fs.exists(pkgconfdir / 'dbus-session.conf') and not overwrite_config)
 -        message('will not replace existing', pkgconfdir / 'dbus-session.conf')
 -    else
 -        install_data(dbus_session_conf, install_dir: pkgconfdir, install_tag: 'config')
@@ -34,7 +31,7 @@
  
 -static_conf_files = ['extmap.conf']
 -
--if have_appletalk
+-if enable_appletalk
 -    static_conf_files += ['atalkd.conf', 'macipgw.conf', 'papd.conf']
 -endif
 -
@@ -48,7 +45,7 @@
 -    cups_libdir = '/usr/lib'
 -endif
 -
--if have_appletalk and have_cups and get_option('with-cups-pap-backend')
+-if enable_appletalk and have_cups and install_cups_pap_backend
 -    configure_file(
 -        input: 'pap.in',
 -        output: 'pap',
@@ -60,7 +57,7 @@
 -endif
 -
 -foreach file : static_conf_files
--    if (fs.exists(pkgconfdir / file) and not get_option('with-overwrite'))
+-    if fs.exists(pkgconfdir / file) and not overwrite_config
 -        message('will not replace existing', pkgconfdir / file)
 -    else
 -        install_data(file, install_dir: pkgconfdir, install_tag: 'config')
@@ -68,5 +65,5 @@
 -endforeach
 +install_data('extmap.conf', rename: 'extmap.conf.sample', install_dir: pkgconfdir)
  
- if (fs.exists('/etc/ld.so.conf.d') and get_option('with-ldsoconf'))
+ if fs.exists('/etc/ld.so.conf.d') and enable_ldsoconf
      configure_file(
diff --git a/net/netatalk4/files/patch-config_pam_meson.build b/net/netatalk4/files/patch-config_pam_meson.build
index dfa44713a9f1..46eddaa95f66 100644
--- a/net/netatalk4/files/patch-config_pam_meson.build
+++ b/net/netatalk4/files/patch-config_pam_meson.build
@@ -1,10 +1,10 @@
---- config/pam/meson.build.orig	2026-09-12 18:19:45 UTC
+--- config/pam/meson.build.orig	2026-09-19 15:04:37 UTC
 +++ config/pam/meson.build
 @@ -4,8 +4,3 @@ netatalk_pamd = configure_file(
      configuration: cdata,
  )
  
--if (fs.exists(pam_confdir / 'netatalk') and not get_option('with-overwrite'))
+-if fs.exists(pam_confdir / 'netatalk') and not overwrite_config
 -    message('will not replace existing', pam_confdir / 'netatalk')
 -else
 -    install_data(netatalk_pamd, install_dir: pam_confdir, install_tag: 'config')
diff --git a/net/netatalk4/files/patch-meson.build b/net/netatalk4/files/patch-meson.build
index d41c468fa281..b3064160143b 100644
--- a/net/netatalk4/files/patch-meson.build
+++ b/net/netatalk4/files/patch-meson.build
@@ -1,14 +1,6 @@
---- meson.build.orig	2026-05-30 12:42:34 UTC
+--- meson.build.orig	2026-09-19 15:10:20 UTC
 +++ meson.build
-@@ -57,6 +57,7 @@ libdir = prefix / get_option('libdir')
- datadir = prefix / get_option('datadir')
- includedir = prefix / get_option('includedir')
- libdir = prefix / get_option('libdir')
-+libexecdir = prefix / get_option('libexecdir')
- mandir = prefix / get_option('mandir')
- sbindir = prefix / get_option('sbindir')
- sysconfdir = prefix / get_option('sysconfdir')
-@@ -306,7 +307,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne
+@@ -366,7 +366,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne
  messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"'
  naddir = '-D_PATH_NAD="' + bindir + '/nad"'
  statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"'
@@ -17,15 +9,15 @@
  
  ############
  # Includes #
-@@ -629,6 +630,7 @@ if 'dbd' in get_option('with-cnid-backends')
+@@ -699,6 +699,7 @@ if enable_dbd_backend
      endif
  
      bdb_subdirs = [
-+        'db18',
++        '%%DB_NAME%%',
          'db62',
          'db6.2',
          'db61',
-@@ -1203,12 +1205,12 @@ dns_sd_libs = []
+@@ -1274,12 +1275,12 @@ dns_sd_libs = []
  
  dns_sd_libs = []
  
@@ -40,7 +32,7 @@
  if dns_sd.found()
      dns_sd_libs += system
  endif
-@@ -1222,6 +1224,8 @@ have_dns = (
+@@ -1293,6 +1294,8 @@ have_dns = (
      )
  )
  
@@ -49,7 +41,7 @@
  if enable_zeroconf
      if host_os == 'darwin'
          # On Darwin/macOS, prefer mDNS over Avahi
-@@ -1231,6 +1235,7 @@ if enable_zeroconf
+@@ -1302,6 +1305,7 @@ if enable_zeroconf
              cdata.set('HAVE_MDNS', 1)
              cdata.set('freebsd_zeroconf', 'mdnsd')
              zeroconf_provider += 'mDNS'
@@ -57,7 +49,7 @@
          elif avahi.found()
              have_zeroconf = true
              cdata.set('USE_ZEROCONF', 1)
-@@ -1252,6 +1257,7 @@ if enable_zeroconf
+@@ -1323,6 +1327,7 @@ if enable_zeroconf
              cdata.set('HAVE_MDNS', 1)
              cdata.set('freebsd_zeroconf', 'mdnsd')
              zeroconf_provider += 'mDNS'
@@ -65,7 +57,7 @@
          endif
      endif
  endif
-@@ -1929,6 +1935,7 @@ if not enable_pam
+@@ -1990,6 +1995,7 @@ if not enable_pam
  
  if not enable_pam
      have_pam = false
diff --git a/net/netatalk4/pkg-plist b/net/netatalk4/pkg-plist
index 36e5d36d3b1d..3ab6d96c91c3 100644
--- a/net/netatalk4/pkg-plist
+++ b/net/netatalk4/pkg-plist
@@ -10,6 +10,7 @@ bin/nad
 %%SPOTLIGHT%%etc/dbus-session.conf.netatalk
 @sample etc/extmap.conf.sample
 %%PAM%%@sample etc/pam.d/netatalk.sample
+libexec/netatalk/fce_ev_script
 libexec/netatalk-uams/uams_clrtxt.so
 libexec/netatalk-uams/uams_dhx.so
 libexec/netatalk-uams/uams_dhx2.so
@@ -55,6 +56,7 @@ include/atalk/netddp.h
 include/atalk/pap.h
 include/atalk/queue.h
 include/atalk/rtmp.h
+include/atalk/srp.h
 include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/unix.h
@@ -64,8 +66,8 @@ include/atalk/volume.h
 include/atalk/zip.h
 lib/libatalk.a
 lib/libatalk.so
-lib/libatalk.so.21
-lib/libatalk.so.21.0.0
+lib/libatalk.so.22
+lib/libatalk.so.22.0.0
 sbin/afpd
 sbin/cnid_dbd
 sbin/cnid_metad
@@ -85,6 +87,7 @@ share/man/man5/extmap.conf.5.gz
 share/man/man8/afpd.8.gz
 share/man/man8/cnid_dbd.8.gz
 share/man/man8/cnid_metad.8.gz
+share/man/man8/fce_ev_script.8.gz
 share/man/man8/netatalk.8.gz
 /var/netatalk/CNID/README
 @dir /var/netatalk/CNID