Date: Sun, 23 Sep 2012 21:19:19 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304766 - head/audio/sox Message-ID: <201209232119.q8NLJJZL078866@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209232119.q8NLJJZL078866>