Date: Sat, 24 Sep 2016 13:15:48 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r422717 - head/security/openssl Message-ID: <201609241315.u8ODFmSr089279@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Sat Sep 24 13:15:47 2016 New Revision: 422717 URL: https://svnweb.freebsd.org/changeset/ports/422717 Log: devel/openssl: change CONFLICTS to CONFLICTS_INSTALL THere's no problem building openssl with other ports SSL libraries installed, the conflict comes when it's time to install it. Modified: head/security/openssl/Makefile Modified: head/security/openssl/Makefile ============================================================================== --- head/security/openssl/Makefile Sat Sep 24 13:14:49 2016 (r422716) +++ head/security/openssl/Makefile Sat Sep 24 13:15:47 2016 (r422717) @@ -17,9 +17,9 @@ LICENSE_FILE= ${WRKSRC}/LICENSE MAKE_JOBS_UNSAFE= yes CPE_VERSION= ${PORTVERSION}${DISTVERSIONSUFFIX} -CONFLICTS= libressl-[0-9]* \ - libressl-devel-[0-9]* \ - openssl-devel-[0-9]* +CONFLICTS_INSTALL= libressl-[0-9]* \ + libressl-devel-[0-9]* \ + openssl-devel-[0-9]* OPTIONS_DEFINE= SHARED THREADS SSE2 ASM PADLOCK ZLIB SCTP SSL2 SSL3 RFC3779 MD2 RC5 EXPCIPHERS DOCS MAN3 OPTIONS_DEFAULT=SHARED THREADS SSE2 SCTP SSL2 SSL3 MD2 MAN3
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609241315.u8ODFmSr089279>