2 files changed, 62 insertions, 8 deletions

diff --git a/multimedia/xine/Makefile b/multimedia/xine/Makefile
index c14b5a2334b0..ae82b8c3406c 100644
--- a/multimedia/xine/Makefile
+++ b/multimedia/xine/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xine
 PORTVERSION=	0.9.8
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://xine.sourceforge.net/files/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -20,15 +21,15 @@ LIB_DEPENDS=	xine.0:${PORTSDIR}/graphics/libxine \
 		png.5:${PORTSDIR}/graphics/png \
 		intl.1:${PORTSDIR}/devel/gettext
 
-GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_IMLIB=	yes
-USE_LIBTOOL=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		THREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		THREAD_LIBS="${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-w32-path=${LOCALBASE}/lib/win32
-CONFIGURE_ENV=	CFLAGS="-I${LOCALBASE}/include" \
-			CPPFLAGS="-I${LOCALBASE}/include" \
-			LIBS="-L${LOCALBASE}/lib"
 
 MANLANG=	"" es fr pl
 MAN1=		aaxine.1 xine.1
@@ -44,8 +45,12 @@ CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .endif
 .endif
 
-post-configure:
-	@${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC}
+post-patch:
+	@${PERL} -pi -e \
+		's|THREAD_LIBS=.*$$|THREAD_LIBS="\$$THREAD_LIBS"|g ; \
+		 s|THREAD_CFLAGS=.*$$|THREAD_CFLAGS="\$$THREAD_CFLAGS"|g ; \
+		 s|-L/usr/local/lib||g ; \
+		 s|-I/usr/local/include||g' ${WRKSRC}/configure
 
 post-install:
 	@${CP} ${PREFIX}/man/man1/aaxine.1 ${PREFIX}/man/fr/man1/aaxine.1
diff --git a/multimedia/xine/files/patch-ltmain.sh b/multimedia/xine/files/patch-ltmain.sh
new file mode 100644
index 000000000000..c65b12a2d188
--- /dev/null
+++ b/multimedia/xine/files/patch-ltmain.sh
@@ -0,0 +1,49 @@
+--- ltmain.sh.orig	Wed Jan 16 09:00:24 2002
++++ ltmain.sh	Tue Jan 29 10:33:29 2002
+@@ -958,6 +958,7 @@
+ 	;;
+ 
+       -avoid-version)
++	build_old_libs=no
+ 	avoid_version=yes
+ 	continue
+ 	;;
+@@ -1045,14 +1046,14 @@
+ 	    # These systems don't actually have a C library (as such)
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    test "X$arg" = "X-lc" && continue
+ 	    ;;
+ 	  esac
+ 	 elif test "X$arg" = "X-lc_r"; then
+ 	  case $host in
+-	 *-*-openbsd* | *-*-freebsd*)
++	 *-*-openbsd*)
+ 	    # Do not include libc_r directly, use -pthread flag.
+ 	    continue
+ 	    ;;
+@@ -2459,7 +2460,7 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
+-	  *-*-openbsd* | *-*-freebsd*)
++	  *-*-openbsd*)
+ 	    # Do not include libc due to us having libc/libc_r.
+ 	    ;;
+ 	  *)
+@@ -4247,10 +4248,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"