From owner-svn-ports-head@FreeBSD.ORG  Thu Oct 10 02:15:59 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id A96C8C6D;
 Thu, 10 Oct 2013 02:15:59 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7AFC22612;
 Thu, 10 Oct 2013 02:15:59 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9A2Fw3b089611;
 Thu, 10 Oct 2013 02:15:58 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9A2FwHj089610;
 Thu, 10 Oct 2013 02:15:58 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201310100215.r9A2FwHj089610@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Thu, 10 Oct 2013 02:15:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329957 - head/multimedia/xbmc-pvr
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Oct 2013 02:15:59 -0000

Author: wg
Date: Thu Oct 10 02:15:58 2013
New Revision: 329957
URL: http://svnweb.freebsd.org/changeset/ports/329957

Log:
  multimedia/xbmc-pvr: link using ffmpeg0
  
  - Link using ffmpeg0
  
  Approved by:	portmgr (bapt, implicit)

Modified:
  head/multimedia/xbmc-pvr/Makefile

Modified: head/multimedia/xbmc-pvr/Makefile
==============================================================================
--- head/multimedia/xbmc-pvr/Makefile	Thu Oct 10 02:04:46 2013	(r329956)
+++ head/multimedia/xbmc-pvr/Makefile	Thu Oct 10 02:15:58 2013	(r329957)
@@ -3,7 +3,7 @@
 
 PORTNAME=	xbmc
 PORTVERSION=	70
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	multimedia
 MASTER_SITES=	LOCAL/nox
 PKGNAMESUFFIX=	-pvr-ppa-odk
@@ -30,7 +30,7 @@ LIB_DEPENDS=	asound:${PORTSDIR}/audio/al
 		dbus-1:${PORTSDIR}/devel/dbus \
 		enca:${PORTSDIR}/converters/enca \
 		GLEW:${PORTSDIR}/graphics/glew \
-		avcodec:${PORTSDIR}/multimedia/ffmpeg	\
+		avcodec0:${PORTSDIR}/multimedia/ffmpeg0	\
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
 		fribidi:${PORTSDIR}/converters/fribidi \
@@ -94,7 +94,9 @@ DESKTOP_ENTRIES="XBMC" \
 		"AudioVideo;Video;" \
 		true
 
-CPPFLAGS+=	-I${LOCALBASE}/include
+CPPFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
+CXXFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
+CFLAGS+=	-I${LOCALBASE}/include/ffmpeg0
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--enable-external-libraries
@@ -218,6 +220,15 @@ post-patch:
 		${WRKSRC}/lib/libsidplay2/libsidplay/unix/my_macros.m4 \
 		${WRKSRC}/lib/timidity/configure.in \
 		${WRKSRC}/xbmc/screensavers/rsxs-0.9/acinclude.m4
+	@${REINPLACE_CMD} \
+		-e 's|libavcodec |libavcodec0 |g' \
+		-e 's|libavfilter |libavfilter0 |g' \
+		-e 's|libavformat |libavformat0 |g' \
+		-e 's|libavutil |libavutil0 |g' \
+		-e 's|libpostproc |libpostproc0 |g' \
+		-e 's|libswscale"|libswscale0"|g' \
+		-e 's|avcodec\]|avcodec0\]|g' \
+		${WRKSRC}/configure.in
 	${RM} ${WRKSRC}/addons/library.xbmc.addon/libXBMC_addon.h.orig
 # XXX somehow there are still references to linux libraries, if you find
 # where they come from please tell us!