o Update to 0.90.0.9 [1]

o Add WITH_FREETYPE knob [2]

PR:		44362 [2]
Submitted by:	maintainer [1],
		Pat Lashley <patl+freebsd@volant.org> [2]
Reviewed by:	maintainer

8 files changed, 84 insertions, 32 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 6c9b9597f5a2..02b783f6abd1 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.90.0.8
-PORTREVISION=	2
+PORTVERSION=	0.90.0.9
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.mplayerhq.hu/MPlayer/releases/ \
@@ -17,7 +16,7 @@ MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp.lug.udel.edu/MPlayer/releases/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.90pre8
+DISTNAME=	MPlayer-0.90pre9
 
 MAINTAINER=	riggs@rrr.de
 
@@ -134,6 +133,12 @@ RUN_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMe
 BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 .endif
 
+.if defined(WITH_FREETYPE)
+CONFIGURE_ARGS+=	--with-extraincdir=${LOCALBASE}/include/freetype2 \
+			--enable-freetype
+LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
+.endif
+
 .if defined(WITH_XANIM)
 BUILD_DEPENDS+=	xanim:${PORTSDIR}/graphics/xanim
 
@@ -211,6 +216,13 @@ pre-everything::
 .if !defined(WITH_XANIM)
 	@${ECHO_MSG} "You can enable XAnim DLL support by defining WITH_XANIM."
 .endif
+.if !defined(WITH_LIVEMEDIA)
+	@${ECHO_MSG} "You can enable liveMedia support by defining WITH_LIVEMEDIA."
+.endif
+.if !defined(WITH_FREETYPE)
+	@${ECHO_MSG} "You can enable truetype font support by defining WITH_FREETYPE."
+	@${ECHO_MSG} "    But use with caution. mplayer won't use the standard fonts anymore."
+.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 e483e3861986..2a476def967c 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.90pre8.tar.bz2) = 8c844865b05574a1cfb2813e8487d21b
+MD5 (MPlayer-0.90pre9.tar.bz2) = 527fe1559507f60bbbf9d887d07a0ea9
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index 5ebd397726a8..cfd8603b66f5 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,6 +1,6 @@
---- configure.orig	Tue Sep 17 21:47:55 2002
-+++ configure	Thu Sep 19 12:19:12 2002
-@@ -491,19 +491,10 @@
+--- configure.orig	Thu Oct 24 20:12:40 2002
++++ configure	Fri Nov  1 12:46:36 2002
+@@ -495,19 +495,10 @@
  
  # Try to find the available options for the current CPU
  if x86 || ppc; then
@@ -20,7 +20,7 @@
  
    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`
-@@ -1289,8 +1280,8 @@
+@@ -1302,8 +1293,8 @@
      ;;
  
    *)
@@ -31,7 +31,16 @@
      ;;
  
    esac
-@@ -1688,13 +1679,7 @@
+@@ -1313,7 +1304,7 @@
+ test -z "$_bindir" && _bindir="$_prefix/bin"
+ test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
+ test -z "$_mandir" && _mandir="$_prefix/man"
+-test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
++test -z "$_confdir" && _confdir="$_prefix/share/mplayer"
+ test -z "$_libdir" && _libdir="$_prefix/lib"
+ test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
+ 
+@@ -1702,13 +1693,7 @@
  
  
  echocheck "memalign()"
@@ -45,7 +54,7 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -1771,31 +1756,7 @@
+@@ -1785,31 +1770,7 @@
  
  
  echocheck "pthread"
@@ -78,7 +87,7 @@
  echores "yes (using $_ld_pthread)"
  
  
-@@ -4211,7 +4172,7 @@
+@@ -4277,7 +4238,7 @@
    CFLAGS="$CFLAGS -D_REENTRANT"
  elif bsd ; then
    # FIXME bsd needs this so maybe other OS'es
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index 8fa1b930b4c2..b9d7a7e3daba 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Sep  9 13:47:54 2002
-+++ Makefile	Thu Sep 19 12:54:34 2002
+--- Makefile.orig	Wed Oct 23 19:20:59 2002
++++ Makefile	Fri Nov  1 12:31:48 2002
 @@ -24,7 +24,7 @@
  endif
  
@@ -8,8 +8,8 @@
 +INSTALL = @${BSD_INSTALL_PROGRAM}
  
  SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c
- SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c me-opt-reg.c xvid_vbr.c
-@@ -193,44 +193,11 @@
+ SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c
+@@ -201,49 +201,11 @@
  ifeq ($(VIDIX),yes)
  	$(DO_MAKE)
  endif
@@ -40,10 +40,15 @@
 -	@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 ($(DVDKIT),yes)
 -ifeq ($(DVDKIT_SHARED),yes)
+-ifeq ($(DVDKIT2),yes)
 -	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit2/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+-else
+-ifeq ($(DVDKIT),yes)
+-	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+-endif
 -endif
 -endif
 -ifeq ($(CSS_USE),yes)
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 6c9b9597f5a2..02b783f6abd1 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.90.0.8
-PORTREVISION=	2
+PORTVERSION=	0.90.0.9
 CATEGORIES=	graphics
 MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		http://www.mplayerhq.hu/MPlayer/releases/ \
@@ -17,7 +16,7 @@ MASTER_SITES=	http://ftp.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp.lug.udel.edu/MPlayer/releases/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.90pre8
+DISTNAME=	MPlayer-0.90pre9
 
 MAINTAINER=	riggs@rrr.de
 
@@ -134,6 +133,12 @@ RUN_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMe
 BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 .endif
 
+.if defined(WITH_FREETYPE)
+CONFIGURE_ARGS+=	--with-extraincdir=${LOCALBASE}/include/freetype2 \
+			--enable-freetype
+LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
+.endif
+
 .if defined(WITH_XANIM)
 BUILD_DEPENDS+=	xanim:${PORTSDIR}/graphics/xanim
 
@@ -211,6 +216,13 @@ pre-everything::
 .if !defined(WITH_XANIM)
 	@${ECHO_MSG} "You can enable XAnim DLL support by defining WITH_XANIM."
 .endif
+.if !defined(WITH_LIVEMEDIA)
+	@${ECHO_MSG} "You can enable liveMedia support by defining WITH_LIVEMEDIA."
+.endif
+.if !defined(WITH_FREETYPE)
+	@${ECHO_MSG} "You can enable truetype font support by defining WITH_FREETYPE."
+	@${ECHO_MSG} "    But use with caution. mplayer won't use the standard fonts anymore."
+.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 e483e3861986..2a476def967c 100644
--- a/multimedia/mplayerxp/distinfo
+++ b/multimedia/mplayerxp/distinfo
@@ -1 +1 @@
-MD5 (MPlayer-0.90pre8.tar.bz2) = 8c844865b05574a1cfb2813e8487d21b
+MD5 (MPlayer-0.90pre9.tar.bz2) = 527fe1559507f60bbbf9d887d07a0ea9
diff --git a/multimedia/mplayerxp/files/patch-ad b/multimedia/mplayerxp/files/patch-ad
index 5ebd397726a8..cfd8603b66f5 100644
--- a/multimedia/mplayerxp/files/patch-ad
+++ b/multimedia/mplayerxp/files/patch-ad
@@ -1,6 +1,6 @@
---- configure.orig	Tue Sep 17 21:47:55 2002
-+++ configure	Thu Sep 19 12:19:12 2002
-@@ -491,19 +491,10 @@
+--- configure.orig	Thu Oct 24 20:12:40 2002
++++ configure	Fri Nov  1 12:46:36 2002
+@@ -495,19 +495,10 @@
  
  # Try to find the available options for the current CPU
  if x86 || ppc; then
@@ -20,7 +20,7 @@
  
    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`
-@@ -1289,8 +1280,8 @@
+@@ -1302,8 +1293,8 @@
      ;;
  
    *)
@@ -31,7 +31,16 @@
      ;;
  
    esac
-@@ -1688,13 +1679,7 @@
+@@ -1313,7 +1304,7 @@
+ test -z "$_bindir" && _bindir="$_prefix/bin"
+ test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
+ test -z "$_mandir" && _mandir="$_prefix/man"
+-test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
++test -z "$_confdir" && _confdir="$_prefix/share/mplayer"
+ test -z "$_libdir" && _libdir="$_prefix/lib"
+ test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
+ 
+@@ -1702,13 +1693,7 @@
  
  
  echocheck "memalign()"
@@ -45,7 +54,7 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -1771,31 +1756,7 @@
+@@ -1785,31 +1770,7 @@
  
  
  echocheck "pthread"
@@ -78,7 +87,7 @@
  echores "yes (using $_ld_pthread)"
  
  
-@@ -4211,7 +4172,7 @@
+@@ -4277,7 +4238,7 @@
    CFLAGS="$CFLAGS -D_REENTRANT"
  elif bsd ; then
    # FIXME bsd needs this so maybe other OS'es
diff --git a/multimedia/mplayerxp/files/patch-ae b/multimedia/mplayerxp/files/patch-ae
index 8fa1b930b4c2..b9d7a7e3daba 100644
--- a/multimedia/mplayerxp/files/patch-ae
+++ b/multimedia/mplayerxp/files/patch-ae
@@ -1,5 +1,5 @@
---- Makefile.orig	Mon Sep  9 13:47:54 2002
-+++ Makefile	Thu Sep 19 12:54:34 2002
+--- Makefile.orig	Wed Oct 23 19:20:59 2002
++++ Makefile	Fri Nov  1 12:31:48 2002
 @@ -24,7 +24,7 @@
  endif
  
@@ -8,8 +8,8 @@
 +INSTALL = @${BSD_INSTALL_PROGRAM}
  
  SRCS_COMMON = cpudetect.c codec-cfg.c cfgparser.c my_profile.c spudec.c playtree.c playtreeparser.c asxparser.c vobsub.c subreader.c sub_cc.c find_sub.c
- SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c me-opt-reg.c xvid_vbr.c
-@@ -193,44 +193,11 @@
+ SRCS_MENCODER = mencoder.c mp_msg-mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/osd.c libvo/sub.c libvo/font_load.c libvo/font_load_ft.c xvid_vbr.c
+@@ -201,49 +201,11 @@
  ifeq ($(VIDIX),yes)
  	$(DO_MAKE)
  endif
@@ -40,10 +40,15 @@
 -	@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 ($(DVDKIT),yes)
 -ifeq ($(DVDKIT_SHARED),yes)
+-ifeq ($(DVDKIT2),yes)
 -	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit2/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+-else
+-ifeq ($(DVDKIT),yes)
+-	if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
+-endif
 -endif
 -endif
 -ifeq ($(CSS_USE),yes)