[pkgsrc/trunk]: pkgsrc/security heimdal and gss conflict because they install...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3caa6e6a3cab
branches:  trunk
changeset: 510613:3caa6e6a3cab
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Mar 31 23:44:39 2006 +0000

description:
heimdal and gss conflict because they install a common set of manpages
for the gss_* functions.

diffstat:

 security/gss/Makefile     |  4 +++-
 security/heimdal/Makefile |  3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (35 lines):

diff -r f7bd34a48188 -r 3caa6e6a3cab security/gss/Makefile
--- a/security/gss/Makefile     Fri Mar 31 23:43:32 2006 +0000
+++ b/security/gss/Makefile     Fri Mar 31 23:44:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/04 21:30:34 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/31 23:44:39 jlam Exp $
 #
 
 DISTNAME=              gss-0.0.15
@@ -10,6 +10,8 @@
 HOMEPAGE=              http://www.gnu.org/software/gss/
 COMMENT=               GNU Generic Security Service Library
 
+CONFLICTS+=            heimdal-[0-9]*
+
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
 USE_TOOLS+=            pkg-config
diff -r f7bd34a48188 -r 3caa6e6a3cab security/heimdal/Makefile
--- a/security/heimdal/Makefile Fri Mar 31 23:43:32 2006 +0000
+++ b/security/heimdal/Makefile Fri Mar 31 23:44:39 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2006/03/30 03:44:43 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2006/03/31 23:44:39 jlam Exp $
 
 DISTNAME=      heimdal-0.7.2
 CATEGORIES=    security
@@ -12,6 +12,7 @@
 CONFLICTS+=    arla-[0-9]*
 CONFLICTS+=    mit-krb5-[0-9]*
 CONFLICTS+=    openafs-[0-9]*
+CONFLICTS+=    gss-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews