[pkgsrc/trunk]: pkgsrc/audio/bmpx restore the timeout argument to pselect() -...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/312ae2b8debd
branches:  trunk
changeset: 532818:312ae2b8debd
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Fri Aug 31 17:08:54 2007 +0000

description:
restore the timeout argument to pselect() -- this is intended to work
non-blocking

diffstat:

 audio/bmpx/distinfo         |   4 ++--
 audio/bmpx/patches/patch-ab |  18 ++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diffs (53 lines):

diff -r ecc1dd485e63 -r 312ae2b8debd audio/bmpx/distinfo
--- a/audio/bmpx/distinfo       Fri Aug 31 16:30:11 2007 +0000
+++ b/audio/bmpx/distinfo       Fri Aug 31 17:08:54 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.5 2007/08/30 15:30:30 joerg Exp $
+$NetBSD: distinfo,v 1.6 2007/08/31 17:08:54 drochner Exp $
 
 SHA1 (bmpx-0.40.1.tar.bz2) = c2d69fd8909d1d7a69ff13eee149084da9b802f0
 RMD160 (bmpx-0.40.1.tar.bz2) = 8d00392449ad4602e380c9f78cb12c4077db9eec
 Size (bmpx-0.40.1.tar.bz2) = 1793356 bytes
 SHA1 (patch-aa) = b4a761b618aa976945c6983e752389cc226b1cbb
-SHA1 (patch-ab) = 120eb75ae966e59a071c3023470c9204428440e6
+SHA1 (patch-ab) = 71e24c8d18b9223a9a9895a9af18e5818886a60c
 SHA1 (patch-ac) = 77d88acc2c74259f293dc54699a322962f50ce57
 SHA1 (patch-ad) = baaff3d28d81532d692a7594818d763552b81349
 SHA1 (patch-ae) = 249f85f328d82e69b440999063a4b42be5f0614d
diff -r ecc1dd485e63 -r 312ae2b8debd audio/bmpx/patches/patch-ab
--- a/audio/bmpx/patches/patch-ab       Fri Aug 31 16:30:11 2007 +0000
+++ b/audio/bmpx/patches/patch-ab       Fri Aug 31 17:08:54 2007 +0000
@@ -1,21 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2007/08/30 15:30:31 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2007/08/31 17:08:54 drochner Exp $
 
---- jnetlib/connection.cpp.orig        2007-08-30 13:39:23.000000000 +0000
+--- jnetlib/connection.cpp.orig        2007-08-11 20:41:49.000000000 +0200
 +++ jnetlib/connection.cpp
-@@ -205,8 +205,6 @@ void JNL_Connection::run(int max_send_by
-         FD_SET(m_socket,&f[1]);
-         FD_SET(m_socket,&f[2]);
- 
--        struct timespec ts;
--        memset(&ts,0,sizeof(ts));
-         sigset_t sigs; 
-         sigfillset (&sigs);
-         sigdelset (&sigs, SIGBUS);
-@@ -215,7 +213,16 @@ void JNL_Connection::run(int max_send_by
+@@ -215,7 +215,16 @@ void JNL_Connection::run(int max_send_by
          sigdelset (&sigs, SIGSEGV);
          sigdelset (&sigs, SIGKILL);
          sigdelset (&sigs, SIGSTOP);
--        if (pselect(m_socket+1,&f[0],&f[1],&f[2],&ts,&sigs)==-1)
 +#ifdef __DragonFly__
 +      sigset_t cur_set;
 +      sigprocmask(SIG_SETMASK, &sigs, &cur_set);
@@ -24,7 +14,7 @@
 +      
 +      if (select_retval == -1)
 +#else
-+        if (pselect(m_socket+1,&f[0],&f[1],&f[2],NULL,&sigs)==-1)
+         if (pselect(m_socket+1,&f[0],&f[1],&f[2],&ts,&sigs)==-1)
 +#endif
          {
            m_errorstr="connecting to host (calling select())";