- Update libdvdread and libdvdnav to 4.2.0 and bump dependent ports' revisions

- libdvdread: allow package building with libdvdcss if WITH_DVDCSS is set [1]
- libdvdread/libdvdnav: fix endianness handling [2]

Submitted by: olgeni [1], richo <richo@psych0tik.net> [2] (via mail to ports@)
PR: ports/162197 [1]

6 files changed, 48 insertions, 23 deletions

diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 7c5a86a87aa3..7c521d281b29 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -6,26 +6,16 @@
 #
 
 PORTNAME=	libdvdread
-PORTVERSION=	4.1.4.r1219
+PORTVERSION=	4.2.0
 CATEGORIES=	multimedia
 # Svn repository URL : svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
-MASTER_SITES=	http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
-		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/ \
+MASTER_SITES=	http://dvdnav.mplayerhq.hu/releases/ \
+		http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
 
 MAINTAINER=	martymac@FreeBSD.org
 COMMENT=	MPlayer version of the libdvdread project
 
-.if !defined(PACKAGE_BUILDING)
-LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
-.endif
-
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
@@ -42,13 +32,27 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
+.if defined(PACKAGE_BUILDING)
+DVDCSS_OPTION=	off
+.else
+DVDCSS_OPTION=	on
+.endif
+
+OPTIONS=	DVDCSS "Include libdvdcss support" ${DVDCSS_OPTION}
+
 # DVDCSS version hardcoded in src/dvd_input.c (dlopen'ed)
 DVDCSS_LIBVERSION=	3
 
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DVDCSS)
+LIB_DEPENDS+=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl ||g' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
 		${WRKSRC}/src/dvd_input.c
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 96e38ea9ec76..78f105ce015f 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdvdread-4.1.4.r1219.tar.bz2) = 25301ce340e2456e5b245e6eb5243d6460b500f9fba0ff00ac85235df9796b72
-SIZE (libdvdread-4.1.4.r1219.tar.bz2) = 96953
+SHA256 (libdvdread-4.2.0.tar.bz2) = 0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097
+SIZE (libdvdread-4.2.0.tar.bz2) = 97469
diff --git a/multimedia/libdvdread/files/patch-configure2 b/multimedia/libdvdread/files/patch-configure2
index 99b0f897f63c..5f7e5b291a18 100644
--- a/multimedia/libdvdread/files/patch-configure2
+++ b/multimedia/libdvdread/files/patch-configure2
@@ -1,5 +1,5 @@
---- configure2.orig	2010-09-06 11:36:58.000000000 +0000
-+++ configure2	2010-09-07 13:01:25.216794661 +0000
+--- configure2.orig	2011-10-07 22:20:59.000000000 +0200
++++ configure2	2011-12-09 12:01:14.948827944 +0100
 @@ -26,6 +26,7 @@
    echo "  --help                   print this message"
    echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
@@ -52,12 +52,17 @@
  BUILD_SHARED=$SHARED
  BUILD_STATIC=$STATIC
  SHLIB_VERSION=$dvdread_sh_version
-@@ -149,7 +153,7 @@
+@@ -149,7 +153,12 @@
  /* Automatically generated by configure, do not edit */
  #include "version.h"
  EOF
--test "$bigendian" == "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
-+test "$bigendian" = "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
+-test "$bigendian" = "yes" && echo "#define WORDS_BIGENDIAN" || echo "#undef WORDS_BIGENDIAN" >> config.h
++if test "$bigendian" = "yes"
++then
++    echo "#define WORDS_BIGENDIAN" >> config.h
++else
++    echo "#undef WORDS_BIGENDIAN" >> config.h
++fi
  
  # build tree in object directory if source path is different from current one
  if test "$source_path_used" != "no"; then
diff --git a/multimedia/libdvdread/files/patch-src.md5.c b/multimedia/libdvdread/files/patch-src.md5.c
new file mode 100644
index 000000000000..c150b237f2b2
--- /dev/null
+++ b/multimedia/libdvdread/files/patch-src.md5.c
@@ -0,0 +1,16 @@
+--- src/md5.c.orig	2011-12-09 11:27:02.423821748 +0100
++++ src/md5.c	2011-12-09 11:29:07.409821303 +0100
+@@ -28,12 +28,7 @@
+ #include "md5.h"
+ /* #include "unlocked-io.h" */
+ 
+-#ifdef _LIBC
+-# include <endian.h>
+-# if __BYTE_ORDER == __BIG_ENDIAN
+-#  define WORDS_BIGENDIAN 1
+-# endif
+-#endif
++#include "config.h"
+ 
+ #ifdef WORDS_BIGENDIAN
+ # define SWAP(n)                                                        \
diff --git a/multimedia/libdvdread/pkg-descr b/multimedia/libdvdread/pkg-descr
index 664d5e7d2538..aae4e1ee2826 100644
--- a/multimedia/libdvdread/pkg-descr
+++ b/multimedia/libdvdread/pkg-descr
@@ -1,3 +1,3 @@
 MPlayer version of the libdvdread project.
 
-WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav
+WWW: http://dvdnav.mplayerhq.hu
diff --git a/multimedia/libdvdread/pkg-plist b/multimedia/libdvdread/pkg-plist
index 59f35e158e09..dbf72553ea9c 100644
--- a/multimedia/libdvdread/pkg-plist
+++ b/multimedia/libdvdread/pkg-plist
@@ -11,6 +11,6 @@ include/dvdread/nav_types.h
 lib/libdvdread.a
 lib/libdvdread.so
 lib/libdvdread.so.4
-lib/libdvdread.so.4.1.4
+lib/libdvdread.so.4.2.0
 libdata/pkgconfig/dvdread.pc
 @dirrm include/dvdread