[pkgsrc/trunk]: pkgsrc/mk Don't require pkg_delete or pkg_info -r to list pac...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c58c8f5705d8
branches:  trunk
changeset: 558868:c58c8f5705d8
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat May 16 01:27:30 2009 +0000

description:
Don't require pkg_delete or pkg_info -r to list packages in full
topological sort for the make update list. This breaks naturally when
new dependencies are introduced that are also in the list scheduled for
later installation. Reported by David Holland.

diffstat:

 mk/bsd.pkg.barrier.mk |  9 +++++++--
 mk/bsd.pkg.update.mk  |  3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r 972f1740cfda -r c58c8f5705d8 mk/bsd.pkg.barrier.mk
--- a/mk/bsd.pkg.barrier.mk     Fri May 15 23:29:23 2009 +0000
+++ b/mk/bsd.pkg.barrier.mk     Sat May 16 01:27:30 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.barrier.mk,v 1.16 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: bsd.pkg.barrier.mk,v 1.17 2009/05/16 01:27:30 joerg Exp $
 
 _COOKIE.barrier=       ${WRKDIR}/.barrier_cookie
 
@@ -64,13 +64,18 @@
        @${PHASE_MSG} "Invoking \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
        ${RUN}                                  \
+       if ${TEST} -n "${_PKGSRC_UPDATE_CHECK}" && \
+          ${PKG_INFO} -qe ${PKGNAME}; then \
+               ${PHASE_MSG} "Skipping installation of already handled package"; \
+       else \
        cd ${.CURDIR}                                                   \
        && ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes ALLOW_VULNERABLE_PACKAGES= ${_BARRIER_CMDLINE_TARGETS} \
        || {                                                            \
                exitcode="$$?";                                         \
                ${RECURSIVE_MAKE} ${MAKEFLAGS} _PKGSRC_BARRIER=yes barrier-error-check; \
                exit "$$exitcode";                                      \
-       }
+       }; \
+       fi
 .  if defined(PKG_VERBOSE)
        @${PHASE_MSG} "Leaving \`\`"${_BARRIER_CMDLINE_TARGETS:Q}"'' after barrier for ${PKGNAME}"
 .  endif
diff -r 972f1740cfda -r c58c8f5705d8 mk/bsd.pkg.update.mk
--- a/mk/bsd.pkg.update.mk      Fri May 15 23:29:23 2009 +0000
+++ b/mk/bsd.pkg.update.mk      Sat May 16 01:27:30 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.update.mk,v 1.17 2009/03/07 19:36:31 joerg Exp $
+# $NetBSD: bsd.pkg.update.mk,v 1.18 2009/05/16 01:27:30 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and contains the targets
 # and variables for "make update".
@@ -72,6 +72,7 @@
                                ${RECURSIVE_MAKE} ${MAKEFLAGS} deinstall _UPDATE_RUNNING=YES; \
                        fi &&                                           \
                        ${RECURSIVE_MAKE} ${MAKEFLAGS} ${UPDATE_TARGET} \
+                               _PKGSRC_UPDATE_CHECK=yes                \
                                DEPENDS_TARGET=${DEPENDS_TARGET:Q} ;    \
                else                                                    \
                        ${PHASE_MSG} "Skipping removed directory $${dep}"; \