summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorknu <knu@FreeBSD.org>2001-09-22 11:42:33 +0000
committerknu <knu@FreeBSD.org>2001-09-22 11:42:33 +0000
commit0bad99f77473917cfa663caf181cfece57985310 (patch)
tree517a445e0298ffb5bf2cd491ca0fdf4eaf13b7d5 /Mk
parent06511e7664a72a3142f9da2f37eec017491d0142 (diff)
downloadFreeBSD-ports-0bad99f77473917cfa663caf181cfece57985310.zip
FreeBSD-ports-0bad99f77473917cfa663caf181cfece57985310.tar.gz
Include ${PKGNAME} in the names of cookie files so that a port would
never re-use outdated, stale working directories. Approved by: portmgr (sobomax)
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.port.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index b26e81c..729fff0 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -911,12 +911,12 @@ LIB_DEPENDS+= X11.6:${PORTSDIR}/x11/XFree86-4-libraries
# Don't change these!!! These names are built into the _TARGET_USE macro,
# there is no way to refer to them cleanly from within the macro AFAIK.
-EXTRACT_COOKIE?= ${WRKDIR}/.extract_done
-CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done
-INSTALL_COOKIE?= ${WRKDIR}/.install_done
-BUILD_COOKIE?= ${WRKDIR}/.build_done
-PATCH_COOKIE?= ${WRKDIR}/.patch_done
-PACKAGE_COOKIE?= ${WRKDIR}/.package_done
+EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PKGNAME}
+CONFIGURE_COOKIE?= ${WRKDIR}/.configure_done.${PKGNAME}
+INSTALL_COOKIE?= ${WRKDIR}/.install_done.${PKGNAME}
+BUILD_COOKIE?= ${WRKDIR}/.build_done.${PKGNAME}
+PATCH_COOKIE?= ${WRKDIR}/.patch_done.${PKGNAME}
+PACKAGE_COOKIE?= ${WRKDIR}/.package_done.${PKGNAME}
# How to do nothing. Override if you, for some strange reason, would rather
# do something.
@@ -2027,7 +2027,7 @@ _PORT_USE: .USE
.if !make(real-fetch) \
&& (!make(real-patch) || !defined(PATCH_CHECK_ONLY)) \
&& (!make(real-package) || !defined(PACKAGE_NOINSTALL))
- @${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.${.TARGET:S/^real-//}_done
+ @${TOUCH} ${TOUCH_FLAGS} ${WRKDIR}/.${.TARGET:S/^real-//}_done.${PKGNAME}
.endif
################################################################
OpenPOWER on IntegriCloud