[pkgsrc/trunk]: pkgsrc/archivers lzma and xz-utils conflict as well.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf7eafa2db44
branches:  trunk
changeset: 394311:cf7eafa2db44
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jun 08 14:02:50 2009 +0000

description:
lzma and xz-utils conflict as well.

diffstat:

 archivers/lzma/Makefile     |  4 ++--
 archivers/xz-utils/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 1686db8d6cfd -r cf7eafa2db44 archivers/lzma/Makefile
--- a/archivers/lzma/Makefile   Mon Jun 08 14:02:11 2009 +0000
+++ b/archivers/lzma/Makefile   Mon Jun 08 14:02:50 2009 +0000
@@ -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 @@
 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
 
diff -r 1686db8d6cfd -r cf7eafa2db44 archivers/xz-utils/Makefile
--- a/archivers/xz-utils/Makefile       Mon Jun 08 14:02:11 2009 +0000
+++ b/archivers/xz-utils/Makefile       Mon Jun 08 14:02:50 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/06/08 14:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2009/06/08 14:02:50 wiz Exp $
 #
 
 DISTNAME=      xz-4.999.8beta
@@ -16,7 +16,7 @@
 USE_LIBTOOL=           yes
 PKGCONFIG_OVERRIDE=    src/liblzma/liblzma.pc.in
 
-CONFLICTS=     lzma-utils-[0-9]*
+CONFLICTS=     lzma-[0-9]* lzma-utils-[0-9]*
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"