summaryrefslogtreecommitdiff
path: root/archivers/lzma
diff options
context:
space:
mode:
authorwiz <wiz>2009-06-08 14:02:50 +0000
committerwiz <wiz>2009-06-08 14:02:50 +0000
commita70430b10fdfdb7b0751bc5325a2ec2455e96e46 (patch)
tree8a6bb9b8b23417e3a88b9bcb328a6e510b35e5d8 /archivers/lzma
parent973d92b7aea01058f2be35ec9e30232b8007b505 (diff)
downloadpkgsrc-a70430b10fdfdb7b0751bc5325a2ec2455e96e46.tar.gz
lzma and xz-utils conflict as well.
Diffstat (limited to 'archivers/lzma')
-rw-r--r--archivers/lzma/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile
index f703f55e0aa..4fcee55e852 100644
--- a/archivers/lzma/Makefile
+++ b/archivers/lzma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/06/05 18:52:46 jakllsch Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/08 14:02:50 wiz Exp $
#
DISTNAME= lzma465
@@ -20,7 +20,7 @@ USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/CPP/7zip/Compress/LZMA_Alone
MAKE_FILE= makefile.gcc
-CONFLICTS+= lzma-utils-[0-9]*
+CONFLICTS+= lzma-utils-[0-9]* xz-utils-[0-9]*
INSTALLATION_DIRS= bin