[51081] trunk/dports/multimedia/mplayer-devel/Portfile

[raimue at macports.org]

Revision: 51081
          http://trac.macports.org/changeset/51081
Author:   raimue at macports.org
Date:     2009-05-17 12:12:54 -0700 (Sun, 17 May 2009)
Log Message:
-----------
multimedia/mplayer-devel:
Fix fetch error by moving fetch of the binary codecs into the appropriate
variants. Also remove duplication of other phases in this variant as
simplification.

As this prevented installation without +binary_codecs, no revision bump.

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

Modified: trunk/dports/multimedia/mplayer-devel/Portfile
===================================================================
--- trunk/dports/multimedia/mplayer-devel/Portfile	2009-05-17 18:53:49 UTC (rev 51080)
+++ trunk/dports/multimedia/mplayer-devel/Portfile	2009-05-17 19:12:54 UTC (rev 51081)
@@ -44,7 +44,6 @@
     system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavutil ${worksrcpath}/libavutil/"
     system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libavformat ${worksrcpath}/libavformat/"
     system "svn export -r${ffmpeg_ver} svn://svn.ffmpeg.org/ffmpeg/trunk/libpostproc ${worksrcpath}/libpostproc/"
-    system "curl --create-dirs http://www.mplayerhq.hu/MPlayer/releases/codecs/${mplayercodecsfile} -o ${distpath}/${mplayercodecsfile}"
 }
 # Do not use the following environment variables, otherwise the build phase
 # will fail.
@@ -226,18 +225,6 @@
         extract.only            ${distname}${extract.suffix}
 
         depends_build-append    bin:unzip:unzip
-
-        post-extract {
-            system "unzip -q -d ${worksrcpath} ${distpath}/${mplayercodecsfile}"
-        }
-
-        configure.args-append   --codecsdir=${prefix}/share/${name}/codecs
-
-        post-destroot {
-            xinstall -m 755 -d ${destroot}${prefix}/share/${name}/codecs
-            system "cd ${destroot}${prefix}/share/${name}/codecs && \
-                pax -r -z -f \"${worksrcpath}/${mplayercodecs}/Contents/Archive.pax.gz\""
-        }
     }
     if {[variant_isset darwin_i386]} {
         global mplayercodecs mplayercodecsfile
@@ -252,18 +239,22 @@
         extract.only            ${distname}${extract.suffix}
 
         depends_build-append    bin:unzip:unzip
+    }
 
-        post-extract {
-            system "unzip -q -d ${worksrcpath} ${distpath}/${mplayercodecsfile}"
-        }
+    post-fetch {
+        system "curl --create-dirs http://www.mplayerhq.hu/MPlayer/releases/codecs/${mplayercodecsfile} -o ${distpath}/${mplayercodecsfile}"
+    }
 
-        configure.args-append   --codecsdir=${prefix}/share/${name}/codecs
+    post-extract {
+        system "unzip -q -d ${worksrcpath} ${distpath}/${mplayercodecsfile}"
+    }
 
-        post-destroot {
-            xinstall -m 755 -d ${destroot}${prefix}/share/${name}/codecs
-            system "cd ${destroot}${prefix}/share/${name}/codecs && \
-                pax -r -z -f \"${worksrcpath}/${mplayercodecs}/Contents/Archive.pax.gz\""
-        }
+    configure.args-append   --codecsdir=${prefix}/share/${name}/codecs
+
+    post-destroot {
+        xinstall -m 755 -d ${destroot}${prefix}/share/${name}/codecs
+        system "cd ${destroot}${prefix}/share/${name}/codecs && \
+            pax -r -z -f \"${worksrcpath}/${mplayercodecs}/Contents/Archive.pax.gz\""
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090517/62726567/attachment-0001.html>