Update to 4.1.4.r1217

PR:		ports/150450
Submitted by:	Ganael Laplanche (maintainer)

8 files changed, 65 insertions, 42 deletions

diff --git a/multimedia/libdvdnav/Makefile b/multimedia/libdvdnav/Makefile
index 160047e273a..4c9449a3833 100644
--- a/multimedia/libdvdnav/Makefile
+++ b/multimedia/libdvdnav/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	libdvdnav
-PORTVERSION=	4.1.3
+PORTVERSION=	4.1.4.r1217
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+# Svn repository URL : svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav
+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/
-DISTNAME=	libdvdnav-${PORTVERSION}
+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		LOCAL/makc
+DISTNAME=	${PORTNAME}-${PORTVERSION:S,r,,}
 
 MAINTAINER=	ganael.laplanche@martymac.org
 COMMENT=	MPlayer version of the libdvdnav project
@@ -23,8 +26,6 @@ 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}" \
@@ -34,15 +35,12 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--incdir="${PREFIX}/include/dvdnav" \
 		--disable-opts \
 		--disable-debug \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}"
+		--cc=${CC}
 USE_GMAKE=	yes
 CONFLICTS=	libdvdnav-mplayer-[0-9]*
 USE_LDCONFIG=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl ||g' \
-		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|^threadlib="-lpthread"|threadlib="${PTHREAD_LIBS}"|g' \
 		${WRKSRC}/configure2
 
diff --git a/multimedia/libdvdnav/distinfo b/multimedia/libdvdnav/distinfo
index 9ae3a482c4a..19a741894ee 100644
--- a/multimedia/libdvdnav/distinfo
+++ b/multimedia/libdvdnav/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdvdnav-4.1.3.tar.bz2) = d62383c45b28816771e283515f2c27fa
-SHA256 (libdvdnav-4.1.3.tar.bz2) = e82a3d7b3c342a895a332fc0fb2281f40ff9978cb8cbb8bf1343fcad0063759d
-SIZE (libdvdnav-4.1.3.tar.bz2) = 110843
+MD5 (libdvdnav-4.1.4.1217.tar.bz2) = f28973e8f0cde1aab596141eecb8451d
+SHA256 (libdvdnav-4.1.4.1217.tar.bz2) = 3d8cf09d88c93d2abd343f020dc9a38d65cba6f77b8704206bf813db8a7159bb
+SIZE (libdvdnav-4.1.4.1217.tar.bz2) = 111089
diff --git a/multimedia/libdvdnav/files/patch-configure2 b/multimedia/libdvdnav/files/patch-configure2
index 425db7d73d3..ba3a3da1cb9 100644
--- a/multimedia/libdvdnav/files/patch-configure2
+++ b/multimedia/libdvdnav/files/patch-configure2
@@ -1,5 +1,5 @@
---- configure2.orig	2008-10-04 12:27:58.564694499 +0200
-+++ configure2	2008-10-04 12:35:04.406225755 +0200
+--- configure2.orig	2010-09-06 11:37:21.000000000 +0000
++++ configure2	2010-09-07 12:58:47.440053134 +0000
 @@ -26,6 +26,7 @@
    echo "  --help                   print this message"
    echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
@@ -17,8 +17,12 @@
    --shlibdir=*) shlibdir="$optval"
    ;;
    --incdir=*) incdir="$optval"
-@@ -100,6 +103,7 @@
- PREFIX=`cd $PREFIX && pwd`
+@@ -97,9 +100,10 @@
+   esac
+ done
+ 
+-PREFIX=`cd $PREFIX && pwd`
++#PREFIX=`cd $PREFIX && pwd`
  
  test -z "$libdir" && libdir=$PREFIX/lib
 +test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig
diff --git a/multimedia/libdvdnav/pkg-plist b/multimedia/libdvdnav/pkg-plist
index 657d65d8aa1..07376804933 100644
--- a/multimedia/libdvdnav/pkg-plist
+++ b/multimedia/libdvdnav/pkg-plist
@@ -5,10 +5,10 @@ include/dvdnav/dvdnav_events.h
 lib/libdvdnav.a
 lib/libdvdnav.so
 lib/libdvdnav.so.4
-lib/libdvdnav.so.4.1.3
+lib/libdvdnav.so.4.1.4
 lib/libdvdnavmini.so
 lib/libdvdnavmini.so.4
-lib/libdvdnavmini.so.4.1.3
+lib/libdvdnavmini.so.4.1.4
 libdata/pkgconfig/dvdnav.pc
 libdata/pkgconfig/dvdnavmini.pc
 @dirrm include/dvdnav
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index e428dc2a175..b4b400b5966 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	libdvdread
-PORTVERSION=	4.1.3
-PORTREVISION=	2
+PORTVERSION=	4.1.4.r1217
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+# 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/
+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/dvdnav/ \
+		LOCAL/makc
+DISTNAME=	${PORTNAME}-${PORTVERSION:S,r,,}
 
 MAINTAINER=	ganael.laplanche@martymac.org
 COMMENT=	MPlayer version of the libdvdread project
@@ -25,8 +28,6 @@ LIB_DEPENDS=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
 .endif
 
 USE_BZIP2=	yes
-CFLAGS+=	"-I${LOCALBASE}/include"
-LDFLAGS+=	"-L${LOCALBASE}/lib"
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure2
 CONFIGURE_ARGS=	--prefix="${PREFIX}" \
@@ -36,8 +37,7 @@ CONFIGURE_ARGS=	--prefix="${PREFIX}" \
 		--incdir="${PREFIX}/include/dvdread" \
 		--disable-opts \
 		--disable-debug \
-		--extra-cflags="${CFLAGS}" \
-		--extra-ldflags="${LDFLAGS}"
+		--cc=${CC}
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
@@ -49,6 +49,5 @@ post-patch:
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
 		${WRKSRC}/src/dvd_input.c
-	@${REINPLACE_CMD} -e 's|cc=gcc|cc=${CC}|' ${WRKSRC}/configure2
 
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 21629370745..703c30c9cd2 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,3 +1,3 @@
-MD5 (libdvdread-4.1.3.tar.bz2) = 6dc068d442c85a3cdd5ad3da75f6c6e8
-SHA256 (libdvdread-4.1.3.tar.bz2) = 07c39907beccd141adb710403c4704a1e1fe2f3f61d1e5a74fc5bcb7679819b4
-SIZE (libdvdread-4.1.3.tar.bz2) = 96899
+MD5 (libdvdread-4.1.4.1217.tar.bz2) = 07857c744ab30325b5eaa9c86324d725
+SHA256 (libdvdread-4.1.4.1217.tar.bz2) = 640b618f14892f43f74060286cf57c9824789e05f143cde36c95f722def2ac5a
+SIZE (libdvdread-4.1.4.1217.tar.bz2) = 96898
diff --git a/multimedia/libdvdread/files/patch-configure2 b/multimedia/libdvdread/files/patch-configure2
index bb606b9a5eb..99b0f897f63 100644
--- a/multimedia/libdvdread/files/patch-configure2
+++ b/multimedia/libdvdread/files/patch-configure2
@@ -1,5 +1,5 @@
---- configure2.orig	2008-08-31 11:27:37.000000000 +0200
-+++ configure2	2008-10-04 12:41:51.534005961 +0200
+--- configure2.orig	2010-09-06 11:36:58.000000000 +0000
++++ configure2	2010-09-07 13:01:25.216794661 +0000
 @@ -26,6 +26,7 @@
    echo "  --help                   print this message"
    echo "  --prefix=PREFIX          install in PREFIX [$PREFIX]"
@@ -17,8 +17,12 @@
    --shlibdir=*) shlibdir="$optval"
    ;;
    --incdir=*) incdir="$optval"
-@@ -95,8 +98,9 @@
- PREFIX=`cd $PREFIX && pwd`
+@@ -92,11 +95,12 @@
+   esac
+ done
+ 
+-PREFIX=`cd $PREFIX && pwd`
++#PREFIX=`cd $PREFIX && pwd`
  
  test -z "$libdir" && libdir=$PREFIX/lib
 +test -z "$libdatadir" && libdir=$PREFIX/lib/pkgconfig
@@ -28,7 +32,16 @@
  
  targetos=`uname -s`
  case $targetos in
-@@ -112,9 +116,9 @@
+@@ -110,7 +114,7 @@
+ 
+ echo -n "Checking if we're big-endian... "
+ bigendian=no
+-TMPD=`mktemp -d`
++TMPD=`mktemp -d temp.XXXX`
+ TMPC=$TMPD/endian.c
+ TMPO=$TMPD/endian.o
+ cat > $TMPC <<EOF
+@@ -125,9 +129,9 @@
  # Automatically generated by configure, do not edit
  PREFIX=$PREFIX
  libdir=$libdir
@@ -39,3 +52,12 @@
  BUILD_SHARED=$SHARED
  BUILD_STATIC=$STATIC
  SHLIB_VERSION=$dvdread_sh_version
+@@ -149,7 +153,7 @@
+ /* 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
+ 
+ # 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/pkg-plist b/multimedia/libdvdread/pkg-plist
index 7097f9dfd80..59f35e158e0 100644
--- a/multimedia/libdvdread/pkg-plist
+++ b/multimedia/libdvdread/pkg-plist
@@ -1,16 +1,16 @@
 bin/dvdread-config
+include/dvdread/bitreader.h
 include/dvdread/dvd_reader.h
+include/dvdread/dvd_udf.h
 include/dvdread/ifo_print.h
 include/dvdread/ifo_read.h
 include/dvdread/ifo_types.h
 include/dvdread/nav_print.h
 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.a
+lib/libdvdread.so
+lib/libdvdread.so.4
+lib/libdvdread.so.4.1.4
 libdata/pkgconfig/dvdread.pc
+@dirrm include/dvdread