6 files changed, 12 insertions, 116 deletions

diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index d81c78d6ad93..ae742497e08c 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libdvdread
-PORTVERSION=	4.2.1
+PORTVERSION=	4.9.9
 CATEGORIES=	multimedia
-# Svn repository URL : svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread
 MASTER_SITES=	http://dvdnav.mplayerhq.hu/releases/ \
 		http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
 		LOCAL/martymac
@@ -14,33 +13,26 @@ COMMENT=	MPlayer version of the libdvdread project
 
 LICENSE=	GPLv2
 
-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 \
-		--cc="${CC}"
-USES=	tar:xz gmake
+GNU_CONFIGURE=	yes
+USES=	tar:xz gmake pkgconfig:build
 USE_LDCONFIG=	yes
 
-OPTIONS_DEFINE=	DVDCSS DEBUG
+OPTIONS_DEFINE=	DVDCSS
 .if !defined(PACKAGE_BUILDING)
 OPTIONS_DEFAULT=	DVDCSS
 .endif
-DEBUG_CONFIGURE_ON=	--enable-debug --disable-strip
-DEBUG_CONFIGURE_OFF=	--disable-debug --enable-strip
 DVDCSS_LIB_DEPENDS=	libdvdcss.so:${PORTSDIR}/multimedia/libdvdcss
 
 # DVDCSS version hardcoded in src/dvd_input.c (dlopen'ed)
 DVDCSS_LIBVERSION=	3
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-ldl ||g' \
-		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's|^pkgconfigdir =.*|pkgconfigdir = ${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -E -e 's|(libdvdcss.so)\.2|\1.${DVDCSS_LIBVERSION}|' \
 		${WRKSRC}/src/dvd_input.c
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libdvdread.so.5
+
 .include <bsd.port.mk>
diff --git a/multimedia/libdvdread/distinfo b/multimedia/libdvdread/distinfo
index 3b0ec88f4054..e0abd393af61 100644
--- a/multimedia/libdvdread/distinfo
+++ b/multimedia/libdvdread/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdvdread-4.2.1.tar.xz) = af9b98f049580a6521d56c978b736d3d609562dd12955e11d50e26d97542dcd4
-SIZE (libdvdread-4.2.1.tar.xz) = 96108
+SHA256 (libdvdread-4.9.9.tar.xz) = d91275471ef69d488b05cf15c60e1cd65e17648bfc692b405787419f47ca424a
+SIZE (libdvdread-4.9.9.tar.xz) = 322964
diff --git a/multimedia/libdvdread/files/patch-Makefile b/multimedia/libdvdread/files/patch-Makefile
deleted file mode 100644
index 6e58e3ea76d5..000000000000
--- a/multimedia/libdvdread/files/patch-Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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
deleted file mode 100644
index 839a11bbbf07..000000000000
--- a/multimedia/libdvdread/files/patch-configure2
+++ /dev/null
@@ -1,54 +0,0 @@
---- configure2.orig	2013-11-12 00:59:39.000000000 +0100
-+++ configure2	2014-01-29 18:09:55.000000000 +0100
-@@ -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"
-@@ -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
- 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
-@@ -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
-@@ -137,9 +141,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/files/patch-src.md5.c b/multimedia/libdvdread/files/patch-src.md5.c
deleted file mode 100644
index c150b237f2b2..000000000000
--- a/multimedia/libdvdread/files/patch-src.md5.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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-plist b/multimedia/libdvdread/pkg-plist
index 431ede7f8fbf..39641f6f744c 100644
--- a/multimedia/libdvdread/pkg-plist
+++ b/multimedia/libdvdread/pkg-plist
@@ -1,4 +1,3 @@
-bin/dvdread-config
 include/dvdread/bitreader.h
 include/dvdread/dvd_reader.h
 include/dvdread/dvd_udf.h
@@ -10,7 +9,6 @@ include/dvdread/nav_read.h
 include/dvdread/nav_types.h
 lib/libdvdread.a
 lib/libdvdread.so
-lib/libdvdread.so.4
-lib/libdvdread.so.4.2.1
+lib/libdvdread.so.5
 libdata/pkgconfig/dvdread.pc
 @dirrm include/dvdread