[88383] trunk/dports/gnome/gst-ffmpeg/Portfile

[jmr at macports.org]

Revision: 88383
          http://trac.macports.org/changeset/88383
Author:   jmr at macports.org
Date:     2011-12-30 02:52:58 -0800 (Fri, 30 Dec 2011)
Log Message:
-----------
gst-ffmpeg:
 * pass --with-ffmpeg-extra-configure once instead of passing it multiple times and assuming (incorrectly AFAICT) that they accumulate
 * only depend on gmake on tiger

Modified Paths:
--------------
    trunk/dports/gnome/gst-ffmpeg/Portfile

Modified: trunk/dports/gnome/gst-ffmpeg/Portfile
===================================================================
--- trunk/dports/gnome/gst-ffmpeg/Portfile	2011-12-30 09:25:55 UTC (rev 88382)
+++ trunk/dports/gnome/gst-ffmpeg/Portfile	2011-12-30 10:52:58 UTC (rev 88383)
@@ -24,34 +24,40 @@
     reinplace "s|%%CONFIGURE.CC%%|${configure.cc}|g" ${worksrcpath}/gst-libs/ext/libav/configure
 }
 
-depends_build       port:gmake port:pkgconfig
+depends_build       port:pkgconfig
 
 depends_lib         port:gst-plugins-base
 
 universal_variant   no
 use_bzip2           yes
 
-configure.args      --mandir=${prefix}/share/man \
-                    --with-ffmpeg-extra-configure="--cc=${configure.cc}"
+configure.args      --mandir=${prefix}/share/man
+set with_ffmpeg_extra_configure "--cc=${configure.cc}"
+pre-configure {
+    configure.args-append --with-ffmpeg-extra-configure="$with_ffmpeg_extra_configure"
+}
 
-if {$build_arch != ""} {
-    configure.args-append --with-ffmpeg-extra-configure="--arch=${build_arch}"
+if {$build_arch == "i386"} {
+    append with_ffmpeg_extra_configure " --arch=i686"
+} elseif {$build_arch != ""} {
+    append with_ffmpeg_extra_configure " --arch=${build_arch}"
 }
 
 platform darwin 10 {
     # ticket #20938 -- disable mmx for 32 bit intel only
     if { $build_arch == "i386" } {
-        configure.args-append --with-ffmpeg-extra-configure="--disable-swscale"
-        configure.args-append --with-ffmpeg-extra-configure="--disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext"
+        append with_ffmpeg_extra_configure " --disable-swscale --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext"
     }
 }
 
 #
 # embedded ffmpeg code requires gmake 3.81 to build properly
 #
+platform darwin 8 {
+    depends_build-append port:gmake
+    build.cmd            gmake
+}
 
-build.cmd           gmake
-
 livecheck.type      regex
 livecheck.url       http://gstreamer.freedesktop.org/src/${name}/
 livecheck.regex     "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111230/9b9a0ded/attachment.html>