From b8b5e97f7a1b94890fddb2c45cd8f7fe4f2ba75d Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Mon, 14 Apr 2025 09:22:27 -0400
Subject: [PATCH] net/netatalk4: Update to 4.2.1

See https://github.com/Netatalk/netatalk/releases/tag/netatalk-4-2-1 for
a list of changes in this release.
---
 net/netatalk4/Makefile                       |  2 +-
 net/netatalk4/distinfo                       |  6 +++---
 net/netatalk4/files/patch-config_meson.build | 12 +++++++-----
 net/netatalk4/pkg-plist                      |  1 -
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/net/netatalk4/Makefile b/net/netatalk4/Makefile
index 866b5f560795..c7b9898e5061 100644
--- a/net/netatalk4/Makefile
+++ b/net/netatalk4/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	netatalk
-PORTVERSION=	4.2.0
+PORTVERSION=	4.2.1
 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 23c449260af1..812f58ee631d 100644
--- a/net/netatalk4/distinfo
+++ b/net/netatalk4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1743438055
-SHA256 (netatalk-4.2.0.tar.xz) = 768a91014e298dc1d14ef28ebe330ddad49928e3c34f307353b8bdd317f50a52
-SIZE (netatalk-4.2.0.tar.xz) = 934020
+TIMESTAMP = 1744636557
+SHA256 (netatalk-4.2.1.tar.xz) = 43a51064eef0d3d786e6359888bc000d1458b509bf709bae8cbd4526388f468b
+SIZE (netatalk-4.2.1.tar.xz) = 932772
diff --git a/net/netatalk4/files/patch-config_meson.build b/net/netatalk4/files/patch-config_meson.build
index d10c4aae7ff5..63840c721ac7 100644
--- a/net/netatalk4/files/patch-config_meson.build
+++ b/net/netatalk4/files/patch-config_meson.build
@@ -1,6 +1,6 @@
---- config/meson.build.orig	2025-03-31 05:27:01 UTC
+--- config/meson.build.orig	2025-04-13 22:12:29 UTC
 +++ config/meson.build
-@@ -4,77 +4,23 @@ afp_conf = configure_file(
+@@ -4,79 +4,23 @@ afp_conf = configure_file(
      configuration: cdata,
  )
  
@@ -53,13 +53,15 @@
 -
 -cups_libdir = ''
 -
--if host_os in ['netbsd']
+-if get_option('with-cups-libdir-path') != ''
+-    cups_libdir = get_option('with-cups-libdir-path')
+-elif host_os in ['netbsd']
 -    cups_libdir = '/usr/pkg/libexec'
--elif host_os in ['linux']
+-else
 -    cups_libdir = '/usr/lib'
 -endif
 -
--if have_appletalk and have_cups and cups_libdir != ''
+-if have_appletalk and have_cups and get_option('with-cups-pap-backend')
 -    configure_file(
 -        input: 'pap.in',
 -        output: 'pap',
diff --git a/net/netatalk4/pkg-plist b/net/netatalk4/pkg-plist
index 4bcafaaaeb28..cb431efc3325 100644
--- a/net/netatalk4/pkg-plist
+++ b/net/netatalk4/pkg-plist
@@ -42,7 +42,6 @@ include/atalk/atp.h
 include/atalk/bstrlib.h
 include/atalk/cnid.h
 include/atalk/ddp.h
-include/atalk/dictionary.h
 include/atalk/ea.h
 include/atalk/globals.h
 include/atalk/hash.h