aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbeich <jbeich@FreeBSD.org>2016-11-02 15:15:08 +0800
committerjbeich <jbeich@FreeBSD.org>2016-11-02 15:15:08 +0800
commit8960dbfa61322b5b9affa970834001a31323fcda (patch)
tree75ecfbd86596723e2535f017e51d26e683f89984
parentdff8e3cd906fc5a43794acbca5f4fe0f98a3c214 (diff)
downloadfreebsd-ports-gnome-8960dbfa61322b5b9affa970834001a31323fcda.tar.gz
freebsd-ports-gnome-8960dbfa61322b5b9affa970834001a31323fcda.tar.zst
freebsd-ports-gnome-8960dbfa61322b5b9affa970834001a31323fcda.zip
security/openssl-devel: adjust conflicts like r422717 and r424947
This permits bundling when DEPENDS_TARGET != install e.g., BUILD_DEPENDS += ${NONEXISTENT}:security/openssl-devel:stage CPPFLAGS+= -I${WRKDIR}/openssl-devel/include LDFLAGS+= -L${WRKDIR}/openssl-devel/lib pre-configure: @(cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/openssl-devel`${LOCALBASE} \ && ${COPYTREE_SHARE} . ${WRKDIR}/openssl-devel "! -name *.so*") PR: 213889 Approved by: portmgr blanket
-rw-r--r--security/openssl-devel/Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/security/openssl-devel/Makefile b/security/openssl-devel/Makefile
index 4c999ed30276..4bc662eb1644 100644
--- a/security/openssl-devel/Makefile
+++ b/security/openssl-devel/Makefile
@@ -15,9 +15,9 @@ COMMENT= SSL and crypto library (1.1.x)
LICENSE= OpenSSL
LICENSE_FILE= ${WRKSRC}/LICENSE
-CONFLICTS= libressl-[0-9]* \
- libressl-devel-[0-9]* \
- openssl-[0-9]*
+CONFLICTS_INSTALL= libressl-[0-9]* \
+ libressl-devel-[0-9]* \
+ openssl-[0-9]*
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= config