CVS commit: pkgsrc/net

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Nov 21 15:26:08 UTC 2024

Modified Files:
        pkgsrc/net: Makefile
Added Files:
        pkgsrc/net/netatalk4: DESCR MESSAGE MESSAGE.pam Makefile PLIST distinfo
            options.mk
        pkgsrc/net/netatalk4/files: netatalk.sh netatalk_smf.sh
        pkgsrc/net/netatalk4/patches: patch-libatalk_bstring_bstrlib.c
            patch-meson.build

Log Message:
Add net/netatalk4

Netatalk is an Apple Filesharing Protocol server. Version 4
re-integrates the AppleTalk ddp support for Traditional Mac OS and
Apple II that had been removed from version 3.

Moreover, it comes with numerous fixes and improvements.

This version supersedes both the netatalk22 and netatalk3 packages,
which will be removed in due time.


To generate a diff of this commit:
cvs rdiff -u -r1.1583 -r1.1584 pkgsrc/net/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/netatalk4/DESCR \
    pkgsrc/net/netatalk4/MESSAGE pkgsrc/net/netatalk4/MESSAGE.pam \
    pkgsrc/net/netatalk4/Makefile pkgsrc/net/netatalk4/PLIST \
    pkgsrc/net/netatalk4/distinfo pkgsrc/net/netatalk4/options.mk
cvs rdiff -u -r0 -r1.1 pkgsrc/net/netatalk4/files/netatalk.sh \
    pkgsrc/net/netatalk4/files/netatalk_smf.sh
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c \
    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/Makefile
diff -u pkgsrc/net/Makefile:1.1583 pkgsrc/net/Makefile:1.1584
--- pkgsrc/net/Makefile:1.1583  Tue Nov  5 11:14:19 2024
+++ pkgsrc/net/Makefile Thu Nov 21 15:26:08 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1583 2024/11/05 11:14:19 wiz Exp $
+# $NetBSD: Makefile,v 1.1584 2024/11/21 15:26:08 hauke Exp $
 #
 
 COMMENT=       Networking tools
@@ -453,6 +453,7 @@ SUBDIR+=    nemesis
 SUBDIR+=       net-snmp
 SUBDIR+=       netatalk22
 SUBDIR+=       netatalk3
+SUBDIR+=       netatalk4
 SUBDIR+=       netbsd-iscsi-initiator
 SUBDIR+=       netbsd-iscsi-target
 SUBDIR+=       netcat

Added files:

Index: pkgsrc/net/netatalk4/DESCR
diff -u /dev/null pkgsrc/net/netatalk4/DESCR:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/DESCR  Thu Nov 21 15:26:08 2024
@@ -0,0 +1,21 @@
+Netatalk is a Free and Open Source file server that implements the
+Apple Filing Protocol (AFP) 3.4 over TCP/IP and AppleTalk ddp.
+
+AFP is the primary file sharing protocol used on Apple II, Traditional
+Mac OS, and Mac OS X, as well as one of several supported protocols on
+macOS.
+
+If you have a local network of macOS, Mac OS X, Traditional Mac OS, or
+even Apple II computers, running a Netatalk AppleShare server allows
+you to share, collaborate on, and back up files comfortably.
+
+The latest macOS at the time of writing ships with an AFP client, so
+Netatalk can act as a seamless bridge between new and old Macs. With
+dnsd support, the Netatalk AFP server will be auto-discoverable via
+Bonjour. It supports Time Machine backups.
+
+Compared to cross-platform file sharing protocols like nfs and sftp,
+Netatalk delivers a Mac-like user experience,
+
+Compared to a Samba setup with macOS support, Netatalk comes with a
+lot less complexity.
Index: pkgsrc/net/netatalk4/MESSAGE
diff -u /dev/null pkgsrc/net/netatalk4/MESSAGE:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/MESSAGE        Thu Nov 21 15:26:08 2024
@@ -0,0 +1,12 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+For users migrating from Netatalk 2, version 4 comes with substantial
+changes, like an all-new config file format.
+
+You are advised to familiarize yourself with the changes in advance;
+use <https://netatalk.io/stable/htmldocs/upgrade> as a starting point.
+
+AppleTalk will require kernel support.
+
+===========================================================================
Index: pkgsrc/net/netatalk4/MESSAGE.pam
diff -u /dev/null pkgsrc/net/netatalk4/MESSAGE.pam:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/MESSAGE.pam    Thu Nov 21 15:26:08 2024
@@ -0,0 +1,8 @@
+===========================================================================
+$NetBSD: MESSAGE.pam,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+A netatalk PAM configuration file needs to be installed in the pam.d
+directory.  An example file can be found at
+${PREFIX}/share/examples/netatalk/netatalk.pam
+
+===========================================================================
Index: pkgsrc/net/netatalk4/Makefile
diff -u /dev/null pkgsrc/net/netatalk4/Makefile:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/Makefile       Thu Nov 21 15:26:08 2024
@@ -0,0 +1,150 @@
+# $NetBSD: Makefile,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+GITHUB_PROJECT=        netatalk
+GITHUB_TAG=    refs/tags/${DISTNAME}
+DISTNAME=      netatalk-4-0-6
+
+PKGVER=                ${GITHUB_TAG:C/^.+netatalk-//:C/-/./g}
+PKGNAME=       ${DISTNAME:C/-[0-9].*$//}-${PKGVER}
+
+CATEGORIES=    net
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=Netatalk/}
+
+MAINTAINER=    hauke%NetBSD.org@localhost
+HOMEPAGE=      https://www.netatalk.io/
+COMMENT=       AFP file and AppleTalk print services
+LICENSE=       gnu-gpl-v2
+
+WRKSRC=                        ${WRKDIR}/${GITHUB_PROJECT}-${DISTNAME}
+
+USE_TOOLS+=            pkg-config perl
+
+PKG_SYSCONFSUBDIR=     netatalk
+EGDIR=                 ${PREFIX}/share/examples/netatalk
+CONF_FILES+=           ${EGDIR}/afp.conf       ${PKG_SYSCONFDIR}/afp.conf
+CONF_FILES+=           ${EGDIR}/extmap.conf    ${PKG_SYSCONFDIR}/extmap.conf
+
+CONFLICTS=             netatalk22-[0-9]* netatalk30-[0-9]* netatalk3-[0-9]*
+CONFLICTS+=            netatalk-[0-9]* netatalk-asun-[0-9]* netatalk-umich-[0-9]*
+
+.include "../../mk/bsd.prefs.mk"
+
+RCD_SCRIPTS=           netatalk
+ATALK_RCD_SCRIPTS=     a2boot atalkd macipgw papd timelord
+RCD_SCRIPT_SRC.netatalk= ${WRKSRC}/output/distrib/initscripts/netatalk
+
+SMF_SRCDIR=            ${WRKSRC}/distrib/initscripts
+SMF_METHODS=           netatalk_smf
+SMF_MANIFEST=          netatalk.xml
+
+BUILD_DEFS+=           VARBASE
+
+.if ${OPSYS} == "NetBSD"
+# See PR lib/50485
+MESON_ARGS+=           -Dwith-dtrace=false
+.endif
+
+BDB_ACCEPTED=          db4 db5
+# Build script expects exactly major dot minor
+MESON_ARGS+=           -Dwith-bdb-version=${BUILDLINK_ABI_DEPENDS.${BDB_TYPE}:C/^.*>=//:R}
+MESON_ARGS+=           -Dwith-bdb-path=${BDBBASE}
+
+MESON_ARGS+=           -Dwith-tcp-wrappers=true
+MESON_ARGS+=           -Dwith-statedir-path=${VARBASE}/db
+MESON_ARGS+=           -Dwith-spooldir=${VARBASE}/spool/netatalk
+
+# Meson will look for perl(1), but then substitute the buildlink path
+# into scripts, so replace manually
+SUBST_CLASSES+=                perlpath
+SUBST_STAGE.perlpath=  pre-configure
+SUBST_FILES.perlpath+= contrib/macusers/macusers.in
+SUBST_FILES.perlpath+= contrib/shell_utils/afpstats.in
+SUBST_FILES.perlpath+= contrib/shell_utils/apple_dump.in
+SUBST_FILES.perlpath+= contrib/shell_utils/asip-status.in
+SUBST_SED.perlpath=    -e 's|@PERL@|${PERL5}|g'
+
+MAKE_DIRS+=            ${PKG_SYSCONFDIR}/msg
+OWN_DIRS+=             ${VARBASE}/db/netatalk/CNID ${REAL_ROOT_USER} ${REAL_ROOT_GROUP}
+
+PLIST_VARS+=           ea
+.if ${OPSYS} == "SunOS" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || \
+       (${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 070000) || \
+       ${OPSYS} == "FreeBSD"
+PLIST.ea=              yes
+.endif
+
+# appletalk
+.for atbin in aecho getzones nbplkup nbprgstr nbpunrgstr pap papstatus
+PRINT_PLIST_AWK+=      { gsub(/^bin\/${atbin}$$/, "$${PLIST.appletalk}&"); }
+.endfor
+.for athdr in aarp at at_var ddp ddp_var endian phase2
+PRINT_PLIST_AWK+=      { gsub(/^include\/netatalk\/${athdr}\.h$$/, "$${PLIST.appletalk}&"); }
+.endfor
+.for atsbin in a2boot atalkd macipgw papd timelord
+PRINT_PLIST_AWK+=      { gsub(/^sbin\/${atsbin}$$/, "$${PLIST.appletalk}&"); }
+PRINT_PLIST_AWK+=      { gsub(/^share\/examples\/netatalk\/(atalk|pap)d\.conf$$/, "$${PLIST.appletalk}&"); }
+.endfor
+
+# ea
+PRINT_PLIST_AWK+=      { gsub(/^bin\/ad$$/, "$${PLIST.ea}&"); }
+
+# gssapi
+PRINT_PLIST_AWK+=      { gsub(/^lib\/netatalk\/uams_gss\.so$$/, "$${PLIST.gssapi}&"); }
+
+# ldap
+PRINT_PLIST_AWK+=      { gsub(/^share\/examples\/netatalk\/afp_ldap\.conf$$/, "$${PLIST.ldap}&"); }
+PRINT_PLIST_AWK+=      { gsub(/^bin\/afpldaptest$$/, "$${PLIST.ldap}&"); }
+
+# pam
+PRINT_PLIST_AWK+=      { gsub(/^lib\/netatalk\/uams_.*pam\.so$$/, "$${PLIST.pam}&"); }
+PRINT_PLIST_AWK+=      { gsub(/^share\/examples\/netatalk\/netatalk\.pam$$/, "$${PLIST.pam}&"); }
+
+# spotlight
+PRINT_PLIST_AWK+=      { gsub(/^share\/dbus-1\/netatalk-dbus\.conf$$/, "$${PLIST.spotlight}&"); }
+PRINT_PLIST_AWK+=      { gsub(/^share\/examples\/netatalk\/dbus-session\.conf$$/, "$${PLIST.spotlight}&"); }
+
+.include "options.mk"
+
+INSTALLATION_DIRS+=    ${EGDIR}
+
+post-configure:
+       ${CP} ${FILESDIR}/netatalk_smf.sh ${SMF_SRCDIR}
+
+post-install:
+       rm -r ${DESTDIR}${PREFIX}/share/doc/netatalk/htmldocs
+       chmod -w ${DESTDIR}${PREFIX}/bin/afppasswd
+       ${INSTALL_DATA} ${WRKSRC}/output/config/afp.conf \
+               ${DESTDIR}${EGDIR}/afp.conf
+       ${INSTALL_DATA} ${WRKSRC}/config/extmap.conf \
+               ${DESTDIR}${EGDIR}/extmap.conf
+.if !empty(PKG_OPTIONS:Mappletalk)
+       ${INSTALL_DATA} ${WRKSRC}/config/atalkd.conf \
+               ${DESTDIR}${EGDIR}/atalkd.conf
+       ${INSTALL_DATA} ${WRKSRC}/config/papd.conf \
+               ${DESTDIR}${EGDIR}/papd.conf
+.endif
+.if !empty(PKG_OPTIONS:Mspotlight)
+       ${INSTALL_DATA} ${WRKSRC}/output/config/dbus-session.conf \
+               ${DESTDIR}${EGDIR}/dbus-session.conf
+.else
+       rm -r ${DESTDIR}${PREFIX}/share/dbus-1
+.endif
+.if !empty(PKG_OPTIONS:Mpam)
+       ${INSTALL_DATA} ${WRKSRC}/output/config/pam/netatalk \
+               ${DESTDIR}${EGDIR}/netatalk.pam
+.endif
+
+.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libevent+=        libevent>=2
+.include "../../devel/libevent/buildlink3.mk"
+.include "../../security/cracklib/buildlink3.mk"
+.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../security/tcp_wrappers/buildlink3.mk"
+.include "../../textproc/cmark-gfm/buildlink3.mk"
+
+.include "../../mk/bdb.buildlink3.mk"
+
+.include "../../devel/meson/build.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/netatalk4/PLIST
diff -u /dev/null pkgsrc/net/netatalk4/PLIST:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/PLIST  Thu Nov 21 15:26:08 2024
@@ -0,0 +1,133 @@
+@comment $NetBSD: PLIST,v 1.1 2024/11/21 15:26:08 hauke Exp $
+${PLIST.ea}bin/ad
+${PLIST.appletalk}bin/aecho
+${PLIST.ldap}bin/afpldaptest
+bin/afppasswd
+bin/afpstats
+bin/apple_dump
+bin/asip-status
+bin/dbd
+${PLIST.appletalk}bin/getzones
+bin/macusers
+${PLIST.appletalk}bin/nbplkup
+${PLIST.appletalk}bin/nbprgstr
+${PLIST.appletalk}bin/nbpunrgstr
+${PLIST.appletalk}bin/pap
+${PLIST.appletalk}bin/papstatus
+include/atalk/acl.h
+include/atalk/adouble.h
+include/atalk/aep.h
+include/atalk/afp.h
+include/atalk/asp.h
+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
+include/atalk/iniparser.h
+include/atalk/list.h
+include/atalk/logger.h
+include/atalk/nbp.h
+include/atalk/netatalk_conf.h
+include/atalk/netddp.h
+include/atalk/pap.h
+include/atalk/paths.h
+include/atalk/queue.h
+include/atalk/rtmp.h
+include/atalk/standards.h
+include/atalk/uam.h
+include/atalk/unicode.h
+include/atalk/unix.h
+include/atalk/util.h
+include/atalk/vfs.h
+include/atalk/volume.h
+include/atalk/zip.h
+${PLIST.appletalk}include/netatalk/aarp.h
+${PLIST.appletalk}include/netatalk/at.h
+${PLIST.appletalk}include/netatalk/at_var.h
+${PLIST.appletalk}include/netatalk/ddp.h
+${PLIST.appletalk}include/netatalk/ddp_var.h
+${PLIST.appletalk}include/netatalk/endian.h
+${PLIST.appletalk}include/netatalk/phase2.h
+lib/libatalk.so
+lib/libatalk.so.19
+lib/libatalk.so.19.0.0
+lib/netatalk/uams_clrtxt.so
+lib/netatalk/uams_dhx.so
+lib/netatalk/uams_dhx2.so
+${PLIST.pam}lib/netatalk/uams_dhx2_pam.so
+lib/netatalk/uams_dhx2_passwd.so
+${PLIST.pam}lib/netatalk/uams_dhx_pam.so
+lib/netatalk/uams_dhx_passwd.so
+${PLIST.gssapi}lib/netatalk/uams_gss.so
+lib/netatalk/uams_guest.so
+${PLIST.pam}lib/netatalk/uams_pam.so
+lib/netatalk/uams_passwd.so
+lib/netatalk/uams_randnum.so
+man/man1/ad.1
+man/man1/aecho.1
+man/man1/afp_lantest.1
+man/man1/afp_logintest.1
+man/man1/afp_spectest.1
+man/man1/afp_speedtest.1
+man/man1/afparg.1
+man/man1/afpldaptest.1
+man/man1/afppasswd.1
+man/man1/afpstats.1
+man/man1/afptest.1
+man/man1/apple_dump.1
+man/man1/asip-status.1
+man/man1/dbd.1
+man/man1/getzones.1
+man/man1/macusers.1
+man/man1/nbp.1
+man/man1/nbplkup.1
+man/man1/nbprgstr.1
+man/man1/nbpunrgstr.1
+man/man1/pap.1
+man/man3/atalk_aton.3
+man/man3/nbp_name.3
+man/man4/atalk.4
+man/man5/afp.conf.5
+man/man5/afp_signature.conf.5
+man/man5/afp_voluuid.conf.5
+man/man5/atalkd.conf.5
+man/man5/extmap.conf.5
+man/man5/papd.conf.5
+man/man8/a2boot.8
+man/man8/afpd.8
+man/man8/atalkd.8
+man/man8/cnid_dbd.8
+man/man8/cnid_metad.8
+man/man8/macipgw.8
+man/man8/netatalk.8
+man/man8/papd.8
+man/man8/papstatus.8
+man/man8/timelord.8
+${PLIST.appletalk}sbin/a2boot
+sbin/afpd
+${PLIST.appletalk}sbin/atalkd
+sbin/cnid_dbd
+sbin/cnid_metad
+${PLIST.appletalk}sbin/macipgw
+sbin/netatalk
+${PLIST.appletalk}sbin/papd
+${PLIST.appletalk}sbin/timelord
+${PLIST.spotlight}share/dbus-1/netatalk-dbus.conf
+share/doc/netatalk/CONTRIBUTORS
+share/doc/netatalk/DEVELOPER
+share/doc/netatalk/DOCKER.txt
+share/doc/netatalk/INSTALL.txt
+share/doc/netatalk/NEWS
+share/doc/netatalk/README.AppleTalk
+share/doc/netatalk/README.txt
+share/doc/netatalk/SECURITY.txt
+share/examples/netatalk/afp.conf
+${PLIST.appletalk}share/examples/netatalk/atalkd.conf
+${PLIST.spotlight}share/examples/netatalk/dbus-session.conf
+share/examples/netatalk/extmap.conf
+${PLIST.pam}share/examples/netatalk/netatalk.pam
+${PLIST.appletalk}share/examples/netatalk/papd.conf
Index: pkgsrc/net/netatalk4/distinfo
diff -u /dev/null pkgsrc/net/netatalk4/distinfo:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/distinfo       Thu Nov 21 15:26:08 2024
@@ -0,0 +1,7 @@
+$NetBSD: distinfo,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+BLAKE2s (netatalk-4-0-6.tar.gz) = 00beb8d601af7dba7f9e0c30f00c3f90fd3e786346b60997a7708674214a2df9
+SHA512 (netatalk-4-0-6.tar.gz) = d0a99bc8200d767dba8254cf21b9880267da4a18524dbbffec2049dca747f0fe3d7023d26098c5bdc1fca160d06cc019f23e9f34be9ca9f823b3071a6cc729c8
+Size (netatalk-4-0-6.tar.gz) = 1326496 bytes
+SHA1 (patch-libatalk_bstring_bstrlib.c) = bb0efb8b474f9ed05118a3aa65aa64e01eb5d486
+SHA1 (patch-meson.build) = 1a62c6009058e2e38fe9017afe30a8732c86d40d
Index: pkgsrc/net/netatalk4/options.mk
diff -u /dev/null pkgsrc/net/netatalk4/options.mk:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/options.mk     Thu Nov 21 15:26:08 2024
@@ -0,0 +1,86 @@
+# $NetBSD: options.mk,v 1.1 2024/11/21 15:26:08 hauke Exp $
+#
+PKG_OPTIONS_VAR=               PKG_OPTIONS.netatalk
+PKG_SUPPORTED_OPTIONS=         debug dnssd kerberos ldap pam
+# Untested
+#PKG_SUPPORTED_OPTIONS+=       spotlight
+PKG_SUGGESTED_OPTIONS=         dnssd pam
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+# Requires AppleTalk kernel support
+.if ${OPSYS} == "Linux" || ${OPSYS} == "NetBSD"
+PKG_SUPPORTED_OPTIONS+=                appletalk
+PKG_SUGGESTED_OPTIONS+=                appletalk
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=                   appletalk gssapi ldap pam spotlight
+
+.if !empty(PKG_OPTIONS:Mappletalk)
+# For AppleTalk pap
+.include "../../print/cups-base/buildlink3.mk"
+PLIST.appletalk=       yes
+MESON_ARGS+=           -Dwith-appletalk=true
+CONF_FILES+=           ${EGDIR}/atalkd.conf    ${PKG_SYSCONFDIR}/atalkd.conf
+CONF_FILES+=           ${EGDIR}/papd.conf      ${PKG_SYSCONFDIR}/papd.conf
+RCD_SCRIPTS+=          ${ATALK_RCD_SCRIPTS}
+.for rs in ${ATALK_RCD_SCRIPTS}
+RCD_SCRIPT_SRC.${rs}=  ${WRKSRC}/output/distrib/initscripts/${rs}
+.endfor
+.else
+MESON_ARGS+=           -Dwith-appletalk=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+MESON_ARGS+=           -Dwith-debug=true
+MESON_ARGS+=           -Dwith-debugging=true
+CFLAGS+=               -g3
+INSTALL_UNSTRIPPED=    yes
+.endif
+
+.if !empty(PKG_OPTIONS:Mdnssd)
+.include "../../net/mDNSResponder/buildlink3.mk"
+MESON_ARGS+=           -Dwith-zeroconf=true
+.else
+MESON_ARGS+=           -Dwith-zeroconf=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+.include "../../mk/krb5.buildlink3.mk"
+PLIST.gssapi=          yes
+MESON_ARGS+=           -Dwith-gssapi=true
+MESON_ARGS+=           -Dwith-kerberos=true
+.else
+MESON_ARGS+=           -Dwith-gssapi=false
+MESON_ARGS+=           -Dwith-kerberos=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mldap)
+.include "../../databases/openldap-client/buildlink3.mk"
+PLIST.ldap=            yes
+MESON_ARGS+=           -Dwith-ldap=true
+.else
+MESON_ARGS+=           -Dwith-ldap=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mpam)
+.include "../../mk/pam.buildlink3.mk"
+PLIST.pam=             yes
+MESON_ARGS+=           -Dwith-pam=true
+MESSAGE_SRC+=          MESSAGE MESSAGE.pam
+.else
+MESON_ARGS+=           -Dwith-pam=false
+.endif
+
+.if !empty(PKG_OPTIONS:Mspotlight)
+.include "../../devel/talloc/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/gnome-tracker/buildlink3.mk"
+PLIST.spotlight=       yes
+MESON_ARGS+=           -Dwith-dbus-daemon-path=${PREFIX}/bin/dbus-daemon
+MESON_ARGS+=           -Dwith-dbus-sysconf-path=${PREFIX}/share/dbus-1
+CONF_FILES+=           ${EGDIR}/dbus-session.conf \
+                               ${PKG_SYSCONFDIR}/dbus-session.conf
+.endif

Index: pkgsrc/net/netatalk4/files/netatalk.sh
diff -u /dev/null pkgsrc/net/netatalk4/files/netatalk.sh:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/files/netatalk.sh      Thu Nov 21 15:26:08 2024
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# $NetBSD: netatalk.sh,v 1.1 2024/11/21 15:26:08 hauke Exp $
+#
+
+# PROVIDE: netatalk
+# REQUIRE: NETWORKING mountcritremote syslogd
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="netatalk"
+rcvar=$name
+command="/usr/pkg/libexec/netatalk/${name}"
+pidfile="/var/spool/lock/${name}"
+required_files="/etc/${name}/afp.conf /etc/${name}/extmap.conf"
+
+load_rc_config $name
+run_rc_command "$1"
Index: pkgsrc/net/netatalk4/files/netatalk_smf.sh
diff -u /dev/null pkgsrc/net/netatalk4/files/netatalk_smf.sh:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/files/netatalk_smf.sh  Thu Nov 21 15:26:08 2024
@@ -0,0 +1,32 @@
+#!@SMF_METHOD_SHELL@
+#
+# SunOS SMF start/stop/refresh "methods" script for Netatalk 3
+
+# $NetBSD: netatalk_smf.sh,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+PIDFILE=@VARBASE@/run/netatalk.pid
+
+case $1 in
+'start')
+       @PREFIX@/libexec/netatalk/netatalk
+       ;;
+
+'stop')
+       if [ -f "$PIDFILE" ]; then
+               /usr/bin/kill `/usr/bin/head -1 $PIDFILE`
+       fi
+       ;;
+
+'refresh')
+       if [ -f "$PIDFILE" ]; then
+               /usr/bin/kill -HUP `/usr/bin/head -1 $PIDFILE`
+       fi
+       ;;
+
+*)
+       echo "Usage: $0 { start | stop | refresh }"
+       exit 1
+       ;;
+esac
+
+exit $?

Index: pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c
diff -u /dev/null pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c       Thu Nov 21 15:26:08 2024
@@ -0,0 +1,18 @@
+$NetBSD: patch-libatalk_bstring_bstrlib.c,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+See https://github.com/mvp/uhubctl/issues/586
+
+Maybe the re-definition should just be removed, given the vague
+reasoning
+
+--- libatalk/bstring/bstrlib.c.orig    2024-11-08 16:22:48.888569855 +0000
++++ libatalk/bstring/bstrlib.c
+@@ -2913,7 +2913,7 @@ struct genBstrList g;
+ #define START_VSNBUFF (256)
+ #else
+ 
+-#if defined(__GNUC__) && !defined(__APPLE__)
++#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__NetBSD__)
+ /* Something is making gcc complain about this prototype not being here, so
+    I've just gone ahead and put it in. */
+ extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg);
Index: pkgsrc/net/netatalk4/patches/patch-meson.build
diff -u /dev/null pkgsrc/net/netatalk4/patches/patch-meson.build:1.1
--- /dev/null   Thu Nov 21 15:26:09 2024
+++ pkgsrc/net/netatalk4/patches/patch-meson.build      Thu Nov 21 15:26:08 2024
@@ -0,0 +1,21 @@
+$NetBSD: patch-meson.build,v 1.1 2024/11/21 15:26:08 hauke Exp $
+
+While NetBSD has libwrap, the meson code doesn't find it. The test
+cond still succeeds, so add a branch that does not require the
+library.
+
+--- meson.build.orig   2024-11-09 23:29:31.000000000 +0000
++++ meson.build
+@@ -1993,7 +1993,11 @@ int main(void) {
+ }
+ '''
+ 
+-    have_tcpwrap = wrap.found() and cc.links(tcpwrap_code, args: '-lwrap')
++    # *BSD have tcpwrappers support in libc
++    have_tcpwrap = wrap.found() and cc.links(tcpwrap_code)
++    if not have_tcpwrap
++      have_tcpwrap = wrap.found() and cc.links(tcpwrap_code, args: '-lwrap')
++    endif
+     if not have_tcpwrap
+         have_tcpwrap = cc.links(tcpwrap_code, args: ['-lwrap', '-lnsl'])
+     endif