Revision

81285

Author

dports@macports.org

Date

2011-07-28 17:47:19 -0700 (Thu, 28 Jul 2011)

Log Message

Add more registry_deactivate hacks for the TL2011 update:
 * texlive-bin installs updmap.pl now, instead of texlive-basic, so
   have it deactivate texlive-basic
 * texlive-latex-recommended now contains fontspec and textcase, so
   have it deactivate 2010 versions of texlive-xetex and
   texlive-latex-extra

Modified Paths

• users/dports/ports/tex/texlive-bin/Portfile
• users/dports/ports/tex/texlive-latex-recommended/Portfile

Diff

--- users/dports/ports/tex/texlive-bin/Portfile	2011-07-28 23:14:06 UTC (rev 81284)
+++ users/dports/ports/tex/texlive-bin/Portfile	2011-07-29 00:47:19 UTC (rev 81285)
@@ -184,6 +184,16 @@
         }
         $deactivate_proc texlive-htmlxml "" [list ports_nodepcheck 1]
     }
+
+    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} {
+        set deactivate_proc registry_deactivate_composite
+        if {[info commands registry_deactivate_composite] == {}} {
+            set deactivate_proc registry_deactivate
+        }
+        $deactivate_proc texlive-basic "" [list ports_nodepcheck 1]
+    }
 }
 
 post-activate {

--- users/dports/ports/tex/texlive-latex-recommended/Portfile	2011-07-28 23:14:06 UTC (rev 81284)
+++ users/dports/ports/tex/texlive-latex-recommended/Portfile	2011-07-29 00:47:19 UTC (rev 81285)
@@ -33,4 +33,26 @@
 # beamer requires pgf; see #25478
 depends_lib-append port:pgf
 
+pre-activate {
+    # fontspec moved from texlive-xetex in TL2011
+    if {![catch {set vers [lindex [registry_active texlive-xetex] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 23080] < 0} {
+        set deactivate_proc registry_deactivate_composite
+        if {[info commands registry_deactivate_composite] == {}} {
+            set deactivate_proc registry_deactivate
+        }
+        $deactivate_proc texlive-xetex "" [list ports_nodepcheck 1]
+    }
+
+    # textcase moved from texlive-latex-extra in TL2011
+    if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
+        && [rpm-vercomp [lindex $vers 1] 22931] < 0} {
+        set deactivate_proc registry_deactivate_composite
+        if {[info commands registry_deactivate_composite] == {}} {
+            set deactivate_proc registry_deactivate
+        }
+        $deactivate_proc texlive-latex-extra "" [list ports_nodepcheck 1]
+    }
+}
+
 texlive.texmfport