[pkgsrc/trunk]: pkgsrc/audio/xmms-cdread - Adjust cdrom access logic so all t...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d6d2a974fe2b
branches:  trunk
changeset: 592439:d6d2a974fe2b
user:      dholland <dholland%pkgsrc.org@localhost>
date:      Sun Sep 04 23:10:30 2011 +0000

description:
- Adjust cdrom access logic so all the BSDs go to the BSD cdrom code,
not just FreeBSD and OpenBSD.

- Update NOT_FOR_PLATFORM: the only BSD for which the cdrom code can
actually work is DragonFly. The others are missing ioctls it uses.
This could probably be fixed up readily by someone who knows how cdrom
access is supposed to work, if any such person cares.

- Allow clang until proven otherwise.

diffstat:

 audio/xmms-cdread/Makefile         |  12 +++++++++---
 audio/xmms-cdread/distinfo         |   4 ++--
 audio/xmms-cdread/patches/patch-ab |  16 ++++++++++++++--
 3 files changed, 25 insertions(+), 7 deletions(-)

diffs (64 lines):

diff -r c7e17480fdc9 -r d6d2a974fe2b audio/xmms-cdread/Makefile
--- a/audio/xmms-cdread/Makefile        Sun Sep 04 22:17:41 2011 +0000
+++ b/audio/xmms-cdread/Makefile        Sun Sep 04 23:10:30 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/04/22 13:43:01 obache Exp $
+# $NetBSD: Makefile,v 1.3 2011/09/04 23:10:30 dholland Exp $
 #
 
 DISTNAME=              xmms-cdread-0.14a
@@ -12,8 +12,14 @@
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-NOT_FOR_PLATFORM=      Interix-*-* NetBSD-*-*
-ONLY_FOR_COMPILER=     gcc
+# no cdrom access code
+NOT_FOR_PLATFORM=      Interix-*-*
+
+# The BSD cdrom access code ostensibly for FreeBSD requires:
+#   - CDIOREADTOCENTRY ioctl, which NetBSD and OpenBSD don't have
+#   - CDIOCREADAUDIO ioctl, which only Dragonfly has
+NOT_FOR_PLATFORM+=     NetBSD-*-* FreeBSD-*-* OpenBSD-*-*
+ONLY_FOR_COMPILER=     gcc clang
 
 GNU_CONFIGURE=         yes
 USE_LIBTOOL=           yes
diff -r c7e17480fdc9 -r d6d2a974fe2b audio/xmms-cdread/distinfo
--- a/audio/xmms-cdread/distinfo        Sun Sep 04 22:17:41 2011 +0000
+++ b/audio/xmms-cdread/distinfo        Sun Sep 04 23:10:30 2011 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2011/03/06 16:46:04 wiz Exp $
+$NetBSD: distinfo,v 1.2 2011/09/04 23:10:30 dholland 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) = 70a1c4f7565a55fdbc7154481cd6fb03cb68b864
+SHA1 (patch-ab) = a5b9b4e670f6d40f0ddd97dff74a033069584cb7
diff -r c7e17480fdc9 -r d6d2a974fe2b audio/xmms-cdread/patches/patch-ab
--- a/audio/xmms-cdread/patches/patch-ab        Sun Sep 04 22:17:41 2011 +0000
+++ b/audio/xmms-cdread/patches/patch-ab        Sun Sep 04 23:10:30 2011 +0000
@@ -1,7 +1,19 @@
-$NetBSD: patch-ab,v 1.1.1.1 2011/03/06 16:46:04 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2011/09/04 23:10:30 dholland Exp $
+
+- support more OSes
+- avoid gross linker abuse 
 
---- cdread.c.orig      2001-08-18 14:29:43.000000000 +0300
+--- cdread.c.orig      2001-08-18 11:29:43.000000000 +0000
 +++ cdread.c
+@@ -57,7 +57,7 @@ struct cd_cfg cd_cfg;
+ #endif
+ 
+ /*\ Neat.. Three OSes with three different ways of talking to CDROM drives.. \*/
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
+ #include "cdrombsd.h"
+ #elif defined(__SOLARIS__) || defined(__Solaris__) || defined(__solaris__) || defined(__sun__) || defined(sun)
+ #include "cdromsolaris.h"
 @@ -377,7 +377,7 @@ init_thread(gchar *device)
  }