svn commit: r453148 - in head: security/krb5-113 security/krb5-114 security/krb5-115 security/krb5-devel sysutils/e2fsprogs

[Matthias Andree]

Author: mandree
Date: Mon Oct 30 00:16:28 2017
New Revision: 453148
URL: https://svnweb.freebsd.org/changeset/ports/453148

Log:
  Add CONFLICTS between krb5-* and e2fsprogs.
  
  Reported by: jbeich@

Modified:
  head/security/krb5-113/Makefile
  head/security/krb5-114/Makefile
  head/security/krb5-115/Makefile
  head/security/krb5-devel/Makefile
  head/sysutils/e2fsprogs/Makefile

Modified: head/security/krb5-113/Makefile
==============================================================================
--- head/security/krb5-113/Makefile	Mon Oct 30 00:14:29 2017	(r453147)
+++ head/security/krb5-113/Makefile	Mon Oct 30 00:16:28 2017	(r453148)
@@ -22,7 +22,7 @@ DEPRECATED=             EOL twelve months after releas
 EXPIRATION_DATE=        2017-12-02
 
 CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[45]-[0-9]* \
-			krb5-1.[0-9]* krbt5-devel-*
+			krb5-1.[0-9]* krbt5-devel-* e2fsprogs-[0-9]*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build

Modified: head/security/krb5-114/Makefile
==============================================================================
--- head/security/krb5-114/Makefile	Mon Oct 30 00:14:29 2017	(r453147)
+++ head/security/krb5-114/Makefile	Mon Oct 30 00:16:28 2017	(r453148)
@@ -18,7 +18,7 @@ COMMENT=		MIT implementation of RFC 4120 network authe
 LICENSE=		MIT
 
 CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[35]-[0-9]* \
-			krb5-1.[0-9]* krb5-devel-*
+			krb5-1.[0-9]* krb5-devel-* e2fsprogs-[0-9]*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build

Modified: head/security/krb5-115/Makefile
==============================================================================
--- head/security/krb5-115/Makefile	Mon Oct 30 00:14:29 2017	(r453147)
+++ head/security/krb5-115/Makefile	Mon Oct 30 00:16:28 2017	(r453148)
@@ -18,7 +18,7 @@ COMMENT=		MIT implementation of RFC 4120 network authe
 LICENSE=		MIT
 
 CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[34]-[0-9]* \
-			krb5-1.[0-9]* krb5-devel-*
+			krb5-1.[0-9]* krb5-devel-* e2fsprogs-[0-9]*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build

Modified: head/security/krb5-devel/Makefile
==============================================================================
--- head/security/krb5-devel/Makefile	Mon Oct 30 00:14:29 2017	(r453147)
+++ head/security/krb5-devel/Makefile	Mon Oct 30 00:16:28 2017	(r453148)
@@ -22,7 +22,7 @@ USE_GITHUB=		yes
 GH_TAGNAME=		${HASH}
 
 CONFLICTS=		heimdal-[0-9]* srp-[0-9]* krb5-11[345]-[0-9]* \
-			krb5-1.[0-9]*
+			krb5-1.[0-9]* e2fsprogs-[0-9]*
 
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_PERL5=		build

Modified: head/sysutils/e2fsprogs/Makefile
==============================================================================
--- head/sysutils/e2fsprogs/Makefile	Mon Oct 30 00:14:29 2017	(r453147)
+++ head/sysutils/e2fsprogs/Makefile	Mon Oct 30 00:16:28 2017	(r453148)
@@ -18,6 +18,8 @@ LICENSE_DISTFILES_GPLv2=	${DISTNAME}${EXTRACT_SUFX}
 
 PORTSCOUT=	ignore	# cannot handle the version in the directory
 
+CONFLICTS_INSTALL=	krb5-[0-9d]*
+
 .if !defined(MASTERDIR)
 BROKEN_aarch64=		fails to link: missing sbrk
 .endif