Index: branches/2020Q2/comms/openzwave-devel/Makefile
===================================================================
--- branches/2020Q2/comms/openzwave-devel/Makefile	(revision 531918)
+++ branches/2020Q2/comms/openzwave-devel/Makefile	(revision 531919)
@@ -1,44 +1,44 @@
 # Created by: Johan Strom <johna@stromnet.se>
 # $FreeBSD$
 
 PORTNAME=	openzwave
 PORTVERSION=	1.6.${VERSION_REV}
 PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	kiwi@oav.net
 COMMENT=	Open-zwave - An open-source interface to Z-Wave networks
 
 LICENSE=	LGPL20
 
 USES=		compiler:c++11-lang gmake iconv pkgconfig tar:bz2
 
 # Manually update this when makefile is updated
 # echo $(git describe --long --tags --dirty 2>/dev/null | sed s/^v//) | awk '{split($$0,a,"-"); print a[2]}'
 VERSION_REV=	897
 
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenZWave
 GH_PROJECT=	open-zwave
 GH_TAGNAME=	1e2d123c
-MAKE_ARGS=	VERSION_REV=${VERSION_REV} LIBDIR=${WRKSRC} docdir=${DOCSDIR}
+MAKE_ARGS=	VERSION_REV=${VERSION_REV} LIBDIR=${WRKSRC} docdir=${DOCSDIR} CXX=${CXX}
 
 OPTIONS_DEFINE=	DOCS DOXYGEN
 OPTIONS_SUB=	yes
 
 DOXYGEN_DESC=		Build docs (requires doxygen + graphviz)
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen:devel/doxygen
 DOXYGEN_PORTDOCS=	api/* ChangeLog.old default.htm general/* images+css/*
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenzwave.so.1.6
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/MinOZW
 
 post-install-DOXYGEN-on:
 	${RM} ${STAGEDIR}${DOCSDIR}/Doxyfile.in
 
 .include <bsd.port.mk>
Index: branches/2020Q2
===================================================================
--- branches/2020Q2	(revision 531918)
+++ branches/2020Q2	(revision 531919)

Property changes on: branches/2020Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r531918