Update to 0.9.3:

  Support for MacOS X/Darwin have been added.
  Ported to use libdvdcss2 (1.2.0 and later).
  Can now use libdvdcss to also decrypt files on a normal filsystem.
  A bit more tolerant of incorrectly mastered DVDs.
  Build robustness fixes from Mark Espie.
  Added some Doxygen markup and comments.

Please note that you need to update libdvdcss to 1.2.0 if you are using it.

6 files changed, 17 insertions, 34 deletions

diff --git a/misc/libdvdread/MESSAGE b/misc/libdvdread/MESSAGE
new file mode 100644
index 00000000000..107cb2df3cd
--- /dev/null
+++ b/misc/libdvdread/MESSAGE
@@ -0,0 +1,8 @@
+======================================================================
+$NetBSD: MESSAGE,v 1.1 2002/05/27 15:08:15 veego Exp $
+
+Because of the unclear legal status of libdvdcss, we do not provide a
+package for it.  It is however needed to play encrypted DVDs.
+If you want to play encrypted DVDs, please install it yourself.
+
+======================================================================
diff --git a/misc/libdvdread/Makefile b/misc/libdvdread/Makefile
index 5ac5d2068c0..648dd19098a 100644
--- a/misc/libdvdread/Makefile
+++ b/misc/libdvdread/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2001/12/12 01:32:32 enami Exp $
+# $NetBSD: Makefile,v 1.3 2002/05/27 15:08:15 veego Exp $
 
-DISTNAME=	libdvdread-0.9.2
+DISTNAME=	libdvdread-0.9.3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/misc/libdvdread/PLIST b/misc/libdvdread/PLIST
index 08e919766db..90d12bfb075 100644
--- a/misc/libdvdread/PLIST
+++ b/misc/libdvdread/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2001/12/10 20:26:38 veego Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/05/27 15:08:15 veego Exp $
 include/dvdread/dvd_reader.h
 include/dvdread/ifo_print.h
 include/dvdread/ifo_read.h
@@ -10,5 +10,5 @@ lib/libdvdread.a
 lib/libdvdread.la
 lib/libdvdread.so
 lib/libdvdread.so.2
-lib/libdvdread.so.2.1
+lib/libdvdread.so.2.2
 @dirrm include/dvdread
diff --git a/misc/libdvdread/buildlink.mk b/misc/libdvdread/buildlink.mk
index 1ab5ef92010..5c5ea7bc6e6 100644
--- a/misc/libdvdread/buildlink.mk
+++ b/misc/libdvdread/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.1 2002/01/21 15:43:46 zuntum Exp $
+# $NetBSD: buildlink.mk,v 1.2 2002/05/27 15:08:15 veego Exp $
 #
 # This Makefile fragment is included by packages that use libdvdread.
 #
@@ -17,7 +17,7 @@ LIBDVDREAD_BUILDLINK_MK=	# defined
 
 .include "../../mk/bsd.buildlink.mk"
 
-BUILDLINK_DEPENDS.libdvdread?=	libdvdread>=0.9.2
+BUILDLINK_DEPENDS.libdvdread?=	libdvdread>=0.9.3
 DEPENDS+=		${BUILDLINK_DEPENDS.libdvdread}:../../misc/libdvdread
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.libdvdread=libdvdread
diff --git a/misc/libdvdread/distinfo b/misc/libdvdread/distinfo
index 67ca55f4007..e1a4e76cebb 100644
--- a/misc/libdvdread/distinfo
+++ b/misc/libdvdread/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.2 2002/01/21 14:02:45 dmcmahill Exp $
+$NetBSD: distinfo,v 1.3 2002/05/27 15:08:15 veego Exp $
 
-SHA1 (libdvdread-0.9.2.tar.gz) = 68fbd4a583b82b052f8a766c918f7814e805ae28
-Size (libdvdread-0.9.2.tar.gz) = 195657 bytes
-SHA1 (patch-aa) = 9955a59f0776214df8d234ad11abc7a4deb53898
+SHA1 (libdvdread-0.9.3.tar.gz) = 8098fd5f03e3b521b58ac1a5eb838b2e5ceb0426
+Size (libdvdread-0.9.3.tar.gz) = 196597 bytes
diff --git a/misc/libdvdread/patches/patch-aa b/misc/libdvdread/patches/patch-aa
deleted file mode 100644
index 18a28fb5419..00000000000
--- a/misc/libdvdread/patches/patch-aa
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2002/01/21 14:02:46 dmcmahill Exp $
-
-fix format string for LP64 machines.
-
---- dvdread/dvd_reader.c.orig	Tue Oct  9 16:07:40 2001
-+++ dvdread/dvd_reader.c	Sun Jan 20 10:10:50 2002
-@@ -862,6 +862,6 @@
- 			       offset * (int64_t) DVD_VIDEO_LB_LEN, SEEK_SET );
- 		if( off != ( offset * (int64_t) DVD_VIDEO_LB_LEN ) ) {
--		    fprintf( stderr, "libdvdread: Can't seek to block %d\n", 
--			     offset );
-+		    fprintf( stderr, "libdvdread: Can't seek to block %lld\n", 
-+			     (long long) offset );
- 		    return 0;
- 		}
-@@ -879,6 +879,6 @@
- 			       offset * (int64_t) DVD_VIDEO_LB_LEN, SEEK_SET );
- 		if( off != ( offset * (int64_t) DVD_VIDEO_LB_LEN ) ) {
--		    fprintf( stderr, "libdvdread: Can't seek to block %d\n", 
--			     offset );
-+		    fprintf( stderr, "libdvdread: Can't seek to block %lld\n", 
-+			     (long long) offset );
- 		    return 0;
- 		}