diff options
| -rw-r--r-- | Keywords/info.yaml | 4 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 9 | ||||
| -rw-r--r-- | Mk/bsd.stage.mk | 18 |
3 files changed, 10 insertions, 21 deletions
diff --git a/Keywords/info.yaml b/Keywords/info.yaml index b4bf1e78330e..e571d3a1e7a5 100644 --- a/Keywords/info.yaml +++ b/Keywords/info.yaml @@ -5,10 +5,10 @@ actions: [file] post-install: | file=%D/%@ - install-info --quiet %D/%@ ${file%/*}/dir + install-info --quiet %D/%@ %D/info/dir post-deinstall: | file=%D/%@ - install-info --quiet --delete %D/%@ ${file%/*}/dir + install-info --quiet --delete %D/%@ %D/info/dir if [ $(info -d ${file%/*} --output - 2>/dev/null | grep -c '^*') -eq 1 ]; then rm -f ${file%/*}/dir fi diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 545dfb5986e7..8ebc8cebcfd9 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6001,7 +6001,9 @@ add-plist-info: # Process GNU INFO files at package install/deinstall time .if defined(INFO) .for i in ${INFO} +.if defined(NO_STAGE) install-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir +.endif .if !defined(WITH_PKGNG) @${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} @@ -6011,11 +6013,16 @@ add-plist-info: @${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ >> ${TMPPLIST} .else - @${LS} ${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${PREFIX}/:@info\ :g >> ${TMPPLIST} + @${ECHO_CMD} "@info ${INFO_PATH}/$i.info" >> ${TMPPLIST} + @${LS} ${PREFIX}/${INFO_PATH}/$i.info-* 2>/dev/null | ${SED} -e s:${PREFIX}/:@info\ :g >> ${TMPPLIST} .endif .endfor .if defined(INFO_SUBDIR) +.if !defined(WITH_PKGNG) @${ECHO_CMD} "@unexec ${RMDIR} %D/${INFO_PATH}/${INFO_SUBDIR} 2> /dev/null || true" >> ${TMPPLIST} +.else + @${ECHO_CMD} "@dirrmtry ${INFO_PATH}/${INFO_SUBDIR}" >> ${TMPPLIST} +.endif .endif .if (${PREFIX} != "/usr") @${ECHO_CMD} "@unexec if [ -f %D/${INFO_PATH}/dir ]; then if sed -e '1,/Menu:/d' %D/${INFO_PATH}/dir | grep -q '^[*] '; then true; else rm %D/${INFO_PATH}/dir; fi; fi" >> ${TMPPLIST} diff --git a/Mk/bsd.stage.mk b/Mk/bsd.stage.mk index ed24a79e0e5d..bb480c7c5cae 100644 --- a/Mk/bsd.stage.mk +++ b/Mk/bsd.stage.mk @@ -68,24 +68,6 @@ compress-man: done .endif -.if !target(add-plist-info) -add-plist-info: -.for i in ${INFO} -.if !defined(WITH_PKGNG) - @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec install-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ - >> ${TMPPLIST} - @${ECHO_CMD} "@unexec [ \`info -d %D/${INFO_PATH} --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\ - >> ${TMPPLIST} - @${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST} - @${ECHO_CMD} "@exec install-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ - >> ${TMPPLIST} -.else - @${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST} -.endif -.endfor -.endif - .if !target(makeplist) makeplist: stage @${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist |