Update to revsion 1061

This unbreak building on head

PR:		244903
Submitted by:	kiwi@oav.net

6 files changed, 126 insertions, 25 deletions

diff --git a/comms/openzwave-devel/Makefile b/comms/openzwave-devel/Makefile
index 7c8b40e58098..8f5d8f3a2979 100644
--- a/comms/openzwave-devel/Makefile
+++ b/comms/openzwave-devel/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	openzwave
 PORTVERSION=	1.6.${VERSION_REV}
-PORTREVISION=	1
 CATEGORIES=	comms
 PKGNAMESUFFIX=	-devel
 
@@ -12,31 +11,32 @@ COMMENT=	Open-zwave - An open-source interface to Z-Wave networks
 
 LICENSE=	LGPL20
 
-USES=		compiler:c++11-lang gmake iconv pkgconfig tar:bz2
+USES=		gmake tar:bz2 iconv pkgconfig
 
 # 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
+VERSION_REV=	1061
 
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	OpenZWave
 GH_PROJECT=	open-zwave
-GH_TAGNAME=	1e2d123c
+GH_TAGNAME=	14f2ba74
 MAKE_ARGS=	VERSION_REV=${VERSION_REV} LIBDIR=${WRKSRC} docdir=${DOCSDIR}
 
-OPTIONS_DEFINE=	DOCS DOXYGEN
+OPTIONS_DEFINE=	DOXYGEN DOCS
+OPTIONS_DEFAULT=
 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/*
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+DOXYGEN_DESCR=	Build docs (requires doxygen + graphviz)
+DOXYGEN_BUILD_DEPENDS=	doxygen:${PORTSDIR}/devel/doxygen dot:${PORTSDIR}/graphics/graphviz
+DOXYGEN_PORTDOCS=	*
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopenzwave.so.1.6
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/MinOZW
+	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/lib/libopenzwave.so.1.6
+	${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/MinOZW
 
 post-install-DOXYGEN-on:
 	${RM} ${STAGEDIR}${DOCSDIR}/Doxyfile.in
diff --git a/comms/openzwave-devel/distinfo b/comms/openzwave-devel/distinfo
index 4a1f76710a09..d88d311fded7 100644
--- a/comms/openzwave-devel/distinfo
+++ b/comms/openzwave-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566889355
-SHA256 (OpenZWave-open-zwave-1.6.897-1e2d123c_GH0.tar.gz) = 6608e9961b8439841fce3d64f562f7c4140345d57b841c943bb6418bf939c60d
-SIZE (OpenZWave-open-zwave-1.6.897-1e2d123c_GH0.tar.gz) = 12048208
+TIMESTAMP = 1584434997
+SHA256 (OpenZWave-open-zwave-1.6.1061-14f2ba74_GH0.tar.gz) = 58fd7ead9b236f21e8876ceb5b4fd8781d25bc162daee2d6b9ab9923fdf493e5
+SIZE (OpenZWave-open-zwave-1.6.1061-14f2ba74_GH0.tar.gz) = 13252460
diff --git a/comms/openzwave-devel/files/patch-cpp_build_Makefile b/comms/openzwave-devel/files/patch-cpp_build_Makefile
index 3a2f4199067d..15d3f4c97853 100644
--- a/comms/openzwave-devel/files/patch-cpp_build_Makefile
+++ b/comms/openzwave-devel/files/patch-cpp_build_Makefile
@@ -1,5 +1,18 @@
---- cpp/build/Makefile.orig	2019-08-26 02:51:02 UTC
+--- cpp/build/Makefile.orig	2020-03-16 04:03:45 UTC
 +++ cpp/build/Makefile
+@@ -13,10 +13,10 @@
+ 
+ 
+ # what flags we will use for compiling in debug mode
+-DEBUG_CFLAGS    := -Wformat -Wall -Wno-unknown-pragmas -Wno-inline -Werror -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
++DEBUG_CFLAGS    := -Wformat -Wall -Wno-unknown-pragmas -Wno-inline -Wno-error=sequence-point -Wno-sequence-point -ggdb -DDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
+ DEBUG_CPPFLAGS  := -std=c++11 
+ # what flags we will use for compiling in release mode
+-RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Werror -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
++RELEASE_CFLAGS  := -Wall -Wno-unknown-pragmas -Wno-error=sequence-point -Wno-sequence-point -O3 -DNDEBUG -fPIC  -DSYSCONFDIR="\"$(PREFIX)/etc/openzwave/\""
+ RELEASE_CPPFLAGS := -std=c++11
+ #what flags we will use for linking in debug mode
+ DEBUG_LDFLAGS	:= -g
 @@ -280,8 +280,8 @@ install: $(LIBDIR)/$(SHARED_LIB_NAME) doc $(top_buildd
  	@cp -r $(top_srcdir)/docs/* $(DESTDIR)/$(docdir)
  	@if [ -d "$(top_builddir)/docs/html/" ]; then cp -r $(top_builddir)/docs/html/* $(DESTDIR)/$(docdir); fi
diff --git a/comms/openzwave-devel/files/patch-cpp_build_support.mk b/comms/openzwave-devel/files/patch-cpp_build_support.mk
index e594987159b3..bff3dc0f7929 100644
--- a/comms/openzwave-devel/files/patch-cpp_build_support.mk
+++ b/comms/openzwave-devel/files/patch-cpp_build_support.mk
@@ -1,9 +1,9 @@
---- cpp/build/support.mk.orig	2019-08-26 02:51:02 UTC
+--- cpp/build/support.mk.orig	2020-02-10 15:58:14 UTC
 +++ cpp/build/support.mk
-@@ -46,8 +46,8 @@ VERSION_REV ?= 0
- else
- GITVERSION	:= $(shell $(GIT) --git-dir $(top_srcdir)/.git describe --long --tags --dirty 2>/dev/null | sed s/^v//)
+@@ -67,8 +67,8 @@ endif
+ 
  ifeq ($(GITVERSION),)
+ $(warning  git describe returned an empty result, setting GITVERSION to VERSION_MAJ.VERSION_MIN.-1 and VERSION_REV to 0)
 -GITVERSION	:= $(VERSION_MAJ).$(VERSION_MIN).-1
 -VERSION_REV	:= 0
 +GITVERSION	:= $(VERSION_MAJ).$(VERSION_MIN).$(VERSION_REV)
diff --git a/comms/openzwave-devel/pkg-descr b/comms/openzwave-devel/pkg-descr
index 24bc2c850ca8..45f67fa09d19 100644
--- a/comms/openzwave-devel/pkg-descr
+++ b/comms/openzwave-devel/pkg-descr
@@ -1,6 +1,3 @@
-Free software library that interfaces with selected Z-Wave PC controllers,
-allowing anyone to create applications that manipulate and respond to
-devices on a Z-Wave network, without requiring in-depth knowledge of the
-Z-Wave protocol.
+Open-zwave - An open-source interface to Z-Wave networks.
 
-WWW: http://www.openzwave.net/
+WWW: https://code.google.com/p/open-zwave/
diff --git a/comms/openzwave-devel/pkg-plist b/comms/openzwave-devel/pkg-plist
index 4d915069faee..2a721f97671e 100644
--- a/comms/openzwave-devel/pkg-plist
+++ b/comms/openzwave-devel/pkg-plist
@@ -96,6 +96,8 @@ bin/ozw_config
 %%ETCDIR%%/aeotec/zw162.xml
 %%ETCDIR%%/aeotec/zw164.xml
 %%ETCDIR%%/aeotec/zw175.xml
+%%ETCDIR%%/aeotec/zw187.xml
+%%ETCDIR%%/aeotec/zw189.xml
 %%ETCDIR%%/aeotec/zwa001.xml
 %%ETCDIR%%/aeotec/zwa002.xml
 %%ETCDIR%%/aeotec/zwa003.xml
@@ -103,6 +105,7 @@ bin/ozw_config
 %%ETCDIR%%/aeotec/zwa005.xml
 %%ETCDIR%%/aeotec/zwa006.xml
 %%ETCDIR%%/aeotec/zwa008.xml
+%%ETCDIR%%/aeotec/zwa021.xml
 %%ETCDIR%%/airlinemechanical/zds-ud10.xml
 %%ETCDIR%%/alfred/DB2.xml
 %%ETCDIR%%/assa_abloy/ConexisL1.xml
@@ -175,6 +178,7 @@ bin/ozw_config
 %%ETCDIR%%/duwi/zwws.xml
 %%ETCDIR%%/ecolink/doorwindow.xml
 %%ETCDIR%%/ecolink/firefighter.xml
+%%ETCDIR%%/ecolink/floodfreeze.xml
 %%ETCDIR%%/ecolink/motion.xml
 %%ETCDIR%%/ecolink/sensor.xml
 %%ETCDIR%%/ecolink/tiltsensor.xml
@@ -189,9 +193,11 @@ bin/ozw_config
 %%ETCDIR%%/enerwave/zwn-sc7.xml
 %%ETCDIR%%/enerwave/zwnrsm1plus.xml
 %%ETCDIR%%/enerwave/zwnrsm2plus.xml
+%%ETCDIR%%/eurotronic/eur_airquality.xml
 %%ETCDIR%%/eurotronic/eur_cometz.xml
 %%ETCDIR%%/eurotronic/eur_spiritz.xml
 %%ETCDIR%%/eurotronic/eur_stellaz.xml
+%%ETCDIR%%/eurotronic/eur_temphumin.xml
 %%ETCDIR%%/everspring/ad146.xml
 %%ETCDIR%%/everspring/ad147.xml
 %%ETCDIR%%/everspring/an145.xml
@@ -266,6 +272,7 @@ bin/ozw_config
 %%ETCDIR%%/followgood/swz-1002.xml
 %%ETCDIR%%/forest/fs2z5232000002.xml
 %%ETCDIR%%/fortrezz/fmi.xml
+%%ETCDIR%%/fortrezz/fts05p.xml
 %%ETCDIR%%/fortrezz/gdc1_fortrezz_1501.xml
 %%ETCDIR%%/fortrezz/mimo2plus.xml
 %%ETCDIR%%/fortrezz/mimolite.xml
@@ -291,6 +298,8 @@ bin/ozw_config
 %%ETCDIR%%/ge/28167-plugin-dimmer.xml
 %%ETCDIR%%/ge/28169-plugin-switch.xml
 %%ETCDIR%%/ge/45604.xml
+%%ETCDIR%%/ge/46201-switch.xml
+%%ETCDIR%%/ge/46203-dimmer.xml
 %%ETCDIR%%/ge/dimmer.xml
 %%ETCDIR%%/ge/dimmer_module.xml
 %%ETCDIR%%/ge/hinge-pin.xml
@@ -311,6 +320,7 @@ bin/ozw_config
 %%ETCDIR%%/greenwave/gs1110-1-gr-1.xml
 %%ETCDIR%%/greenwave/powernode1.xml
 %%ETCDIR%%/greenwave/powernode6.xml
+%%ETCDIR%%/guardtec/gkw2000d.xml
 %%ETCDIR%%/hank/hkzw-dws01.xml
 %%ETCDIR%%/hank/hkzw-fld01.xml
 %%ETCDIR%%/hank/hkzw-ms01.xml
@@ -331,6 +341,8 @@ bin/ozw_config
 %%ETCDIR%%/heiman/HS1WL-Z.xml
 %%ETCDIR%%/heiman/HS2SK-Z.xml
 %%ETCDIR%%/heiman/HS2WD-Z.xml
+%%ETCDIR%%/heltun/he-ft01.xml
+%%ETCDIR%%/heltun/he-ht01.xml
 %%ETCDIR%%/heltun/he-zw-sw-5a-1.xml
 %%ETCDIR%%/heltun/he-zw-therm-fc1.xml
 %%ETCDIR%%/heltun/he-zw-therm-fl2.xml
@@ -348,7 +360,10 @@ bin/ozw_config
 %%ETCDIR%%/homeseer/hsm100.xml
 %%ETCDIR%%/homeseer/hsm200.xml
 %%ETCDIR%%/homeseer/ztroller.xml
+%%ETCDIR%%/honeywell/39348-zw4008.xml
 %%ETCDIR%%/honeywell/39351-ZW3005.xml
+%%ETCDIR%%/honeywell/39351-ZW3010.xml
+%%ETCDIR%%/honeywell/39357-ZW3004.xml
 %%ETCDIR%%/honeywell/lynx-touch-l5100.xml
 %%ETCDIR%%/honeywell/th6320zw2003.xml
 %%ETCDIR%%/honeywell/th8320zw1000.xml
@@ -432,6 +447,8 @@ bin/ozw_config
 %%ETCDIR%%/images/aeotec/zw141.png
 %%ETCDIR%%/images/aeotec/zw162.png
 %%ETCDIR%%/images/aeotec/zw164.png
+%%ETCDIR%%/images/aeotec/zw187.png
+%%ETCDIR%%/images/aeotec/zw189.png
 %%ETCDIR%%/images/aeotec/zw195.png
 %%ETCDIR%%/images/aeotec/zwa001.png
 %%ETCDIR%%/images/aeotec/zwa002.png
@@ -439,6 +456,7 @@ bin/ozw_config
 %%ETCDIR%%/images/aeotec/zwa004.png
 %%ETCDIR%%/images/aeotec/zwa005.png
 %%ETCDIR%%/images/aeotec/zwa006.png
+%%ETCDIR%%/images/aeotec/zwa021.png
 %%ETCDIR%%/images/airlinemechanical/zds-ud10.png
 %%ETCDIR%%/images/alfred/DB2.png
 %%ETCDIR%%/images/assa_abloy/ConexisL1.png
@@ -485,6 +503,7 @@ bin/ozw_config
 %%ETCDIR%%/images/duwi/zwws.png
 %%ETCDIR%%/images/ecolink/doorwindow.png
 %%ETCDIR%%/images/ecolink/firefighter.png
+%%ETCDIR%%/images/ecolink/floodfreeze.png
 %%ETCDIR%%/images/ecolink/motion.png
 %%ETCDIR%%/images/ecolink/sensor.png
 %%ETCDIR%%/images/ecolink/tiltsensor.png
@@ -495,9 +514,11 @@ bin/ozw_config
 %%ETCDIR%%/images/enerwave/zw20rm.png
 %%ETCDIR%%/images/enerwave/zwn-bpc.png
 %%ETCDIR%%/images/enerwave/zwnrsm1plus.png
+%%ETCDIR%%/images/eurotronic/eur_airquality.png
 %%ETCDIR%%/images/eurotronic/eur_cometz.png
 %%ETCDIR%%/images/eurotronic/eur_spiritz.png
 %%ETCDIR%%/images/eurotronic/eur_stellaz.png
+%%ETCDIR%%/images/eurotronic/eur_temphumid.png
 %%ETCDIR%%/images/everspring/ad146.png
 %%ETCDIR%%/images/everspring/ad147.png
 %%ETCDIR%%/images/everspring/an157.png
@@ -555,6 +576,7 @@ bin/ozw_config
 %%ETCDIR%%/images/followgood/swz-1002.png
 %%ETCDIR%%/images/forest/fs2z5232000002.png
 %%ETCDIR%%/images/fortrezz/fmi.png
+%%ETCDIR%%/images/fortrezz/fts05p.png
 %%ETCDIR%%/images/fortrezz/gdc1_fortrezz_1501.png
 %%ETCDIR%%/images/fortrezz/mimo2plus.png
 %%ETCDIR%%/images/fortrezz/mimolite.png
@@ -579,6 +601,8 @@ bin/ozw_config
 %%ETCDIR%%/images/ge/28167-plugin-dimmer.png
 %%ETCDIR%%/images/ge/28169-plugin-switch.png
 %%ETCDIR%%/images/ge/45604.png
+%%ETCDIR%%/images/ge/46201-switch.png
+%%ETCDIR%%/images/ge/46203-dimmer.png
 %%ETCDIR%%/images/ge/dimmer.png
 %%ETCDIR%%/images/ge/dimmer_module.png
 %%ETCDIR%%/images/ge/hinge-pin.png
@@ -596,6 +620,7 @@ bin/ozw_config
 %%ETCDIR%%/images/greenwave/gs1110-1-gr-1.png
 %%ETCDIR%%/images/greenwave/powernode1.png
 %%ETCDIR%%/images/greenwave/powernode6.png
+%%ETCDIR%%/images/guardtec/gkw2000d.png
 %%ETCDIR%%/images/hank/hkzw-dws01.png
 %%ETCDIR%%/images/hank/hkzw-fld01.png
 %%ETCDIR%%/images/hank/hkzw-ms01.png
@@ -614,6 +639,8 @@ bin/ozw_config
 %%ETCDIR%%/images/heiman/HS1SA-Z.png
 %%ETCDIR%%/images/heiman/HS1WL-Z.png
 %%ETCDIR%%/images/heiman/HS2SK-Z.png
+%%ETCDIR%%/images/heltun/he-ft01.png
+%%ETCDIR%%/images/heltun/he-ht01.png
 %%ETCDIR%%/images/homeseer/hs-ds100plus.png
 %%ETCDIR%%/images/homeseer/hs-fc200plus.png
 %%ETCDIR%%/images/homeseer/hs-fls100plus.png
@@ -624,7 +651,9 @@ bin/ozw_config
 %%ETCDIR%%/images/homeseer/hs-ws100plus.png
 %%ETCDIR%%/images/homeseer/hs-ws200plus.png
 %%ETCDIR%%/images/homeseer/hsm200.png
+%%ETCDIR%%/images/honeywell/39348-zw4008.png
 %%ETCDIR%%/images/honeywell/39351-ZW3005.png
+%%ETCDIR%%/images/honeywell/39357-ZW3004.png
 %%ETCDIR%%/images/honeywell/lynx-touch-l5100.png
 %%ETCDIR%%/images/honeywell/th6320zw2003.png
 %%ETCDIR%%/images/honeywell/th8320zw1000.png
@@ -643,11 +672,19 @@ bin/ozw_config
 %%ETCDIR%%/images/idlock/idlock101.png
 %%ETCDIR%%/images/idlock/idlock150.png
 %%ETCDIR%%/images/ingersoll/dwzwave1.png
+%%ETCDIR%%/images/inovelli/lzw30-sn.png
+%%ETCDIR%%/images/inovelli/lzw30.png
+%%ETCDIR%%/images/inovelli/lzw31-sn.png
+%%ETCDIR%%/images/inovelli/lzw31.png
+%%ETCDIR%%/images/inovelli/lzw40.png
+%%ETCDIR%%/images/inovelli/lzw41.png
+%%ETCDIR%%/images/inovelli/lzw42.png
 %%ETCDIR%%/images/inovelli/simple_module.png
 %%ETCDIR%%/images/iwatsu/ne-4ct-2p.png
 %%ETCDIR%%/images/iwatsu/ne-4ct.png
 %%ETCDIR%%/images/jasco/45601.png
 %%ETCDIR%%/images/kaipule/im20.png
+%%ETCDIR%%/images/kwikset/914c.png
 %%ETCDIR%%/images/kwikset/smartcode.png
 %%ETCDIR%%/images/leviton/dz15s.png
 %%ETCDIR%%/images/leviton/dz6hd.png
@@ -708,6 +745,8 @@ bin/ozw_config
 %%ETCDIR%%/images/popp/700045.png
 %%ETCDIR%%/images/popp/700168.png
 %%ETCDIR%%/images/popp/700397.png
+%%ETCDIR%%/images/popp/701202.png
+%%ETCDIR%%/images/popp/dwt.png
 %%ETCDIR%%/images/popp/smoke-detector.png
 %%ETCDIR%%/images/popp/solar-siren.png
 %%ETCDIR%%/images/popp/zweather.png
@@ -719,6 +758,7 @@ bin/ozw_config
 %%ETCDIR%%/images/qubino/ZMNHCDx.png
 %%ETCDIR%%/images/qubino/ZMNHDA2.png
 %%ETCDIR%%/images/qubino/ZMNHDDx.png
+%%ETCDIR%%/images/qubino/ZMNHIDx.png
 %%ETCDIR%%/images/qubino/ZMNHNDx.png
 %%ETCDIR%%/images/qubino/ZMNHODx.png
 %%ETCDIR%%/images/qubino/ZMNHSDx.png
@@ -771,8 +811,10 @@ bin/ozw_config
 %%ETCDIR%%/images/telldus/tzwp100.png
 %%ETCDIR%%/images/telldus/tzwp102.png
 %%ETCDIR%%/images/there/800z.png
+%%ETCDIR%%/images/thermofloor/Heatit-Z-Push-button-8-white.png
 %%ETCDIR%%/images/thermofloor/heatit021.png
 %%ETCDIR%%/images/thermofloor/heatit056.png
+%%ETCDIR%%/images/thermofloor/heatit_zdim.png
 %%ETCDIR%%/images/trane/TZEMT400AB32MAA.png
 %%ETCDIR%%/images/trane/TZEMT400BB32MAA.png
 %%ETCDIR%%/images/trane/TZEMT524AA21MA.png
@@ -809,14 +851,20 @@ bin/ozw_config
 %%ETCDIR%%/images/wenzhou/tz68.png
 %%ETCDIR%%/images/wenzhou/tz69.png
 %%ETCDIR%%/images/wenzhou/tz88.png
+%%ETCDIR%%/images/widom/DRY.png
 %%ETCDIR%%/images/widom/UBS104.png
 %%ETCDIR%%/images/widom/UME304C_S.png
+%%ETCDIR%%/images/widom/UMS2.png
 %%ETCDIR%%/images/widom/WDS.png
+%%ETCDIR%%/images/widom/WDS2.png
+%%ETCDIR%%/images/widom/WSP.png
+%%ETCDIR%%/images/widom/WTED.png
 %%ETCDIR%%/images/zipato/HS1CA-Z.png
 %%ETCDIR%%/images/zipato/HS1CG-Z.png
 %%ETCDIR%%/images/zipato/HS1SA-Z.png
 %%ETCDIR%%/images/zipato/HS1WL-Z.png
 %%ETCDIR%%/images/zipato/RGBBulb.png
+%%ETCDIR%%/images/zipato/ne-nas-ab01z.png
 %%ETCDIR%%/images/zipato/pan04.png
 %%ETCDIR%%/images/zipato/phpab01.png
 %%ETCDIR%%/images/zipato/pse02.png
@@ -826,11 +874,15 @@ bin/ozw_config
 %%ETCDIR%%/images/zipato/zp3102.png
 %%ETCDIR%%/images/zooz/zen06.png
 %%ETCDIR%%/images/zooz/zen15.png
+%%ETCDIR%%/images/zooz/zen16.png
 %%ETCDIR%%/images/zooz/zen20.png
 %%ETCDIR%%/images/zooz/zen20v2.png
 %%ETCDIR%%/images/zooz/zen21.png
 %%ETCDIR%%/images/zooz/zen22.png
 %%ETCDIR%%/images/zooz/zen26.png
+%%ETCDIR%%/images/zooz/zen27.png
+%%ETCDIR%%/images/zooz/zen30.png
+%%ETCDIR%%/images/zooz/zen31.png
 %%ETCDIR%%/images/zooz/zse09.png
 %%ETCDIR%%/images/zooz/zse19.png
 %%ETCDIR%%/images/zooz/zse29.png
@@ -848,6 +900,13 @@ bin/ozw_config
 %%ETCDIR%%/images/zwave.me/zweather.png
 %%ETCDIR%%/images/zwp/WD-100.png
 %%ETCDIR%%/ingersoll/dwzwave1.xml
+%%ETCDIR%%/inovelli/lzw30-sn.xml
+%%ETCDIR%%/inovelli/lzw30.xml
+%%ETCDIR%%/inovelli/lzw31-sn.xml
+%%ETCDIR%%/inovelli/lzw31.xml
+%%ETCDIR%%/inovelli/lzw40.xml
+%%ETCDIR%%/inovelli/lzw41.xml
+%%ETCDIR%%/inovelli/lzw42.xml
 %%ETCDIR%%/inovelli/nzw1201.xml
 %%ETCDIR%%/inovelli/nzw30.xml
 %%ETCDIR%%/inovelli/nzw31.xml
@@ -864,6 +923,7 @@ bin/ozw_config
 %%ETCDIR%%/jasco/45601.xml
 %%ETCDIR%%/kaipule/im20.xml
 %%ETCDIR%%/kaipule/ix32.xml
+%%ETCDIR%%/kwikset/914c.xml
 %%ETCDIR%%/kwikset/smartcode.xml
 %%ETCDIR%%/leviton/dz15s.xml
 %%ETCDIR%%/leviton/dz6hd.xml
@@ -965,8 +1025,11 @@ bin/ozw_config
 %%ETCDIR%%/popp/123658.xml
 %%ETCDIR%%/popp/700045.xml
 %%ETCDIR%%/popp/700168.xml
+%%ETCDIR%%/popp/700342.xml
 %%ETCDIR%%/popp/700397.xml
 %%ETCDIR%%/popp/700793.xml
+%%ETCDIR%%/popp/701202.xml
+%%ETCDIR%%/popp/dwt.xml
 %%ETCDIR%%/popp/smoke-detector.xml
 %%ETCDIR%%/popp/solar-siren.xml
 %%ETCDIR%%/popp/zweather.xml
@@ -992,6 +1055,7 @@ bin/ozw_config
 %%ETCDIR%%/qubino/ZMNHLDx.xml
 %%ETCDIR%%/qubino/ZMNHNDx.xml
 %%ETCDIR%%/qubino/ZMNHODx.xml
+%%ETCDIR%%/qubino/ZMNHQDx.xml
 %%ETCDIR%%/qubino/ZMNHSDx.xml
 %%ETCDIR%%/qubino/ZMNHTDx.xml
 %%ETCDIR%%/qubino/ZMNHTDxS3.xml
@@ -1060,8 +1124,10 @@ bin/ozw_config
 %%ETCDIR%%/telldus/tzwp100.xml
 %%ETCDIR%%/telldus/tzwp102.xml
 %%ETCDIR%%/there/800z.xml
+%%ETCDIR%%/thermofloor/heatit-zdim.xml
 %%ETCDIR%%/thermofloor/heatit021.xml
 %%ETCDIR%%/thermofloor/heatit056.xml
+%%ETCDIR%%/thermofloor/heatitz8.xml
 %%ETCDIR%%/trane/TZEMT400AB32MAA.xml
 %%ETCDIR%%/trane/TZEMT400BB32MAA.xml
 %%ETCDIR%%/trane/TZEMT524AA21MA.xml
@@ -1113,18 +1179,25 @@ bin/ozw_config
 %%ETCDIR%%/wenzhou/tz74.xml
 %%ETCDIR%%/wenzhou/tz79.xml
 %%ETCDIR%%/wenzhou/tz88.xml
+%%ETCDIR%%/widom/DRY.xml
 %%ETCDIR%%/widom/UBS104.xml
 %%ETCDIR%%/widom/UME304C_S.xml
+%%ETCDIR%%/widom/UMS2.xml
 %%ETCDIR%%/widom/WDS.xml
+%%ETCDIR%%/widom/WDS2.xml
+%%ETCDIR%%/widom/WSP.xml
+%%ETCDIR%%/widom/WTED.xml
 %%ETCDIR%%/zipato/MiniKeypad.xml
 %%ETCDIR%%/zipato/RGBBulb.xml
 %%ETCDIR%%/zipato/RGBBulb2.xml
+%%ETCDIR%%/zipato/ne-nas-ab02z.xml
 %%ETCDIR%%/zipato/pan04.xml
 %%ETCDIR%%/zipato/vszd2102.xml
 %%ETCDIR%%/zipato/zp3102.xml
 %%ETCDIR%%/zooz/zen06.xml
 %%ETCDIR%%/zooz/zen07.xml
 %%ETCDIR%%/zooz/zen15.xml
+%%ETCDIR%%/zooz/zen16.xml
 %%ETCDIR%%/zooz/zen20.xml
 %%ETCDIR%%/zooz/zen20v2.xml
 %%ETCDIR%%/zooz/zen21.xml
@@ -1136,6 +1209,8 @@ bin/ozw_config
 %%ETCDIR%%/zooz/zen25.xml
 %%ETCDIR%%/zooz/zen26.xml
 %%ETCDIR%%/zooz/zen27.xml
+%%ETCDIR%%/zooz/zen30.xml
+%%ETCDIR%%/zooz/zen31.xml
 %%ETCDIR%%/zooz/zse08.xml
 %%ETCDIR%%/zooz/zse09.xml
 %%ETCDIR%%/zooz/zse18.xml
@@ -1295,3 +1370,19 @@ include/openzwave/value_classes/ValueString.h
 lib/libopenzwave.so
 lib/libopenzwave.so.1.6
 libdata/pkgconfig/libopenzwave.pc
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.old
+%%PORTDOCS%%%%DOCSDIR%%/Doxyfile.in
+%%PORTDOCS%%%%DOCSDIR%%/default.htm
+%%PORTDOCS%%%%DOCSDIR%%/general/DoxygenStepByStep.html
+%%PORTDOCS%%%%DOCSDIR%%/general/GettingHelp.html
+%%PORTDOCS%%%%DOCSDIR%%/general/Index.htm
+%%PORTDOCS%%%%DOCSDIR%%/general/MakingDocumentation.html
+%%PORTDOCS%%%%DOCSDIR%%/general/Notifications.html
+%%PORTDOCS%%%%DOCSDIR%%/images+css/Doxywizard1.JPG
+%%PORTDOCS%%%%DOCSDIR%%/images+css/Doxywizard2.JPG
+%%PORTDOCS%%%%DOCSDIR%%/images+css/Doxywizard3.JPG
+%%PORTDOCS%%%%DOCSDIR%%/images+css/Doxywizard4.JPG
+%%PORTDOCS%%%%DOCSDIR%%/images+css/Doxywizard5.JPG
+%%PORTDOCS%%%%DOCSDIR%%/images+css/OpenZWave.css
+%%PORTDOCS%%%%DOCSDIR%%/images+css/image003.gif
+%%PORTDOCS%%%%DOCSDIR%%/images+css/zwalliance_250x100.jpg