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>

6 files changed, 111 insertions, 61 deletions

diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 09b3c7d3eae6..7952bfccb387 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 4f6f7251063a..216293707455 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 000000000000..6e58e3ea76d5
--- /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 000000000000..bb606b9a5eb6
--- /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 150295c80db3..73689c5f2050 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 bb71aaf1b283..7097f9dfd80e 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