From nobody Tue Jun 18 13:19:20 2024 X-Original-To: dev-commits-ports-all@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 4W3S5N3RVKz5NnR2; Tue, 18 Jun 2024 13:19:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4W3S5N2v4Yz4K02; Tue, 18 Jun 2024 13:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1718716760; 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=nVTIWqMUVk/m8kmadDV5akwswsUIOv6VmqKirvR9PK4=; b=BiXdN9JAKbj5vFeFQBPFbP/xwK1YUBfFxYm+pnlitleiVZV5nKru1oIrG1lCZ+X42p2tiy QPhdTOhjq24d3IBPRmR3ECiblx7DWodzY69v5OcPFwqs7KPSF3Yb5a2zyg3GcEGmFaWm+H XLH3pFu6umbYeNX0MyCxVqEZgMlPD3seQX6nu8kTUFFjwCXZSDLE3QgrUQ/oB+b8A9ujcN itme5Y+fKuqlk3kIINvbiAY6SIlfYiq19niI8rFeuoyaJIOe2vjFrmqrpTDUQdak4hwk4n Ki5NiZSuU+OcowDBdlpQcrCOmh2386N8jv5Lrt9A2pmJpTLK5htre8/b/8p35g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1718716760; a=rsa-sha256; cv=none; b=Z3n+YaMH6G6sjBpNDpueQY1cvTw2yOzuXSZxQEtRUV99pRfk1n/IXsLUznLoy+amxZDxzd ApcMrNwrpkG/pHryHk003RpgLPOh4gX9U3D/3lMU8sFlPniuoq1gSmi2r6ZTC2UWPZrMrE +JplemTTTVjIWWXrqoDpXUsyj6cyR9iG/f8ScZGTTaLxYgNS2H0GPEX+vXtk5Nuv0QznwK teMm9eBh/qXZpv7UA0t7gcUbTvWYSepiMASC2OVnKwhxS0A29xmUvbA8lzl9nSi3Cvlpsi 7tiswMm7uT2bDA7wxFRyK7veBrqFJm4Cr8BMSMIYcEwdhl+G9glkIrn4ohJ8+Q== 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=1718716760; 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=nVTIWqMUVk/m8kmadDV5akwswsUIOv6VmqKirvR9PK4=; b=myPRRzp3j8g2bzoTfoI14Wdmd/fbrPRP/6ks7COFHBafs3HdXk0BJP0hdV34bcHsNT8ae6 fiMKUQ5OLPg0hfziFEMqzA8lHPBrhlSHIaHEzLoOGhqDmgazx29/mADIzk4WASpjht/vqM IKqpZPiBNGiKTlMMzJOcaoLPIYxxDUoq7MBidFUuZMCN1tQ1Mg3/HERrqYIXQIG3WRLuV2 UgiT4H0Y8Z/+RxL1sfObOKz10h2KwmpjIw2NpjNPx0sjJ82YqGBGUDOkDjUdwN3k869SYG 7EomHmuUeH4IsCdxeJr2bjQjmubpgnB7aYMZTPFGSsVYEQUV95D8DdSiahC/wA== 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 4W3S5N2VHvz115x; Tue, 18 Jun 2024 13:19:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 45IDJKsA015844; Tue, 18 Jun 2024 13:19:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45IDJKh0015841; Tue, 18 Jun 2024 13:19:20 GMT (envelope-from git) Date: Tue, 18 Jun 2024 13:19:20 GMT Message-Id: <202406181319.45IDJKh0015841@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: 905388dcd28e - main - net/netatalk3: Fix some build issues List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 905388dcd28eb1f6d9140ff14e20d89083a71545 Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=905388dcd28eb1f6d9140ff14e20d89083a71545 commit 905388dcd28eb1f6d9140ff14e20d89083a71545 Author: Joe Marcus Clarke AuthorDate: 2024-06-18 13:17:57 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-06-18 13:17:57 +0000 net/netatalk3: Fix some build issues * Port a patch from the autoconf world to find the right BDB version * Correct a Meson argument to use disabled instead of false --- net/netatalk3/Makefile | 11 +++++------ net/netatalk3/files/patch-meson.build | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index eecc32512471..7f8d9f6056eb 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -1,5 +1,6 @@ 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}/ @@ -83,14 +84,12 @@ CONFLICTS= jday yudit # bin/dbd man/man1/uniconv.1.gz .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}|' \ 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 @@ -17,7 +17,15 @@ ############ # 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) @@ -29,7 +37,7 @@ endif des = cc.find_library('des', required: false) -@@ -763,19 +769,7 @@ else +@@ -763,19 +770,7 @@ else required: false, ) @@ -50,7 +58,7 @@ cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -816,15 +810,16 @@ else +@@ -816,15 +811,16 @@ else endif endif endif @@ -70,7 +78,7 @@ 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;