Update multimedia/libdvdread and multimedia/libdvdnav

- Update multimedia/libdvdread to version 5.0.1
- Update multimedia/libdvdnav to version 5.0.2
- Bump revisions of ports that depend on multimedia/libdvdnav
  (library version is going backwards from 4.2.1 to 4.1.2)
- Ports depending on multimedia/libdvdread do not need to be bumped
  (the library keeps being numbered 4.1.2 and is binary compatible with the
  previous version)

6 files changed, 10 insertions, 150 deletions

diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 8ba96329e604..decb4a120936 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	libdvdnav
-PORTVERSION=	4.2.1
-PORTREVISION=	2
+PORTVERSION=	5.0.2
 CATEGORIES=	multimedia
-# Svn repository URL : svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
-MASTER_SITES=	http://dvdnav.mplayerhq.hu/releases/ \
+MASTER_SITES=	http://download.videolan.org/pub/videolan/libdvdnav/${PORTVERSION}/ \
+		http://dvdnav.mplayerhq.hu/releases/ \
 		http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
 
@@ -17,25 +16,11 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
 
-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 \
-		--cc="${CC}"
-USES=	tar:xz gmake pkgconfig:build
-CONFLICTS=	libdvdnav-mplayer-[0-9]*
+GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		tar:bz2 gmake libtool pathfix pkgconfig
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DEBUG
-DEBUG_CONFIGURE_ON=	--enable-debug --disable-strip
-DEBUG_CONFIGURE_OFF=	--disable-debug --enable-strip
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|^threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \
-		${WRKSRC}/configure2
+PORTDOCS=	AUTHORS COPYING ChangeLog README TODO
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index e53d0992d2cd..d90b4f72cf34 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdvdnav-4.2.1.tar.xz) = 7fca272ecc3241b6de41bbbf7ac9a303ba25cb9e0c82aa23901d3104887f2372
-SIZE (libdvdnav-4.2.1.tar.xz) = 109856
+SHA256 (libdvdnav-5.0.2.tar.bz2) = 14dc140b81c3a23b6bfbd73ba54cc866da84d57030da61b172a2e76338d50696
+SIZE (libdvdnav-5.0.2.tar.bz2) = 371826
diff --git a/multimedia/libdvdnav/files/patch-Makefile b/multimedia/libdvdnav/files/patch-Makefile
deleted file mode 100644
index 659395e4c0f7..000000000000
--- a/multimedia/libdvdnav/files/patch-Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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
deleted file mode 100644
index 3254537e2abe..000000000000
--- a/multimedia/libdvdnav/files/patch-configure2
+++ /dev/null
@@ -1,75 +0,0 @@
---- configure2.orig	2014-05-05 07:23:08.000000000 +0200
-+++ configure2	2014-05-05 07:23:19.000000000 +0200
-@@ -27,6 +27,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]"
-@@ -76,6 +77,8 @@
-   ;;
-   --libdir=*) libdir="$optval"
-   ;;
-+  --libdatadir=*) libdatadir="$optval"
-+  ;;
-   --shlibdir=*) shlibdir="$optval"
-   ;;
-   --incdir=*) incdir="$optval"
-@@ -101,9 +104,10 @@
-   esac
- done
- 
--PREFIX=`cd $PREFIX && pwd`
-+#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
- 
-@@ -113,10 +117,6 @@
-   $DVDREAD_CONFIG --exists >> /dev/null 2>&1 && dvdread=yes
- fi
- if test "$dvdread" != "yes" ; then
--  DVDREAD_CONFIG=dvdread-config
--  $DVDREAD_CONFIG --prefix >> /dev/null 2>&1 && dvdread=yes
--fi
--if test "$dvdread" != "yes" ; then
-   echo "$DVDREAD_CONFIG returned an error. Can't proceed"
-   exit 1
- fi
-@@ -133,10 +133,24 @@
-   ;;
- esac
- 
-+echo -n "Checking if we're big-endian... "
-+bigendian=no
-+TMPD=`mktemp -d temp.XXXX`
-+TMPC=$TMPD/endian.c
-+TMPO=$TMPD/endian.o
-+cat > $TMPC <<EOF
-+unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
-+EOF
-+$cc $optimizations $cflags -c -o $TMPO $TMPC
-+od -A n -t x1 $TMPO | grep -q '42 *49 *47 *45' && bigendian=yes
-+rm -rf $TMPD
-+echo "$bigendian"
-+
- cat > config.mak << EOF
- # Automatically generated by configure, do not edit
- PREFIX=$PREFIX
- libdir=$libdir
-+libdatadir=$libdatadir
- shlibdir=$shlibdir
- incdir=$incdir
- THREADLIB=$threadlib
-@@ -163,6 +177,7 @@
- /* Automatically generated by configure, do not edit */
- #include "version.h"
- EOF
-+test "$bigendian" = "yes" && echo "#define WORDS_BIGENDIAN" >> config.h || echo "#undef WORDS_BIGENDIAN" >> config.h
- 
- # build tree in object directory if source path is different from current one
- if test "$source_path_used" != "no"; then
diff --git a/multimedia/libdvdnav/files/patch-src-vm-vm.c b/multimedia/libdvdnav/files/patch-src-vm-vm.c
deleted file mode 100644
index 37fc1297fafb..000000000000
--- a/multimedia/libdvdnav/files/patch-src-vm-vm.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/vm/vm.c.orig	2014-01-30 07:10:55.000000000 +0100
-+++ src/vm/vm.c	2014-01-30 07:13:13.000000000 +0100
-@@ -179,7 +179,7 @@
-         if (off == ( (off_t) DVD_VIDEO_LB_LEN )) {
-           fprintf(MSG_OUT, "libdvdnav: DVD Title: ");
-           for(i=25; i < 73; i++ ) {
--            if((data[i] == 0)) break;
-+            if(data[i] == 0) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);
-             } else {
-@@ -190,7 +190,7 @@
-           name[48] = 0;
-           fprintf(MSG_OUT, "\nlibdvdnav: DVD Serial Number: ");
-           for(i=73; i < 89; i++ ) {
--            if((data[i] == 0)) break;
-+            if(data[i] == 0) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);
-             } else {
-@@ -201,7 +201,7 @@
-           serial[14] = 0;
-           fprintf(MSG_OUT, "\nlibdvdnav: DVD Title (Alternative): ");
-           for(i=89; i < 128; i++ ) {
--            if((data[i] == 0)) break;
-+            if(data[i] == 0) break;
-             if((data[i] > 32) && (data[i] < 127)) {
-               fprintf(MSG_OUT, "%c", data[i]);
-             } else {
diff --git a/multimedia/libdvdnav/pkg-plist b/multimedia/libdvdnav/pkg-plist
index f1c38949b1d6..0173771b1caf 100644
--- a/multimedia/libdvdnav/pkg-plist
+++ b/multimedia/libdvdnav/pkg-plist
@@ -1,13 +1,8 @@
-bin/dvdnav-config
 include/dvdnav/dvd_types.h
 include/dvdnav/dvdnav.h
 include/dvdnav/dvdnav_events.h
 lib/libdvdnav.a
 lib/libdvdnav.so
 lib/libdvdnav.so.4
-lib/libdvdnav.so.4.2.1
-lib/libdvdnavmini.so
-lib/libdvdnavmini.so.4
-lib/libdvdnavmini.so.4.2.1
+lib/libdvdnav.so.4.1.2
 libdata/pkgconfig/dvdnav.pc
-libdata/pkgconfig/dvdnavmini.pc