[69275] trunk/dports/aqua/LyX/Portfile

[michaelld at macports.org]

Revision: 69275
          http://trac.macports.org/changeset/69275
Author:   michaelld at macports.org
Date:     2010-06-29 00:23:44 -0700 (Tue, 29 Jun 2010)
Log Message:
-----------
Corrected use of qt4-mac dependency.
Added variants for python25 and python26.

Modified Paths:
--------------
    trunk/dports/aqua/LyX/Portfile

Modified: trunk/dports/aqua/LyX/Portfile
===================================================================
--- trunk/dports/aqua/LyX/Portfile	2010-06-29 07:22:28 UTC (rev 69274)
+++ trunk/dports/aqua/LyX/Portfile	2010-06-29 07:23:44 UTC (rev 69275)
@@ -5,6 +5,7 @@
 
 name			    LyX
 version			    1.6.6.1
+revision            1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories	        aqua
 license             GPL
@@ -17,13 +18,11 @@
 				    appearance. LyX lets you concentrate on writing, \
 				    leaving details of visual layout to the software.
 
-
 platforms		    darwin
 depends_build	    port:pkgconfig
-depends_lib		    path:bin/qmake-mac:qt4-mac \
+depends_lib		    port:qt4-mac \
 				    bin:tex:texlive \
-				    port:ImageMagick \
-				    port:python25
+				    port:ImageMagick
 
 use_bzip2		    yes
 distname		    lyx-${version}
@@ -37,7 +36,6 @@
                     sha1    4f0d20a890b6c78da7d863377632c5bb2b02fb4c \
                     rmd160  b6ab705815ae6d7950cee32a947bf636d102d91b
 
-configure.python    ${prefix}/bin/python2.5
 configure.pre_args  --prefix=${applications_dir}/LyX.app
 configure.args      --with-frontend=qt4 --without-x --with-included-gettext \
                     --enable-optimization=-Os --disable-concept-checks \
@@ -48,6 +46,20 @@
                     LD_LIBRARY_PATH=${prefix}/libexec/qt4-mac/lib \
                     CPLUS_INCLUDE_PATH=${prefix}/libexec/qt4-mac/include
 
+variant python25 conflicts python26 description {Use python25} {
+    depends_build-append  port:python25
+    configure.python      ${prefix}/bin/python2.5
+}
+
+variant python26 conflicts python25 description {Use python25} {
+    depends_build-append  port:python26
+    configure.python      ${prefix}/bin/python2.6
+}
+
+if {![variant_isset python25] && ![variant_isset python26]} {
+    default_variants +python25
+}
+
 livecheck.type      regex
 livecheck.url       ${homepage}
 livecheck.regex     "${name} (\\d+\\.\\d+\\.\\d+(\\.\\d+)?) released"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100629/e1aa809d/attachment.html>