diff options
author | jtb <jtb@pkgsrc.org> | 2001-04-11 21:49:15 +0000 |
---|---|---|
committer | jtb <jtb@pkgsrc.org> | 2001-04-11 21:49:15 +0000 |
commit | 12a5fb83acb31d6b548c294a2d018bc614d93aa4 (patch) | |
tree | 2d3b11a39b7554cef39a8da36f451c7b5bc9ee7c | |
parent | 108d5a9aeb9c766482c0b275bb2d9b7bd2840498 (diff) | |
download | pkgsrc-12a5fb83acb31d6b548c294a2d018bc614d93aa4.tar.gz |
Add a conflict -- both packages have a `pgps' executable.
From Lex Wennmacher's pkgconflict results.
-rw-r--r-- | graphics/pgraf/Makefile | 4 | ||||
-rw-r--r-- | security/pgp5/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/graphics/pgraf/Makefile b/graphics/pgraf/Makefile index 8111aed5fc0..7df43d83ed6 100644 --- a/graphics/pgraf/Makefile +++ b/graphics/pgraf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2001/02/16 15:22:29 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2001/04/11 21:49:15 jtb Exp $ DISTNAME= pgraf-20010131 CATEGORIES= graphics @@ -10,6 +10,8 @@ COMMENT= Portable graphics system NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL USE_X11= YES +CONFLICTS= pgp5-* # Both have a `pgps' executable + post-install: ${INSTALL_DATA} ${WRKSRC}/include/pgraf.h ${PREFIX}/include ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgraf diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile index d5828115560..bdd4730d2d9 100644 --- a/security/pgp5/Makefile +++ b/security/pgp5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2001/03/27 03:20:16 hubertf Exp $ +# $NetBSD: Makefile,v 1.14 2001/04/11 21:49:16 jtb Exp $ # DISTNAME= pgp50i-unix-src @@ -20,6 +20,8 @@ COMMENT= New, international, Public-Key encryption and digital signature utility BUILD_DEPENDS= perl-5.*:../../lang/perl5 +CONFLICTS= pgraf-* # Both have a `pgps' executable + CRYPTO= YES GNU_CONFIGURE= YES USE_RSAREF2= NO |