[50588] trunk/dports/multimedia/libmpeg2/Portfile

[devans at macports.org]

Revision: 50588
          http://trac.macports.org/changeset/50588
Author:   devans at macports.org
Date:     2009-05-04 15:02:50 -0700 (Mon, 04 May 2009)
Log Message:
-----------
libmpeg2: if building with X11, unconditionally configure using MacPorts xorg libs.

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

Modified: trunk/dports/multimedia/libmpeg2/Portfile
===================================================================
--- trunk/dports/multimedia/libmpeg2/Portfile	2009-05-04 21:53:54 UTC (rev 50587)
+++ trunk/dports/multimedia/libmpeg2/Portfile	2009-05-04 22:02:50 UTC (rev 50588)
@@ -25,7 +25,9 @@
                         port:xorg-libXv
 
 configure.args          --enable-shared \
-                        --mandir=${prefix}/share/man
+                        --mandir=${prefix}/share/man \
+                        --x-includes=${prefix}/include \
+                        --x-libraries=${prefix}/lib
 
 configure.cppflags-append	"-no-cpp-precomp"
 
@@ -36,16 +38,11 @@
 
 variant no_x11 {
         configure.args-append --without-x
+        configure.args-delete --x-includes=${prefix}/include
+        configure.args-delete --x-libraries=${prefix}/lib
         depends_lib-delete port:xorg-libXv
 }
 
-if {![variant_isset no_x11]} {
-    if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
-            configure.args-append --x-includes=${prefix}/include \
-                                  --x-libraries=${prefix}/lib
-    }
-}
-
 livecheck.check regex
 livecheck.url   ${homepage}downloads.html
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090504/ebb03a26/attachment.html>