audio/xmms-cdread: Support DragonFly

There were a few issues with this package wrt DragonFly. The biggest issue
is the use of ETIME, which should not be used with sockets.  It doesn't
even appear to be used later.  NetBSD defines ETIME, but neither DragonFly
nor FreeBSD even have this definition in errno.  Somebody might want to
look at this choice for the variable.

Libtool also choked due to a missing tag, the FreeBSD volume control was
needed, and some standard headers were added.

6 files changed, 82 insertions, 6 deletions

diff --git a/audio/xmms-cdread/distinfo b/audio/xmms-cdread/distinfo
index 0b77e370868..82c59afd899 100644
--- a/audio/xmms-cdread/distinfo
+++ b/audio/xmms-cdread/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.2 2011/09/04 23:10:30 dholland Exp $
+$NetBSD: distinfo,v 1.3 2011/11/27 00:25:05 marino Exp $
 
 SHA1 (xmms-cdread-0.14a.tar.gz) = b0408433618f1f237cd2a42999a2a67642d4a778
 RMD160 (xmms-cdread-0.14a.tar.gz) = bcea65cf1919071d8036d1219979376d6632ae09
 Size (xmms-cdread-0.14a.tar.gz) = 153811 bytes
 SHA1 (patch-aa) = 623e9df7f7eb4aef6c5b2ef7445575081067a199
-SHA1 (patch-ab) = a5b9b4e670f6d40f0ddd97dff74a033069584cb7
+SHA1 (patch-ab) = 7338dee30a6571a0f1597fa8361829b4cf393213
+SHA1 (patch-ac) = 9198fec43a3d7a62d805ec5666f7c9406692c3bb
+SHA1 (patch-ad) = d3ff5e3bb86f2025d5a7dece916a861b8b553077
+SHA1 (patch-ae) = 1ca7a9d83e2d6c500b215feb6d85406d2876fb1e
+SHA1 (patch-af) = 7a0a387c63727e536e61b63842ddc1cd6b112baa
diff --git a/audio/xmms-cdread/patches/patch-ab b/audio/xmms-cdread/patches/patch-ab
index af727248ee2..33c505545f1 100644
--- a/audio/xmms-cdread/patches/patch-ab
+++ b/audio/xmms-cdread/patches/patch-ab
@@ -1,7 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2011/09/04 23:10:30 dholland Exp $
-
-- support more OSes
-- avoid gross linker abuse 
+$NetBSD: patch-ab,v 1.3 2011/11/27 00:25:05 marino Exp $
 
 --- cdread.c.orig	2001-08-18 11:29:43.000000000 +0000
 +++ cdread.c
@@ -33,3 +30,13 @@ $NetBSD: patch-ab,v 1.2 2011/09/04 23:10:30 dholland Exp $
  static void
  cd_init(void)
  {
+@@ -742,7 +745,8 @@ get_volume(gint *l, gint *r)
+ static void
+ set_volume(gint l, gint r)
+ {
+-#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
++#if defined(HAVE_SYS_CDIO_H) && \
++   (defined(__FreeBSD__) || defined(__DragonFly__))
+ 	struct ioc_vol vol;
+ #else
+ 	struct cdrom_volctrl vol;
diff --git a/audio/xmms-cdread/patches/patch-ac b/audio/xmms-cdread/patches/patch-ac
new file mode 100644
index 00000000000..ba03db0a835
--- /dev/null
+++ b/audio/xmms-cdread/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2011/11/27 00:25:05 marino Exp $
+
+--- cdconf.c.orig	2001-08-18 11:11:22.000000000 +0000
++++ cdconf.c
+@@ -6,6 +6,7 @@
+ #include <netinet/in.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ static GtkWidget *cd_configure_win, *cddb_dir_entry;
+ static GtkWidget *format_entry, *device_entry;
diff --git a/audio/xmms-cdread/patches/patch-ad b/audio/xmms-cdread/patches/patch-ad
new file mode 100644
index 00000000000..4aefe8d767d
--- /dev/null
+++ b/audio/xmms-cdread/patches/patch-ad
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.1 2011/11/27 00:25:05 marino Exp $
+
+--- fileinfo.c.orig	2001-07-21 00:35:41.000000000 +0000
++++ fileinfo.c
+@@ -27,6 +27,7 @@
+ 
+ #include <gtk/gtk.h>
+ #include <stdio.h>
++#include <string.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ 
diff --git a/audio/xmms-cdread/patches/patch-ae b/audio/xmms-cdread/patches/patch-ae
new file mode 100644
index 00000000000..d088ffe8da9
--- /dev/null
+++ b/audio/xmms-cdread/patches/patch-ae
@@ -0,0 +1,28 @@
+$NetBSD: patch-ae,v 1.1 2011/11/27 00:25:05 marino Exp $
+
+--- server.c.orig	2011-11-26 18:44:22.642361000 +0000
++++ server.c
+@@ -282,7 +282,11 @@ read_line(struct cddb_req *req)
+ 		if (r < 0) {
+ 			req->rest[0] = 0;
+ 			if (errno == EAGAIN) {
++#if defined(__DragonFly__)
++				errno = ETIMEDOUT;
++#else
+ 				errno = ETIME;
++#endif
+ 				if (++rtr < READ_TIMEOUT) {
+ 					xmms_usleep(READ_USEC);
+ 					continue;
+@@ -312,7 +316,11 @@ write_line(gint sock, gchar *l)
+ 		gint w = write(sock, p, strlen(p));
+ 		if (w < 0) {
+ 			if (errno == EAGAIN) {
++#if defined(__DragonFly__)
++				errno = ETIMEDOUT;
++#else
+ 				errno = ETIME;
++#endif
+ 				if (++rtr < READ_TIMEOUT) {
+ 					xmms_usleep(READ_USEC);
+ 					continue;
diff --git a/audio/xmms-cdread/patches/patch-af b/audio/xmms-cdread/patches/patch-af
new file mode 100644
index 00000000000..01515c9560f
--- /dev/null
+++ b/audio/xmms-cdread/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2011/11/27 00:25:05 marino Exp $
+
+--- Makefile.in.orig	2001-08-21 09:44:03.000000000 +0000
++++ Makefile.in
+@@ -102,7 +102,7 @@ libcdread_la_OBJECTS =  cdread.lo cdconf
+ server.lo playlist.lo filter.lo
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
++LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ DIST_COMMON =  README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
+ Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \
+ configure configure.in install-sh ltconfig ltmain.sh missing \