[68678] users/dports/ports

[dports at macports.org]

Revision: 68678
          http://trac.macports.org/changeset/68678
Author:   dports at macports.org
Date:     2010-06-09 22:38:09 -0700 (Wed, 09 Jun 2010)
Log Message:
-----------
Add post-deactivate hook to clean up config files and generated
formats (and their logs).

Ensure /opt/local/etc/texmf/ls-R is registered to texlive-common

Set supported_arch on texlive, texlive-common, texlive-bin.

Use 1.9 features freely throughout.

Modified Paths:
--------------
    users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl
    users/dports/ports/tex/texlive/Portfile
    users/dports/ports/tex/texlive-bin/Portfile
    users/dports/ports/tex/texlive-common/Portfile

Modified: users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl
===================================================================
--- users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl	2010-06-10 04:26:03 UTC (rev 68677)
+++ users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl	2010-06-10 05:38:09 UTC (rev 68678)
@@ -91,11 +91,7 @@
     homepage        http://www.tug.org/texlive/
     platforms       darwin
     
-    if {[info exists supported_archs]} { 
-        supported_archs noarch 
-    } else { 
-        universal_variant no 
-    } 
+    supported_archs noarch 
     
     master_sites    http://flute.csail.mit.edu/texlive/
     use_bzip2       yes
@@ -245,4 +241,35 @@
             system "${prefix}/bin/fmtutil-sys --all"
         }
     }
+
+    post-deactivate {
+        # Update ls-R and any config files to reflect that the package
+        # is now gone
+        system "${prefix}/bin/texhash"
+        if {${texlive.forceupdatecnf} || ${texlive.languages} != ""} {
+            system "${prefix}/libexec/texlive-update-cnf language.dat"
+            system "${prefix}/libexec/texlive-update-cnf language.def"
+        }
+        if {${texlive.forceupdatecnf} || ${texlive.maps} != ""} {
+            system "${prefix}/libexec/texlive-update-cnf updmap.cfg"
+        }
+        if {${texlive.forceupdatecnf} || ${texlive.formats} != ""} {
+            system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
+        }
+        
+        # Remove any generated format files
+        foreach x ${texlive.formats} {
+            set fmtname [lindex $x 1]
+            set fmtengine [lindex $x 2]
+            switch $fmtengine {
+                "mf"       -
+                "mf-nowin" {set fmtengine "metafont"}
+                "mpost"    {set fmtengine "metapost"}
+            }
+            
+            foreach filename [glob -nocomplain ${texlive_texmfsysvar}/web2c/$fmtengine/$fmtname.*] {
+                delete $filename
+            }
+        }
+    }
 }

Modified: users/dports/ports/tex/texlive/Portfile
===================================================================
--- users/dports/ports/tex/texlive/Portfile	2010-06-10 04:26:03 UTC (rev 68677)
+++ users/dports/ports/tex/texlive/Portfile	2010-06-10 05:38:09 UTC (rev 68678)
@@ -21,6 +21,7 @@
 
 homepage        http://www.tug.org/texlive/
 platforms       darwin
+supported_archs noarch
 
 depends_lib     port:texlive-common port:texlive-bin
 

Modified: users/dports/ports/tex/texlive-bin/Portfile
===================================================================
--- users/dports/ports/tex/texlive-bin/Portfile	2010-06-10 04:26:03 UTC (rev 68677)
+++ users/dports/ports/tex/texlive-bin/Portfile	2010-06-10 05:38:09 UTC (rev 68678)
@@ -31,13 +31,9 @@
                 rmd160 e467932d53abe418f4e36a56afb683912ab0caec
 
 # xetex doesn't build 64-bit; force 32-bit for now
-if {${build_arch} == "x86_64"} {
-    configure.build_arch i386
-    configure.ldflags "-arch i386"
-} elseif {${build_arch} == "ppc64"} {
-    configure.build_arch ppc
-    configure.ldflags "-arch ppc"
-}
+supported_archs i386 ppc
+universal_variant no
+
 archcheck.files lib/libz.dylib \
                 lib/libpng.dylib \
                 lib/libt1.dylib \
@@ -46,8 +42,6 @@
                 lib/libpoppler.dylib \
                 lib/libXmu.dylib \
                 lib/libXp.dylib
-                
-universal_variant no
 
 # Bug #18303
 use_parallel_build no
@@ -139,7 +133,6 @@
 variant no_x11 conflicts xaw motif xaw3d nextaw {
     depends_lib-delete port:xorg-libXp
     archcheck.files-delete lib/libXp.dylib
-
     configure.args-append --without-x --without-pdfopen
     configure.args-delete  --x-includes=${prefix}/include \
                            --x-libraries=${prefix}/lib

Modified: users/dports/ports/tex/texlive-common/Portfile
===================================================================
--- users/dports/ports/tex/texlive-common/Portfile	2010-06-10 04:26:03 UTC (rev 68677)
+++ users/dports/ports/tex/texlive-common/Portfile	2010-06-10 05:38:09 UTC (rev 68678)
@@ -16,13 +16,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 +58,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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100609/16c78fc8/attachment.html>