pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk Support DEPENDS_TARGET="install clean"; from Allan ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b893c351a9b9
branches:  trunk
changeset: 472127:b893c351a9b9
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Apr 05 08:06:07 2004 +0000

description:
Support DEPENDS_TARGET="install clean"; from Allan Barrett in
PR pkg/25059.

diffstat:

 mk/bsd.pkg.mk |  14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diffs (63 lines):

diff -r 36b98b20dbe7 -r b893c351a9b9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Apr 05 08:02:56 2004 +0000
+++ b/mk/bsd.pkg.mk     Mon Apr 05 08:06:07 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1436 2004/04/03 06:22:39 reed Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1437 2004/04/05 08:06:07 xtraeme Exp $
 #
 # This file is in the public domain.
 #
@@ -3216,7 +3216,7 @@
        @${TOUCH} ${INTERACTIVE_COOKIE}
        @${FALSE}
 .else
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-extract DEPENDS_TARGET=${DEPENDS_TARGET} PKG_PHASE=extract
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} real-extract DEPENDS_TARGET=${DEPENDS_TARGET:Q} PKG_PHASE=extract
 .endif
 
 ${PATCH_COOKIE}:
@@ -3415,7 +3415,7 @@
 .if !target(reinstall)
 reinstall:
        ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${INSTALL_COOKIE} ${PACKAGE_COOKIE} ${PLIST}
-       ${_PKG_SILENT}${_PKG_DEBUG}DEPENDS_TARGET=${DEPENDS_TARGET} ${MAKE} ${MAKEFLAGS} install
+       ${_PKG_SILENT}${_PKG_DEBUG}DEPENDS_TARGET=${DEPENDS_TARGET:Q} ${MAKE} ${MAKEFLAGS} install
 .endif
 
 # Deinstall
@@ -3508,7 +3508,7 @@
 .endif
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
                ${MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} KEEP_WRKDIR=YES   \
-                       DEPENDS_TARGET=${DEPENDS_TARGET}
+                       DEPENDS_TARGET=${DEPENDS_TARGET:Q}
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        [ ! -s ${DDIR} ] || for dep in `${CAT} ${DDIR}` ; do            \
                (if cd ../.. && cd "$${dep}" ; then                     \
@@ -3519,7 +3519,7 @@
                                ${MAKE} ${MAKEFLAGS} deinstall;         \
                        fi &&                                           \
                        ${MAKE} ${MAKEFLAGS} ${UPDATE_TARGET}           \
-                               DEPENDS_TARGET=${DEPENDS_TARGET} ;      \
+                               DEPENDS_TARGET=${DEPENDS_TARGET:Q} ;    \
                else                                                    \
                        ${ECHO_MSG} "${_PKGSRC_IN}> Skipping removed directory $${dep}"; \
                fi) ;                                                   \
@@ -4038,7 +4038,7 @@
                        ${SHCOMMENT} Cycle through some FTP server here ;\
                        ${ECHO_MSG} "Installing from source" ;          \
                        ${MAKE} ${MAKEFLAGS} package                    \
-                               DEPENDS_TARGET=${DEPENDS_TARGET} &&     \
+                               DEPENDS_TARGET=${DEPENDS_TARGET:Q} &&   \
                        ${MAKE} ${MAKEFLAGS} clean ;                    \
                fi ; \
        fi
@@ -4171,7 +4171,7 @@
                ${ECHO_MSG} "${_PKGSRC_IN}> Required installed package $$pkg: $${found} found"; \
        else                                                            \
                ${ECHO_MSG} "${_PKGSRC_IN}> Required package $$pkg: NOT found"; \
-               target=${DEPENDS_TARGET};                               \
+               target=${DEPENDS_TARGET:Q};                             \
                ${ECHO_MSG} "${_PKGSRC_IN}> Verifying $$target for $$dir";      \
                if [ ! -d $$dir ]; then                                 \
                        ${ECHO_MSG} "=> No directory for $$dir.  Skipping.."; \



Home | Main Index | Thread Index | Old Index