diff options
| author | wiz <wiz> | 2009-06-08 14:02:50 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2009-06-08 14:02:50 +0000 |
| commit | a70430b10fdfdb7b0751bc5325a2ec2455e96e46 (patch) | |
| tree | 8a6bb9b8b23417e3a88b9bcb328a6e510b35e5d8 | |
| parent | 973d92b7aea01058f2be35ec9e30232b8007b505 (diff) | |
| download | pkgsrc-a70430b10fdfdb7b0751bc5325a2ec2455e96e46.tar.gz | |
lzma and xz-utils conflict as well.
| -rw-r--r-- | archivers/lzma/Makefile | 4 | ||||
| -rw-r--r-- | archivers/xz-utils/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile index f703f55e0aa..4fcee55e852 100644 --- a/archivers/lzma/Makefile +++ b/archivers/lzma/Makefile @@ -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 @@ USE_TOOLS+= gmake 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 --git a/archivers/xz-utils/Makefile b/archivers/xz-utils/Makefile index f34749111fa..6290496b365 100644 --- a/archivers/xz-utils/Makefile +++ b/archivers/xz-utils/Makefile @@ -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 @@ GNU_CONFIGURE= yes 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" |