From nobody Thu Jan 11 18:02:30 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 4T9svV45p8z56brl; Thu, 11 Jan 2024 18:02:30 +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 4T9svV3gyYz57df; Thu, 11 Jan 2024 18:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704996150; 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=pFrffqsp02nonBAYaL4tJ0ohYzEivH2WrEZ4bkA7flw=; b=Vi/AWaAe2Y8suMc0UuohEqYSYw8krXdoIP5eBl8ALp4x77PNhyE5bHVe7ezAACpTceTmEr S5qSF8mb4aNBeFPrOMUNTc8BAb7kdr/NliJhj51x/y9VmzbtwxLYHG0TwRWxSUPy80iWow oB5ox0eXnjhXrjrkeV033/jhSXFV0TK6nHMU4ElrFzq01G3+S5NtOeUIRcWPbnjliLpq2/ ZTtVROs3u6CvFPQNPISwSfrv93poCcUpDK0aSMQ6E+d1/f0h9grKbMENOiQ3TaoawahWDj VOoKRZfSq8+rX+PeBvMX5V8uIZIL+t4EqJ/qqTQ2+j6UDwnUIivNoixFENx+IQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704996150; 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=pFrffqsp02nonBAYaL4tJ0ohYzEivH2WrEZ4bkA7flw=; b=DN6Z34sh8wZqtXP1oGP4fGvG+hpVi5EhgavORERV0Mc4II13FyxkUG0/59b6Y/Vfgs08Rs eDfZidUUmRM0/lea4hU+PV+4qJXwf6a/1L6lGkoCmGz32aJ+4ANhU11ip4CvF5i42yxtZA bsTrV784+u3MFPvzcnxfz7KxoKIOqThQpjB37wlTj3t6A6N8Azha2IxOiDFRSuOmHdx9z/ qzcu4GatR4gp9TgivjbAklCt/mp2UxKyzu8f1uzgf3XVeCZfmby+0WJWWWGWVoKHwxoGbx z/tcisTli7CxX2MOIDGs3m1ekB/n4SDG7kswbV89rX037/u9cVo7n/emoITfCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704996150; a=rsa-sha256; cv=none; b=QdMhp3LIQWVrdc/D0ywjQD8k352K68ON5MaVN2wH+dCanWw6V6HV6pobGsjkkqEsu9z2BP 1naE1pYwZ3yAdBkn4VjkYZ4ZsI/WCEzkOsJPQ12yQS/9L/U9kSs4LvJLcHqqfenQSSZRi/ 5Ha48t9Od3Cn7ZXpSwJ7MzISPF5P+Kbsz5sslz95LGx9PzoFPQMdmOZzlYJC5VCBe1Qhs1 yVHyf6iRBBzlStLpFqbRozOBOqgDfYvvkZ4m7m5LsE9S1Rf7p1EhzlAdBxBw94bJDyxufz tiRmvtyakOb4oCsrdJtAg4O0XY9PGHSouv+5pJ5zIpE5HlkgXxEvfKCNuoFb9Q== 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 4T9svV2lqgzTPL; Thu, 11 Jan 2024 18:02:30 +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 40BI2U6h083678; Thu, 11 Jan 2024 18:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40BI2Uij083675; Thu, 11 Jan 2024 18:02:30 GMT (envelope-from git) Date: Thu, 11 Jan 2024 18:02:30 GMT Message-Id: <202401111802.40BI2Uij083675@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: da8c93e915ee - 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: da8c93e915ee19fd92ea6a4f8b6368c3db6bef74 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=da8c93e915ee19fd92ea6a4f8b6368c3db6bef74 commit da8c93e915ee19fd92ea6a4f8b6368c3db6bef74 Author: Dirk Meyer AuthorDate: 2024-01-11 18:02:20 +0000 Commit: Dirk Meyer CommitDate: 2024-01-11 18:02:20 +0000 mail/sendmail-devel: use ${PREFIX}/share/man --- mail/sendmail-devel/Makefile | 17 ++++++++++------- mail/sendmail-devel/files/site.config.m4 | 4 ++-- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/mail/sendmail-devel/Makefile b/mail/sendmail-devel/Makefile index cba3642cc08a..712f6fc35fb1 100644 --- a/mail/sendmail-devel/Makefile +++ b/mail/sendmail-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= sendmail PORTVERSION= 8.18.0.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/snapshots/ PKGNAMESUFFIX?= -devel${PKGNAMESUFFIX2} @@ -32,7 +32,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 @@ -225,7 +225,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} @@ -252,18 +255,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-devel/files/site.config.m4 b/mail/sendmail-devel/files/site.config.m4 index 6fca36fdda64..bea3f87bc2c1 100644 --- a/mail/sendmail-devel/files/site.config.m4 +++ b/mail/sendmail-devel/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')