Date: Sun, 30 Oct 2016 15:16:01 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424949 - head/security/acme-client Message-ID: <201610301516.u9UFG1FZ093325@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sun Oct 30 15:16:01 2016 New Revision: 424949 URL: https://svnweb.freebsd.org/changeset/ports/424949 Log: security/acme-client: Fix CONFLICT errors when OpenSSL is installed - As reported for OpenNTPd PR: 213691 Reported by: Simeon Simeonov <blackmore@pichove.org> Modified: head/security/acme-client/Makefile Modified: head/security/acme-client/Makefile ============================================================================== --- head/security/acme-client/Makefile Sun Oct 30 15:13:27 2016 (r424948) +++ head/security/acme-client/Makefile Sun Oct 30 15:16:01 2016 (r424949) @@ -14,7 +14,7 @@ COMMENT= Native C client for Let's Encry LICENSE= ISCL -USES= gmake ssl tar:tgz +USES= gmake tar:tgz MAKEFILE= GNUmakefile MAKE_ENV= PREFIX=${STAGEDIR}/${PREFIX} @@ -47,10 +47,12 @@ post-install: .include <bsd.port.pre.mk> -.if ! ${SSL_DEFAULT:Mlibressl*} -BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage -CPPFLAGS+= -I${WRKDIR}/libressl/include -LDFLAGS+= -L${WRKDIR}/libressl/lib +.if ${SSL_DEFAULT:Mlibressl*} +USES+= ssl +.else +BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage +CPPFLAGS+= -I${WRKDIR}/libressl/include +LDFLAGS+= -L${WRKDIR}/libressl/lib . ifnmake describe STAGEDIR_libressl!= ${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610301516.u9UFG1FZ093325>