From nobody Mon Jan 8 12:19:28 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 4T7tR46VRmz55X67;
Mon, 8 Jan 2024 12:19:28 +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 4T7tR45y8Hz56y2;
Mon, 8 Jan 2024 12:19:28 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1704716368;
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=EdmswtefcgtriaVnK4EdRKfDqY+UDkUj0hKHVHe19RQ=;
b=TclIiIx4nfo7heOQKrw/Lxvw5CVxSN5wfREWqCaQl4no4m3NT9QjGeZL/qHXQCP9lFe5b6
sqya0uS4nO84EcmhbbHnszhyN6JrNHDaRcobHOkbMDaxu7ZbuPVlnC+/q5bUc1WpGKHgNU
8ghM2INNEoDM1/5zIBrzmyTPptyrG3iBhPIkCXMajAPWhcDOohVeRWmYj5o5ALf8DoKslJ
zvjab4YJBQSS7IFf2ErF9PeY75KfFhDW+BVJY3iJvzd/zD3uFbaECkuGrLVoPJthm/OfBN
E5dthc/HBIKW0U43HsRZMmSdP3+jTQRxUZPTiy5QtoMRSk+aD5UCMcc8KiD5eA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1704716368;
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=EdmswtefcgtriaVnK4EdRKfDqY+UDkUj0hKHVHe19RQ=;
b=c9BQxdzh+Dzy1+CQBmHZN3M9PvBQwHVPUCRj3Kog/d5R02mpOuBICh1MUjV8Kur2UuVK5x
r6IqGWDA0Es8lBXSZrZE37oFDKot/D52SCAFvppNgZjn4q6cqbLQQ7snNzgA54CfV0AOgT
RhxLJbkuJckA2W2nud+TB/+s6mz8A9UN0+srZMkKZnAo63vFi8PCLcJijguq3hIZjPXfIC
QO5f9y7sBJgGYmJmpTOf3zotJbe8a0u0SfYnCLR/myWLs7zx8kbxP9LF+gLayOWJcFRAmL
tA4vc4Eol04f4rrtCUHilC4c93bsul2lTAsyq730EBAU7BoIAaJiDU0KVvW0mw==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704716368; a=rsa-sha256; cv=none;
b=IATwxez0H0IQiIyxiRSMRKeGr9CoS4Hm5bYy4I9OqOaugxyzE124nyz0rciX3k581LPy5b
0EwZyVcCieDTlMMCxsAyMG+Ss2lG5y+2tvNhSABmv93k6ZQka0Bj0zqmEIIZVyfAYZ3o3T
y6131iF3WKWGIEuniI3pdR+VxcKBMNxFP0hTfNOIFyiQlMzMazEk0+NHS+ska669+k9lIW
Qr70lWqdPxj61EPgybI6GYE9TZ/CBlNY42lRixWQBS0hKlhmsR8+AwTdEy8lbqhm3ud5wM
/fBUF+zPRGJtusnyGaxPX+siNmVtEBp5k5/qhN73btB2aOxRuCzQJoW0ZgUXTw==
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 4T7tR451yPz16Wt;
Mon, 8 Jan 2024 12:19:28 +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 408CJSUE083132;
Mon, 8 Jan 2024 12:19:28 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408CJSVp083129;
Mon, 8 Jan 2024 12:19:28 GMT
(envelope-from git)
Date: Mon, 8 Jan 2024 12:19:28 GMT
Message-Id: <202401081219.408CJSVp083129@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-main@FreeBSD.org
From: Renato Botelho <garga@FreeBSD.org>
Subject: git: 811994a58524 - main - */*: Eliminate use of MANPREFIX
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
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: garga
X-Git-Repository: ports
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 811994a5852484a5997cad3f8ce8c6dd8af3484d
Auto-Submitted: auto-generated
The branch main has been updated by garga:
URL: https://cgit.FreeBSD.org/ports/commit/?id=811994a5852484a5997cad3f8ce8c6dd8af3484d
commit 811994a5852484a5997cad3f8ce8c6dd8af3484d
Author: Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-01-05 16:35:47 +0000
Commit: Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-01-08 12:19:07 +0000
*/*: Eliminate use of MANPREFIX
Follow bapt and remove any usage of MANPREFIX from ports I maintain. No
functional changes intended.
---
devel/cvsps-devel/Makefile | 2 +-
devel/cvsps/Makefile | 2 +-
devel/git/Makefile | 24 ++++++++++++------------
irc/bitlbee/Makefile | 2 +-
misc/ondir/Makefile | 2 +-
net-mgmt/choparp/Makefile | 2 +-
net/tcpdump/Makefile | 2 +-
net/wmnd/Makefile | 2 +-
security/keychain/Makefile | 2 +-
9 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/devel/cvsps-devel/Makefile b/devel/cvsps-devel/Makefile
index 9a74b7bbd063..37fa383e45a3 100644
--- a/devel/cvsps-devel/Makefile
+++ b/devel/cvsps-devel/Makefile
@@ -24,7 +24,7 @@ OPTIONS_DEFINE= DOCS
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index ffeb4ef99aa1..c0deb03094c6 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -21,7 +21,7 @@ OPTIONS_DEFINE= DOCS
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/
do-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/git/Makefile b/devel/git/Makefile
index fb4985d03cda..e4d923a69286 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -244,11 +244,11 @@ post-build-CONTRIB-on:
post-install:
(cd ${WRKDIR}/man1/ && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man1)
+ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man1)
(cd ${WRKDIR}/man5/ && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man5)
+ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man5)
(cd ${WRKDIR}/man7/ && \
- ${COPYTREE_SHARE} . ${STAGEDIR}${MANPREFIX}/man/man7)
+ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man7)
${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
@@ -313,11 +313,11 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/gitk-git/po/*.msg \
${STAGEDIR}${PREFIX}/share/gitk/lib/msgs/
${INSTALL_DATA} ${WRKDIR}/man1/git-citool.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_DATA} ${WRKDIR}/man1/git-gui.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_DATA} ${WRKDIR}/man1/gitk.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
.elif ${SUBPORT} == cvs
@@ -331,13 +331,13 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/git-cvsserver \
${STAGEDIR}${PREFIX}/libexec/git-core/
${INSTALL_DATA} ${WRKDIR}/man1/git-cvsimport.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_DATA} ${WRKDIR}/man1/git-cvsexportcommit.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_DATA} ${WRKDIR}/man1/git-cvsserver.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
${INSTALL_DATA} ${WRKDIR}/man7/gitcvs-migration.7 \
- ${STAGEDIR}${MANPREFIX}/man/man7/
+ ${STAGEDIR}${PREFIX}/man/man7/
.elif ${SUBPORT} == p4
@@ -346,7 +346,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py \
${STAGEDIR}${PREFIX}/libexec/git-core/git-p4
${INSTALL_DATA} ${WRKDIR}/man1/git-p4.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
.elif ${SUBPORT} == svn
@@ -355,7 +355,7 @@ do-install:
${INSTALL_SCRIPT} ${WRKSRC}/git-svn \
${STAGEDIR}${PREFIX}/libexec/git-core/
${INSTALL_DATA} ${WRKDIR}/man1/git-svn.1 \
- ${STAGEDIR}${MANPREFIX}/man/man1/
+ ${STAGEDIR}${PREFIX}/man/man1/
.endif
.include <bsd.port.mk>
diff --git a/irc/bitlbee/Makefile b/irc/bitlbee/Makefile
index 8bc53ac840a2..9fdf89e78cdd 100644
--- a/irc/bitlbee/Makefile
+++ b/irc/bitlbee/Makefile
@@ -52,7 +52,7 @@ OPTIONS_DEFAULT= GLIB GNUTLS JABBER OSCAR OTR TWITTER
CONFIGURE_ARGS= --config=/var/db/bitlbee \
--pcdir=${PREFIX}/libdata/pkgconfig \
--prefix=${PREFIX} \
- --mandir=${MANPREFIX}/man \
+ --mandir=${PREFIX}/man \
--strip=1 \
--yahoo=0
diff --git a/misc/ondir/Makefile b/misc/ondir/Makefile
index 7dca1bc82de7..c6a138f6049b 100644
--- a/misc/ondir/Makefile
+++ b/misc/ondir/Makefile
@@ -20,7 +20,7 @@ MAKE_ARGS= PREFIX="${PREFIX}" \
PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
do-install:
- ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
.include <bsd.port.mk>
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index 89a760c4686e..7e383480d0db 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -24,6 +24,6 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \
${STAGEDIR}${PREFIX}/sbin
${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.8 \
- ${STAGEDIR}${MAN8PREFIX}/man/man8
+ ${STAGEDIR}${PREFIX}/man/man8
.include <bsd.port.mk>
diff --git a/net/tcpdump/Makefile b/net/tcpdump/Makefile
index f8f726ddd20a..c7331f1465a5 100644
--- a/net/tcpdump/Makefile
+++ b/net/tcpdump/Makefile
@@ -57,6 +57,6 @@ post-configure:
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${STAGEDIR}/${PREFIX}/sbin
- ${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}/${MAN1PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}/${PREFIX}/man/man1
.include <bsd.port.mk>
diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index d41fbb9c79c1..3a4b163a2f29 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -23,7 +23,7 @@ PLIST_FILES= bin/wmnd \
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/wmnd ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${STAGEDIR}${MANPREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${STAGEDIR}${PREFIX}/man/man1
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/examples/wmndrc ${STAGEDIR}${EXAMPLESDIR}
diff --git a/security/keychain/Makefile b/security/keychain/Makefile
index be090b7daaf5..59c3d14d2561 100644
--- a/security/keychain/Makefile
+++ b/security/keychain/Makefile
@@ -33,7 +33,7 @@ post-patch:
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}${PREFIX}/man/man1
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}