Date: Sat, 23 Nov 2013 09:48:42 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334652 - in head: Keywords Mk Message-ID: <201311230948.rAN9mgS8032212@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Sat Nov 23 09:48:42 2013 New Revision: 334652 URL: http://svnweb.freebsd.org/changeset/ports/334652 Log: Fix handling of info files with pkgng, when dealing with .info-X files and also what INFO_SUBDIR. The .info-X handling was wrong since the beginning of pkgng, the INFO_SUBDIR regression was introduced with stage PR: ports/184178 Reported by: gerald Tested by: gerald Modified: head/Keywords/info.yaml head/Mk/bsd.port.mk head/Mk/bsd.stage.mk Modified: head/Keywords/info.yaml ============================================================================== --- head/Keywords/info.yaml Sat Nov 23 09:25:06 2013 (r334651) +++ head/Keywords/info.yaml Sat Nov 23 09:48:42 2013 (r334652) @@ -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 Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat Nov 23 09:25:06 2013 (r334651) +++ head/Mk/bsd.port.mk Sat Nov 23 09:48:42 2013 (r334652) @@ -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} Modified: head/Mk/bsd.stage.mk ============================================================================== --- head/Mk/bsd.stage.mk Sat Nov 23 09:25:06 2013 (r334651) +++ head/Mk/bsd.stage.mk Sat Nov 23 09:48:42 2013 (r334652) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311230948.rAN9mgS8032212>