Adapt to use the mplayer-share package.

5 files changed, 9 insertions, 183 deletions

diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index 3fa0b460e52..69edc7ee43a 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,22 +1,17 @@
-# $NetBSD: Makefile,v 1.24 2002/05/03 18:00:50 fredb Exp $
+# $NetBSD: Makefile,v 1.25 2002/05/25 07:56:02 veego Exp $
 
-.include "Makefile.common"
+.include "../../graphics/mplayer-share/Makefile.common"
 
 PKGNAME=	mplayer-${MPLAYER_PKG_VERSION}
 COMMENT=	Software only MPEG-1/2/4 video decoder
 
-MASTER_SITES+=	http://www2.mplayerhq.hu/MPlayer/releases/	\
-		ftp://ftp.mplayerhq.hu/MPlayer/releases/	\
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/
+DEPENDS+=	mplayer-share>=0.90rc4nb1:../../graphics/mplayer-share
+
+CONFIGURE_ARGS+=	--disable-mencoder
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mplayer ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/DOCS/mplayer.1 ${PREFIX}/man/man1
-	${INSTALL_DATA_DIR} ${PREFIX}/share/mplayer
-	${INSTALL_DATA} ${WRKSRC}/etc/codecs.conf ${PREFIX}/share/mplayer
-	${CP} -R ${WRKSRC}/DOCS ${PREFIX}/share/mplayer
 
-.include "../../audio/lame/buildlink.mk"
 .include "../../devel/SDL/buildlink.mk"
 .include "../../graphics/jpeg/buildlink.mk"
 .include "../../graphics/png/buildlink.mk"
diff --git a/graphics/mplayer/Makefile.common b/graphics/mplayer/Makefile.common
deleted file mode 100644
index e29ce28a829..00000000000
--- a/graphics/mplayer/Makefile.common
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: Makefile.common,v 1.12 2002/05/14 22:13:35 veego Exp $
-
-MPLAYER_DIST_VERSION=	0.90pre4
-MPLAYER_PKG_VERSION=	${MPLAYER_DIST_VERSION:S/pre/rc/}
-
-DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
-CATEGORIES?=		graphics
-MASTER_SITES=		http://www.mplayerhq.hu/MPlayer/releases/
-EXTRACT_SUFX=		.tar.bz2
-
-MAINTAINER?=		svs@ropnet.ru,zuntum@netbsd.org
-HOMEPAGE?=		http://www.mplayerhq.hu/
-
-PATCHDIR=		${.CURDIR}/../mplayer/patches
-ONLY_FOR_PLATFORM=	NetBSD-*-i386
-
-RESTRICTED?=		"unsure of the license"
-#	see http://www.mplayerhq.hu/DOCS/users_against_developers.html#binary
-NO_BIN_ON_CDROM=	${RESTRICTED}
-NO_BIN_ON_FTP=		${RESTRICTED}
-#	no source on the ftp server because of the css source code in it
-NO_SRC_ON_FTP=		${RESTRICTED}
-
-USE_X11=		YES
-USE_GMAKE=		YES
-HAS_CONFIGURE=		YES
-
-USE_PTHREAD=		native pth
-
-CONFIGURE_ARGS+=	--prefix="${PREFIX}"
-CONFIGURE_ARGS+=	--with-extraincdir="${BUILDLINK_DIR}/include"
-CONFIGURE_ARGS+=	--with-extralibdir="${LOCALBASE}/lib"
-CONFIGURE_ARGS+=	--with-win32libdir="${LOCALBASE}/lib/win32"
-#CONFIGURE_ARGS+=	--enable-dvdread
-CONFIGURE_ARGS+=	--disable-mpdvdkit
-
-# The configure script attempts to test-execute compiled programs in /tmp,
-# but that directory may be mounted as noexec; work this around by setting
-# TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
-
-.include "../../devel/binutils/buildlink.mk"
-.include "../../lang/gcc/Makefile.gcc"
diff --git a/graphics/mplayer/PLIST b/graphics/mplayer/PLIST
index 9b6b3d32356..e861cf21c74 100644
--- a/graphics/mplayer/PLIST
+++ b/graphics/mplayer/PLIST
@@ -1,113 +1,2 @@
-@comment $NetBSD: PLIST,v 1.6 2002/05/14 22:13:35 veego Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/05/25 07:56:02 veego Exp $
 bin/mplayer
-man/man1/mplayer.1
-share/mplayer/DOCS/DVB
-share/mplayer/DOCS/DXR3
-share/mplayer/DOCS/French/bugreports.html
-share/mplayer/DOCS/French/cd-dvd.html
-share/mplayer/DOCS/French/codecs.html
-share/mplayer/DOCS/French/documentation.html
-share/mplayer/DOCS/French/exemple.conf
-share/mplayer/DOCS/French/faq.html
-share/mplayer/DOCS/French/skin-fr.html
-share/mplayer/DOCS/French/sound.html
-share/mplayer/DOCS/French/video.html
-share/mplayer/DOCS/German/bugreports.html
-share/mplayer/DOCS/German/cd-dvd.html
-share/mplayer/DOCS/German/codecs.html
-share/mplayer/DOCS/German/documentation.html
-share/mplayer/DOCS/German/encoding.html
-share/mplayer/DOCS/German/faq.html
-share/mplayer/DOCS/German/formats.html
-share/mplayer/DOCS/German/gcc-2.96-3.0.html
-share/mplayer/DOCS/German/mencoder.1
-share/mplayer/DOCS/German/mplayer.1
-share/mplayer/DOCS/German/sound.html
-share/mplayer/DOCS/German/video.html
-share/mplayer/DOCS/Hungarian/bugreports.html
-share/mplayer/DOCS/Hungarian/cd-dvd.html
-share/mplayer/DOCS/Hungarian/codecs.html
-share/mplayer/DOCS/Hungarian/documentation.html
-share/mplayer/DOCS/Hungarian/encoding.html
-share/mplayer/DOCS/Hungarian/example.conf
-share/mplayer/DOCS/Hungarian/faq.html
-share/mplayer/DOCS/Hungarian/formats.html
-share/mplayer/DOCS/Hungarian/mplayer.1
-share/mplayer/DOCS/Hungarian/skin-hu.html
-share/mplayer/DOCS/Hungarian/sound.html
-share/mplayer/DOCS/Hungarian/video.html
-share/mplayer/DOCS/Italian/bugreports.html
-share/mplayer/DOCS/Italian/cd-dvd.html
-share/mplayer/DOCS/Italian/codecs.html
-share/mplayer/DOCS/Italian/documentation.html
-share/mplayer/DOCS/Italian/encoding.html
-share/mplayer/DOCS/Italian/faq.html
-share/mplayer/DOCS/Italian/formats.html
-share/mplayer/DOCS/Italian/gcc-2.96-3.0.html
-share/mplayer/DOCS/Italian/skin-it.html
-share/mplayer/DOCS/Italian/sound.html
-share/mplayer/DOCS/Italian/users_against_developers.html
-share/mplayer/DOCS/Italian/video.html
-share/mplayer/DOCS/Polish/DVB
-share/mplayer/DOCS/Polish/DXR3
-share/mplayer/DOCS/Polish/bugreports.html
-share/mplayer/DOCS/Polish/cd-dvd.html
-share/mplayer/DOCS/Polish/codecs-in.html
-share/mplayer/DOCS/Polish/codecs.html
-share/mplayer/DOCS/Polish/documentation.html
-share/mplayer/DOCS/Polish/encoding.html
-share/mplayer/DOCS/Polish/faq.html
-share/mplayer/DOCS/Polish/formats.html
-share/mplayer/DOCS/Polish/gcc-2.96-3.0.html
-share/mplayer/DOCS/Polish/mplayer.1
-share/mplayer/DOCS/Polish/skin-pl.html
-share/mplayer/DOCS/Polish/sound.html
-share/mplayer/DOCS/Polish/users_against_developers.html
-share/mplayer/DOCS/Polish/video.html
-share/mplayer/DOCS/SGML/DO_NOT_USE
-share/mplayer/DOCS/SGML/c
-share/mplayer/DOCS/SGML/docs.sgml
-share/mplayer/DOCS/bugreports.html
-share/mplayer/DOCS/cd-dvd.html
-share/mplayer/DOCS/codecs-in.html
-share/mplayer/DOCS/codecs.html
-share/mplayer/DOCS/documentation.html
-share/mplayer/DOCS/encoding.html
-share/mplayer/DOCS/faq.html
-share/mplayer/DOCS/formats.html
-share/mplayer/DOCS/gcc-2.96-3.0.html
-share/mplayer/DOCS/mplayer.1
-share/mplayer/DOCS/skin-en.html
-share/mplayer/DOCS/sound.html
-share/mplayer/DOCS/tech/TODO
-share/mplayer/DOCS/tech/codec-devel.txt
-share/mplayer/DOCS/tech/codecs.conf.txt
-share/mplayer/DOCS/tech/colorspaces.txt
-share/mplayer/DOCS/tech/cvs-howto.txt
-share/mplayer/DOCS/tech/dr-methods.txt
-share/mplayer/DOCS/tech/formats-hun.txt
-share/mplayer/DOCS/tech/formats.txt
-share/mplayer/DOCS/tech/hwac3.txt
-share/mplayer/DOCS/tech/libvo.txt
-share/mplayer/DOCS/tech/libvo2.txt
-share/mplayer/DOCS/tech/mpsub.sub
-share/mplayer/DOCS/tech/osd.txt
-share/mplayer/DOCS/tech/patches.txt
-share/mplayer/DOCS/tech/playtree
-share/mplayer/DOCS/tech/playtree-hun
-share/mplayer/DOCS/tech/subcp.txt
-share/mplayer/DOCS/tech/tech-eng.txt
-share/mplayer/DOCS/tech/vidix.txt
-share/mplayer/DOCS/tech/vop.txt
-share/mplayer/DOCS/users_against_developers.html
-share/mplayer/DOCS/video.html
-share/mplayer/codecs.conf
-@dirrm share/mplayer/DOCS/tech
-@dirrm share/mplayer/DOCS/SGML
-@dirrm share/mplayer/DOCS/Polish
-@dirrm share/mplayer/DOCS/Italian
-@dirrm share/mplayer/DOCS/Hungarian
-@dirrm share/mplayer/DOCS/German
-@dirrm share/mplayer/DOCS/French
-@dirrm share/mplayer/DOCS
-@dirrm share/mplayer
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index a1ae0789268..1bde2c70eb1 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.12 2002/05/14 22:13:35 veego Exp $
+$NetBSD: distinfo,v 1.13 2002/05/25 07:56:02 veego Exp $
 
-SHA1 (MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
-Size (MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
+SHA1 (mplayer/MPlayer-0.90pre4.tar.bz2) = 54621d010d5fb28e1ad2f857135543c3bd466d50
+Size (mplayer/MPlayer-0.90pre4.tar.bz2) = 2424843 bytes
 SHA1 (patch-aa) = 2c1c6f35caf047f188871ac223d672ce453c26ec
diff --git a/graphics/mplayer/patches/patch-aa b/graphics/mplayer/patches/patch-aa
deleted file mode 100644
index 730d1371d91..00000000000
--- a/graphics/mplayer/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.8 2002/05/14 22:13:35 veego Exp $
-
---- configure.orig	Mon May 13 22:52:10 2002
-+++ configure	Tue May 14 18:57:42 2002
-@@ -269,8 +269,8 @@
-     _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
-     ;;
-   --with-extralibdir=*)
--    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
--#    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+#    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-+    _ld_extra="${_ld_extra} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-     ;;
-   --enable-runtime-cpudetection)
-     _runtime_cpudetection=yes