Update to 4.1.3 (switch over to MPlayer's version)

Pass maintainership to submitter

PR:		ports/131969
Sumbmitted by:	Ganael LAPLANCHE <ganael.laplanche at martymac.com>
Approved by:	nobutaka (timeout 18 months)

9 files changed, 96 insertions, 81 deletions

diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index fafe42e43763..53f3c8956877 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -6,38 +6,44 @@
 #
 
 PORTNAME=	libdvdnav
-PORTVERSION=	0.1.10
-PORTREVISION=	5
+PORTVERSION=	4.1.3
 CATEGORIES=	multimedia
-MASTER_SITES=	SF/dvd/${PORTNAME}/${PORTVERSION}
-
-MAINTAINER=	nobutaka@FreeBSD.org
-COMMENT=	The library for the xine-dvdnav plugin
-
+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/
+DISTNAME=	libdvdnav-${PORTVERSION}
+
+MAINTAINER=	ganael.laplanche@martymac.com
+COMMENT=	MPlayer version of the libdvdnav project
+
+LIB_DEPENDS=	dvdread.4:${PORTSDIR}/multimedia/libdvdread
+
+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/dvdnav" \
+		--disable-opts \
+		--disable-debug \
+		--extra-cflags="${CFLAGS}" \
+		--extra-ldflags="${LDFLAGS}"
+USE_GMAKE=	yes
 CONFLICTS=	libdvdnav-mplayer-[0-9]*
-
-CONFIGURE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		THREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--program-transform-name=''
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	libtool:22 autoconf:262 automake:16
-
-# Internal libdvdread staticly dlopens libdvdcss.so.2
-DVDCSS_LIBVERSION=	3
 
 post-patch:
-	${REINPLACE_CMD} -e \
-		's|THREAD_LIBS="[^"]*"$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
-		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
-		 s|-L/usr/local/lib|-L${LOCALBASE}/lib|g ; \
-		 s|-I/usr/local/include|-I${LOCALBASE}/include|g' \
-		 ${WRKSRC}/configure ${WRKSRC}/configure.ac \
-		 ${WRKSRC}/missing ${WRKSRC}/aclocal.m4 ${WRKSRC}/autogen.sh
-	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
-		${WRKSRC}/src/dvdread/dvd_input.c
-
-post-configure:
-	${REINPLACE_CMD} -e 's|automake[0-9][0-9]|${TRUE}|' \
-		`${FIND} ${WRKSRC} -type f -name Makefile`
+	@${REINPLACE_CMD} -e 's|-ldl ||g' \
+		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|^threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \
+		${WRKSRC}/configure2
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index 0988723d1a17..9ae3a482c4a9 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdvdnav-0.1.10.tar.gz) = c8ddee96ba1182d73447eaf0bb6fde81
-SHA256 (libdvdnav-0.1.10.tar.gz) = c2c6ee274cbd5759715a786b949df8ac3e848ffc771173c4f006b88c665346d0
-SIZE (libdvdnav-0.1.10.tar.gz) = 539803
+MD5 (libdvdnav-4.1.3.tar.bz2) = d62383c45b28816771e283515f2c27fa
+SHA256 (libdvdnav-4.1.3.tar.bz2) = e82a3d7b3c342a895a332fc0fb2281f40ff9978cb8cbb8bf1343fcad0063759d
+SIZE (libdvdnav-4.1.3.tar.bz2) = 110843
diff --git a/multimedia/libdvdnav/files/patch-Makefile b/multimedia/libdvdnav/files/patch-Makefile
new file mode 100644
index 000000000000..659395e4c0f7
--- /dev/null
+++ b/multimedia/libdvdnav/files/patch-Makefile
@@ -0,0 +1,16 @@
+--- Makefile.orig	2008-10-04 12:25:15.145677557 +0200
++++ Makefile	2008-10-04 12:36:23.806607647 +0200
+@@ -131,10 +131,9 @@
+ 	$(pcedit) $< > $@
+ 
+ install-pkgconfig: $(.OBJDIR)/dvdnav.pc $(.OBJDIR)/dvdnavmini.pc
+-	install -d $(DESTDIR)$(libdir)/pkgconfig
+-	install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdir)/pkgconfig
+-	install -m 0644 $(.OBJDIR)/dvdnavmini.pc \
+-	  $(DESTDIR)$(libdir)/pkgconfig
++	install -d $(DESTDIR)$(libdatadir)
++	install -m 0644 $(.OBJDIR)/dvdnav.pc $(DESTDIR)$(libdatadir)
++	install -m 0644 $(.OBJDIR)/dvdnavmini.pc $(DESTDIR)$(libdatadir)
+ 
+ distclean: clean
+ 	find . -name "*~" | xargs rm -rf
diff --git a/multimedia/libdvdnav/files/patch-configure2 b/multimedia/libdvdnav/files/patch-configure2
new file mode 100644
index 000000000000..425db7d73d30
--- /dev/null
+++ b/multimedia/libdvdnav/files/patch-configure2
@@ -0,0 +1,35 @@
+--- configure2.orig	2008-10-04 12:27:58.564694499 +0200
++++ configure2	2008-10-04 12:35:04.406225755 +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/dvdnav]"
+   echo "  --enable-static          build static libraries [default=yes]"
+@@ -72,6 +73,8 @@
+   ;;
+   --libdir=*) libdir="$optval"
+   ;;
++  --libdatadir=*) libdatadir="$optval"
++  ;;
+   --shlibdir=*) shlibdir="$optval"
+   ;;
+   --incdir=*) incdir="$optval"
+@@ -100,6 +103,7 @@
+ 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" && incdir=$PREFIX/include/dvdnav
+ 
+@@ -127,6 +131,7 @@
+ # Automatically generated by configure, do not edit
+ PREFIX=$PREFIX
+ libdir=$libdir
++libdatadir=$libdatadir
+ shlibdir=$shlibdir
+ incdir=$incdir
+ THREADLIB=$threadlib
diff --git a/multimedia/libdvdnav/files/patch-example:Makefile.in b/multimedia/libdvdnav/files/patch-example:Makefile.in
deleted file mode 100644
index b06d67ee61fe..000000000000
--- a/multimedia/libdvdnav/files/patch-example:Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/Makefile.in.orig	Tue May 20 23:20:12 2003
-+++ examples/Makefile.in	Thu Feb 12 20:44:41 2004
-@@ -151,7 +151,7 @@
- noinst_PROGRAMS = menus
- 
- menus_SOURCES = menus.c
--menus_LDFLAGS = -L$(top_srcdir)/src/
-+menus_LDFLAGS = -L$(top_srcdir)/src/ $(THREAD_LIBS)
- menus_LDADD = $(DVDNAV_LIB)
- subdir = examples
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff --git a/multimedia/libdvdnav/files/patch-m4:Makefile.in b/multimedia/libdvdnav/files/patch-m4:Makefile.in
deleted file mode 100644
index 905e1c7d80c9..000000000000
--- a/multimedia/libdvdnav/files/patch-m4:Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- m4/Makefile.in.orig	Sun Oct 23 11:18:31 2005
-+++ m4/Makefile.in	Sun Oct 23 11:19:02 2005
-@@ -116,8 +116,7 @@
- 
- EXTRA_DIST = dvdnav.m4
- 
--@INSTALL_M4_TRUE@m4datadir = @ACLOCAL_DIR@
--@INSTALL_M4_FALSE@m4datadir = $(datadir)/aclocal
-+m4datadir = $(datadir)/aclocal
- 
- m4data_DATA = dvdnav.m4
- subdir = m4
diff --git a/multimedia/libdvdnav/files/patch-src:vm.c b/multimedia/libdvdnav/files/patch-src:vm.c
deleted file mode 100644
index c538f0ef24cc..000000000000
--- a/multimedia/libdvdnav/files/patch-src:vm.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/vm/vm.c.orig	Fri Feb 20 00:49:57 2004
-+++ src/vm/vm.c	Fri Feb 20 00:54:31 2004
-@@ -47,6 +47,10 @@
- #define lseek64 lseek
- #endif /* _MSC_VER */
- 
-+#ifdef __FreeBSD__
-+#define lseek64 lseek
-+#endif
-+
- /*
- #define STRICT
- */
diff --git a/multimedia/libdvdnav/pkg-descr b/multimedia/libdvdnav/pkg-descr
index 1f3040c04e2d..34c2ba95c64e 100644
--- a/multimedia/libdvdnav/pkg-descr
+++ b/multimedia/libdvdnav/pkg-descr
@@ -1,6 +1,3 @@
-The library for the xine-dvdnav plugin.
+Mplayer version of the libdvdnav project.
 
-WWW: http://dvd.sourceforge.net/xine-dvdnav.shtml
-
---
-MANTANI Nobutaka <nobutaka@nobutaka.com>
+WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav
diff --git a/multimedia/libdvdnav/pkg-plist b/multimedia/libdvdnav/pkg-plist
index ffce020678ea..657d65d8aa18 100644
--- a/multimedia/libdvdnav/pkg-plist
+++ b/multimedia/libdvdnav/pkg-plist
@@ -1,17 +1,14 @@
 bin/dvdnav-config
-include/dvdnav/dvd_reader.h
 include/dvdnav/dvd_types.h
 include/dvdnav/dvdnav.h
 include/dvdnav/dvdnav_events.h
-include/dvdnav/ifo_print.h
-include/dvdnav/ifo_read.h
-include/dvdnav/ifo_types.h
-include/dvdnav/nav_print.h
-include/dvdnav/nav_read.h
-include/dvdnav/nav_types.h
 lib/libdvdnav.a
-lib/libdvdnav.la
 lib/libdvdnav.so
 lib/libdvdnav.so.4
-share/aclocal/dvdnav.m4
+lib/libdvdnav.so.4.1.3
+lib/libdvdnavmini.so
+lib/libdvdnavmini.so.4
+lib/libdvdnavmini.so.4.1.3
+libdata/pkgconfig/dvdnav.pc
+libdata/pkgconfig/dvdnavmini.pc
 @dirrm include/dvdnav