Date: Fri, 17 Aug 2001 02:30:14 +0900 From: "Akinori MUSHA" <knu@iDaemons.org> To: portmgr@FreeBSD.org, ports@FreeBSD.org Subject: bsd.port.mk: renaming cookie files Message-ID: <86snernc9l.wl@archon.local.idaemons.org>
next in thread | raw e-mail | index | archive | help
Hi,
I'd suggest including ${PKGNAME} in the name of each cookie file, so
that a port would never install the stuff built in the outdated
working directory.
With the following patch, bsd.port.mk will not think a port is already
built when the PKGNAME doesn't match that of what is built in the
WRKDIR.
Any comments?
--
/
/__ __ Akinori.org / MUSHA.org
/ ) ) ) ) / FreeBSD.org / Ruby-lang.org
Akinori MUSHA aka / (_ / ( (__( @ iDaemons.org / and.or.jp
"Freeze this moment a little bit longer, make each impression
a little bit stronger.. Experience slips away -- Time stand still"
Index: bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.376
diff -u -u -r1.376 bsd.port.mk
--- bsd.port.mk 2001/08/03 11:35:35 1.376
+++ bsd.port.mk 2001/08/16 17:21:07
@@ -911,12 +911,12 @@
# 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 @@
.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
################################################################
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86snernc9l.wl>