svn commit: r424949 - head/security/acme-client

[Adam Weinberger]

> On 30 Oct, 2016, at 9:16, Bernard Spil <brnrd at freebsd.org> wrote:
> 
> 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 at 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
> 

Hi Bernard,

This doesn't work if SSL_DEFAULT is LibreSSL. I don't think USES=ssl can be set after bsd.port.pre.mk:

cc -O2 -pipe  -fstack-protector -fno-strict-aliasing -g -W -Wall -DHAVE_CONFIG_H -I/usr/local/include   -c -o keyproc.o keyproc.c
http.c:34:10: fatal error: 'tls.h' file not found
#include <tls.h>
         ^
1 error generated.
gmake[1]: *** [<builtin>: http.o] Error 1
gmake[1]: *** Waiting for unfinished jobs....
gmake[1]: Leaving directory '/wrkdirs/usr/ports/security/acme-client/work/acme-client-portable-0.1.11'
===> Compilation failed unexpectedly.

# Adam


-- 
Adam Weinberger
adamw at adamw.org
http://www.adamw.org