From e5b22182a15d24700a515e8d1a383e7c7aa4c838 Mon Sep 17 00:00:00 2001
From: Chin-San Huang <chinsan@FreeBSD.org>
Date: Sun, 24 Aug 2008 17:49:32 +0000
Subject: [PATCH] - Remove the last commit as maintainer's request[B. - Use
 maintainer's patch which also fix build multimedia/mencoder.

Thanks for all helpers:
mezz, Kalten, Thomas E. Zander(maintainer), John Nielsen

PR:		ports/126354
Submitted by:	Kalten <kalten at sbox.tu-graz.ac.at>
Tested on:	tinderbox and my home box
Approved by:	Thomas E. Zander(maintainer)
---
 multimedia/mplayer/Makefile       |  3 +--
 multimedia/mplayer/files/patch-ad | 11 ++++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 7e039a1fd33b..9a1f5301cf51 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -241,8 +241,7 @@ post-patch:
 .endif
 
 post-configure:
-	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g; \
-		s|= -I/usr/local/|= -I. -I... -I.../libavutil -I/usr/local/|g' \
+	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
 		${WRKSRC}/config.mak
 
 post-install:
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index ad4871aecd2a..7641c1e7227c 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,5 +1,5 @@
 --- configure.orig	2007-10-08 03:49:33.000000000 +0800
-+++ configure	2007-11-11 13:09:59.000000000 +0800
++++ configure	2008-08-18 20:37:59.000000000 +0800
 @@ -62,9 +62,9 @@
    echo >> "$TMPLOG"
    cat "$1" >> "$TMPLOG"
@@ -47,6 +47,15 @@
        macppc|ppc|ppc64) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sparc) host_arch=sparc ;;
+@@ -1307,7 +1299,7 @@
+ 
+ if freebsd ; then
+   _ld_extra="$_ld_extra -L/usr/local/lib"
+-  _inc_extra="$_inc_extra -I/usr/local/include"
++  _inc_extra="$_inc_extra -I... -I.../libavutil"
+ fi
+ 
+ if darwin; then
 @@ -1524,25 +1516,10 @@
  
  # Cygwin has /proc/cpuinfo, but only supports Intel CPUs