Replace libdvdread with the version maintained by the mplayer group

	-Turn over maintainership
	-Bump ports that depend on libdvdread since shared lib
	 version rolls back from .5 to .4
	-Fix multimedia/ogle build with this version

PR:		127849
Submitted by:	Ganael LAPLANCHE <ganael.laplanche@martymac.com>

36 files changed, 308 insertions, 109 deletions

diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 1bbf5776f14..fdfbaecf762 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dvdauthor
 PORTVERSION=	0.6.14
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pb@FreeBSD.org
 COMMENT=	Makes a DVD file structure from one or more MPEG2 streams
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread \
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_BISON=	build
diff --git a/multimedia/gmerlin-avdecoder/Makefile b/multimedia/gmerlin-avdecoder/Makefile
index 60afc941292..4986b075c4f 100644
--- a/multimedia/gmerlin-avdecoder/Makefile
+++ b/multimedia/gmerlin-avdecoder/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gmerlin-avdecoder
 PORTVERSION=	0.1.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/gmerlin
 
@@ -129,7 +129,7 @@ CONFIGURE_ARGS+=--disable-faad2
 .endif
 
 .if !defined(WITHOUT_DVDREAD)
-LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 .else
 CONFIGURE_ARGS+=--disable-dvdread
 .endif
@@ -181,6 +181,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-O3 -funroll-all-loops -ffast-math||g; \
 		/LIBS/ s|-ldl||g; s|^LDFLAGS="|&$${LDFLAGS} |' \
 		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|#if DVDREAD_VERSION < 905|#if DVDREAD_VERSION < 904|' \
+		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^LIBS = / s|$$| @LIBINTL@ -lz|' \
 		${WRKSRC}/tests/Makefile.in
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/lib/in_smb.c
diff --git a/multimedia/k9copy-kde4/Makefile b/multimedia/k9copy-kde4/Makefile
index 809e856a842..8fb7dc468a0 100644
--- a/multimedia/k9copy-kde4/Makefile
+++ b/multimedia/k9copy-kde4/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	triosoft@triosoft.com.ua
 COMMENT=	A DVD-9 to DVD-5 shrinking application for KDE
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		vamps:${PORTSDIR}/multimedia/vamps
diff --git a/multimedia/k9copy/Makefile b/multimedia/k9copy/Makefile
index 809e856a842..8fb7dc468a0 100644
--- a/multimedia/k9copy/Makefile
+++ b/multimedia/k9copy/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	k9copy
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	triosoft@triosoft.com.ua
 COMMENT=	A DVD-9 to DVD-5 shrinking application for KDE
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		vamps:${PORTSDIR}/multimedia/vamps
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index 5aac54dc7cf..d9a96d65678 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kissdx
 PORTVERSION=	0.13.10a
+PORTREVISION=	1
 CATEGORIES=	multimedia net
 MASTER_SITES=	http://paragi.dk/kiss/
 
diff --git a/multimedia/ldvd/Makefile b/multimedia/ldvd/Makefile
index e45b5a8d461..63d5a1c4c84 100644
--- a/multimedia/ldvd/Makefile
+++ b/multimedia/ldvd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ldvd
 PORTVERSION=	2.0.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	multimedia
 MASTER_SITES=	http://freebsd.unixfreunde.de/sources/
 
@@ -15,7 +15,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Gui, which shall simplify shrinking a DVD-9 to a DVD-5
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Gtk.pm:${PORTSDIR}/x11-toolkits/p5-Gtk
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		ifo_dump:${PORTSDIR}/multimedia/ogle \
diff --git a/multimedia/libdvdnav-mplayer/Makefile b/multimedia/libdvdnav-mplayer/Makefile
index b74ea65fb6e..80385fd8a26 100644
--- a/multimedia/libdvdnav-mplayer/Makefile
+++ b/multimedia/libdvdnav-mplayer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libdvdnav-mplayer
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \
@@ -20,7 +21,7 @@ DISTNAME=	libdvdnav-${PORTVERSION}
 MAINTAINER=	ganael.laplanche@martymac.com
 COMMENT=	Mplayer fork of the lidvdnav project
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 340d11e0614..708c372dea8 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdnav
 PORTVERSION=	0.1.10
-PORTREVISION=	3
+PORTREVISION=	4
 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.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 CONFLICTS=	libdvdnav-mplayer-[0-9]*
 
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 0b6e914df64..5a5adbeaf7e 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	libdvdplay
 PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTREVISION=	3
 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.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 USE_AUTOTOOLS=	libtool:15
 USE_BZIP2=	yes
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 09b3c7d3eae..7952bfccb38 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -6,50 +6,38 @@
 #
 
 PORTNAME=	libdvdread
-PORTVERSION=	0.9.7
-PORTREVISION=	3
+PORTVERSION=	4.1.3
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
-
-MAINTAINER=	rnoland@FreeBSD.org
-COMMENT=	This is needed by ogle, which is a DVD player that supports DVD menus
-
-.if !defined(PACKAGE_BUILDING)
-LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
-.endif
-
-USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	yes
+MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		http://www2.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		http://www3.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		http://www4.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		http://www5.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		ftp://ftp1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/dvdnav/
+
+MAINTAINER=	ganael.laplanche@martymac.com
+COMMENT=	Mplayer version of the lidvdread project
+
+USE_BZIP2=	yes
+CFLAGS+=	"-I${LOCALBASE}/include"
+LDFLAGS+=	"-L${LOCALBASE}/lib"
+HAS_CONFIGURE=	yes
+CONFIGURE_SCRIPT=	configure2
+CONFIGURE_ARGS=	--prefix="${PREFIX}" \
+		--libdir="${PREFIX}/lib" \
+		--libdatadir="${PREFIX}/libdata/pkgconfig" \
+		--shlibdir="${PREFIX}/lib" \
+		--incdir="${PREFIX}/include/dvdread" \
+		--disable-opts \
+		--disable-debug \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}"
+USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-DOC_FILES=	AUTHORS COPYING NEWS README TODO
-
-# allow build with more warnings enabled
-.if defined(NO_WERROR)
-CONFIGURE_ARGS+=	--disable-warnings
-.endif
-
-# ugly hack to have libdvdread directly depend on libdvdcss since
-# it already does for practical reasons even though not for compile
-# time ones
-DVDCSS_LIBVERSION=	2
-
 post-patch:
-.for p in Makefile.in dvdread/Makefile.in src/Makefile.in
-	@${REINPLACE_CMD} -E -e 's|cd \$$\(top_srcdir\) && \$$\(AUTOMAKE\)|\#|; \
-		s|cd \$$\(srcdir\) && \$$\(ACLOCAL\)|\#|' ${WRKSRC}/${p}
-.endfor
-# update this in sync with libdvdcss shared library version
-	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so).2|\1.${DVDCSS_LIBVERSION}|' \
-		${WRKSRC}/dvdread/dvd_input.c
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for file in ${DOC_FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${REINPLACE_CMD} -e 's|-ldl ||g' \
+		${WRKSRC}/Makefile
 
-.include <bsd.port.pre.mk>
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 4f6f7251063..21629370745 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdvdread-0.9.7.tar.gz) = 078788c9241ae16763529e1235502337
-SHA256 (libdvdread-0.9.7.tar.gz) = e01f70cba5cfbc577b853ae69d73f00db7161e1704dc2359c4377aac4232a184
-SIZE (libdvdread-0.9.7.tar.gz) = 389113
+MD5 (libdvdread-4.1.3.tar.bz2) = 6dc068d442c85a3cdd5ad3da75f6c6e8
+SHA256 (libdvdread-4.1.3.tar.bz2) = 07c39907beccd141adb710403c4704a1e1fe2f3f61d1e5a74fc5bcb7679819b4
+SIZE (libdvdread-4.1.3.tar.bz2) = 96899
diff --git a/multimedia/libdvdread/files/patch-Makefile b/multimedia/libdvdread/files/patch-Makefile
new file mode 100644
index 00000000000..6e58e3ea76d
--- /dev/null
+++ b/multimedia/libdvdread/files/patch-Makefile
@@ -0,0 +1,24 @@
+--- Makefile.orig	2008-08-31 11:27:37.000000000 +0200
++++ Makefile	2008-10-04 12:42:55.833207676 +0200
+@@ -90,8 +90,8 @@
+ # Install targets
+ 
+ install-headers:
+-	install -d $(DESTDIR)$(dvdread_incdir)
+-	install -m 644 $(DVDREAD_HEADERS) $(DESTDIR)$(dvdread_incdir)
++	install -d $(DESTDIR)$(incdir)
++	install -m 644 $(DVDREAD_HEADERS) $(DESTDIR)$(incdir)
+ 
+ install-shared: $(SHLIB)
+ 	install -d $(DESTDIR)$(shlibdir)
+@@ -154,8 +154,8 @@
+ 	$(pcedit) $< > $@
+ 
+ install-pkgconfig: $(.OBJDIR)/dvdread.pc
+-	install -d $(DESTDIR)$(libdir)/pkgconfig
+-	install -m 0644 $(.OBJDIR)/dvdread.pc $(DESTDIR)$(libdir)/pkgconfig
++	install -d $(DESTDIR)$(libdatadir)
++	install -m 0644 $(.OBJDIR)/dvdread.pc $(DESTDIR)$(libdatadir)
+ 
+ vpath %.so ${.OBJDIR}
+ vpath %.o ${.OBJDIR}
diff --git a/multimedia/libdvdread/files/patch-configure2 b/multimedia/libdvdread/files/patch-configure2
new file mode 100644
index 00000000000..bb606b9a5eb
--- /dev/null
+++ b/multimedia/libdvdread/files/patch-configure2
@@ -0,0 +1,41 @@
+--- configure2.orig	2008-08-31 11:27:37.000000000 +0200
++++ configure2	2008-10-04 12:41:51.534005961 +0200
+@@ -26,6 +26,7 @@
+   echo "  --help                   print this message"
+   echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
+   echo "  --libdir=DIR             install libs in DIR [PREFIX/lib]"
++  echo "  --libdatadir=DIR         install pkgconfig files in DIR [PREFIX/lib/pkgconfig]"
+   echo "  --shlibdir=DIR           install shared libs in DIR [PREFIX/lib]"
+   echo "  --incdir=DIR             install includes in DIR [PREFIX/include/libdvdread]"
+   echo "  --enable-static          build static libraries [default=yes]"
+@@ -67,6 +68,8 @@
+   ;;
+   --libdir=*) libdir="$optval"
+   ;;
++  --libdatadir=*) libdatadir="$optval"
++  ;;
+   --shlibdir=*) shlibdir="$optval"
+   ;;
+   --incdir=*) incdir="$optval"
+@@ -95,8 +98,9 @@
+ PREFIX=`cd $PREFIX && pwd`
+ 
+ test -z "$libdir" && libdir=$PREFIX/lib
++test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig
+ test -z "$shlibdir" && shlibdir=$PREFIX/lib
+-test -z "$incdir" && dvdread_incdir=$PREFIX/include/dvdread
++test -z "$incdir" && incdir=$PREFIX/include/dvdread
+ 
+ targetos=`uname -s`
+ case $targetos in
+@@ -112,9 +116,9 @@
+ # Automatically generated by configure, do not edit
+ PREFIX=$PREFIX
+ libdir=$libdir
++libdatadir=$libdatadir
+ shlibdir=$shlibdir
+ incdir=$incdir
+-dvdread_incdir=$dvdread_incdir
+ BUILD_SHARED=$SHARED
+ BUILD_STATIC=$STATIC
+ SHLIB_VERSION=$dvdread_sh_version
diff --git a/multimedia/libdvdread/pkg-descr b/multimedia/libdvdread/pkg-descr
index 150295c80db..73689c5f205 100644
--- a/multimedia/libdvdread/pkg-descr
+++ b/multimedia/libdvdread/pkg-descr
@@ -1,3 +1,3 @@
-This is needed by ogle, which is a DVD player that supports DVD menus
+Mplayer version of the libdvdread project.
 
-WWW: http://www.dtek.chalmers.se/groups/dvd/
+WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav
diff --git a/multimedia/libdvdread/pkg-plist b/multimedia/libdvdread/pkg-plist
index bb71aaf1b28..7097f9dfd80 100644
--- a/multimedia/libdvdread/pkg-plist
+++ b/multimedia/libdvdread/pkg-plist
@@ -1,19 +1,16 @@
+bin/dvdread-config
 include/dvdread/dvd_reader.h
-include/dvdread/ifo_types.h
-include/dvdread/ifo_read.h
 include/dvdread/ifo_print.h
-include/dvdread/nav_types.h
-include/dvdread/nav_read.h
+include/dvdread/ifo_read.h
+include/dvdread/ifo_types.h
 include/dvdread/nav_print.h
-include/dvdread/cmd_print.h
-lib/libdvdread.so.5
+include/dvdread/nav_read.h
+include/dvdread/dvd_udf.h
+include/dvdread/nav_types.h
+include/dvdread/bitreader.h
+@dirrm include/dvdread
+lib/libdvdread.so.4.1.3
+lib/libdvdread.so.4
 lib/libdvdread.so
-lib/libdvdread.la
 lib/libdvdread.a
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/dvdread
+libdata/pkgconfig/dvdread.pc
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 7965885d15c..8be9d48edd8 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	1.1.15
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia ipv6
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	lib
@@ -21,7 +21,7 @@ LIB_DEPENDS=	FLAC.10:${PORTSDIR}/audio/flac \
 		speex.1:${PORTSDIR}/audio/speex \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		png.5:${PORTSDIR}/graphics/png \
-		dvdread.5:${PORTSDIR}/multimedia/libdvdread \
+		dvdread.4:${PORTSDIR}/multimedia/libdvdread \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		fame-0.9.1:${PORTSDIR}/multimedia/libfame \
 		cdio.8:${PORTSDIR}/sysutils/libcdio \
diff --git a/multimedia/lsdvd/Makefile b/multimedia/lsdvd/Makefile
index 8443b4290e3..57664eff781 100644
--- a/multimedia/lsdvd/Makefile
+++ b/multimedia/lsdvd/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	lsdvd
 PORTVERSION=	0.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Print information about the contents and structure of a DVD
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/multimedia/lxdvdrip/Makefile b/multimedia/lxdvdrip/Makefile
index 9abc83d78fa..693306d7452 100644
--- a/multimedia/lxdvdrip/Makefile
+++ b/multimedia/lxdvdrip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	lxdvdrip
 PORTVERSION=	1.62
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	multimedia
 MASTER_SITES=	http://download.berlios.de/lxdvdrip/ \
 		ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
@@ -17,7 +17,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Command Line Tool to make a copy from a Video DVD
 
 LIB_DEPENDS=	dvdnav.4:${PORTSDIR}/multimedia/libdvdnav \
-		dvdread.5:${PORTSDIR}/multimedia/libdvdread
+		dvdread.4:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	buffer:${PORTSDIR}/misc/buffer \
 		dvdauthor:${PORTSDIR}/multimedia/dvdauthor \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
diff --git a/multimedia/mmpython/Makefile b/multimedia/mmpython/Makefile
index 3d517e4ce1d..59643d8d2e2 100644
--- a/multimedia/mmpython/Makefile
+++ b/multimedia/mmpython/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mmpython
 PORTVERSION=	0.4.10
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia python
 MASTER_SITES=	SF
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,7 +15,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Retrieves metadata from mp3, ogg, avi, jpg and other formats
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	lsdvd:${PORTSDIR}/multimedia/lsdvd
 
 USE_PYTHON=	yes
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 89aa71c4621..43a5c486e3d 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mplayerxp
 PORTVERSION=	0.6.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	multimedia audio
 MASTER_SITES=	SF
 
@@ -115,7 +115,7 @@ CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
 # dvd support
 .if defined(WITH_DVD)
-LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 CONFIGURE_ARGS+=	--with-csslibdir=${LOCALBASE}/lib
 PLIST_SUB+=	DVD=''
diff --git a/multimedia/nmm/Makefile b/multimedia/nmm/Makefile
index bfc8cc549ac..09bcba2c687 100644
--- a/multimedia/nmm/Makefile
+++ b/multimedia/nmm/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	nmm
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.motama.com/download/
 
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index 67e9fda2f22..c8629e244c7 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogle
 PORTVERSION=	0.9.2
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.dtek.chalmers.se/groups/dvd/dist/
 
@@ -15,7 +15,7 @@ MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	Open DVD player that supports DVD menus
 
 LIB_DEPENDS=	a52.0:${PORTSDIR}/audio/liba52 \
-		dvdread.5:${PORTSDIR}/multimedia/libdvdread \
+		dvdread.4:${PORTSDIR}/multimedia/libdvdread \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mad.2:${PORTSDIR}/audio/libmad \
 		xml2.5:${PORTSDIR}/textproc/libxml2
diff --git a/multimedia/ogle/files/patch-vmg-ifo_dump.c b/multimedia/ogle/files/patch-vmg-ifo_dump.c
new file mode 100644
index 00000000000..549e502a5e0
--- /dev/null
+++ b/multimedia/ogle/files/patch-vmg-ifo_dump.c
@@ -0,0 +1,140 @@
+--- vmg/ifo_dump.c.orig	2003-06-25 18:12:43.000000000 +0200
++++ vmg/ifo_dump.c	2009-02-04 08:20:52.000000000 +0100
+@@ -50,134 +50,12 @@
+ 
+ 
+ static void print_ifo(char *path, int title) {
+-  dvd_reader_t *dvd;
+-  ifo_handle_t *h;
+-  
+-  dvd = DVDOpen(path);
++  dvd_reader_t *dvd = DVDOpen(path);
++
+   if(!dvd) {
+     fprintf(stderr, "Can't open disc %s!\n", path);
+     return;
+   }
+ 
+-  if((h = ifoOpen(dvd, title)) == NULL)
+-    return;
+-    
+-  if(h->vmgi_mat != NULL) {
+-    
+-    printf("VMG top level\n-------------\n");
+-    ifoPrint_VMGI_MAT(h->vmgi_mat);
+-      
+-    printf("\nFirst Play PGC\n--------------\n");
+-    ifoPrint_PGC(h->first_play_pgc);
+-      
+-    printf("\nTitle Track search pointer table\n");
+-    printf(  "------------------------------------------------\n");
+-    ifoPrint_TT_SRPT(h->tt_srpt);
+-      
+-    printf("\nMenu PGCI Unit table\n");
+-    printf(  "--------------------\n");
+-    if(h->vmgi_mat->vmgm_pgci_ut != 0) {
+-      ifoPrint_PGCI_UT(h->pgci_ut);
+-    } else 
+-      printf("No Menu PGCI Unit table present\n");
+-      
+-    printf("\nParental Manegment Information table\n");
+-    printf(  "------------------------------------\n");
+-    if(h->vmgi_mat->ptl_mait != 0) {
+-      ifoPrint_PTL_MAIT(h->ptl_mait);
+-    } else
+-      printf("No Parental Management Information present\n");
+-      
+-    printf("\nVideo Title Set Attribute Table\n");
+-    printf(  "-------------------------------\n");
+-    ifoPrint_VTS_ATRT(h->vts_atrt);
+-
+-      
+-    printf("\nText Data Manager Information\n");
+-    printf(  "-----------------------------\n");
+-    if(h->vmgi_mat->txtdt_mgi != 0) {
+-      //ifoPrint_TXTDT_MGI(h->txtdt_mgi);
+-      printf("Can't print Text Data Manager Information yet\n");
+-    } else
+-      printf("No Text Data Manager Information present\n");
+-      
+-    if(1) {
+-      
+-      printf("\nCell Address table\n");
+-      printf(  "-----------------\n");
+-      if(h->vmgi_mat->vmgm_c_adt != 0) {
+-	ifoPrint_C_ADT(h->menu_c_adt);
+-      } else
+-	printf("No Cell Address table present\n");
+-      
+-      printf("\nVideo Title set Menu VOBU address map\n");
+-      printf(  "-----------------\n");
+-      if(h->vmgi_mat->vmgm_vobu_admap != 0) {
+-	ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
+-      } else
+-	printf("No Menu VOBU address map present\n");
+-    }
+-  }
+-
+-  if(h->vtsi_mat != NULL) {
+-      
+-    printf("VTS top level\n-------------\n");
+-    ifoPrint_VTSI_MAT(h->vtsi_mat);
+-      
+-    printf("\nPart of title search pointer table information\n");
+-    printf(  "----------------------------------------------\n");
+-    ifoPrint_VTS_PTT_SRPT(h->vts_ptt_srpt);
+-       
+-    printf("\nPGCI Unit table\n");
+-    printf(  "--------------------\n");
+-    ifoPrint_PGCIT(h->vts_pgcit);
+-      
+-    printf("\nMenu PGCI Unit table\n");
+-    printf(  "--------------------\n");
+-    if(h->vtsi_mat->vtsm_pgci_ut != 0) {
+-      ifoPrint_PGCI_UT(h->pgci_ut);
+-    } else
+-      printf("No Menu PGCI Unit table present\n");
+-      
+-    if(1) {
+-      
+-      printf("\nTime Map table\n");
+-      printf(  "-----------------\n");
+-      if(h->vtsi_mat->vts_tmapt != 0) {
+-	ifoPrint_VTS_TMAPT(h->vts_tmapt);
+-      } else
+-	printf("No Time Map table present\n");
+-      
+-      printf("\nMenu Cell Address table\n");
+-      printf(  "-----------------\n");
+-      if(h->vtsi_mat->vtsm_c_adt != 0) {
+-	ifoPrint_C_ADT(h->menu_c_adt);
+-      } else
+-	printf("No Cell Address table present\n");
+-      
+-      printf("\nVideo Title Set Menu VOBU address map\n");
+-      printf(  "-----------------\n");
+-      if(h->vtsi_mat->vtsm_vobu_admap != 0) {
+-	ifoPrint_VOBU_ADMAP(h->menu_vobu_admap);
+-      } else
+-	printf("No Menu VOBU address map present\n");
+-      
+-      printf("\nCell Address table\n");
+-      printf(  "-----------------\n");
+-      ifoPrint_C_ADT(h->vts_c_adt);
+-      
+-      printf("\nVideo Title Set VOBU address map\n");
+-      printf(  "-----------------\n");
+-      ifoPrint_VOBU_ADMAP(h->vts_vobu_admap);
+-      
+-    }
+-  }
+-
+-
+-  /* Vob */
+-  
++  ifo_print(dvd, title);
+ }
+-
+-
+-
+-
diff --git a/multimedia/ogmrip/Makefile b/multimedia/ogmrip/Makefile
index 620b1cf8cbd..2436e735172 100644
--- a/multimedia/ogmrip/Makefile
+++ b/multimedia/ogmrip/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	ogmrip
 PORTVERSION=	0.12.2
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF
 
@@ -16,7 +17,7 @@ COMMENT=	Application and libraries for encoding DVDs into DivX/OGM files
 BUILD_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mencoder \
 		gsed:${PORTSDIR}/textproc/gsed
 LIB_DEPENDS=	enca.5:${PORTSDIR}/converters/enca \
-		dvdread.5:${PORTSDIR}/multimedia/libdvdread
+		dvdread.4:${PORTSDIR}/multimedia/libdvdread
 RUN_DEPENDS=	lame:${PORTSDIR}/audio/lame \
 		oggenc:${PORTSDIR}/audio/vorbis-tools \
 		mencoder:${PORTSDIR}/multimedia/mencoder \
diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile
index 2a15c0ccc22..daaa95c191b 100644
--- a/multimedia/ogmtools/Makefile
+++ b/multimedia/ogmtools/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ogmtools
 PORTVERSION=	1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www.bunkus.org/videotools/ogmtools/
 
@@ -52,7 +52,7 @@ WITH_DVDREAD=yes
 .endif
 
 .ifdef(WITH_DVDREAD)
-LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 CONFIGURE_ARGS+=	--with-dvdread \
 			--with-dvdread-includes=${LOCALBASE} \
diff --git a/multimedia/streamanalyze/Makefile b/multimedia/streamanalyze/Makefile
index 24cecbd173d..dab411aacfa 100644
--- a/multimedia/streamanalyze/Makefile
+++ b/multimedia/streamanalyze/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	streamanalyze
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	CENKES LOCAL/beech
 
 MAINTAINER=	h.eichmann@gmx.de
 COMMENT=	Shrink-factor calculator for StreamDVD
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 WRKSRC=		${WRKDIR}/StreamAnalyze
 
diff --git a/multimedia/streamdvd/Makefile b/multimedia/streamdvd/Makefile
index dd5f014cdb9..242ea84627b 100644
--- a/multimedia/streamdvd/Makefile
+++ b/multimedia/streamdvd/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	streamdvd
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://quenix2.dyndns.org/FreeBSD/ports/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A fast tool to backup Video DVDs 'on the fly'
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 WRKSRC=		${WRKDIR}/StreamDVD-${PORTVERSION}
 
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index ab668646f30..7520bf6dd3f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	transcode
 PORTVERSION=	1.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://transcode.kabewm.com/ \
 		http://fromani.exit1.org/
@@ -15,7 +15,7 @@ MASTER_SITES=	http://transcode.kabewm.com/ \
 MAINTAINER=	multimedia@FreeBSD.org
 COMMENT=	A text-console utility for video stream processing
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread \
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
diff --git a/multimedia/vamps/Makefile b/multimedia/vamps/Makefile
index a0f4c1ad3fa..9961834e09e 100644
--- a/multimedia/vamps/Makefile
+++ b/multimedia/vamps/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vamps
 PORTVERSION=	0.99.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	vamps
@@ -15,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.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 USE_GMAKE=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 5d562e0e036..7241804b564 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	vlc
 DISTVERSION=	0.9.8a
+PORTREVISION=	1
 PORTEPOCH=	3
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ \
@@ -269,7 +270,7 @@ CONFIGURE_ARGS+=--disable-dvdnav
 .endif
 
 .if defined(WITH_DVDREAD) && !defined(WITHOUT_DVDREAD)
-LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 CONFIGURE_ARGS+=--enable-dvdread
 .else
 CONFIGURE_ARGS+=--disable-dvdread
diff --git a/net/wizd/Makefile b/net/wizd/Makefile
index 6e8f6d4e679..ca64500324e 100644
--- a/net/wizd/Makefile
+++ b/net/wizd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	wizd
 PORTVERSION=	24
+PORTREVISION=	1
 CATEGORIES=	net multimedia
 MASTER_SITES=	SF
 DISTFILES=	wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip
diff --git a/sysutils/dvdbackup/Makefile b/sysutils/dvdbackup/Makefile
index 46a35c3f474..cecca9c756a 100644
--- a/sysutils/dvdbackup/Makefile
+++ b/sysutils/dvdbackup/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	dvdbackup
 PORTVERSION=	0.1.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dvd-create.sourceforge.net/ GENTOO/distfiles
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Backup content from DVD to hard disk
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PLIST_FILES=	bin/dvdbackup
diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 3ef9b589e16..892caf90d6f 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF
 
@@ -99,7 +100,7 @@ CONFIGURE_ARGS+=	--without-musepack
 
 .if defined(WITH_LIBDVDREAD)
 PLIST_SUB+=	LIBDVDREAD=""
-LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 .else
 PLIST_SUB+=	LIBDVDREAD="@comment "
 CONFIGURE_ARGS+=	--without-libdvdread
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 3ef9b589e16..892caf90d6f 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	k3b
 PORTVERSION=	1.0.5
+PORTREVISION=	1
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	SF
 
@@ -99,7 +100,7 @@ CONFIGURE_ARGS+=	--without-musepack
 
 .if defined(WITH_LIBDVDREAD)
 PLIST_SUB+=	LIBDVDREAD=""
-LIB_DEPENDS+=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS+=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 .else
 PLIST_SUB+=	LIBDVDREAD="@comment "
 CONFIGURE_ARGS+=	--without-libdvdread
diff --git a/sysutils/vobcopy/Makefile b/sysutils/vobcopy/Makefile
index f93bf57e663..2dd4e96b836 100644
--- a/sysutils/vobcopy/Makefile
+++ b/sysutils/vobcopy/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vobcopy
 PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://vobcopy.org/download/ \
 		CRITICAL
@@ -15,7 +15,7 @@ MASTER_SITES=	http://vobcopy.org/download/ \
 MAINTAINER=	jpaetzel@FreeBSD.org
 COMMENT=	Decrypts and copies DVD .vob files
 
-LIB_DEPENDS=	dvdread.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
diff --git a/sysutils/vstrip/Makefile b/sysutils/vstrip/Makefile
index d29a41896ae..48c82b72ffd 100644
--- a/sysutils/vstrip/Makefile
+++ b/sysutils/vstrip/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	vstrip
 DISTVERSION=	0.8f
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://files.digital-digest.com/downloads/files/encode/
 DISTNAME=	vStrip_${DISTVERSION:C/\.//g}
@@ -15,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.5:${PORTSDIR}/multimedia/libdvdread
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
 
 USE_ZIP=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"