head 1.4; access; symbols pkgsrc-2026Q1:1.4.0.104 pkgsrc-2026Q1-base:1.4 pkgsrc-2025Q4:1.4.0.102 pkgsrc-2025Q4-base:1.4 pkgsrc-2025Q3:1.4.0.100 pkgsrc-2025Q3-base:1.4 pkgsrc-2025Q2:1.4.0.98 pkgsrc-2025Q2-base:1.4 pkgsrc-2025Q1:1.4.0.96 pkgsrc-2025Q1-base:1.4 pkgsrc-2024Q4:1.4.0.94 pkgsrc-2024Q4-base:1.4 pkgsrc-2024Q3:1.4.0.92 pkgsrc-2024Q3-base:1.4 pkgsrc-2024Q2:1.4.0.90 pkgsrc-2024Q2-base:1.4 pkgsrc-2024Q1:1.4.0.88 pkgsrc-2024Q1-base:1.4 pkgsrc-2023Q4:1.4.0.86 pkgsrc-2023Q4-base:1.4 pkgsrc-2023Q3:1.4.0.84 pkgsrc-2023Q3-base:1.4 pkgsrc-2023Q2:1.4.0.82 pkgsrc-2023Q2-base:1.4 pkgsrc-2023Q1:1.4.0.80 pkgsrc-2023Q1-base:1.4 pkgsrc-2022Q4:1.4.0.78 pkgsrc-2022Q4-base:1.4 pkgsrc-2022Q3:1.4.0.76 pkgsrc-2022Q3-base:1.4 pkgsrc-2022Q2:1.4.0.74 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.72 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.70 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.68 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.66 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.64 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.62 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.60 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.56 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.36 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.58 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.54 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.52 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.50 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.48 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.46 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.44 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.42 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.40 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.38 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.34 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.32 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.30 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.28 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.26 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.24 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.22 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.20 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.18 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.16 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.14 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.12 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.10 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.8 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.6 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.4 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.2 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.3.0.2 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.1.0.62 pkgsrc-2012Q4-base:1.1 pkgsrc-2012Q3:1.1.0.60 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.58 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.56 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.54 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.52 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.50 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.48 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.46 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.44 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.42 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.40 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.38 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.36 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.34 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.32 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.30 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.28 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.26 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.24 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.22 pkgsrc-2008Q1:1.1.0.20 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.18 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.16 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.14 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.12 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.10 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.8 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.6 pkgsrc-2006Q2-base:1.1 pkgsrc-2006Q1:1.1.0.4 pkgsrc-2006Q1-base:1.1 pkgsrc-2005Q4:1.1.0.2 pkgsrc-2005Q4-base:1.1; locks; strict; comment @# @; 1.4 date 2013.05.19.17.45.04; author wiz; state Exp; branches; next 1.3; commitid vvJ2ZmekZMeRBgQw; 1.3 date 2013.01.22.10.42.06; author jperkin; state Exp; branches; next 1.2; 1.2 date 2013.01.21.22.24.56; author jperkin; state Exp; branches; next 1.1; 1.1 date 2005.10.03.12.35.39; author joerg; state Exp; branches; next ; desc @@ 1.4 log @Update to 1.4: cd-discid 1.4 * Make it possible to prevent stripping e.g. with STRIP=/bin/true. * Add support for "make install DESTDIR=...". * Add '--help' and '--version' options. * Misc fixes. @ text @$NetBSD: patch-aa,v 1.3 2013/01/22 10:42:06 jperkin Exp $ - Add support for DragonFly - Fix output on OSX, and use raw disk device. --- cd-discid.c.orig 2013-05-14 09:02:00.000000000 +0000 +++ cd-discid.c @@@@ -46,7 +46,7 @@@@ /* __FreeBSD_kernel__ is needed for properly compiling on Debian GNU/kFreeBSD Look at http://glibc-bsd.alioth.debian.org/porting/PORTING for more info */ -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) #include #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */ #define CD_MSF_OFFSET 150 /* MSF offset of first frame */ @@@@ -93,7 +93,7 @@@@ #define cdth_trk1 lastTrackNumberInLastSessionLSB #define cdrom_tocentry CDTrackInfo #define cdte_track_address trackStartAddress -#define DEVICE_NAME "/dev/disk1" +#define DEVICE_NAME "/dev/rdisk1" #else #error "Your OS isn't supported yet." @@@@ -236,8 +236,7 @@@@ int main(int argc, char *argv[]) * TocEntry[last-1].lastRecordedAddress + 1, so we compute the start * of leadout from the start+length of the last track instead */ - TocEntry[last].cdte_track_address = TocEntry[last - 1].trackSize + - TocEntry[last - 1].trackStartAddress; + TocEntry[last].cdte_track_address = htonl(ntohl(TocEntry[last-1].trackSize) + ntohl(TocEntry[last-1].trackStartAddress)); #else /* FreeBSD, Linux, Solaris */ for (i = 0; i < last; i++) { /* tracks start with 1, but I must start with 0 on OpenBSD */ @@@@ -260,12 +259,12 @@@@ int main(int argc, char *argv[]) /* release file handle */ close(drive); -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__) TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address); #endif for (i = 0; i < last; i++) { -#if defined(__FreeBSD__) +#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__) TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address); #endif cksum += cddb_sum((TocEntry[i].cdte_track_address + CD_MSF_OFFSET) / CD_FRAMES); @ 1.3 log @Update to cd-discid-1.3.1. Notable changes since 0.9 are: - New upstream maintainer. - Try to use a default cdrom device if none is specified. - Add --musicbrainz option for output suitable for calculating a MusicBrainz DiscID. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $ d6 4 a9 3 --- cd-discid.c.orig 2013-01-22 10:30:56.000000000 +0000 +++ cd-discid.c 2013-01-22 10:34:05.000000000 +0000 @@@@ -50,7 +50,7 @@@@ d11 1 a11 2 Look at http://glibc-bsd.alioth.debian.org/porting/PORTING for more info */ a13 1 d15 8 a22 7 #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */ @@@@ -100,7 +100,7 @@@@ #define cdth_trk1 lastTrackNumberInLastSessionLSB #define cdrom_tocentry CDTrackInfo #define cdte_track_address trackStartAddress -#define DEVICE_NAME "/dev/disk1" +#define DEVICE_NAME "/dev/rdisk1" d25 2 a26 2 # error "Your OS isn't supported yet." @@@@ -221,7 +221,7 @@@@ d30 2 a31 1 - TocEntry[last].cdte_track_address = TocEntry[last-1].trackSize + TocEntry[last-1].trackStartAddress; d33 2 a34 2 #else /* FreeBSD, Linux, Solaris */ for (i=0; i < last; i++) { d36 3 a38 3 @@@@ -241,12 +241,12 @@@@ } #endif d43 1 a43 1 #endif d45 1 a45 1 for (i=0; i < last; i++) { @ 1.2 log @Fix output on OSX. Appease pkglint while here (license, patch comments). Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2005/10/03 12:35:39 joerg Exp $ d4 1 a4 1 - Fix output on OSX d6 5 a10 5 --- cd-discid.c.orig 2003-12-15 23:55:00.000000000 +0000 +++ cd-discid.c 2013-01-21 22:20:21.000000000 +0000 @@@@ -37,7 +37,7 @@@@ * to compile on Solaris */ #define cdte_track_address cdte_addr.lba d12 2 a13 2 -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__DragonFly__) d17 10 a26 1 @@@@ -194,7 +194,7 @@@@ d35 1 a35 1 @@@@ -214,12 +214,12 @@@@ @ 1.1 log @Allow building on DragonFly. @ text @d1 1 a1 1 $NetBSD$ d3 5 a7 2 --- cd-discid.c.orig 2005-07-22 16:14:41.000000000 +0000 +++ cd-discid.c d17 10 a26 1 @@@@ -214,12 +214,12 @@@@ int main(int argc, char *argv[]) d31 1 a31 1 +#if defined(__FreeBSD__) || defined(__DragonFly__) d37 1 a37 1 +#if defined(__FreeBSD__) || defined(__DragonFly__) @