[pkgsrc/trunk]: pkgsrc/archivers Marked as CONFLICT each other, both package ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d37f435e76ce
branches:  trunk
changeset: 398063:d37f435e76ce
user:      obache <obache%pkgsrc.org@localhost>
date:      Sun Aug 23 09:23:28 2009 +0000

description:
Marked as CONFLICT each other, both package contains lib/liblzma.{a,so}.
Noticed by Jukka Salmi in pkgsrc-users@.

diffstat:

 archivers/lzmalib/Makefile |  4 +++-
 archivers/xz/Makefile      |  4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 1f9480b62a17 -r d37f435e76ce archivers/lzmalib/Makefile
--- a/archivers/lzmalib/Makefile        Sun Aug 23 09:22:42 2009 +0000
+++ b/archivers/lzmalib/Makefile        Sun Aug 23 09:23:28 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/04 12:07:15 obache Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/23 09:23:28 obache Exp $
 #
 
 DISTNAME=      lzmalib-0.0.1
@@ -11,6 +11,8 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+CONFLICTS=     xz-[0-9]*
+
 GNU_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake
diff -r 1f9480b62a17 -r d37f435e76ce archivers/xz/Makefile
--- a/archivers/xz/Makefile     Sun Aug 23 09:22:42 2009 +0000
+++ b/archivers/xz/Makefile     Sun Aug 23 09:23:28 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/07/07 11:08:52 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2009/08/23 09:23:28 obache Exp $
 #
 
 DISTNAME=      xz-4.999.8beta
@@ -16,7 +16,7 @@
 USE_LIBTOOL=           yes
 PKGCONFIG_OVERRIDE=    src/liblzma/liblzma.pc.in
 
-CONFLICTS=     lzma-[0-9]* lzma-utils-[0-9]*
+CONFLICTS=     lzma-[0-9]* lzma-utils-[0-9]* lzmalib-[0-9]*
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"