Update mplayer to 0.60 release.

Can't seem to find a Changelog, sorry.

5 files changed, 9 insertions, 105 deletions

diff --git a/graphics/mplayer/Makefile b/graphics/mplayer/Makefile
index cd5efd20282..9d7129a9130 100644
--- a/graphics/mplayer/Makefile
+++ b/graphics/mplayer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2002/01/21 19:38:40 zuntum Exp $
+# $NetBSD: Makefile,v 1.16 2002/01/25 16:16:27 skrll Exp $
 
-DISTNAME=	MPlayer-0.60pre1
-PKGNAME=	mplayer-0.60.0.1
-PKGREVISION=	2
+DISTNAME=	MPlayer-0.60
+PKGNAME=	mplayer-0.60
 CATEGORIES=	graphics
 MASTER_SITES=	http://mp.dev.hu/MPlayer/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/graphics/mplayer/PLIST b/graphics/mplayer/PLIST
index 52023340f76..d5ebd39a45c 100644
--- a/graphics/mplayer/PLIST
+++ b/graphics/mplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2001/12/26 00:58:04 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/01/25 16:16:28 skrll Exp $
 bin/mplayer
 man/man1/mplayer.1
 share/mplayer/DOCS/DVB
@@ -35,61 +35,10 @@ share/mplayer/DOCS/Hungarian/skin-hu.html
 share/mplayer/DOCS/Hungarian/sound.html
 share/mplayer/DOCS/Hungarian/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/mencoder.1
-share/mplayer/DOCS/Polish/mplayer.1
-share/mplayer/DOCS/Polish/skin-en.html
-share/mplayer/DOCS/Polish/sound.html
-share/mplayer/DOCS/Polish/users_against_developers.html
-share/mplayer/DOCS/Polish/video.html
-share/mplayer/DOCS/Russian/BUGS
-share/mplayer/DOCS/Russian/CODECS
-share/mplayer/DOCS/Russian/DEBIAN
-share/mplayer/DOCS/Russian/DGA
-share/mplayer/DOCS/Russian/MPlayer-FAQ
-share/mplayer/DOCS/Russian/OpenDivX
-share/mplayer/DOCS/Russian/README
-share/mplayer/DOCS/Russian/SOUNDCARDS
-share/mplayer/DOCS/Russian/TVout-G400
-share/mplayer/DOCS/Russian/VIDEOCARDS
-share/mplayer/DOCS/Russian/cdrom
-share/mplayer/DOCS/Russian/dvd
-share/mplayer/DOCS/Russian/dvd-faq
-share/mplayer/DOCS/Russian/install
-share/mplayer/DOCS/Russian/lirc
-share/mplayer/DOCS/Russian/mtrr
-share/mplayer/DOCS/Russian/sdl
-share/mplayer/DOCS/Spanish/BUGREPORTS
-share/mplayer/DOCS/Spanish/CDROM
-share/mplayer/DOCS/Spanish/DEBIAN
-share/mplayer/DOCS/Spanish/DGA
-share/mplayer/DOCS/Spanish/DVD
-share/mplayer/DOCS/Spanish/DVD-FAQ
-share/mplayer/DOCS/Spanish/FREEBSD
-share/mplayer/DOCS/Spanish/INSTALL
-share/mplayer/DOCS/Spanish/LIRC
-share/mplayer/DOCS/Spanish/MPlayer-FAQ
-share/mplayer/DOCS/Spanish/MTRR
-share/mplayer/DOCS/Spanish/OpenDivX
-share/mplayer/DOCS/Spanish/README
-share/mplayer/DOCS/Spanish/Requirements
-share/mplayer/DOCS/Spanish/SDL
-share/mplayer/DOCS/Spanish/SOLARIS
-share/mplayer/DOCS/Spanish/SOUNDCARDS
-share/mplayer/DOCS/Spanish/SUB+OSD
-share/mplayer/DOCS/Spanish/TVout-G400
-share/mplayer/DOCS/Spanish/Translator
-share/mplayer/DOCS/Spanish/VIDEOCARDS
-share/mplayer/DOCS/Spanish/example.conf
 share/mplayer/DOCS/bugreports.html
 share/mplayer/DOCS/cd-dvd.html
 share/mplayer/DOCS/codecs-in.html
@@ -104,6 +53,8 @@ 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/cvs-howto.txt
 share/mplayer/DOCS/tech/formats-hun.txt
 share/mplayer/DOCS/tech/formats.txt
@@ -116,8 +67,6 @@ 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/Spanish
-@dirrm share/mplayer/DOCS/Russian
 @dirrm share/mplayer/DOCS/Polish
 @dirrm share/mplayer/DOCS/Hungarian
 @dirrm share/mplayer/DOCS/German
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index b445c6be2f8..cfdc74cce6b 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,12 +1,10 @@
-$NetBSD: distinfo,v 1.3 2001/12/26 00:58:04 zuntum Exp $
+$NetBSD: distinfo,v 1.4 2002/01/25 16:16:28 skrll Exp $
 
-SHA1 (MPlayer-0.60pre1.tar.bz2) = c3af1cf1c4ac6f3bb8a88d5d25acb33086fd2acd
-Size (MPlayer-0.60pre1.tar.bz2) = 1905451 bytes
+SHA1 (MPlayer-0.60.tar.bz2) = 6af7da481fe3688061f5a74ceed694812c1d475a
+Size (MPlayer-0.60.tar.bz2) = 1753317 bytes
 SHA1 (patch-aa) = 1e626d0312631e441d126a89314f4e4e6d177e1f
 SHA1 (patch-ab) = b57033b07b789917dc2f576e34dacf06e90fc824
-SHA1 (patch-ac) = 0061804974919d44ae911bcd6a8f56637869e810
 SHA1 (patch-ad) = 2caecb946658925f20874a2aff61afc972354a37
 SHA1 (patch-ae) = 84db805213925f9ebc511de56f723ba29147ba99
-SHA1 (patch-af) = c2189af1b14f8f541242106c55d41827f8eec716
 SHA1 (patch-ag) = bfbae41a30a7f0c9440ece02e3f2eadd1fca87a1
 SHA1 (patch-ah) = 506cda70793d84342b035570b428cb7b566b622e
diff --git a/graphics/mplayer/patches/patch-ac b/graphics/mplayer/patches/patch-ac
deleted file mode 100644
index e21c4b7aa1b..00000000000
--- a/graphics/mplayer/patches/patch-ac
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2001/12/26 00:58:05 zuntum Exp $
-
---- Makefile.orig	Fri Oct 19 22:53:42 2001
-+++ Makefile	Fri Oct 19 23:09:34 2001
-@@ -170,18 +170,17 @@
- 	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
- 
- install: $(ALL_PRG)
--	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
--	$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
-+	$(BSD_INSTALL_PROGRAM_DIR) $(BINDIR)
-+	$(BSD_INSTALL_PROGRAM) $(PRG) $(BINDIR)
- ifeq ($(GUI),yes)
--	-ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
-+ 	-ln -sf $(PRG) $(BINDIR)/gmplayer
- endif
--	if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
--	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
-+	$(BSD_INSTALL_MAN) DOCS/mplayer.1 $(prefix)/man/man1/
- ifeq ($(MENCODER),yes)
--	$(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
--	$(INSTALL) -c -m 644 DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1
-+	$(BSD_INSTALL_PROGRAM) $(PRG_MENCODER) $(BINDIR)
-+	$(BSD_INSTALL_MAN) DOCS/mencoder.1 $(prefix)/man/man1/
- endif
-
- ifeq ($(CSS_USE),yes)
- 	@echo "Following task requires root privs. If it fails don't panic"
- 	@echo "however it means you can't use fibmap_mplayer."
diff --git a/graphics/mplayer/patches/patch-af b/graphics/mplayer/patches/patch-af
deleted file mode 100644
index 1cfcc8c085e..00000000000
--- a/graphics/mplayer/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.3 2001/12/26 00:58:05 zuntum Exp $
-
---- cpudetect.c.orig	Mon Dec 24 13:35:42 2001
-+++ cpudetect.c	Tue Dec 25 23:26:28 2001
-@@ -341,7 +341,7 @@
- #else
-    /* Do nothing on other platforms for now.
-     */
--   message( "Not testing OS support for SSE, leaving disabled.\n" );
-+   printf( "Not testing OS support for SSE, leaving disabled.\n" );
-    gCpuCaps.hasSSE=0;
- #endif /* __linux__ */
- }