From owner-svn-ports-head@FreeBSD.ORG  Sun Sep 23 21:19:19 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 60282106566C;
	Sun, 23 Sep 2012 21:19:19 +0000 (UTC)
	(envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4B48F8FC0C;
	Sun, 23 Sep 2012 21:19:19 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8NLJJSc078868;
	Sun, 23 Sep 2012 21:19:19 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8NLJJZL078866;
	Sun, 23 Sep 2012 21:19:19 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201209232119.q8NLJJZL078866@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Sun, 23 Sep 2012 21:19:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304766 - head/audio/sox
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 23 Sep 2012 21:19:19 -0000

Author: jhale
Date: Sun Sep 23 21:19:18 2012
New Revision: 304766
URL: http://svn.freebsd.org/changeset/ports/304766

Log:
  - Fix FFMPEG option when ffmpeg-devel is installed
  
  While here:
  - Move LICENSE to proper location
  - Convert to USE_PKGCONFIG
  
  PR:		ports/171813
  Submitted by:	Dan Nelson <dnelson at allantgroup.com> (maintainer)
  Approved by:	makc (mentor)

Modified:
  head/audio/sox/Makefile   (contents, props changed)

Modified: head/audio/sox/Makefile
==============================================================================
--- head/audio/sox/Makefile	Sun Sep 23 20:47:31 2012	(r304765)
+++ head/audio/sox/Makefile	Sun Sep 23 21:19:18 2012	(r304766)
@@ -14,6 +14,9 @@ MASTER_SITES=	SF
 MAINTAINER=	dnelson@allantgroup.com
 COMMENT=	SOund eXchange - universal sound sample translator
 
+LICENSE=	LGPL21 GPLv2
+LICENSE_COMB=	dual
+
 CONFLICTS=	play-[0-9]*
 
 MAN1=		sox.1 soxi.1
@@ -23,9 +26,7 @@ MLINKS=		sox.1 play.1 sox.1 rec.1 sox.1 
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libltdl
-USE_GNOME=	pkgconfig
-LICENSE_COMB=	dual
-LICENSE=	LGPL21 GPLv2
+USE_PKGCONFIG=	build
 
 # Default LAME to off for packages so we don't end up RESTRICTED
 .if defined(PACKAGE_BUILDING)
@@ -88,7 +89,7 @@ CONFIGURE_ARGS+=	--without-amrwb
 
 .if defined(WITH_FFMPEG)
 CONFIGURE_ARGS+=	--with-ffmpeg
-LIB_DEPENDS+=		avformat:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 .else
 CONFIGURE_ARGS+=	--without-ffmpeg
 .endif