pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Use ${SLEEP} instead of sleep, and note that we use...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc6aa318223a
branches:  trunk
changeset: 502455:dc6aa318223a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Nov 04 20:06:14 2005 +0000

description:
Use ${SLEEP} instead of sleep, and note that we use the sleep tool if
we're doing locking.

diffstat:

 mk/bsd.pkg.mk |  15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r 38495f81d925 -r dc6aa318223a mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Nov 04 20:02:01 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri Nov 04 20:06:14 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1739 2005/11/04 11:27:41 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1740 2005/11/04 20:06:14 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -822,11 +822,11 @@
 USE_TOOLS+=    mail
 .endif
 
-# We need shlock if we're using locking to synchronize multiple builds
-# over the same pkgsrc tree.
+# We need shlock and sleep if we're using locking to synchronize multiple
+# builds over the same pkgsrc tree.
 #
 .if ${PKGSRC_LOCKTYPE} != "none"
-USE_TOOLS+=    shlock
+USE_TOOLS+=    shlock sleep
 .endif
 
 # If MANZ is defined, then we want the final man pages to be compressed.
@@ -1634,7 +1634,7 @@
                ${ECHO} "=> Lock is held by pid `cat ${LOCKFILE}`";     \
                case "${PKGSRC_LOCKTYPE}" in                            \
                once)   exit 1 ;;                                       \
-               sleep)  sleep ${PKGSRC_SLEEPSECS} ;;                    \
+               sleep)  ${SLEEP} ${PKGSRC_SLEEPSECS} ;;                 \
                esac                                                    \
        done;                                                           \
        if [ "${PKG_VERBOSE}" != "" ]; then                             \
@@ -2099,7 +2099,10 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        for dir in ${INSTALLATION_DIRS}; do                             \
                case $$dir in                                           \
-               /*)     ;;                                              \
+               ${PREFIX}/*)    ;;                                      \
+               *)              continue ;;                             \
+               done;                                                   \
+               case $$dir in                                           \
                *bin|*bin/*|*libexec|*libexec/*)                        \
                        ${INSTALL_PROGRAM_DIR} ${PREFIX}/$$dir ;;       \
                ${PKGMANDIR}/*)                                         \



Home | Main Index | Thread Index | Old Index