[107911] users/dports/ports/tex
dports at macports.org
dports at macports.org
Mon Jul 8 20:31:17 PDT 2013
Revision: 107911
https://trac.macports.org/changeset/107911
Author: dports at macports.org
Date: 2013-07-08 20:31:17 -0700 (Mon, 08 Jul 2013)
Log Message:
-----------
remove deactivate hacks from texlive ports. We can get away without
them because the otherwise-conflicting files have moved to a different
tree this year (texmf vs texmf-dist)
Modified Paths:
--------------
users/dports/ports/tex/texlive-basic/Portfile
users/dports/ports/tex/texlive-bin/Portfile
users/dports/ports/tex/texlive-common/Portfile
users/dports/ports/tex/texlive-fonts-recommended/Portfile
users/dports/ports/tex/texlive-generic-recommended/Portfile
users/dports/ports/tex/texlive-latex/Portfile
users/dports/ports/tex/texlive-latex-recommended/Portfile
users/dports/ports/tex/texlive-math-extra/Portfile
users/dports/ports/tex/texlive-pictures/Portfile
users/dports/ports/tex/texlive-xetex/Portfile
Modified: users/dports/ports/tex/texlive-basic/Portfile
===================================================================
--- users/dports/ports/tex/texlive-basic/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-basic/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -62,32 +62,6 @@
patch-runfiles_texmf-dist_scripts_texlive_updmap-sys.sh.diff
-pre-activate {
- # If texlive 2007 metaport is installed, deactivate it to avoid
- # conflicts on $prefix/bin/etex etc.
- if {[file exists $prefix/bin/etex]
- && ![catch {set vers [lindex [registry_active texlive] 0]}]
- && [vercmp [lindex $vers 1] 2009] < 0} {
- registry_deactivate_composite 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]}]
- && [vercmp [lindex $vers 1] 16392] < 0} {
- registry_deactivate_composite texlive-fontutils "" [list ports_nodepcheck 1]
- }
-
- # Deactivate 2009 version of texlive-lang-mongolian if it's
- # installed; its hyphenation references a file that no longer
- # exists, causing format generation to fail (see #27339)
- if {![catch {set vers [lindex [registry_active texlive-lang-mongolian] 0]}]
- && [vercmp [lindex $vers 1] 14727] == 0
- && [lindex $vers 2] < 2} {
- registry_deactivate_composite texlive-lang-mongolian "" [list ports_nodepcheck 1]
- }
-}
-
texlive.forceupdatecnf yes
texlive.use_mktexlsr_on_deactivate no
Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-bin/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -223,33 +223,6 @@
${destroot}${texlive_mactex_texdistdir}
}
-pre-activate {
- if { [file exists ${texlive_texmfdist}/scripts/tex4ht/ht.sh]
- && ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
- && [vercmp [lindex $vers 1] 13822] == 0
- && [lindex $vers 2] <3} {
- registry_deactivate_composite texlive-htmlxml "" [list ports_nodepcheck 1]
- }
-
- if { [file exists ${texlive_texmfmain}/scripts/tetex/updmap.pl]
- && ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
- && [vercmp [lindex $vers 1] 23152] < 0} {
- registry_deactivate_composite texlive-basic "" [list ports_nodepcheck 1]
- }
-
- # TL2012: some scripts in texmf are now installed by this port
- # rather than by texlive-bin-extra and texlive-basic
- if { ![catch {set vers [lindex [registry_active texlive-bin-extra] 0]}]
- && [vercmp [lindex $vers 1] 26926] < 0} {
- registry_deactivate_composite texlive-bin-extra "" [list ports_nodepcheck 1]
- }
- if { ![catch {set vers [lindex [registry_active texlive-basic] 0]}]
- && [vercmp [lindex $vers 1] 26926] < 0} {
- registry_deactivate_composite texlive-basic "" [list ports_nodepcheck 1]
- }
-
-}
-
post-activate {
system "${texlive_bindir}/mktexlsr"
}
Modified: users/dports/ports/tex/texlive-common/Portfile
===================================================================
--- users/dports/ports/tex/texlive-common/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-common/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -121,11 +121,6 @@
if [file exists ${texlive_texmfsysvar}/tex/generic/config/language.def] {
delete ${texlive_texmfsysvar}/tex/generic/config/language.def
}
-
- # Deactivate tetex if installed
- if {![catch {registry_active teTeX}]} {
- registry_deactivate_composite teTeX "" [list ports_nodepcheck 1]
- }
}
post-activate {
Modified: users/dports/ports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- users/dports/ports/tex/texlive-fonts-recommended/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-fonts-recommended/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -50,12 +50,5 @@
{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]}]
- && [vercmp [lindex $vers 1] 19491] < 0} {
- registry_deactivate_composite texlive-fonts-extra "" [list ports_nodepcheck 1]
- }
-}
texlive.texmfport
Modified: users/dports/ports/tex/texlive-generic-recommended/Portfile
===================================================================
--- users/dports/ports/tex/texlive-generic-recommended/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-generic-recommended/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -26,12 +26,5 @@
depends_lib port:texlive-basic
-pre-activate {
- # kastrup moved from texlive-latex-extra to texlive-generic-recommended
- if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
- && [vercmp [lindex $vers 1] 19548] < 0} {
- registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
- }
-}
texlive.texmfport
Modified: users/dports/ports/tex/texlive-latex/Portfile
===================================================================
--- users/dports/ports/tex/texlive-latex/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-latex/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -41,13 +41,5 @@
texlive.binaries dvilualatex latex lualatex mptopdf pdflatex
-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]}]
- && [vercmp [lindex $vers 1] 18549] < 0} {
- registry_deactivate_composite texlive-context "" [list ports_nodepcheck 1]
- }
-}
texlive.texmfport
Modified: users/dports/ports/tex/texlive-latex-recommended/Portfile
===================================================================
--- users/dports/ports/tex/texlive-latex-recommended/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-latex-recommended/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -31,18 +31,4 @@
# 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]}]
- && [vercmp [lindex $vers 1] 23080] < 0} {
- registry_deactivate_composite 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]}]
- && [vercmp [lindex $vers 1] 22931] < 0} {
- registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
- }
-}
-
texlive.texmfport
Modified: users/dports/ports/tex/texlive-math-extra/Portfile
===================================================================
--- users/dports/ports/tex/texlive-math-extra/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-math-extra/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -35,12 +35,5 @@
texlive.binaries amstex
-pre-activate {
- # binomexp moved from texlive-latex-extra to texlive-math-extra in TL2010
- if {![catch {set vers [lindex [registry_active texlive-latex-extra] 0]}]
- && [vercmp [lindex $vers 1] 19538] < 0} {
- registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
- }
-}
texlive.texmfport
Modified: users/dports/ports/tex/texlive-pictures/Portfile
===================================================================
--- users/dports/ports/tex/texlive-pictures/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-pictures/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -35,11 +35,4 @@
# 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]}]
- && [vercmp [lindex $vers 1] 19538] < 0} {
- registry_deactivate_composite texlive-latex-extra "" [list ports_nodepcheck 1]
- }
-}
-
texlive.texmfport
Modified: users/dports/ports/tex/texlive-xetex/Portfile
===================================================================
--- users/dports/ports/tex/texlive-xetex/Portfile 2013-07-09 03:30:15 UTC (rev 107910)
+++ users/dports/ports/tex/texlive-xetex/Portfile 2013-07-09 03:31:17 UTC (rev 107911)
@@ -37,12 +37,4 @@
depends_lib-append port:texlive-latex-recommended \
port:texlive-generic-recommended
-pre-activate {
- # realscripts moved from texlive-math-extra in TL2012
- if {![catch {set vers [lindex [registry_active texlive-math-extra] 0]}]
- && [vercmp [lindex $vers 1] 26720] < 0} {
- registry_deactivate_composite texlive-math-extra "" [list ports_nodepcheck 1]
- }
-}
-
texlive.texmfport
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130708/e46db0e2/attachment.html>
More information about the macports-changes
mailing list