Date: Sun, 30 Oct 2016 10:25:06 -0600 From: Adam Weinberger <adamw@adamw.org> To: Bernard Spil <brnrd@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r424949 - head/security/acme-client Message-ID: <58CE59D0-FDEA-444D-8DB0-6DF94FCB8FCA@adamw.org> In-Reply-To: <201610301516.u9UFG1FZ093325@repo.freebsd.org> References: <201610301516.u9UFG1FZ093325@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 30 Oct, 2016, at 9:16, Bernard Spil <brnrd@freebsd.org> wrote: >=20 > Author: brnrd > Date: Sun Oct 30 15:16:01 2016 > New Revision: 424949 > URL: https://svnweb.freebsd.org/changeset/ports/424949 >=20 > Log: > security/acme-client: Fix CONFLICT errors when OpenSSL is installed >=20 > - As reported for OpenNTPd >=20 > PR: 213691 > Reported by: Simeon Simeonov <blackmore@pichove.org> >=20 > Modified: > head/security/acme-client/Makefile >=20 > Modified: head/security/acme-client/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- 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=3D Native C client for Let's Encry >=20 > LICENSE=3D ISCL >=20 > -USES=3D gmake ssl tar:tgz > +USES=3D gmake tar:tgz >=20 > MAKEFILE=3D GNUmakefile > MAKE_ENV=3D PREFIX=3D${STAGEDIR}/${PREFIX} > @@ -47,10 +47,12 @@ post-install: >=20 > .include <bsd.port.pre.mk> >=20 > -.if ! ${SSL_DEFAULT:Mlibressl*} > -BUILD_DEPENDS+=3D ${NONEXISTENT}:security/libressl:stage > -CPPFLAGS+=3D -I${WRKDIR}/libressl/include > -LDFLAGS+=3D -L${WRKDIR}/libressl/lib > +.if ${SSL_DEFAULT:Mlibressl*} > +USES+=3D ssl > +.else > +BUILD_DEPENDS+=3D ${NONEXISTENT}:security/libressl:stage > +CPPFLAGS+=3D -I${WRKDIR}/libressl/include > +LDFLAGS+=3D -L${WRKDIR}/libressl/lib > . ifnmake describe > STAGEDIR_libressl!=3D ${MAKE} -V STAGEDIR -C = ${PORTSDIR}/security/libressl > . endif >=20 Hi Bernard, This doesn't work if SSL_DEFAULT is LibreSSL. I don't think USES=3Dssl = 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'= =3D=3D=3D> Compilation failed unexpectedly. # Adam --=20 Adam Weinberger adamw@adamw.org http://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?58CE59D0-FDEA-444D-8DB0-6DF94FCB8FCA>