From e86e6140eb67007b12c4d499039fc2c813bd055d Mon Sep 17 00:00:00 2001
From: kei <kei@pkgsrc.org>
Date: Wed, 7 Mar 2001 07:07:11 +0000
Subject: add CONFLICTS as misc/rpm package has rpm2cpio program.  Problem
 noted by IWAMOTO Toshihiro in private mail.  Thanks.

---
 misc/rpm/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'misc/rpm/Makefile')

diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index ef168068005..fc56547847c 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2001/02/26 14:36:11 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2001/03/07 07:07:11 kei Exp $
 #
 
 DISTNAME=	rpm-2.5.4
@@ -12,6 +12,8 @@ COMMENT=	The Red Hat Package Manager
 
 BUILD_DEPENDS+=	msgfmt:../../devel/gettext
 
+CONFLICTS+=	rpm2cpio-*
+
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_LIBINTL=	yes
-- 
cgit v1.2.3