diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index a8b1778da24..1e260361303 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -1,15 +1,17 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/19 07:23:13 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2012/05/03 06:50:37 ajacoutot Exp $
 
-COMMENT=	DVD read/navigation library
-DISTNAME=	libdvdnav-4.1.3
-REVISION=	1
+COMMENT=	DVD navigation library
+
+DISTNAME=	libdvdnav-4.2.0
 EPOCH=		0
 CATEGORIES=	multimedia
+MASTER_SITES=	${HOMEPAGE}releases/
+EXTRACT_SUFX=	.tar.bz2
 
-SHARED_LIBS=	dvdnav	6.0 \
-		dvdnavmini	6.0
+SHARED_LIBS=	dvdnav		6.1 \
+		dvdnavmini	6.1
 
-MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/
+HOMEPAGE=	http://dvdnav.mplayerhq.hu/
 
 # GPLv2
 PERMIT_DISTFILES_CDROM=	Yes
@@ -17,27 +19,23 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
-WANTLIB += dvdread
+WANTLIB=	dvdread
 
-EXTRACT_SUFX=	.tar.bz2
+AUTOCONF_VERSION= 2.61
+AUTOMAKE_VERSION= 1.10
 
-AUTOMAKE_VERSION=1.9
-AUTOCONF_VERSION=2.59
+# needs libtoolize
+BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
+		${MODGNU_AUTOMAKE_DEPENDS} \
+		devel/libtool
+
+LIB_DEPENDS=	devel/libdvdread>=4.2.0
 
 USE_LIBTOOL=	Yes
-
-BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} ${MODGNU_AUTOMAKE_DEPENDS}
-# needs libtoolize
-BUILD_DEPENDS+=	devel/libtool
-
-LIB_DEPENDS=	devel/libdvdread
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	DVDREAD_CFLAGS="-I${LOCALBASE}/include" \
-		DVDREAD_LIBS="-L${LOCALBASE}/lib -ldvdread"
+CONFIGURE_STYLE= gnu
 
 post-patch:
-	cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+	@cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
 		AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh noconfig
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index d7f689321d7..c2776cf5d51 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,5 +1,5 @@
-MD5 (libdvdnav-4.1.3.tar.bz2) = 1iODxFsogWdx4oNRXywn+g==
-RMD160 (libdvdnav-4.1.3.tar.bz2) = fGQ3Iwr2mfaxwtc/BfME8Dq6nc4=
-SHA1 (libdvdnav-4.1.3.tar.bz2) = 0bleuKfK7h+nWAoauthNbLPK0EY=
-SHA256 (libdvdnav-4.1.3.tar.bz2) = 6Co9ezw0KolaMy/A+yKB9A/5l4y4y7i/E0P8rQBjdZ0=
-SIZE (libdvdnav-4.1.3.tar.bz2) = 110843
+MD5 (libdvdnav-4.2.0.tar.bz2) = U76JA/mALhAZKaNFEgO79g==
+RMD160 (libdvdnav-4.2.0.tar.bz2) = HpV1VBc/6uO98f3WqDwqZKJVBoM=
+SHA1 (libdvdnav-4.2.0.tar.bz2) = 3tRdmFV2FprjYw2L5xeaIyO8D28=
+SHA256 (libdvdnav-4.2.0.tar.bz2) = jJcbCCdsid3OzSb8RCBEYP0lDcVzRvA0dtMHcYjEdVA=
+SIZE (libdvdnav-4.2.0.tar.bz2) = 111575
diff --git a/multimedia/libdvdnav/patches/patch-configure_ac b/multimedia/libdvdnav/patches/patch-configure_ac
index 0017d26c2c0..645f8b95bce 100644
--- a/multimedia/libdvdnav/patches/patch-configure_ac
+++ b/multimedia/libdvdnav/patches/patch-configure_ac
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_ac,v 1.3 2009/07/30 19:07:15 jakemsr Exp $
---- configure.ac.orig	Sat Aug 30 06:02:17 2008
-+++ configure.ac	Mon Sep 15 17:54:08 2008
+$OpenBSD: patch-configure_ac,v 1.4 2012/05/03 06:50:37 ajacoutot Exp $
+--- configure.ac.orig	Fri Oct  7 16:20:59 2011
++++ configure.ac	Thu Dec 15 13:32:10 2011
 @@ -143,6 +143,11 @@ case $host in
      THREAD_CFLAGS="-I/usr/local/include -D_THREAD_SAFE"
      CFLAGS="$THREAD_CFLAGS $CFLAGS"
@@ -13,31 +13,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2009/07/30 19:07:15 jakemsr Exp $
    *mingw32* | *cygwin*)
      ;;
    *)
-@@ -178,27 +183,16 @@ esac
- dnl ---------------------------------------------
- dnl libdvdread
- dnl ---------------------------------------------
--AC_ARG_WITH([dvdread-config],
--  [AS_HELP_STRING([--with-dvdread-config=PROG],
--    [dvdread-config program to use @<:@default=from PATH@:>@])],
--  [DVDREAD_CONFIG="$withval"],
--  [dnl User didn't specify program, search PATH
--  AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no])
--  test "x$DVDREAD_CONFIG" = xno && \
--    AC_MSG_ERROR([dvdread-config required to link with libdvdread])
--  ])
--DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \
--  AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG])
--DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \
--  AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG])
--AC_SUBST([DVDREAD_CFLAGS])
--AC_SUBST([DVDREAD_LIBS])
-+DVDREAD_CFLAGS="$DVDREAD_CFLAGS"
-+DVDREAD_LIBS="$DVDREAD_LIBS"
-+AC_SUBST(DVDREAD_CFLAGS)
-+AC_SUBST(DVDREAD_LIBS)
- 
- dnl ---------------------------------------------
+@@ -201,7 +206,7 @@ dnl ---------------------------------------------
  dnl cflags
  dnl ---------------------------------------------
  dnl Common cflags for all platforms
diff --git a/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in b/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
deleted file mode 100644
index 5c18c43cfac..00000000000
--- a/multimedia/libdvdnav/patches/patch-misc_dvdnav_pc_in
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-misc_dvdnav_pc_in,v 1.1 2010/06/02 16:55:38 ajacoutot Exp $
---- misc/dvdnav.pc.in.orig	Wed Jun  2 15:18:41 2010
-+++ misc/dvdnav.pc.in	Wed Jun  2 15:20:11 2010
-@@ -7,6 +7,5 @@ Name: libdvdnav
- Description: DVD Navigation library
- Version: @VERSION@
- 
--Requires.private: dvdread >= 4.1.2
- Cflags: -I${includedir} @THREAD_CFLAGS@
- Libs: -L${libdir} -ldvdnav @THREAD_LIBS@