svn commit: r424947 - in head/security: libressl libressl-devel

[Bernard Spil]

Author: brnrd
Date: Sun Oct 30 14:56:57 2016
New Revision: 424947
URL: https://svnweb.freebsd.org/changeset/ports/424947

Log:
  security/libressl: Switch to CONFLICTS_INSTALL
  
    - There's no conflict at build time
  
  PR:		213691

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

Modified: head/security/libressl-devel/Makefile
==============================================================================
--- head/security/libressl-devel/Makefile	Sun Oct 30 14:28:48 2016	(r424946)
+++ head/security/libressl-devel/Makefile	Sun Oct 30 14:56:57 2016	(r424947)
@@ -20,9 +20,9 @@ OPTIONS_DEFAULT=	MAN3 NC
 MAN3_DESC=	Install API manpages (section 3)
 NC_DESC=	Install TLS-enabled netcat
 
-CONFLICTS?=	libressl-[0-9]* \
-		openssl-[0-9]* \
-		openssl-devel-[0-9]*
+CONFLICTS_INSTALL=	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 Oct 30 14:28:48 2016	(r424946)
+++ head/security/libressl/Makefile	Sun Oct 30 14:56:57 2016	(r424947)
@@ -19,9 +19,9 @@ OPTIONS_DEFAULT=	MAN3 NC
 MAN3_DESC=	Install API manpages (section 3)
 NC_DESC=	Install TLS-enabled netcat
 
-CONFLICTS?=	libressl-devel-[0-9]* \
-		openssl-[0-9]* \
-		openssl-devel-[0-9]*
+CONFLICTS_INSTALL=	libressl-devel-[0-9]* \
+			openssl-[0-9]* \
+			openssl-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
 USES=		cpe libtool pathfix pkgconfig