pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk Revert unintended part of last commit.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/32813d05ab4b
branches:  trunk
changeset: 505656:32813d05ab4b
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Jan 05 23:18:26 2006 +0000

description:
Revert unintended part of last commit.

diffstat:

 mk/bsd.pkg.mk           |  5 ++---
 mk/bulk/bsd.bulk-pkg.mk |  3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r eff1eebf9230 -r 32813d05ab4b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Jan 05 23:16:01 2006 +0000
+++ b/mk/bsd.pkg.mk     Thu Jan 05 23:18:26 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1784 2006/01/05 23:16:01 joerg Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1785 2006/01/05 23:18:26 joerg Exp $
 #
 # This file is in the public domain.
 #
@@ -391,8 +391,7 @@
 _TEST_COOKIE=          ${WRKDIR}/.test_done
 _INSTALL_COOKIE=       ${WRKDIR}/.install_done
 _PACKAGE_COOKIE=       ${WRKDIR}/.package_done
-_INTERACTIVE_COOKIE_DIR?=      ${.CURDIR}
-_INTERACTIVE_COOKIE=   ${_INTERACTIVE_COOKiE_DIR}/.interactive_stage
+_INTERACTIVE_COOKIE=   .interactive_stage
 _NULL_COOKIE=          ${WRKDIR}/.null
 
 # Miscellaneous overridable commands:
diff -r eff1eebf9230 -r 32813d05ab4b mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Thu Jan 05 23:16:01 2006 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Thu Jan 05 23:18:26 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.109 2006/01/05 23:16:01 joerg Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.110 2006/01/05 23:18:27 joerg Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -181,7 +181,6 @@
 
 # The directory where package-specific log files are saved.
 _BULK_PKGLOGDIR=       ${BULKFILESDIR}/${PKGPATH}
-_INTERACTIVE_COOKIE_DIR= ${BULK_PKGLOGDIR}
 
 # Package-specific log files.
 _BROKENFILE=           ${_BULK_PKGLOGDIR}/${BROKENFILE}



Home | Main Index | Thread Index | Old Index