[81860] users/dports/ports/tex/texlive-bin/Portfile

[dports at macports.org]

Revision: 81860
          http://trac.macports.org/changeset/81860
Author:   dports at macports.org
Date:     2011-08-06 00:24:40 -0700 (Sat, 06 Aug 2011)
Log Message:
-----------
texlive-bin: fix requires/conflicts for +motif variant; use correct
texlive-basic version number for registry_deactivate hack

Modified Paths:
--------------
    users/dports/ports/tex/texlive-bin/Portfile

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2011-08-06 07:11:23 UTC (rev 81859)
+++ users/dports/ports/tex/texlive-bin/Portfile	2011-08-06 07:24:40 UTC (rev 81860)
@@ -199,7 +199,7 @@
 
     if { [file exists ${texlive_texmfmain}/scripts/tetex/updmap.pl]
          && ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
-         && [rpm-vercomp [lindex $vers 1] 2011] < 0} {
+         && [rpm-vercomp [lindex $vers 1] 23152] < 0} {
         set deactivate_proc registry_deactivate_composite
         if {[info commands registry_deactivate_composite] == {}} {
             set deactivate_proc registry_deactivate
@@ -223,12 +223,12 @@
 
 variant x11 conflicts no_x11 description {Build with x11 support, using Xaw widgets for xdvi} {
     depends_lib-append port:xorg-libXp
-    configure.args-delete --without-x --without-pdfopen    
+    configure.args-delete --without-x --without-pdfopen
     depends_lib-append port:xorg-libXaw
     configure.args-append --with-xdvi-x-toolkit=xaw
 }
 
-variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi} {
+variant motif requires x11 description {Use Motif to build xdvi} {
     depends_lib-delete port:xorg-libXaw
     configure.args-delete --with-xdvi-x-toolkit=xaw
     depends_lib-append lib:libXm:openmotif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110806/ab1f0138/attachment.html>