4 files changed, 37 insertions, 47 deletions

diff --git a/multimedia/mplayer/files/install-user b/multimedia/mplayer/files/install-user
index deef2d700fa8..75e8002181c4 100644
--- a/multimedia/mplayer/files/install-user
+++ b/multimedia/mplayer/files/install-user
@@ -1,10 +1,10 @@
 #This perl script links the codec config file
 #and the fonts dir to the user's home dir.
-#Last touched: 2002-05-04 riggs
+#Last touched: 2002-12-16 riggs
 
-if (-e "$ENV{HOME}/.mplayer/")
+if (-e "$ENV{HOME}/.mplayer/font")
 {
-	print "Sorry, you should execute this target without having a .mplayer directory in your homedir.\n";
+	print "Sorry, font link is already existing.\n";
 	exit 1;
 }
 
@@ -16,6 +16,12 @@ $prefix=$pkg[3];
 $prefix=~ s/(.+mplayer).*/$1/;
 chop $prefix;
 
+if ($1 eq "")
+{
+	print "You have no mplayer-fonts installed.\n";
+	exit 1;
+}
+
 print "You may choose any of the available language sets:\n\n";
 print "ISO-8859-1 Font : 1\n";
 print "ISO-8859-2 Font : 2\n";
@@ -34,8 +40,8 @@ if ($lang eq "1" || $lang eq "2")
 	if ($size ne "14" && $size ne "18" && $size ne "24" && $size ne "28") {$size=14;}
 }
 
+unless (-e "$ENV{HOME}/.mplayer") {system "mkdir $ENV{HOME}/.mplayer";}
 
-system "mkdir $ENV{HOME}/.mplayer";
 if ($lang eq "c")
 {
 	system "ln -sv $prefix/fonts/cyrillic/ $ENV{HOME}/.mplayer/font";
@@ -49,7 +55,3 @@ elsif ($lang eq "2")
 	system "ln -sv $prefix/fonts/iso-8859-2/arial-$size/ $ENV{HOME}/.mplayer/font";
 }
 else {system "ln -sv $prefix/fonts/iso-8859-1/arial-$size/ $ENV{HOME}/.mplayer/font"};
-
-system "ln -sv $prefix/codecs.conf $ENV{HOME}/.mplayer/codecs.conf";
-system "cp -pv $prefix/example.conf $ENV{HOME}/.mplayer/example.conf";
-system "cp -pv $prefix/input.conf $ENV{HOME}/.mplayer/input.conf";
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index cfd8603b66f5..4588426a277a 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,6 +1,15 @@
---- configure.orig	Thu Oct 24 20:12:40 2002
-+++ configure	Fri Nov  1 12:46:36 2002
-@@ -495,19 +495,10 @@
+--- configure.orig	Sat Dec  7 07:54:02 2002
++++ configure	Mon Dec 16 21:02:31 2002
+@@ -276,7 +276,7 @@
+ 
+ 
+ # 1st pass checking for vital options
+-_install=install
++_install=@${BSD_INSTALL_PROGRAM}
+ _ranlib=ranlib
+ _cc=gcc
+ test "$CC" && _cc="$CC"
+@@ -512,19 +512,10 @@
  
  # Try to find the available options for the current CPU
  if x86 || ppc; then
@@ -20,18 +29,18 @@
  
    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`
-@@ -1302,8 +1293,8 @@
+@@ -1353,8 +1344,8 @@
      ;;
  
    *)
 -    echo "Unknown parameter: $ac_option"
--    exit
+-    exit 1
 +    echo -n "Unknown parameter: $ac_option"
 +    echo " (ignoring)"
      ;;
  
    esac
-@@ -1313,7 +1304,7 @@
+@@ -1364,7 +1355,7 @@
  test -z "$_bindir" && _bindir="$_prefix/bin"
  test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
  test -z "$_mandir" && _mandir="$_prefix/man"
@@ -40,7 +49,7 @@
  test -z "$_libdir" && _libdir="$_prefix/lib"
  test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
  
-@@ -1702,13 +1693,7 @@
+@@ -1784,13 +1775,7 @@
  
  
  echocheck "memalign()"
@@ -54,7 +63,7 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -1785,31 +1770,7 @@
+@@ -1879,31 +1864,7 @@
  
  
  echocheck "pthread"
@@ -87,7 +96,7 @@
  echores "yes (using $_ld_pthread)"
  
  
-@@ -4277,7 +4238,7 @@
+@@ -4483,7 +4444,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 b9d7a7e3daba..cbaaba34a7d8 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,28 +1,21 @@
---- Makefile.orig	Wed Oct 23 19:20:59 2002
-+++ Makefile	Fri Nov  1 12:31:48 2002
-@@ -24,7 +24,7 @@
- endif
- 
- # a BSD compatible 'install' program
--INSTALL = install
-+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 xvid_vbr.c
-@@ -201,49 +201,11 @@
- ifeq ($(VIDIX),yes)
- 	$(DO_MAKE)
+--- Makefile.orig	Thu Dec  5 07:29:26 2002
++++ Makefile	Tue Dec 17 09:53:32 2002
+@@ -241,49 +241,11 @@
+ ifeq ($(SHARED_PP),yes)
+ 	$(MAKE) install -C postproc 
  endif
 -	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
- 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
 -ifeq ($(GUI),yes)
 -	-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_PROGRAM} $(PRG) $(BINDIR)/$(PRG)
 +	@${BSD_INSTALL_MAN} DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
  ifeq ($(MENCODER),yes)
- 	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
++	@${BSD_INSTALL_PROGRAM} $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
  	-ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
 -endif
 -	@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
diff --git a/multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp b/multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp
deleted file mode 100644
index 0d22a5695dba..000000000000
--- a/multimedia/mplayer/files/patch-libmpdemux::demux_rtp.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- libmpdemux/demux_rtp.cpp.orig	Thu Oct 17 00:15:43 2002
-+++ libmpdemux/demux_rtp.cpp	Sat Dec 14 19:17:10 2002
-@@ -314,7 +314,11 @@
-     // block myself until one comes available:
-     TaskScheduler& scheduler
-       = bufferQueue->readSource()->envir().taskScheduler();
-+#if USAGEENVIRONMENT_LIBRARY_VERSION_INT >= 1038614400
-+    scheduler.doEventLoop(&bufferQueue->blockingFlag);
-+#else
-     scheduler.blockMyself(&bufferQueue->blockingFlag);
-+#endif
-   }
- 
-   if (demuxer->stream->eof) return 0; // source stream has closed down