Mon Jan 21 22:24:56 2013 UTC ()
Fix output on OSX.  Appease pkglint while here (license, patch comments).

Bump PKGREVISION.


(jperkin)
diff -r1.16 -r1.17 pkgsrc/audio/cd-discid/Makefile
diff -r1.4 -r1.5 pkgsrc/audio/cd-discid/distinfo
diff -r1.1 -r1.2 pkgsrc/audio/cd-discid/patches/patch-aa
cvs diff -r1.16 -r1.17 pkgsrc/audio/cd-discid/Makefile (expand / switch to unified diff)

--- pkgsrc/audio/cd-discid/Makefile 2012/09/11 23:59:28 1.16
+++ pkgsrc/audio/cd-discid/Makefile 2013/01/21 22:24:55 1.17
@@ -1,23 +1,25 @@ @@ -1,23 +1,25 @@
1# $NetBSD: Makefile,v 1.16 2012/09/11 23:59:28 asau Exp $ 1# $NetBSD: Makefile,v 1.17 2013/01/21 22:24:55 jperkin Exp $
2 2
3DISTNAME= cd-discid_0.9.orig 3DISTNAME= cd-discid_0.9.orig
4PKGNAME= cd-discid-0.9 4PKGNAME= cd-discid-0.9
 5PKGREVISION= 1
5CATEGORIES= audio 6CATEGORIES= audio
6MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/} 7MASTER_SITES= ${MASTER_SITE_GENTOO:=distfiles/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9COMMENT= Read CD to obtain CDDB discid information 10COMMENT= Read CD to obtain CDDB discid information
10HOMEPAGE= http://linukz.org/cd-discid.shtml 11HOMEPAGE= http://linukz.org/cd-discid.shtml
 12LICENSE= gnu-gpl-v2
11 13
12NOT_FOR_PLATFORM= Interix-*-* 14NOT_FOR_PLATFORM= Interix-*-*
13 15
14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 16WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
15 17
16INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 18INSTALLATION_DIRS= bin ${PKGMANDIR}/man1
17 19
18do-build: 20do-build:
19 cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c 21 cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c
20 22
21do-install: 23do-install:
22 ${INSTALL_PROGRAM} ${WRKSRC}/cd-discid ${DESTDIR}${PREFIX}/bin 24 ${INSTALL_PROGRAM} ${WRKSRC}/cd-discid ${DESTDIR}${PREFIX}/bin
23 ${INSTALL_MAN} ${WRKSRC}/cd-discid.1 \ 25 ${INSTALL_MAN} ${WRKSRC}/cd-discid.1 \
cvs diff -r1.4 -r1.5 pkgsrc/audio/cd-discid/distinfo (expand / switch to unified diff)

--- pkgsrc/audio/cd-discid/distinfo 2005/10/03 12:35:39 1.4
+++ pkgsrc/audio/cd-discid/distinfo 2013/01/21 22:24:56 1.5
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.4 2005/10/03 12:35:39 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2013/01/21 22:24:56 jperkin Exp $
2 2
3SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4 3SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4
4RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa 4RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa
5Size (cd-discid_0.9.orig.tar.gz) = 11217 bytes 5Size (cd-discid_0.9.orig.tar.gz) = 11217 bytes
6SHA1 (patch-aa) = 80dc0338faf17f8b8cb556fa08e973cd01759a02 6SHA1 (patch-aa) = 7ce1a368262880ad9c5be43e15790d491abd53c8
cvs diff -r1.1 -r1.2 pkgsrc/audio/cd-discid/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/audio/cd-discid/patches/patch-aa 2005/10/03 12:35:39 1.1
+++ pkgsrc/audio/cd-discid/patches/patch-aa 2013/01/21 22:24:56 1.2
@@ -1,28 +1,40 @@ @@ -1,28 +1,40 @@
1$NetBSD: patch-aa,v 1.1 2005/10/03 12:35:39 joerg Exp $ 1$NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $
2 2
3--- cd-discid.c.orig 2005-07-22 16:14:41.000000000 +0000 3- Add support for DragonFly
4+++ cd-discid.c 4- Fix output on OSX
 5
 6--- cd-discid.c.orig 2003-12-15 23:55:00.000000000 +0000
 7+++ cd-discid.c 2013-01-21 22:20:21.000000000 +0000
5@@ -37,7 +37,7 @@ 8@@ -37,7 +37,7 @@
6 * to compile on Solaris */ 9 * to compile on Solaris */
7 #define cdte_track_address cdte_addr.lba 10 #define cdte_track_address cdte_addr.lba
8  11
9-#elif defined(__FreeBSD__) 12-#elif defined(__FreeBSD__)
10+#elif defined(__FreeBSD__) || defined(__DragonFly__) 13+#elif defined(__FreeBSD__) || defined(__DragonFly__)
11  14
12 #include <sys/cdio.h> 15 #include <sys/cdio.h>
13 #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */ 16 #define CDROM_LBA CD_LBA_FORMAT /* first frame is 0 */
14@@ -214,12 +214,12 @@ int main(int argc, char *argv[]) 17@@ -194,7 +194,7 @@
 18 * TocEntry[last-1].lastRecordedAddress + 1, so we compute the start
 19 * of leadout from the start+length of the last track instead
 20 */
 21- TocEntry[last].cdte_track_address = TocEntry[last-1].trackSize + TocEntry[last-1].trackStartAddress;
 22+ TocEntry[last].cdte_track_address = htonl(ntohl(TocEntry[last-1].trackSize) + ntohl(TocEntry[last-1].trackStartAddress));
 23 #else /* FreeBSD, Linux, Solaris */
 24 for (i=0; i < last; i++) {
 25 /* tracks start with 1, but I must start with 0 on OpenBSD */
 26@@ -214,12 +214,12 @@
15 } 27 }
16 #endif 28 #endif
17  29
18-#if defined(__FreeBSD__) 30-#if defined(__FreeBSD__)
19+#if defined(__FreeBSD__) || defined(__DragonFly__) 31+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
20 TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address); 32 TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address);
21 #endif  33 #endif
22  34
23 for (i=0; i < last; i++) { 35 for (i=0; i < last; i++) {
24-#if defined(__FreeBSD__) 36-#if defined(__FreeBSD__)
25+#if defined(__FreeBSD__) || defined(__DragonFly__) 37+#if defined(__FreeBSD__) || defined(__DragonFly__) || defined(__APPLE__)
26 TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address); 38 TocEntry[i].cdte_track_address = ntohl(TocEntry[i].cdte_track_address);
27 #endif 39 #endif
28 cksum += cddb_sum((TocEntry[i].cdte_track_address + CD_MSF_OFFSET) / CD_FRAMES); 40 cksum += cddb_sum((TocEntry[i].cdte_track_address + CD_MSF_OFFSET) / CD_FRAMES);