CVS commit: pkgsrc/misc/open2300

["Martin Husemann" <martin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   martin
Date:           Sun Jul 30 11:02:33 UTC 2017

Modified Files:
        pkgsrc/misc/open2300: Makefile.common distinfo
Added Files:
        pkgsrc/misc/open2300/patches: patch-linux2300.c

Log Message:
Make serial communication with the weather station work more reliably
via USB serial adapters.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/open2300/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/misc/open2300/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/open2300/patches/patch-linux2300.c

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

Modified files:

Index: pkgsrc/misc/open2300/Makefile.common
diff -u pkgsrc/misc/open2300/Makefile.common:1.8 pkgsrc/misc/open2300/Makefile.common:1.9
--- pkgsrc/misc/open2300/Makefile.common:1.8    Sat Dec 12 22:57:22 2015
+++ pkgsrc/misc/open2300/Makefile.common        Sun Jul 30 11:02:33 2017
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile.common,v 1.8 2015/12/12 22:57:22 wiedi Exp $
+# $NetBSD: Makefile.common,v 1.9 2017/07/30 11:02:33 martin Exp $
 #
 # used by misc/open2300-mysql/Makefile
 
 DISTNAME=              open2300-1.10
 CATEGORIES=            misc
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=open2300/}
+PKGREVISION=           1
 
 MAINTAINER=            martin%NetBSD.org@localhost
 HOMEPAGE=              http://www.lavrsen.dk/twiki/bin/view/Open2300/WebHome

Index: pkgsrc/misc/open2300/distinfo
diff -u pkgsrc/misc/open2300/distinfo:1.11 pkgsrc/misc/open2300/distinfo:1.12
--- pkgsrc/misc/open2300/distinfo:1.11  Tue Nov  3 23:49:44 2015
+++ pkgsrc/misc/open2300/distinfo       Sun Jul 30 11:02:33 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2015/11/03 23:49:44 agc Exp $
+$NetBSD: distinfo,v 1.12 2017/07/30 11:02:33 martin Exp $
 
 SHA1 (open2300-1.10.tar.gz) = 428d30bd885b5c0acee257bcd04cb47eee14bc3e
 RMD160 (open2300-1.10.tar.gz) = 0773bfdf3d0c18b9113f16556651c559cc61b25f
@@ -7,3 +7,4 @@ Size (open2300-1.10.tar.gz) = 337926 byt
 SHA1 (patch-aa) = 06dbd4a01ee378bf068ef4e8a55327e36fdc3416
 SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9
 SHA1 (patch-ac) = 48762f4c60ca475031659cad94701a1bc83b6795
+SHA1 (patch-linux2300.c) = 25184ec0d41e00eb16cec43fc359a450777546fe

Added files:

Index: pkgsrc/misc/open2300/patches/patch-linux2300.c
diff -u /dev/null pkgsrc/misc/open2300/patches/patch-linux2300.c:1.1
--- /dev/null   Sun Jul 30 11:02:33 2017
+++ pkgsrc/misc/open2300/patches/patch-linux2300.c      Sun Jul 30 11:02:33 2017
@@ -0,0 +1,24 @@
+$NetBSD: patch-linux2300.c,v 1.1 2017/07/30 11:02:33 martin Exp $
+
+Fix sleep_short() function. Add small delay to make it work more reliably
+with USB serial adapters.
+
+--- linux2300.c.orig   2005-03-05 09:26:58.000000000 +0100
++++ linux2300.c        2017-07-30 12:56:59.000000000 +0200
+@@ -200,6 +200,7 @@ int write_device(WEATHERSTATION serdevic
+ {
+       int ret = write(serdevice, buffer, size);
+       tcdrain(serdevice);     // wait for all output written
++      sleep_short(1);         // for USB serial devices: wait for real drain
+       return ret;
+ }
+ 
+@@ -213,7 +214,7 @@ int write_device(WEATHERSTATION serdevic
+  ********************************************************************/
+ void sleep_short(int milliseconds)
+ {
+-      usleep(milliseconds/1000);
++      usleep(milliseconds*1000);
+ }
+ 
+ /********************************************************************