Date: 4 Aug 1999 08:00:23 -0000 From: nbm@rucus.ru.ac.za To: FreeBSD-gnats-submit@freebsd.org Subject: ports/12952: make _PORT_USE touch cookies by variable, not name. Message-ID: <19990804080023.56740.qmail@rucus.ru.ac.za>
next in thread | raw e-mail | index | archive | help
>Number: 12952
>Category: ports
>Synopsis: make _PORT_USE touch cookies by variable, not name.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Aug 4 01:10:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator: Neil Blakey-Milner
>Release: FreeBSD 3.0-STABLE i386
>Organization:
Rhodes University Computer Users' Society
>Environment:
FreeBSD rucus.ru.ac.za 3.0-STABLE FreeBSD 3.0-STABLE #0: Tue Feb 9 22:52:23 GMT 1999 grahams@rucus.ru.ac.za:/usr/src/sys/compile/RUCUS-SMP i386
>Description:
Entirely arbitrary patch that makes _PORT_USE touch the filenames
specified by {BUILD,CONFIGURE,etc}_COOKIE, and not simply
work/.build_cookie
I'm not sure why anyone would want to change the filenames, but it looks
messy for it not to work.
>How-To-Repeat:
(nbm@rucus) /usr/ports/net/micq# make PATCH_COOKIE=foo patch
===> Extracting for micq-0.4.1
>Fix:
--- bsd.port.mk.orig Tue Aug 3 17:13:12 1999
+++ bsd.port.mk Tue Aug 3 17:13:33 1999
@@ -659,6 +659,14 @@
PATCH_COOKIE?= ${WRKDIR}/.patch_done
PACKAGE_COOKIE?= ${WRKDIR}/.package_done
+COOKIES?= \
+ EXTRACT_COOKIE=${EXTRACT_COOKIE} \
+ CONFIGURE_COOKIE=${CONFIGURE_COOKIE} \
+ INSTALL_COOKIE=${INSTALL_COOKIE} \
+ BUILD_COOKIE=${BUILD_COOKIE} \
+ PATCH_COOKIE=${PATCH_COOKIE} \
+ PACKAGE_COOKIE=${PACKAGE_COOKIE}
+
# How to do nothing. Override if you, for some strange reason, would rather
# do something.
DO_NADA?= /usr/bin/true
@@ -1740,7 +1748,8 @@
.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
+ @target=`${ECHO} ${.TARGET:S/^real-//} | ${TR} a-z A-Z`_COOKIE; \
+ ${ECHO} ${TOUCH} \$${$$target} | ${SETENV} - ${COOKIES} ${SH}
.endif
################################################################
>Release-Note:
>Audit-Trail:
>Unformatted:
>> Checksum OK for micq-0.4.1.tgz.
===> Patching for micq-0.4.1
===> Applying FreeBSD patches for micq-0.4.1
(nbm@rucus) /usr/ports/net/micq# make PATCH_COOKIE=foo patch
===> Patching for micq-0.4.1
===> Applying FreeBSD patches for micq-0.4.1
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to Makefile.rej
*** Error code 2
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?19990804080023.56740.qmail>