15 files changed, 43 insertions, 22 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 581193785c04..6220d1b3191a 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.6.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ MAINTAINER=	pb@FreeBSD.org
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
 BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread \
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GETOPT_LONG=yes
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 8835f705b23d..b7f00c96767c 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdnav
 PORTVERSION=	0.1.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dvd
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	dvd
 MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	The library for the xine-dvdnav plugin
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		THREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 3267d47f5e84..0b6e914df642 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdplay
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.videolan.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Portable abstraction library for DVD navigation
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 1d50f16bb878..aa603e59db76 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdread
 PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
diff --git a/multimedia/libdvdread/files/patch-dvdread-ifo_types.h b/multimedia/libdvdread/files/patch-dvdread-ifo_types.h
new file mode 100644
index 000000000000..3ac3b5737be9
--- /dev/null
+++ b/multimedia/libdvdread/files/patch-dvdread-ifo_types.h
@@ -0,0 +1,15 @@
+--- dvdread/ifo_types.h.orig	Thu Mar  2 17:25:43 2006
++++ dvdread/ifo_types.h	Wed Apr  4 20:07:32 2007
+@@ -29,7 +29,11 @@
+ #endif
+ #else
+ #if !defined(UINT8_MAX) || !defined(UINT16_MAX) || !defined(INT32_MAX)
+-#error "Must include <inttypes.h> or <stdint.h> before any libdvdread header."
++#if !defined(_SYS_STDINT_H_) || !defined(_INTTYPES_H_)
++#include <stdint.h>
++#else
++#error "UINT8_MAX, UINT16_MAX, or INT32_MAX are missing from <stdint.h> or <inttypes.h>."
++#endif
+ #endif
+ #endif
+ 
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index a0b393553012..8bbfef8d21fb 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lsdvd
 PORTVERSION=	0.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	acidrip
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	acidrip
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Print information about the contents and structure of a DVD
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 9e1f5a4bf498..48e365e2991c 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmpython
 PORTVERSION=	0.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,7 +16,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	lewiz@compsoc.man.ac.uk
 COMMENT=	Retrieves metadata from mp3, ogg, avi, jpg and other formats
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	lsdvd:${PORTSDIR}/multimedia/lsdvd
 
 USE_PYTHON=	yes
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 4f25329aa5ee..9bc25185d357 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogmtools
 PORTVERSION=	1.5
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 
@@ -46,12 +47,12 @@ post-configure:
 
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libdvdread.so.3)
+.if exists(${LOCALBASE}/lib/libdvdread.so.5)
 WITH_DVDREAD=yes
 .endif
 
 .ifdef(WITH_DVDREAD)
-LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 CONFIGURE_ARGS+=	--with-dvdread \
 			--with-dvdread-includes=${LOCALBASE} \
diff --git a/multimedia/streamanalyze/Makefile b/multimedia/streamanalyze/Makefile
index 58a41143c907..72ab97af06e7 100644
--- a/multimedia/streamanalyze/Makefile
+++ b/multimedia/streamanalyze/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	streamanalyze
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.badabum.de/down/
 
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	Shrink-factor calculator for StreamDVD
 
-LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 WRKSRC=		${WRKDIR}/StreamAnalyze
 
diff --git a/multimedia/streamdvd/Makefile b/multimedia/streamdvd/Makefile
index 6316d09f960a..852c545fd262 100644
--- a/multimedia/streamdvd/Makefile
+++ b/multimedia/streamdvd/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	streamdvd
 PORTVERSION=	0.4
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.badabum.de/down/
 
 MAINTAINER=	serge.gagnon@b2b2c.ca
 COMMENT=	A fast tool to backup Video DVDs 'on the fly'
 
-LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 WRKSRC=		${WRKDIR}/StreamDVD-${PORTVERSION}
 
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index 99e4d223a7c5..ae321dda06b6 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vamps
 PORTVERSION=	0.99.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	vamps
@@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR=	vamps
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	High performance tool to transcode DVD videos to a smaller size
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
diff --git a/net/vls/Makefile b/net/vls/Makefile
index ff82d5a13330..7700c87fc79d 100644
--- a/net/vls/Makefile
+++ b/net/vls/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vls
 PORTVERSION=	0.5.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net ipv6 multimedia
 MASTER_SITES=	http://download.videolan.org/pub/videolan/vls/${PORTVERSION}/
 
@@ -17,7 +17,7 @@ COMMENT=	Broadcasts MPEG(1/2/4, PS/TS) video streams
 LIB_DEPENDS=	dvbpsi.4:${PORTSDIR}/multimedia/libdvbpsi
 .if !defined(WITHOUT_DVD)
 LIB_DEPENDS+=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
-		dvdread.3:${PORTSDIR}/multimedia/libdvdread
+		dvdread.5:${PORTSDIR}/multimedia/libdvdread
 .endif
 
 USE_BZIP2=	yes
diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index 982bee6559dc..e5744e7c45bd 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	dvdbackup
 PORTVERSION=	0.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dvd-create.sourceforge.net/ GENTOO/distfiles
 
 MAINTAINER=	conrads@cox.net
 COMMENT=	Backup content from DVD to hard disk
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	bin/dvdbackup
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index 43470b823ded..fe1bd102719a 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -7,13 +7,14 @@
 
 PORTNAME=	vobcopy
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://lpn.rnbhq.org/download/
 
 MAINTAINER=	josh@tcbug.org
 COMMENT=	Decrypts and copies DVD .vob files
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 USE_BZIP2=	yes
 USE_GETOPT_LONG=	yes
diff --git a/sysutils/vstrip/Makefile b/sysutils/vstrip/Makefile
index 00883dfa92cd..d29a41896ae2 100644
--- a/sysutils/vstrip/Makefile
+++ b/sysutils/vstrip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	vstrip
 DISTVERSION=	0.8f
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://files.digital-digest.com/downloads/files/encode/
 DISTNAME=	vStrip_${DISTVERSION:C/\.//g}
@@ -14,7 +15,7 @@ DISTNAME=	vStrip_${DISTVERSION:C/\.//g}
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A VOB de-multiplexing tool, splitter and VOB/IFO files processor
 
-LIB_DEPENDS=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
 
 USE_ZIP=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"