diff options
| author | kei <kei> | 2001-03-07 07:07:11 +0000 |
|---|---|---|
| committer | kei <kei> | 2001-03-07 07:07:11 +0000 |
| commit | 186fccbb46324a35c829ebb6bf0be8f4c9d514da (patch) | |
| tree | 2298143c8b6c852977841c41a668e9e6e0c5ae65 | |
| parent | ff95a3e9ef494c9f670a957764cb5d2fb661a8da (diff) | |
| download | pkgsrc-186fccbb46324a35c829ebb6bf0be8f4c9d514da.tar.gz | |
add CONFLICTS as misc/rpm package has rpm2cpio program. Problem noted by
IWAMOTO Toshihiro in private mail. Thanks.
| -rw-r--r-- | converters/rpm2cpio/Makefile | 4 | ||||
| -rw-r--r-- | misc/rpm/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/converters/rpm2cpio/Makefile b/converters/rpm2cpio/Makefile index 04d38c21c45..533b2ac5666 100644 --- a/converters/rpm2cpio/Makefile +++ b/converters/rpm2cpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2001/03/07 04:24:39 kei Exp $ +# $NetBSD: Makefile,v 1.2 2001/03/07 07:07:12 kei Exp $ # FreeBSD Id: ports/misc/rpm2cpio/Makefile,v 1.2 1999/08/25 07:22:29 obrien Exp DISTNAME= rpm2cpio @@ -13,6 +13,8 @@ COMMENT= Convert .rpm files for extraction with cpio, needs just perl EXTRACT_CMD= ${CP} ${DOWNLOADED_DISTFILE} . +CONFLICTS+= rpm-* + USE_PERL5= # defined do-build: 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 |