[64558] trunk/dports/tex

[takanori at macports.org]

Revision: 64558
          http://trac.macports.org/changeset/64558
Author:   takanori at macports.org
Date:     2010-03-09 01:10:48 -0800 (Tue, 09 Mar 2010)
Log Message:
-----------
pTeX and texlive, texlive_base, texlive_texmf-minimal, texlive_texmf-full, texlive_texmf-docs: declare conflicts

Modified Paths:
--------------
    trunk/dports/tex/pTeX/Portfile
    trunk/dports/tex/texlive/Portfile
    trunk/dports/tex/texlive_base/Portfile
    trunk/dports/tex/texlive_texmf-docs/Portfile
    trunk/dports/tex/texlive_texmf-full/Portfile
    trunk/dports/tex/texlive_texmf-minimal/Portfile

Modified: trunk/dports/tex/pTeX/Portfile
===================================================================
--- trunk/dports/tex/pTeX/Portfile	2010-03-09 08:54:10 UTC (rev 64557)
+++ trunk/dports/tex/pTeX/Portfile	2010-03-09 09:10:48 UTC (rev 64558)
@@ -80,6 +80,8 @@
 depends_run     port:texi2html \
                 port:texinfo
 
+conflicts       texlive, texlive_base, texlive_texmf-minimal, texlive_texmf-full, texlive_texmf-docs
+
 if {![variant_isset euc] && ![variant_isset sjis] && ![variant_isset utf8]} {
     default_variants    +euc
 }

Modified: trunk/dports/tex/texlive/Portfile
===================================================================
--- trunk/dports/tex/texlive/Portfile	2010-03-09 08:54:10 UTC (rev 64557)
+++ trunk/dports/tex/texlive/Portfile	2010-03-09 09:10:48 UTC (rev 64558)
@@ -21,6 +21,9 @@
 				http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/
 
 depends_lib     port:texlive_base
+
+conflicts       pTeX
+
 distfiles
 use_configure   no
 build           {}

Modified: trunk/dports/tex/texlive_base/Portfile
===================================================================
--- trunk/dports/tex/texlive_base/Portfile	2010-03-09 08:54:10 UTC (rev 64557)
+++ trunk/dports/tex/texlive_base/Portfile	2010-03-09 09:10:48 UTC (rev 64558)
@@ -36,6 +36,8 @@
                 port:texlive_texmf-minimal port:texlive_texmf-full \
                 port:xorg-libXp
 
+conflicts       pTeX
+
 depends_build   path:bin/perl:perl5
 
 configure.args  --mandir=${prefix}/share/man \

Modified: trunk/dports/tex/texlive_texmf-docs/Portfile
===================================================================
--- trunk/dports/tex/texlive_texmf-docs/Portfile	2010-03-09 08:54:10 UTC (rev 64557)
+++ trunk/dports/tex/texlive_texmf-docs/Portfile	2010-03-09 09:10:48 UTC (rev 64558)
@@ -18,6 +18,8 @@
 
 depends_run    port:texlive_base
 
+conflicts      pTeX
+
 master_sites   openbsd:distfiles \
 			   http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/
 distname       ${name}-${version}

Modified: trunk/dports/tex/texlive_texmf-full/Portfile
===================================================================
--- trunk/dports/tex/texlive_texmf-full/Portfile	2010-03-09 08:54:10 UTC (rev 64557)
+++ trunk/dports/tex/texlive_texmf-full/Portfile	2010-03-09 09:10:48 UTC (rev 64558)
@@ -20,6 +20,8 @@
 
 #depends_run    port:texlive_base
 
+conflicts     	pTeX
+
 master_sites   openbsd:distfiles \
                http://students.dec.bournemouth.ac.uk/ebarrett/texlive/distfiles/
 distname       ${name}-${version}${rev}

Modified: trunk/dports/tex/texlive_texmf-minimal/Portfile
===================================================================
--- trunk/dports/tex/texlive_texmf-minimal/Portfile	2010-03-09 08:54:10 UTC (rev 64557)
+++ trunk/dports/tex/texlive_texmf-minimal/Portfile	2010-03-09 09:10:48 UTC (rev 64558)
@@ -28,6 +28,8 @@
 
 patchfiles      patch-beamerbaseboxes.sty.diff
 
+conflicts     	pTeX
+
 use_configure   no
 build       {
         delete ${worksrcpath}/texmf/doc/man
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100309/f9c14779/attachment-0001.html>