[88764] trunk/dports/tex/texlive-common/Portfile

[dports at macports.org]

Revision: 88764
          http://trac.macports.org/changeset/88764
Author:   dports at macports.org
Date:     2012-01-10 17:28:46 -0800 (Tue, 10 Jan 2012)
Log Message:
-----------
texlive-common: remove registry_deactivate hacks related to the
texlive 2007 ports, as these were removed in r85560/r85561

Revision Links:
--------------
    http://trac.macports.org/changeset/85560
    http://trac.macports.org/changeset/85561

Modified Paths:
--------------
    trunk/dports/tex/texlive-common/Portfile

Modified: trunk/dports/tex/texlive-common/Portfile
===================================================================
--- trunk/dports/tex/texlive-common/Portfile	2012-01-11 01:10:20 UTC (rev 88763)
+++ trunk/dports/tex/texlive-common/Portfile	2012-01-11 01:28:46 UTC (rev 88764)
@@ -124,18 +124,10 @@
         delete ${texlive_texmfsysvar}/tex/generic/config/language.def
     }
 
-    # Deactivate tetex and any of the texlive 2007 ports. replaced_by
-    # does not accomplish this because not all of these ports conflict
-    # with this one (although they will cause problems later).
-    set deactivate_proc registry_deactivate_composite
-    if {[info commands registry_deactivate_composite] == {}} {
-        set deactivate_proc registry_deactivate
+    # Deactivate tetex if installed
+    if {![catch {registry_active teTeX}]} {
+        registry_deactivate_composite teTeX "" [list ports_nodepcheck 1]
     }
-    foreach oldport {texlive_base texlive_texmf-full texlive_texmf-minimal texlive_texmf-docs teTeX} {
-        if {![catch {registry_active $oldport}]} {
-            $deactivate_proc $oldport "" [list ports_nodepcheck 1]
-        }
-    }
 }
 
 post-activate {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120110/95bd9351/attachment-0001.html>