Sun Sep 4 23:10:30 2011 UTC ()
- 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.


(dholland)
diff -r1.2 -r1.3 pkgsrc/audio/xmms-cdread/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/audio/xmms-cdread/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/audio/xmms-cdread/patches/patch-ab
cvs diff -r1.2 -r1.3 pkgsrc/audio/xmms-cdread/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/xmms-cdread/Makefile 2011/04/22 13:43:01 1.2
+++ pkgsrc/audio/xmms-cdread/Makefile 2011/09/04 23:10:30 1.3
@@ -1,29 +1,35 @@ @@ -1,29 +1,35 @@
1# $NetBSD: Makefile,v 1.2 2011/04/22 13:43:01 obache Exp $ 1# $NetBSD: Makefile,v 1.3 2011/09/04 23:10:30 dholland Exp $
2# 2#
3 3
4DISTNAME= xmms-cdread-0.14a 4DISTNAME= xmms-cdread-0.14a
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= audio 6CATEGORIES= audio
7MASTER_SITES= ftp://mud.stack.nl/pub/OuterSpace/willem/ 7MASTER_SITES= ftp://mud.stack.nl/pub/OuterSpace/willem/
8 8
9MAINTAINER= cheusov@tut.by 9MAINTAINER= cheusov@tut.by
10HOMEPAGE= ftp://mud.stack.nl/pub/OuterSpace/willem/ 10HOMEPAGE= ftp://mud.stack.nl/pub/OuterSpace/willem/
11COMMENT= XMMS input plugin that reads audio data from CDs 11COMMENT= XMMS input plugin that reads audio data from CDs
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14 14
15NOT_FOR_PLATFORM= Interix-*-* NetBSD-*-* 15# no cdrom access code
16ONLY_FOR_COMPILER= gcc 16NOT_FOR_PLATFORM= Interix-*-*
 17
 18# The BSD cdrom access code ostensibly for FreeBSD requires:
 19# - CDIOREADTOCENTRY ioctl, which NetBSD and OpenBSD don't have
 20# - CDIOCREADAUDIO ioctl, which only Dragonfly has
 21NOT_FOR_PLATFORM+= NetBSD-*-* FreeBSD-*-* OpenBSD-*-*
 22ONLY_FOR_COMPILER= gcc clang
17 23
18GNU_CONFIGURE= yes 24GNU_CONFIGURE= yes
19USE_LIBTOOL= yes 25USE_LIBTOOL= yes
20 26
21DOC_FILES= AUTHORS ChangeLog COPYING NEWS README 27DOC_FILES= AUTHORS ChangeLog COPYING NEWS README
22PKGDOCDIR= ${PREFIX}/share/doc/${PKGBASE} 28PKGDOCDIR= ${PREFIX}/share/doc/${PKGBASE}
23 29
24INSTALLATION_DIRS= ${PKGDOCDIR} 30INSTALLATION_DIRS= ${PKGDOCDIR}
25 31
26post-install: 32post-install:
27.for i in ${DOC_FILES} 33.for i in ${DOC_FILES}
28 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PKGDOCDIR} 34 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PKGDOCDIR}
29.endfor 35.endfor
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/xmms-cdread/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/xmms-cdread/distinfo 2011/03/06 16:46:04 1.1.1.1
+++ pkgsrc/audio/xmms-cdread/distinfo 2011/09/04 23:10:30 1.2
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.1.1.1 2011/03/06 16:46:04 wiz Exp $ 1$NetBSD: distinfo,v 1.2 2011/09/04 23:10:30 dholland Exp $
2 2
3SHA1 (xmms-cdread-0.14a.tar.gz) = b0408433618f1f237cd2a42999a2a67642d4a778 3SHA1 (xmms-cdread-0.14a.tar.gz) = b0408433618f1f237cd2a42999a2a67642d4a778
4RMD160 (xmms-cdread-0.14a.tar.gz) = bcea65cf1919071d8036d1219979376d6632ae09 4RMD160 (xmms-cdread-0.14a.tar.gz) = bcea65cf1919071d8036d1219979376d6632ae09
5Size (xmms-cdread-0.14a.tar.gz) = 153811 bytes 5Size (xmms-cdread-0.14a.tar.gz) = 153811 bytes
6SHA1 (patch-aa) = 623e9df7f7eb4aef6c5b2ef7445575081067a199 6SHA1 (patch-aa) = 623e9df7f7eb4aef6c5b2ef7445575081067a199
7SHA1 (patch-ab) = 70a1c4f7565a55fdbc7154481cd6fb03cb68b864 7SHA1 (patch-ab) = a5b9b4e670f6d40f0ddd97dff74a033069584cb7
cvs diff -r1.1.1.1 -r1.2 pkgsrc/audio/xmms-cdread/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/audio/xmms-cdread/patches/patch-ab 2011/03/06 16:46:04 1.1.1.1
+++ pkgsrc/audio/xmms-cdread/patches/patch-ab 2011/09/04 23:10:30 1.2
@@ -1,17 +1,29 @@ @@ -1,17 +1,29 @@
1$NetBSD: patch-ab,v 1.1.1.1 2011/03/06 16:46:04 wiz Exp $ 1$NetBSD: patch-ab,v 1.2 2011/09/04 23:10:30 dholland Exp $
2 2
3--- cdread.c.orig 2001-08-18 14:29:43.000000000 +0300 3- support more OSes
 4- avoid gross linker abuse
 5
 6--- cdread.c.orig 2001-08-18 11:29:43.000000000 +0000
4+++ cdread.c 7+++ cdread.c
 8@@ -57,7 +57,7 @@ struct cd_cfg cd_cfg;
 9 #endif
 10
 11 /*\ Neat.. Three OSes with three different ways of talking to CDROM drives.. \*/
 12-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
 13+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__))
 14 #include "cdrombsd.h"
 15 #elif defined(__SOLARIS__) || defined(__Solaris__) || defined(__solaris__) || defined(__sun__) || defined(sun)
 16 #include "cdromsolaris.h"
5@@ -377,7 +377,7 @@ init_thread(gchar *device) 17@@ -377,7 +377,7 @@ init_thread(gchar *device)
6 } 18 }
7  19
8 void 20 void
9-_fini(void) 21-_fini(void)
10+cd_finish(void) 22+cd_finish(void)
11 { 23 {
12 CD_LOCK(); 24 CD_LOCK();
13 while (cd_list) 25 while (cd_list)
14@@ -388,6 +388,9 @@ _fini(void) 26@@ -388,6 +388,9 @@ _fini(void)
15 xmms_usleep(10000); 27 xmms_usleep(10000);
16 } 28 }
17  29