10 files changed, 314 insertions, 328 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 079bed0ae495..9c073575225b 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -6,17 +6,21 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.50.0.2
-PORTREVISION=	1
+PORTVERSION=	0.60.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
+		http://www.mplayerhq.hu/MPlayer/releases/ \
+		http://www2.mplayerhq.hu/MPlayer/releases/ \
+		ftp://ftp.mplayerhq.hu/MPlayer/releases/ \
+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
 		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.50
+DISTNAME=	MPlayer-0.60
 
 MAINTAINER=	riggs@rrr.de
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		giconv.2:${PORTSDIR}/converters/iconv \
 		SDL-1.1.3:${PORTSDIR}/devel/sdl12
 RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
 
@@ -26,8 +30,8 @@ USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-esd
+		PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS= --disable-mencoder
 
 MAN1=		mplayer.1
 MANCOMPRESSED=	no
@@ -35,17 +39,33 @@ MANCOMPRESSED=	no
 CONFFILES=	codecs.conf example.conf
 DOCFILES=       DVB bugreports.html cd-dvd.html codecs-in.html \
 		codecs.html documentation.html faq.html skin-en.html \
-		sound.html video.html tech/tech-eng.txt
+		DXR3 formats.html skin-en.html sound.html tech/tech-eng.txt \
+		video.html
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libdvdread.so.2)
+WITH_DVD=	yes
+.endif
+
+.if exists(${X11BASE}/bin/xanim)
+WITH_XANIM=	yes
+.endif
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
 
 .if defined(WITH_GUI)
 USE_GTK=	yes
+
+RUN_DEPENDS+=	${SKIN_DETECTION_FILE}:${SKIN_PORT}
+
 CONFIGURE_ARGS+=	--enable-gui
+
+#SKIN_PORT=     ${PORTSDIR}/graphics/mplayer-skins
+SKIN_PORT=     ${.CURDIR}/../mplayer-skins
+SKIN_DETECTION_FILE!=  ${MAKE} -f ${SKIN_PORT}/Makefile -V SKIN_DETECTION_FILE
 .endif
 
 .if defined(WITH_DVD)
@@ -61,6 +81,14 @@ LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
 .endif
 
+.if defined(WITH_XANIM) 
+BUILD_DEPENDS+=	xanim:${PORTSDIR}/graphics/xanim
+
+CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim
+.else
+CONFIGURE_ARGS+=--disable-xanim
+.endif
+
 # "enable" build for other archs
 .if ${ARCH} == "i386"
 .if defined(WITHOUT_MMX)
@@ -86,7 +114,8 @@ RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 CONFIGURE_ARGS+=	--with-win32libdir=${LOCALBASE}/lib/win32
 
-CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+#CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif # ARCH == i386
@@ -108,6 +137,9 @@ pre-everything::
 .if !defined(WITH_VORBIS)
 	@${ECHO_MSG} "You can enable VORBIS sound support by defining WITH_VORBIS."
 .endif
+.if !defined(WITH_XANIM)
+	@${ECHO_MSG} "You can enable XAnim DLL support by defining WITH_XANIM."
+.endif
 .if ${ARCH} == "i386"
 .if !defined(WITHOUT_WIN32_CODECS)
 	@${ECHO_MSG} "You can disable support (this turns this into a X86 only port)"
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 85e5441a3fbe..cca391e55fc1 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.50.tar.bz2) = b8c4fc82db0571a237bbed81c602d48c
+MD5 (MPlayer-0.60.tar.bz2) = 0acefa2cb6130b14848955695e51d934
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index bb36af32952d..dc33a4c21ead 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,150 +1,78 @@
---- configure.old	Sun Oct  7 23:36:29 2001
-+++ configure	Tue Nov 13 15:38:29 2001
-@@ -299,7 +299,7 @@
- _confcygwin="TARGET_CYGWIN=no"
- _confwin32=
- 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"
-@@ -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" -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 || \
-@@ -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 -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 -lm $_socklib > /dev/null 2>&1 && _gl=yes
- fi
-@@ -904,7 +893,7 @@
+--- configure.old	Fri Jan  4 23:48:35 2002
++++ configure	Sat Jan  5 00:26:19 2002
+@@ -415,19 +415,10 @@
+ 
+ # Try to find the available options for the current CPU
+ if x86 ; then
+-  if test -r /proc/cpuinfo ; then
+-    # linux with /proc mounted, extract cpu information from it
+-    _cpuinfo="cat /proc/cpuinfo"
+-  elif test -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`
+   pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -1`
+@@ -1135,14 +1126,7 @@
+ int main(void) { (void) malloc(0); return 0; }
  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 -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 -lm $_socklib > /dev/null 2>&1 || \
-@@ -998,33 +987,10 @@
- # ---
- # check availability of some header files
+ _malloc=no
+-cc_check && _malloc=yes
+-if test "$_malloc" = yes ; then
+-  _def_malloc='#define HAVE_MALLOC_H 1'
+-else
+-  _def_malloc='#undef HAVE_MALLOC_H'
+-fi
+-# malloc.h emits a warning in FreeBSD
+-freebsd && _def_malloc='#undef HAVE_MALLOC_H'
++_def_malloc='#undef HAVE_MALLOC_H'
+ echores "$_malloc"
  
--cat > $TMPC << EOF
--#include <malloc.h>
--int main( void ) { return 0; }
--EOF
  
--_memalign_def=
+@@ -1153,12 +1137,7 @@
+ int main (void) { (void) memalign(64, sizeof(char)); return 0; }
+ EOF
  _memalign=no
- _malloc_h=no
--if $_cc -o $TMPO $TMPC 2> /dev/null ; then
--_malloc_h=yes
--# check for memalign - atmos
--# should this be restricted to x86, or customized for cpu types (opt for cacheline sizes)?
--cat > $TMPC << EOF
--#include <malloc.h>
--int main ( void ) {
--char *string = NULL;
--string = memalign(64, sizeof(char));
--return 0;
--}
--EOF
--_memalign_def='/* #define memalign(a,b) malloc(b) */'
--_memalign=yes
--$_cc -o $TMPO $TMPC 2> /dev/null || _memalign=no 
--if [ "$_memalign" = "no" ]; then
- _memalign_def='#define memalign(a,b) malloc(b)'
+-cc_check && _memalign=yes
+-if test "$_memalign" = yes ; then
+- _def_memalign='#define HAVE_MEMALIGN 1'
+-else
+- _def_memalign='#undef HAVE_MEMALIGN'
 -fi
--fi
- 
- 
- cat > $TMPC << EOF
-@@ -1645,33 +1611,33 @@
- 
- echo
- echo $_echo_n "Checking for gtk version ... $_echo_c"
--_gtk=`gtk-config --version 2>&1`
-+_gtk=`${GTK_CONFIG} --version 2>&1`
- [ -z "$_gtk" ] && { echo 'gtk not found.'; exit 1; }
- echo "$_gtk"
++_def_memalign='#undef HAVE_MEMALIGN'
+ echores "$_memalign"
  
- echo $_echo_n "Checking for gtk includes ... $_echo_c"
--_gtkinc=`gtk-config --cflags 2>&1`
-+_gtkinc=`${GTK_CONFIG} --cflags 2>&1`
- [ -z "$_gtkinc" ] && { echo 'gtk not found.'; exit 1; }
- echo "done"
  
- echo $_echo_n "Checking for gtk libs ... $_echo_c"
--_gtklib=`gtk-config --libs 2>&1`
-+_gtklib=`${GTK_CONFIG} --libs 2>&1`
- [ -z "$_gtklib" ] && { echo 'gtk not found.'; exit 1; }
- echo "done"
- 
- echo
- echo $_echo_n "Checking for glib version ... $_echo_c"
--_glib=`glib-config --version 2>&1`
-+_glib=`${GLIB_CONFIG} --version 2>&1`
- [ -z "$_glib" ] && { echo 'glib not found.'; exit 1; }
- echo "$_glib"
- 
- echo $_echo_n "Checking for glib includes ... $_echo_c"
--_glibinc=`glib-config --cflags 2>&1`
-+_glibinc=`${GLIB_CONFIG} --cflags 2>&1`
- [ -z "$_glibinc" ] && { echo 'glib not found.'; exit 1; }
- echo "done"
+@@ -1235,15 +1214,7 @@
+ void* func(void *arg) { return arg; }
+ int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
+ EOF
+-if ( cc_check && $TMPO ) ; then              # QNX
+-  _ld_pthread=''
+-elif ( cc_check -lpthread && $TMPO ) ; then
+-  _ld_pthread='-lpthread'
+-elif ( cc_check -pthread && $TMPO ) ; then
+-  _ld_pthread='-pthread'
+-else
+-  die "Lib pthread not found. (needed by windows and networking stuff)"
+-fi
++_ld_pthread="${PTHREAD_LIBS}"
+ echores "yes (using $_ld_pthread)"
  
- echo $_echo_n "Checking for glib libs ... $_echo_c"
--_gliblib=`glib-config --libs 2>&1`
-+_gliblib=`${GLIB_CONFIG} --libs 2>&1`
- [ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
- echo "done"
  
-@@ -1700,7 +1666,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
--         _gllib='-lGL -pthread'
-+         _gllib='-lGL ${PTHREAD_LIBS}'
-       else
-          _gllib='-lGL'
-       fi
-@@ -1926,7 +1892,7 @@
- # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
- # for MT applications: 
- if [ "$system_name" = "FreeBSD" ]; then
--CFLAGS="$CFLAGS -D_THREAD_SAFE"
-+CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
+@@ -2692,7 +2663,7 @@
+   CFLAGS="$CFLAGS -D_REENTRANT"
+ elif bsd ; then
+   # FIXME bsd needs this so maybe other OS'es
+-  CFLAGS="$CFLAGS -D_THREAD_SAFE"
++  CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
  fi
  
  # 64 bit file offsets?
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index 11a873330955..34aaa37e50bd 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,29 +1,60 @@
---- 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
+--- Makefile.old	Wed Jan  2 20:05:02 2002
++++ Makefile	Sat Jan  5 01:38:46 2002
+@@ -15,12 +15,12 @@
+ PRG_MENCODER = mencoder
+ 
+ #prefix = /usr/local
+-BINDIR = ${prefix}/bin
++BINDIR = $(PREFIX)/bin
+ # BINDIR = /usr/local/bin
+-MANDIR = ${prefix}/man
++MANDIR = $(PREFIX)/man
+ 
+ # a BSD compatible 'install' program
+-INSTALL = install
++INSTALL = @${BSD_INSTALL_PROGRAM}
+ 
+ SRCS_COMMON = adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c
+ SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c
+@@ -186,38 +186,12 @@
  
  install: $(ALL_PRG)
--	if [ ! -e $(BINDIR) ]; then \
--		mkdir -p $(BINDIR); \
--	fi
--	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+ 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
+-	$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
 -ifeq ($(GUI),yes)
--	-ln -s $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+-	-ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
 -endif
--	if [ ! -e $(prefix)/man/man1 ]; then \
--		mkdir -p $(prefix)/man/man1; \
++	$(INSTALL) $(PRG) $(BINDIR)/$(PRG)
+ 	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 $(MANDIR)/man1/mplayer.1
+ ifeq ($(MENCODER),yes)
+ 	$(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+-	$(INSTALL) -c -m 644 DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1
+-endif
+-	@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
+-	@if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+-	@if test ! -f $(DATADIR)/font/font.desc ; then \
+-	echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \
+-	echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
 -	fi
--	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-ifeq ($(GUI),yes)
+-	@if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
+-	@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
+-	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
+-endif
+-	@if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
+-	@if test -f $(CONFDIR)/codecs.conf.old ; then mv -f $(CONFDIR)/codecs.conf.old $(CONFDIR)/codecs.conf.older ; fi
+-	@if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+-	$(INSTALL) -c -m 644 etc/codecs.conf $(CONFDIR)/codecs.conf
+-
 -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 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
+-	-$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
++	@${BSD_INSTALL_MAN} DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1
+ endif
  
- clean:
- 	rm -f *.o *~ $(OBJS)
+ uninstall:
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 004bead94968..a6e4ad2f248f 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -1,11 +1,13 @@
 bin/mplayer
 %%PORTDOCS%%share/doc/mplayer/DVB
+%%PORTDOCS%%share/doc/mplayer/DXR3
 %%PORTDOCS%%share/doc/mplayer/bugreports.html
 %%PORTDOCS%%share/doc/mplayer/cd-dvd.html
 %%PORTDOCS%%share/doc/mplayer/codecs-in.html
 %%PORTDOCS%%share/doc/mplayer/codecs.html
 %%PORTDOCS%%share/doc/mplayer/documentation.html
 %%PORTDOCS%%share/doc/mplayer/faq.html
+%%PORTDOCS%%share/doc/mplayer/formats.html
 %%PORTDOCS%%share/doc/mplayer/skin-en.html
 %%PORTDOCS%%share/doc/mplayer/sound.html
 %%PORTDOCS%%share/doc/mplayer/video.html
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 079bed0ae495..9c073575225b 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -6,17 +6,21 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.50.0.2
-PORTREVISION=	1
+PORTVERSION=	0.60.1
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
+		http://www.mplayerhq.hu/MPlayer/releases/ \
+		http://www2.mplayerhq.hu/MPlayer/releases/ \
+		ftp://ftp.mplayerhq.hu/MPlayer/releases/ \
+		ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
 		http://www.stud.uni-karlsruhe.de/~uedc/mplayer/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.50
+DISTNAME=	MPlayer-0.60
 
 MAINTAINER=	riggs@rrr.de
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
+		giconv.2:${PORTSDIR}/converters/iconv \
 		SDL-1.1.3:${PORTSDIR}/devel/sdl12
 RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/graphics/mplayer-fonts
 
@@ -26,8 +30,8 @@ USE_GMAKE=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_ARGS=	--disable-esd
+		PTHREAD_LIBS=${PTHREAD_LIBS}
+CONFIGURE_ARGS= --disable-mencoder
 
 MAN1=		mplayer.1
 MANCOMPRESSED=	no
@@ -35,17 +39,33 @@ MANCOMPRESSED=	no
 CONFFILES=	codecs.conf example.conf
 DOCFILES=       DVB bugreports.html cd-dvd.html codecs-in.html \
 		codecs.html documentation.html faq.html skin-en.html \
-		sound.html video.html tech/tech-eng.txt
+		DXR3 formats.html skin-en.html sound.html tech/tech-eng.txt \
+		video.html
 
 .include <bsd.port.pre.mk>
 
+.if exists(${LOCALBASE}/lib/libdvdread.so.2)
+WITH_DVD=	yes
+.endif
+
+.if exists(${X11BASE}/bin/xanim)
+WITH_XANIM=	yes
+.endif
+
 .if defined(WITH_OPTIMIZED_CFLAGS)
 CFLAGS+=       -O3 -ffast-math -fomit-frame-pointer
 .endif
 
 .if defined(WITH_GUI)
 USE_GTK=	yes
+
+RUN_DEPENDS+=	${SKIN_DETECTION_FILE}:${SKIN_PORT}
+
 CONFIGURE_ARGS+=	--enable-gui
+
+#SKIN_PORT=     ${PORTSDIR}/graphics/mplayer-skins
+SKIN_PORT=     ${.CURDIR}/../mplayer-skins
+SKIN_DETECTION_FILE!=  ${MAKE} -f ${SKIN_PORT}/Makefile -V SKIN_DETECTION_FILE
 .endif
 
 .if defined(WITH_DVD)
@@ -61,6 +81,14 @@ LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 LIB_DEPENDS+=	vorbis.1:${PORTSDIR}/audio/libvorbis
 .endif
 
+.if defined(WITH_XANIM) 
+BUILD_DEPENDS+=	xanim:${PORTSDIR}/graphics/xanim
+
+CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim
+.else
+CONFIGURE_ARGS+=--disable-xanim
+.endif
+
 # "enable" build for other archs
 .if ${ARCH} == "i386"
 .if defined(WITHOUT_MMX)
@@ -86,7 +114,8 @@ RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 
 CONFIGURE_ARGS+=	--with-win32libdir=${LOCALBASE}/lib/win32
 
-CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+#CODEC_PORT=	${PORTSDIR}/graphics/win32-codecs
+CODEC_PORT=	${.CURDIR}/../win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif # ARCH == i386
@@ -108,6 +137,9 @@ pre-everything::
 .if !defined(WITH_VORBIS)
 	@${ECHO_MSG} "You can enable VORBIS sound support by defining WITH_VORBIS."
 .endif
+.if !defined(WITH_XANIM)
+	@${ECHO_MSG} "You can enable XAnim DLL support by defining WITH_XANIM."
+.endif
 .if ${ARCH} == "i386"
 .if !defined(WITHOUT_WIN32_CODECS)
 	@${ECHO_MSG} "You can disable support (this turns this into a X86 only port)"
diff --git a/multimedia/mplayerxp/distinfo b/multimedia/mplayerxp/distinfo
index 85e5441a3fbe..cca391e55fc1 100644
--- a/multimedia/mplayerxp/distinfo
+++ b/multimedia/mplayerxp/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.50.tar.bz2) = b8c4fc82db0571a237bbed81c602d48c
+MD5 (MPlayer-0.60.tar.bz2) = 0acefa2cb6130b14848955695e51d934
diff --git a/multimedia/mplayerxp/files/patch-ad b/multimedia/mplayerxp/files/patch-ad
index bb36af32952d..dc33a4c21ead 100644
--- a/multimedia/mplayerxp/files/patch-ad
+++ b/multimedia/mplayerxp/files/patch-ad
@@ -1,150 +1,78 @@
---- configure.old	Sun Oct  7 23:36:29 2001
-+++ configure	Tue Nov 13 15:38:29 2001
-@@ -299,7 +299,7 @@
- _confcygwin="TARGET_CYGWIN=no"
- _confwin32=
- 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"
-@@ -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" -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 || \
-@@ -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 -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 -lm $_socklib > /dev/null 2>&1 && _gl=yes
- fi
-@@ -904,7 +893,7 @@
+--- configure.old	Fri Jan  4 23:48:35 2002
++++ configure	Sat Jan  5 00:26:19 2002
+@@ -415,19 +415,10 @@
+ 
+ # Try to find the available options for the current CPU
+ if x86 ; then
+-  if test -r /proc/cpuinfo ; then
+-    # linux with /proc mounted, extract cpu information from it
+-    _cpuinfo="cat /proc/cpuinfo"
+-  elif test -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`
+   pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -1`
+@@ -1135,14 +1126,7 @@
+ int main(void) { (void) malloc(0); return 0; }
  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 -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 -lm $_socklib > /dev/null 2>&1 || \
-@@ -998,33 +987,10 @@
- # ---
- # check availability of some header files
+ _malloc=no
+-cc_check && _malloc=yes
+-if test "$_malloc" = yes ; then
+-  _def_malloc='#define HAVE_MALLOC_H 1'
+-else
+-  _def_malloc='#undef HAVE_MALLOC_H'
+-fi
+-# malloc.h emits a warning in FreeBSD
+-freebsd && _def_malloc='#undef HAVE_MALLOC_H'
++_def_malloc='#undef HAVE_MALLOC_H'
+ echores "$_malloc"
  
--cat > $TMPC << EOF
--#include <malloc.h>
--int main( void ) { return 0; }
--EOF
  
--_memalign_def=
+@@ -1153,12 +1137,7 @@
+ int main (void) { (void) memalign(64, sizeof(char)); return 0; }
+ EOF
  _memalign=no
- _malloc_h=no
--if $_cc -o $TMPO $TMPC 2> /dev/null ; then
--_malloc_h=yes
--# check for memalign - atmos
--# should this be restricted to x86, or customized for cpu types (opt for cacheline sizes)?
--cat > $TMPC << EOF
--#include <malloc.h>
--int main ( void ) {
--char *string = NULL;
--string = memalign(64, sizeof(char));
--return 0;
--}
--EOF
--_memalign_def='/* #define memalign(a,b) malloc(b) */'
--_memalign=yes
--$_cc -o $TMPO $TMPC 2> /dev/null || _memalign=no 
--if [ "$_memalign" = "no" ]; then
- _memalign_def='#define memalign(a,b) malloc(b)'
+-cc_check && _memalign=yes
+-if test "$_memalign" = yes ; then
+- _def_memalign='#define HAVE_MEMALIGN 1'
+-else
+- _def_memalign='#undef HAVE_MEMALIGN'
 -fi
--fi
- 
- 
- cat > $TMPC << EOF
-@@ -1645,33 +1611,33 @@
- 
- echo
- echo $_echo_n "Checking for gtk version ... $_echo_c"
--_gtk=`gtk-config --version 2>&1`
-+_gtk=`${GTK_CONFIG} --version 2>&1`
- [ -z "$_gtk" ] && { echo 'gtk not found.'; exit 1; }
- echo "$_gtk"
++_def_memalign='#undef HAVE_MEMALIGN'
+ echores "$_memalign"
  
- echo $_echo_n "Checking for gtk includes ... $_echo_c"
--_gtkinc=`gtk-config --cflags 2>&1`
-+_gtkinc=`${GTK_CONFIG} --cflags 2>&1`
- [ -z "$_gtkinc" ] && { echo 'gtk not found.'; exit 1; }
- echo "done"
  
- echo $_echo_n "Checking for gtk libs ... $_echo_c"
--_gtklib=`gtk-config --libs 2>&1`
-+_gtklib=`${GTK_CONFIG} --libs 2>&1`
- [ -z "$_gtklib" ] && { echo 'gtk not found.'; exit 1; }
- echo "done"
- 
- echo
- echo $_echo_n "Checking for glib version ... $_echo_c"
--_glib=`glib-config --version 2>&1`
-+_glib=`${GLIB_CONFIG} --version 2>&1`
- [ -z "$_glib" ] && { echo 'glib not found.'; exit 1; }
- echo "$_glib"
- 
- echo $_echo_n "Checking for glib includes ... $_echo_c"
--_glibinc=`glib-config --cflags 2>&1`
-+_glibinc=`${GLIB_CONFIG} --cflags 2>&1`
- [ -z "$_glibinc" ] && { echo 'glib not found.'; exit 1; }
- echo "done"
+@@ -1235,15 +1214,7 @@
+ void* func(void *arg) { return arg; }
+ int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
+ EOF
+-if ( cc_check && $TMPO ) ; then              # QNX
+-  _ld_pthread=''
+-elif ( cc_check -lpthread && $TMPO ) ; then
+-  _ld_pthread='-lpthread'
+-elif ( cc_check -pthread && $TMPO ) ; then
+-  _ld_pthread='-pthread'
+-else
+-  die "Lib pthread not found. (needed by windows and networking stuff)"
+-fi
++_ld_pthread="${PTHREAD_LIBS}"
+ echores "yes (using $_ld_pthread)"
  
- echo $_echo_n "Checking for glib libs ... $_echo_c"
--_gliblib=`glib-config --libs 2>&1`
-+_gliblib=`${GLIB_CONFIG} --libs 2>&1`
- [ -z "$_gliblib" ] && { echo 'glib not found.'; exit 1; }
- echo "done"
  
-@@ -1700,7 +1666,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
--         _gllib='-lGL -pthread'
-+         _gllib='-lGL ${PTHREAD_LIBS}'
-       else
-          _gllib='-lGL'
-       fi
-@@ -1926,7 +1892,7 @@
- # Under FreeBSD (maybe other systems as well?) we have to add to CFLAGS
- # for MT applications: 
- if [ "$system_name" = "FreeBSD" ]; then
--CFLAGS="$CFLAGS -D_THREAD_SAFE"
-+CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
+@@ -2692,7 +2663,7 @@
+   CFLAGS="$CFLAGS -D_REENTRANT"
+ elif bsd ; then
+   # FIXME bsd needs this so maybe other OS'es
+-  CFLAGS="$CFLAGS -D_THREAD_SAFE"
++  CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
  fi
  
  # 64 bit file offsets?
diff --git a/multimedia/mplayerxp/files/patch-ae b/multimedia/mplayerxp/files/patch-ae
index 11a873330955..34aaa37e50bd 100644
--- a/multimedia/mplayerxp/files/patch-ae
+++ b/multimedia/mplayerxp/files/patch-ae
@@ -1,29 +1,60 @@
---- 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
+--- Makefile.old	Wed Jan  2 20:05:02 2002
++++ Makefile	Sat Jan  5 01:38:46 2002
+@@ -15,12 +15,12 @@
+ PRG_MENCODER = mencoder
+ 
+ #prefix = /usr/local
+-BINDIR = ${prefix}/bin
++BINDIR = $(PREFIX)/bin
+ # BINDIR = /usr/local/bin
+-MANDIR = ${prefix}/man
++MANDIR = $(PREFIX)/man
+ 
+ # a BSD compatible 'install' program
+-INSTALL = install
++INSTALL = @${BSD_INSTALL_PROGRAM}
+ 
+ SRCS_COMMON = adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c
+ SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c
+@@ -186,38 +186,12 @@
  
  install: $(ALL_PRG)
--	if [ ! -e $(BINDIR) ]; then \
--		mkdir -p $(BINDIR); \
--	fi
--	install -m 755 -s $(PRG) $(BINDIR)/$(PRG)
+ 	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
+-	$(INSTALL) -m 755 -s $(PRG) $(BINDIR)/$(PRG)
 -ifeq ($(GUI),yes)
--	-ln -s $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
+-	-ln -sf $(BINDIR)/$(PRG) $(BINDIR)/gmplayer
 -endif
--	if [ ! -e $(prefix)/man/man1 ]; then \
--		mkdir -p $(prefix)/man/man1; \
++	$(INSTALL) $(PRG) $(BINDIR)/$(PRG)
+ 	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 $(MANDIR)/man1/mplayer.1
+ ifeq ($(MENCODER),yes)
+ 	$(INSTALL) -m 755 -s $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+-	$(INSTALL) -c -m 644 DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1
+-endif
+-	@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
+-	@if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+-	@if test ! -f $(DATADIR)/font/font.desc ; then \
+-	echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \
+-	echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
 -	fi
--	install -c -m 644 DOCS/mplayer.1 $(prefix)/man/man1/mplayer.1
+-ifeq ($(GUI),yes)
+-	@if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
+-	@echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
+-	@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
+-endif
+-	@if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
+-	@if test -f $(CONFDIR)/codecs.conf.old ; then mv -f $(CONFDIR)/codecs.conf.old $(CONFDIR)/codecs.conf.older ; fi
+-	@if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
+-	$(INSTALL) -c -m 644 etc/codecs.conf $(CONFDIR)/codecs.conf
+-
 -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 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
+-	-$(INSTALL) -o 0 -g 0 -m 4755 -s $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
++	@${BSD_INSTALL_MAN} DOCS/mencoder.1 $(MANDIR)/man1/mencoder.1
+ endif
  
- clean:
- 	rm -f *.o *~ $(OBJS)
+ uninstall:
diff --git a/multimedia/mplayerxp/pkg-plist b/multimedia/mplayerxp/pkg-plist
index 004bead94968..a6e4ad2f248f 100644
--- a/multimedia/mplayerxp/pkg-plist
+++ b/multimedia/mplayerxp/pkg-plist
@@ -1,11 +1,13 @@
 bin/mplayer
 %%PORTDOCS%%share/doc/mplayer/DVB
+%%PORTDOCS%%share/doc/mplayer/DXR3
 %%PORTDOCS%%share/doc/mplayer/bugreports.html
 %%PORTDOCS%%share/doc/mplayer/cd-dvd.html
 %%PORTDOCS%%share/doc/mplayer/codecs-in.html
 %%PORTDOCS%%share/doc/mplayer/codecs.html
 %%PORTDOCS%%share/doc/mplayer/documentation.html
 %%PORTDOCS%%share/doc/mplayer/faq.html
+%%PORTDOCS%%share/doc/mplayer/formats.html
 %%PORTDOCS%%share/doc/mplayer/skin-en.html
 %%PORTDOCS%%share/doc/mplayer/sound.html
 %%PORTDOCS%%share/doc/mplayer/video.html