From nobody Mon Jan 22 17:34:43 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 4TJcmM61phz57rsN; Mon, 22 Jan 2024 17:34:43 +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 4TJcmM406Dz4kgp; Mon, 22 Jan 2024 17:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944883; 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=6DRXFcAq9yj364BoPeHo1y5nfGoKehnGYX48CJ1cvhU=; b=qCY7uTDm2SyVL9xY2dxtm1R5Pv+BF9FtA1fhbikP0xaIBqjak1h7dapSbB1SEQ/IMmnFWw j13bl20b5OLmDyUBFI0ah+5+/3jbhRLIvBlXB4uHSHVAPjcF0S6gFBHd+cd+RYEHAjq4Qj OnCTD+poj/ZWukyy9OjBLVmSDTMeNieVJjm6dAxlacYgMOjPxlcbnsVwFQ1pCOSWQfbmzR TFg7+E/8JI5MzyB51VgpoYqEzdJwupuAruUaNwrxVTfUA0FQJNQzQX5uhvu2gWBAtWHosa dC4x+He3IatAHu4YWMvMWWDFInTug6oA0TRMaKNFc0FA8RdJ7lmfkQ3z15CLig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705944883; 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=6DRXFcAq9yj364BoPeHo1y5nfGoKehnGYX48CJ1cvhU=; b=Uz7o2d3SwZayjs24jpzugjlL2ZKEYyjynTRH9qKE4ov+CNztmTdviNK4nbYKuvcpGLcAqE CejahWD1kdsrY6me6PHculbyHQMrpMEhqiY3NrZuU4hJuvodHH1hnJ8A3KeiV0tXKQ2P3e 0RBHOwRMSt7LbLa6KHqBgSKIp9ynzk6ZffUKeKD3m8OuUChI4yRXPXMV965jW9yU63Cqmg hGTPp8olB2u9ptHqd0E40j4i/oNlQh98EOL++gAkvLeJCRC+cjpccVeB1hgS26Wl29mGEV r63F0dYmZ6eMNxvcZ7x9vlu7ha0effPBurJld6cEge7EFM9JCirRDjEFUsDQQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705944883; a=rsa-sha256; cv=none; b=Avsv7ad14EvIknTXynZtkIpCTyNv3ueXXDn8Hov6gQ/M0EX9XoieKUZau6xZ99M+jPpHlJ gQEB4QBWBGaILY2837bspi3SFjhtQdTD8daKLt/g13GWAeb2gaCW9jMkRKVydEa6WlJy4v onpGZ8fiVGeqM/9wAvVKZ3MPp8hosJOXbtdj894H3wNJZMzpvuEPYuCZLGwoKlaBNdGEV1 cSqo2z+gzqQ1rSAJZvkWShbdqQmz9T3A8AuaCAG8p9jETN1GBZEluh6JxuXMTtmFRTbmxq PHDN/hqUoBJ6JxR1wY42g9FCKZTtBiH8DR63qzDAVx/BhsWoSc1s0ECDFlgdJA== 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 4TJcmM355Cz19mv; Mon, 22 Jan 2024 17:34:43 +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 40MHYhYN023913; Mon, 22 Jan 2024 17:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40MHYh2i023909; Mon, 22 Jan 2024 17:34:43 GMT (envelope-from git) Date: Mon, 22 Jan 2024 17:34:43 GMT Message-Id: <202401221734.40MHYh2i023909@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: fff227115a30 - main - mail/qmail: Sanitize MANPREFIX 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: fff227115a30382a50e699a5ca834f26778d8a9d Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=fff227115a30382a50e699a5ca834f26778d8a9d commit fff227115a30382a50e699a5ca834f26778d8a9d Author: Muhammad Moinur Rahman AuthorDate: 2024-01-22 17:11:36 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-01-22 17:34:25 +0000 mail/qmail: Sanitize MANPREFIX Approved by: portmgr (blanket) --- mail/qmail/Makefile | 8 ++-- mail/qmail/pkg-plist | 112 +++++++++++++++++++++++++-------------------------- 2 files changed, 60 insertions(+), 60 deletions(-) diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index b9bc4105fb96..642becda86c9 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${QMAIL_PORTNAME} PORTVERSION?= ${QMAIL_VERSION} -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= mail MASTER_SITES+= QMAIL DISTNAME= ${PORTNAME}-${QMAIL_VERSION} @@ -784,7 +784,7 @@ post-patch: .endif @${REINPLACE_CMD} -e "s/void *main/int main/g" ${WRKSRC}/*.c @${REINPLACE_CMD} -e "/int main/ s/argc, *argv/int argc, char **argv/" ${WRKSRC}/install.c - @${ECHO_CMD} "MANPATH ${MANPREFIX}/man" > ${WRKDIR}/qmail.conf + @${ECHO_CMD} "MANPATH ${PREFIX}/share/man" > ${WRKDIR}/qmail.conf do-configure: @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @@ -832,9 +832,9 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/qmailsend ${STAGEDIR}${PREFIX}/boot .endif .for i in 1 5 7 8 - @${MKDIR} ${STAGEDIR}${PREFIX}/man/man$i + @${MKDIR} ${STAGEDIR}${PREFIX}/share/man/man$i . for j in ${MMAN${i}} - ${INSTALL_MAN} ${WRKSRC}/$j ${STAGEDIR}${PREFIX}/man/man${i} + ${INSTALL_MAN} ${WRKSRC}/$j ${STAGEDIR}${PREFIX}/share/man/man${i} . endfor .endfor .if ${PORT_OPTIONS:MDOCS} diff --git a/mail/qmail/pkg-plist b/mail/qmail/pkg-plist index 71536d67a3cd..89529edfdad8 100644 --- a/mail/qmail/pkg-plist +++ b/mail/qmail/pkg-plist @@ -123,62 +123,62 @@ configure/ipmeprint %%LDAP%%@sample control/qmail-qmqpd.rules.sample %%LDAP%%@sample control/qmail-smtpd.rules.sample %%LDAP%%@sample control/signatures.sample -man/man1/bouncesaying.1.gz -man/man1/condredirect.1.gz -man/man1/except.1.gz -man/man1/forward.1.gz -man/man1/maildir2mbox.1.gz -man/man1/maildirmake.1.gz -man/man1/maildirwatch.1.gz -man/man1/mailsubj.1.gz -man/man1/preline.1.gz -man/man1/qbiff.1.gz -man/man1/qreceipt.1.gz -man/man1/tcp-env.1.gz -man/man5/addresses.5.gz -man/man5/dot-qmail.5.gz -man/man5/envelopes.5.gz -man/man5/maildir.5.gz -man/man5/mbox.5.gz -man/man5/qmail-control.5.gz -man/man5/qmail-header.5.gz -man/man5/qmail-log.5.gz -man/man5/qmail-users.5.gz -man/man5/tcp-environ.5.gz -man/man7/forgeries.7.gz -man/man7/qmail-limits.7.gz -man/man7/qmail.7.gz -man/man8/qmail-clean.8.gz -man/man8/qmail-command.8.gz -man/man8/qmail-getpw.8.gz -man/man8/qmail-inject.8.gz -man/man8/qmail-local.8.gz -man/man8/qmail-lspawn.8.gz -man/man8/qmail-newmrh.8.gz -man/man8/qmail-newu.8.gz -man/man8/qmail-pop3d.8.gz -man/man8/qmail-popup.8.gz -man/man8/qmail-pw2u.8.gz -man/man8/qmail-qmqpc.8.gz -man/man8/qmail-qmqpd.8.gz -man/man8/qmail-qmtpd.8.gz -man/man8/qmail-qread.8.gz -man/man8/qmail-qstat.8.gz -man/man8/qmail-queue.8.gz -man/man8/qmail-remote.8.gz -man/man8/qmail-rspawn.8.gz -man/man8/qmail-send.8.gz -man/man8/qmail-showctl.8.gz -man/man8/qmail-smtpd.8.gz -man/man8/qmail-start.8.gz -man/man8/qmail-tcpok.8.gz -man/man8/qmail-tcpto.8.gz -man/man8/splogger.8.gz -%%SPAMCONTROL%%man/man8/qmail-smtpam.8.gz -%%SPAMCONTROL%%man/man8/qmail-badloadertypes.8.gz -%%SPAMCONTROL%%man/man8/qmail-badmimetypes.8.gz -%%SPAMCONTROL%%man/man8/qmail-mfrules.8.gz -%%SPAMCONTROL%%man/man8/qmail-recipients.8.gz +share/man/man1/bouncesaying.1.gz +share/man/man1/condredirect.1.gz +share/man/man1/except.1.gz +share/man/man1/forward.1.gz +share/man/man1/maildir2mbox.1.gz +share/man/man1/maildirmake.1.gz +share/man/man1/maildirwatch.1.gz +share/man/man1/mailsubj.1.gz +share/man/man1/preline.1.gz +share/man/man1/qbiff.1.gz +share/man/man1/qreceipt.1.gz +share/man/man1/tcp-env.1.gz +share/man/man5/addresses.5.gz +share/man/man5/dot-qmail.5.gz +share/man/man5/envelopes.5.gz +share/man/man5/maildir.5.gz +share/man/man5/mbox.5.gz +share/man/man5/qmail-control.5.gz +share/man/man5/qmail-header.5.gz +share/man/man5/qmail-log.5.gz +share/man/man5/qmail-users.5.gz +share/man/man5/tcp-environ.5.gz +share/man/man7/forgeries.7.gz +share/man/man7/qmail-limits.7.gz +share/man/man7/qmail.7.gz +share/man/man8/qmail-clean.8.gz +share/man/man8/qmail-command.8.gz +share/man/man8/qmail-getpw.8.gz +share/man/man8/qmail-inject.8.gz +share/man/man8/qmail-local.8.gz +share/man/man8/qmail-lspawn.8.gz +share/man/man8/qmail-newmrh.8.gz +share/man/man8/qmail-newu.8.gz +share/man/man8/qmail-pop3d.8.gz +share/man/man8/qmail-popup.8.gz +share/man/man8/qmail-pw2u.8.gz +share/man/man8/qmail-qmqpc.8.gz +share/man/man8/qmail-qmqpd.8.gz +share/man/man8/qmail-qmtpd.8.gz +share/man/man8/qmail-qread.8.gz +share/man/man8/qmail-qstat.8.gz +share/man/man8/qmail-queue.8.gz +share/man/man8/qmail-remote.8.gz +share/man/man8/qmail-rspawn.8.gz +share/man/man8/qmail-send.8.gz +share/man/man8/qmail-showctl.8.gz +share/man/man8/qmail-smtpd.8.gz +share/man/man8/qmail-start.8.gz +share/man/man8/qmail-tcpok.8.gz +share/man/man8/qmail-tcpto.8.gz +share/man/man8/splogger.8.gz +%%SPAMCONTROL%%share/man/man8/qmail-smtpam.8.gz +%%SPAMCONTROL%%share/man/man8/qmail-badloadertypes.8.gz +%%SPAMCONTROL%%share/man/man8/qmail-badmimetypes.8.gz +%%SPAMCONTROL%%share/man/man8/qmail-mfrules.8.gz +%%SPAMCONTROL%%share/man/man8/qmail-recipients.8.gz scripts/enable-qmail scripts/mkaliasdir %%SPAMCONTROL%%scripts/qmail-alias2recipients