FreeBSD Bugzilla – Attachment 188835 Details for
Bug 220214
Try to handle man files for USE_PYTHON=concurrent
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v2
uses-concurrent.diff (text/plain), 6.38 KB, created by
Mathieu Arnold
on 2017-12-14 17:31:39 UTC
(
hide
)
Description:
v2
Filename:
MIME Type:
Creator:
Mathieu Arnold
Created:
2017-12-14 17:31:39 UTC
Size:
6.38 KB
patch
obsolete
>base commit: r456026 >diff --git Mk/Uses/python.mk Mk/Uses/python.mk >index 9030c3a..aa1356c 100644 >--- Mk/Uses/python.mk >+++ Mk/Uses/python.mk >@@ -576,14 +576,23 @@ UNIQUE_DEFAULT_LINKS= no > .endif > UNIQUE_PREFIX= ${PYTHON_PKGNAMEPREFIX} > UNIQUE_SUFFIX= -${PYTHON_VER} >+UNIQUE_SUFFIX_TYPES+= SUFFIX_MAN >+UNIQUE_SUFFIX_MAN_WITH_EXT= .[1-9ln] > > .if defined(_PYTHON_FEATURE_AUTOPLIST) > UNIQUE_FIND_SUFFIX_FILES= \ > ${SED} -e 's|^${PREFIX}/||' ${_PYTHONPKGLIST} ${TMPPLIST} | \ > ${EGREP} -e '^bin/.*$$|^sbin/.*$$|^libexec/.*$$' >+UNIQUE_FIND_SUFFIX_MAN_FILES= \ >+ ${SED} -e 's|^${PREFIX}/||' ${_PYTHONPKGLIST} ${TMPPLIST} | \ >+ ${EGREP} -e '^man/man[1-9ln]/.*$$' | \ >+ ${SED} -e 's/\.gz$$//' > .else > UNIQUE_FIND_SUFFIX_FILES= \ > ${EGREP} -he '^bin/.*$$|^sbin/.*$$|^libexec/.*$$' ${TMPPLIST} 2>/dev/null >+UNIQUE_FIND_SUFFIX_MAN_FILES= \ >+ ${EGREP} -he '^man/man[1-9ln]/.*$$' ${TMPPLIST} 2>/dev/null | \ >+ ${SED} -e 's/\.gz$$//' > .endif > .endif # defined(_PYTHON_FEATURE_CONCURRENT) > >diff --git Mk/Uses/uniquefiles.mk Mk/Uses/uniquefiles.mk >index 940ef35..bc99fdc 100644 >--- Mk/Uses/uniquefiles.mk >+++ Mk/Uses/uniquefiles.mk >@@ -69,6 +69,8 @@ UNIQUE_SUFFIX?= ${PKGNAMESUFFIX} > UNIQUE_PREFIX_FILES?= # empty > UNIQUE_SUFFIX_FILES?= # empty > >+UNIQUE_SUFFIX_TYPES+= SUFFIX >+ > .if ${uniquefiles_ARGS:Mdirs} > DOCSDIR= ${PREFIX}/share/doc/${UNIQUE_PREFIX}${PORTNAME} > EXAMPLESDIR= ${PREFIX}/share/examples/${UNIQUE_PREFIX}${PORTNAME} >@@ -134,13 +136,20 @@ move-uniquefiles: > done; > .endif > >-.if ${UNIQUE_SUFFIX_FILES} || ${UNIQUE_FIND_SUFFIX_FILES} >+.for sufxtype in ${UNIQUE_SUFFIX_TYPES} >+. if (defined(UNIQUE_${sufxtype}_FILES) && ${UNIQUE_${sufxtype}_FILES}) || \ >+ (defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES}) >+. if defined(UNIQUE_${sufxtype}_WITH_EXT) && ${UNIQUE_${sufxtype}_WITH_EXT} >+ @${ECHO_MSG} "===> Creating unique files: Move ${sufxtype:S|SUFFIX_||} files needing SUFFIX"; >+. else > @${ECHO_MSG} "===> Creating unique files: Move files needing SUFFIX"; >-.endif >-.for entry in ${UNIQUE_SUFFIX_FILES} >+. endif >+. endif >+. for entry in ${UNIQUE_${sufxtype}_FILES} > @fname=${entry}; \ > if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ >- newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \ >+ ofname=$${fname##*/}; \ >+ newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \ > ${ECHO_MSG} "Move: $${fname} --> $${newf}"; \ > ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ > ${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \ >@@ -149,11 +158,12 @@ move-uniquefiles: > ${ECHO_MSG} "Makefile error: UNIQUE (suffix): $${fname} not found"; \ > ${FALSE}; \ > fi; >-.endfor >-.if ${UNIQUE_FIND_SUFFIX_FILES} >- @for fname in `${UNIQUE_FIND_SUFFIX_FILES}`; do \ >+. endfor >+. if defined(UNIQUE_FIND_${sufxtype}_FILES) && ${UNIQUE_FIND_${sufxtype}_FILES} >+ @for fname in `${UNIQUE_FIND_${sufxtype}_FILES}`; do \ > if [ -e ${STAGEDIR}${PREFIX}/$${fname} -o -L ${STAGEDIR}${PREFIX}/$${fname} ]; then \ >- newf=$${fname%/*}/$${fname##*/}${UNIQUE_SUFFIX}; \ >+ ofname=$${fname##*/}; \ >+ newf=$${fname%/*}/$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}${UNIQUE_SUFFIX}$${ofname#$${ofname%${UNIQUE_${sufxtype}_WITH_EXT}}}; \ > ${ECHO_MSG} "Move: $${fname} --> $${newf}"; \ > ${MV} ${STAGEDIR}${PREFIX}/$${fname} ${STAGEDIR}${PREFIX}/$${newf}; \ > ${ECHO_CMD} MOVED:$${fname}:$${newf} >> ${_UNIQUEPKGLIST}; \ >@@ -163,7 +173,8 @@ move-uniquefiles: > ${FALSE}; \ > fi; \ > done; >-.endif >+. endif >+.endfor > > # Using .if exists(${_UNIQUEPKGPLIST} below instead of the sh test > # does not work in poudriere. It works fine on the CLI, though... >@@ -172,6 +183,8 @@ move-uniquefiles-plist: > @if [ -e ${_UNIQUEPKGLIST} ]; then \ > orgIFS=$$IFS; IFS=":"; while read command entry newentry; do \ > IFS=$$orgIFS; \ >+ case $$entry in man/man[0-9ln]/*) entry="$$entry.gz" ;; esac; \ >+ case $$newentry in man/man[0-9ln]/*) newentry="$$newentry.gz" ;; esac; \ > case $${command} in \ > MOVED) \ > ${REINPLACE_CMD} -e "s|^$${entry}$$|$${newentry}|" ${TMPPLIST}; \ >diff --git mail/py-pymailq/Makefile mail/py-pymailq/Makefile >index fb65284..ce2e733 100644 >--- mail/py-pymailq/Makefile >+++ mail/py-pymailq/Makefile >@@ -19,12 +19,7 @@ NO_ARCH= yes > USES= python:2.7+ > USE_PYTHON= autoplist distutils concurrent > >-.include <bsd.port.pre.mk> >- >-PLIST_FILES+= man/man1/pqshell-${PYTHON_VER}.1.gz >-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} >-PLIST_FILES+= man/man1/pqshell.1.gz >-.endif >+PLIST_FILES= man/man1/pqshell.1.gz > > post-patch: > @${REINPLACE_CMD} -e \ >@@ -32,9 +27,6 @@ post-patch: > ${WRKSRC}/setup.py > > post-install: >- ${INSTALL_MAN} ${WRKSRC}/man/pqshell.1 ${STAGEDIR}${MANPREFIX}/man/man1/pqshell-${PYTHON_VER}.1 >-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} >- ${LN} -sf pqshell-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/pqshell.1 >-.endif >+ ${INSTALL_MAN} ${WRKSRC}/man/pqshell.1 ${STAGEDIR}${MANPREFIX}/man/man1/pqshell.1 > >-.include <bsd.port.post.mk> >+.include <bsd.port.mk> >diff --git math/py-numpy/Makefile math/py-numpy/Makefile >index 374ed0f..d33997f 100644 >--- math/py-numpy/Makefile >+++ math/py-numpy/Makefile >@@ -46,10 +46,6 @@ TESTS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${FLAVOR} > > .include <bsd.port.pre.mk> > >-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} >-PLIST_FILES+= man/man1/f2py.1.gz >-.endif >- > post-patch: > @${REINPLACE_CMD} -e "s|%%FC%%|${FC}|" ${WRKSRC}/numpy/distutils/fcompiler/gnu.py > @${CP} ${FILESDIR}/site.cfg ${WRKSRC}/site.cfg >@@ -86,10 +82,7 @@ pre-configure-SUITESPARSE-off: > @${REINPLACE_CMD} -e "s|:%%LOCALBASE%%/include/suitesparse||" ${WRKSRC}/site.cfg > > post-install: >- ${INSTALL_MAN} ${WRKSRC}/doc/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py-${PYTHON_VER}.1 >-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION} >- ${LN} -sf f2py-${PYTHON_VER}.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1 >-.endif >+ ${INSTALL_MAN} ${WRKSRC}/doc/f2py/f2py.1 ${STAGEDIR}${MANPREFIX}/man/man1/f2py.1 > ${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -name '*.so' | ${XARGS} ${STRIP_CMD} > > post-install-DOCS-on: >diff --git math/py-numpy/pkg-plist math/py-numpy/pkg-plist >index 62b1eb8..34bee43 100644 >--- math/py-numpy/pkg-plist >+++ math/py-numpy/pkg-plist >@@ -771,4 +771,4 @@ bin/f2py > %%PYTHON_SITELIBDIR%%/numpy/version.py > %%PYTHON_SITELIBDIR%%/numpy/version.pyc > %%PYTHON_SITELIBDIR%%/numpy/version.pyo >-man/man1/f2py-%%PYTHON_VER%%.1.gz >+man/man1/f2py.1.gz
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 220214
:
183717
|
184080
|
188715
| 188835