- Update to version 0.9.98

- Bug fixes

PR:		56460
Submitted by:	Simon Barner <barner@in.tum.de>

5 files changed, 91 insertions, 23 deletions

diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index 27c02312fe67..1896bfc82afd 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	rawrec
-PORTVERSION=	0.9.97
-PORTREVISION=	3
+PORTVERSION=	0.9.98
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE} \
 		${MASTER_SITE_SOURCEFORGE}
diff --git a/audio/rawrec/distinfo b/audio/rawrec/distinfo
index 8874c89f381c..d72d5c274e66 100644
--- a/audio/rawrec/distinfo
+++ b/audio/rawrec/distinfo
@@ -1 +1 @@
-MD5 (rawrec-0.9.97.tar.gz) = 67a219555cfbf0fff1eb62b1e03f3e6b
+MD5 (rawrec-0.9.98.tar.gz) = 15a26258853cf061e9b7e5a81f147528
diff --git a/audio/rawrec/files/patch-play.c b/audio/rawrec/files/patch-play.c
index fd94beeeaa85..1fa7de9d7a79 100644
--- a/audio/rawrec/files/patch-play.c
+++ b/audio/rawrec/files/patch-play.c
@@ -1,11 +1,41 @@
---- play.c.orig	Tue Nov  5 22:11:11 2002
-+++ play.c	Tue Nov  5 22:11:38 2002
-@@ -400,7 +400,7 @@
-     }
+--- play.c.orig	Fri Nov 29 03:33:21 2002
++++ play.c	Thu Sep  4 22:13:08 2003
+@@ -263,6 +263,10 @@
+ 					  PTHREAD_CREATE_JOINABLE)) ) {
+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
+   }
++
++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
++   but it does not support PTHREAD_SCOPE_SYSTEM
++ 
+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
+@@ -282,6 +286,8 @@
+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
+   }
+ #endif
++*/
++    
+   if ( (rtn = pthread_attr_init(&move_fd_attr)) )
+     err_die("BUG: pthread_attr_init failed: %s\n", strerror(rtn));
+   if ( (rtn = pthread_attr_setdetachstate(&move_fd_attr, 
+@@ -289,6 +295,9 @@
+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
+   }
  
-     /* Entering critical section.  Lock down our memory, if possible.  */
--#ifdef _POSIX_MEMLOCK
-+#if _POSIX_MEMLOCK == 1
-     if ( mlockall(MCL_CURRENT) == -1 ) {
-       fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);
-       perror("");
++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
++   but it does not support PTHREAD_SCOPE_SYSTEM
++ 
+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
+@@ -306,7 +315,7 @@
+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
+   }
+ #endif
+-
++*/
+   /* Getting ugly.  Here we install a handler (which sets a global
+      flag which the threads can poll in order to do graceful
+      death). */
diff --git a/audio/rawrec/files/patch-record.c b/audio/rawrec/files/patch-record.c
index 206152df95d8..e6ab7e0abf65 100644
--- a/audio/rawrec/files/patch-record.c
+++ b/audio/rawrec/files/patch-record.c
@@ -1,11 +1,39 @@
---- record.c.orig	Tue Nov  5 22:11:18 2002
-+++ record.c	Tue Nov  5 22:11:55 2002
-@@ -317,7 +317,7 @@
-     }
+--- record.c.orig	Fri Nov 29 03:33:21 2002
++++ record.c	Thu Sep  4 22:12:48 2003
+@@ -185,6 +185,10 @@
+ 					  PTHREAD_CREATE_JOINABLE)) ) {
+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
+   }
++
++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
++   but it does not support PTHREAD_SCOPE_SYSTEM
++
+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
+@@ -204,12 +208,17 @@
+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
+   }
+ #endif
++*/    
+   if ( (rtn = pthread_attr_init(&move_fd_attr)) )
+     err_die("BUG: pthread_attr_init failed: %s\n", strerror(rtn));
+   if ( (rtn = pthread_attr_setdetachstate(&move_fd_attr, 
+ 					  PTHREAD_CREATE_JOINABLE)) ) {
+     err_die("BUG: pthread_attr_setdetachstate failed: %s\n", strerror(rtn));
+   }
++
++/* This is ugly, but FreeBSD defines _POSIX_THREAD_PRIORITY_SCHEDULING
++   but it does not support PTHREAD_SCOPE_SYSTEM
++
+ #if defined (_POSIX_THREAD_PRIORITY_SCHEDULING) \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != -1 \
+     && _POSIX_THREAD_PRIORITY_SCHEDULING != 0
+@@ -227,6 +236,7 @@
+       err_die("BUG: pthread_attr_setscope failed: %s\n", strerror(rtn));
+   }
+ #endif
++*/
  
-     /* Entering critical section.  Lock down our memory, if possible.  */
--#ifdef _POSIX_MEMLOCK
-+#if _POSIX_MEMLOCK == 1
-     if ( mlockall(MCL_CURRENT) == -1 ) {
-       fprintf(stderr, "%s: mlockall(MCL_CURRENT) failed: ", progname);
-       perror("");
+   /* Getting ugly.  Here we install a handler (which sets a global
+      flag which the threads can poll in order to do graceful
diff --git a/audio/rawrec/files/patch-sleep_on_motion.c b/audio/rawrec/files/patch-sleep_on_motion.c
new file mode 100644
index 000000000000..6646f808060e
--- /dev/null
+++ b/audio/rawrec/files/patch-sleep_on_motion.c
@@ -0,0 +1,11 @@
+--- sleep_on_option.c.orig	Tue Jul 22 15:27:18 2003
++++ sleep_on_option.c	Tue Jul 22 15:27:32 2003
+@@ -15,7 +15,7 @@
+ 
+     if ( time > samples / speed ) {
+       reqst.tv_sec = (time_t) floor(time);
+-      reqst.tv_nsec = (long) nearbyint((time - floor(time)) * 1000000);      
++      reqst.tv_nsec = (long) rint((time - floor(time)) * 1000000);      
+     } else {
+       reqst.tv_sec = (time_t) floor(samples / speed);
+       reqst.tv_nsec = (long) rint((samples / speed - floor(samples / speed))