pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk make(1) will automatically delete partially made ta...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f2bab58dd159
branches: trunk
changeset: 514267:f2bab58dd159
user: jlam <jlam%pkgsrc.org@localhost>
date: Fri Jun 09 16:41:09 2006 +0000
description:
make(1) will automatically delete partially made targets if the target
creation fails, so remove instances where temporary files were created
then moved to the final target filename, and just directly create the
target. This is just for brevity/clarity, and saves a few tool calls.
diffstat:
mk/check/check-files.mk | 52 ++++++++++------------------
mk/flavor/pkg/depends.mk | 15 ++-----
mk/flavor/pkg/metadata.mk | 52 ++++++++++++----------------
mk/pkginstall/bsd.pkginstall.mk | 73 +++++++++++++---------------------------
4 files changed, 70 insertions(+), 122 deletions(-)
diffs (truncated from 651 to 300 lines):
diff -r ee51ed6b3e4c -r f2bab58dd159 mk/check/check-files.mk
--- a/mk/check/check-files.mk Fri Jun 09 16:37:18 2006 +0000
+++ b/mk/check/check-files.mk Fri Jun 09 16:41:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check-files.mk,v 1.4 2006/06/09 16:12:08 jlam Exp $
+# $NetBSD: check-files.mk,v 1.5 2006/06/09 16:41:09 jlam Exp $
.if defined(PKG_DEVELOPER)
CHECK_FILES?= yes
@@ -140,25 +140,22 @@
${_PKG_SILENT}${_PKG_DEBUG} \
${FIND} ${PREFIX}/. \( -type f -o -type l \) -print 2>/dev/null \
| ${SED} -e 's,/\./,/,' \
- | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET}.tmp \
+ | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET} \
|| ${TRUE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
${_CHECK_FILES_PRE.sysconfdir} ${_CHECK_FILES_POST.sysconfdir}:
${_PKG_SILENT}${_PKG_DEBUG} \
${FIND} ${PKG_SYSCONFDIR}/. -print 2>/dev/null \
| ${SED} -e 's,/\./,/,' \
- | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET}.tmp \
+ | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET} \
|| ${TRUE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
${_CHECK_FILES_PRE.varbase} ${_CHECK_FILES_POST.varbase}:
${_PKG_SILENT}${_PKG_DEBUG} \
${FIND} ${VARBASE}/. -print 2>/dev/null \
| ${SED} -e 's,/\./,/,' \
- | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET}.tmp \
+ | ${_CHECK_FILES_SKIP_FILTER} > ${.TARGET} \
|| ${TRUE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
###########################################################################
# check-files targets and subtargets
@@ -201,26 +198,22 @@
${_PKG_SILENT}${_PKG_DEBUG} \
${DIFF} -u ${_CHECK_FILES_PRE.prefix} \
${_CHECK_FILES_POST.prefix} \
- > ${.TARGET}.tmp || ${TRUE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ > ${.TARGET} || ${TRUE}
${_CHECK_FILES_ADDED}: ${_CHECK_FILES_DIFF}
${_PKG_SILENT}${_PKG_DEBUG} \
${GREP} '^+/' ${_CHECK_FILES_DIFF} | ${SED} "s|^+||" | ${SORT} \
- > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ > ${.TARGET}
${_CHECK_FILES_DELETED}: ${_CHECK_FILES_DIFF}
${_PKG_SILENT}${_PKG_DEBUG} \
${GREP} '^-/' ${_CHECK_FILES_DIFF} | ${SED} "s|^-||" | ${SORT} \
- > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ > ${.TARGET}
${_CHECK_FILES_EXPECTED}: plist
${_PKG_SILENT}${_PKG_DEBUG} \
${GREP} '^[^@]' ${PLIST} | ${SED} "s|^|${PREFIX}/|" | ${SORT} \
- > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ > ${.TARGET}
${_CHECK_FILES_MISSING}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
${_PKG_SILENT}${_PKG_DEBUG} \
@@ -228,14 +221,12 @@
${GREP} '^-[^-]' | ${SED} "s|^-||" | \
while read file; do \
${TEST} -f "$$file" || ${ECHO} "$$file"; \
- done > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ done > ${.TARGET}
${_CHECK_FILES_MISSING_REAL}: ${_CHECK_FILES_MISSING}
${_PKG_SILENT}${_PKG_DEBUG} \
${CAT} ${_CHECK_FILES_MISSING} | ${_CHECK_FILES_SKIP_FILTER} \
- > ${.TARGET}.tmp || ${TRUE}
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ > ${.TARGET} || ${TRUE}
${_CHECK_FILES_MISSING_SKIP}: \
${_CHECK_FILES_MISSING} \
@@ -244,8 +235,7 @@
${DIFF} -u ${_CHECK_FILES_MISSING} \
${_CHECK_FILES_MISSING_REAL} | \
${GREP} '^-[^-]' | ${SED} "s|^-||" \
- > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ > ${.TARGET}
${_CHECK_FILES_EXTRA}: ${_CHECK_FILES_EXPECTED} ${_CHECK_FILES_ADDED}
${_PKG_SILENT}${_PKG_DEBUG} \
@@ -253,8 +243,7 @@
${GREP} '^+[^+]' | ${SED} "s|^+||" | \
while read file; do \
${TEST} ! -f "$$file" || ${ECHO} "$$file"; \
- done > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ done > ${.TARGET}
.if defined(NO_PKG_REGISTER)
${_CHECK_FILES_ERRMSG.prefix}:
@@ -266,35 +255,34 @@
${_CHECK_FILES_MISSING_REAL} \
${_CHECK_FILES_MISSING_SKIP} \
${_CHECK_FILES_EXTRA}
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
+ ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_DELETED}; then \
${ECHO} "The following files have been deleted" \
"from ${PREFIX}!"; \
${SED} "s|^| |" ${_CHECK_FILES_DELETED}; \
- fi >> ${.TARGET}.tmp
+ fi >> ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_MISSING_REAL}; then \
${ECHO} "************************************************************"; \
${ECHO} "The following files are in the" \
"PLIST but not in ${PREFIX}:"; \
${SED} "s|^| |" ${_CHECK_FILES_MISSING_REAL}; \
- fi >> ${.TARGET}.tmp
+ fi >> ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_EXTRA}; then \
${ECHO} "************************************************************"; \
${ECHO} "The following files are in" \
"${PREFIX} but not in the PLIST:"; \
${SED} "s|^| |" ${_CHECK_FILES_EXTRA}; \
- fi >> ${.TARGET}.tmp
+ fi >> ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG} \
if ${_NONZERO_FILESIZE_P} ${_CHECK_FILES_MISSING_SKIP}; then \
${ECHO} "************************************************************"; \
${ECHO} "The following files are in both the" \
"PLIST and CHECK_FILES_SKIP:"; \
${SED} "s|^| |" ${_CHECK_FILES_MISSING_SKIP}; \
- fi >> ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ fi >> ${.TARGET}
.endif
# Check ${SYSCONFDIR} for files which are not in the PLIST and are also
@@ -319,8 +307,7 @@
${DIFF} -u ${_CHECK_FILES_PRE.sysconfdir} \
${_CHECK_FILES_POST.sysconfdir} | \
${GREP} '^+[^+]' | ${SED} "s|^+| |"; \
- fi > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ fi > ${.TARGET}
.endif
# Check ${VARBASE} for files which are not in the PLIST and are also
@@ -345,8 +332,7 @@
${DIFF} -u ${_CHECK_FILES_PRE.varbase} \
${_CHECK_FILES_POST.varbase} | \
${GREP} '^+[^+]' | ${SED} "s|^+| |"; \
- fi > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ fi > ${.TARGET}
.endif
###########################################################################
diff -r ee51ed6b3e4c -r f2bab58dd159 mk/flavor/pkg/depends.mk
--- a/mk/flavor/pkg/depends.mk Fri Jun 09 16:37:18 2006 +0000
+++ b/mk/flavor/pkg/depends.mk Fri Jun 09 16:41:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: depends.mk,v 1.5 2006/06/08 08:01:53 rillig Exp $
+# $NetBSD: depends.mk,v 1.6 2006/06/09 16:41:09 jlam Exp $
_DEPENDS_FILE= ${WRKDIR}/.depends
_REDUCE_DEPENDS_CMD= ${SETENV} CAT=${CAT:Q} \
@@ -40,8 +40,6 @@
${_DEPENDS_FILE}:
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET}.tmp
${_PKG_SILENT}${_PKG_DEBUG} \
${_REDUCE_DEPENDS_CMD} ${BUILD_DEPENDS:Q} | \
while read dep; do \
@@ -49,9 +47,8 @@
dir=`${ECHO} $$dep | ${SED} -e "s,.*:,,"`; \
${TEST} -n "$$pattern" || exit 1; \
${TEST} -n "$$dir" || exit 1; \
- ${ECHO} "build $$pattern $$dir" \
- >> ${.TARGET}.tmp; \
- done
+ ${ECHO} "build $$pattern $$dir"; \
+ done >> ${.TARGET}
${_PKG_SILENT}${_PKG_DEBUG} \
${_REDUCE_DEPENDS_CMD} ${DEPENDS:Q} | \
while read dep; do \
@@ -59,10 +56,8 @@
dir=`${ECHO} $$dep | ${SED} -e "s,.*:,,"`; \
${TEST} -n "$$pattern" || exit 1; \
${TEST} -n "$$dir" || exit 1; \
- ${ECHO} "full $$pattern $$dir" \
- >> ${.TARGET}.tmp; \
- done
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ ${ECHO} "full $$pattern $$dir"; \
+ done >> ${.TARGET}
######################################################################
### depends-install (PRIVATE, pkgsrc/mk/depends/depends.mk)
diff -r ee51ed6b3e4c -r f2bab58dd159 mk/flavor/pkg/metadata.mk
--- a/mk/flavor/pkg/metadata.mk Fri Jun 09 16:37:18 2006 +0000
+++ b/mk/flavor/pkg/metadata.mk Fri Jun 09 16:41:09 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.5 2006/06/08 08:01:53 rillig Exp $
+# $NetBSD: metadata.mk,v 1.6 2006/06/09 16:41:09 jlam Exp $
######################################################################
### The targets below are all PRIVATE.
@@ -93,9 +93,8 @@
${ECHO} "REQUIRES=$$req" >> ${.TARGET}.tmp; \
done
.endif
- ${_PKG_SILENT}${_PKG_DEBUG}${SORT} ${.TARGET}.tmp > ${.TARGET}.tmp2
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp2 ${.TARGET}
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${SORT} ${.TARGET}.tmp > ${.TARGET} && ${RM} -f ${.TARGET}.tmp
######################################################################
###
@@ -110,11 +109,13 @@
${_BUILD_VERSION_FILE}:
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}exec 1>>${.TARGET}.tmp; \
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ exec 1>>${.TARGET}.tmp; \
for f in ${.CURDIR}/Makefile ${FILESDIR}/* ${PKGDIR}/*; do \
${TEST} ! -f "$$f" || ${ECHO} "$$f"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}exec 1>>${.TARGET}.tmp; \
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ exec 1>>${.TARGET}.tmp; \
${TEST} -f ${DISTINFO_FILE:Q} || exit 0; \
${CAT} ${DISTINFO_FILE} | \
${AWK} 'NF == 4 && $$3 == "=" { gsub("[()]", "", $$2); print $$2 }' | \
@@ -122,7 +123,8 @@
${TEST} ! -f "${PATCHDIR}/$$file" || \
${ECHO} "${PATCHDIR}/$$file"; \
done
- ${_PKG_SILENT}${_PKG_DEBUG}exec 1>>${.TARGET}.tmp; \
+ ${_PKG_SILENT}${_PKG_DEBUG} \
+ exec 1>>${.TARGET}.tmp; \
${TEST} -d ${PATCHDIR} || exit 0; \
cd ${PATCHDIR}; for f in *; do \
case "$$f" in \
@@ -139,9 +141,8 @@
${AWK} '{ sub("^${PKGSRCDIR}/", ""); \
sub(":.*[$$]NetBSD", ": $$NetBSD"); \
sub("[$$][^$$]*$$", "$$"); \
- print; }' | ${SORT} -u > ${.TARGET}.tmp1 && \
- ${RM} -f ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp1 ${.TARGET}
+ print; }' | \
+ ${SORT} -u > ${.TARGET} && ${RM} -f ${.TARGET}.tmp
######################################################################
###
@@ -154,8 +155,7 @@
${_COMMENT_FILE}:
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${COMMENT:Q} > ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ${COMMENT:Q} > ${.TARGET}
######################################################################
###
@@ -168,14 +168,13 @@
${_DESCR_FILE}: ${DESCR_SRC}
${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
- ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} > ${.TARGET}.tmp
+ ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${.TARGET}
+ ${_PKG_SILENT}${_PKG_DEBUG}${CAT} ${.ALLSRC} > ${.TARGET}
.if defined(HOMEPAGE)
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} >> ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "Homepage:" >> ${.TARGET}.tmp
- ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ""${HOMEPAGE:Q} >> ${.TARGET}.tmp
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} >> ${.TARGET}
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} "Homepage:" >> ${.TARGET}
+ ${_PKG_SILENT}${_PKG_DEBUG}${ECHO} ""${HOMEPAGE:Q} >> ${.TARGET}
.endif
- ${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
######################################################################
###
@@ -222,11 +221,8 @@
Home |
Main Index |
Thread Index |
Old Index