pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/archivers/lzma-utils Conflict with new xz-utils package.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/518a6984f73a
branches:  trunk
changeset: 560161:518a6984f73a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Mon Jun 08 14:01:58 2009 +0000

description:
Conflict with new xz-utils package.

diffstat:

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

diffs (17 lines):

diff -r a685a07c7af0 -r 518a6984f73a archivers/lzma-utils/Makefile
--- a/archivers/lzma-utils/Makefile     Mon Jun 08 14:01:37 2009 +0000
+++ b/archivers/lzma-utils/Makefile     Mon Jun 08 14:01:58 2009 +0000
@@ -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 @@
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
 
-CONFLICTS=     lzma-[0-9]*
+CONFLICTS=     lzma-[0-9]* xz-utils-[0-9]*
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index