diff options
| author | jlam <jlam@pkgsrc.org> | 2003-11-25 12:01:31 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2003-11-25 12:01:31 +0000 |
| commit | 8c6a703c0b2569e8767288937e175fd5e726c689 (patch) | |
| tree | 9cd2d057d24f71e46f10107ed9db1a80047ddcad /mk/bsd.pkg.mk | |
| parent | c3a1661459e7fea6fc0cc19865d8ba35869e551b (diff) | |
| download | pkgsrc-8c6a703c0b2569e8767288937e175fd5e726c689.tar.gz | |
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 (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 3b036806d4e..5f3e6e6cd91 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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= -v -c -${COMMENT:Q}" " -d ${DESCR} -f ${PLIST} 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 |