Date: Fri, 18 Oct 2013 08:42:38 -0600 From: John Hein <jhein@symmetricom.com> To: <mva@freebsd.org> Cc: python@freebsd.org Subject: Re: PYDISTUTILS_AUTOPLIST, stage, man pages Message-ID: <21089.18654.805483.17460@gromit.timing.com> In-Reply-To: <20131018093947.Horde.dMzpGTK02ZW8_6ahbZyciA1@webmail.df.eu> References: <5260203B.6060502@FreeBSD.org> <20131017181944.GA1374@medusa.sysfault.org> <52604530.6040209@FreeBSD.org> <20131017220703.GA24842@medusa.sysfault.org> <5260CA83.8080503@FreeBSD.org> <20131018064409.GA1412@medusa.sysfault.org> <5260DA34.8090501@FreeBSD.org> <20131018093947.Horde.dMzpGTK02ZW8_6ahbZyciA1@webmail.df.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
Marcus von Appen wrote at 09:39 +0200 on Oct 18, 2013:
> Andriy Gapon <avg@freebsd.org>:
>
> > on 18/10/2013 09:44 Marcus von Appen said the following:
> >> 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).
> >
> > Woo-hoo, thanks a lot! The patch worked perfectly for me.
> > From pkg info -l py27-obnam-1.5:
> > /usr/local/man/man1/obnam-benchmark.1.gz
> > /usr/local/man/man1/obnam-viewprof.1.gz
> > /usr/local/man/man1/obnam.1.gz
>
> Excellent! I'll commit it later on.
Maybe you should escape the '.' before the [0-9] (like below).
Also if ${_PYTHONPKGLIST} already has entries with, then the patch
above will append another ${MANEXT}. Maybe adding '$' (also below)
will be better.
Is it worth trying to handle man{l,n}? They are defined in
BSD.local.dist, but I don't know of any ports that use them anymore?
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) { \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?21089.18654.805483.17460>