[pkgsrc/trunk]: pkgsrc/mk Don't write conflicts into the binary packages unle...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dc7ccda63d10
branches:  trunk
changeset: 463745:dc7ccda63d10
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 25 12:01:31 2003 +0000

description:
Don't write conflicts into the binary packages unless they're "overwrite"
packages.  All pkgviews packages are safe to install into the same tree,
and we rely on more dynamic file collision detection through linkfarm(1)
rather than just using CONFLICTS.

diffstat:

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

diffs (18 lines):

diff -r 44d177b1abd8 -r dc7ccda63d10 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Nov 25 11:42:09 2003 +0000
+++ b/mk/bsd.pkg.mk     Tue Nov 25 12:01:31 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1305 2003/11/23 07:31:18 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1306 2003/11/25 12:01:31 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -797,7 +797,7 @@
 PKG_ARGS_COMMON+=      -l -b ${BUILD_VERSION_FILE} -B ${BUILD_INFO_FILE}
 PKG_ARGS_COMMON+=      -s ${SIZE_PKG_FILE} -S ${SIZE_ALL_FILE}
 PKG_ARGS_COMMON+=      -P "`${MAKE} ${MAKEFLAGS} run-depends-list PACKAGE_DEPENDS_QUICK=true | ${SORT} -u`"
-.  ifdef CONFLICTS
+.  if defined(CONFLICTS) && (${PKG_INSTALLATION_TYPE} == "overwrite")
 PKG_ARGS_COMMON+=      -C "${CONFLICTS}"
 .  endif
 .  ifdef INSTALL_FILE