Remove libdvdnav-mplayer in favour of multimedia/libdvdnav

PR:		ports/131969
Submitted by:	Ganael LAPLANCHE <ganael.laplanche at martymac.com>

8 files changed, 1 insertions, 121 deletions

diff --git a/MOVED b/MOVED
index a3b0cf66662d..0ceaac329ecd 100644
--- a/MOVED
+++ b/MOVED
@@ -4515,3 +4515,4 @@ comms/spandsp-devel5||2010-08-31|Older than stable port and unmaintained
 french/pluxml-devel||2010-08-31|Stable was removed 2 years ago, doesn't make sense to keep -devel
 graphics/lphoto||2010-08-31|Has expired: broken
 mail/ngmp||2010-08-31|Has expired: does not compile and no longer supported by upstream
+multimedia/libdvdnav-mplayer||2010-09-02|Removed in favour of updated multimedia/libdvdnav
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 879e35ed4984..56fe174d9ce1 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -146,7 +146,6 @@
     SUBDIR += libdvbpsi
     SUBDIR += libdvdcss
     SUBDIR += libdvdnav
-    SUBDIR += libdvdnav-mplayer
     SUBDIR += libdvdplay
     SUBDIR += libdvdread
     SUBDIR += libfame
diff --git a/multimedia/libdvdnav-mplayer/Makefile b/multimedia/libdvdnav-mplayer/Makefile
deleted file mode 100644
index 62776a4b9c36..000000000000
--- a/multimedia/libdvdnav-mplayer/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for: libdvdnav-mplayer
-# Date created:                      11 August 2008
-# Whom:                              Ganael Laplanche <ganael.laplanche@martymac.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	libdvdnav-mplayer
-PORTVERSION=	4.1.3
-CATEGORIES=	multimedia
-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-[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
-
-.include <bsd.port.mk>
diff --git a/multimedia/libdvdnav-mplayer/distinfo b/multimedia/libdvdnav-mplayer/distinfo
deleted file mode 100644
index 9ae3a482c4a9..000000000000
--- a/multimedia/libdvdnav-mplayer/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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-mplayer/files/patch-Makefile b/multimedia/libdvdnav-mplayer/files/patch-Makefile
deleted file mode 100644
index 659395e4c0f7..000000000000
--- a/multimedia/libdvdnav-mplayer/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-mplayer/files/patch-configure2 b/multimedia/libdvdnav-mplayer/files/patch-configure2
deleted file mode 100644
index 425db7d73d30..000000000000
--- a/multimedia/libdvdnav-mplayer/files/patch-configure2
+++ /dev/null
@@ -1,35 +0,0 @@
---- 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-mplayer/pkg-descr b/multimedia/libdvdnav-mplayer/pkg-descr
deleted file mode 100644
index 34c2ba95c64e..000000000000
--- a/multimedia/libdvdnav-mplayer/pkg-descr
+++ /dev/null
@@ -1,3 +0,0 @@
-Mplayer version of the libdvdnav project.
-
-WWW: http://www.mplayerhq.hu/MPlayer/releases/dvdnav
diff --git a/multimedia/libdvdnav-mplayer/pkg-plist b/multimedia/libdvdnav-mplayer/pkg-plist
deleted file mode 100644
index 7af27e3bd5b4..000000000000
--- a/multimedia/libdvdnav-mplayer/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-bin/dvdnav-config
-include/dvdnav/dvd_types.h
-include/dvdnav/dvdnav.h
-include/dvdnav/dvdnav_events.h
-@dirrm include/dvdnav
-lib/libdvdnav.so.4.1.3
-lib/libdvdnav.so.4
-lib/libdvdnav.so
-lib/libdvdnav.a
-lib/libdvdnavmini.so.4.1.3
-lib/libdvdnavmini.so.4
-lib/libdvdnavmini.so
-libdata/pkgconfig/dvdnav.pc
-libdata/pkgconfig/dvdnavmini.pc