pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

open-zwave: Update to 1.6.0.913



Module Name:	pkgsrc-wip
Committed By:	Greg Troxel <gdt%lexort.com@localhost>
Pushed By:	gdt
Date:		Sat Sep 14 13:17:53 2019 -0400
Changeset:	1a6fb426229766685b410184873cfd3b7c7989b9

Modified Files:
	open-zwave/Makefile
	open-zwave/PLIST
	open-zwave/distinfo
Removed Files:
	open-zwave/patches/patch-cpp_src_CompatOptionManager.cpp
	open-zwave/patches/patch-cpp_src_platform_unix_ThreadImpl.cpp

Log Message:
open-zwave: Update to 1.6.0.913

This is not really a release; it's 913 commits on master after 1.6.
Changes are basically bugfixes and new device definitions.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a6fb426229766685b410184873cfd3b7c7989b9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 open-zwave/Makefile                                |  17 +-
 open-zwave/PLIST                                   | 371 ++++++++++++++++++++-
 open-zwave/distinfo                                |  10 +-
 .../patches/patch-cpp_src_CompatOptionManager.cpp  |  18 -
 .../patch-cpp_src_platform_unix_ThreadImpl.cpp     |  22 --
 5 files changed, 371 insertions(+), 67 deletions(-)

diffs:
diff --git a/open-zwave/Makefile b/open-zwave/Makefile
index e6fdc1ca2e..f1de3c768b 100644
--- a/open-zwave/Makefile
+++ b/open-zwave/Makefile
@@ -1,19 +1,28 @@
 # $NetBSD$
 
-#https://github.com/OpenZWave/open-zwave/archive/v1.6.tar.gz
+# Originally we packaged the v1.6 releaes, but upstream seems to avoid
+# using master (the stable branch), as there are frequent
+# fixes/updates to config files, but no new release tags.  We
+# construct a faux release number by using 1.6 (the release), .0, and
+# the commit number along master since 1.6, in order to sort under a
+# possible 1.6.1.
 GITHUB_PROJECT=	open-zwave
-VERSION=	1.6
+VERSION=	1.6.0.913	# faux
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
-GITHUB_TAG=	v${VERSION}
+GITHUB_TAG=	2f2b314f7d8c7b2fc943e57f09bcf9bb6670adbc
 CATEGORIES=	comms
 MASTER_SITES=	${MASTER_SITE_GITHUB:=OpenZWave/}
 
+# \todo Define shortened variants of PKGVERSION as 1.6 and 1.6.0 for
+# PLIST usage.
+
 MAINTAINER=	gdt%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/OpenZWave/open-zwave/
 COMMENT=	Library for Z-Wave controllers
 LICENSE=	gnu-lgpl-v3
 
-WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
+#WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${VERSION}
+WRKSRC=		${WRKDIR}/${GITHUB_PROJECT}-${GITHUB_TAG}
 USE_TOOLS+=	pkg-config gmake
 USE_LANGUAGES=	c c++
 
diff --git a/open-zwave/PLIST b/open-zwave/PLIST
index ee34481886..80e56a59a4 100644
--- a/open-zwave/PLIST
+++ b/open-zwave/PLIST
@@ -28,6 +28,8 @@ etc/openzwave/Localization.xml
 etc/openzwave/Localization.xsd
 etc/openzwave/NotificationCCTypes.xml
 etc/openzwave/NotificationCCTypes.xsd
+etc/openzwave/SensorMultiLevelCCTypes.xml
+etc/openzwave/SensorMultiLevelCCTypes.xsd
 etc/openzwave/act/lfm20.xml
 etc/openzwave/act/zdm230.xml
 etc/openzwave/act/zdp100.xml
@@ -93,6 +95,8 @@ etc/openzwave/aeotec/zw139.xml
 etc/openzwave/aeotec/zw140.xml
 etc/openzwave/aeotec/zw141.xml
 etc/openzwave/aeotec/zw162.xml
+etc/openzwave/aeotec/zw164.xml
+etc/openzwave/aeotec/zw175.xml
 etc/openzwave/aeotec/zwa001.xml
 etc/openzwave/aeotec/zwa002.xml
 etc/openzwave/aeotec/zwa003.xml
@@ -101,6 +105,7 @@ etc/openzwave/aeotec/zwa005.xml
 etc/openzwave/aeotec/zwa006.xml
 etc/openzwave/aeotec/zwa008.xml
 etc/openzwave/airlinemechanical/zds-ud10.xml
+etc/openzwave/alfred/DB2.xml
 etc/openzwave/assa_abloy/ConexisL1.xml
 etc/openzwave/assa_abloy/KeyfreeConnected-plus.xml
 etc/openzwave/assa_abloy/KeyfreeConnected.xml
@@ -112,6 +117,7 @@ etc/openzwave/assa_abloy/nexTouch.xml
 etc/openzwave/august/asl-03.xml
 etc/openzwave/buffalo/hw-100v15a-zw.xml
 etc/openzwave/comfort/ucm.xml
+etc/openzwave/config-template.xml
 etc/openzwave/cooper/RF9501.xml
 etc/openzwave/cooper/RF9505-T.xml
 etc/openzwave/cooper/RF9505-T.xml.zip
@@ -170,6 +176,7 @@ etc/openzwave/duwi/zwfb.xml
 etc/openzwave/duwi/zwws.xml
 etc/openzwave/ecolink/doorwindow.xml
 etc/openzwave/ecolink/firefighter.xml
+etc/openzwave/ecolink/floodfreeze.xml
 etc/openzwave/ecolink/motion.xml
 etc/openzwave/ecolink/sensor.xml
 etc/openzwave/ecolink/tiltsensor.xml
@@ -250,13 +257,18 @@ etc/openzwave/fibaro/fgs223.xml
 etc/openzwave/fibaro/fgsd002.xml
 etc/openzwave/fibaro/fgss101.xml
 etc/openzwave/fibaro/fgt001.xml
+etc/openzwave/fibaro/fgwd111.xml
+etc/openzwave/fibaro/fgwds221.xml
+etc/openzwave/fibaro/fgwoe.xml
 etc/openzwave/fibaro/fgwpe.xml
 etc/openzwave/fibaro/fgwpfzw5.xml
 etc/openzwave/fibaro/fgwpg111.xml
+etc/openzwave/fibaro/fgwr111.xml
 etc/openzwave/firstalert/zcombo.xml
 etc/openzwave/followgood/swz-1002.xml
 etc/openzwave/forest/fs2z5232000002.xml
 etc/openzwave/fortrezz/fmi.xml
+etc/openzwave/fortrezz/gdc1_fortrezz_1501.xml
 etc/openzwave/fortrezz/mimo2plus.xml
 etc/openzwave/fortrezz/mimolite.xml
 etc/openzwave/fortrezz/ssa2.xml
@@ -268,7 +280,9 @@ etc/openzwave/frostdale/fdn2311.xml
 etc/openzwave/frostdale/fdn2nxx.xml
 etc/openzwave/ge/12719-plugin-switch.xml
 etc/openzwave/ge/12724-dimmer.xml
+etc/openzwave/ge/12727.xml
 etc/openzwave/ge/14282-plugin-switch.xml
+etc/openzwave/ge/14284.xml
 etc/openzwave/ge/14288-outlet.xml
 etc/openzwave/ge/14291-switch.xml
 etc/openzwave/ge/14292-toggle-switch.xml
@@ -288,10 +302,13 @@ etc/openzwave/ge/ze26i.xml
 etc/openzwave/ge/zw4001-switch.xml
 etc/openzwave/ge/zw6302.xml
 etc/openzwave/gocontrol/GC-TBZ48L.xml
+etc/openzwave/gr/gr-302n.xml
 etc/openzwave/gr/gr105.xml
 etc/openzwave/gr/gr105n.xml
 etc/openzwave/gr/grb3.xml
 etc/openzwave/graber/brz1.xml
+etc/openzwave/graber/csz1.xml
+etc/openzwave/graber/rsz1.xml
 etc/openzwave/graber/vcz1.xml
 etc/openzwave/greenwave/gs1110-1-gr-1.xml
 etc/openzwave/greenwave/powernode1.xml
@@ -316,8 +333,11 @@ etc/openzwave/heiman/HS1SA-Z.xml
 etc/openzwave/heiman/HS1WL-Z.xml
 etc/openzwave/heiman/HS2SK-Z.xml
 etc/openzwave/heiman/HS2WD-Z.xml
+etc/openzwave/heltun/he-zw-sw-5a-1.xml
+etc/openzwave/heltun/he-zw-therm-fc1.xml
 etc/openzwave/heltun/he-zw-therm-fl2.xml
 etc/openzwave/homeseer/ezmotionplus.xml
+etc/openzwave/homeseer/hs-ds100plus.xml
 etc/openzwave/homeseer/hs-fc200plus.xml
 etc/openzwave/homeseer/hs-fls100plus.xml
 etc/openzwave/homeseer/hs-fs100plus.xml
@@ -350,9 +370,11 @@ etc/openzwave/idlock/idlock101.xml
 etc/openzwave/idlock/idlock150.xml
 etc/openzwave/images/2gig/ct100.png
 etc/openzwave/images/2gig/ct32.png
+etc/openzwave/images/BeNext/AlarmSound.png
 etc/openzwave/images/BeNext/DoorSensor.png
 etc/openzwave/images/BeNext/Molite.png
 etc/openzwave/images/BeNext/TagReader.png
+etc/openzwave/images/BeNext/TagReader500.png
 etc/openzwave/images/BeNext/mydisplay.png
 etc/openzwave/images/BeNext/mygate.png
 etc/openzwave/images/act/lfm20.png
@@ -364,6 +386,7 @@ etc/openzwave/images/act/zrp100.png
 etc/openzwave/images/act/zrw103.png
 etc/openzwave/images/act/zrw230.png
 etc/openzwave/images/aeotec/dsa03202.png
+etc/openzwave/images/aeotec/dsa38.png
 etc/openzwave/images/aeotec/dsb04100.png
 etc/openzwave/images/aeotec/dsb05.png
 etc/openzwave/images/aeotec/dsb09104.png
@@ -373,18 +396,61 @@ etc/openzwave/images/aeotec/dsb29.png
 etc/openzwave/images/aeotec/dsc06106.png
 etc/openzwave/images/aeotec/dsc10.png
 etc/openzwave/images/aeotec/dsc11.png
+etc/openzwave/images/aeotec/dsc14104.png
 etc/openzwave/images/aeotec/dsc18103.png
 etc/openzwave/images/aeotec/dsc19103.png
 etc/openzwave/images/aeotec/dsc24.png
 etc/openzwave/images/aeotec/dsc26103.png
 etc/openzwave/images/aeotec/dsc27103.png
+etc/openzwave/images/aeotec/dsc35103.png
 etc/openzwave/images/aeotec/dsd37.png
+etc/openzwave/images/aeotec/zw056.png
+etc/openzwave/images/aeotec/zw062.png
+etc/openzwave/images/aeotec/zw074.png
 etc/openzwave/images/aeotec/zw075.png
 etc/openzwave/images/aeotec/zw078.png
+etc/openzwave/images/aeotec/zw080.png
+etc/openzwave/images/aeotec/zw088.png
+etc/openzwave/images/aeotec/zw089.png
+etc/openzwave/images/aeotec/zw090.png
+etc/openzwave/images/aeotec/zw095.png
+etc/openzwave/images/aeotec/zw096.png
+etc/openzwave/images/aeotec/zw097.png
+etc/openzwave/images/aeotec/zw098.png
+etc/openzwave/images/aeotec/zw099.png
+etc/openzwave/images/aeotec/zw100.png
+etc/openzwave/images/aeotec/zw111.png
+etc/openzwave/images/aeotec/zw112.png
+etc/openzwave/images/aeotec/zw116.png
+etc/openzwave/images/aeotec/zw117.png
+etc/openzwave/images/aeotec/zw120.png
+etc/openzwave/images/aeotec/zw121.png
+etc/openzwave/images/aeotec/zw122.png
+etc/openzwave/images/aeotec/zw129.png
+etc/openzwave/images/aeotec/zw130.png
+etc/openzwave/images/aeotec/zw132.png
+etc/openzwave/images/aeotec/zw139.png
+etc/openzwave/images/aeotec/zw140.png
+etc/openzwave/images/aeotec/zw141.png
+etc/openzwave/images/aeotec/zw162.png
+etc/openzwave/images/aeotec/zw164.png
+etc/openzwave/images/aeotec/zw195.png
+etc/openzwave/images/aeotec/zwa001.png
+etc/openzwave/images/aeotec/zwa002.png
+etc/openzwave/images/aeotec/zwa003.png
+etc/openzwave/images/aeotec/zwa004.png
+etc/openzwave/images/aeotec/zwa005.png
+etc/openzwave/images/aeotec/zwa006.png
 etc/openzwave/images/airlinemechanical/zds-ud10.png
+etc/openzwave/images/alfred/DB2.png
+etc/openzwave/images/assa_abloy/ConexisL1.png
+etc/openzwave/images/assa_abloy/KeyfreeConnected-plus.png
+etc/openzwave/images/assa_abloy/KeyfreeConnected.png
 etc/openzwave/images/assa_abloy/PushButtonDeadbolt.png
 etc/openzwave/images/assa_abloy/TouchDeadbolt.png
 etc/openzwave/images/assa_abloy/TouchLever.png
+etc/openzwave/images/assa_abloy/nexTouch.png
+etc/openzwave/images/august/asl-03.png
 etc/openzwave/images/buffalo/hw-100v15a-zw.png
 etc/openzwave/images/comfort/ucm.png
 etc/openzwave/images/cooper/RF9501.png
@@ -396,17 +462,44 @@ etc/openzwave/images/cooper/rf9534.png
 etc/openzwave/images/danfoss/living.png
 etc/openzwave/images/danfoss/rsroom.png
 etc/openzwave/images/danfoss/z.png
+etc/openzwave/images/devolo/mt02648.png
+etc/openzwave/images/devolo/mt02755.png
+etc/openzwave/images/devolo/mt02758.png
+etc/openzwave/images/devolo/mt2646.png
+etc/openzwave/images/devolo/mt2647.png
+etc/openzwave/images/devolo/mt2652.png
+etc/openzwave/images/devolo/mt2756.png
 etc/openzwave/images/diehlcontrols/766366.png
+etc/openzwave/images/dlink/dch-z110.png
+etc/openzwave/images/dlink/dch-z120.png
+etc/openzwave/images/dlink/dch-z510.png
+etc/openzwave/images/dome/0002.png
+etc/openzwave/images/dome/0085.png
+etc/openzwave/images/dome/0086.png
+etc/openzwave/images/dome/0088.png
+etc/openzwave/images/dome/0201.png
+etc/openzwave/images/domitech/zb22uk.png
+etc/openzwave/images/domitech/ze27eu.png
+etc/openzwave/images/dragontech/wd-100.png
 etc/openzwave/images/duwi/ZWES1000.png
 etc/openzwave/images/duwi/zw-edan-300.png
 etc/openzwave/images/duwi/zw-zdan-300.png
 etc/openzwave/images/duwi/zwws.png
 etc/openzwave/images/ecolink/doorwindow.png
+etc/openzwave/images/ecolink/firefighter.png
+etc/openzwave/images/ecolink/floodfreeze.png
+etc/openzwave/images/ecolink/motion.png
 etc/openzwave/images/ecolink/sensor.png
 etc/openzwave/images/ecolink/tiltsensor.png
 etc/openzwave/images/electronicsolutions/dbmz.png
 etc/openzwave/images/enblink/ss201-us-w_1308.png
+etc/openzwave/images/enerwave/zw15rmplus.png
 etc/openzwave/images/enerwave/zw20r.png
+etc/openzwave/images/enerwave/zw20rm.png
+etc/openzwave/images/enerwave/zwn-bpc.png
+etc/openzwave/images/enerwave/zwnrsm1plus.png
+etc/openzwave/images/eurotronic/eur_cometz.png
+etc/openzwave/images/eurotronic/eur_spiritz.png
 etc/openzwave/images/eurotronic/eur_stellaz.png
 etc/openzwave/images/everspring/ad146.png
 etc/openzwave/images/everspring/ad147.png
@@ -427,6 +520,8 @@ etc/openzwave/images/everspring/sf812.png
 etc/openzwave/images/everspring/sm103.png
 etc/openzwave/images/everspring/sp103.png
 etc/openzwave/images/everspring/sp814.png
+etc/openzwave/images/everspring/sp815.png
+etc/openzwave/images/everspring/sp816.png
 etc/openzwave/images/everspring/st812.png
 etc/openzwave/images/everspring/st814.png
 etc/openzwave/images/everspring/st815.png
@@ -435,79 +530,254 @@ etc/openzwave/images/evolve/lfm-20.png
 etc/openzwave/images/evolve/ltm-5.png
 etc/openzwave/images/fakro/arz.png
 etc/openzwave/images/fakro/zws12.png
+etc/openzwave/images/fibaro/fgbs222.png
+etc/openzwave/images/fibaro/fgcd001.png
+etc/openzwave/images/fibaro/fgd212.png
+etc/openzwave/images/fibaro/fgdw2.png
+etc/openzwave/images/fibaro/fgfs101zw5.png
+etc/openzwave/images/fibaro/fggc001.png
 etc/openzwave/images/fibaro/fgk001.png
+etc/openzwave/images/fibaro/fgk10x.png
+etc/openzwave/images/fibaro/fgkf601.png
 etc/openzwave/images/fibaro/fgms.png
+etc/openzwave/images/fibaro/fgmszw5.png
+etc/openzwave/images/fibaro/fgpb101.png
+etc/openzwave/images/fibaro/fgr223.png
 etc/openzwave/images/fibaro/fgrgbwm441.png
+etc/openzwave/images/fibaro/fgs213.png
+etc/openzwave/images/fibaro/fgs223.png
+etc/openzwave/images/fibaro/fgsd002.png
+etc/openzwave/images/fibaro/fgt001.png
+etc/openzwave/images/fibaro/fgwd111.png
+etc/openzwave/images/fibaro/fgwoe.png
 etc/openzwave/images/fibaro/fgwpe.png
+etc/openzwave/images/fibaro/fgwpfzw5.png
+etc/openzwave/images/fibaro/fgwpg111.png
+etc/openzwave/images/fibaro/fgwr111.png
 etc/openzwave/images/firstalert/zcombo.png
 etc/openzwave/images/followgood/swz-1002.png
+etc/openzwave/images/forest/fs2z5232000002.png
+etc/openzwave/images/fortrezz/fmi.png
+etc/openzwave/images/fortrezz/gdc1_fortrezz_1501.png
+etc/openzwave/images/fortrezz/mimo2plus.png
+etc/openzwave/images/fortrezz/mimolite.png
 etc/openzwave/images/fortrezz/ssa2.png
 etc/openzwave/images/fortrezz/ssa3.png
 etc/openzwave/images/fortrezz/wv01.png
 etc/openzwave/images/fortrezz/wwa-01aa.png
 etc/openzwave/images/fortrezz/wwa02.png
 etc/openzwave/images/frostdale/fdn2311.png
+etc/openzwave/images/ge/12719-plugin-switch.png
+etc/openzwave/images/ge/12724-dimmer.png
+etc/openzwave/images/ge/12727.png
+etc/openzwave/images/ge/14282-plugin-switch.png
+etc/openzwave/images/ge/14284.png
+etc/openzwave/images/ge/14288-outlet.png
+etc/openzwave/images/ge/14291-switch.png
+etc/openzwave/images/ge/14292-toggle-switch.png
+etc/openzwave/images/ge/14294-dimmer.png
+etc/openzwave/images/ge/14295-dimmer-toggle.png
+etc/openzwave/images/ge/26931-motion-switch.png
+etc/openzwave/images/ge/26933-motion-dimmer.png
+etc/openzwave/images/ge/28167-plugin-dimmer.png
+etc/openzwave/images/ge/28169-plugin-switch.png
 etc/openzwave/images/ge/45604.png
 etc/openzwave/images/ge/dimmer.png
 etc/openzwave/images/ge/dimmer_module.png
+etc/openzwave/images/ge/hinge-pin.png
 etc/openzwave/images/ge/receptacle.png
 etc/openzwave/images/ge/relay.png
+etc/openzwave/images/ge/ze26i.png
+etc/openzwave/images/ge/zw6302.png
+etc/openzwave/images/gr/gr-302n.png
 etc/openzwave/images/gr/gr105.png
+etc/openzwave/images/gr/gr105n.png
+etc/openzwave/images/graber/brz1.png
+etc/openzwave/images/graber/csz1.png
+etc/openzwave/images/graber/rsz1.png
+etc/openzwave/images/graber/vcz1.png
 etc/openzwave/images/greenwave/gs1110-1-gr-1.png
 etc/openzwave/images/greenwave/powernode1.png
 etc/openzwave/images/greenwave/powernode6.png
+etc/openzwave/images/hank/hkzw-dws01.png
+etc/openzwave/images/hank/hkzw-fld01.png
+etc/openzwave/images/hank/hkzw-ms01.png
+etc/openzwave/images/hank/hkzw-ms02-200.png
+etc/openzwave/images/hank/hkzw-rgb01.png
+etc/openzwave/images/hank/hkzw-so01-smartplug.png
+etc/openzwave/images/hank/hkzw-so03.png
+etc/openzwave/images/hank/hkzw-so05-smartplug.png
+etc/openzwave/images/hank/scenecontroller1.png
+etc/openzwave/images/hank/scenecontroller4.png
+etc/openzwave/images/heiman/HS1CA-Z.png
+etc/openzwave/images/heiman/HS1CG-Z.png
+etc/openzwave/images/heiman/HS1DS-Z.png
+etc/openzwave/images/heiman/HS1HT-Z.png
+etc/openzwave/images/heiman/HS1MS-Z.png
+etc/openzwave/images/heiman/HS1SA-Z.png
+etc/openzwave/images/heiman/HS1WL-Z.png
+etc/openzwave/images/heiman/HS2SK-Z.png
+etc/openzwave/images/homeseer/hs-ds100plus.png
+etc/openzwave/images/homeseer/hs-fc200plus.png
+etc/openzwave/images/homeseer/hs-fls100plus.png
+etc/openzwave/images/homeseer/hs-ls100plus.png
+etc/openzwave/images/homeseer/hs-ms100plus.png
+etc/openzwave/images/homeseer/hs-wd100plus.png
+etc/openzwave/images/homeseer/hs-wd200plus.png
+etc/openzwave/images/homeseer/hs-ws100plus.png
+etc/openzwave/images/homeseer/hs-ws200plus.png
+etc/openzwave/images/homeseer/hsm200.png
+etc/openzwave/images/honeywell/39351-ZW3005.png
 etc/openzwave/images/honeywell/lynx-touch-l5100.png
+etc/openzwave/images/honeywell/th6320zw2003.png
 etc/openzwave/images/honeywell/th8320zw1000.png
 etc/openzwave/images/horstmann/asrzw.png
 etc/openzwave/images/horstmann/hrt4zw.png
 etc/openzwave/images/horstmann/scsc17.png
 etc/openzwave/images/horstmann/ses301.png
+etc/openzwave/images/horstmann/ses302.png
+etc/openzwave/images/horstmann/ses303.png
 etc/openzwave/images/horstmann/sir321.png
+etc/openzwave/images/horstmann/srt321.png
+etc/openzwave/images/horstmann/srt323.png
 etc/openzwave/images/horstmann/ssr302.png
+etc/openzwave/images/horstmann/ssr303.png
 etc/openzwave/images/icare/zw-66.png
+etc/openzwave/images/idlock/idlock101.png
+etc/openzwave/images/idlock/idlock150.png
 etc/openzwave/images/ingersoll/dwzwave1.png
+etc/openzwave/images/inovelli/simple_module.png
 etc/openzwave/images/iwatsu/ne-4ct-2p.png
 etc/openzwave/images/iwatsu/ne-4ct.png
 etc/openzwave/images/jasco/45601.png
+etc/openzwave/images/kaipule/im20.png
 etc/openzwave/images/kwikset/smartcode.png
+etc/openzwave/images/leviton/dz15s.png
+etc/openzwave/images/leviton/dz6hd.png
+etc/openzwave/images/leviton/dzpd3.png
 etc/openzwave/images/leviton/vrcs2.png
 etc/openzwave/images/leviton/vrf01.png
 etc/openzwave/images/leviton/vri10.png
 etc/openzwave/images/leviton/vrs15.png
+etc/openzwave/images/linear/LB60Z-1.png
+etc/openzwave/images/linear/WD500Z5-1.png
+etc/openzwave/images/linear/gd00z-7.png
+etc/openzwave/images/linear/ngd00z.png
+etc/openzwave/images/logicsoft/ZHC5010.png
+etc/openzwave/images/mcohome/mh7h.png
+etc/openzwave/images/mcohome/mhp220.png
+etc/openzwave/images/mcohome/mhp511.png
 etc/openzwave/images/merten/5044xx.png
 etc/openzwave/images/merten/5046xx.png
 etc/openzwave/images/merten/506004.png
 etc/openzwave/images/merten/508244.png
 etc/openzwave/images/miyakawaelectric/me-d101.png
+etc/openzwave/images/nexia/db100z.png
 etc/openzwave/images/nodon/asp3100SmartPlug.png
+etc/openzwave/images/nodon/crc3100OctanRemote.png
+etc/openzwave/images/nodon/crc360xSofremote.png
+etc/openzwave/images/nodon/cws3101wallswitch.png
+etc/openzwave/images/nodon/msp31xxMicroSmartPlug.png
 etc/openzwave/images/northq/nq92021.png
+etc/openzwave/images/oomi/ft100.png
+etc/openzwave/images/oomi/ft111.png
+etc/openzwave/images/permundo/psc132zw.png
+etc/openzwave/images/permundo/psc234zw.png
+etc/openzwave/images/philio/pad02.png
 etc/openzwave/images/philio/pan04.png
+etc/openzwave/images/philio/pan05.png
 etc/openzwave/images/philio/pan06.png
 etc/openzwave/images/philio/pan08.png
 etc/openzwave/images/philio/pan11-1.png
 etc/openzwave/images/philio/pan11.png
+etc/openzwave/images/philio/pan16.png
+etc/openzwave/images/philio/phpab01.png
+etc/openzwave/images/philio/phpat02.png
+etc/openzwave/images/philio/phpsg01.png
+etc/openzwave/images/philio/pse02.png
 etc/openzwave/images/philio/psm02.png
+etc/openzwave/images/philio/psp05.png
+etc/openzwave/images/philio/psr03-1b.png
+etc/openzwave/images/philio/psr04.png
 etc/openzwave/images/philio/pst02-1c.png
 etc/openzwave/images/philio/pst02-b.png
 etc/openzwave/images/philio/pst02.png
+etc/openzwave/images/polycontrol/doorlock.png
+etc/openzwave/images/polycontrol/doorlockv3.png
+etc/openzwave/images/popp/004407.png
+etc/openzwave/images/popp/009303.png
+etc/openzwave/images/popp/009402.png
+etc/openzwave/images/popp/012501.png
+etc/openzwave/images/popp/700045.png
+etc/openzwave/images/popp/700168.png
+etc/openzwave/images/popp/700397.png
+etc/openzwave/images/popp/dwt.png
+etc/openzwave/images/popp/smoke-detector.png
+etc/openzwave/images/popp/solar-siren.png
+etc/openzwave/images/popp/zweather.png
 etc/openzwave/images/prowell/zw-702.png
 etc/openzwave/images/qees/reto-dimmer-plus.png
 etc/openzwave/images/qees/reto-plugin-switch.png
+etc/openzwave/images/qubino/ZMNHADx.png
+etc/openzwave/images/qubino/ZMNHBDx.png
+etc/openzwave/images/qubino/ZMNHCDx.png
+etc/openzwave/images/qubino/ZMNHDA2.png
+etc/openzwave/images/qubino/ZMNHDDx.png
+etc/openzwave/images/qubino/ZMNHIDx.png
+etc/openzwave/images/qubino/ZMNHNDx.png
+etc/openzwave/images/qubino/ZMNHODx.png
+etc/openzwave/images/qubino/ZMNHSDx.png
+etc/openzwave/images/qubino/ZMNHTDx.png
+etc/openzwave/images/qubino/ZMNHVDx.png
+etc/openzwave/images/qubino/ZMNHWD1.png
+etc/openzwave/images/qubino/ZMNHYDx.png
+etc/openzwave/images/qubino/zmnhxdx.png
 etc/openzwave/images/quby/qb2.png
 etc/openzwave/images/rcs/em52-zw.png
 etc/openzwave/images/rcs/therm0009.png
 etc/openzwave/images/remotec/bw8120eu.png
 etc/openzwave/images/remotec/zfm-80.png
+etc/openzwave/images/remotec/zrc-100eu.png
+etc/openzwave/images/remotec/zrc-90.png
 etc/openzwave/images/remotec/zts-110.png
+etc/openzwave/images/remotec/zts-500.png
 etc/openzwave/images/remotec/zurc.png
 etc/openzwave/images/remotec/zxt-120.png
+etc/openzwave/images/remotec/zxt-310.png
+etc/openzwave/images/remotec/zxt-600.png
+etc/openzwave/images/schlage/BE468ZP.png
 etc/openzwave/images/schlage/BE469.png
+etc/openzwave/images/schlage/BE469ZP.png
 etc/openzwave/images/schlage/fe599.png
 etc/openzwave/images/schlagelink/41.png
+etc/openzwave/images/sensative/strips.png
+etc/openzwave/images/sensative/stripscomfort.png
 etc/openzwave/images/sercomm/sw-clp01-eu.png
+etc/openzwave/images/shenzen_neo/nas-ab01z.png
+etc/openzwave/images/shenzen_neo/nas-ds01z.png
+etc/openzwave/images/shenzen_neo/nas-pd01z.png
+etc/openzwave/images/shenzen_neo/nas-wr01z.png
+etc/openzwave/images/shenzen_neo/nas-ws02z.png
+etc/openzwave/images/simon/10002034-13X.png
 etc/openzwave/images/smartthings/pgc401m.png
+etc/openzwave/images/smartthings/sth-eth200.png
+etc/openzwave/images/steinel/is140-2.png
+etc/openzwave/images/steinel/l810-led-ihf.png
+etc/openzwave/images/steinel/rs-led-d2.png
+etc/openzwave/images/steinel/xled-home-2.png
+etc/openzwave/images/stelpro/stzw402.png
+etc/openzwave/images/sunricher/srzv9001k8.png
+etc/openzwave/images/sunricher/srzv9001t4dimeu.png
+etc/openzwave/images/sunricher/srzv9003t4rgbweu.png
+etc/openzwave/images/sunricher/srzv9101sachpeu.png
+etc/openzwave/images/sunricher/zv9101.png
 etc/openzwave/images/swiid/swiidinter.png
+etc/openzwave/images/telldus/tzdw100.png
+etc/openzwave/images/telldus/tzwp100.png
+etc/openzwave/images/telldus/tzwp102.png
 etc/openzwave/images/there/800z.png
+etc/openzwave/images/thermofloor/heatit021.png
+etc/openzwave/images/thermofloor/heatit056.png
 etc/openzwave/images/trane/TZEMT400AB32MAA.png
 etc/openzwave/images/trane/TZEMT400BB32MAA.png
 etc/openzwave/images/trane/TZEMT524AA21MA.png
@@ -515,10 +785,18 @@ etc/openzwave/images/vera/vera2.png
 etc/openzwave/images/vision/1701.png
 etc/openzwave/images/vision/brg1-433.png
 etc/openzwave/images/vision/zd2102.png
+etc/openzwave/images/vision/zd2105us5.png
+etc/openzwave/images/vision/zd2201.png
+etc/openzwave/images/vision/zd2301.png
 etc/openzwave/images/vision/zl7101us.png
 etc/openzwave/images/vision/zl7201us.png
+etc/openzwave/images/vision/zl7431.png
+etc/openzwave/images/vision/zl7432us.png
 etc/openzwave/images/vision/zm1601eu.png
+etc/openzwave/images/vision/zm1601eu5.png
+etc/openzwave/images/vision/zm1602eu5.png
 etc/openzwave/images/vision/zp3102.png
+etc/openzwave/images/vision/zp3111.png
 etc/openzwave/images/vision/zr1202us.png
 etc/openzwave/images/vision/zs610eu.png
 etc/openzwave/images/vision/zu1401jp.png
@@ -528,14 +806,52 @@ etc/openzwave/images/vitrum/vitrumII-Blind.png
 etc/openzwave/images/vitrum/vitrumII-Dimmer.png
 etc/openzwave/images/vitrum/vitrumII-Switch.png
 etc/openzwave/images/wenzhou/tsp01.png
+etc/openzwave/images/wenzhou/tz55.png
+etc/openzwave/images/wenzhou/tz56.png
+etc/openzwave/images/wenzhou/tz65d.png
 etc/openzwave/images/wenzhou/tz66d.png
 etc/openzwave/images/wenzhou/tz67.png
+etc/openzwave/images/wenzhou/tz68.png
+etc/openzwave/images/wenzhou/tz69.png
 etc/openzwave/images/wenzhou/tz88.png
 etc/openzwave/images/widom/UBS104.png
+etc/openzwave/images/widom/UME304C_S.png
+etc/openzwave/images/widom/WDS.png
+etc/openzwave/images/zipato/HS1CA-Z.png
+etc/openzwave/images/zipato/HS1CG-Z.png
+etc/openzwave/images/zipato/HS1SA-Z.png
+etc/openzwave/images/zipato/HS1WL-Z.png
+etc/openzwave/images/zipato/RGBBulb.png
+etc/openzwave/images/zipato/pan04.png
+etc/openzwave/images/zipato/phpab01.png
+etc/openzwave/images/zipato/pse02.png
+etc/openzwave/images/zipato/pst02.png
+etc/openzwave/images/zipato/vszd2102.png
+etc/openzwave/images/zipato/zd2301.png
+etc/openzwave/images/zipato/zp3102.png
+etc/openzwave/images/zooz/zen06.png
+etc/openzwave/images/zooz/zen15.png
+etc/openzwave/images/zooz/zen20.png
+etc/openzwave/images/zooz/zen20v2.png
+etc/openzwave/images/zooz/zen21.png
+etc/openzwave/images/zooz/zen22.png
+etc/openzwave/images/zooz/zen26.png
+etc/openzwave/images/zooz/zse09.png
+etc/openzwave/images/zooz/zse19.png
+etc/openzwave/images/zooz/zse29.png
+etc/openzwave/images/zooz/zse30.png
+etc/openzwave/images/zooz/zse33.png
+etc/openzwave/images/zooz/zse40.png
+etc/openzwave/images/zwave.me/004001.png
 etc/openzwave/images/zwave.me/ZME_05431.png
 etc/openzwave/images/zwave.me/ZME_06433.png
 etc/openzwave/images/zwave.me/ZME_06436.png
+etc/openzwave/images/zwave.me/ZUno.png
 etc/openzwave/images/zwave.me/kfob.png
+etc/openzwave/images/zwave.me/popp_kfob-c.png
+etc/openzwave/images/zwave.me/zme_raz5.png
+etc/openzwave/images/zwave.me/zweather.png
+etc/openzwave/images/zwp/WD-100.png
 etc/openzwave/ingersoll/dwzwave1.xml
 etc/openzwave/inovelli/nzw1201.xml
 etc/openzwave/inovelli/nzw30.xml
@@ -577,6 +893,8 @@ etc/openzwave/linear/WD500Z-1.xml
 etc/openzwave/linear/WD500Z5-1.xml
 etc/openzwave/linear/WS15Z-1.xml
 etc/openzwave/linear/WT00Z-1.xml
+etc/openzwave/linear/gd00z-7.xml
+etc/openzwave/linear/ngd00z.xml
 etc/openzwave/logicsoft/ZHC5002.xml
 etc/openzwave/logicsoft/ZHC5010.xml
 etc/openzwave/manufacturer_specific.xml
@@ -586,6 +904,8 @@ etc/openzwave/mcohome/mh7h.xml
 etc/openzwave/mcohome/mh8fceu.xml
 etc/openzwave/mcohome/mh9co2.xml
 etc/openzwave/mcohome/mhp210.xml
+etc/openzwave/mcohome/mhp220.xml
+etc/openzwave/mcohome/mhp511.xml
 etc/openzwave/mcohome/mhs311.xml
 etc/openzwave/mcohome/mhs312.xml
 etc/openzwave/mcohome/mhs314.xml
@@ -612,6 +932,8 @@ etc/openzwave/oomi/ft100.xml
 etc/openzwave/oomi/ft111.xml
 etc/openzwave/options.xml
 etc/openzwave/options.xsd
+etc/openzwave/permundo/psc132zw.xml
+etc/openzwave/permundo/psc234zw.xml
 etc/openzwave/philio/pad02.xml
 etc/openzwave/philio/pan03.xml
 etc/openzwave/philio/pan04.xml
@@ -650,6 +972,7 @@ etc/openzwave/popp/700045.xml
 etc/openzwave/popp/700168.xml
 etc/openzwave/popp/700397.xml
 etc/openzwave/popp/700793.xml
+etc/openzwave/popp/dwt.xml
 etc/openzwave/popp/smoke-detector.xml
 etc/openzwave/popp/solar-siren.xml
 etc/openzwave/popp/zweather.xml
@@ -664,6 +987,7 @@ etc/openzwave/qubino/ZMNHCA2.xml
 etc/openzwave/qubino/ZMNHCDx.xml
 etc/openzwave/qubino/ZMNHDA2.xml
 etc/openzwave/qubino/ZMNHDDx.xml
+etc/openzwave/qubino/ZMNHHDx.xml
 etc/openzwave/qubino/ZMNHIA2.xml
 etc/openzwave/qubino/ZMNHIDxS1.xml
 etc/openzwave/qubino/ZMNHIDxS2.xml
@@ -692,6 +1016,7 @@ etc/openzwave/rcs/therm0007.xml
 etc/openzwave/rcs/therm0009.xml
 etc/openzwave/remotec/bw8120eu.xml
 etc/openzwave/remotec/zfm-80.xml
+etc/openzwave/remotec/zrc-100eu.xml
 etc/openzwave/remotec/zrc-90.xml
 etc/openzwave/remotec/zts-110.xml
 etc/openzwave/remotec/zts-500.xml
@@ -700,6 +1025,7 @@ etc/openzwave/remotec/zxt-120.xml
 etc/openzwave/remotec/zxt-310.xml
 etc/openzwave/remotec/zxt-600.xml
 etc/openzwave/schlage/BE468.xml
+etc/openzwave/schlage/BE468ZP.xml
 etc/openzwave/schlage/BE469.xml
 etc/openzwave/schlage/BE469ZP.xml
 etc/openzwave/schlage/fe599.xml
@@ -722,13 +1048,16 @@ etc/openzwave/shenzen_neo/nas-ws02z.xml
 etc/openzwave/simon/10002034-13X.xml
 etc/openzwave/simon/10002041-13X.xml
 etc/openzwave/smartthings/pgc401m.xml
+etc/openzwave/smartthings/sth-eth200.xml
 etc/openzwave/somfy/1811265_ZRTSI.xml
 etc/openzwave/steinel/is140-2.xml
 etc/openzwave/steinel/l810-led-ihf.xml
 etc/openzwave/steinel/rs-led-d2.xml
 etc/openzwave/steinel/xled-home-2.xml
 etc/openzwave/stelpro/stzw402.xml
+etc/openzwave/sunricher/srzv9001k8.xml
 etc/openzwave/sunricher/srzv9001t4dimeu.xml
+etc/openzwave/sunricher/srzv9003t4rgbweu.xml
 etc/openzwave/sunricher/srzv9101sachpeu.xml
 etc/openzwave/sunricher/zv9101.xml
 etc/openzwave/swiid/swiidinter.xml
@@ -755,6 +1084,7 @@ etc/openzwave/vision/zl7101us.xml
 etc/openzwave/vision/zl7201us.xml
 etc/openzwave/vision/zl7261.xml
 etc/openzwave/vision/zl7431.xml
+etc/openzwave/vision/zl7432us.xml
 etc/openzwave/vision/zm1601eu.xml
 etc/openzwave/vision/zm1601eu5.xml
 etc/openzwave/vision/zm1602eu.xml
@@ -767,8 +1097,8 @@ etc/openzwave/vision/zs610eu.xml
 etc/openzwave/vision/zu1401jp.xml
 etc/openzwave/vitrum/vitrumI-Dimmer.xml
 etc/openzwave/vitrum/vitrumI-Switch.xml
-etc/openzwave/vitrum/vitrumII-Blind.xml
 etc/openzwave/vitrum/vitrumII-Dimmer.xml
+etc/openzwave/vitrum/vitrumII-RollerBlind.xml
 etc/openzwave/vitrum/vitrumII-Switch.xml
 etc/openzwave/vitrum/vitrumIII-Dimmer.xml
 etc/openzwave/vitrum/vitrumIII-Switch.xml
@@ -816,9 +1146,11 @@ etc/openzwave/zooz/zse08.xml
 etc/openzwave/zooz/zse09.xml
 etc/openzwave/zooz/zse18.xml
 etc/openzwave/zooz/zse19.xml
+etc/openzwave/zooz/zse29.xml
 etc/openzwave/zooz/zse30.xml
 etc/openzwave/zooz/zse33.xml
 etc/openzwave/zooz/zse40.xml
+etc/openzwave/zwave.me/004001.xml
 etc/openzwave/zwave.me/ZME_05431.xml
 etc/openzwave/zwave.me/ZME_05461.xml
 etc/openzwave/zwave.me/ZME_06433.xml
@@ -833,6 +1165,7 @@ etc/openzwave/zwave.me/ZUno.xml
 etc/openzwave/zwave.me/iTemp.xml
 etc/openzwave/zwave.me/kfob.xml
 etc/openzwave/zwave.me/popp_kfob-c.xml
+etc/openzwave/zwave.me/zme_raz5.xml
 etc/openzwave/zwave.me/zweather.xml
 etc/openzwave/zwcfg.xsd
 etc/openzwave/zwp/PA-100.xml
@@ -856,8 +1189,11 @@ include/openzwave/NotificationCCTypes.h
 include/openzwave/OZWException.h
 include/openzwave/Options.h
 include/openzwave/Scene.h
+include/openzwave/SensorMultiLevelCCTypes.h
 include/openzwave/TimerThread.h
 include/openzwave/Utils.h
+include/openzwave/ValueIDIndexes.h
+include/openzwave/ValueIDIndexesDefines.h
 include/openzwave/ZWSecurity.h
 include/openzwave/aes/aes.h
 include/openzwave/aes/aescpp.h
@@ -963,20 +1299,21 @@ include/openzwave/value_classes/ValueShort.h
 include/openzwave/value_classes/ValueStore.h
 include/openzwave/value_classes/ValueString.h
 lib/libopenzwave.so
-lib/libopenzwave.so.${PKGVERSION}
+lib/libopenzwave.so.1.6
 lib/pkgconfig/libopenzwave.pc
-share/doc/openzwave-${PKGVERSION}.0/Doxyfile.in
-share/doc/openzwave-${PKGVERSION}.0/default.htm
-share/doc/openzwave-${PKGVERSION}.0/general/DoxygenStepByStep.html
-share/doc/openzwave-${PKGVERSION}.0/general/GettingHelp.html
-share/doc/openzwave-${PKGVERSION}.0/general/Index.htm
-share/doc/openzwave-${PKGVERSION}.0/general/MakingDocumentation.html
-share/doc/openzwave-${PKGVERSION}.0/general/Notifications.html
-share/doc/openzwave-${PKGVERSION}.0/images+css/Doxywizard1.JPG
-share/doc/openzwave-${PKGVERSION}.0/images+css/Doxywizard2.JPG
-share/doc/openzwave-${PKGVERSION}.0/images+css/Doxywizard3.JPG
-share/doc/openzwave-${PKGVERSION}.0/images+css/Doxywizard4.JPG
-share/doc/openzwave-${PKGVERSION}.0/images+css/Doxywizard5.JPG
-share/doc/openzwave-${PKGVERSION}.0/images+css/OpenZWave.css
-share/doc/openzwave-${PKGVERSION}.0/images+css/image003.gif
-share/doc/openzwave-${PKGVERSION}.0/images+css/zwalliance_250x100.jpg
+share/doc/openzwave-1.6.0/ChangeLog.old
+share/doc/openzwave-1.6.0/Doxyfile.in
+share/doc/openzwave-1.6.0/default.htm
+share/doc/openzwave-1.6.0/general/DoxygenStepByStep.html
+share/doc/openzwave-1.6.0/general/GettingHelp.html
+share/doc/openzwave-1.6.0/general/Index.htm
+share/doc/openzwave-1.6.0/general/MakingDocumentation.html
+share/doc/openzwave-1.6.0/general/Notifications.html
+share/doc/openzwave-1.6.0/images+css/Doxywizard1.JPG
+share/doc/openzwave-1.6.0/images+css/Doxywizard2.JPG
+share/doc/openzwave-1.6.0/images+css/Doxywizard3.JPG
+share/doc/openzwave-1.6.0/images+css/Doxywizard4.JPG
+share/doc/openzwave-1.6.0/images+css/Doxywizard5.JPG
+share/doc/openzwave-1.6.0/images+css/OpenZWave.css
+share/doc/openzwave-1.6.0/images+css/image003.gif
+share/doc/openzwave-1.6.0/images+css/zwalliance_250x100.jpg
diff --git a/open-zwave/distinfo b/open-zwave/distinfo
index 22f0df997c..f858fb615d 100644
--- a/open-zwave/distinfo
+++ b/open-zwave/distinfo
@@ -1,9 +1,7 @@
 $NetBSD$
 
-SHA1 (open-zwave-1.6.tar.gz) = ae58b3d8266c95ec0e4c6af1ad2bb32bd2f0e7e6
-RMD160 (open-zwave-1.6.tar.gz) = 540be46256a7d3d3654e95e7e273c80e98f94cbf
-SHA512 (open-zwave-1.6.tar.gz) = ae04fc7ad279f0b4bc5ffc62151c401bb40e2b50da7d6047506daeb39d5655be16dc1eeb15dc22b6cb75cac567609e2f804e6a07f438681e462088a50b6cf11a
-Size (open-zwave-1.6.tar.gz) = 5857049 bytes
+SHA1 (open-zwave-1.6.0.913-2f2b314f7d8c7b2fc943e57f09bcf9bb6670adbc.tar.gz) = 95cba506d26e629a083c0dda972d078c048bfc49
+RMD160 (open-zwave-1.6.0.913-2f2b314f7d8c7b2fc943e57f09bcf9bb6670adbc.tar.gz) = c59159cdb36726071cf6115a7f1775b67bf7e90c
+SHA512 (open-zwave-1.6.0.913-2f2b314f7d8c7b2fc943e57f09bcf9bb6670adbc.tar.gz) = 12adb482c9946d0ad35192bc3d1f1969a4b57b755cc661eb406c38943e98a26ff594026e2c3a5b6510f624cd873f5609e9fff01f4bfa0e7dde8fb25a626f4c3c
+Size (open-zwave-1.6.0.913-2f2b314f7d8c7b2fc943e57f09bcf9bb6670adbc.tar.gz) = 12113197 bytes
 SHA1 (patch-cpp_build_ozw__config.in) = 2f81ddf9250fc6c4d919f435e550597c7eaa3630
-SHA1 (patch-cpp_src_CompatOptionManager.cpp) = 2edbf9c1c8bd6e440d4c9f1275d1f864d0c6466b
-SHA1 (patch-cpp_src_platform_unix_ThreadImpl.cpp) = 5ba9904fcc7b98714f76a3bd8f451bf3841e8f05
diff --git a/open-zwave/patches/patch-cpp_src_CompatOptionManager.cpp b/open-zwave/patches/patch-cpp_src_CompatOptionManager.cpp
deleted file mode 100644
index f73bba82df..0000000000
--- a/open-zwave/patches/patch-cpp_src_CompatOptionManager.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Avoid compiler warning about possibly-uninitialized variable.
-
-(Upstream master has diverged from this patch.)
-
---- cpp/src/CompatOptionManager.cpp.orig	2019-05-03 14:49:45.000000000 +0000
-+++ cpp/src/CompatOptionManager.cpp
-@@ -255,6 +255,9 @@ void CompatOptionManager::WriteXML
- 				snprintf(str, sizeof(str), "%d", m_CompatVals[it->second].valInt);
- 				text = new TiXmlText(str);
- 				break;
-+			default:
-+				text = new TiXmlText("UNMATCHED");
-+				break;
- 		}
- 		valElement->LinkEndChild(text);
- 		compatElement->LinkEndChild( valElement );
diff --git a/open-zwave/patches/patch-cpp_src_platform_unix_ThreadImpl.cpp b/open-zwave/patches/patch-cpp_src_platform_unix_ThreadImpl.cpp
deleted file mode 100644
index faeb873a5c..0000000000
--- a/open-zwave/patches/patch-cpp_src_platform_unix_ThreadImpl.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD$
-
-Adapt to pthread_setname_np signature on NetBSD.
-
-Not yet sent upstream.
-
---- cpp/src/platform/unix/ThreadImpl.cpp.orig	2019-05-03 14:49:45.000000000 +0000
-+++ cpp/src/platform/unix/ThreadImpl.cpp
-@@ -90,8 +90,13 @@ bool ThreadImpl::Start
- 	string threadname("OZW-");
- 	threadname.append(m_name);
- #if !defined(__APPLE_CC__) && !defined(__FreeBSD__)
-+#if defined(__NetBSD__)
-+	/* signature differs */
-+	pthread_setname_np( m_hThread, "%s", (void  *) threadname.c_str() );
-+#else
- 	pthread_setname_np( m_hThread, threadname.c_str() );
- #endif
-+#endif
- 	//fprintf(stderr, "thread %s starting %08x\n", m_name.c_str(), m_hThread);
- 	//fflush(stderr);
- 


Home | Main Index | Thread Index | Old Index