[73177] users/dports/ports/tex

[dports at macports.org]

Revision: 73177
          http://trac.macports.org/changeset/73177
Author:   dports at macports.org
Date:     2010-11-05 19:21:06 -0700 (Fri, 05 Nov 2010)
Log Message:
-----------
Avoid conflicts during texlive upgrade, caused by files that moved
from one port to another, by deactivating old (pre-2010) ports before
installing the conflicting new ports
  - texlive-basic: deactivate old texlive-fontutils (conflict on mft)
  - texlive-bin: deactivate old texlive-htmlxml (moved tex4ht scripts)
  - texlive-fonts-recommended: deactivate old texlive-fonts-extra
    (conflict on cmsuper)
  - texlive-latex: deactivate old texlive-context
  - texlive-pictures: deactivate old texlive-latex-extra

Modified Paths:
--------------
    users/dports/ports/tex/texlive-basic/Portfile
    users/dports/ports/tex/texlive-bin/Portfile
    users/dports/ports/tex/texlive-fonts-recommended/Portfile
    users/dports/ports/tex/texlive-latex/Portfile
    users/dports/ports/tex/texlive-pictures/Portfile

Modified: users/dports/ports/tex/texlive-basic/Portfile
===================================================================
--- users/dports/ports/tex/texlive-basic/Portfile	2010-11-06 02:02:01 UTC (rev 73176)
+++ users/dports/ports/tex/texlive-basic/Portfile	2010-11-06 02:21:06 UTC (rev 73177)
@@ -54,6 +54,13 @@
         && [rpm-vercomp [lindex $vers 1] 2009] < 0} {
         registry_deactivate texlive "" [list ports_nodepcheck 1]
     }
+
+    # Deactivate texlive-fontutils to avoid conflicts on mft from the
+    # 2009->2010 update
+    if {![catch {set vers [lindex [registry_active texlive-fontutils] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 16392] < 0} {
+        registry_deactivate texlive-fontutils "" [list ports_nodepcheck 1]
+    }
 }
 
 texlive.forceupdatecnf yes

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2010-11-06 02:02:01 UTC (rev 73176)
+++ users/dports/ports/tex/texlive-bin/Portfile	2010-11-06 02:21:06 UTC (rev 73177)
@@ -158,6 +158,15 @@
     }
 }
 
+pre-activate {
+    if { [file exists ${texlive_texmfdist}/scripts/tex4ht/ht.sh]
+         && ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
+         && [rpm-vercomp [lindex $vers 1] 13822] == 0
+         && [lindex $vers 2] <3} {        
+        registry_deactivate texlive-htmlxml "" [list ports_nodepcheck 1]
+    }
+}
+
 post-activate {
     system "${texlive_bindir}/mktexlsr"
 }

Modified: users/dports/ports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- users/dports/ports/tex/texlive-fonts-recommended/Portfile	2010-11-06 02:02:01 UTC (rev 73176)
+++ users/dports/ports/tex/texlive-fonts-recommended/Portfile	2010-11-06 02:21:06 UTC (rev 73177)
@@ -44,5 +44,12 @@
     {Map txfonts.map} \
     {MixedMap wasy.map}
 
+pre-activate {
+    # cmsuper moved from fonts-extra to fonts-recommended in TL2010
+    if {![catch {set vers [lindex [registry_active texlive-fonts-extra] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 19491] < 0} {
+        registry_deactivate texlive-fonts-extra "" [list ports_nodepcheck 1]
+    }
+}
 
 texlive.texmfport

Modified: users/dports/ports/tex/texlive-latex/Portfile
===================================================================
--- users/dports/ports/tex/texlive-latex/Portfile	2010-11-06 02:02:01 UTC (rev 73176)
+++ users/dports/ports/tex/texlive-latex/Portfile	2010-11-06 02:21:06 UTC (rev 73177)
@@ -32,5 +32,13 @@
     {Map pazo.map} \
     {Map utopia.map}
 
+pre-activate {
+    # Deactivate texlive-context to avoid conflicts on mft from the
+    # 2009->2010 update
+    if {![catch {set vers [lindex [registry_active texlive-context] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 18549] < 0} {
+        registry_deactivate texlive-context "" [list ports_nodepcheck 1]
+    }
+}
 
 texlive.texmfport

Modified: users/dports/ports/tex/texlive-pictures/Portfile
===================================================================
--- users/dports/ports/tex/texlive-pictures/Portfile	2010-11-06 02:02:01 UTC (rev 73176)
+++ users/dports/ports/tex/texlive-pictures/Portfile	2010-11-06 02:21:06 UTC (rev 73177)
@@ -28,4 +28,11 @@
 # use pgf port to satisfy pgf dependency (see #25478)
 depends_lib-append port:pgf
 
+pre-activate {
+    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 19538] < 0} {
+        registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
+    }
+}
+
 texlive.texmfport
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101105/e4ca366b/attachment.html>