o update to 0.50 final

o add several WITH_* options (specially DVD support :-)
o update WWW tag in DESCR
o update PKGMESSAGE
o update install-user script to handle new fonts from port
  mplayer-fonts/Makefile rev 1.2

Submitted by:	MAINTAINER

20 files changed, 290 insertions, 206 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index b350a90e4ccd..02d63fa326df 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.50.0.1
+PORTVERSION=	0.50.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.50pre1
+DISTNAME=	MPlayer-0.50
 
 MAINTAINER=	riggs@rrr.de
 
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
+WANT_ESOUND=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-esd
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
@@ -37,15 +37,6 @@ DOCFILES=       DVB bugreports.html cd-dvd.html codecs-in.html \
 
 .include <bsd.port.pre.mk>
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-# hack to cope with dmesg standard vs ports standard
-.if (WITH_3DNow!)
-WITH_3DNOW=	yes
-.endif
-
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
@@ -55,19 +46,45 @@ USE_GTK=	yes
 CONFIGURE_ARGS+=	--enable-gui
 .endif
 
+.if defined(WITH_DVD)
+LIB_DEPENDS+=	dvdcss.0:${PORTSDIR}/graphics/libdvdcss \
+		dvdread.2:${PORTSDIR}/graphics/libdvdread
+.endif
+
+.if defined(WITH_ESOUND) || defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+.endif
+
+.if defined(WITH_SVGALIB)
+LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
+.endif
+
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=	vorbis.0:${PORTSDIR}/audio/libvorbis
+.endif
+
 # "enable" build for other archs
 .if ${ARCH} == "i386"
-.if defined(WITH_MMX)
-CONFIGURE_ARGS+=--enable-mmx
+.if defined(WITHOUT_MMX)
+CONFIGURE_ARGS+=--disable-mmx
 .endif
-.if defined(WITH_3DNOW) && ${OSVERSION} >= 400021
-CONFIGURE_ARGS+=--enable-3dnow
+.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
+CONFIGURE_ARGS+=--disable-3dnow
 .endif
-.if defined(WITH_DSP) && defined(WITH_3DNOW) && ${OSVERSION} >= 400021
-CONFIGURE_ARGS+=--enable-3dnowex
+.if defined(WITHOUT_DSP) || defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
+CONFIGURE_ARGS+=--disable-3dnowex
 .endif
-.if defined(WITH_SSE)
-CONFIGURE_ARGS+=--enable-mmx2 --enable-sse
+.if !defined(WITH_ESOUND) && !defined(HAVE_ESOUND) 
+CONFIGURE_ARGS+=--disable-esd
+.endif
+.if defined(WITHOUT_SSE)
+CONFIGURE_ARGS+=--disable-mmx2 --disable-sse
+.endif
+.if !defined(WITH_SVGALIB)
+CONFIGURE_ARGS+=--disable-svga
+.endif
+.if !defined(WITH_VORBIS)
+CONFIGURE_ARGS+=--disable-vorbis
 .endif
 .if !defined(WITHOUT_WIN32_CODECS)
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
@@ -85,27 +102,42 @@ pre-everything::
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
 .if !defined(WITH_GUI)
-	@${ECHO} "You can enable GTK GUI by defining WITH_GUI."
+	@${ECHO_MSG} "You can enable GTK GUI by defining WITH_GUI."
+.endif
+.if !defined(WITH_DVD)
+	@${ECHO_MSG} "You can enable DVD support by defining WITH_DVD."
+.endif
+.if !defined(WITH_ESOUND) && !defined(HAVE_ESOUND)
+	@${ECHO_MSG} "You can enable ESOUND sound support by defining WITH_ESOUND."
+.endif
+.if !defined(WITH_SVGALIB)
+	@${ECHO_MSG} "You can enable SVGALIB support by defining WITH_SVGALIB."
+.endif
+.if !defined(WITH_VORBIS)
+	@${ECHO_MSG} "You can enable VORBIS sound support by defining WITH_VORBIS."
 .endif
 .if ${ARCH} == "i386"
 .if !defined(WITHOUT_WIN32_CODECS)
 	@${ECHO_MSG} "You can disable support (this turns this into a X86 only port)"
 	@${ECHO_MSG} "for Win32 codecs"
 .endif
-.if defined(WITH_SSE)
+.if !defined(WITHOUT_SSE)
 	@${ECHO_MSG} "You have to enable \"options CPU_ENABLE_SSE\" in your kernel"
 	@${ECHO_MSG} "config in order to enable kernel support for SSE/MMX2."
 .endif
+.if !defined(WITHOUT_MMX)
+	@${ECHO_MSG} "You can disable use of MMX routines by defining WITHOUT_MMX."
+.endif
+.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
+	@${ECHO_MSG} "You can disable use of 3DNow! optimized routines by defining WITHOUT_3DNOW."
+.endif
+.if !defined(WITHOUT_3DNOW) && !defined(WITHOUT_DSP) && ${OSVERSION} >= 400021
+	@${ECHO_MSG} "You can disable support for Athlon DSP extensions by defining WITHOUT_DSP."
+.endif
+	@${ECHO_MSG} "Note: The cpu features are autodetected, so there is probably no need"
+	@${ECHO_MSG} "to manually disable them."
 .endif # ARCH == i386
 
-pre-configure:
-	@${RM} -f "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-	@${MKDIR} "${WRKDIRPREFIX}${.CURDIR}"
-	@${SETENV} TEMPDIR="${WRKDIRPREFIX}${.CURDIR}" ${PERL} ${FILESDIR}/get-feat
-
-post-configure:
-	@${RM} -f "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-
 post-install:
 	@${MKDIR} ${DATADIR}
 	@${CHMOD} 755 ${DATADIR}
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index e7590972a303..85e5441a3fbe 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.50pre1.tar.bz2) = 5a71689dda88731e1dba596e270fa3d9
+MD5 (MPlayer-0.50.tar.bz2) = b8c4fc82db0571a237bbed81c602d48c
diff --git a/multimedia/mplayer/files/get-feat b/multimedia/mplayer/files/get-feat
deleted file mode 100644
index 07deea5e6107..000000000000
--- a/multimedia/mplayer/files/get-feat
+++ /dev/null
@@ -1,18 +0,0 @@
-#This perl script will determine the supported CPU features
-#of this machine, so the build of the correct decode plugins
-#will do automatically
-
-@list=`cat /var/run/dmesg.boot|grep Feat`;
-@features=("MMX","SSE","3DNow!","DSP");
-open (INC,">$ENV{TEMPDIR}/Makefile.inc");
-foreach $feature(@features)
-{
-  foreach $line(@list)
-  {
-    if ( $line =~ m/$feature/)
-    {
-      print INC "WITH_$feature = yes\n";
-    }
-  }
-}
-close (INC);
diff --git a/multimedia/mplayer/files/install-user b/multimedia/mplayer/files/install-user
index 8f0dda4a6adf..0fd764316a50 100644
--- a/multimedia/mplayer/files/install-user
+++ b/multimedia/mplayer/files/install-user
@@ -1,5 +1,6 @@
 #This perl script links the codec config file
 #and the fonts dir to the user's home dir.
+#V0.2 Last touched: 2001-10-12 riggs
 
 if (-e "$ENV{HOME}/.mplayer/")
 {
@@ -16,14 +17,24 @@ $prefix=~ s/(.+mplayer).*/$1/;
 chop $prefix;
 
 print "You may choose any of the available language sets:\n\n";
-print "European fonts (e.g. dutch, french, german...) : e\n";
-print "Cyrillic fonts : c\n";
-print "Russian fonts: r\n";
+print "ISO-8859-1 Font : 1\n";
+print "ISO-8859-2 Font : 2\n";
+print "(old) Cyrillic fonts : c\n";
+print "Russian fonts : r\n";
 
 print "Your decision? ";
 chomp ($lang=<STDIN>);
 print "\n";
 
+if ($lang eq "1" || $lang eq "2")
+{
+	print "The available sizes for this font are 14,18,24,28.\n";
+	print "Please enter the wanted size: \n";
+	chomp ($size=<STDIN>);
+	if ($size ne "14" && $size ne "18" && $size ne "24" && $size ne "28") {$size=14;}
+}
+
+
 system "mkdir $ENV{HOME}/.mplayer";
 if ($lang eq "c")
 {
@@ -31,8 +42,12 @@ if ($lang eq "c")
 }
 elsif ($lang eq "r")
 {
-	system "ln -s $prefix/fonts/koi8r/ $ENV{HOME}/.mplayer/font";
+	system "ln -s $prefix/fonts/koi8r-font/ $ENV{HOME}/.mplayer/font";
+}
+elsif ($lang eq "2")
+{
+	system "ln -s $prefix/fonts/iso-8859-2/arial-$size/ $ENV{HOME}/.mplayer/font";
 }
-else {system "ln -s $prefix/fonts/iso/ $ENV{HOME}/.mplayer/font"};
+else {system "ln -s $prefix/fonts/iso-8859-1/arial-$size/ $ENV{HOME}/.mplayer/font"};
 
 system "ln -s $prefix/codecs.conf $ENV{HOME}/.mplayer/codecs.conf";
diff --git a/multimedia/mplayer/files/patch-Gui::mplayer::gtk::fs.h b/multimedia/mplayer/files/patch-Gui::mplayer::gtk::fs.h
deleted file mode 100644
index bbe349a91da3..000000000000
--- a/multimedia/mplayer/files/patch-Gui::mplayer::gtk::fs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gui/mplayer/gtk/fs.h.orig	Fri Sep 28 19:48:50 2001
-+++ Gui/mplayer/gtk/fs.h	Fri Sep 28 19:49:11 2001
-@@ -9,7 +9,7 @@
- #include <glob.h>
- #include <unistd.h>
- 
--#ifdef	__SVR4
-+#if defined(__SVR4) || defined (__FreeBSD__)
- #define	get_current_dir_name()	getcwd(NULL, PATH_MAX)
- #endif
- 
diff --git a/multimedia/mplayer/files/patch-Gui::mplayer::psignal.h b/multimedia/mplayer/files/patch-Gui::mplayer::psignal.h
deleted file mode 100644
index a5c3768cdc7e..000000000000
--- a/multimedia/mplayer/files/patch-Gui::mplayer::psignal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gui/mplayer/psignal.h.orig	Fri Sep 28 19:46:22 2001
-+++ Gui/mplayer/psignal.h	Fri Sep 28 19:46:55 2001
-@@ -39,7 +39,7 @@
- #define mplIncAudioBufferDelay                   28
- #define mplDecAudioBufferDelay                   29
- 
--#ifdef	__SVR4
-+#if defined(__SVR4) || defined(__FreeBSD__)
- #define	SIGTYPE SIGUSR2
- #warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
- #else
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index 82abd70949a2..532df185635c 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,42 +1,62 @@
---- configure.orig	Fri Sep 28 19:21:08 2001
-+++ configure	Fri Sep 28 19:33:35 2001
+--- configure.old	Sun Oct  7 23:36:29 2001
++++ configure	Fri Oct 12 11:22:39 2001
 @@ -299,7 +299,7 @@
  _confcygwin="TARGET_CYGWIN=no"
  _confwin32=
- if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
+ if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then
 -    _archlibs="-rdynamic -pthread"
 +    _archlibs="-rdynamic ${PTHREAD_LIBS}"
  elif [ `echo $system_name | sed 's/[cC][yY][gG][wW][iI][nN].*/CYGWIN/'` = "CYGWIN" ]; then
      _confcygwin="TARGET_CYGWIN=yes"
      _confwin32="#define WIN32"
-@@ -766,7 +766,7 @@
+@@ -460,19 +460,8 @@
+ fi
+ 
+ if [ "$host_arch" = i386 ]; then
+-    if [ -r /proc/cpuinfo ]; then
+-	# linux with /proc mounted, extract cpu information from it
+-	_cpuinfo="cat /proc/cpuinfo"
+-    elif [ -r /compat/linux/proc/cpuinfo ]; then
+-        # FreeBSD with linux emulation /proc mounted, 
+-	# extract cpu information from it
+-        _cpuinfo="cat /compat/linux/proc/cpuinfo"
+-    else
+-	# all other OS try to extract cpu information from a small helper
+-	# program TOOLS/cpuinfo instead
+ 	$_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
+ 	_cpuinfo="TOOLS/cpuinfo"
+-    fi
+ 
+     pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
+     pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
+@@ -798,7 +787,7 @@
  $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes
  
- if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
+ if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then
 -$_cc $TMPC -o $TMPO -pthread > /dev/null 2>&1 || \
 +$_cc $TMPC -o $TMPO ${PTHREAD_LIBS} > /dev/null 2>&1 || \
   { echo "Lib pthread not found."; rm -f $TMPC $TMPO $TMPS ; exit 1; }
  else
  $_cc $TMPC -o $TMPO -lpthread > /dev/null 2>&1 || \
-@@ -861,7 +861,7 @@
+@@ -893,7 +882,7 @@
  
  # this is not yet checked with OpenBSD - atmos
  if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
--$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 && _gl=yes
-+$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 && _gl=yes
+-$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm -pthread $_socklib > /dev/null 2>&1 && _gl=yes
++$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 && _gl=yes
  else
- $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 && _gl=yes
+ $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 && _gl=yes
  fi
-@@ -872,7 +872,7 @@
+@@ -904,7 +893,7 @@
  EOF
  # this is not yet checked with OpenBSD - atmos
  if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
--$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 || \
-+$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 || \
+-$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm -pthread $_socklib > /dev/null 2>&1 || \
++$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 || \
   { _gl=no; echo "GL includes not found!";}
  else
- $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 || \
-@@ -1613,33 +1613,33 @@
+ $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 || \
+@@ -1645,33 +1634,33 @@
  
  echo
  echo $_echo_n "Checking for gtk version ... $_echo_c"
@@ -76,7 +96,7 @@
  [ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
  echo "done"
  
-@@ -1668,7 +1668,7 @@
+@@ -1700,7 +1689,7 @@
     if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
        # Under XFree86 4.x GL port is poorly designed
        if [ -r /usr/X11R6/bin/XFree86 ]; then
@@ -85,7 +105,7 @@
        else
           _gllib='-lGL'
        fi
-@@ -1895,7 +1895,7 @@
+@@ -1926,7 +1915,7 @@
  # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
  # for MT applications: 
  if [ "$system_name" = "FreeBSD" ]; then
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index 80b04bc7ede0..11a873330955 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,20 +1,29 @@
---- Makefile.orig	Fri Sep 28 19:37:12 2001
-+++ Makefile	Fri Sep 28 19:41:53 2001
-@@ -113,15 +113,8 @@
+--- Makefile.orig	Fri Oct  5 10:39:21 2001
++++ Makefile	Mon Oct 15 21:51:01 2001
+@@ -118,24 +118,8 @@
  	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
  
- install: $(PRG) $(PRG_FIBMAP)
--	install -d $(BINDIR)
+ install: $(ALL_PRG)
+-	if [ ! -e $(BINDIR) ]; then \
+-		mkdir -p $(BINDIR); \
+-	fi
 -	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
--	install -d $(prefix)/man/man1
--	install -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-ifeq ($(GUI),yes)
+-	-ln -s $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+-endif
+-	if [ ! -e $(prefix)/man/man1 ]; then \
+-		mkdir -p $(prefix)/man/man1; \
+-	fi
+-	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-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."
 -	@echo "Without this (or without running mplayer as root) you won't be"
 -	@echo "able to play encrypted DVDs."
--	install -o root -g root -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
-+	install -C -m 755 -s $(PRG) $(BINDIR)/$(PRG)
-+	install -C -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-	-install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+-endif
++	@${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG)
++	@${BSD_INSTALL_MAN} DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
  
  clean:
  	rm -f *.o *~ $(OBJS)
diff --git a/multimedia/mplayer/pkg-descr b/multimedia/mplayer/pkg-descr
index a613c1786f48..ea53eb32e136 100644
--- a/multimedia/mplayer/pkg-descr
+++ b/multimedia/mplayer/pkg-descr
@@ -5,4 +5,6 @@ It is based on the windows codec compilation and
 provides the ability to play many formats
 in a very good quality without much CPU comsumption.
 
-WWW: http://mplayer.sourceforge.net/
+Support for ffmpeg and DVD are also included.
+
+WWW: http://www.mplayerhq.hu/
diff --git a/multimedia/mplayer/pkg-message b/multimedia/mplayer/pkg-message
index 242404f7723b..cec7bbd056f3 100644
--- a/multimedia/mplayer/pkg-message
+++ b/multimedia/mplayer/pkg-message
@@ -12,3 +12,7 @@ Please take a look at docs in
 
 You can download skins from the mplayer homepage:
 http://www.mplayerhq.hu/
+
+In order to use DVD please make sure that your
+kernel and base system is newer than 2001-09-25,
+otherwise DVD play will not work!
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index b350a90e4ccd..02d63fa326df 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.50.0.1
+PORTVERSION=	0.50.0.2
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.50pre1
+DISTNAME=	MPlayer-0.50
 
 MAINTAINER=	riggs@rrr.de
 
@@ -22,8 +22,8 @@ RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_XLIB=	yes
+WANT_ESOUND=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--disable-esd
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
@@ -37,15 +37,6 @@ DOCFILES=       DVB bugreports.html cd-dvd.html codecs-in.html \
 
 .include <bsd.port.pre.mk>
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
-
-# hack to cope with dmesg standard vs ports standard
-.if (WITH_3DNow!)
-WITH_3DNOW=	yes
-.endif
-
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
@@ -55,19 +46,45 @@ USE_GTK=	yes
 CONFIGURE_ARGS+=	--enable-gui
 .endif
 
+.if defined(WITH_DVD)
+LIB_DEPENDS+=	dvdcss.0:${PORTSDIR}/graphics/libdvdcss \
+		dvdread.2:${PORTSDIR}/graphics/libdvdread
+.endif
+
+.if defined(WITH_ESOUND) || defined(HAVE_ESOUND)
+USE_ESOUND=	yes
+.endif
+
+.if defined(WITH_SVGALIB)
+LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
+.endif
+
+.if defined(WITH_VORBIS)
+LIB_DEPENDS+=	vorbis.0:${PORTSDIR}/audio/libvorbis
+.endif
+
 # "enable" build for other archs
 .if ${ARCH} == "i386"
-.if defined(WITH_MMX)
-CONFIGURE_ARGS+=--enable-mmx
+.if defined(WITHOUT_MMX)
+CONFIGURE_ARGS+=--disable-mmx
 .endif
-.if defined(WITH_3DNOW) && ${OSVERSION} >= 400021
-CONFIGURE_ARGS+=--enable-3dnow
+.if defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
+CONFIGURE_ARGS+=--disable-3dnow
 .endif
-.if defined(WITH_DSP) && defined(WITH_3DNOW) && ${OSVERSION} >= 400021
-CONFIGURE_ARGS+=--enable-3dnowex
+.if defined(WITHOUT_DSP) || defined(WITHOUT_3DNOW) || ${OSVERSION} < 400021
+CONFIGURE_ARGS+=--disable-3dnowex
 .endif
-.if defined(WITH_SSE)
-CONFIGURE_ARGS+=--enable-mmx2 --enable-sse
+.if !defined(WITH_ESOUND) && !defined(HAVE_ESOUND) 
+CONFIGURE_ARGS+=--disable-esd
+.endif
+.if defined(WITHOUT_SSE)
+CONFIGURE_ARGS+=--disable-mmx2 --disable-sse
+.endif
+.if !defined(WITH_SVGALIB)
+CONFIGURE_ARGS+=--disable-svga
+.endif
+.if !defined(WITH_VORBIS)
+CONFIGURE_ARGS+=--disable-vorbis
 .endif
 .if !defined(WITHOUT_WIN32_CODECS)
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
@@ -85,27 +102,42 @@ pre-everything::
 	@${ECHO_MSG} "by defining WITH_OPTIMIZED_CFLAGS"
 .endif
 .if !defined(WITH_GUI)
-	@${ECHO} "You can enable GTK GUI by defining WITH_GUI."
+	@${ECHO_MSG} "You can enable GTK GUI by defining WITH_GUI."
+.endif
+.if !defined(WITH_DVD)
+	@${ECHO_MSG} "You can enable DVD support by defining WITH_DVD."
+.endif
+.if !defined(WITH_ESOUND) && !defined(HAVE_ESOUND)
+	@${ECHO_MSG} "You can enable ESOUND sound support by defining WITH_ESOUND."
+.endif
+.if !defined(WITH_SVGALIB)
+	@${ECHO_MSG} "You can enable SVGALIB support by defining WITH_SVGALIB."
+.endif
+.if !defined(WITH_VORBIS)
+	@${ECHO_MSG} "You can enable VORBIS sound support by defining WITH_VORBIS."
 .endif
 .if ${ARCH} == "i386"
 .if !defined(WITHOUT_WIN32_CODECS)
 	@${ECHO_MSG} "You can disable support (this turns this into a X86 only port)"
 	@${ECHO_MSG} "for Win32 codecs"
 .endif
-.if defined(WITH_SSE)
+.if !defined(WITHOUT_SSE)
 	@${ECHO_MSG} "You have to enable \"options CPU_ENABLE_SSE\" in your kernel"
 	@${ECHO_MSG} "config in order to enable kernel support for SSE/MMX2."
 .endif
+.if !defined(WITHOUT_MMX)
+	@${ECHO_MSG} "You can disable use of MMX routines by defining WITHOUT_MMX."
+.endif
+.if !defined(WITHOUT_3DNOW) && ${OSVERSION} >= 400021
+	@${ECHO_MSG} "You can disable use of 3DNow! optimized routines by defining WITHOUT_3DNOW."
+.endif
+.if !defined(WITHOUT_3DNOW) && !defined(WITHOUT_DSP) && ${OSVERSION} >= 400021
+	@${ECHO_MSG} "You can disable support for Athlon DSP extensions by defining WITHOUT_DSP."
+.endif
+	@${ECHO_MSG} "Note: The cpu features are autodetected, so there is probably no need"
+	@${ECHO_MSG} "to manually disable them."
 .endif # ARCH == i386
 
-pre-configure:
-	@${RM} -f "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-	@${MKDIR} "${WRKDIRPREFIX}${.CURDIR}"
-	@${SETENV} TEMPDIR="${WRKDIRPREFIX}${.CURDIR}" ${PERL} ${FILESDIR}/get-feat
-
-post-configure:
-	@${RM} -f "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-
 post-install:
 	@${MKDIR} ${DATADIR}
 	@${CHMOD} 755 ${DATADIR}
diff --git a/multimedia/mplayerxp/distinfo b/multimedia/mplayerxp/distinfo
index e7590972a303..85e5441a3fbe 100644
--- a/multimedia/mplayerxp/distinfo
+++ b/multimedia/mplayerxp/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.50pre1.tar.bz2) = 5a71689dda88731e1dba596e270fa3d9
+MD5 (MPlayer-0.50.tar.bz2) = b8c4fc82db0571a237bbed81c602d48c
diff --git a/multimedia/mplayerxp/files/get-feat b/multimedia/mplayerxp/files/get-feat
deleted file mode 100644
index 07deea5e6107..000000000000
--- a/multimedia/mplayerxp/files/get-feat
+++ /dev/null
@@ -1,18 +0,0 @@
-#This perl script will determine the supported CPU features
-#of this machine, so the build of the correct decode plugins
-#will do automatically
-
-@list=`cat /var/run/dmesg.boot|grep Feat`;
-@features=("MMX","SSE","3DNow!","DSP");
-open (INC,">$ENV{TEMPDIR}/Makefile.inc");
-foreach $feature(@features)
-{
-  foreach $line(@list)
-  {
-    if ( $line =~ m/$feature/)
-    {
-      print INC "WITH_$feature = yes\n";
-    }
-  }
-}
-close (INC);
diff --git a/multimedia/mplayerxp/files/install-user b/multimedia/mplayerxp/files/install-user
index 8f0dda4a6adf..0fd764316a50 100644
--- a/multimedia/mplayerxp/files/install-user
+++ b/multimedia/mplayerxp/files/install-user
@@ -1,5 +1,6 @@
 #This perl script links the codec config file
 #and the fonts dir to the user's home dir.
+#V0.2 Last touched: 2001-10-12 riggs
 
 if (-e "$ENV{HOME}/.mplayer/")
 {
@@ -16,14 +17,24 @@ $prefix=~ s/(.+mplayer).*/$1/;
 chop $prefix;
 
 print "You may choose any of the available language sets:\n\n";
-print "European fonts (e.g. dutch, french, german...) : e\n";
-print "Cyrillic fonts : c\n";
-print "Russian fonts: r\n";
+print "ISO-8859-1 Font : 1\n";
+print "ISO-8859-2 Font : 2\n";
+print "(old) Cyrillic fonts : c\n";
+print "Russian fonts : r\n";
 
 print "Your decision? ";
 chomp ($lang=<STDIN>);
 print "\n";
 
+if ($lang eq "1" || $lang eq "2")
+{
+	print "The available sizes for this font are 14,18,24,28.\n";
+	print "Please enter the wanted size: \n";
+	chomp ($size=<STDIN>);
+	if ($size ne "14" && $size ne "18" && $size ne "24" && $size ne "28") {$size=14;}
+}
+
+
 system "mkdir $ENV{HOME}/.mplayer";
 if ($lang eq "c")
 {
@@ -31,8 +42,12 @@ if ($lang eq "c")
 }
 elsif ($lang eq "r")
 {
-	system "ln -s $prefix/fonts/koi8r/ $ENV{HOME}/.mplayer/font";
+	system "ln -s $prefix/fonts/koi8r-font/ $ENV{HOME}/.mplayer/font";
+}
+elsif ($lang eq "2")
+{
+	system "ln -s $prefix/fonts/iso-8859-2/arial-$size/ $ENV{HOME}/.mplayer/font";
 }
-else {system "ln -s $prefix/fonts/iso/ $ENV{HOME}/.mplayer/font"};
+else {system "ln -s $prefix/fonts/iso-8859-1/arial-$size/ $ENV{HOME}/.mplayer/font"};
 
 system "ln -s $prefix/codecs.conf $ENV{HOME}/.mplayer/codecs.conf";
diff --git a/multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h b/multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h
deleted file mode 100644
index bbe349a91da3..000000000000
--- a/multimedia/mplayerxp/files/patch-Gui::mplayer::gtk::fs.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gui/mplayer/gtk/fs.h.orig	Fri Sep 28 19:48:50 2001
-+++ Gui/mplayer/gtk/fs.h	Fri Sep 28 19:49:11 2001
-@@ -9,7 +9,7 @@
- #include <glob.h>
- #include <unistd.h>
- 
--#ifdef	__SVR4
-+#if defined(__SVR4) || defined (__FreeBSD__)
- #define	get_current_dir_name()	getcwd(NULL, PATH_MAX)
- #endif
- 
diff --git a/multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h b/multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h
deleted file mode 100644
index a5c3768cdc7e..000000000000
--- a/multimedia/mplayerxp/files/patch-Gui::mplayer::psignal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- Gui/mplayer/psignal.h.orig	Fri Sep 28 19:46:22 2001
-+++ Gui/mplayer/psignal.h	Fri Sep 28 19:46:55 2001
-@@ -39,7 +39,7 @@
- #define mplIncAudioBufferDelay                   28
- #define mplDecAudioBufferDelay                   29
- 
--#ifdef	__SVR4
-+#if defined(__SVR4) || defined(__FreeBSD__)
- #define	SIGTYPE SIGUSR2
- #warning should we use SIGUSR1 or SIGUSR2 on linux, bsd, ... too?
- #else
diff --git a/multimedia/mplayerxp/files/patch-ad b/multimedia/mplayerxp/files/patch-ad
index 82abd70949a2..532df185635c 100644
--- a/multimedia/mplayerxp/files/patch-ad
+++ b/multimedia/mplayerxp/files/patch-ad
@@ -1,42 +1,62 @@
---- configure.orig	Fri Sep 28 19:21:08 2001
-+++ configure	Fri Sep 28 19:33:35 2001
+--- configure.old	Sun Oct  7 23:36:29 2001
++++ configure	Fri Oct 12 11:22:39 2001
 @@ -299,7 +299,7 @@
  _confcygwin="TARGET_CYGWIN=no"
  _confwin32=
- if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
+ if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then
 -    _archlibs="-rdynamic -pthread"
 +    _archlibs="-rdynamic ${PTHREAD_LIBS}"
  elif [ `echo $system_name | sed 's/[cC][yY][gG][wW][iI][nN].*/CYGWIN/'` = "CYGWIN" ]; then
      _confcygwin="TARGET_CYGWIN=yes"
      _confwin32="#define WIN32"
-@@ -766,7 +766,7 @@
+@@ -460,19 +460,8 @@
+ fi
+ 
+ if [ "$host_arch" = i386 ]; then
+-    if [ -r /proc/cpuinfo ]; then
+-	# linux with /proc mounted, extract cpu information from it
+-	_cpuinfo="cat /proc/cpuinfo"
+-    elif [ -r /compat/linux/proc/cpuinfo ]; then
+-        # FreeBSD with linux emulation /proc mounted, 
+-	# extract cpu information from it
+-        _cpuinfo="cat /compat/linux/proc/cpuinfo"
+-    else
+-	# all other OS try to extract cpu information from a small helper
+-	# program TOOLS/cpuinfo instead
+ 	$_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
+ 	_cpuinfo="TOOLS/cpuinfo"
+-    fi
+ 
+     pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
+     pparam=`$_cpuinfo | grep 'features' | cut -d ':' -f 2 | head -1`
+@@ -798,7 +787,7 @@
  $_cc $_extraincdir $_extralibdir $TMPC -o $TMPO -lvgagl -lvga > /dev/null 2>&1 && _svga=yes
  
- if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
+ if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" -o "$system_name" = "BSD/OS" ]; then
 -$_cc $TMPC -o $TMPO -pthread > /dev/null 2>&1 || \
 +$_cc $TMPC -o $TMPO ${PTHREAD_LIBS} > /dev/null 2>&1 || \
   { echo "Lib pthread not found."; rm -f $TMPC $TMPO $TMPS ; exit 1; }
  else
  $_cc $TMPC -o $TMPO -lpthread > /dev/null 2>&1 || \
-@@ -861,7 +861,7 @@
+@@ -893,7 +882,7 @@
  
  # this is not yet checked with OpenBSD - atmos
  if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
--$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 && _gl=yes
-+$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 && _gl=yes
+-$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm -pthread $_socklib > /dev/null 2>&1 && _gl=yes
++$_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 && _gl=yes
  else
- $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 && _gl=yes
+ $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 && _gl=yes
  fi
-@@ -872,7 +872,7 @@
+@@ -904,7 +893,7 @@
  EOF
  # this is not yet checked with OpenBSD - atmos
  if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
--$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -pthread $_socklib > /dev/null 2>&1 || \
-+$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 || \
+-$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm -pthread $_socklib > /dev/null 2>&1 || \
++$_cc $_x11incdir $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm ${PTHREAD_LIBS} $_socklib > /dev/null 2>&1 || \
   { _gl=no; echo "GL includes not found!";}
  else
- $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL $_socklib > /dev/null 2>&1 || \
-@@ -1613,33 +1613,33 @@
+ $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lGL -lm $_socklib > /dev/null 2>&1 || \
+@@ -1645,33 +1634,33 @@
  
  echo
  echo $_echo_n "Checking for gtk version ... $_echo_c"
@@ -76,7 +96,7 @@
  [ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
  echo "done"
  
-@@ -1668,7 +1668,7 @@
+@@ -1700,7 +1689,7 @@
     if [ "$system_name" = "FreeBSD" -o "$system_name" = "OpenBSD" ]; then
        # Under XFree86 4.x GL port is poorly designed
        if [ -r /usr/X11R6/bin/XFree86 ]; then
@@ -85,7 +105,7 @@
        else
           _gllib='-lGL'
        fi
-@@ -1895,7 +1895,7 @@
+@@ -1926,7 +1915,7 @@
  # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
  # for MT applications: 
  if [ "$system_name" = "FreeBSD" ]; then
diff --git a/multimedia/mplayerxp/files/patch-ae b/multimedia/mplayerxp/files/patch-ae
index 80b04bc7ede0..11a873330955 100644
--- a/multimedia/mplayerxp/files/patch-ae
+++ b/multimedia/mplayerxp/files/patch-ae
@@ -1,20 +1,29 @@
---- Makefile.orig	Fri Sep 28 19:37:12 2001
-+++ Makefile	Fri Sep 28 19:41:53 2001
-@@ -113,15 +113,8 @@
+--- Makefile.orig	Fri Oct  5 10:39:21 2001
++++ Makefile	Mon Oct 15 21:51:01 2001
+@@ -118,24 +118,8 @@
  	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DCODECS2HTML
  
- install: $(PRG) $(PRG_FIBMAP)
--	install -d $(BINDIR)
+ install: $(ALL_PRG)
+-	if [ ! -e $(BINDIR) ]; then \
+-		mkdir -p $(BINDIR); \
+-	fi
 -	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
--	install -d $(prefix)/man/man1
--	install -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-ifeq ($(GUI),yes)
+-	-ln -s $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+-endif
+-	if [ ! -e $(prefix)/man/man1 ]; then \
+-		mkdir -p $(prefix)/man/man1; \
+-	fi
+-	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-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."
 -	@echo "Without this (or without running mplayer as root) you won't be"
 -	@echo "able to play encrypted DVDs."
--	install -o root -g root -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
-+	install -C -m 755 -s $(PRG) $(BINDIR)/$(PRG)
-+	install -C -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-	-install -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
+-endif
++	@${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG)
++	@${BSD_INSTALL_MAN} DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
  
  clean:
  	rm -f *.o *~ $(OBJS)
diff --git a/multimedia/mplayerxp/pkg-descr b/multimedia/mplayerxp/pkg-descr
index a613c1786f48..ea53eb32e136 100644
--- a/multimedia/mplayerxp/pkg-descr
+++ b/multimedia/mplayerxp/pkg-descr
@@ -5,4 +5,6 @@ It is based on the windows codec compilation and
 provides the ability to play many formats
 in a very good quality without much CPU comsumption.
 
-WWW: http://mplayer.sourceforge.net/
+Support for ffmpeg and DVD are also included.
+
+WWW: http://www.mplayerhq.hu/
diff --git a/multimedia/mplayerxp/pkg-message b/multimedia/mplayerxp/pkg-message
index 242404f7723b..cec7bbd056f3 100644
--- a/multimedia/mplayerxp/pkg-message
+++ b/multimedia/mplayerxp/pkg-message
@@ -12,3 +12,7 @@ Please take a look at docs in
 
 You can download skins from the mplayer homepage:
 http://www.mplayerhq.hu/
+
+In order to use DVD please make sure that your
+kernel and base system is newer than 2001-09-25,
+otherwise DVD play will not work!