From 2b7b8b4c76e25090ee4b3f8d7d187ebc1a85850a Mon Sep 17 00:00:00 2001 From: drochner Date: Mon, 21 Jun 2004 17:30:05 +0000 Subject: update to 1.4 changes: Add Mac OS X and Darwin support. Update FreeDB version to 5 for DYEAR and DGENRE fields. --- audio/py-cddb/Makefile | 8 ++++---- audio/py-cddb/distinfo | 8 ++++---- audio/py-cddb/patches/patch-aa | 32 ++++++++++++++++---------------- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/audio/py-cddb/Makefile b/audio/py-cddb/Makefile index ce0f4dba13f..95cebd67a10 100644 --- a/audio/py-cddb/Makefile +++ b/audio/py-cddb/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2004/04/11 17:50:33 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2004/06/21 17:30:05 drochner Exp $ # -DISTNAME= CDDB-1.3 -PKGNAME= ${PYPKGPREFIX}-cddb-1.3 +DISTNAME= CDDB-1.4 +PKGNAME= ${PYPKGPREFIX}-cddb-1.4 CATEGORIES= audio -MASTER_SITES= http://ftp1.sourceforge.net/cddb-py/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cddb-py/} MAINTAINER= drochner@NetBSD.org HOMEPAGE= http://cddb-py.sourceforge.net/ diff --git a/audio/py-cddb/distinfo b/audio/py-cddb/distinfo index 78ad925753f..6d5c3fcf513 100644 --- a/audio/py-cddb/distinfo +++ b/audio/py-cddb/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2001/05/19 13:08:27 drochner Exp $ +$NetBSD: distinfo,v 1.2 2004/06/21 17:30:05 drochner Exp $ -SHA1 (CDDB-1.3.tar.gz) = 882f9e115a5bc31d646e6e0d3f24c4e2ee524ae4 -Size (CDDB-1.3.tar.gz) = 38399 bytes -SHA1 (patch-aa) = 76eb143ab303a413a163076912c7596113060178 +SHA1 (CDDB-1.4.tar.gz) = 4b101ff3a0a5895385dffac8ab807400f682a195 +Size (CDDB-1.4.tar.gz) = 39562 bytes +SHA1 (patch-aa) = df1f9556f181629022deb70d4de290477abe009d diff --git a/audio/py-cddb/patches/patch-aa b/audio/py-cddb/patches/patch-aa index b1a8352800c..fa6d02915f6 100644 --- a/audio/py-cddb/patches/patch-aa +++ b/audio/py-cddb/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/05/19 13:08:27 drochner Exp $ +$NetBSD: patch-aa,v 1.2 2004/06/21 17:30:05 drochner Exp $ ---- unix/cdrommodule.c.orig Sat Mar 10 23:34:03 2001 -+++ unix/cdrommodule.c Mon Mar 12 14:28:16 2001 -@@ -28,7 +28,7 @@ +--- unix/cdrommodule.c.orig 2003-09-01 01:24:30.000000000 +0200 ++++ unix/cdrommodule.c 2004-04-17 17:52:50.000000000 +0200 +@@ -29,7 +29,7 @@ #include #endif @@ -11,43 +11,43 @@ $NetBSD: patch-aa,v 1.1.1.1 2001/05/19 13:08:27 drochner Exp $ #include #endif -@@ -54,7 +54,7 @@ +@@ -61,7 +61,7 @@ #define CDDB_DEFAULT_CDROM_DEVICE "/dev/cdrom" #define CDDB_DEFAULT_CDROM_FLAGS 0 -#elif defined(__OpenBSD__) +#elif defined(__OpenBSD__) || defined(__NetBSD__) - #define CDDB_TOC_HEADER_STRUCT ioc_toc_header - #define CDDB_STARTING_TRACK_FIELD starting_track -@@ -123,7 +123,7 @@ + #define CDDB_TOC_HEADER_STRUCT ioc_toc_header + #define CDDB_STARTING_TRACK_FIELD starting_track +@@ -151,7 +151,7 @@ int cdrom_fd; unsigned char track; -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) struct cd_toc_entry data; - #endif - -@@ -135,7 +135,7 @@ + #elif defined(__APPLE__) + dk_cd_read_track_info_t trackInfoParams; +@@ -184,7 +184,7 @@ entry.CDDB_TRACK_FIELD = track; entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT; - + -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) entry.data = &data; entry.data_len = sizeof(data); #endif -@@ -156,7 +156,7 @@ +@@ -206,7 +206,7 @@ PyObject *cdrom_fileobj; int cdrom_fd; -#if defined(__OpenBSD__) +#if defined(__OpenBSD__) || defined(__NetBSD__) struct cd_toc_entry data; - #endif - -@@ -168,7 +168,7 @@ + #elif defined(__APPLE__) + struct CDDB_TOC_HEADER_STRUCT hdr; +@@ -250,7 +250,7 @@ entry.CDDB_TRACK_FIELD = CDDB_CDROM_LEADOUT; entry.CDDB_FORMAT_FIELD = CDDB_MSF_FORMAT; -- cgit v1.2.3