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 context 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,13 +1,15 @@
-# $NetBSD: Makefile,v 1.16 2012/09/11 23:59:28 asau Exp $
+# $NetBSD: Makefile,v 1.17 2013/01/21 22:24:55 jperkin Exp $
 
 DISTNAME=	cd-discid_0.9.orig
 PKGNAME=	cd-discid-0.9
+PKGREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_GENTOO:=distfiles/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Read CD to obtain CDDB discid information
 HOMEPAGE=	http://linukz.org/cd-discid.shtml
+LICENSE=	gnu-gpl-v2
 
 NOT_FOR_PLATFORM=	Interix-*-*
cvs diff -r1.4 -r1.5 pkgsrc/audio/cd-discid/distinfo (expand / switch to context 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 @@
-$NetBSD: distinfo,v 1.4 2005/10/03 12:35:39 joerg Exp $
+$NetBSD: distinfo,v 1.5 2013/01/21 22:24:56 jperkin Exp $
 
 SHA1 (cd-discid_0.9.orig.tar.gz) = 389c3b5bbfb96b113f85a8d206f9d0d7052146a4
 RMD160 (cd-discid_0.9.orig.tar.gz) = 58049ba778243019a96ab7f8d8eaf213e8eca4fa
 Size (cd-discid_0.9.orig.tar.gz) = 11217 bytes
-SHA1 (patch-aa) = 80dc0338faf17f8b8cb556fa08e973cd01759a02
+SHA1 (patch-aa) = 7ce1a368262880ad9c5be43e15790d491abd53c8
cvs diff -r1.1 -r1.2 pkgsrc/audio/cd-discid/patches/patch-aa (expand / switch to context 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,7 +1,10 @@
-$NetBSD: patch-aa,v 1.1 2005/10/03 12:35:39 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2013/01/21 22:24:56 jperkin Exp $
 
---- cd-discid.c.orig	2005-07-22 16:14:41.000000000 +0000
-+++ cd-discid.c
+- Add support for DragonFly
+- Fix output on OSX
+
+--- 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
@@ -11,18 +14,27 @@
  
  #include <sys/cdio.h>
  #define        CDROM_LBA       CD_LBA_FORMAT   /* first frame is 0 */
-@@ -214,12 +214,12 @@ int main(int argc, char *argv[])
+@@ -194,7 +194,7 @@
+ 	 * 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 */
+@@ -214,12 +214,12 @@
  	}
  #endif
  
 -#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
++#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__)
++#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);