From nobody Thu Jan 11 18:01:14 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 4T9st31NSGz56bFC; Thu, 11 Jan 2024 18:01:15 +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 4T9st30xB7z57RL; Thu, 11 Jan 2024 18:01:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704996075; 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=lxKo0iKMtJFT3TVCRpjdLQy8Q8E9Lxb0PjITiRZEAVM=; b=U+BURcpiiXZDzQ7eDURp6TCP8SYrlseY5Jb3Hd+X40mtzfYr1pxRgjCqxaiNihee9Gr0S9 COfrr2EUs7vDNILJQllaT2sYip2nnqEus1HPu+mfW/28SCLgtWxueqQN/V9Bl3WH8wamqd OoN7BP7fxnPtqeYT34PEMF5R5UN/O/mzoRqDlwiB7NOgGM+nQCujm/BkaQ67T4D42JzSFK IeA1lpVsbI/NHAZwQwlnwlbh3RzqbXJPmvBSFMmzDl3Ojohsad53kqAIWyzrMoUAJU8gq8 ACUKVTEHJhHavTbolRjmEM8U5eOxMjKi/xsdOBLrGcTcMkwI6FIlC0mSu2qQOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704996075; 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=lxKo0iKMtJFT3TVCRpjdLQy8Q8E9Lxb0PjITiRZEAVM=; b=S/M0QNOfqbjBc6xHSCZRxlE9oJgkeZKZsxg/lHM0JpKaTS6PCanL8npqwpJjbKA8d9Yt6H PIL/33u6HpShhWN3C5E7pmHv6p73G6QfATv3ENafiivPp0Rq66j7w0uv518Y1UyE6H34jy B7MhRL/i3yIF65aTSmYu1kH338MWN2gKQqqLrd6klTQeX1ZvKzD/N9jIBukyRzqihX5vgD lSHYFyQVuEazKYVF6MUd5i0eVg9nMv6MW6Z9rTh52x8hW5ZfXkSWbWQXG8PQMlvSPcKjGw DthSPruNQXdftl2OCZyxB+6Gt3F07UO7+cZcanLW6H4JmuVX1/3UpWjrwXK8qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704996075; a=rsa-sha256; cv=none; b=KMMi5y9i8yAwXt+CeWO0hwMrAN60RpGs+bjtZkHOWHwo92o98BMCcqTQGDhekCYHZ7sdyH HcRZrKh1yIn2rZwqnLjTGUbqrkyJqzZxOO0shqFJ5xN0oN6m4xqgl8v3Ga4ZhlQdInmVsy qRkwABh1PGLh0NrX3V+nE5z99KVvm6B5PL3r+CKBOCNrTj6Fr5SsP2LB4mFwFspafQ6zoD ku0CqXKezyd1CCmyqsjF1YWoesjieKxH8AXiVUt6Ktjwei/rleqKumWMO3M+L9gau0AGUP J6u957LDdc0Di6uGyqgmOI6Yt+Y3m6iwRADZkJ77AQ2rRf0Qd5y9zOt45P4+zQ== 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 4T9st301nbzTDW; Thu, 11 Jan 2024 18:01:14 +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 40BI1Ev2077791; Thu, 11 Jan 2024 18:01:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BI1EtT077788; Thu, 11 Jan 2024 18:01:14 GMT (envelope-from git) Date: Thu, 11 Jan 2024 18:01:14 GMT Message-Id: <202401111801.40BI1EtT077788@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: f1fbe644d372 - main - mail/sendmail-devel: use ${PREFIX}/share/man 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: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1fbe644d372fcfb50c550b602e97f0e2a5f9398 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=f1fbe644d372fcfb50c550b602e97f0e2a5f9398 commit f1fbe644d372fcfb50c550b602e97f0e2a5f9398 Author: Dirk Meyer AuthorDate: 2024-01-11 18:00:48 +0000 Commit: Dirk Meyer CommitDate: 2024-01-11 18:00:48 +0000 mail/sendmail-devel: use ${PREFIX}/share/man --- mail/sendmail/Makefile | 17 ++++++++++------- mail/sendmail/files/site.config.m4 | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index aa413a611cae..f6ae13074d6e 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.17.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ DISTNAME= ${PORTNAME}.${PORTVERSION} @@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} DOCS= KNOWNBUGS LICENSE PGPKEYS README RELEASE_NOTES \ sendmail/TRACEFLAGS sendmail/SECURITY sendmail/TUNING PLIST_SUB+= PREFIX=${PREFIX:S=${PREFIX}/==} \ - MANPREFIX=${MANPREFIX:S=$=/=:S=${PREFIX}==:S=^/==} + MANPREFIX=${PREFIX}/share/ SUB_FILES= pkg-message WCONF= ${WRKSRC}/devtools/Site @@ -217,7 +217,10 @@ post-build: ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} op.txt) pre-install: - ${MKDIR} ${STAGEDIR}/etc/mail + ${MKDIR} ${STAGEDIR}/etc/mail \ + ${STAGEDIR}${PREFIX}/share/man/cat1 \ + ${STAGEDIR}${PREFIX}/share/man/cat5 \ + ${STAGEDIR}${PREFIX}/share/man/cat8 @${CAT} ${PKGDIR}/pkg-plist >${PLIST} @cd ${WRKSRC} && ${FIND} cf -type f | \ ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} @@ -244,18 +247,18 @@ post-install: (cd ${WRKSRC}/rmail && \ ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} force-install) .for i in ${LMAN8} - ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man8/ + ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/share/man/man8/ .endfor .for i in ${LMAN5} - ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man5/ + ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/share/man/man5/ .endfor .for i in ${LMAN1} - ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_MAN} ${WRKSRC}/*/${i} ${STAGEDIR}${PREFIX}/share/man/man1/ .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/share/sendmail ${TAR} -C ${WRKSRC} -cf - cf | \ ${TAR} -C ${STAGEDIR}${PREFIX}/share/sendmail -xf - - ${RM} ${STAGEDIR}${PREFIX}/man/cat*/* + ${RM} -rfv ${STAGEDIR}${PREFIX}/share/man/cat* # final perm of sendmail is 2555 (see plist), needed for strip cmd ${CHMOD} 755 ${STAGEDIR}${PREFIX}/sbin/sendmail ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/vacation diff --git a/mail/sendmail/files/site.config.m4 b/mail/sendmail/files/site.config.m4 index 6fca36fdda64..bea3f87bc2c1 100644 --- a/mail/sendmail/files/site.config.m4 +++ b/mail/sendmail/files/site.config.m4 @@ -1,6 +1,6 @@ define(`confEBINDIR',`%%PREFIX%%/libexec') -define(`confMANROOT',`%%PREFIX%%/man/cat') -define(`confMANROOTMAN',`%%PREFIX%%/man/man') +define(`confMANROOT',`%%PREFIX%%/share/man/cat') +define(`confMANROOTMAN',`%%PREFIX%%/share/man/man') define(`confMBINDIR',`%%PREFIX%%/sbin') define(`confSBINDIR',`%%PREFIX%%/sbin') define(`confUBINDIR',`%%PREFIX%%/bin')