Date: Fri, 18 Oct 2013 08:44:09 +0200 From: Marcus von Appen <mva@FreeBSD.org> To: Andriy Gapon <avg@FreeBSD.org>, python@FreeBSD.org Subject: Re: PYDISTUTILS_AUTOPLIST, stage, man pages Message-ID: <20131018064409.GA1412@medusa.sysfault.org> In-Reply-To: <5260CA83.8080503@FreeBSD.org> References: <5260203B.6060502@FreeBSD.org> <20131017181944.GA1374@medusa.sysfault.org> <52604530.6040209@FreeBSD.org> <20131017220703.GA24842@medusa.sysfault.org> <5260CA83.8080503@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--17pEHd4RhPHOinZp
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
On, Fri Oct 18, 2013, Andriy Gapon wrote:
> on 18/10/2013 01:07 Marcus von Appen said the following:
> > Except for the fact that 'share/' is wrong for FreeBSD (which you know,
> > I guess ;-), I see what you mean. A fix for that might be to check the
> > directory for something matching on
> >
> > man/man[0-9]/*.[0-9]
> >
> > and append it automatically with a .gz in the ${_PYTHONPKGLIST} record
> > file within the add-plist-pymod target in bsd.python.mk
> >
> > Can you upload the port shar somewhere for a test?
>
> The port is here:
> https://redports.org/browser/avg/sysutils/py-obnam
> It also depends on the following four new ports (all matching py-*):
> https://redports.org/browser/avg/devel
>
> In the current shape the port "works", but installs the man pages into a wrong
> place. If I fix it like this:
>
> Index: Makefile
> ===================================================================
> --- Makefile (revision 18184)
> +++ Makefile (working copy)
> @@ -26,4 +26,7 @@
> USE_PYDISTUTILS= yes
> PYDISTUTILS_AUTOPLIST= yes
>
> +post-patch:
> + ${REINPLACE_CMD} 's#share/man#man#' ${WRKSRC}/${PYSETUP}
> +
> .include <bsd.port.mk>
>
> Then installation fails because auto-generated plist and what's in stage
> directory do not match.
>
> Thank you!
Can you give the following change to Mk/bsd.python.mk a try:
Index: Mk/bsd.python.mk
===================================================================
--- Mk/bsd.python.mk (revision 330721)
+++ Mk/bsd.python.mk (working copy)
@@ -528,7 +528,9 @@
${SED} '/^\.$$/d' > ${WRKDIR}/.localmtree
@${ECHO_CMD} "${_RELSITELIBDIR}" >> ${WRKDIR}/.localmtree
@${ECHO_CMD} "${_RELLIBDIR}" >> ${WRKDIR}/.localmtree
- @${SED} 's|^${PREFIX}/||' ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
+ @${SED} -e 's|^${PREFIX}/||' \
+ -e 's|^\(man/man[0-9]\)/\(.*.[0-9]\)|\1/\2${MANEXT}|' \
+ ${_PYTHONPKGLIST} | ${SORT} >> ${TMPPLIST}
@${SED} -e 's|^${PREFIX}/\(.*\)/\(.*\)|\1|' ${_PYTHONPKGLIST} | \
${AWK} '{ num = split($$0, a, "/"); res=""; \
for(i = 1; i <= num; ++i) { \
It adds the .gz to every man/manX/*.X, if it is defined (depending on
the NO_MANCOMPRESS setting).
Cheers
Marcus
--17pEHd4RhPHOinZp
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (FreeBSD)
iEYEARECAAYFAlJg2LkACgkQi68/ErJnpkf8RQCeM6BVywFtJJ/LNlCteeyg+Qpy
Mj4AoIBH5I6bUSya343kStcoMwM5G6Pr
=/cYc
-----END PGP SIGNATURE-----
--17pEHd4RhPHOinZp--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131018064409.GA1412>