diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2024-07-01 12:09:04 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2024-07-01 12:09:04 +0000 |
| commit | e2d62a8b47d0aa5478b62c8b862401882319963a (patch) | |
| tree | dd50114c4ad221f72fa731a4bebe82430d4d5473 | |
| parent | 2e86da195185f34d97dc1d1a5c6a926f66fa7e7c (diff) | |
| download | ports-e2d62a8b47d0aa5478b62c8b862401882319963a.tar.gz ports-e2d62a8b47d0aa5478b62c8b862401882319963a.zip | |
net/netatalk3: Fix some packaging issues
* Use library search dirs to find mDNSResponder [1]
* Properly disable LDAP when not requested [2]
PR: 280064 [1]
280067 [2]
| -rw-r--r-- | net/netatalk3/Makefile | 2 | ||||
| -rw-r--r-- | net/netatalk3/files/patch-meson.build | 40 | ||||
| -rw-r--r-- | net/netatalk3/pkg-plist | 2 |
3 files changed, 37 insertions, 7 deletions
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index 8e551124b8ff..cdb8e6579319 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,5 +1,6 @@ PORTNAME= netatalk PORTVERSION= 3.2.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/netatalk-${PORTVERSION:S/./-/g}/ @@ -55,6 +56,7 @@ 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 diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index b72a231638a8..929085981db4 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -37,7 +37,30 @@ endif des = cc.find_library('des', required: false) -@@ -822,19 +829,7 @@ else +@@ -725,12 +732,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 +@@ -755,6 +762,7 @@ else + cdata.set('HAVE_MDNS', 1) + freebsd_zeroconf_daemon = 'mdnsd' + zeroconf_provider += 'mDNS' ++ dns_sd_libs += threads + else + have_zeroconf = avahi.found() + if avahi.found() +@@ -822,19 +830,7 @@ else required: false, ) @@ -58,7 +81,7 @@ cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -875,7 +870,6 @@ else +@@ -875,7 +871,6 @@ else endif endif endif @@ -66,7 +89,7 @@ have_spotlight = ( tracker_sparql.found() -@@ -884,6 +878,8 @@ have_spotlight = ( +@@ -884,6 +879,8 @@ have_spotlight = ( and flex.found() and bison.found() ) @@ -75,7 +98,7 @@ if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1370,7 +1366,7 @@ if iconv_path != '' +@@ -1370,7 +1367,7 @@ if iconv_path != '' endif iconv = declare_dependency( link_args: libiconv_link_args, @@ -84,7 +107,12 @@ ) endif -@@ -1683,7 +1679,7 @@ else +@@ -1679,11 +1676,11 @@ enable_shadow = get_option('with-shadow') + + enable_shadow = get_option('with-shadow') + +-if enable_shadow ++if not enable_shadow have_shadow = false else have_shadow = (cc.has_header('shadow.h')) @@ -93,7 +121,7 @@ cdata.set('SHADOWPW', 1) uams_options += ' SHADOW' else -@@ -1926,6 +1922,8 @@ int deny_severity = 0; +@@ -1926,6 +1923,8 @@ int deny_severity = 0; tcpwrap_code = ''' int allow_severity = 0; int deny_severity = 0; diff --git a/net/netatalk3/pkg-plist b/net/netatalk3/pkg-plist index b8df0404b3b7..b60284191e8b 100644 --- a/net/netatalk3/pkg-plist +++ b/net/netatalk3/pkg-plist @@ -1,5 +1,5 @@ bin/ad -bin/afpldaptest +%%LDAP%%bin/afpldaptest bin/afppasswd %%DBUS%%bin/afpstats bin/apple_dump |