From nobody Sat Feb 11 12:32:56 2023 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 4PDVPN4hKrz3q5Bh; Sat, 11 Feb 2023 12:32:56 +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 4PDVPN4DC9z3LvB; Sat, 11 Feb 2023 12:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676118776; 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=dMjqmhZ+ePUvloIgl6GYhCtghuhf/3piWIXxc847r/A=; b=F8Q2eK6p1C7GGe2vEj9WxpSoFgIgJbAiZhofQs9LVZ2XS8Dy88VSEisFttcEZyxoLzDhQ9 HFEpkgHOuutQ/kHpaBuVTHjW1TdBde/m3C41tDZ5R3qW3z6rTY7OE4HZy5Wm8qksR9CEES wUqivEuoaeytNTpiqdYugsKNDJEKwFzA3EIo1DGd/BTHa1zek3uJCwQHh3NCJL+u7/+56i 4M+bmGNCMOPlRA7UgxGRY0YsjDsHBmx9bA+ug+iB8AC1A8dZadYUYVWXU0CYDyJU+g60ig fNuJ3Ap0vzDorIw5YAbhej1qHPy+L1EO2lPDNTJtejXkm6Kk+VDjofGUMGV+ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676118776; 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=dMjqmhZ+ePUvloIgl6GYhCtghuhf/3piWIXxc847r/A=; b=owECoM2bkc6gHpRbvkN9ysoG2F+NuRYochaxLOE9lbmei9UGm4zNyow2Ue3G5Eg+TE6+kX 7qxIMykJIYOWd+b4uViBmzJjKFDgzDalm3/zcRAbOcDFG7pTZ4nTZkMPskhMm5F5yZVNGO vleC8eTV62d4i/IHPJ4zTcuVkK3B2OM5AyScONvGzaNhquUJnscI1o0WPx8O9suM+U9XzM n8sNwWf8wl30PrpXxfFAT5QkiJKicy5gKSulwhSeJWl6iLzRD39LzovXEh1wmiYLYlTRzl KB98q7UXb7ICLbxJasxPg7AiQC4CscXxWEH52VW4mIIGyo/pdZ6ab14FGMMjhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676118776; a=rsa-sha256; cv=none; b=ocHw9pevkplwpD8bi5qlsNEdRPfukMVqkhgUUnpVSU+mpNJlDoLGa447/c7ANjDCLB+LH0 7j5oKYh1Yb3SWqtsOpA3bVJGnaOeO2qbp+EOVSuJCIbbcreR8NLSqEhsNXbT9cqeaE7a68 rFhWAX7ULRvwJNcUQZj/B7JeSin0s2rfMZ1ka3o8M1tr4tFUG9XDdi7vdZkCYMyQQZbyzV rpDeDuEPOH0fkMo00+zXZfxjzvvYloy/cNMNotb/8BbC/upkn5EWemuV2ZWVthxS+EPmHR OlNZ79tuYG89roJASIQzIdYilmDT9cRHyhNckrwUlaPZT/EaYXDFt/GILvzt+Q== 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 4PDVPN3GZFzyZm; Sat, 11 Feb 2023 12:32:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31BCWu3r016815; Sat, 11 Feb 2023 12:32:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31BCWul5016814; Sat, 11 Feb 2023 12:32:56 GMT (envelope-from git) Date: Sat, 11 Feb 2023 12:32:56 GMT Message-Id: <202302111232.31BCWul5016814@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 9bce8280df4b - main - mail/spamass-milter: Fix build 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9bce8280df4b4b9e107b3d643d87a2f89b3adae4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=9bce8280df4b4b9e107b3d643d87a2f89b3adae4 commit 9bce8280df4b4b9e107b3d643d87a2f89b3adae4 Author: Muhammad Moinur Rahman AuthorDate: 2023-02-11 12:28:23 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-02-11 12:32:43 +0000 mail/spamass-milter: Fix build - While converting USE_LDAP=yes to USES=ldap this port was missed. Fix this. - Utilize OPTIONS framework - Utilize USES=localbase - Refactor conditional PORTDOCS as by function this is conditional PR: 269485 Reported by: dinoex Approved by: portmgr (just-fix-it) Fixes: 6e1233b Mk/**ldap.mk: Convert USE_LDAP to USES=ldap --- mail/spamass-milter/Makefile | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile index 1148b1b1acc0..99d8db475e19 100644 --- a/mail/spamass-milter/Makefile +++ b/mail/spamass-milter/Makefile @@ -8,14 +8,24 @@ MAINTAINER= bmah@FreeBSD.org COMMENT= Sendmail Milter (mail filter) plugin for SpamAssassin WWW= https://savannah.nongnu.org/projects/spamass-milt/ +LICENSE= GPLv2 + BUILD_DEPENDS= spamc:mail/spamassassin RUN_DEPENDS:= ${BUILD_DEPENDS} -LICENSE= GPLv2 +USE_RC_SUBR= spamass-milter + +GNU_CONFIGURE= yes + +SUB_FILES= pkg-message + +PORTDOCS= AUTHORS ChangeLog NEWS README TODO OPTIONS_DEFINE= LDAP MILTER_PORT DOCS MILTER_PORT_DESC= Build against libmilter port +LDAP_USES= ldap localbase:ldflags + .include .if exists(${LOCALBASE}/lib/libldap.so) @@ -23,36 +33,19 @@ WITH_LDAP=yes .undef WITHOUT_LDAP .endif -.if ${PORT_OPTIONS:MLDAP} -USE+= ldap -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif - -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= AUTHORS ChangeLog NEWS README TODO -.endif - -USE_RC_SUBR= spamass-milter -GNU_CONFIGURE= yes - -SUB_FILES= pkg-message - post-patch: @${SED} -e's,%%PREFIX%%,${PREFIX},g' \ ${FILESDIR}/activation.txt > ${WRKDIR}/activation.txt -.if ${PORT_OPTIONS:MLDAP} && ${PORT_OPTIONS:MLDAP} + +post-patch-LDAP-on: @${REINPLACE_CMD} -e 's|-lmilter|-lmilter -lldap|g' ${WRKSRC}/configure -.endif -post-install: -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKDIR}/activation.txt ${STAGEDIR}${DOCSDIR}/activation.txt .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" .include