svn commit: r412796 - head/devel/tcltls

[Jan Beich]

Antoine Brodin <antoine at FreeBSD.org> writes:

> -.include <bsd.port.pre.mk>
> -
> -.if "${WITH_OPENSSL_PORT:tl}" == "yes" && "${OPENSSL_PORT}" == "security/libressl"
> -CFLAGS+=	-DNO_SSL2
> -.endif
> -
> -.include <bsd.port.post.mk>

Note, this can easily be modernized assuming
- WITH_OPENSSL_PORT is a user variable, cannot be defined by any Mk/*
- bmake syntax is allowed in individual Makefiles

Index: devel/tcltls/Makefile
===================================================================
--- devel/tcltls/Makefile	(revision 412888)
+++ devel/tcltls/Makefile	(working copy)
@@ -24,7 +24,14 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
 		--with-tcl=${TCL_LIBDIR} \
 		--with-ssl-dir=${OPENSSLBASE}
+CFLAGS_libressl+=-DNO_SSL2
 
+.if defined(.PARSEDIR)
+CFLAGS+=	${WITH_OPENSSL_PORT:D${CFLAGS_${OPENSSL_PORT:T}}}
+.elif defined(WITH_OPENSSL_PORT) # XXX Remove after 9.x EOL
+CFLAGS+=	${CFLAGS_${OPENSSL_PORT:T}}
+.endif
+
 TCLPKG=		tls${PORTVERSION}
 WRKSRC=		${WRKDIR}/${TCLPKG}
 PLIST_FILES=	\
@@ -46,7 +53,7 @@ post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/tls.htm ${STAGEDIR}${DOCSDIR}
 
-xregression-test test check: build
+do-test check: build
 	cd ${WRKSRC}/tests && ${SETENV} TCL_LIBRARY="${WRKSRC}" \
 		tclsh${TCL_VER} all.tcl
 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 602 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20160410/750d1551/attachment.sig>