diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index eecc32512471..7f8d9f6056eb 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,107 +1,106 @@ PORTNAME= netatalk PORTVERSION= 3.2.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/ PKGNAMESUFFIX= 3 MAINTAINER= marcus@FreeBSD.org COMMENT= File server for Mac OS X WWW= http://netatalk.sourceforge.net/ LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libevent.so:devel/libevent USES= bdb:18 cpe gettext iconv meson perl5 pkgconfig shebangfix ssl tar:xz USE_LDCONFIG= yes USE_RC_SUBR= netatalk #INSTALL_TARGET=install-strip CPE_VENDOR= netatalk_project MESON_ARGS= -Dwith-libgcrypt-dir=${LOCALBASE} \ -Dwith-bdb=${LOCALBASE} \ -Dwith-libiconv=${LOCALBASE} \ -Dwith-ssl-dir=${OPENSSLBASE} \ -Dwith-dtrace=false \ -Ddisable-init-hooks=true \ -Dpkg_config_path=${LOCALBASE}/libdata/pkgconfig \ -Dwith-shadow=disabled \ -Denable-pgp-uam=disabled \ --localstatedir=/var \ --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= -Denable-krbV-uam=enabled \ -Dwith-kerberos=enabled KERBEROS5_MESON_OFF= -Denable-krbV-uam=disabled \ -Dwith-kerberos=disabled KERBEROS_LIB_DEPENDS=libgpg-error.so:security/libgpg-error PAM_MESON_ON= -Dwith-pam=${LOCALBASE} PAM_MESON_OFF= -Dwithout-pam=true 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=${LOCALBASE} LDAP_CFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib LDAP_USES= ldap SENDFILE_MESON_OFF=-Ddisable-sendfile=true 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=${LOCALBASE}/bin/dbus-daemon \ -Dwith-dbus-sysconf-dir=${LOCALBASE}/etc/dbus-1/system.d DBUS_MESON_OFF= -Dwith-afpstats=disabled MYSQL_USES= mysql MYSQL_MESON_OFF=-Dwith-mysql-config=/nonexistent ACL_LIB_DEPENDS= libsunacl.so:sysutils/libsunacl ACL_MESON_ENABLED=with-acls LIBWRAP_MESON_OFF=-Ddisable-tcp-wrappers=true SPOTLIGHT_LIB_DEPENDS= libtracker-sparql-3.0.so:sysutils/tracker3 SPOTLIGHT_MESON_OFF= -Dwith-spotlight=disabled SHEBANG_GLOB= afpstats CONFLICTS= jday yudit # bin/dbd man/man1/uniconv.1.gz .include .if ${PORT_OPTIONS:MAVAHI}=="" && ${PORT_OPTIONS:MMDNSRESPONDER}=="" SUB_LIST+= ZEROCONF="" -MESON_ARGS+=-Denable-zeroconf=false +MESON_ARGS+=-Denable-zeroconf=disabled .endif -#post-patch: -# @${REINPLACE_CMD} -e 's|%%DB_NAME%%|${BDB_INCLUDE_DIR:T}| ; \ -# s|%%DB_LIB%%|-l${BDB_LIB_NAME}|g ; \ -# s|%%LOCALBASE%%|${LOCALBASE}|g' \ -# ${WRKSRC}/configure +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/macusers/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/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index da457a0f49d6..ce0550a44aab 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -1,81 +1,89 @@ --- meson.build.orig 2024-06-01 04:56:52 UTC +++ meson.build @@ -40,6 +40,7 @@ sbindir = prefix / get_option('sbindir') mandir = prefix / get_option('mandir') pkgconfdir = prefix / get_option('sysconfdir') sbindir = prefix / get_option('sbindir') +libexecdir = prefix / get_option('libexecdir') ################## # Compiler flags # @@ -70,7 +71,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne dversion = '-DVERSION="' + 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 # -@@ -487,6 +488,11 @@ if crypt.found() +@@ -367,6 +368,7 @@ bdb_subdirs = [ + '/usr', + ] + bdb_subdirs = [ ++ '%%DB_NAME%%', + 'db4.6', + 'db4.7', + 'db4.8', +@@ -487,6 +489,11 @@ if crypt.found() if crypt.found() cdata.set('HAVE_CRYPT_H', 1) cdata.set('HAVE_LIBCRYPT', 1) +else + crypt = cc.find_library('crypt', has_headers: 'unistd.h', required: false) + if crypt.found() + cdata.set('HAVE_LIBCRYPT', 1) + endif endif des = cc.find_library('des', required: false) -@@ -763,19 +769,7 @@ else +@@ -763,19 +770,7 @@ else required: false, ) - if tracker.found() - cdata.set( - 'TRACKER_MANAGING_COMMAND', - '"tracker daemon"', - ) - cdata.set( - 'TRACKER_PREFIX', - '"' - + tracker_sparql.get_variable(pkgconfig: 'prefix') - + '"', - ) - tracker_manager += 'tracker' - elif tracker3.found() + if tracker3.found() cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -816,15 +810,16 @@ else +@@ -816,15 +811,16 @@ else endif endif endif -endif - -have_spotlight = ( + have_spotlight = ( tracker_sparql.found() and tracker_ok and talloc.found() and flex.found() and bison.found() ) +endif + + if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1833,6 +1828,8 @@ int deny_severity = 0; +@@ -1833,6 +1829,8 @@ int deny_severity = 0; tcpwrap_code = ''' int allow_severity = 0; int deny_severity = 0; + +int hosts_access(); int main(void) {