[68890] trunk/dports/tex

[dports at macports.org]

Revision: 68890
          http://trac.macports.org/changeset/68890
Author:   dports at macports.org
Date:     2010-06-16 17:25:08 -0700 (Wed, 16 Jun 2010)
Log Message:
-----------
texlive-bin, texlive-common: merge in a couple more changes that
inexplicably did not get merged over by r68884:
  * set supported_archs
  * add pre-activate hook to texlive-common to remove old texlive 2007
    ports
  * remove libXmu from archcheck for texlive-bin +no_x11
  * update maintainer email address

Revision Links:
--------------
    http://trac.macports.org/changeset/68884

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

Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile	2010-06-17 00:18:22 UTC (rev 68889)
+++ trunk/dports/tex/texlive-bin/Portfile	2010-06-17 00:25:08 UTC (rev 68890)
@@ -7,9 +7,10 @@
 
 name            texlive-bin
 version         2009
+revision        1
 
 categories      tex
-maintainers     ambulatoryclam.net:dports
+maintainers     dports
 description     TeX Live Binaries.
 long_description    TeX Live is an easy way to get up and running with TeX. \
     It provides a comprehensive TeX system with binaries for most flavors \
@@ -31,8 +32,9 @@
                 rmd160 e467932d53abe418f4e36a56afb683912ab0caec
 
 # xetex doesn't build 64-bit; force 32-bit for now
-configure.build_arch i386
-configure.ldflags "-arch i386"
+supported_archs i386 ppc
+universal_variant no
+
 archcheck.files lib/libz.dylib \
                 lib/libpng.dylib \
                 lib/libt1.dylib \
@@ -41,8 +43,6 @@
                 lib/libpoppler.dylib \
                 lib/libXmu.dylib \
                 lib/libXp.dylib
-                
-universal_variant no
 
 # Bug #18303
 use_parallel_build no
@@ -133,8 +133,7 @@
 
 variant no_x11 conflicts xaw motif xaw3d nextaw {
     depends_lib-delete port:xorg-libXp
-    archcheck.files-delete lib/libXp.dylib
-
+    archcheck.files-delete lib/libXp.dylib lib/libXmu.dylib
     configure.args-append --without-x --without-pdfopen
     configure.args-delete  --x-includes=${prefix}/include \
                            --x-libraries=${prefix}/lib

Modified: trunk/dports/tex/texlive-common/Portfile
===================================================================
--- trunk/dports/tex/texlive-common/Portfile	2010-06-17 00:18:22 UTC (rev 68889)
+++ trunk/dports/tex/texlive-common/Portfile	2010-06-17 00:25:08 UTC (rev 68890)
@@ -6,9 +6,10 @@
 
 name                texlive-common
 version             2009
+revision            1
 
 categories          tex
-maintainers         ambulatoryclam.net:dports
+maintainers         dports
 description         TeX Live common infrastructure.
 long_description    This port provides files that support a MacPorts    \
                     installation of TeX Live, such as configuration     \
@@ -16,13 +17,8 @@
 
 homepage            http://www.tug.org/texlive/
 platforms           darwin
+supported_archs     noarch
 
-if {[info exists supported_archs]} {
-    supported_archs noarch
-} else {
-    universal_variant no
-}
-
 master_sites        http://flute.csail.mit.edu/texlive/
 worksrcdir          ${distname}
 use_bzip2           yes
@@ -63,6 +59,7 @@
     touch ${destroot}${texlive_texmfdist}/ls-R
     touch ${destroot}${texlive_texmflocal}/ls-R
     touch ${destroot}${texlive_texmfsysvar}/ls-R
+    touch ${destroot}${texlive_texmfsysconfig}/ls-R
 
     # Install texmf.cnf and symlink to its usual expected location
     xinstall -d ${destroot}${texlive_texmflocal}/web2c
@@ -92,6 +89,22 @@
         ${destroot}${prefix}/libexec/texlive-update-cnf
 }
 
+pre-activate {
+    # Delete ls-R index file if it exists
+    if [file exists ${texlive_texmflocal}/ls-R] {
+        delete ${texlive_texmflocal}/ls-R
+    }
+
+    # Deactivate 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).
+    foreach oldport {texlive_base texlive_texmf-full texlive_texmf-minimal texlive_texmf-docs} {
+        if {![catch {registry_active $oldport}]} {
+            registry_deactivate $oldport "" [list ports_nodepcheck 1]
+        }
+    }
+}
+
 post-activate {
     system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
     system "${prefix}/libexec/texlive-update-cnf language.dat"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100616/e84b1374/attachment.html>