Register conflicts for srp in security/heimdal, security/krb4, and securiry/krb5.

Bump PORTREVISION accordingly.

PR:		ports/105442
Submitted by:	Ruben van Staveren <ruben@verweg.com>
Reviewed by:	shaun@, cy@
Approved by:	flz (mentor)

7 files changed, 19 insertions, 12 deletions

diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 0de037ed3fb4..bfbf1d00008c 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	heimdal
 PORTVERSION=	0.7.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/heimdal/src/ \
 		ftp://ftp.sunet.se/pub/unix/admin/mirror-pdc/pub/heimdal/src/ \
@@ -20,7 +20,7 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	shaun@FreeBSD.org
 COMMENT=	A popular BSD-licensed implementation of Kerberos 5
 
-CONFLICTS=	krb4-[0-9]* krb5-[0-9]*
+CONFLICTS=	krb4-[0-9]* krb5-[0-9]* srp-[0-9]*
 
 OPTIONS+=	LDAP	 "Use OpenLDAP as the KDC backend"		off
 OPTIONS+=	CRACKLIB "Use CrackLib for password quality checking"	off
diff --git a/security/krb4/Makefile b/security/krb4/Makefile
index 92871b0b2f50..d18469bbf86d 100644
--- a/security/krb4/Makefile
+++ b/security/krb4/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	krb4
 PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.pdc.kth.se/pub/krb/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KTH Kerberos 4
 
-CONFLICTS=	krb5-[0-9]* heimdal-[0-9]*
+CONFLICTS=	krb5-[0-9]* heimdal-[0-9]* srp-[0-9]*
 USE_LDCONFIG=	yes
 # Don't remove this.  This port installs several applications
 # which have the same name as some in the base system (e.g.
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
index f1f4e150315a..c53e08d2f807 100644
--- a/security/krb5-16/Makefile
+++ b/security/krb5-16/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.5.1
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -17,13 +18,13 @@ COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		krb4-[0-9]* heimdal-[0-9]*
+CONFLICTS=		krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
 
 LATEST_LINK=		${PORTNAME}
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool:15
 CONFIGURE_ARGS?=	--enable-shared
 # CONFIGURE_ARGS+=	--disable-thread-support
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
index f1f4e150315a..c53e08d2f807 100644
--- a/security/krb5-17/Makefile
+++ b/security/krb5-17/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.5.1
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -17,13 +18,13 @@ COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		krb4-[0-9]* heimdal-[0-9]*
+CONFLICTS=		krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
 
 LATEST_LINK=		${PORTNAME}
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool:15
 CONFIGURE_ARGS?=	--enable-shared
 # CONFIGURE_ARGS+=	--disable-thread-support
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
index f1f4e150315a..c53e08d2f807 100644
--- a/security/krb5-appl/Makefile
+++ b/security/krb5-appl/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.5.1
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -17,13 +18,13 @@ COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		krb4-[0-9]* heimdal-[0-9]*
+CONFLICTS=		krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
 
 LATEST_LINK=		${PORTNAME}
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool:15
 CONFIGURE_ARGS?=	--enable-shared
 # CONFIGURE_ARGS+=	--disable-thread-support
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index f1f4e150315a..c53e08d2f807 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=		krb5
 PORTVERSION=		1.5.1
+PORTREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
 DISTNAME=		${PORTNAME}-${PORTVERSION}-signed
@@ -17,13 +18,13 @@ COMMENT=		An authentication system developed at MIT, successor to Kerberos IV
 
 BUILD_DEPENDS=		gm4:${PORTSDIR}/devel/m4
 
-CONFLICTS=		krb4-[0-9]* heimdal-[0-9]*
+CONFLICTS=		krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
 
 LATEST_LINK=		${PORTNAME}
 KERBEROSV_URL=		http://web.mit.edu/kerberos/
 USE_GMAKE=		yes
 USE_PERL5_BUILD=	yes
-INSTALLS_SHLIB=		yes
+USE_LDCONFIG=		yes
 USE_AUTOTOOLS=		libtool:15
 CONFIGURE_ARGS?=	--enable-shared
 # CONFIGURE_ARGS+=	--disable-thread-support
diff --git a/security/srp/Makefile b/security/srp/Makefile
index 1e2bb5023606..f3531e906256 100644
--- a/security/srp/Makefile
+++ b/security/srp/Makefile
@@ -7,12 +7,15 @@
 
 PORTNAME=	srp
 PORTVERSION=	2.1.1
+PORTREVISION=	1
 CATEGORIES=	security net
 MASTER_SITES=	http://srp.stanford.edu/source/
 
 MAINTAINER=	laszlof@FreeBSD.org
 COMMENT=	Secure Remote Password protocol library, TELNET, and FTP
 
+CONFLICTS=	krb4-[0-9]* krb5-[0-9]* heimdal-[0-9]*
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	INSTALL="/usr/bin/install -C"
 CONFIGURE_ARGS=	--with-openssl=/usr				\