Date: Sat, 28 Jun 2014 10:03:00 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r359680 - in head: Keywords Mk Message-ID: <201406281003.s5SA30Hc072320@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Sat Jun 28 10:03:00 2014 New Revision: 359680 URL: http://svnweb.freebsd.org/changeset/ports/359680 QAT: https://qat.redports.org/buildarchive/r359680/ Log: Use print/indexinfo to generate index of info pages It is much more lightweight than ginstall-info (12kB vs 400kB) and ginstall-info had a regression causing some index leftover on uninstall Submitted by: bapt Exp-run: self With hat: portmgr Modified: head/Keywords/info.yaml head/Mk/bsd.port.mk Modified: head/Keywords/info.yaml ============================================================================== --- head/Keywords/info.yaml Sat Jun 28 09:57:48 2014 (r359679) +++ head/Keywords/info.yaml Sat Jun 28 10:03:00 2014 (r359680) @@ -5,13 +5,7 @@ actions: [file] post-install: | file=%D/%@ - ginstall-info --quiet %D/%@ %D/info/dir + indexinfo ${file%/*} post-deinstall: | file=%D/%@ - ginstall-info --quiet --delete %D/%@ %D/info/dir - if [ $(ginfo -d ${file%/*} --output - 2>/dev/null | grep -c '^*') -eq 1 ]; then - rm -f ${file%/*}/dir - fi - if [ ${file%/*} != "%D/info" ]; then - rmdir ${file%/*} 2> /dev/null || true - fi + indexinfo ${file%/*} Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat Jun 28 09:57:48 2014 (r359679) +++ head/Mk/bsd.port.mk Sat Jun 28 10:03:00 2014 (r359680) @@ -2914,8 +2914,7 @@ INFO_PATH?= info .endif .if defined(INFO) -BUILD_DEPENDS+= ginstall-info:${PORTSDIR}/print/texinfo-lite -RUN_DEPENDS+= ginstall-info:${PORTSDIR}/print/texinfo-lite +RUN_DEPENDS+= indexinfo:${PORTSDIR}/print/indexinfo . for D in ${INFO:H} RD:= ${D} @@ -5656,16 +5655,12 @@ add-plist-info: # Process GNU INFO files at package install/deinstall time .for i in ${INFO} .if defined(NO_STAGE) - ginstall-info --quiet ${PREFIX}/${INFO_PATH}/$i.info ${PREFIX}/${INFO_PATH}/dir + indexinfo ${PREFIX}/${INFO_PATH} .endif .if !defined(WITH_PKGNG) - @${ECHO_CMD} "@unexec ginstall-info --quiet --delete %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ - >> ${TMPPLIST} - @${ECHO_CMD} "@unexec [ \`ginfo -d %D/${INFO_PATH} --output - 2>/dev/null | grep -c '^*'\` -eq 1 ] && rm -f %D/${INFO_PATH}/dir || :"\ - >> ${TMPPLIST} + @${ECHO_CMD} "@unexec indexinfo %D/${INFO_PATH}" >> ${TMPPLIST} @${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/::g >> ${TMPPLIST} - @${ECHO_CMD} "@exec ginstall-info --quiet %D/${INFO_PATH}/$i.info %D/${INFO_PATH}/dir" \ - >> ${TMPPLIST} + @${ECHO_CMD} "@exec indexinfo %D/${INFO_PATH}" >> ${TMPPLIST} .else @${LS} ${STAGEDIR}${PREFIX}/${INFO_PATH}/$i.info* | ${SED} -e s:${STAGEDIR}${PREFIX}/:@info\ :g >> ${TMPPLIST} .endif @@ -5678,7 +5673,7 @@ add-plist-info: .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} + @${ECHO_CMD} "@unexec indexinfo %D/${INFO_PATH}" >> ${TMPPLIST} .if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${LINUXBASE}) @${ECHO_CMD} "@dirrmtry ${INFO_PATH}" >> ${TMPPLIST} .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406281003.s5SA30Hc072320>