From owner-freebsd-ports Thu Aug 16 10:30:27 2001 Delivered-To: freebsd-ports@freebsd.org Received: from mail.musha.org (daemon.musha.org [61.122.44.178]) by hub.freebsd.org (Postfix) with ESMTP id 72B7037B40C; Thu, 16 Aug 2001 10:30:16 -0700 (PDT) (envelope-from knu@iDaemons.org) Received: from archon.local.idaemons.org (archon.local.idaemons.org [192.168.1.32]) by mail.musha.org (Postfix) with ESMTP id 9C7464E24D; Fri, 17 Aug 2001 02:30:14 +0900 (JST) Date: Fri, 17 Aug 2001 02:30:14 +0900 Message-ID: <86snernc9l.wl@archon.local.idaemons.org> From: "Akinori MUSHA" To: portmgr@FreeBSD.org, ports@FreeBSD.org Subject: bsd.port.mk: renaming cookie files User-Agent: Wanderlust/2.7.1 (Too Funky) SEMI/1.14.3 (Ushinoya) FLIM/1.14.3 (=?ISO-8859-1?Q?Unebigory=F2mae?=) APEL/10.3 MULE XEmacs/21.1 (patch 14) (Cuyahoga Valley) (i386--freebsd) Organization: Associated I. Daemons X-PGP-Public-Key: finger knu@FreeBSD.org X-PGP-Fingerprint: 081D 099C 1705 861D 4B70 B04A 920B EFC7 9FD9 E1EE MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya") Content-Type: text/plain; charset=US-ASCII Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org 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