5 files changed, 47 insertions, 4 deletions
diff --git a/jackd/Makefile.am b/jackd/Makefile.am
index eb03ca3..b284f9a 100644
--- a/jackd/Makefile.am
+++ b/jackd/Makefile.am
@@ -37,7 +37,11 @@ jack_md5.h: jackd
 if STRIPPED_JACKD
 	strip -R .note -R .comment .libs/jackd
 endif
+if USE_MD5SUM
 	echo "#define JACKD_MD5_SUM \"`md5sum .libs/jackd | awk '{print $$1}'`\"" > jack_md5.h
+else
+	echo "#define JACKD_MD5_SUM \"`md5 -q .libs/jackd | awk '{print $$1}'`\"" > jack_md5.h
+endif
 
 jackstart_SOURCES = jackstart.c md5.c
 jackstart_LDFLAGS = -lcap
diff --git a/jackd/controlapi.c b/jackd/controlapi.c
index 90edc28..a117e20 100644
--- a/jackd/controlapi.c
+++ b/jackd/controlapi.c
@@ -843,7 +843,7 @@ get_realtime_priority_constraint ()
 
 	return constraint_ptr;
 #else
-	return NULL
+	return NULL;
 #endif
 }
 
diff --git a/jackd/engine.c b/jackd/engine.c
index 365a29a..ad0a8d6 100644
--- a/jackd/engine.c
+++ b/jackd/engine.c
@@ -1435,7 +1435,7 @@ handle_external_client_request (jack_engine_t *engine, int fd)
 	if ((r = read (client->request_fd, &req, sizeof(req)))
 	    < (ssize_t)sizeof(req)) {
 		if (r == 0) {
-#ifdef JACK_USE_MACH_THREADS
+#if defined(JACK_USE_MACH_THREADS) || defined(__OpenBSD__)
 			/* poll is implemented using
 			   select (see the macosx/fakepoll
 			   code). When the socket is closed
diff --git a/jackd/jackd.1.in b/jackd/jackd.1.in
index 1bc7c9c..6b86210 100644
--- a/jackd/jackd.1.in
+++ b/jackd/jackd.1.in
@@ -28,7 +28,7 @@ For the latest JACK information, please consult the web site,
 .br
 Select the audio interface backend.  The current list of supported
 backends is: \fBalsa\fR, \fBcoreaudio\fR, \fBdummy\fR, \fBfreebob\fR,
-\fBoss\fR \fBsun\fR and \fBportaudio\fR.  They are not all available
+\fBoss\fR \fBsun\fR \fBportaudio\fR and \fB sndio.  They are not all available
 on all platforms.  All \fIbackend\-parameters\fR are optional.
 .TP
 \fB\-h, \-\-help\fR
@@ -523,6 +523,43 @@ Driver name (default: none)
 .TP
 \fB\-z \-\-dither\fR
 Dithering mode (default: none)
+.SS SNDIO BACKEND PARAMETERS
+.TP
+\fB\-r, \-\-rate \fIint\fR
+Specify the sample rate.  The default is 44100.
+.TP
+\fB\-p, \-\-period \fIint\fR
+Specify the number of frames between JACK \fBprocess()\fR calls.  This
+value must be a power of 2, and the default is 1024.  If you need low 
+latency, set \fB\-p\fR as low as you can go without seeing xruns.  A larger 
+period size yields higher latency, but makes xruns less likely.  The JACK 
+capture latency in seconds is \fB\-\-period\fR divided by \fB\-\-rate\fR.
+Note that this value is mostly advisory when aucat server is running
+and may be updated internally.
+.TP
+\fB\-n, \-\-nperiods \fIint\fR
+Specify the number of periods in the hardware buffer.  The default is
+2.  The period size (\fB\-p\fR) times \fB\-\-nperiods\fR times four
+(assuming 2 channels 16-bit samples) is the JACK buffer size in bytes.
+The JACK output latency in seconds is \fB\-\-nperiods\fR times
+\fB\-\-period\fR divided by \fB\-\-rate\fR.
+Note that this value is mostly advisory when aucat server is running
+and may be updated internally.
+.TP
+\fB\-w, \-\-wordlength \fIint\fR
+Specify the sample size in bits. The default is 16.
+.TP
+\fB\-i, \-\-inchannels \fIint\fR
+Specify how many channels to capture (default: 2)
+.TP
+\fB\-o, \-\-outchannels \fIint\fR
+Specify number of playback channels (default: 2)
+.TP
+\fB\-d, \-\-device \fIdevice_file\fR
+Specify device for capture and playback (default: NULL)
+.TP
+\fB\-b, \-\-ignorehwbuf \fIboolean\fR
+Specify, whether to ignore hardware period size (default: false)
 .SH "EXAMPLES"
 .PP
 Print usage message for the parameters specific to each backend.
@@ -544,6 +581,8 @@ Print usage message for the parameters specific to each backend.
 \fBjackd \-d sun \-\-help\fR
 .br
 \fBjackd \-d portaudio \-\-help\fR
+.br
+\fBjackd \-d sndio \-\-help\fR
 .PP
 Run the JACK daemon with realtime priority using the first ALSA
 hardware card defined in \fB/etc/modules.conf\fR.
diff --git a/jackd/jackd.c b/jackd/jackd.c
index 90fb38f..b27dde2 100644
--- a/jackd/jackd.c
+++ b/jackd/jackd.c
@@ -537,7 +537,7 @@ static void usage (FILE *file)
 #ifdef __APPLE__
 		 "             Available backends may include: coreaudio, dummy, net, portaudio.\n\n"
 #else
-		 "             Available backends may include: alsa, dummy, freebob, firewire, net, oss, sun, or portaudio.\n\n"
+		 "             Available backends may include: alsa, dummy, freebob, firewire, net, oss, sun, portaudio or sndio.\n\n"
 #endif
 		 "       jackd -d backend --help\n"
 		 "             to display options for each backend\n\n");