-update to 0.90 release (no changes from rc5, except documentation fixes,

 they even forgot to update the version string)
-make sure libfreetype is found by "configure"
-we don't really need GNU libintl - this avoids a conflict with libmad

6 files changed, 27 insertions, 21 deletions

diff --git a/graphics/gmplayer/distinfo b/graphics/gmplayer/distinfo
index 93ea39a3092..6d481f86d45 100644
--- a/graphics/gmplayer/distinfo
+++ b/graphics/gmplayer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2003/03/22 03:13:37 salo Exp $
+$NetBSD: distinfo,v 1.31 2003/04/09 14:57:31 drochner Exp $
 
-SHA1 (mplayer/MPlayer-0.90rc5.tar.bz2) = 430c661d9b023db09662ea81da2b64147268c8ef
-Size (mplayer/MPlayer-0.90rc5.tar.bz2) = 3403602 bytes
+SHA1 (mplayer/MPlayer-0.90.tar.bz2) = 01be27d68a250be814af5f090e8a217c1f4838a8
+Size (mplayer/MPlayer-0.90.tar.bz2) = 3436463 bytes
 SHA1 (mplayer/default-1.7.tar.bz2) = 6912c3e58b4c76fad97fdb72945b27815069f7e3
 Size (mplayer/default-1.7.tar.bz2) = 173439 bytes
 SHA1 (mplayer/AlienMind-1.0.tar.bz2) = 7c890bbb2e5b34b800ba2f7273b1f6a4e6c4281c
@@ -46,3 +46,4 @@ SHA1 (mplayer/xine-lcd-1.0.tar.bz2) = 1edbf1703e64f7a7c2aa3837d3383ba60a6d2f2d
 Size (mplayer/xine-lcd-1.0.tar.bz2) = 168441 bytes
 SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
 SHA1 (patch-ab) = f2fd9006914a7d1bac364be74ca5d7cb9aab6806
+SHA1 (patch-ac) = 3539a185ff74922f8ce6da3187ca443334fa2d78
diff --git a/graphics/mplayer-share/Makefile.common b/graphics/mplayer-share/Makefile.common
index d68a35a480f..f74d1f05358 100644
--- a/graphics/mplayer-share/Makefile.common
+++ b/graphics/mplayer-share/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.29 2003/04/04 01:02:39 salo Exp $
+# $NetBSD: Makefile.common,v 1.30 2003/04/09 14:57:32 drochner Exp $
 #
 
-MPLAYER_DIST_VERSION=	0.90rc5
+MPLAYER_DIST_VERSION=	0.90
 #PKGREVISION=		0
 
 # This variable is used in all packages which depend on this package
 # XXX Add 10, as the "rc" version numbers were used up for the "pre" versions.
-MPLAYER_PKG_VERSION=	0.90rc15
+MPLAYER_PKG_VERSION=	0.90
 
 DISTNAME=		MPlayer-${MPLAYER_DIST_VERSION}
 CATEGORIES?=		graphics
@@ -29,7 +29,6 @@ NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
 USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
-USE_GNU_GETTEXT=	YES
 
 PTHREAD_OPTS+=		require
 
@@ -37,6 +36,7 @@ CONFIGURE_ARGS+=	--prefix="${PREFIX}"
 CONFIGURE_ARGS+=	--with-extraincdir="${LOCALBASE}/include"
 CONFIGURE_ARGS+=	--with-cdparanoiaincdir="${LOCALBASE}/include/cdparanoia"
 CONFIGURE_ARGS+=	--with-extralibdir="${LOCALBASE}/lib"
+CONFIGURE_ARGS+=	--with-extralibdir="${X11BASE}/lib"
 CONFIGURE_ARGS+=	--disable-mpdvdkit
 CONFIGURE_ARGS+=	--enable-faad
 CONFIGURE_ARGS+=	--disable-arts
diff --git a/graphics/mplayer-share/PLIST b/graphics/mplayer-share/PLIST
index a53e8150ca2..4b4cd78a29d 100644
--- a/graphics/mplayer-share/PLIST
+++ b/graphics/mplayer-share/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2003/02/18 11:16:33 mrg Exp $
+@comment $NetBSD: PLIST,v 1.11 2003/04/09 14:57:32 drochner Exp $
 man/man1/mplayer.1
 share/mplayer/DOCS/Chinese/bugreports.html
 share/mplayer/DOCS/Chinese/cd-dvd.html
@@ -8,6 +8,7 @@ share/mplayer/DOCS/Chinese/documentation.html
 share/mplayer/DOCS/Chinese/encoding.html
 share/mplayer/DOCS/Chinese/faq.html
 share/mplayer/DOCS/Chinese/formats.html
+share/mplayer/DOCS/Chinese/mplayer.1
 share/mplayer/DOCS/Chinese/skin.html
 share/mplayer/DOCS/Chinese/sound.html
 share/mplayer/DOCS/Chinese/users_against_developers.html
@@ -62,17 +63,13 @@ share/mplayer/DOCS/Italian/skin.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.html
 share/mplayer/DOCS/Polish/sound.html
@@ -103,7 +100,6 @@ share/mplayer/DOCS/tech/formats.txt
 share/mplayer/DOCS/tech/general.txt
 share/mplayer/DOCS/tech/hwac3.txt
 share/mplayer/DOCS/tech/libao2.txt
-share/mplayer/DOCS/tech/libavc-options.txt
 share/mplayer/DOCS/tech/libmpcodecs.txt
 share/mplayer/DOCS/tech/libvo.txt
 share/mplayer/DOCS/tech/libvo2.txt
@@ -114,7 +110,6 @@ share/mplayer/DOCS/tech/patches.txt
 share/mplayer/DOCS/tech/playtree
 share/mplayer/DOCS/tech/playtree-hun
 share/mplayer/DOCS/tech/porting-status.txt
-share/mplayer/DOCS/tech/qt-libwine-howto.txt
 share/mplayer/DOCS/tech/realcodecs/TODO
 share/mplayer/DOCS/tech/realcodecs/audio-codecs.txt
 share/mplayer/DOCS/tech/realcodecs/streaming.txt
@@ -123,7 +118,6 @@ share/mplayer/DOCS/tech/subcp.txt
 share/mplayer/DOCS/tech/swscaler_filters.txt
 share/mplayer/DOCS/tech/swscaler_methods.txt
 share/mplayer/DOCS/tech/vidix.txt
-share/mplayer/DOCS/tech/vop.txt
 share/mplayer/DOCS/tech/wishlist
 share/mplayer/DOCS/users_against_developers.html
 share/mplayer/DOCS/video.html
diff --git a/graphics/mplayer-share/distinfo b/graphics/mplayer-share/distinfo
index 4b77b7bed7d..6b9f31a457e 100644
--- a/graphics/mplayer-share/distinfo
+++ b/graphics/mplayer-share/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.21 2003/03/22 03:13:37 salo Exp $
+$NetBSD: distinfo,v 1.22 2003/04/09 14:57:32 drochner Exp $
 
-SHA1 (mplayer/MPlayer-0.90rc5.tar.bz2) = 430c661d9b023db09662ea81da2b64147268c8ef
-Size (mplayer/MPlayer-0.90rc5.tar.bz2) = 3403602 bytes
+SHA1 (mplayer/MPlayer-0.90.tar.bz2) = 01be27d68a250be814af5f090e8a217c1f4838a8
+Size (mplayer/MPlayer-0.90.tar.bz2) = 3436463 bytes
 SHA1 (mplayer/font-arial-iso-8859-1.tar.bz2) = cec0cad6145382dd15c801f9c6e9cda1ab71b1ed
 Size (mplayer/font-arial-iso-8859-1.tar.bz2) = 234810 bytes
 SHA1 (mplayer/font-arial-iso-8859-2.tar.bz2) = 12c05c32f64818378a32699bea0f5d3aa1551afa
@@ -10,3 +10,4 @@ SHA1 (mplayer/font-arial-cp1250.tar.bz2) = 7b11d721e348a53abf9656f3ade61d0b99e2e
 Size (mplayer/font-arial-cp1250.tar.bz2) = 490101 bytes
 SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
 SHA1 (patch-ab) = f2fd9006914a7d1bac364be74ca5d7cb9aab6806
+SHA1 (patch-ac) = 3539a185ff74922f8ce6da3187ca443334fa2d78
diff --git a/graphics/mplayer-share/patches/patch-ac b/graphics/mplayer-share/patches/patch-ac
new file mode 100644
index 00000000000..7a968171604
--- /dev/null
+++ b/graphics/mplayer-share/patches/patch-ac
@@ -0,0 +1,9 @@
+$NetBSD: patch-ac,v 1.4 2003/04/09 14:57:32 drochner Exp $
+
+--- version.sh.orig	2003-04-09 14:10:13.000000000 +0200
++++ version.sh	2003-04-09 14:10:24.000000000 +0200
+@@ -1,3 +1,3 @@
+ #!/bin/sh
+ 
+-echo "#define VERSION \"0.90rc5-$1 \"" >version.h
++echo "#define VERSION \"0.90-$1 \"" >version.h
diff --git a/graphics/mplayer/distinfo b/graphics/mplayer/distinfo
index d5eb38c6244..93b0f2c2a18 100644
--- a/graphics/mplayer/distinfo
+++ b/graphics/mplayer/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.31 2003/03/22 03:13:37 salo Exp $
+$NetBSD: distinfo,v 1.32 2003/04/09 14:57:32 drochner Exp $
 
-SHA1 (mplayer/MPlayer-0.90rc5.tar.bz2) = 430c661d9b023db09662ea81da2b64147268c8ef
-Size (mplayer/MPlayer-0.90rc5.tar.bz2) = 3403602 bytes
+SHA1 (mplayer/MPlayer-0.90.tar.bz2) = 01be27d68a250be814af5f090e8a217c1f4838a8
+Size (mplayer/MPlayer-0.90.tar.bz2) = 3436463 bytes
 SHA1 (patch-aa) = 6938dbdccb9b760dadad304f3bf61245e8b1baa6
 SHA1 (patch-ab) = f2fd9006914a7d1bac364be74ca5d7cb9aab6806
+SHA1 (patch-ac) = 3539a185ff74922f8ce6da3187ca443334fa2d78