From nobody Mon Jul 01 12:11:18 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WCPyv1rk9z5QWpL; Mon, 01 Jul 2024 12:11:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WCPyt4t8Tz4Y4R; Mon, 1 Jul 2024 12:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719835878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e8Et94GRnPx4n4xFbYE3nqV1wZXMkwi5RJuNr0Td0D4=; b=wnFxXus3O91tNu1LhvWStjUcr6UputlfgC+ZrhnviealOmDpU0BfcaDyVwL2M1JLiSXHlQ VBYaYQOspAoUlwHk9XIao0A3UaZtt6qcEwZgYm522XVWUNH1wNODWPXfU33kaMKiEYqgVP ZvXt9ZNNCuPiWTWwST5D0Yg0DKK1MIZuF/DJTXn1drAF+mb2mxUrJV8MNvWtusOEi0zAEM BYMj8ijekcy6bFF/FXI62AH2HpIfnD10gpgCq5jdj4VY1Tco9woNvUZ1OFGTURW9Cc5erO fvHZGOl9NkbMAAhTczgq54m9RI2oulgFfTnB0i0n33rKvtvpZqZ6SPjjLXxN6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719835878; a=rsa-sha256; cv=none; b=ad4loYBDnAO1GG4aP4DNt07jd46bqpVqVb8bfnfh4i2/qxF9KDlKsJk0fCsJrOLiYyY34W J2WcemJe9qaTBrqUv8V2xk+lhfnaxTJ1OKs6EBX+zr0E0H8wEy866LWGe79gCLZJL7FDEA opJ9Suz0x+8nsXhA4qQFn5jw7WlgewJTcI9VYan9zju+ij3BiDrQ9E/EMuUBlv4e9Gj5Bd QSM0mwCkEilSKZFne5DYyR1yQbrBrE6RatrviU32XA5clIBBAvHxnaRdcrOqqBCYt90JmA iXxNU1M8pb42n8Y2qmRMwId8ftd2ZoppEt8mU/Jcyzl2AOhvf31XGk8K1u0VTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719835878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e8Et94GRnPx4n4xFbYE3nqV1wZXMkwi5RJuNr0Td0D4=; b=V4Nv6HfPLD4v8InHpybshSC8PLwVD/vDg/TU6gJWwzRp3Y/n2UIw1XxXIB+Jq/9bwZt4YT nbzEfKBpC/I5xq860QVqLjNuMaYEIUJwZHBVcPeJ04UPvqnJ2Gj7GGMKXUZWBqHyovwQvP DbAcy+J0e547kJG9eojQ8lRiqZrqFrYXy2q/GLa/DnqNe9oDbt1SALqtnEd6RasUYRDzL3 ankkYGbPdayUv2dmWAZt4oeYFehx+mCg6n77kI4gx6xGrIVpXhgVmreWvsINBZ5sGHBC7C k+83Yd9JSJe0F1enLvL63ikOFZhzICd2JlxqObegePzSfMpWnOjIzUzsNrj0gA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WCPyt4Th0z14VY; Mon, 1 Jul 2024 12:11:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 461CBI0r073534; Mon, 1 Jul 2024 12:11:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 461CBI0I073531; Mon, 1 Jul 2024 12:11:18 GMT (envelope-from git) Date: Mon, 1 Jul 2024 12:11:18 GMT Message-Id: <202407011211.461CBI0I073531@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: e2d62a8b47d0 - main - net/netatalk3: Fix some packaging issues List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e2d62a8b47d0aa5478b62c8b862401882319963a Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=e2d62a8b47d0aa5478b62c8b862401882319963a commit e2d62a8b47d0aa5478b62c8b862401882319963a Author: Joe Marcus Clarke AuthorDate: 2024-07-01 12:09:04 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-07-01 12:09:04 +0000 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] --- net/netatalk3/Makefile | 2 ++ net/netatalk3/files/patch-meson.build | 40 +++++++++++++++++++++++++++++------ 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