Date: Sun, 10 Apr 2016 05:16:46 +0200 From: Jan Beich <jbeich@vfemail.net> To: Mikhail Teterin <mi@FreeBSD.org>, Cc: Antoine Brodin <antoine@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r412796 - head/devel/tcltls Message-ID: <vb3q-9mqp-wny@vfemail.net> In-Reply-To: <201604090525.u395PjiC019435@repo.freebsd.org> (Antoine Brodin's message of "Sat, 9 Apr 2016 05:25:45 %2B0000 (UTC)") References: <201604090525.u395PjiC019435@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable
Antoine Brodin <antoine@FreeBSD.org> writes:
> -.include <bsd.port.pre.mk>
> -
> -.if "${WITH_OPENSSL_PORT:tl}" =3D=3D "yes" && "${OPENSSL_PORT}" =3D=3D "=
security/libressl"
> -CFLAGS+=3D -DNO_SSL2
> -.endif
> -
> -.include <bsd.port.post.mk>
Note, this can easily be modernized assuming
=2D WITH_OPENSSL_PORT is a user variable, cannot be defined by any Mk/*
=2D bmake syntax is allowed in individual Makefiles
Index: devel/tcltls/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
=2D-- devel/tcltls/Makefile (revision 412888)
+++ devel/tcltls/Makefile (working copy)
@@ -24,7 +24,14 @@ GNU_CONFIGURE=3D yes
CONFIGURE_ARGS+=3D--exec-prefix=3D${PREFIX} \
--with-tcl=3D${TCL_LIBDIR} \
--with-ssl-dir=3D${OPENSSLBASE}
+CFLAGS_libressl+=3D-DNO_SSL2
=20
+.if defined(.PARSEDIR)
+CFLAGS+=3D ${WITH_OPENSSL_PORT:D${CFLAGS_${OPENSSL_PORT:T}}}
+.elif defined(WITH_OPENSSL_PORT) # XXX Remove after 9.x EOL
+CFLAGS+=3D ${CFLAGS_${OPENSSL_PORT:T}}
+.endif
+
TCLPKG=3D tls${PORTVERSION}
WRKSRC=3D ${WRKDIR}/${TCLPKG}
PLIST_FILES=3D \
@@ -46,7 +53,7 @@ post-install-DOCS-on:
${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/tls.htm ${STAGEDIR}${DOCSDIR}
=20
=2Dxregression-test test check: build
+do-test check: build
cd ${WRKSRC}/tests && ${SETENV} TCL_LIBRARY=3D"${WRKSRC}" \
tclsh${TCL_VER} all.tcl
=20
--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQF8BAEBCgBmBQJXCcWeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXREQjQ0MzY3NEM3RDIzNTc4NkUxNDkyQ0VF
NEM3Nzg4MzQ3OURCRERCAAoJEOTHeINHnb3bOX0IAJnb0YXZhgcX8h9tV/qg7B9Y
kyuc6qZVa/JqNk4PjXENInlWfGX6W64qpiZfU7/Y3xN6AKC1g6JO/D3jF+67JW9I
w4wdzlr/JoAlHHdgs8efh7IzcSdnfOwxrJG848d43YMuw2yS9XuDY1n9UQodSlqw
j559kONwGhsc1kfYo1ItOfPMcXMEogYZhI9+LWXmYLA80Hd2x3EvKFndOa814sXm
yuPbRU8eztFmMp+mvtWcrcG5DpGGtCnVO+cBINvWtDQ8McgbllE7WmP/DKikKtxV
yUGeXa93N1BloXftns8NUEtPk8qETe/V20U2wVwJVsvzDnrTyITwG5+KVCfRAgY=
=XFZs
-----END PGP SIGNATURE-----
--=-=-=--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?vb3q-9mqp-wny>