Changeset 81862

Timestamp:

08/06/11 00:48:29 (4 years ago)

Author:

jmr@…

Message:

ffmpeg: adjust license in appropriate variants, and consolidate arg and dep deletions

File:

• trunk/dports/multimedia/ffmpeg/Portfile (modified) (1 diff)

trunk/dports/multimedia/ffmpeg/Portfile

@@ -153 +153 @@
 
 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
 }