From owner-svn-ports-head@FreeBSD.ORG  Sat Jul 12 18:03:25 2014
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 ESMTPS id 22C18C01;
 Sat, 12 Jul 2014 18:03:25 +0000 (UTC)
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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 1122226D0;
 Sat, 12 Jul 2014 18:03:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6CI3O13033916;
 Sat, 12 Jul 2014 18:03:24 GMT (envelope-from nox@svn.freebsd.org)
Received: (from nox@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6CI3OOe033915;
 Sat, 12 Jul 2014 18:03:24 GMT (envelope-from nox@svn.freebsd.org)
Message-Id: <201407121803.s6CI3OOe033915@svn.freebsd.org>
From: Juergen Lock <nox@FreeBSD.org>
Date: Sat, 12 Jul 2014 18:03:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r361631 - head/multimedia/vlc
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.18
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: Sat, 12 Jul 2014 18:03:25 -0000

Author: nox
Date: Sat Jul 12 18:03:24 2014
New Revision: 361631
URL: http://svnweb.freebsd.org/changeset/ports/361631
QAT: https://qat.redports.org/buildarchive/r361631/

Log:
  - Fix build with MUSEPACK knob.
  - Replace another occurence of /usr/local with LOCALBASE.
  
  PR:		191836
  Submitted by:	mikhail.rokhin@gmail.com

Modified:
  head/multimedia/vlc/Makefile

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Sat Jul 12 17:58:06 2014	(r361630)
+++ head/multimedia/vlc/Makefile	Sat Jul 12 18:03:24 2014	(r361631)
@@ -117,8 +117,8 @@ DVDNAV_CONFIGURE_ENABLE=dvdnav
 
 FAAD_LIB_DEPENDS=	libfaad.so:${PORTSDIR}/audio/faad
 FAAD_CONFIGURE_ENABLE=	faad
-FAAD_CONFIGURE_ENV=	CPPFLAGS_faad="-I/usr/local/include" \
-			LIBS_faad="-L/usr/local/lib"
+FAAD_CONFIGURE_ENV=	CPPFLAGS_faad="-I${LOCALBASE}/include" \
+			LIBS_faad="-L${LOCALBASE}/lib"
 
 FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
 FLAC_CONFIGURE_ENABLE=	flac
@@ -198,6 +198,7 @@ MTP_CONFIGURE_ENABLE=	mtp
 
 MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
 MUSEPACK_CONFIGURE_ENABLE=	mpc
+MUSEPACK_CONFIGURE_ENV=		LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec"
 
 NCURSES_USES=			ncurses
 NCURSES_CONFIGURE_ENV=		NCURSES_CFLAGS="-I${NCURSESINC}" \