[138598] trunk/dports/multimedia

[devans at macports.org]

Revision: 138598
          https://trac.macports.org/changeset/138598
Author:   devans at macports.org
Date:     2015-07-13 11:56:13 -0700 (Mon, 13 Jul 2015)
Log Message:
-----------
ffmpeg, ffmpeg-devel: simplify license statements, remove outdated comments.

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

Modified: trunk/dports/multimedia/ffmpeg/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg/Portfile	2015-07-13 18:43:17 UTC (rev 138597)
+++ trunk/dports/multimedia/ffmpeg/Portfile	2015-07-13 18:56:13 UTC (rev 138598)
@@ -256,12 +256,9 @@
                             port:x264 \
                             port:x265
 
-    license-replace         LGPL-2.1+ GPL-2+
+    license                 GPL-2+
 }
 
-# libsmbclient causes build failure when +gpl3 is selected (#46244)
-# disable until underlying cause is identified and addressed
-
 variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
     configure.args-append   --enable-version3 \
                             --enable-libopencore-amrnb \
@@ -271,7 +268,7 @@
     depends_lib-append      port:opencore-amr \
                             port:samba3
 
-    license-replace         GPL-2+ GPL-3+
+    license                 GPL-3+
 }
 
 # the build server uses the default variants, and we want distributable binaries
@@ -283,8 +280,7 @@
                             --enable-libfaac
     depends_lib-append      port:libfdk-aac \
                             port:faac
-    license-delete          LGPL-2.1+
-    license-append          Restrictive
+    license                 Restrictive
 }
 
 if {[variant_isset nonfree]} {

Modified: trunk/dports/multimedia/ffmpeg-devel/Portfile
===================================================================
--- trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-13 18:43:17 UTC (rev 138597)
+++ trunk/dports/multimedia/ffmpeg-devel/Portfile	2015-07-13 18:56:13 UTC (rev 138598)
@@ -255,7 +255,7 @@
                             port:x264 \
                             port:x265
 
-    license-replace         LGPL-2.1+ GPL-2+
+    license                 GPL-2+
 }
 
 variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
@@ -267,7 +267,7 @@
     depends_lib-append      port:opencore-amr \
                             port:samba3
 
-    license-replace         GPL-2+ GPL-3+
+    license                 GPL-3+
 }
 
 # the build server uses the default variants, and we want distributable binaries
@@ -279,8 +279,7 @@
                             --enable-libfaac
     depends_lib-append      port:libfdk-aac \
                             port:faac
-    license-delete          LGPL-2.1+
-    license-append          Restrictive
+    license                 Restrictive
 }
 
 if {[variant_isset nonfree]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150713/6aa98512/attachment.html>