From nobody Mon Jan 8 12:47:18 2024 X-Original-To: dev-commits-ports-all@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 4T7v3R1fSvz55bmv; Mon, 8 Jan 2024 12:47:31 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T7v3R1NNFz59Vc; Mon, 8 Jan 2024 12:47:31 +0000 (UTC) (envelope-from eduardo@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704718051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pmLgN92UGfa05hiKKDtCrAlxCdT0xYe0HD08+i27blo=; b=K4fvzGKyRbhrrTKAvceN9Rxd2EDdU/TK5HhHeCLRu/RTQApapYwdbWBaYWCWoN+QGHpjyD P2B8tM3b/BQAoIX59TxgMKI2e5YcJvP8GFaQHMwRJt8wM6PSlt7iB3h7ARxnDAgry864fl 8LVt4FWaL725yFgQNDosC/Oa5gt8f71Y2/3yK0MX+rNam6AxsHactxbKKKDMukn+fP2E+g dUprAuMXofAz4t8cj9vqJ6RzWNpvp9vuFVjvJLkxrCTyrnu4cMYOa7uMpZ1QIsMCnp3WM0 Hkvqy77+3fLVmV6wFlmld7E6adUFfstp1froJ7KMiWaUxIEoBgl0EDwjBXO6GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704718051; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=pmLgN92UGfa05hiKKDtCrAlxCdT0xYe0HD08+i27blo=; b=l16etzSgSyiGN6AunBkoCQgjDYfLijQA0sGFmJV8yxLD6lNdPalFgdMaNRDhx4zVLDHKIk B3LAp9CkSTsZ7zXT4UkLbgOiyGqz0zWXfeYKvOoEdBG111shLuBMp8Z69skzlTzyJJHkPQ 38QbBuIAwG6kP90SkHENY9vYliQ7wIpVWTKgd7+OMipAcQTSmI1Bzqgw75m6otyuZPemkk 4liQqUY55wytzgIvxYN27qTukAsg1BtHt+KtLuVx9E4noAzHD1SgZBpnAYyWFonTNbYGSV LY9BfrVh7C1C0Ao8t7bvXmQT0difdJdYI5Q4+d56G16G3dIOqphzSktBdQYsiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704718051; a=rsa-sha256; cv=none; b=rkJaRDWf1jT2IzCeWzPaPZxge7QmVsAsIcxwP1VLH8fkHCmAa1J4KHSR3e5DLXbiVmYoJt 9l0Jxyly+MMggfOoZrWRKK2yEjl44afpZbWKFr1iM/1V8bhcD8ikhGTCRQWr8kZNPeYRxT GRX0Jxu7oeDmxSaVJ5DbXoJ+S1psBf5n5v7+2mB4ZJS2L2hpkV5JryH78A4/MsTQUpllCL q4SI2TfJe3E0O7AD9kGdmMvGQ6/TEVd+ZAJsZQ7/0eM1Y9aVI3/luY5zQ09T6WaEqRebyK tyARK/r7B4VtPYfA32hSJ45Fn6U2Xeq7Y/apkW4JWpR80xpjJJn+Uc2il6aoRg== Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) (Authenticated sender: eduardo) by smtp.freebsd.org (Postfix) with ESMTPSA id 4T7v3R0HdVz17s0; Mon, 8 Jan 2024 12:47:31 +0000 (UTC) (envelope-from eduardo@freebsd.org) Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-42993124fa1so7969211cf.3; Mon, 08 Jan 2024 04:47:31 -0800 (PST) X-Gm-Message-State: AOJu0YwZNLOzCox0CqSsRzaYd+skZbfYAMRnqEL1mNTtk6JouR6WSZSA aMZXOu6j7SqDGmWeSzcuyiAHBS6ggyTmTu1baOE= X-Google-Smtp-Source: AGHT+IFo9wlBvp9HM0gErmTGNYv1PKVKjzvYmXbNkyOsBJgfmRgWyzSQl30aMAn6MdmOI6zTtw3e5M5vjdekXhpncfM= X-Received: by 2002:ac8:5996:0:b0:429:97ab:f8a5 with SMTP id e22-20020ac85996000000b0042997abf8a5mr1296833qte.14.1704718049976; Mon, 08 Jan 2024 04:47:29 -0800 (PST) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 References: <202401081219.408CJSVp083129@gitrepo.freebsd.org> In-Reply-To: <202401081219.408CJSVp083129@gitrepo.freebsd.org> From: Nuno Teixeira Date: Mon, 8 Jan 2024 12:47:18 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: git: 811994a58524 - main - */*: Eliminate use of MANPREFIX To: Renato Botelho Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000cfa987060e6e99f7" --000000000000cfa987060e6e99f7 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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 escreveu no dia segunda, 8/01/2024 =C3= =A0(s) 12:19: > The branch main has been updated by garga: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3D811994a5852484a5997cad3f8ce8c= 6dd8af3484d > > commit 811994a5852484a5997cad3f8ce8c6dd8af3484d > Author: Renato Botelho > AuthorDate: 2024-01-05 16:35:47 +0000 > Commit: Renato Botelho > 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=3D 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=3D 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} =3D=3D 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} =3D=3D 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} =3D=3D 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 > 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=3D GLIB GNUTLS JABBER OSCAR OTR > TWITTER > CONFIGURE_ARGS=3D --config=3D/var/db/bitlbee \ > --pcdir=3D${PREFIX}/libdata/pkgconfig \ > --prefix=3D${PREFIX} \ > - --mandir=3D${MANPREFIX}/man \ > + --mandir=3D${PREFIX}/man \ > --strip=3D1 \ > --yahoo=3D0 > > 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=3D PREFIX=3D"${PREFIX}" \ > PLIST_FILES=3D 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 > 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 > 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 > 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=3D 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}${EXAMPLESDI= R} > > 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} > > --=20 Nuno Teixeira FreeBSD Committer (ports) --000000000000cfa987060e6e99f7 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello Renato,

From CHANGES:<= br>
---
20200115:
AUTHOR: bapt@FreeBSD.org
=C2=A0 ${PREFIX}/share/man is now a valid location for manpages ${PREFIX}= /man being
=C2=A0 considered as deprecated.
---

=
But just a few ports uses this location...

<= div>Cheers,

Renato Botelho <garga@freebsd.org> escreveu no dia segunda, 8/01/2024 =C3=A0(s) 12= :19:
The branch = main has been updated by garga:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D811994a5852484a5997cad3f8ce8c6dd8af3484d

commit 811994a5852484a5997cad3f8ce8c6dd8af3484d
Author:=C2=A0 =C2=A0 =C2=A0Renato Botelho <garga@FreeBSD.org>
AuthorDate: 2024-01-05 16:35:47 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Renato Botelho <garga@FreeBSD.org>
CommitDate: 2024-01-08 12:19:07 +0000

=C2=A0 =C2=A0 */*: Eliminate use of MANPREFIX

=C2=A0 =C2=A0 Follow bapt and remove any usage of MANPREFIX from ports I ma= intain.=C2=A0 No
=C2=A0 =C2=A0 functional changes intended.
---
=C2=A0devel/cvsps-devel/Makefile |=C2=A0 2 +-
=C2=A0devel/cvsps/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0devel/git/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0| 24 ++++++++++++= ------------
=C2=A0irc/bitlbee/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0misc/ondir/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
=C2=A0net-mgmt/choparp/Makefile=C2=A0 |=C2=A0 2 +-
=C2=A0net/tcpdump/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
=C2=A0net/wmnd/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
=C2=A0security/keychain/Makefile |=C2=A0 2 +-
=C2=A09 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=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0DOCS

=C2=A0do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAG= EDIR}${PREFIX}/bin/
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGED= IR}${MAN1PREFIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGED= IR}${PREFIX}/man/man1/

=C2=A0do-install-DOCS-on:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @${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=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0DOCS

=C2=A0do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAG= EDIR}${PREFIX}/bin/
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGED= IR}${MAN1PREFIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGED= IR}${PREFIX}/man/man1/

=C2=A0do-install-DOCS-on:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @${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:

=C2=A0post-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (cd ${WRKDIR}/man1/ && \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${COPYTREE_SHARE} .= ${STAGEDIR}${MANPREFIX}/man/man1)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${COPYTREE_SHARE} .= ${STAGEDIR}${PREFIX}/man/man1)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (cd ${WRKDIR}/man5/ && \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${COPYTREE_SHARE} .= ${STAGEDIR}${MANPREFIX}/man/man5)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${COPYTREE_SHARE} .= ${STAGEDIR}${PREFIX}/man/man5)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 (cd ${WRKDIR}/man7/ && \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${COPYTREE_SHARE} .= ${STAGEDIR}${MANPREFIX}/man/man7)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${COPYTREE_SHARE} .= ${STAGEDIR}${PREFIX}/man/man7)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-= lisp/git
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el = \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${STAGEDIR}${PREFIX= }/share/emacs/site-lisp/git/
@@ -313,11 +313,11 @@ do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKSRC}/gitk-git/po/*.msg \ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${STAGEDIR}${PREFIX= }/share/gitk/lib/msgs/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-citool.1 \ -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-gui.1 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/gitk.1 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/

=C2=A0.elif ${SUBPORT} =3D=3D cvs

@@ -331,13 +331,13 @@ do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_SCRIPT} ${WRKSRC}/git-cvsserver \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${STAGEDIR}${PREFIX= }/libexec/git-core/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-cvsimport.1 = \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-cvsexportcom= mit.1 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-cvsserver.1 = \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man7/gitcvs-migration= .7 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man7/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man7/

=C2=A0.elif ${SUBPORT} =3D=3D p4

@@ -346,7 +346,7 @@ do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${STAGEDIR}${PREFIX= }/libexec/git-core/git-p4
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-p4.1 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/

=C2=A0.elif ${SUBPORT} =3D=3D svn

@@ -355,7 +355,7 @@ do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_SCRIPT} ${WRKSRC}/git-svn \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${STAGEDIR}${PREFIX= }/libexec/git-core/
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKDIR}/man1/git-svn.1 \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MANPRE= FIX}/man/man1/
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man1/
=C2=A0.endif

=C2=A0.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=3D=C2=A0 =C2=A0 =C2=A0 GLIB GNUTLS JABBER= OSCAR OTR TWITTER
=C2=A0CONFIGURE_ARGS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 --config=3D/var/db/bitlbee \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 --pcdir=3D${PREFIX}/libdata/pkgconfig \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 --prefix=3D${PREFIX} \
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0--mandir=3D${MANPREFIX}/man \
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0--mandir=3D${PREFIX}/man \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 --strip=3D1 \
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 --yahoo=3D0

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=3D=C2=A0 =C2=A0 PREFIX=3D"${PREFIX}" = \
=C2=A0PLIST_FILES=3D=C2=A0 =C2=A0bin/${PORTNAME} man/man1/${PORTNAME}.1.gz<= br>
=C2=A0do-install:
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGED= IR}${MANPREFIX}/man/man1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGED= IR}${PREFIX}/man/man1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAG= EDIR}${PREFIX}/bin

=C2=A0.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:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} \<= br> =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 ${STAGEDIR}${PREFIX= }/sbin
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_MAN} ${WRKSRC}/src/${PORTNAME}.8 \ -=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${MAN8PR= EFIX}/man/man8
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${STAGEDIR}${PREFIX= }/man/man8

=C2=A0.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:

=C2=A0do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${STAGEDIR= }/${PREFIX}/sbin
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}/= ${MAN1PREFIX}/man/man1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/tcpdump.1 ${STAGEDIR}/= ${PREFIX}/man/man1

=C2=A0.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=3D=C2=A0 bin/wmnd \

=C2=A0do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_PROGRAM} ${WRKSRC}/src/wmnd ${STAGEDI= R}${PREFIX}/bin
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${STAGEDIR}= ${MANPREFIX}/man/man1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/doc/wmnd.1 ${STAGEDIR}= ${PREFIX}/man/man1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${WRKSRC}/examples/wmndrc ${STA= GEDIR}${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:

=C2=A0do-install:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGE= DIR}${PREFIX}/bin
-=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}= ${MAN1PREFIX}/man/man1
+=C2=A0 =C2=A0 =C2=A0 =C2=A0${INSTALL_MAN} ${WRKSRC}/keychain.1 ${STAGEDIR}= ${PREFIX}/man/man1
=C2=A0 =C2=A0 =C2=A0 =C2=A0 @${MKDIR} ${STAGEDIR}${DOCSDIR}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${S= TAGEDIR}${DOCSDIR}



--
Nuno Teixeira
FreeBSD Committ= er (ports)
--000000000000cfa987060e6e99f7--