[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Explicitly override the update ta...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e1df1192c691
branches:  trunk
changeset: 485390:e1df1192c691
user:      erh <erh%pkgsrc.org@localhost>
date:      Thu Dec 09 21:29:06 2004 +0000

description:
Explicitly override the update target to cause the deinstall step to happen
after the package is built.  This is necessary because the pkg_delete binary
that is used is the one from the WRKDIR, not the installed one.

diffstat:

 pkgtools/pkg_install/Makefile |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r 87176d366352 -r e1df1192c691 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Thu Dec 09 20:33:38 2004 +0000
+++ b/pkgtools/pkg_install/Makefile     Thu Dec 09 21:29:06 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2004/11/02 00:10:15 erh Exp $
+# $NetBSD: Makefile,v 1.106 2004/12/09 21:29:06 erh Exp $
 
 # Notes to package maintainers:
 #
@@ -71,6 +71,14 @@
                ${PKG_ADMIN} rebuild;                                   \
        fi
 
+# XXX Reverse the order that update does things since
+# XXX we need pkg_delete built before we can deinstall.
+# XXX This should probably be the default order for all packages.
+update:
+       ${MAKE}
+       ${MAKE} deinstall UPDATE_RUNNING=YES
+       ${MAKE} install
+
 .include "../../pkgtools/libnbcompat/inplace.mk"
 .include "../../mk/bsd.pkg.mk"