aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbrnrd <brnrd@FreeBSD.org>2016-10-30 22:56:57 +0800
committerbrnrd <brnrd@FreeBSD.org>2016-10-30 22:56:57 +0800
commitc138c842557699eaac2b46956c729d2c0e88573f (patch)
treeab9257e3723d33bf5c58cbde0e2b999e6058323d
parentb43e7dc15a83951867dcc689229618127f250576 (diff)
downloadfreebsd-ports-gnome-c138c842557699eaac2b46956c729d2c0e88573f.tar.gz
freebsd-ports-gnome-c138c842557699eaac2b46956c729d2c0e88573f.tar.zst
freebsd-ports-gnome-c138c842557699eaac2b46956c729d2c0e88573f.zip
security/libressl: Switch to CONFLICTS_INSTALL
- There's no conflict at build time PR: 213691
-rw-r--r--security/libressl-devel/Makefile6
-rw-r--r--security/libressl/Makefile6
2 files changed, 6 insertions, 6 deletions
diff --git a/security/libressl-devel/Makefile b/security/libressl-devel/Makefile
index 2cde312b6a3e..2fea72f544ff 100644
--- a/security/libressl-devel/Makefile
+++ b/security/libressl-devel/Makefile
@@ -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
diff --git a/security/libressl/Makefile b/security/libressl/Makefile
index 15c68cae204f..c593cc5cc487 100644
--- a/security/libressl/Makefile
+++ b/security/libressl/Makefile
@@ -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