summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoerg <joerg>2005-12-11 21:28:14 +0000
committerjoerg <joerg>2005-12-11 21:28:14 +0000
commit456440bd4a473cfa1a3d5be4cdade6f6f8f91db5 (patch)
tree30ad20c512691ef32381df9751ec23b95828f75d
parent57b1ad2efb291274f15a0732c25d52e251f92950 (diff)
downloadpkgsrc-456440bd4a473cfa1a3d5be4cdade6f6f8f91db5.tar.gz
DragonFly support.
-rw-r--r--audio/py-cddb/distinfo4
-rw-r--r--audio/py-cddb/patches/patch-aa25
2 files changed, 19 insertions, 10 deletions
diff --git a/audio/py-cddb/distinfo b/audio/py-cddb/distinfo
index c36d59d68a9..4279c5916e3 100644
--- a/audio/py-cddb/distinfo
+++ b/audio/py-cddb/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 20:39:50 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/12/11 21:28:14 joerg Exp $
SHA1 (CDDB-1.4.tar.gz) = 4b101ff3a0a5895385dffac8ab807400f682a195
RMD160 (CDDB-1.4.tar.gz) = 9418e53382b1ac06363a22122bb72cc3fb518327
Size (CDDB-1.4.tar.gz) = 39562 bytes
-SHA1 (patch-aa) = df1f9556f181629022deb70d4de290477abe009d
+SHA1 (patch-aa) = c492b5d562095677cea89b73a38cfee12cbd0853
diff --git a/audio/py-cddb/patches/patch-aa b/audio/py-cddb/patches/patch-aa
index fa6d02915f6..ed8eb9869f8 100644
--- a/audio/py-cddb/patches/patch-aa
+++ b/audio/py-cddb/patches/patch-aa
@@ -1,16 +1,25 @@
-$NetBSD: patch-aa,v 1.2 2004/06/21 17:30:05 drochner Exp $
+$NetBSD: patch-aa,v 1.3 2005/12/11 21:28:14 joerg Exp $
---- unix/cdrommodule.c.orig 2003-09-01 01:24:30.000000000 +0200
-+++ unix/cdrommodule.c 2004-04-17 17:52:50.000000000 +0200
+--- unix/cdrommodule.c.orig 2003-08-31 23:24:30.000000000 +0000
++++ unix/cdrommodule.c
@@ -29,7 +29,7 @@
#include <linux/cdrom.h>
#endif
-#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
++#if defined(sun) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
#include <sys/cdio.h>
#endif
+@@ -45,7 +45,7 @@
+ * so that we don't have to repeat the code.
+ */
+
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__DragonFly__)
+
+ #define CDDB_TOC_HEADER_STRUCT ioc_toc_header
+ #define CDDB_STARTING_TRACK_FIELD starting_track
@@ -61,7 +61,7 @@
#define CDDB_DEFAULT_CDROM_DEVICE "/dev/cdrom"
#define CDDB_DEFAULT_CDROM_FLAGS 0
@@ -20,7 +29,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/21 17:30:05 drochner Exp $
#define CDDB_TOC_HEADER_STRUCT ioc_toc_header
#define CDDB_STARTING_TRACK_FIELD starting_track
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ static PyObject *cdrom_toc_entry(PyObjec
int cdrom_fd;
unsigned char track;
@@ -29,7 +38,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/21 17:30:05 drochner Exp $
struct cd_toc_entry data;
#elif defined(__APPLE__)
dk_cd_read_track_info_t trackInfoParams;
-@@ -184,7 +184,7 @@
+@@ -184,7 +184,7 @@ static PyObject *cdrom_toc_entry(PyObjec
entry.CDDB_TRACK_FIELD = track;
entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT;
@@ -38,7 +47,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/21 17:30:05 drochner Exp $
entry.data = &data;
entry.data_len = sizeof(data);
#endif
-@@ -206,7 +206,7 @@
+@@ -206,7 +206,7 @@ static PyObject *cdrom_leadout(PyObject
PyObject *cdrom_fileobj;
int cdrom_fd;
@@ -47,7 +56,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/21 17:30:05 drochner Exp $
struct cd_toc_entry data;
#elif defined(__APPLE__)
struct CDDB_TOC_HEADER_STRUCT hdr;
-@@ -250,7 +250,7 @@
+@@ -250,7 +250,7 @@ static PyObject *cdrom_leadout(PyObject
entry.CDDB_TRACK_FIELD = CDDB_CDROM_LEADOUT;
entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT;