7 files changed, 23 insertions, 60 deletions
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index d29d5b6c638..6fce5dae1f4 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,21 +1,24 @@
-# $NetBSD: Makefile,v 1.18 2008/07/20 23:38:17 dbj Exp $
+# $NetBSD: Makefile,v 1.19 2009/01/14 22:28:05 jmcneill Exp $
 
-DISTNAME=	libdvdread-0.9.7
-PKGREVISION=   1
+DISTNAME=	libdvdread-4.1.3
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
+MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/releases/dvdnav/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
-COMMENT=	DVD access library, primarily used in Ogle
+HOMEPAGE=	http://www.mplayerhq.hu/
+COMMENT=	DVD access library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake autoconf automake aclocal autoreconf
 USE_LIBTOOL=	yes
 
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE:Q}
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -vi
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdread/PLIST b/multimedia/libdvdread/PLIST
index 8d545d943f1..8e78b840c85 100644
--- a/multimedia/libdvdread/PLIST
+++ b/multimedia/libdvdread/PLIST
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.3 2006/01/23 22:09:26 wiz Exp $
-include/dvdread/cmd_print.h
+@comment $NetBSD: PLIST,v 1.4 2009/01/14 22:28:05 jmcneill Exp $
+bin/dvdread-config
+include/dvdread/bitreader.h
 include/dvdread/dvd_reader.h
+include/dvdread/dvd_udf.h
 include/dvdread/ifo_print.h
 include/dvdread/ifo_read.h
 include/dvdread/ifo_types.h
@@ -8,4 +10,6 @@ include/dvdread/nav_print.h
 include/dvdread/nav_read.h
 include/dvdread/nav_types.h
 lib/libdvdread.la
+lib/pkgconfig/dvdread.pc
+share/aclocal/dvdread.m4
 @dirrm include/dvdread
diff --git a/multimedia/libdvdread/buildlink3.mk b/multimedia/libdvdread/buildlink3.mk
index 1671de61830..c171a436657 100644
--- a/multimedia/libdvdread/buildlink3.mk
+++ b/multimedia/libdvdread/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2006/07/08 23:11:01 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2009/01/14 22:28:05 jmcneill Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBDVDREAD_BUILDLINK3_MK:=	${LIBDVDREAD_BUILDLINK3_MK}+
@@ -12,8 +12,8 @@ BUILDLINK_PACKAGES+=	libdvdread
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libdvdread
 
 .if !empty(LIBDVDREAD_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.libdvdread+=		libdvdread>=0.9.4
-BUILDLINK_ABI_DEPENDS.libdvdread+=	libdvdread>=0.9.5nb2
+BUILDLINK_API_DEPENDS.libdvdread+=	libdvdread>=4.1.3
+BUILDLINK_ABI_DEPENDS.libdvdread+=	libdvdread>=4.1.3
 BUILDLINK_PKGSRCDIR.libdvdread?=	../../multimedia/libdvdread
 .endif	# LIBDVDREAD_BUILDLINK3_MK
 
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 15045fd5e9a..59561672a55 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.15 2008/07/20 23:38:17 dbj Exp $
+$NetBSD: distinfo,v 1.16 2009/01/14 22:28:05 jmcneill Exp $
 
-SHA1 (libdvdread-0.9.7.tar.gz) = b2c2ede36cff9d56205747d3740c50fd32669e21
-RMD160 (libdvdread-0.9.7.tar.gz) = 7233064f35d86a27202ca1bef165f6972e20b3e8
-Size (libdvdread-0.9.7.tar.gz) = 389113 bytes
-SHA1 (patch-aa) = 1eba4b76ad030ebfe43ff082304599d7815fa947
-SHA1 (patch-ab) = 57fde8d79d911f2bb162b70223a493076c3aa12d
-SHA1 (patch-ac) = 900b46bfbb3c18f1731852161f0d87fe89e3f6a8
+SHA1 (libdvdread-4.1.3.tar.bz2) = fc4c7ba3e49929191e057b435bc4f867583ea8d5
+RMD160 (libdvdread-4.1.3.tar.bz2) = 60e802494bf64e019d6ccfcf42a17dd03e29a382
+Size (libdvdread-4.1.3.tar.bz2) = 96899 bytes
diff --git a/multimedia/libdvdread/patches/patch-aa b/multimedia/libdvdread/patches/patch-aa
deleted file mode 100644
index d2c44ddc89f..00000000000
--- a/multimedia/libdvdread/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2008/07/20 23:38:17 dbj Exp $
-
---- dvdread/Makefile.am.orig	2006-10-06 01:12:31.000000000 -0700
-+++ dvdread/Makefile.am	2007-05-09 09:53:33.000000000 -0700
-@@ -6,7 +6,7 @@
- 	dvdread_internal.h cmd_print.c \
- 	md5.c md5.h
- libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@
--libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*)"
-+libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*|UDFFindFile)"
- 
- pkgincludedir = $(includedir)/dvdread
- 
diff --git a/multimedia/libdvdread/patches/patch-ab b/multimedia/libdvdread/patches/patch-ab
deleted file mode 100644
index c749607e0cb..00000000000
--- a/multimedia/libdvdread/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.7 2008/07/20 23:38:17 dbj Exp $
-
---- dvdread/Makefile.in.orig	2006-10-06 01:14:22.000000000 -0700
-+++ dvdread/Makefile.in	2007-05-09 09:53:51.000000000 -0700
-@@ -190,7 +190,7 @@
- 	md5.c md5.h
- 
- libdvdread_la_LIBADD = @DL_LIBS@ @CSS_LIBS@
--libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*)"
-+libdvdread_la_LDFLAGS = -version-info 5:1:2 -export-symbols-regex "(DVD.*|ifo.*|nav.*|cmd.*|UDFFindFile)"
- pkginclude_HEADERS = dvd_reader.h ifo_types.h ifo_read.h \
- 	ifo_print.h nav_types.h nav_read.h nav_print.h cmd_print.h
- 
diff --git a/multimedia/libdvdread/patches/patch-ac b/multimedia/libdvdread/patches/patch-ac
deleted file mode 100644
index e200e317572..00000000000
--- a/multimedia/libdvdread/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2008/07/20 23:38:17 dbj Exp $
-
---- dvdread/dvd_input.c.orig	2005-09-19 06:43:08.000000000 -0700
-+++ dvdread/dvd_input.c	2007-05-09 11:14:08.000000000 -0700
-@@ -333,6 +333,10 @@
- #else
- 
-   dvdcss_library = dlopen("libdvdcss.so.2", RTLD_LAZY);
-+#ifdef __APPLE__
-+  if (!dvdcss_library)
-+    dvdcss_library = dlopen("libdvdcss.2.dylib", RTLD_LAZY);
-+#endif
- 
-   if(dvdcss_library != NULL) {
- #if defined(__OpenBSD__) && !defined(__ELF__)