pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/archivers Mark unzip and fcrackzip as mutually conflic...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/24cc738f0413
branches:  trunk
changeset: 546228:24cc738f0413
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Aug 24 10:21:33 2008 +0000

description:
Mark unzip and fcrackzip as mutually conflicting: both install bin/zipinfo.

diffstat:

 archivers/fcrackzip/Makefile |  6 ++++--
 archivers/unzip/Makefile     |  4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (41 lines):

diff -r 7840a5e5fef1 -r 24cc738f0413 archivers/fcrackzip/Makefile
--- a/archivers/fcrackzip/Makefile      Sun Aug 24 10:08:59 2008 +0000
+++ b/archivers/fcrackzip/Makefile      Sun Aug 24 10:21:33 2008 +0000
@@ -1,15 +1,17 @@
-# $NetBSD: Makefile,v 1.2 2008/06/12 02:14:13 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2008/08/24 10:21:33 wiz Exp $
 
 DISTNAME=      fcrackzip-0.3
 MASTER_SITES=  http://www.goof.com/pcg/marc/data/
 CATEGORIES=    archivers
 
-COMMENT=       Zip password cracker
 MAINTAINER=    pkgsrc-users%pkgsrc.org@localhost
 HOMEPAGE=      http://www.goof.com/pcg/marc/fcrackzip.html
+COMMENT=       Zip password cracker
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 GNU_CONFIGURE= yes
 
+CONFLICTS=     unzip-[0-9]*
+
 .include "../../mk/bsd.pkg.mk"
diff -r 7840a5e5fef1 -r 24cc738f0413 archivers/unzip/Makefile
--- a/archivers/unzip/Makefile  Sun Aug 24 10:08:59 2008 +0000
+++ b/archivers/unzip/Makefile  Sun Aug 24 10:21:33 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2008/03/23 13:05:31 tron Exp $
+# $NetBSD: Makefile,v 1.70 2008/08/24 10:21:33 wiz Exp $
 
 DISTNAME=      unzip552
 PKGNAME=       unzip-5.52
@@ -18,6 +18,8 @@
 WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 USE_TOOLS+=    gmake
 
+CONFLICTS=     fcrackzip-[0-9]*
+
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_FILE=     unix/Makefile



Home | Main Index | Thread Index | Old Index