Revision: 86811 http://trac.macports.org/changeset/86811 Author: devans@macports.org Date: 2011-11-04 20:37:12 -0700 (Fri, 04 Nov 2011) Log Message: ----------- ffmpeg-devel: update to recent (post-0.8.6) git master, correct license logic. Modified Paths: -------------- trunk/dports/multimedia/ffmpeg-devel/Portfile Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile =================================================================== --- trunk/dports/multimedia/ffmpeg-devel/Portfile 2011-11-05 03:33:29 UTC (rev 86810) +++ trunk/dports/multimedia/ffmpeg-devel/Portfile 2011-11-05 03:37:12 UTC (rev 86811) @@ -7,9 +7,9 @@ name ffmpeg-devel conflicts ffmpeg -version 20111004 -set git_branch 751a4efd4d754b15ebc6027b09051f27860bb1e8 -license GPL-2+ LGPL-2.1+ +version 20111104 +set git_branch 38a444e05dd980af321211b1584421fb28b67faa +license GPL-2+ categories multimedia maintainers devans openmaintainer @@ -76,7 +76,7 @@ error "git branch hash must be at least 7 characters long." } -checksums rmd160 8047d9a808415e52524a41bd0f4e634a8a810023 +checksums rmd160 2b5f175b9681a3456d3c2081a2b89b7b3918732d build.cmd ${prefix}/bin/gmake build.env-append V=1 @@ -180,6 +180,7 @@ depends_lib-delete port:XviD \ port:x264 license-delete GPL-2+ + license-append LGPL-2.1+ } # the build server uses the default variants, and we want distributable binaries @@ -189,7 +190,8 @@ configure.args-append --enable-nonfree \ --enable-libfaac depends_lib-append port:faac - license-append nonfree + license-delete GPL-2+ + license-append Restrictive } if {[variant_isset nonfree]} {