diff options
| author | jlam <jlam> | 2002-01-25 07:16:16 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-01-25 07:16:16 +0000 |
| commit | 6c8f46e97c99f5e66910cc7cea50e73d728fffc2 (patch) | |
| tree | 9ed3e88df7df1e47ebe70aa6ade0639dcaf78f15 /mk | |
| parent | 914e37aabe6c6ce05cb1c076623d076c00364cb0 (diff) | |
| download | pkgsrc-6c8f46e97c99f5e66910cc7cea50e73d728fffc2.tar.gz | |
Optimize the code to extract distfiles based on the extract suffix by
putting them all into one large case statement instead of successive if
statements, and by removing the creation and constant testing of a temp
file to mark when the distfile is extracted.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index eccbfffb929..755e723f727 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.912 2002/01/23 13:05:51 seb Exp $ +# $NetBSD: bsd.pkg.mk,v 1.913 2002/01/25 07:16:16 jlam Exp $ # # This file is in the public domain. # @@ -1474,6 +1474,22 @@ EXTRACT_CMD${__suffix__}?= ${DECOMPRESS_CMD${__suffix__}} ${DOWNLOADED_DISTFILE} . endif .endfor +# _SHELL_EXTRACT is a case statement used to conditionalize the extraction +# of $${file} based on the file extension. +# +_SHELL_EXTRACT= case $$file in +.for __suffix__ in ${_EXTRACT_SUFFICES} +_SHELL_EXTRACT+= \ + *${__suffix__}) \ + { cd ${WRKDIR} && ${EXTRACT_CMD${__suffix__}}; }; \ + ;; +.endfor +_SHELL_EXTRACT+= \ + *) \ + { cd ${WRKDIR} && ${_DFLT_EXTRACT_CMD}; }; \ + ;; +_SHELL_EXTRACT+= esac; + ${WRKDIR}: .if !defined(KEEP_WRKDIR) . if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once" @@ -1506,25 +1522,9 @@ do-extract: ${WRKDIR} done . else . for __file__ in ${EXTRACT_ONLY} -. for __suffix__ in ${_EXTRACT_SUFFICES} ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ ! -f ${WRKDIR}/.extracted ]; then \ - case "${__file__}" in \ - *${__suffix__}) \ - file="${__file__}"; \ - { cd ${WRKDIR} && ${EXTRACT_CMD${__suffix__}}; }; \ - ${ECHO} "$$file" > ${WRKDIR}/.extracted; \ - ;; \ - esac; \ - fi -. endfor # __suffix__ - ${_PKG_SILENT}${_PKG_DEBUG} \ - if [ ! -f ${WRKDIR}/.extracted ]; then \ - file="${__file__}"; \ - { cd ${WRKDIR} && ${_DFLT_EXTRACT_CMD}; }; \ - ${ECHO} "$$file" > ${WRKDIR}/.extracted; \ - fi - ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR}/.extracted + file="${__file__}"; \ + ${_SHELL_EXTRACT} . endfor # __file__ . endif # defined(EXTRACT_CMD) .endif |