diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-02-20 22:48:24 +0000 |
| commit | 2a95ad9c6be52511880e6ee241b087af70706624 (patch) | |
| tree | f0ac98b899382f539e1e39385f1316edd18626bd /archivers | |
| parent | 2821cb11104fb7319e84b4cd1808cf56f3604a54 (diff) | |
| download | pkgsrc-2a95ad9c6be52511880e6ee241b087af70706624.tar.gz | |
Fix CONFLICTS (remove redundancy, mostly)
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/bzip2/Makefile | 4 | ||||
| -rw-r--r-- | archivers/unzip/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile index 02a34704d22..7f7a622fc9f 100644 --- a/archivers/bzip2/Makefile +++ b/archivers/bzip2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 1998/10/14 21:51:14 tron Exp $ +# $NetBSD: Makefile,v 1.10 1999/02/20 22:48:24 hubertf Exp $ # FreeBSD Id: Makefile,v 1.1.1.1 1997/11/20 08:18:40 tg Exp # @@ -10,8 +10,6 @@ MASTER_SITES= http://www.muraroa.demon.co.uk/ \ MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.muraroa.demon.co.uk/ -CONFLICTS= bzip2-0.1p2 - .if exists(/usr/bin/bzip2) IGNORE= "is part of your NetBSD distribution" .endif diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile index b5fbb7618d5..922a823e2a4 100644 --- a/archivers/unzip/Makefile +++ b/archivers/unzip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 1999/01/09 01:26:09 tron Exp $ +# $NetBSD: Makefile,v 1.19 1999/02/20 22:48:24 hubertf Exp $ # FreeBSD Id: Makefile,v 1.14 1997/06/19 05:30:04 ache Exp # @@ -11,8 +11,6 @@ DISTFILES= unzip540.tar.gz MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.cdrom.com/pub/infozip/ -CONFLICTS= unzip-* - MAKEFILE= unix/Makefile ALL_TARGET= unzips # we do not use USE_ZLIB because of unknown bugs in 5.40's use of libz |