Fri Apr 18 14:58:32 2008 UTC ()
Fix bug in the original software which prevents the installation of
"libcdio_cdda.pc" and "libcdio_paranoia.pc". Bump package revision
because of this fix.

Problem pointed out by Matthias Drochner in private e-mail.


(tron)
diff -r1.35 -r1.36 pkgsrc/misc/libcdio/Makefile
diff -r1.13 -r1.14 pkgsrc/misc/libcdio/PLIST
diff -r1.15 -r1.16 pkgsrc/misc/libcdio/distinfo
diff -r0 -r1.5 pkgsrc/misc/libcdio/patches/patch-ab

cvs diff -r1.35 -r1.36 pkgsrc/misc/libcdio/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/Makefile 2008/04/15 18:04:50 1.35
+++ pkgsrc/misc/libcdio/Makefile 2008/04/18 14:58:32 1.36
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.35 2008/04/15 18:04:50 tron Exp $ 1# $NetBSD: Makefile,v 1.36 2008/04/18 14:58:32 tron Exp $
2 2
3DISTNAME= libcdio-0.80 3DISTNAME= libcdio-0.80
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= misc 5CATEGORIES= misc
6MASTER_SITES= ${MASTER_SITE_GNU:=libcdio/} 6MASTER_SITES= ${MASTER_SITE_GNU:=libcdio/}
7 7
8MAINTAINER= drochner@NetBSD.org 8MAINTAINER= drochner@NetBSD.org
9HOMEPAGE= http://www.gnu.org/software/libcdio/ 9HOMEPAGE= http://www.gnu.org/software/libcdio/
10COMMENT= CD-ROM access library 10COMMENT= CD-ROM access library
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13PKG_INSTALLATION_TYPES= overwrite pkgviews 13PKG_INSTALLATION_TYPES= overwrite pkgviews
14 14
15USE_PKGLOCALEDIR= yes 15USE_PKGLOCALEDIR= yes
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= gmake perl:run pkg-config 17USE_TOOLS+= gmake perl:run pkg-config

cvs diff -r1.13 -r1.14 pkgsrc/misc/libcdio/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/PLIST 2008/04/15 16:13:12 1.13
+++ pkgsrc/misc/libcdio/PLIST 2008/04/18 14:58:32 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2008/04/15 16:13:12 tron Exp $ 1@comment $NetBSD: PLIST,v 1.14 2008/04/18 14:58:32 tron Exp $
2bin/cd-drive 2bin/cd-drive
3bin/cd-info 3bin/cd-info
4bin/cd-paranoia 4bin/cd-paranoia
5bin/cd-read 5bin/cd-read
6bin/cdda-player 6bin/cdda-player
7bin/iso-info 7bin/iso-info
8bin/iso-read 8bin/iso-read
9bin/mmc-tool 9bin/mmc-tool
10include/cdio/audio.h 10include/cdio/audio.h
11include/cdio/bytesex.h 11include/cdio/bytesex.h
12include/cdio/bytesex_asm.h 12include/cdio/bytesex_asm.h
13include/cdio/cd_types.h 13include/cdio/cd_types.h
14include/cdio/cdda.h 14include/cdio/cdda.h
@@ -47,25 +47,27 @@ include/cdio++/iso9660.hpp @@ -47,25 +47,27 @@ include/cdio++/iso9660.hpp
47include/cdio++/mmc.hpp 47include/cdio++/mmc.hpp
48include/cdio++/read.hpp 48include/cdio++/read.hpp
49include/cdio++/track.hpp 49include/cdio++/track.hpp
50info/libcdio.info 50info/libcdio.info
51lib/libcdio.la 51lib/libcdio.la
52lib/libcdio++.la 52lib/libcdio++.la
53lib/libcdio_cdda.la 53lib/libcdio_cdda.la
54lib/libcdio_paranoia.la 54lib/libcdio_paranoia.la
55lib/libiso9660.la 55lib/libiso9660.la
56lib/libiso9660++.la 56lib/libiso9660++.la
57lib/libudf.la 57lib/libudf.la
58lib/pkgconfig/libcdio.pc 58lib/pkgconfig/libcdio.pc
59lib/pkgconfig/libcdio++.pc 59lib/pkgconfig/libcdio++.pc
 60lib/pkgconfig/libcdio_cdda.pc
 61lib/pkgconfig/libcdio_paranoia.pc
60lib/pkgconfig/libiso9660.pc 62lib/pkgconfig/libiso9660.pc
61lib/pkgconfig/libiso9660++.pc 63lib/pkgconfig/libiso9660++.pc
62lib/pkgconfig/libudf.pc 64lib/pkgconfig/libudf.pc
63man/jp/man1/cd-paranoia.1 65man/jp/man1/cd-paranoia.1
64man/man1/cd-drive.1 66man/man1/cd-drive.1
65man/man1/cd-info.1 67man/man1/cd-info.1
66man/man1/cd-paranoia.1 68man/man1/cd-paranoia.1
67man/man1/cd-read.1 69man/man1/cd-read.1
68man/man1/iso-info.1 70man/man1/iso-info.1
69man/man1/iso-read.1 71man/man1/iso-read.1
70@dirrm include/cdio++ 72@dirrm include/cdio++
71@dirrm include/cdio 73@dirrm include/cdio

cvs diff -r1.15 -r1.16 pkgsrc/misc/libcdio/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/libcdio/distinfo 2008/04/15 16:13:12 1.15
+++ pkgsrc/misc/libcdio/distinfo 2008/04/18 14:58:32 1.16
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.15 2008/04/15 16:13:12 tron Exp $ 1$NetBSD: distinfo,v 1.16 2008/04/18 14:58:32 tron Exp $
2 2
3SHA1 (libcdio-0.80.tar.gz) = 40c1558a65a9eca2b693d1951ed2664efbe7d1ed 3SHA1 (libcdio-0.80.tar.gz) = 40c1558a65a9eca2b693d1951ed2664efbe7d1ed
4RMD160 (libcdio-0.80.tar.gz) = 3ca404bffb107ad950505b8ccd9e659e306545cb 4RMD160 (libcdio-0.80.tar.gz) = 3ca404bffb107ad950505b8ccd9e659e306545cb
5Size (libcdio-0.80.tar.gz) = 2083287 bytes 5Size (libcdio-0.80.tar.gz) = 2083287 bytes
6SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e 6SHA1 (patch-aa) = 8e70ee2840c19da3efc0c47dfa9f7ea400a1ec2e
 7SHA1 (patch-ab) = a2bcb4fec5acf46ede7386287dec3d0d4aa0d81e
7SHA1 (patch-ac) = 7932908d34f8d1cc7946bce6a6d61d5036d102d6 8SHA1 (patch-ac) = 7932908d34f8d1cc7946bce6a6d61d5036d102d6

File Added: pkgsrc/misc/libcdio/patches/Attic/patch-ab
$NetBSD: patch-ab,v 1.5 2008/04/18 14:58:32 tron Exp $

--- Makefile.in.orig	2008-03-15 17:45:36.000000000 +0000
+++ Makefile.in	2008-04-18 15:49:22.000000000 +0100
@@ -284,7 +284,8 @@
 	         libcdio++.pc  \
 	         libiso9660.pc \
 	         libiso9660++.pc \
-	         libudf.pc
+	         libudf.pc \
+	         $(paranoiapcs)
 
 
 # List of additional files for expanded regression tests