svn commit: r410481 - in head/security: libressl libressl-devel openssl

[Bernard Spil]

Author: brnrd
Date: Sun Mar  6 20:06:41 2016
New Revision: 410481
URL: https://svnweb.freebsd.org/changeset/ports/410481

Log:
  security/libressl*: Register conflict with security/openssl-devel
  
   - Add conflict for security/openssl-devel
   - Sort conflicts alphabetically
  
  Reviewed by:	feld (mentor), koobs (mentor)
  Approved by:	feld (mentor)
  Differential Revision:	D5539

Modified:
  head/security/libressl-devel/Makefile
  head/security/libressl/Makefile
  head/security/openssl/Makefile

Modified: head/security/libressl-devel/Makefile
==============================================================================
--- head/security/libressl-devel/Makefile	Sun Mar  6 20:00:32 2016	(r410480)
+++ head/security/libressl-devel/Makefile	Sun Mar  6 20:06:41 2016	(r410481)
@@ -20,8 +20,9 @@ OPTIONS_DEFAULT=	MAN3 NC
 MAN3_DESC=	Install API manpages (section 3)
 NC_DESC=	Build nc libtls demo application
 
-CONFLICTS?=	openssl-[0-9]* \
-		libressl-[0-9]*
+CONFLICTS?=	libressl-[0-9]* \
+		openssl-[0-9]* \
+		openssl-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 USES=		cpe libtool pathfix pkgconfig

Modified: head/security/libressl/Makefile
==============================================================================
--- head/security/libressl/Makefile	Sun Mar  6 20:00:32 2016	(r410480)
+++ head/security/libressl/Makefile	Sun Mar  6 20:06:41 2016	(r410481)
@@ -18,8 +18,9 @@ OPTIONS_DEFINE=	MAN3
 OPTIONS_DEFAULT=	MAN3
 MAN3_DESC=	Install API manpages (section 3)
 
-CONFLICTS?=	openssl-[0-9]* \
-		libressl-devel-[0-9]*
+CONFLICTS?=	libressl-devel-[0-9]* \
+		openssl-[0-9]* \
+		openssl-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 USES=		cpe libtool pathfix pkgconfig

Modified: head/security/openssl/Makefile
==============================================================================
--- head/security/openssl/Makefile	Sun Mar  6 20:00:32 2016	(r410480)
+++ head/security/openssl/Makefile	Sun Mar  6 20:06:41 2016	(r410481)
@@ -18,7 +18,9 @@ COMMENT=	SSL and crypto library
 .error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
 .endif
 
-CONFLICTS?=	libressl-* openssl-devel-*
+CONFLICTS?=	libressl-[0-9]* \
+		libressl-devel-[0-9]* \
+		openssl-devel-[0-9]*
 LICENSE=	OpenSSL
 LICENSE_FILE=	${WRKSRC}/LICENSE