diff options
| author | jlam <jlam> | 2006-07-27 22:16:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2006-07-27 22:16:06 +0000 |
| commit | 371ae2dae697a0fdd7108d4a62991e9435984ff0 (patch) | |
| tree | 3bd26fae118df518770420ca3853d37ef7047dd8 /mk/flavor | |
| parent | 2b515aa57a3f88d021b10021fc15795ad43b18b9 (diff) | |
| download | pkgsrc-371ae2dae697a0fdd7108d4a62991e9435984ff0.tar.gz | |
Add back CONFLICTS handling that was accidentally left out when revision
1.1 of this file was committed and the same code was removed from
bsd.pkg.mk.
Diffstat (limited to 'mk/flavor')
| -rw-r--r-- | mk/flavor/pkg/metadata.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/flavor/pkg/metadata.mk b/mk/flavor/pkg/metadata.mk index 256fd8b0771..ae3e2c35daf 100644 --- a/mk/flavor/pkg/metadata.mk +++ b/mk/flavor/pkg/metadata.mk @@ -1,4 +1,4 @@ -# $NetBSD: metadata.mk,v 1.8 2006/07/15 23:58:52 rillig Exp $ +# $NetBSD: metadata.mk,v 1.9 2006/07/27 22:16:06 jlam Exp $ ###################################################################### ### The targets below are all PRIVATE. @@ -325,6 +325,7 @@ _PKG_CREATE_ARGS+= ${NO_MTREE:D:U -m ${MTREE_FILE}} _PKG_CREATE_ARGS+= ${PKG_PRESERVE:D -n ${_PRESERVE_FILE}} _PKG_CREATE_ARGS+= -S ${_SIZE_ALL_FILE} _PKG_CREATE_ARGS+= -s ${_SIZE_PKG_FILE} +_PKG_CREATE_ARGS+= ${CONFLICTS:D -C ${CONFLICTS:Q}} _PKG_CREATE_ARGS+= ${_DEPENDS_ARG_cmd:sh} _PKG_CREATE_ARGS+= ${INSTALL_FILE:D ${_INSTALL_ARG_cmd:sh}} _PKG_CREATE_ARGS+= ${DEINSTALL_FILE:D ${_DEINSTALL_ARG_cmd:sh}} |