diff options
| author | obache <obache@pkgsrc.org> | 2009-08-23 09:23:28 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2009-08-23 09:23:28 +0000 |
| commit | a6f403168d2c7a732366ce3444a9e7cf97b31fee (patch) | |
| tree | edb031f6732cf6fe141266825eceee490694f31a /archivers | |
| parent | dd43373037052d31887b3ca25865a021763e0b4c (diff) | |
| download | pkgsrc-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')
| -rw-r--r-- | archivers/lzmalib/Makefile | 4 | ||||
| -rw-r--r-- | archivers/xz/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/archivers/lzmalib/Makefile b/archivers/lzmalib/Makefile index 9f3af8ddc2f..a3939d6e2d5 100644 --- a/archivers/lzmalib/Makefile +++ b/archivers/lzmalib/Makefile @@ -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 @@ COMMENT= Thin wrapper library of LZMA PKG_DESTDIR_SUPPORT= user-destdir +CONFLICTS= xz-[0-9]* + GNU_CONFIGURE= yes USE_LANGUAGES= c c++ USE_TOOLS+= gmake 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" |