summaryrefslogtreecommitdiff
path: root/archivers
diff options
context:
space:
mode:
authorwiz <wiz>2009-06-08 14:01:58 +0000
committerwiz <wiz>2009-06-08 14:01:58 +0000
commit49da3da56d2bf45cd9113bd7a3fad4bd0d41b0c6 (patch)
tree1f72c93a5ced5b861107825b8659de9e73f60bf3 /archivers
parent13ff495cc073404db73f0f0bb9a0f39dfcb2feb3 (diff)
downloadpkgsrc-49da3da56d2bf45cd9113bd7a3fad4bd0d41b0c6.tar.gz
Conflict with new xz-utils package.
Diffstat (limited to 'archivers')
-rw-r--r--archivers/lzma-utils/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/archivers/lzma-utils/Makefile b/archivers/lzma-utils/Makefile
index 6a2738a21df..fdd8e97bc59 100644
--- a/archivers/lzma-utils/Makefile
+++ b/archivers/lzma-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/01/28 14:55:48 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2009/06/08 14:01:58 wiz Exp $
#
DISTNAME= lzma-4.32.7
@@ -16,6 +16,6 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-CONFLICTS= lzma-[0-9]*
+CONFLICTS= lzma-[0-9]* xz-utils-[0-9]*
.include "../../mk/bsd.pkg.mk"