summaryrefslogtreecommitdiff
path: root/archivers/xz
diff options
context:
space:
mode:
authorobache <obache@pkgsrc.org>2009-08-23 09:23:28 +0000
committerobache <obache@pkgsrc.org>2009-08-23 09:23:28 +0000
commita6f403168d2c7a732366ce3444a9e7cf97b31fee (patch)
treeedb031f6732cf6fe141266825eceee490694f31a /archivers/xz
parentdd43373037052d31887b3ca25865a021763e0b4c (diff)
downloadpkgsrc-a6f403168d2c7a732366ce3444a9e7cf97b31fee.tar.gz
Marked as CONFLICT each other, both package contains lib/liblzma.{a,so}.
Noticed by Jukka Salmi in pkgsrc-users@.
Diffstat (limited to 'archivers/xz')
-rw-r--r--archivers/xz/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index 14fa60479ab..eb540892c9c 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -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 @@ GNU_CONFIGURE= yes
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"