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.

3 files changed, 32 insertions, 34 deletions

diff --git a/audio/cd-discid/Makefile b/audio/cd-discid/Makefile
index ca326f627f8..c4c9a9b1eea 100644
--- a/audio/cd-discid/Makefile
+++ b/audio/cd-discid/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2013/01/22 10:42:06 jperkin Exp $
+# $NetBSD: Makefile,v 1.19 2013/05/19 17:45:04 wiz Exp $
 
-DISTNAME=	cd-discid-1.3.1
+DISTNAME=	cd-discid-1.4
 CATEGORIES=	audio
 MASTER_SITES=	http://linukz.org/download/
 
@@ -15,9 +15,6 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 
-do-build:
-	cd ${WRKSRC} && ${CC} -O -o cd-discid cd-discid.c
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cd-discid ${DESTDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/cd-discid.1 \
diff --git a/audio/cd-discid/distinfo b/audio/cd-discid/distinfo
index 61ecf66412d..d281f5e3d2d 100644
--- a/audio/cd-discid/distinfo
+++ b/audio/cd-discid/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2013/01/22 10:42:06 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2013/05/19 17:45:04 wiz Exp $
 
-SHA1 (cd-discid-1.3.1.tar.gz) = 32580d3fa446c59d6519c700e1180efb7d5fe23e
-RMD160 (cd-discid-1.3.1.tar.gz) = 1b4fc78212f3ce004edf1337b9e43c210b555a94
-Size (cd-discid-1.3.1.tar.gz) = 12204 bytes
-SHA1 (patch-aa) = d5270a000e5db904fcf41084ac3362eeba3752a2
+SHA1 (cd-discid-1.4.tar.gz) = 9baf059ece993beabbe9c5fb97ceffd47d0070da
+RMD160 (cd-discid-1.4.tar.gz) = a63dabd35ca0b1f8114eeca78f79ea2f6b52cd6e
+Size (cd-discid-1.4.tar.gz) = 12435 bytes
+SHA1 (patch-aa) = 4cf2c11f55e5d8bc717c50cc1819beaa5590e38d
 SHA1 (patch-ab) = 3edf0e6373307a1d3a115f41fac39eaee1fc3aa2
diff --git a/audio/cd-discid/patches/patch-aa b/audio/cd-discid/patches/patch-aa
index a5a08e9c2fe..88db09e9b66 100644
--- a/audio/cd-discid/patches/patch-aa
+++ b/audio/cd-discid/patches/patch-aa
@@ -1,47 +1,48 @@
-$NetBSD: patch-aa,v 1.3 2013/01/22 10:42:06 jperkin Exp $
+$NetBSD: patch-aa,v 1.4 2013/05/19 17:45:04 wiz Exp $
 
 - Add support for DragonFly
 - Fix output on OSX, and use raw disk device.
 
---- 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 @@
- /* __FreeBSD_kernel__ is needed for properly compiling on Debian GNU/kFreeBSD
-  Look at http://glibc-bsd.alioth.debian.org/porting/PORTING for more info */
+--- 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 <sys/cdio.h>
- #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"
+ #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."
-@@ -221,7 +221,7 @@
+ #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 = 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++) {
+ #else   /* FreeBSD, Linux, Solaris */
+ 	for (i = 0; i < last; i++) {
  		/* tracks start with 1, but I must start with 0 on OpenBSD */
-@@ -241,12 +241,12 @@
- 	}
- #endif
+@@ -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       
+ #endif
  
- 	for (i=0; i < last; i++) {
+ 	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);