Re: git: 811994a58524 - main - */*: Eliminate use of MANPREFIX
Date: Mon, 08 Jan 2024 12:47:18 UTC
Hello Renato,
From CHANGES:
---
20200115:
AUTHOR: bapt@FreeBSD.org
${PREFIX}/share/man is now a valid location for manpages ${PREFIX}/man
being
considered as deprecated.
---
But just a few ports uses this location...
Cheers,
Renato Botelho <garga@freebsd.org> escreveu no dia segunda, 8/01/2024 à(s)
12:19:
> 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}
>
>
--
Nuno Teixeira
FreeBSD Committer (ports)