diff --git a/net/netatalk4/Makefile b/net/netatalk4/Makefile index 0789981381f3..b489e17387d3 100644 --- a/net/netatalk4/Makefile +++ b/net/netatalk4/Makefile @@ -1,111 +1,111 @@ PORTNAME= netatalk -PORTVERSION= 4.3.1 +PORTVERSION= 4.3.2 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/ PKGNAMESUFFIX= 4 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X WWW= https://netatalk.io/ LICENSE= GPLv2 BUILD_DEPENDS= cmark:textproc/cmark LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent \ libiniparser.so:devel/iniparser \ libbstring.so:devel/bstring USES= bdb:18 cpe gettext iconv:wchar_t meson perl5 pkgconfig shebangfix ssl tar:xz USE_GNOME= libxslt:build USE_LDCONFIG= yes USE_RC_SUBR= netatalk #INSTALL_TARGET=install-strip CPE_VENDOR= netatalk_project MESON_ARGS= -Dwith-libgcrypt-path=${LOCALBASE} \ -Dwith-bdb-path=${LOCALBASE} \ -Dwith-libiconv-path=${LOCALBASE} \ -Dwith-dtrace=false \ -Dwith-init-hooks=false \ -Dpkg_config_path=${LOCALBASE}/libdata/pkgconfig \ -Dwith-webmin=false \ -Dwith-cups=false \ -Dwith-testsuite=false \ -Dwith-appletalk=false \ -Ddefault_library=both \ --infodir=${PREFIX}/share/info OPTIONS_DEFINE=PAM KERBEROS5 LDAP SENDFILE KERBEROS DBUS MYSQL ACL LIBWRAP SPOTLIGHT OPTIONS_DEFAULT=AVAHI DBUS KERBEROS LIBWRAP SENDFILE OPTIONS_RADIO=ZEROCONF OPTIONS_RADIO_ZEROCONF=AVAHI MDNSRESPONDER ZEROCONF_DESC= Zeroconf(Bonjour) support MYSQL_DESC= Enable MySQL CNID backend support SENDFILE_DESC= Enable Sendfile support ACL_DESC= Enable ACL support SPOTLIGHT_DESC= Enable Spotlight search support OPTIONS_SUB= yes KERBEROS5_MESON_ON= -Dwith-krbV-uam=true \ -Dwith-kerberos=true KERBEROS5_MESON_OFF= -Dwith-krbV-uam=false \ -Dwith-kerberos=false KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error PAM_MESON_ON= -Dwith-pam-path=${LOCALBASE} PAM_MESON_OFF= -Dwith-pam=false AVAHI_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app AVAHI_SUB_LIST= ZEROCONF="avahi_daemon" MDNSRESPONDER_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSResponder MDNSRESPONDER_SUB_LIST= ZEROCONF="mdnsd" LDAP_MESON_ON= -Dwith-ldap-path=${LOCALBASE} LDAP_MESON_OFF= -Dwith-ldap=false LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib LDAP_USES= ldap SENDFILE_MESON_OFF=-Dwith-sendfile=false DBUS_USES= gnome python DBUS_USE= GNOME+=glib20 DBUS_LIB_DEPENDS= libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus DBUS_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/dbus/_dbus.py:devel/py-dbus@${PY_FLAVOR} DBUS_MESON_ON= -Dwith-dbus-daemon-path=${LOCALBASE}/bin/dbus-daemon \ -Dwith-dbus-sysconf-path=${LOCALBASE}/etc/dbus-1/system.d DBUS_MESON_OFF= -Dwith-afpstats=false MYSQL_USES= mysql MYSQL_MESON_ON=-Dwith-cnid-default-backend=mysql MYSQL_MESON_OFF=-Dwith-cnid-default-backend=dbd ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl ACL_MESON_OFF=-Dwith-acls=false LIBWRAP_MESON_OFF=-Dwith-tcp-wrappers=false SPOTLIGHT_LIB_DEPENDS= libtinysparql-3.0.so:devel/tinysparql SPOTLIGHT_MESON_OFF= -Dwith-spotlight=false SHEBANG_GLOB= afpstats CONFLICTS= netatalk3 .include .if ${PORT_OPTIONS:MAVAHI}=="" && ${PORT_OPTIONS:MMDNSRESPONDER}=="" SUB_LIST+= ZEROCONF="" MESON_ARGS+=-Dwith-zeroconf=false .endif post-patch: @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}|' \ ${WRKSRC}/meson.build # @${REINPLACE_CMD} -e 's|\.dist|\.sample|g' \ # ${WRKSRC}/config/Makefile.in # @${REINPLACE_CMD} -e 's|%%PYTHONCMD%%|${PYTHONCMD}|' \ # ${WRKSRC}/contrib/shell_utils/afpstats post-install: ${INSTALL_SCRIPT} ${BUILD_WRKSRC}/contrib/bin_utils/macusers \ ${STAGEDIR}${PREFIX}/bin/macusers .if ${PORT_OPTIONS:MPAM} ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/netatalk.sample .endif .include diff --git a/net/netatalk4/distinfo b/net/netatalk4/distinfo index 19911e0d914b..092fcc1d8a1b 100644 --- a/net/netatalk4/distinfo +++ b/net/netatalk4/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1756664551 -SHA256 (netatalk-4.3.1.tar.xz) = 248e2eea8066c7d3e7fed62c54a3df37b4158bb45247ebdf64efe2e3797c04d5 -SIZE (netatalk-4.3.1.tar.xz) = 956212 +TIMESTAMP = 1759098490 +SHA256 (netatalk-4.3.2.tar.xz) = 2977b4fd113182f0cc183337ba23d5701fb2be4e0dfcec7ee575b4d73a738d3a +SIZE (netatalk-4.3.2.tar.xz) = 956356 diff --git a/net/netatalk4/files/patch-meson.build b/net/netatalk4/files/patch-meson.build index 971d3a2eecf1..2b20d821cd69 100644 --- a/net/netatalk4/files/patch-meson.build +++ b/net/netatalk4/files/patch-meson.build @@ -1,67 +1,67 @@ ---- meson.build.orig 2025-08-05 13:56:32 UTC +--- meson.build.orig 2025-09-07 19:42:40 UTC +++ meson.build @@ -69,6 +69,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') @@ -141,7 +142,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne dversion = '-DVERSION="' + netatalk_version + '"' messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"' statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"' -uamdir = '-D_PATH_AFPDUAMPATH="' + libdir + '/netatalk/"' +uamdir = '-D_PATH_AFPDUAMPATH="' + libexecdir + '/netatalk-uams/"' ############ # Includes # @@ -408,6 +409,7 @@ if 'dbd' in get_option('with-cnid-backends') endif bdb_subdirs = [ + '%%DB_NAME%%', 'db62', 'db6.2', 'db61', -@@ -924,12 +926,12 @@ dns_sd_libs = [] +@@ -922,12 +924,12 @@ dns_sd_libs = [] dns_sd_libs = [] -dns_sd = cc.find_library('dns_sd', required: false) +dns_sd = cc.find_library('dns_sd', dirs: libsearch_dirs, required: false) if dns_sd.found() dns_sd_libs += dns_sd endif -system = cc.find_library('system', required: false) +system = cc.find_library('system', dirs: libsearch_dirs, required: false) if dns_sd.found() dns_sd_libs += system endif -@@ -943,6 +945,8 @@ have_dns = ( +@@ -941,6 +943,8 @@ have_dns = ( ) ) +threads = dependency('threads', required: true) + if enable_zeroconf - if avahi.found() - have_zeroconf = true -@@ -956,6 +960,7 @@ if enable_zeroconf - cdata.set('HAVE_MDNS', 1) - cdata.set('freebsd_zeroconf', 'mdnsd') - zeroconf_provider += 'mDNS' -+ dns_sd_libs += threads - endif - endif - -@@ -1562,6 +1567,7 @@ if not enable_pam + if host_os == 'darwin' + # On Darwin/macOS, prefer mDNS (Bonjour) over Avahi +@@ -950,6 +954,7 @@ if enable_zeroconf + cdata.set('HAVE_MDNS', 1) + cdata.set('freebsd_zeroconf', 'mdnsd') + zeroconf_provider += 'mDNS' ++ dns_sd_libs += threads + elif avahi.found() + have_zeroconf = true + cdata.set('USE_ZEROCONF', 1) +@@ -1578,6 +1583,7 @@ if not enable_pam if not enable_pam have_pam = false + pam = dependency('', required: false) else if host_os != 'sunos' pam_paths = [