CVS commit: pkgsrc/net/netatalk4

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Wed Jun 11 11:24:19 UTC 2025

Modified Files:
        pkgsrc/net/netatalk4: Makefile distinfo
        pkgsrc/net/netatalk4/patches: patch-meson.build

Log Message:
net/netatalk4 update to v4.2.4

Upstream's changelog:

docs: Improve afpd and macipgw man pages by @rdmark in #2155
[4.2] meson: Check for brew include dir before adding it to list
      by @rdmark in #2190
[4.2] uams: Check for const pam_message member of pam_conv by @rdmark in #2196
[4.2] meson: Build and link with Homebrew libraries is now opt-in
      by @rdmark in #2194


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/netatalk4/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/netatalk4/patches/patch-meson.build

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/netatalk4/Makefile
diff -u pkgsrc/net/netatalk4/Makefile:1.19 pkgsrc/net/netatalk4/Makefile:1.20
--- pkgsrc/net/netatalk4/Makefile:1.19  Fri May  9 18:18:21 2025
+++ pkgsrc/net/netatalk4/Makefile       Wed Jun 11 11:24:19 2025
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.19 2025/05/09 18:18:21 hauke Exp $
+# $NetBSD: Makefile,v 1.20 2025/06/11 11:24:19 hauke Exp $
 
 GITHUB_PROJECT=        netatalk
 GITHUB_TAG=    refs/tags/${DISTNAME}
 DISTNAME=      netatalk-${PKGVER:C/\./-/g}
 
 PKGNAME=       ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
-PKGVER=                4.2.3
+PKGVER=                4.2.4
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}
 

Index: pkgsrc/net/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.9 pkgsrc/net/netatalk4/distinfo:1.10
--- pkgsrc/net/netatalk4/distinfo:1.9   Fri May  9 18:16:21 2025
+++ pkgsrc/net/netatalk4/distinfo       Wed Jun 11 11:24:19 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2025/05/09 18:16:21 hauke Exp $
+$NetBSD: distinfo,v 1.10 2025/06/11 11:24:19 hauke Exp $
 
-BLAKE2s (netatalk-4-2-3.tar.gz) = 1ccf13b028d776ea67b4ca3fa6469f8454259fdda0571cfc9493565710c295dd
-SHA512 (netatalk-4-2-3.tar.gz) = c9e96367a56ef4084e525d436f22b7540c9ded0f6787b032144576956d555978a311a12ebae45130ca7928bd2027dfbd8952a479fbfc432f5b3b0f9c680b17bf
-Size (netatalk-4-2-3.tar.gz) = 1389606 bytes
+BLAKE2s (netatalk-4-2-4.tar.gz) = 8997001bcbca80561f2168ef141fc2df8f0d14997c2631232000d8c30b8614ab
+SHA512 (netatalk-4-2-4.tar.gz) = d3828ac95562f71601a588a22583abf28968b5608a83643d3aaef931108fa13da5c3f5f7aef02c30d690dd288966fd636700924247939616cb323746c4076e25
+Size (netatalk-4-2-4.tar.gz) = 1390425 bytes
 SHA1 (patch-config_meson.build) = 2bae343245bcd33869ccb2f47f802fb8e2290050
 SHA1 (patch-config_pam_meson.build) = f321c7bd246f1d82c287e745ea75c9561bc528a9
-SHA1 (patch-meson.build) = 39ed212aee8af8e7dde2ddea33f976c8ff86cbb1
+SHA1 (patch-meson.build) = c23041cd9206085dd086a4ed7d8e62a03c1a475e

Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u pkgsrc/net/netatalk4/patches/patch-meson.build:1.6 pkgsrc/net/netatalk4/patches/patch-meson.build:1.7
--- pkgsrc/net/netatalk4/patches/patch-meson.build:1.6  Mon May  5 13:57:00 2025
+++ pkgsrc/net/netatalk4/patches/patch-meson.build      Wed Jun 11 11:24:19 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-meson.build,v 1.6 2025/05/05 13:57:00 hauke Exp $
+$NetBSD: patch-meson.build,v 1.7 2025/06/11 11:24:19 hauke Exp $
 
 Add PREFIXed paths (include, lib) for all OSes.
 
@@ -6,7 +6,7 @@ Make PREFIX path configurable.
 
 Install at.h on Linux, we do it on NetBSD, too.
 
---- meson.build.orig   2025-04-27 20:58:10.000000000 +0000
+--- meson.build.orig   2025-05-31 04:47:29.000000000 +0000
 +++ meson.build
 @@ -152,16 +152,9 @@ include_dirs = [
      'include',
@@ -26,7 +26,7 @@ Install at.h on Linux, we do it on NetBS
  # note: the brew app is not visible from within the brew build wrapper iteslf,
  # so rather than checking for brew we apply a blanket prefix
  brew_prefix = ''
-@@ -183,13 +176,7 @@ endif
+@@ -189,13 +182,7 @@ endif
  
  libsearch_dirs = []
  
@@ -41,7 +41,7 @@ Install at.h on Linux, we do it on NetBS
  
  if brew_prefix != ''
      libsearch_dirs += brew_prefix + '/lib'
-@@ -227,9 +214,8 @@ add_global_link_arguments(netatalk_commo
+@@ -233,9 +220,8 @@ add_global_link_arguments(netatalk_commo
  #################
  
  header_dir = []
@@ -53,7 +53,7 @@ Install at.h on Linux, we do it on NetBS
  
  check_headers = [
      'acl/libacl.h',
-@@ -386,9 +372,7 @@ else
+@@ -392,9 +378,7 @@ else
      endif
  
      bdb_dirs += [
@@ -64,16 +64,16 @@ Install at.h on Linux, we do it on NetBS
          '/usr',
      ]
  endif
-@@ -824,7 +808,7 @@ endif
- if host_os == 'darwin'
-     bison = find_program(brew_prefix / 'opt/bison/bin/bison', required: false)
+@@ -834,7 +818,7 @@ if host_os == 'darwin'
+         bison = find_program(brew_prefix / 'opt/bison/bin/bison', required: false)
+     endif
      if not bison.found()
 -        bison = find_program('/opt/local/bin/bison', required: false)
 +        bison = find_program( get_option('prefix') / 'bison', required: false)
      endif
  else
      bison = find_program('bison', required: false)
-@@ -1540,7 +1524,7 @@ else
+@@ -1550,7 +1534,7 @@ else
          pam_paths = [
              '/',
              '/usr',
@@ -82,7 +82,7 @@ Install at.h on Linux, we do it on NetBS
          ]
  
          foreach path : pam_paths
-@@ -1870,16 +1854,10 @@ cracklib_dict = ''
+@@ -1904,16 +1888,10 @@ cracklib_dict = ''
  
  if fs.is_dir('/usr/share/cracklib')
      cracklib_dict += '/usr/share/cracklib/pw_dict'
@@ -101,7 +101,7 @@ Install at.h on Linux, we do it on NetBS
  endif
  
  if not enable_cracklib
-@@ -2001,7 +1979,6 @@ if host_os.contains('freebsd')
+@@ -2035,7 +2013,6 @@ if host_os.contains('freebsd')
      cdata.set('FREEBSD', 1)
      cdata.set('OPEN_NOFOLLOW_ERRNO', 'EMLINK')
  elif host_os.contains('linux')