[81862] trunk/dports/multimedia/ffmpeg/Portfile

[jmr at macports.org]

Revision: 81862
          http://trac.macports.org/changeset/81862
Author:   jmr at macports.org
Date:     2011-08-06 00:48:29 -0700 (Sat, 06 Aug 2011)
Log Message:
-----------
ffmpeg: adjust license in appropriate variants, and consolidate arg and dep deletions

Modified Paths:
--------------
    trunk/dports/multimedia/ffmpeg/Portfile

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2011-08-06 07:45:30 UTC (rev 81861)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2011-08-06 07:48:29 UTC (rev 81862)
@@ -152,20 +152,22 @@
 }
 
 variant no_gpl description {disallow use of GPL code, license will be LGPL} {
-    configure.args-delete   --enable-gpl
-    configure.args-delete   --enable-postproc
-    configure.args-delete   --enable-libfaad
-    depends_lib-delete      port:faad2
-    configure.args-delete   --enable-libx264
+    configure.args-delete   --enable-gpl \
+                            --enable-postproc \
+                            --enable-libfaad \
+                            --enable-libx264 \
+                            --enable-libxvid
+    depends_lib-delete      port:faad2 \
+                            port:XviD
     depends_build-delete    port:x264
-    configure.args-delete   --enable-libxvid
-    depends_lib-delete      port:XviD
+    license-delete          GPL-2+
 }
 
 variant no_nonfree description {disallow use of nonfree code, libraries and binaries will be redistributable under GPL/LGPL} {
-    configure.args-delete   --enable-nonfree
-    configure.args-delete   --enable-libfaac
+    configure.args-delete   --enable-nonfree \
+                            --enable-libfaac
     depends_lib-delete      port:faac
+    license-delete          nonfree
 }
 
 #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110806/97ae3465/attachment.html>