[73314] trunk/dports

dports at macports.org dports at macports.org
Tue Nov 9 20:19:19 PST 2010


Revision: 73314
          http://trac.macports.org/changeset/73314
Author:   dports at macports.org
Date:     2010-11-09 20:19:13 -0800 (Tue, 09 Nov 2010)
Log Message:
-----------
Merge texlive 2010 update from /users/dports to /trunk

texlive: update to TeX Live 2010 (#26430)
 * generate texmf.cnf from contents of $prefix/etc/texmf/texmf.cnf.d
   (#24204)
 * build binaries in texlive-bin but stage them in
   $prefix/libexec/texlive/binaries until they are activated by other
   ports when their support files are installed (#25460, #25875)
 * symlink binaries to $prefix/libexec/texlive/texbin for MacTeX
   support (#26784)
 * fix up some dependency problems, including pulling pgf out of
   texlive-pictures so texlive-latex-recommended can depend on it
   (#25478)
 * add pre-activate hooks to deactivate texlive 2009 ports when
   necessary to avoid conflicts during upgrade
 * remove asymptote and xindy texmf files so that we can have separate
   ports someday
 * many minor changes to packaging

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/texlive-1.0.tcl
    trunk/dports/tex/texlive/Portfile
    trunk/dports/tex/texlive-basic/Portfile
    trunk/dports/tex/texlive-bibtex-extra/Portfile
    trunk/dports/tex/texlive-bin/Portfile
    trunk/dports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
    trunk/dports/tex/texlive-bin-extra/Portfile
    trunk/dports/tex/texlive-common/Portfile
    trunk/dports/tex/texlive-context/Portfile
    trunk/dports/tex/texlive-documentation-arabic/Portfile
    trunk/dports/tex/texlive-documentation-base/Portfile
    trunk/dports/tex/texlive-documentation-bulgarian/Portfile
    trunk/dports/tex/texlive-documentation-chinese/Portfile
    trunk/dports/tex/texlive-documentation-czechslovak/Portfile
    trunk/dports/tex/texlive-documentation-dutch/Portfile
    trunk/dports/tex/texlive-documentation-english/Portfile
    trunk/dports/tex/texlive-documentation-finnish/Portfile
    trunk/dports/tex/texlive-documentation-french/Portfile
    trunk/dports/tex/texlive-documentation-german/Portfile
    trunk/dports/tex/texlive-documentation-italian/Portfile
    trunk/dports/tex/texlive-documentation-japanese/Portfile
    trunk/dports/tex/texlive-documentation-korean/Portfile
    trunk/dports/tex/texlive-documentation-mongolian/Portfile
    trunk/dports/tex/texlive-documentation-polish/Portfile
    trunk/dports/tex/texlive-documentation-portuguese/Portfile
    trunk/dports/tex/texlive-documentation-russian/Portfile
    trunk/dports/tex/texlive-documentation-slovenian/Portfile
    trunk/dports/tex/texlive-documentation-spanish/Portfile
    trunk/dports/tex/texlive-documentation-thai/Portfile
    trunk/dports/tex/texlive-documentation-turkish/Portfile
    trunk/dports/tex/texlive-documentation-ukrainian/Portfile
    trunk/dports/tex/texlive-documentation-vietnamese/Portfile
    trunk/dports/tex/texlive-fonts-extra/Portfile
    trunk/dports/tex/texlive-fonts-recommended/Portfile
    trunk/dports/tex/texlive-fontutils/Portfile
    trunk/dports/tex/texlive-formats-extra/Portfile
    trunk/dports/tex/texlive-games/Portfile
    trunk/dports/tex/texlive-generic-extra/Portfile
    trunk/dports/tex/texlive-generic-recommended/Portfile
    trunk/dports/tex/texlive-htmlxml/Portfile
    trunk/dports/tex/texlive-humanities/Portfile
    trunk/dports/tex/texlive-lang-african/Portfile
    trunk/dports/tex/texlive-lang-arabic/Portfile
    trunk/dports/tex/texlive-lang-armenian/Portfile
    trunk/dports/tex/texlive-lang-cjk/Portfile
    trunk/dports/tex/texlive-lang-croatian/Portfile
    trunk/dports/tex/texlive-lang-cyrillic/Portfile
    trunk/dports/tex/texlive-lang-czechslovak/Portfile
    trunk/dports/tex/texlive-lang-danish/Portfile
    trunk/dports/tex/texlive-lang-dutch/Portfile
    trunk/dports/tex/texlive-lang-finnish/Portfile
    trunk/dports/tex/texlive-lang-french/Portfile
    trunk/dports/tex/texlive-lang-german/Portfile
    trunk/dports/tex/texlive-lang-greek/Portfile
    trunk/dports/tex/texlive-lang-hebrew/Portfile
    trunk/dports/tex/texlive-lang-hungarian/Portfile
    trunk/dports/tex/texlive-lang-indic/Portfile
    trunk/dports/tex/texlive-lang-italian/Portfile
    trunk/dports/tex/texlive-lang-latin/Portfile
    trunk/dports/tex/texlive-lang-latvian/Portfile
    trunk/dports/tex/texlive-lang-lithuanian/Portfile
    trunk/dports/tex/texlive-lang-mongolian/Portfile
    trunk/dports/tex/texlive-lang-norwegian/Portfile
    trunk/dports/tex/texlive-lang-other/Portfile
    trunk/dports/tex/texlive-lang-polish/Portfile
    trunk/dports/tex/texlive-lang-portuguese/Portfile
    trunk/dports/tex/texlive-lang-spanish/Portfile
    trunk/dports/tex/texlive-lang-swedish/Portfile
    trunk/dports/tex/texlive-lang-tibetan/Portfile
    trunk/dports/tex/texlive-lang-ukenglish/Portfile
    trunk/dports/tex/texlive-lang-vietnamese/Portfile
    trunk/dports/tex/texlive-latex/Portfile
    trunk/dports/tex/texlive-latex-extra/Portfile
    trunk/dports/tex/texlive-latex-recommended/Portfile
    trunk/dports/tex/texlive-latex3/Portfile
    trunk/dports/tex/texlive-luatex/Portfile
    trunk/dports/tex/texlive-math-extra/Portfile
    trunk/dports/tex/texlive-metapost/Portfile
    trunk/dports/tex/texlive-music/Portfile
    trunk/dports/tex/texlive-omega/Portfile
    trunk/dports/tex/texlive-pictures/Portfile
    trunk/dports/tex/texlive-plain-extra/Portfile
    trunk/dports/tex/texlive-pstricks/Portfile
    trunk/dports/tex/texlive-publishers/Portfile
    trunk/dports/tex/texlive-science/Portfile
    trunk/dports/tex/texlive-xetex/Portfile

Added Paths:
-----------
    trunk/dports/tex/texlive-basic/files/
    trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff
    trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg
    trunk/dports/tex/texlive-bin/files/patch-configure.diff
    trunk/dports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff
    trunk/dports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff
    trunk/dports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff
    trunk/dports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff
    trunk/dports/tex/texlive-documentation-serbian/
    trunk/dports/tex/texlive-documentation-serbian/Portfile
    trunk/dports/tex/texlive-lang-english/
    trunk/dports/tex/texlive-lang-english/Portfile
    trunk/dports/tex/texlive-lang-turkmen/
    trunk/dports/tex/texlive-lang-turkmen/Portfile

Removed Paths:
-------------
    trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff
    trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg
    trunk/dports/tex/texlive-bin/files/patch-configure
    trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc
    trunk/dports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc
    trunk/dports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff
    trunk/dports/tex/texlive-documentation-serbian/Portfile
    trunk/dports/tex/texlive-lang-english/Portfile
    trunk/dports/tex/texlive-lang-turkmen/Portfile

Property Changed:
----------------
    trunk/dports/_resources/port1.0/group/texlive-1.0.tcl
    trunk/dports/tex/
    trunk/dports/tex/texlive_base/
    trunk/dports/tex/texlive_texmf-docs/
    trunk/dports/tex/texlive_texmf-full/
    trunk/dports/tex/texlive_texmf-minimal/

Modified: trunk/dports/_resources/port1.0/group/texlive-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/texlive-1.0.tcl	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/_resources/port1.0/group/texlive-1.0.tcl	2010-11-10 04:19:13 UTC (rev 73314)
@@ -55,15 +55,37 @@
 # well too
 set texlive_texmfdist "${prefix}/share/texmf-texlive-dist"
 
-# "local" texmf files, e.g. installed by ports other than texlive
-set texlive_texmflocal "${prefix}/share/texmf"
+# texmf files installed by ports other than texlive
+set texlive_texmfports "${prefix}/share/texmf"
 
+# optional tree for user-installed texmf files
+set texlive_texmflocal "${prefix}/share/texmf-local"
+
 # variable runtime data, e.g. formats
 set texlive_texmfsysvar "${prefix}/var/db/texmf"
 
 # configuration data from texconfig
 set texlive_texmfsysconfig "${prefix}/etc/texmf"
 
+# location of binaries installed by texlive-bin
+#
+# All TeXLive binaries are built by texlive-bin, but most of them
+# aren't usable without the support files installed by other ports:
+# for example, xetex needs texlive-xetex, tex4ht needs
+# texlive-htmlxml, and just about everything needs texlive-basic.  We
+# don't want to install useless files into $prefix/bin, so instead
+# texlive-bin installs its binaries into this "hidden" directory, and
+# other ports "activate" them when they are ready to be used by creating
+# symlinks into $prefix/bin.
+set texlive_bindir "${prefix}/libexec/texlive/binaries"
+
+# another directory containing symlinks to activated texlive binaries
+#
+# This is provided to support MacTeX's TeX Distribution preference
+# pane: it can select the active TeX distribution by pointing the
+# /usr/texbin symlink here
+set texlive_mactex_texbindir "${prefix}/libexec/texlive/texbin"
+
 # Remove dependencies on any texlive-documentation-* ports, for use by
 # -doc variants
 proc texlive.removedocdepends {} {
@@ -84,12 +106,8 @@
 options texlive.exclude
 default texlive.exclude {}
 
-# Skip installing all manpages. A number of texmf ports include
-# manpages, but many of them are already installed by texmf-bin.
-options texlive.excludemanpages
-default texlive.excludemanpages no
-
-options texlive.formats texlive.languages texlive.maps
+options texlive.binaries texlive.formats texlive.languages texlive.maps
+default texlive.binaries {}
 default texlive.formats {}
 default texlive.languages {}
 default texlive.maps {}
@@ -104,12 +122,12 @@
     supported_archs noarch 
     
     master_sites    http://flute.csail.mit.edu/texlive/
-    use_bzip2       yes
+    use_xz          yes
 
     global name master_sites
     livecheck.type  regex
     livecheck.url   ${master_sites}
-    livecheck.regex ${name}-(\\d+)\\.tar\\.bz2
+    livecheck.regex ${name}-(\\d+)\\.tar
 
     depends_lib-append port:texlive-common port:texlive-bin
 
@@ -127,6 +145,8 @@
     build           { }
 
     destroot {
+        xinstall -d ${destroot}${texlive_mactex_texbindir}
+
         set indexlist {"runfiles"}
         if {[variant_isset "doc"]} { lappend indexlist "docfiles" }
         if {[variant_isset "src"]} { lappend indexlist "srcfiles" }
@@ -157,14 +177,20 @@
 
                 # check for manpages and treat specially
                 if [regexp {^texmf/doc/man/man(\d)/([^/]+)} $line -> section filename] {
-                    if {![tbool texlive.excludemanpages]} {
-                        if [string match "*.$section" $filename] {
-                            # actually a manpage; install it
+                    if [string match "*.$section" $filename] {
+                        # actually a manpage; install it.  If
+                        # texlive-bin installed a manpage with the
+                        # same name, use it instead to make sure the
+                        # documentation matches the binary.
+                        if [file exists ${texlive_bindir}/man${section}/$filename.gz] {
+                            ln -s ${texlive_bindir}/man${section}/$filename.gz \
+                                ${destroot}${prefix}/share/man/man$section/
+                        } else {
                             copy $srcfile ${destroot}${prefix}/share/man/man$section/
-                        } else {
-                            # not actually a manpage; do nothing
-                            # (e.g. don't install PDF manpages)
                         }
+                    } else {
+                        # not actually a manpage; do nothing
+                        # (e.g. don't install PDF manpages)
                     }
                 } else {
                     # not a manpage; install into requested target dir
@@ -184,6 +210,13 @@
             }
         }
 
+        # create symlinks for any binaries activated by the port
+        foreach bin ${texlive.binaries} {
+            ui_msg "activating binary $bin"
+            ln -s ${texlive_bindir}/$bin ${destroot}${prefix}/bin
+            ln -s ${texlive_bindir}/$bin ${destroot}${texlive_mactex_texbindir}
+        }
+
         # install a documentation file containing the list of TeX
         # packages installed. This also ensures that each port
         # provides at least one file, even if there's nothing to
@@ -228,6 +261,8 @@
                     ![file exists ${destroot}${prefix}/bin/$fmtname]} {
                     ln -s ${prefix}/bin/$fmtengine \
                         ${destroot}${prefix}/bin/$fmtname
+                    ln -s ${prefix}/bin/$fmtengine \
+                        ${destroot}${texlive_mactex_texbindir}/$fmtname
                 }
             }
             
@@ -277,7 +312,7 @@
     }
 
     post-activate {
-        system "${prefix}/bin/mktexlsr"
+        system "${texlive_bindir}/mktexlsr"
         if {${texlive.forceupdatecnf}} {
             # If force was specified, update all the config files, and
             # regenerate all maps and formats.
@@ -312,7 +347,7 @@
     post-deactivate {
         # Update ls-R and any config files to reflect that the package
         # is now gone
-        system "${prefix}/bin/mktexlsr"
+        system "${texlive_bindir}/mktexlsr"
         if {${texlive.forceupdatecnf} || ${texlive.languages} != ""} {
             system "${prefix}/libexec/texlive-update-cnf language.dat"
             system "${prefix}/libexec/texlive-update-cnf language.def"


Property changes on: trunk/dports/_resources/port1.0/group/texlive-1.0.tcl
___________________________________________________________________
Added: svn:mergeinfo
   + /users/dports/ports/_resources/port1.0/group/texlive-1.0.tcl:72668-73311


Property changes on: trunk/dports/tex
___________________________________________________________________
Added: svn:mergeinfo
   + /users/dports/ports/tex:72668-73311

Modified: trunk/dports/tex/texlive/Portfile
===================================================================
--- trunk/dports/tex/texlive/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,8 +5,7 @@
 PortGroup       texlive 1.0
 
 name            texlive
-version         2009
-revision        3
+version         2010
 
 categories      tex
 maintainers     dports
@@ -95,7 +94,7 @@
                     port:texlive-lang-polish \
                     port:texlive-lang-portuguese \
                     port:texlive-lang-spanish \
-                    port:texlive-lang-ukenglish \
+                    port:texlive-lang-english \
                     port:texlive-latex \
                     port:texlive-latex-recommended \
                     port:texlive-math-extra \
@@ -137,6 +136,7 @@
                     port:texlive-documentation-polish \
                     port:texlive-documentation-portuguese \
                     port:texlive-documentation-russian \
+                    port:texlive-documentation-serbian \
                     port:texlive-documentation-slovenian \
                     port:texlive-documentation-spanish \
                     port:texlive-documentation-thai \
@@ -180,7 +180,8 @@
                     port:texlive-lang-spanish \
                     port:texlive-lang-swedish \
                     port:texlive-lang-tibetan \
-                    port:texlive-lang-ukenglish \
+                    port:texlive-lang-turkmen \
+                    port:texlive-lang-english \
                     port:texlive-lang-vietnamese \
                     port:texlive-latex \
                     port:texlive-latex-extra \

Modified: trunk/dports/tex/texlive-basic/Portfile
===================================================================
--- trunk/dports/tex/texlive-basic/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-basic/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,23 +5,23 @@
 PortGroup           texlive 1.0
 
 name                texlive-basic
-version             15576
-revision            1
+version             17228
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Essential programs and files
 long_description    These files are regarded as basic for any TeX system, covering plain TeX macros, Computer Modern fonts, and configuration for common drivers\; no LaTeX.
 
-checksums           md5     925a2d2d1622858b15730066326f89f6 \
-                    sha1    b336e42d8e4e2f3103db61ace18256e67e0ab47c \
-                    rmd160  1d817c4ce28f7010dfd001e51800233345736c76
+checksums           md5     cd34562742f998e23be31c3f90aaf8d5 \
+                    sha1    1547529eac5d2a2fa7015ac7e12a5eb049969efb \
+                    rmd160  d45ce7124c1c3a15991b8988e83587f348076047
 
 depends_lib         port:texlive-documentation-base
 
 texlive.formats      \
-    {1 luatex luatex language.def {luatex.ini}} \
-    {1 dviluatex luatex language.def {dviluatex.ini}} \
+    {1 luatex luatex language.def,language.dat.lua {luatex.ini}} \
+    {1 dviluatex luatex language.def,language.dat.lua {dviluatex.ini}} \
     {1 mf mf-nowin - {-translate-file=cp227.tcx mf.ini}} \
     {1 pdftex pdftex language.def {-translate-file=cp227.tcx *pdfetex.ini}} \
     {1 etex pdftex language.def {-translate-file=cp227.tcx *etex.ini}} \
@@ -38,67 +38,16 @@
     {MixedMap cmtext-bsr-interpolated.map} \
     {MixedMap mflogo.map}
 
-texlive.exclude     texmf/doc/man/man1/afm2tfm.1 \
-                    texmf/doc/man/man1/allcm.1 \
-                    texmf/doc/man/man1/allec.1 \
-                    texmf/doc/man/man1/allneeded.1 \
-                    texmf/doc/man/man1/bibtex.1 \
-                    texmf/doc/man/man1/dvi2fax.1 \
-                    texmf/doc/man/man1/dvips.1 \
-                    texmf/doc/man/man1/dvired.1 \
-                    texmf/doc/man/man1/fmtutil-sys.1 \
-                    texmf/doc/man/man1/fmtutil.1 \
-                    texmf/doc/man/man1/fontinst.1 \
-                    texmf/doc/man/man1/gftodvi.1 \
-                    texmf/doc/man/man1/gftopk.1 \
-                    texmf/doc/man/man1/gftype.1 \
-                    texmf/doc/man/man1/gsftopk.1 \
-                    texmf/doc/man/man1/kpseaccess.1 \
-                    texmf/doc/man/man1/kpsepath.1 \
-                    texmf/doc/man/man1/kpsereadlink.1 \
-                    texmf/doc/man/man1/kpsestat.1 \
-                    texmf/doc/man/man1/kpsetool.1 \
-                    texmf/doc/man/man1/kpsewhere.1 \
-                    texmf/doc/man/man1/kpsewhich.1 \
-                    texmf/doc/man/man1/kpsexpand.1 \
-                    texmf/doc/man/man1/gsftopk.1 \
-                    texmf/doc/man/man1/luatex.1 \
-                    texmf/doc/man/man1/makeindex.1 \
-                    texmf/doc/man/man1/mf-nowin.1 \
-                    texmf/doc/man/man1/mf.1 \
-                    texmf/doc/man/man1/mft.1 \
-                    texmf/doc/man/man1/mkindex.1 \
-                    texmf/doc/man/man1/mkocp.1 \
-                    texmf/doc/man/man1/mkofm.1 \
-                    texmf/doc/man/man1/mktexfmt.1 \
-                    texmf/doc/man/man1/mktexlsr.1 \
-                    texmf/doc/man/man1/mktexmf.1 \
-                    texmf/doc/man/man1/mktexpk.1 \
-                    texmf/doc/man/man1/mktextfm.1 \
-                    texmf/doc/man/man1/pdfetex.1 \
-                    texmf/doc/man/man1/pdftex.1 \
-                    texmf/doc/man/man1/pktogf.1 \
-                    texmf/doc/man/man1/pktype.1 \
-                    texmf/doc/man/man1/tcdialog.1 \
-                    texmf/doc/man/man1/tex.1 \
-                    texmf/doc/man/man1/texconfig-sys.1 \
-                    texmf/doc/man/man1/texconfig.1 \
-                    texmf/doc/man/man1/texlinks.1 \
-                    texmf/doc/man/man1/texhash.1 \
-                    texmf/doc/man/man1/updmap-sys.1 \
-                    texmf/doc/man/man1/updmap.1 \
-                    texmf/doc/man/man1/xdvi.1 \
-                    texmf/doc/man/man5/fmtutil.cnf.5 \
-                    texmf/doc/man/man5/updmap.cfg.5 \
-                    texmf/web2c/fmutil.cnf \
+texlive.binaries    afm2tfm allcm allec allneeded bibtex dvi2fax dvipdfm dvipdfmx dvipdft dvips dvired ebb extractbb fmtutil fmtutil-sys gftodvi gftopk gftype gsftopk kpseaccess kpsepath kpsereadlink kpsestat kpsetool kpsewhere kpsewhich kpsexpand luatex makeindex mf-nowin mft mkindex mkocp mkofm mktexfmt mktexlsr mktexmf mktexpk mktextfm pdftex pktogf pktype simpdftex tcdialog tex texconfig texconfig-dialog texconfig-sys texhash texlinks texlua texluac updmap updmap-sys xdvi
+
+texlive.exclude     texmf/web2c/fmutil.cnf \
                     texmf/web2c/texmf.cnf \
                     texmf/web2c/updmap.cfg \
                     texmf/tex/generic/config/language.dat \
                     texmf/tex/generic/config/language.def
 
-post-destroot {
-    delete ${destroot}${prefix}/bin/mf
-}
+patchfiles          patch-runfiles_texmf_dvipdfm_config_config.diff \
+                    patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg
 
 pre-activate {
     # If texlive 2007 metaport is installed, deactivate it to avoid
@@ -108,6 +57,13 @@
         && [rpm-vercomp [lindex $vers 1] 2009] < 0} {
         registry_deactivate 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]}]
+        && [rpm-vercomp [lindex $vers 1] 16392] < 0} {
+        registry_deactivate texlive-fontutils "" [list ports_nodepcheck 1]
+    }
 }
 
 texlive.forceupdatecnf yes

Deleted: trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff
===================================================================
--- users/dports/ports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff	2010-11-10 02:07:55 UTC (rev 73311)
+++ trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,11 +0,0 @@
---- runfiles/texmf/dvipdfm/config/config.orig	2010-11-09 19:46:22.000000000 -0500
-+++ runfiles/texmf/dvipdfm/config/config	2010-11-09 19:46:30.000000000 -0500
-@@ -6,7 +6,7 @@
- %% keep this the same in dvipdfm and dvipdfmx.
- %% can't use zcat because the pipe breaks on Windows; better to have
- %% one config file.
--D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
-+D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
- 
- % Distiller config. Uses ghostscript and works on compressed and
- % uncompressed files.  Use zcat -f <%i instead of zcat -f %i

Copied: trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff (from rev 73311, users/dports/ports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff)
===================================================================
--- trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfm_config_config.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,11 @@
+--- runfiles/texmf/dvipdfm/config/config.orig	2010-11-09 19:46:22.000000000 -0500
++++ runfiles/texmf/dvipdfm/config/config	2010-11-09 19:46:30.000000000 -0500
+@@ -6,7 +6,7 @@
+ %% keep this the same in dvipdfm and dvipdfmx.
+ %% can't use zcat because the pipe breaks on Windows; better to have
+ %% one config file.
+-D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
++D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=1.3 -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dUseFlateCompression=true -sOutputFile=%o %i -c quit"
+ 
+ % Distiller config. Uses ghostscript and works on compressed and
+ % uncompressed files.  Use zcat -f <%i instead of zcat -f %i

Deleted: trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg
===================================================================
--- users/dports/ports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg	2010-11-10 02:07:55 UTC (rev 73311)
+++ trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,11 +0,0 @@
---- runfiles/texmf/dvipdfmx/dvipdfmx.cfg.orig	2010-11-09 19:47:16.000000000 -0500
-+++ runfiles/texmf/dvipdfmx/dvipdfmx.cfg	2010-11-09 19:48:23.000000000 -0500
-@@ -142,7 +142,7 @@
- %% /usr/local/texlive/2009/texmf-dist/dvips/pstricks/pstricks.pro (for
- %% example) needs to be accessed.
- %%
--D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile=%o %i -c quit"
-+D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile=%o %i -c quit"
- 
- %% Frank Siegert's PStill:
- %D  "/usr/local/bin/pstill -c -o %o %i"

Copied: trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg (from rev 73311, users/dports/ports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg)
===================================================================
--- trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg	                        (rev 0)
+++ trunk/dports/tex/texlive-basic/files/patch-runfiles_texmf_dvipdfmx_dvipdfmx.cfg	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,11 @@
+--- runfiles/texmf/dvipdfmx/dvipdfmx.cfg.orig	2010-11-09 19:47:16.000000000 -0500
++++ runfiles/texmf/dvipdfmx/dvipdfmx.cfg	2010-11-09 19:48:23.000000000 -0500
+@@ -142,7 +142,7 @@
+ %% /usr/local/texlive/2009/texmf-dist/dvips/pstricks/pstricks.pro (for
+ %% example) needs to be accessed.
+ %%
+-D  "rungs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile=%o %i -c quit"
++D  "gs -q -dNOPAUSE -dBATCH -sPAPERSIZE=a0 -sDEVICE=pdfwrite -dCompatibilityLevel=%v -dAutoFilterGrayImages=false -dGrayImageFilter=/FlateEncode -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -sOutputFile=%o %i -c quit"
+ 
+ %% Frank Siegert's PStill:
+ %D  "/usr/local/bin/pstill -c -o %o %i"

Modified: trunk/dports/tex/texlive-bibtex-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-bibtex-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bibtex-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,19 +5,21 @@
 PortGroup           texlive 1.0
 
 name                texlive-bibtex-extra
-version             15225
-revision            1
+version             17995
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Extra BibTeX styles
-long_description    Additional BibTeX styles and bibliography databases.
+long_description    Additional BibTeX styles and bibliography databases, including BibLaTeX.
 
-checksums           md5     43067241f2bef392645c5f4e878e8ff8 \
-                    sha1    ef7d98967bd02e70c893a48dec0bba4cacc76588 \
-                    rmd160  f4d1680c97635095910fe2a6237e525019e1d56f
+checksums           md5     69f6a6e09ef00edc44f95536690e27cb \
+                    sha1    4f5899c4f23d4cba28b5044d59ef2109f24c03d7 \
+                    rmd160  e955c3982242f6770f3d39dc5739c0443377b39f
 
 depends_lib         port:texlive-latex
 
+texlive.binaries    bibexport
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-bin/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -3,11 +3,9 @@
 
 PortSystem      1.0
 PortGroup       texlive 1.0
-PortGroup       archcheck 1.0
 
 name            texlive-bin
-version         2009
-revision        6
+version         2010
 
 categories      tex
 maintainers     dports
@@ -21,33 +19,24 @@
 homepage        http://www.tug.org/texlive/
 platforms       darwin
 
-# distfile is the same as the official one, but recompressed in bz2
-master_sites    http://flute.csail.mit.edu/texlive/
-set distversion 20091107
+master_sites    tex_ctan:systems/texlive/Source/
+set distversion 20100720
 distname        texlive-${distversion}-source
 worksrcdir      ${distname}
-use_bzip2       yes
-checksums       md5 34e636c76534d4b3a1b3f06f568ddedc \
-                sha1 891434197b1aa60030eb059553697cb40c6ab15b \
-                rmd160 e467932d53abe418f4e36a56afb683912ab0caec
+use_xz          yes
+checksums       md5     2a2201b84fdbf210032e1df70bc59157 \
+                sha1    713b861123e3d9e073e2c93d7ed3e13262d82c34 \
+                rmd160  b1120f3377ca45b4d86911b99a95c2e6e45927b5
 
 universal_variant no
 
-archcheck.files lib/libz.dylib \
-                lib/libpng.dylib \
-                lib/libt1.dylib \
-                lib/libfreetype.dylib \
-                lib/libgd.dylib \
-                lib/libpoppler.dylib \
-                lib/libXmu.dylib \
-                lib/libXp.dylib
-
 depends_lib     port:fontconfig \
                 port:freetype \
                 port:gd2 \
                 port:libpng \
                 port:ncurses \
                 port:zlib \
+                port:libzzip \
                 port:t1lib \
                 port:poppler \
                 port:xorg-libXp \
@@ -58,17 +47,24 @@
 depends_build   path:bin/perl:perl5 \
                 path:bin/pkg-config:pkgconfig
 
-patchfiles      patch-configure \
+patchfiles      patch-configure.diff \
+                patch-libs_icu_Makefile.in.diff \
+                patch-libs_icu_icu-4.4_configure.diff \
                 patch-libs-freetype-Makefile.in.diff \
-                patch-texk_web2c_luatexdir_image_pdftoepdf_cc \
-                patch-texk_web2c_pdftexdir_pdftoepdf_cc \
-                patch-texk_xdvipdfmx_configure.diff \
-                patch-texk_texlive_linked_scripts_Makefile.in.diff
+                patch-texk_texlive_linked_scripts_Makefile.in.diff \
+                patch-texk_tex4htk_Makefile.in.diff \
+                patch-texk_xdvik_xdvi-sh.in.diff
 
 post-patch {
     reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
     reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/texlive/linked_scripts/Makefile.in
+    reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|" ${worksrcpath}/texk/tex4htk/Makefile.in
+    reinplace "s|@@TEXLIVE_BINDIR@@|${texlive_bindir}|" ${worksrcpath}/texk/xdvik/xdvi-sh.in
 
+    # Link our texmf.cnf in so that the proper paths are compiled into kpathsea
+    delete ${worksrcpath}/texk/kpathsea/texmf.cnf
+    ln -s ${texlive_texmfsysconfig}/texmf.cnf ${worksrcpath}/texk/kpathsea/texmf.cnf
+
     if {![variant_isset atsui]} {
         # Force configure to believe that Carbon API is
         # unavailable. This test is actually used to determine whether
@@ -76,6 +72,12 @@
         reinplace "s|kpse_cv_have_Carbon=yes|kpse_cv_have_Carbon=no|" ${worksrcpath}/texk/web2c/configure
         reinplace "s|kpse_cv_have_Carbon=yes|kpse_cv_have_Carbon=no|" ${worksrcpath}/texk/xdv2pdf/configure
     }
+    
+    # Do the same for xdvipdfmx regardless of whether +atsui is set,
+    # because it will want to use deprecated fontconfig APIs that are
+    # only available if fontconfig is compiled with
+    # --with-old-mac-fonts
+    reinplace "s|kpse_cv_have_ApplicationServices=yes|kpse_cv_have_ApplicationServices=no|" ${worksrcpath}/texk/xdvipdfmx/configure
 }
 
 
@@ -85,12 +87,13 @@
 #
 # Exceptions are freetype1 (not in MacPorts anymore) and icu (the
 # texlive version is non-standard)
-configure.args  --mandir=${prefix}/share/man \
+configure.args  --bindir=${texlive_bindir} \
+                --mandir=${texlive_bindir} \
                 --infodir=${prefix}/share/info \
                 --disable-multiplatform \
                 --disable-native-texlive-build \
                 --without-old-mac-fonts \
-                --with-tex-banner="TeX Live/MacPorts ${version}_${revision}" \
+                --with-banner-add="/MacPorts ${version}_${revision}" \
                 --enable-shared \
                 --with-system-freetype2 \
                 --without-system-freetype \
@@ -105,6 +108,8 @@
                 --with-t1lib-libdir=${prefix}/lib \
                 --with-system-xpdf \
                 --with-system-zlib \
+                --with-system-zziplib \
+                --enable-etex \
                 --disable-detex \
                 --disable-dvi2tty \
                 --disable-ps2eps \
@@ -131,16 +136,31 @@
     # texmf and texmf-dist will be installed by other texlive ports
     delete ${destroot}${prefix}/texmf
     delete ${destroot}${prefix}/texmf-dist
-    delete ${destroot}${texlive_texmfmain}
-    delete ${destroot}${texlive_texmfdist}
 
     # Do not install symlinks to scripts that we will not install
-    delete ${destroot}${prefix}/bin/man
-    delete ${destroot}${prefix}/bin/latexmk
+    delete ${destroot}${texlive_bindir}/latexmk
+    delete ${destroot}${texlive_bindir}/tlmgr
+
+    # gzip manpages that are installed into texlive_bindir
+    foreach manpage [glob -directory ${destroot}${texlive_bindir} man*/*] {
+        # need to make sure it isn't a symlink
+        if {[file type $manpage] == "file"} {
+            system "gzip $manpage"
+        }
+    }
 }
 
+pre-activate {
+    if { [file exists ${texlive_texmfdist}/scripts/tex4ht/ht.sh]
+         && ![catch {set vers [lindex [registry_active texlive-htmlxml] 0]}]
+         && [rpm-vercomp [lindex $vers 1] 13822] == 0
+         && [lindex $vers 2] <3} {
+        registry_deactivate texlive-htmlxml "" [list ports_nodepcheck 1]
+    }
+}
+
 post-activate {
-    system "${prefix}/bin/mktexlsr"
+    system "${texlive_bindir}/mktexlsr"
 }
 
 variant atsui description {Use ATSUI instead of freetype for XeTeX font rendering (forces 32-bit)} {
@@ -154,19 +174,16 @@
 
 variant no_x11 conflicts xaw motif xaw3d nextaw {
     depends_lib-delete port:xorg-libXp
-    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
 }
 variant motif conflicts no_x11 xaw xaw3d nextaw description {Use Motif to build xdvi} {
      depends_lib-append lib:libXm:openmotif
-     archcheck.files-append lib/libXm.dylib
      configure.args-append --with-xdvi-x-toolkit=motif
 }
 variant xaw conflicts no_x11 motif xaw3d nextaw description {Use Xaw to build xdvi} {
     depends_lib-append port:xorg-libXaw
-    archcheck.files-append lib/libXaw.dylib
     configure.args-append --with-xdvi-x-toolkit=xaw
 }
 variant xaw3d conflicts no_x11 motif xaw nextaw description {Use Xaw3d to build xdvi} {
@@ -175,7 +192,6 @@
 }
 variant nextaw conflicts no_x11 motif xaw xaw3d description {Use neXtaw to build xdvi} {
     depends_lib-append port:neXtaw
-    archcheck.files-append lib/libneXtaw.dylib
     configure.args-append --with-xdvi-x-toolkit=neXtaw
 }
 

Deleted: trunk/dports/tex/texlive-bin/files/patch-configure
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-configure	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin/files/patch-configure	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2009/12/12 17:48:34 edd Exp $
---- configure.orig	Sat Jul  4 17:27:52 2009
-+++ configure	Sat Jul  4 17:42:02 2009
-@@ -20683,7 +20683,7 @@ else
- fi
- 
- if $PKG_CONFIG poppler --atleast-version=0.10; then
--  POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-+  POPPLER_VERSION='-DPOPPLER_VERSION="'`$PKG_CONFIG poppler --modversion`'"'
-   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
-   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
- elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then

Copied: trunk/dports/tex/texlive-bin/files/patch-configure.diff (from rev 73311, users/dports/ports/tex/texlive-bin/files/patch-configure.diff)
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-configure.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure,v 1.2 2009/12/12 17:48:34 edd Exp $
+--- configure.orig	Sat Jul  4 17:27:52 2009
++++ configure	Sat Jul  4 17:42:02 2009
+@@ -20683,7 +20683,7 @@ else
+ fi
+ 
+ if $PKG_CONFIG poppler --atleast-version=0.10; then
+-  POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
++  POPPLER_VERSION='-DPOPPLER_VERSION="'`$PKG_CONFIG poppler --modversion`'"'
+   XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
+   XPDF_LIBS=`$PKG_CONFIG poppler --libs`
+ elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then

Copied: trunk/dports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff (from rev 73311, users/dports/ports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff)
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-libs_icu_Makefile.in.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,15 @@
+--- libs/icu/Makefile.in.orig	2010-11-02 20:11:12.000000000 -0400
++++ libs/icu/Makefile.in	2010-11-02 20:20:35.000000000 -0400
+@@ -198,6 +198,12 @@
+ SUBDIRS = . $(am__append_1)
+ EXTRA_DIST = $(ICU_TREE) license.html $(ICU_TREE)-PATCHES
+ @cross_TRUE at ICU_NATIVE = icu-native/config/icucross.mk
++
++# MacPorts: remove $prefix/lib from LIBRARY_PATH to prevent gcc from
++# trying to link against libraries from the icu port
++export LIBRARY_PATH=
++
++
+ all: all-recursive
+ 
+ .SUFFIXES:

Copied: trunk/dports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff (from rev 73311, users/dports/ports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff)
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-libs_icu_icu-4.4_configure.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,75 @@
+--- libs/icu/icu-4.4/configure.orig	2009-10-02 11:50:49.000000000 +0200
++++ libs/icu/icu-4.4/configure	2009-10-02 11:54:38.000000000 +0200
+@@ -7034,52 +7034,6 @@
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_bigendian=unknown
+-    # See if we're dealing with a universal compiler.
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#ifndef __APPLE_CC__
+-	       not a universal capable compiler
+-	     #endif
+-	     typedef int dummy;
+-
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-
+-	# Check for potential -arch flags.  It is not universal unless
+-	# there are some -arch flags.  Note that *ppc* also matches
+-	# ppc64.  This check is also rather less than ideal.
+-	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
+-	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
+-	esac
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     if test $ac_cv_c_bigendian = unknown; then
+       # See if sys/param.h defines the BYTE_ORDER macro.
+       cat >conftest.$ac_ext <<_ACEOF
+@@ -7418,19 +7372,6 @@
+ ;; #(
+    no)
+       ;; #(
+-   universal)
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
+-_ACEOF
+-
+-     ;; #(
+-   *)
+-     { { $as_echo "$as_me:$LINENO: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
+-$as_echo "$as_me: error: unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
+-   { (exit 1); exit 1; }; } ;;
+  esac
+ 
+ if test $ac_cv_c_bigendian = no; then

Copied: trunk/dports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff (from rev 73311, users/dports/ports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff)
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_tex4htk_Makefile.in.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,44 @@
+--- texk/tex4htk/Makefile.in.orig	2010-11-01 20:10:42.000000000 -0400
++++ texk/tex4htk/Makefile.in	2010-11-01 22:31:56.000000000 -0400
+@@ -274,8 +274,8 @@
+ 	wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \
+ 	xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
+ 	xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
+-tex4ht_subdir = texmf-dist/scripts/tex4ht
+-tex4htdir = ${prefix}/$(tex4ht_subdir)
++tex4ht_subdir = scripts/tex4ht
++tex4htdir = @@TEXMFDIST@@/$(tex4ht_subdir)
+ tex4ht_SCRIPTS = 
+ bin_SCRIPTS = 
+ all: c-auto.h
+@@ -837,25 +837,20 @@
+ 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \
+ 	  $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
+ 	done
+-	case "$(bindir)" in \
+-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+-	     exit 1;; \
+-	esac
++	$(MAKE) $(AM_MAKEFLAGS) install-links
+ 
+ .PHONY: install-links
+ install-links:
+ 	@cd $(DESTDIR)$(bindir) && \
+ 	  for p in $(perl_scripts); do \
+ 	    rm -f $$p; \
+-	    echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
+-	    $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
++	    echo "creating link '$$p' -> '$(tex4htdir)/$$p.pl'"; \
++	    $(LN_S) $(tex4htdir)/$$p.pl $$p; \
+ 	  done && \
+ 	  for p in $(shell_scripts); do \
+ 	    rm -f $$p; \
+-	    echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
+-	    $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \
++	    echo "creating link '$$p' -> '$(tex4htdir)/$$p.sh'"; \
++	    $(LN_S) $(tex4htdir)/$$p.sh $$p; \
+ 	  done
+ 
+ uninstall-hook:

Modified: trunk/dports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_texlive_linked_scripts_Makefile.in.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,24 +1,23 @@
---- texk/texlive/linked_scripts/Makefile.in	2009-10-14 19:39:50.000000000 -0400
-+++ texk/texlive/linked_scripts/Makefile.in	2010-02-02 14:54:01.000000000 -0500
-@@ -156,7 +156,7 @@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- bin_SCRIPTS = 
--scriptxdir = ${prefix}/texmf/scripts
-+scriptxdir = @@TEXMFMAIN@@/scripts
- nobase_dist_scriptx_SCRIPTS = \
- 	a2ping/a2ping.pl \
- 	getnonfreefonts/getnonfreefonts.pl \
-@@ -167,7 +167,7 @@
- 	texlive/rungs.tlu \
- 	texlive/tlmgr.pl
+--- texk/texlive/linked_scripts/Makefile.in.orig	2010-11-01 20:10:29.000000000 -0400
++++ texk/texlive/linked_scripts/Makefile.in	2010-11-01 22:27:35.000000000 -0400
+@@ -575,13 +575,10 @@
+ #
+ # We support both multiplatform and non-multiplatform builds.
+ #
++
++# MacPorts: hard-code link destinations instead of using relative ones
+ install-data-hook:
+-	case "$(bindir)" in \
+-	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+-	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+-	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+-	     exit 1;; \
+-	esac
++	 $(MAKE) $(AM_MAKEFLAGS) install-links
  
--scriptdir = ${prefix}/texmf-dist/scripts
-+scriptdir = @@TEXMFDIST@@/scripts
- nobase_dist_script_SCRIPTS = \
- 	accfonts/mkt1font \
- 	accfonts/vpl2ovp \
-@@ -554,16 +554,16 @@
+ .PHONY: install-links
+ install-links:
+@@ -589,16 +586,16 @@
  	  for s in $(nobase_dist_scriptx_SCRIPTS); do \
  	    target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
  	    rm -f $$target; \
@@ -37,16 +36,19 @@
 +	    echo "creating link '$$target' -> '@@TEXMFDIST@@/scripts/$$s'"; \
 +	    $(LN_S) @@TEXMFDIST@@/scripts/$$s $$target; \
  	  done && \
- 	  rm -f rpdfcrop && \
- 	  echo "creating link 'rpdfcrop' -> 'pdfcrop'" && \
-@@ -575,8 +575,8 @@
- 	  echo "creating link 'getnonfreefonts-sys' -> 'getnonfreefonts'" && \
- 	  $(LN_S) getnonfreefonts getnonfreefonts-sys && \
- 	  rm -f man && \
--	  echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
--	  (ln -s $(REL)/texmf/doc/man man || :)
-+	  echo "creating link 'man' -> '@@TEXMFMAIN@@/doc/man'" && \
-+	  (ln -s @@TEXMFMAIN@@/doc/man man || :)
+ 	  for s in $(bin_links); do \
+ 	    link=`echo $$s | sed 's,.*:,,'`; \
+@@ -606,12 +603,7 @@
+ 	    rm -f $$link; \
+ 	    echo "creating link '$$link' -> '$$file'"; \
+ 	    $(LN_S) $$file $$link; \
+-	  done && \
+-	  rm -f man && \
+-	  if test -d $(REL)/texmf/doc/man; then \
+-	    echo "creating link 'man' -> '$(REL)/texmf/doc/man'" && \
+-	    (ln -s $(REL)/texmf/doc/man man || :); \
+-	  else :; fi
++	  done
  
  uninstall-hook:
  	@for s in $(nobase_dist_scriptx_SCRIPTS) $(nobase_dist_script_SCRIPTS); do \

Deleted: trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_web2c_luatexdir_image_pdftoepdf_cc	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,22 +0,0 @@
-$OpenBSD: patch-texk_web2c_luatexdir_image_pdftoepdf_cc,v 1.1 2009/12/12 17:48:34 edd Exp $
---- texk/web2c/luatexdir/image/pdftoepdf.cc.orig	Thu Jun 25 15:05:10 2009
-+++ texk/web2c/luatexdir/image/pdftoepdf.cc	Tue Oct 13 17:43:02 2009
-@@ -666,7 +666,7 @@ static void writeEncodings()
-     }
-     for (r = encodingList; r != NULL; r = n) {
-         n = r->next;
--        delete r->font;
-+        r->font->decRefCnt();
-         delete r;
-     }
- }
-@@ -720,7 +720,8 @@ read_pdf_info(image_dict * idict, integer minor_pdf_ve
-     // this works only for PDF 1.x -- but since any versions of PDF newer
-     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
-     // then have to changed drastically anyway.
--    pdf_version_found = pdf_doc->doc->getPDFVersion();
-+    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() +
-+			0.1 * pdf_doc->doc->getPDFMinorVersion();
-     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-     if (pdf_version_found > pdf_version_wanted + 0.01) {
-         char msg[] =

Deleted: trunk/dports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_web2c_pdftexdir_pdftoepdf_cc	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,22 +0,0 @@
-$OpenBSD: patch-texk_web2c_pdftexdir_pdftoepdf_cc,v 1.1 2009/12/12 17:48:34 edd Exp $
---- texk/web2c/pdftexdir/pdftoepdf.cc.orig	Wed May  6 10:19:56 2009
-+++ texk/web2c/pdftexdir/pdftoepdf.cc	Tue Oct 13 17:23:48 2009
-@@ -650,7 +650,7 @@ static void writeEncodings()
-     }
-     for (r = encodingList; r != 0; r = n) {
-         n = r->next;
--        delete r->font;
-+        r->font->decRefCnt();
-         delete r;
-     }
- }
-@@ -705,7 +705,8 @@ read_pdf_info(char *image_name, char *page_name, integ
-     // this works only for PDF 1.x -- but since any versions of PDF newer
-     // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
-     // then have to changed drastically anyway.
--    pdf_version_found = pdf_doc->doc->getPDFVersion();
-+    pdf_version_found = pdf_doc->doc->getPDFMajorVersion() +
-+			0.1 * pdf_doc->doc->getPDFMinorVersion();
-     pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-     if (pdf_version_found > pdf_version_wanted) {
-         char msg[] =

Copied: trunk/dports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff (from rev 73311, users/dports/ports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff)
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff	                        (rev 0)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_xdvik_xdvi-sh.in.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,8 @@
+--- texk/xdvik/xdvi-sh.in.orig	2010-11-01 20:11:17.000000000 -0400
++++ texk/xdvik/xdvi-sh.in	2010-11-01 22:34:49.000000000 -0400
+@@ -50,4 +50,4 @@
+   XFILESEARCHPATH="$xdviapppath:${XFILESEARCHPATH-%D}"; export XFILESEARCHPATH
+ fi
+ 
+-exec @final_exec_name@ $NAMEOPT ${1+"$@"}
++exec @@TEXLIVE_BINDIR@@/@final_exec_name@ $NAMEOPT ${1+"$@"}

Deleted: trunk/dports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff
===================================================================
--- trunk/dports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin/files/patch-texk_xdvipdfmx_configure.diff	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,12 +0,0 @@
---- texk/xdvipdfmx/configure	2010-01-25 14:39:00.000000000 -0500
-+++ texk/xdvipdfmx/configure	2010-01-25 14:39:55.000000000 -0500
-@@ -18648,6 +18648,9 @@
- 
- fi
- 
-+# force no ApplicationServices to use fontconfig instead of ATSU
-+kpse_cv_have_ApplicationServices=no
-+
- { $as_echo "$as_me:$LINENO: checking for Mac OS X ApplicationServices framework" >&5
- $as_echo_n "checking for Mac OS X ApplicationServices framework... " >&6; }
- if test "${kpse_cv_have_ApplicationServices+set}" = set; then

Modified: trunk/dports/tex/texlive-bin-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-bin-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-bin-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,65 +5,21 @@
 PortGroup           texlive 1.0
 
 name                texlive-bin-extra
-version             15618
-revision            3
+version             18336
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: TeX auxiliary programs
 long_description    Various useful, but non-essential, support programs. Includes programs and macros for DVI file manipulation, literate programming, patgen, and the TeX Works Editor.
 
-checksums           md5     585285a1dde1b7e682f8fdf138ce7819 \
-                    sha1    e69f18fe119f0b1fc2e011472031f6dd86e23a60 \
-                    rmd160  2eeef746b05b2aefba1402ac5b0db9b9551f1467
+checksums           md5     0e4b4a0c41e38429b90522d24807e55b \
+                    sha1    7fdea0949bb227ddf9a5c488a7b46e374fc242ee \
+                    rmd160  92958a1eeac00f6400885a24862f8250dad2a50f
 
 depends_lib         port:texlive-basic
 
-depends_run         port:latexmk
+texlive.binaries    a2ping arlatex bibtex8 bibtexu bundledoc chktex chkweb ctangle ctie cweave de-macro deweb dt2dv dv2dt dviasm dvibook dviconcat dvicopy dvidvi dvigif dvihp dvilj dvilj2p dvilj4 dvilj4l dvilj6 dvipng dvipos dviselect dvisvgm dvitodvi dvitype e2pall findhyph fragmaster lacheck latex2man latexdiff latexdiff-vc latexrevise listings-ext.sh mkjobtexmf patgen pdf180 pdf270 pdf90 pdfatfi pdfbook pdfclose pdfcrop pdfflip pdfjam pdfjam-pocketmod pdfjam-slides3up pdfjam-slides6up pdfjoin pdfnup pdfopen pdfpun pdftosrc pkfix pkfix-helper pooltype ps4pdf purifyeps rpdfcrop synctex tangle texcount texdiff texdirflatten texdoc texdoctk texloganalyser tie tpic2pdftex weave
 
-texlive.exclude     texmf/doc/man/man1/asy.1 \
-                    texmf/doc/man/man1/ctangle.1 \
-                    texmf/doc/man/man1/ctie.1 \
-                    texmf/doc/man/man1/cweave.1 \
-                    texmf/doc/man/man1/cweb.1 \
-                    texmf/doc/man/man1/dt2dv.1 \
-                    texmf/doc/man/man1/dv2dt.1 \
-                    texmf/doc/man/man1/dvibook.1 \
-                    texmf/doc/man/man1/dviconcat.1 \
-                    texmf/doc/man/man1/dvicopy.1 \
-                    texmf/doc/man/man1/dvidvi.1 \
-                    texmf/doc/man/man1/dvihp.1 \
-                    texmf/doc/man/man1/dvilj.1 \
-                    texmf/doc/man/man1/dvilj2p.1 \
-                    texmf/doc/man/man1/dvilj4.1 \
-                    texmf/doc/man/man1/dvilj4l.1 \
-                    texmf/doc/man/man1/dvilj6.1 \
-                    texmf/doc/man/man1/dvipng.1 \
-                    texmf/doc/man/man1/dvipos.1 \
-                    texmf/doc/man/man1/dviselect.1 \
-                    texmf/doc/man/man1/dvitodvi.1 \
-                    texmf/doc/man/man1/dvitype.1 \
-                    texmf/doc/man/man1/e2pall.1 \
-                    texmf/doc/man/man1/getnonfreefonts-sys.1 \
-                    texmf/doc/man/man1/getnonfreefonts.1 \
-                    texmf/doc/man/man1/lacheck.1 \
-                    texmf/doc/man/man1/latexmk.1 \
-                    texmf/doc/man/man1/mkjobtexmf.1 \
-                    texmf/doc/man/man1/patgen.1 \
-                    texmf/doc/man/man1/pdftosrc.1 \
-                    texmf/doc/man/man1/pooltype.1 \
-                    texmf/doc/man/man1/synctex.1 \
-                    texmf/doc/man/man1/tangle.1 \
-                    texmf/doc/man/man1/tex2xindy.1 \
-                    texmf/doc/man/man1/texdoctk.1 \
-                    texmf/doc/man/man1/texindy.1 \
-                    texmf/doc/man/man1/tie.1 \
-                    texmf/doc/man/man1/tpic2pdftex.1 \
-                    texmf/doc/man/man1/weave.1 \
-                    texmf/doc/man/man1/xasy.1 \
-                    texmf/doc/man/man5/synctex.5 \
-                    texmf/doc/man/man1/xindy.1 \
-                    texmf-dist/doc/support/latexmk \
-                    texmf-dist/scripts/latexmk
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-common/Portfile
===================================================================
--- trunk/dports/tex/texlive-common/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-common/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,8 +5,7 @@
 PortGroup           texlive 1.0
 
 name                texlive-common
-version             2009
-revision            1
+version             2010
 
 categories          tex
 maintainers         dports
@@ -21,20 +20,21 @@
 
 master_sites        http://flute.csail.mit.edu/texlive/
 worksrcdir          ${distname}
-use_bzip2           yes
-checksums           md5     8f2f1f88a2c7944204e2c2c09becaa03 \
-                    sha1    4b6052734c78aff3cbfed303b78dea0d67f3a685 \
-                    rmd160  48c92d5a815587034691446c0e9f93a7a5fabf6d
+use_xz              yes
+checksums           sha1     4bbab1829c4218b51e00eb07d7bd741cf29fce55 \
+                    rmd160   fc20939680399ec60e2ff80c312f994f975cfd83
 
 livecheck.type  regex
 livecheck.url   ${master_sites}
-livecheck.regex ${name}-(\[\\d-\]+)\\.tar\\.bz2
+livecheck.regex ${name}-(\[\\d-\]+)\\.tar
 
 
 post-patch {
-    foreach x {texmf.cnf texlive-update-cnf} {
+    foreach x {texmf.cnf.d/10paths.cnf texlive-update-cnf} {
+        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/${x}
         reinplace "s|@@TEXMFMAIN@@|${texlive_texmfmain}|g" ${worksrcpath}/${x}
         reinplace "s|@@TEXMFDIST@@|${texlive_texmfdist}|g" ${worksrcpath}/${x}
+        reinplace "s|@@TEXMFPORTS@@|${texlive_texmfports}|g" ${worksrcpath}/${x}
         reinplace "s|@@TEXMFLOCAL@@|${texlive_texmflocal}|g" ${worksrcpath}/${x}
         reinplace "s|@@TEXMFSYSVAR@@|${texlive_texmfsysvar}|g" ${worksrcpath}/${x}
         reinplace "s|@@TEXMFSYSCONFIG@@|${texlive_texmfsysconfig}|g" ${worksrcpath}/${x}
@@ -49,6 +49,7 @@
     # Create texmf directories
     xinstall -d ${destroot}${texlive_texmfmain}
     xinstall -d ${destroot}${texlive_texmfdist}
+    xinstall -d ${destroot}${texlive_texmfports}
     xinstall -d ${destroot}${texlive_texmflocal}
     xinstall -d ${destroot}${texlive_texmfsysvar}
     xinstall -d ${destroot}${texlive_texmfsysconfig}
@@ -57,17 +58,11 @@
     # port. The contents will be generated/updated by mktexlsr.
     touch ${destroot}${texlive_texmfmain}/ls-R
     touch ${destroot}${texlive_texmfdist}/ls-R
+    touch ${destroot}${texlive_texmfports}/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
-    xinstall -m 644 ${worksrcpath}/texmf.cnf \
-        ${destroot}${texlive_texmfsysconfig}/texmf.cnf
-    ln -s ${texlive_texmfsysconfig}/texmf.cnf \
-        ${destroot}${texlive_texmflocal}/web2c/texmf.cnf
-
     # Create fmt/updmap/hyphen files, directories, and install update script
     xinstall -d ${destroot}${texlive_texmfsysconfig}/fmtutil.d
     xinstall -d ${destroot}${texlive_texmfsysconfig}/language.d
@@ -87,6 +82,20 @@
     touch ${destroot}${texlive_texmfsysvar}/tex/generic/config/language.dat
     xinstall -m 755 ${worksrcpath}/texlive-update-cnf \
         ${destroot}${prefix}/libexec/texlive-update-cnf
+
+    # Install texmf.cnf files
+    touch ${destroot}${texlive_texmfsysconfig}/texmf.cnf
+    xinstall -d ${destroot}${texlive_texmfsysconfig}/texmf.cnf.d
+    foreach cnffile [glob -directory ${worksrcpath}/texmf.cnf.d *.cnf] {
+        xinstall -m 644 $cnffile \
+            ${destroot}${texlive_texmfsysconfig}/texmf.cnf.d/
+    }
+
+    # Symlink texmf.cnf to its usual expected location, just in case
+    # anything tries to look for it there
+    xinstall -d ${destroot}${texlive_texmflocal}/web2c
+    ln -s ${texlive_texmfsysconfig}/texmf.cnf \
+        ${destroot}${texlive_texmflocal}/web2c/texmf.cnf
 }
 
 pre-activate {
@@ -106,8 +115,15 @@
 }
 
 post-activate {
+    system "${prefix}/libexec/texlive-update-cnf texmf.cnf"
     system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
     system "${prefix}/libexec/texlive-update-cnf language.dat"
     system "${prefix}/libexec/texlive-update-cnf language.def"
     system "${prefix}/libexec/texlive-update-cnf updmap.cfg"
+
+    # run mktexlsr if it exists (i.e. if we are upgrading an existing
+    # installation)
+    if [file exists ${prefix}/bin/mktexlsr] {
+        system "${prefix}/bin/mktexlsr"
+    }
 }

Modified: trunk/dports/tex/texlive-context/Portfile
===================================================================
--- trunk/dports/tex/texlive-context/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-context/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,36 +5,32 @@
 PortGroup           texlive 1.0
 
 name                texlive-context
-version             14390
-revision            1
+version             18549
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: ConTeXt format
 long_description    Hans Hagen's powerful ConTeXt system, http://pragma-ade.com. Also includes third-party ConTeXt packages.
 
-checksums           md5     b4e43bd71745f75bdb353b0bd1b2b373 \
-                    sha1    1efe07622db022e948c970cb4dee4cee66b72c2b \
-                    rmd160  3f2530a43ddda2f085075d8cbadd5c4379201590
+checksums           md5     9fc780471b211b6cff2e30ed5c195fcc \
+                    sha1    f0987fde8b096326bde12213dfd5080e940cd892 \
+                    rmd160  8ba979cc328521980917353e7b03895a406cc029
 
-depends_lib         port:texlive-metapost port:texlive-basic
+depends_lib         port:texlive-basic
 
 texlive.formats      \
     {1 cont-en pdftex cont-usr.tex {-8bit *cont-en.ini}} \
-    {0 cont-cz pdftex cont-usr.tex {-8bit *cont-cz.ini}} \
+    {1 cont-en xetex cont-usr.tex {-8bit *cont-en.ini}} \
     {0 cont-de pdftex cont-usr.tex {-8bit *cont-de.ini}} \
+    {0 cont-fr pdftex cont-usr.tex {-8bit *cont-fr.ini}} \
+    {0 cont-it pdftex cont-usr.tex {-8bit *cont-it.ini}} \
     {0 cont-nl pdftex cont-usr.tex {-8bit *cont-nl.ini}} \
-    {0 cont-uk pdftex cont-usr.tex {-8bit *cont-uk.ini}} \
-    {1 cont-en xetex cont-usr.tex {-8bit *cont-en.ini}} \
-    {1 mptopdf pdftex - {-translate-file=cp227.tcx mptopdf.tex}} \
+    {0 cont-ro pdftex cont-usr.tex {-8bit *cont-ro.ini}} \
     {1 metafun mpost - {metafun.mp}}
 
-depends_lib-append port:texlive-latex
+texlive.binaries    context ctxtools luatools mtxrun pstopdf rlxtools texexec texmfstart
 
-texlive.excludemanpages yes
+depends_lib-append port:texlive-latex port:texlive-metapost port:texlive-xetex
 
-post-destroot {
-    delete ${destroot}${prefix}/bin/mptopdf
-}
-
 texlive.texmfport

Modified: trunk/dports/tex/texlive-documentation-arabic/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-arabic/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-arabic/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-arabic
 version             14327
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Arabic documentation
 long_description    Arabic documentation
 
-checksums           md5     e966ddd85ee1e1f356d5c29a28fca357 \
-                    sha1    92bf5f5c1fb8138dfc51abd4d60105ed9d9713a5 \
-                    rmd160  49dc1285f73986d4de6e36da22ed5ccf110352b2
+checksums           md5     2e8b4abba8e95509b338f0c9b9fa867b \
+                    sha1    a021eb28d997d1cc01b8e10789a940787dd37114 \
+                    rmd160  82822a9fbdc2a14b8b7822bf17a74065a8d25f0d
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-base/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-base/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-base/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-documentation-base
-version             13822
-revision            1
+version             17091
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: TeX Live documentation
 long_description    TeX Live documentation
 
-checksums           md5     49126f7fd94f89ece7c0ea8ed5ba69fc \
-                    sha1    52dfd0026409c5e14d8d94de1bdf2d68a268368c \
-                    rmd160  fecb9e92bbb4a38f11fa7987a581fb86a6820306
+checksums           md5     4d262e2d91026f687db919996cb42d66 \
+                    sha1    65e26ce1208b3704ee98f5918f6cb1a7cb29e548 \
+                    rmd160  9fdabd2189d54a93e17ef4023ec0a820fc5450a2
 
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-documentation-bulgarian/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-bulgarian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-bulgarian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-documentation-bulgarian
-version             13822
-revision            1
+version             19296
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Bulgarian documentation
 long_description    Bulgarian documentation
 
-checksums           md5     98aae5b1727726ea06090ea3903680ee \
-                    sha1    e1beb73606cabb19499fd5761dcb7ba22b92bbd3 \
-                    rmd160  da1cbcb7d585bf6e104221213afebaecd9d04749
+checksums           md5     c0109a92e40572a210872883fc20e99b \
+                    sha1    7d104f16cecfbf2a35adce320a12b9077cf3ffc2 \
+                    rmd160  a6b951497d44a05e7d54d02351f06b25e301023f
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-chinese/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-chinese/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-chinese/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-chinese
 version             14384
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Chinese documentation
 long_description    Chinese documentation
 
-checksums           md5     0366f8030b70e8dd74d5d93da8cf5107 \
-                    sha1    079eb819f1d8b8020119d11829796fab72a34606 \
-                    rmd160  7a2887c667aedc935498a033130c2299aedfa445
+checksums           md5     70842e077af26baeffca29e1da66dcc8 \
+                    sha1    8c7566f9de950b15929eccae944eda695856d33e \
+                    rmd160  5234ff0401d5a80d045c12da93063125c37a95cb
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-czechslovak/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-czechslovak/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-czechslovak/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-czechslovak
 version             14740
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Czech/Slovak documentation
 long_description    Czech/Slovak documentation
 
-checksums           md5     83ace198b8db4d25245eaa7ded61add3 \
-                    sha1    faf18ff38cadc73e59e1af58f48e72961a2cbf1f \
-                    rmd160  9678312ea34daef15fd83174d3c05d9ed6e8259c
+checksums           md5     45a2e8f0cf2e65555c7446c6d47af3ea \
+                    sha1    74e5065e4b7eb4246725d27c7a90700eb7fc9702 \
+                    rmd160  dc0f890d0308f5251c80b086245069b1b22ff4aa
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-dutch/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-dutch/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-dutch/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-dutch
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Dutch documentation
 long_description    Dutch documentation
 
-checksums           md5     7968bdeb0c3187e2e2d3dd223a8b0005 \
-                    sha1    c4a858ec1570757172e69760441b8638628782d2 \
-                    rmd160  6a5cf00d61034715104b84e0eab2a8b1b24a3665
+checksums           md5     6b7c71c42ceb81df80b16813d2e6cde9 \
+                    sha1    882b8a0ee146be55a810732eafbc6173b1ec1b0c \
+                    rmd160  31c4aab34077711ca21a387128edd7f50d9e3c14
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-english/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-english/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-english/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-documentation-english
-version             15727
-revision            1
+version             18881
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: English documentation
 long_description    English documentation
 
-checksums           md5     ab47f96ce5dd05252431f7d1e381c43f \
-                    sha1    b5daa337252e13689db6ab72f45a15b873f94713 \
-                    rmd160  db1308dc66a6d29bbb6cf526afc34de1a4b5b3e7
+checksums           md5     3b136ee08d51e5f3e4018e24e3186075 \
+                    sha1    6d02ea68ede7b170a0129a5d0c285a537f200241 \
+                    rmd160  d4ffcd82dc06ec9bbe4a0dd25070fd69e5c65036
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-finnish/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-finnish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-finnish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-finnish
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Finnish documentation
 long_description    Finnish documentation
 
-checksums           md5     9b608d2d141320274eeef7629b105b91 \
-                    sha1    d24afa7c8c0c846575b22926a986e51e9f764b0a \
-                    rmd160  6cc7e86ffebd89276f02f8b8acb88fa5b72e2a6e
+checksums           md5     588bc7744d93c1e6896d873368305174 \
+                    sha1    0d4b46efd997e00e45b735a1e5c3c0a7ec0fe841 \
+                    rmd160  939e907e0a66404b08f235a47424e13cbcbcce58
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-french/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-french/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-french/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-documentation-french
-version             13822
-revision            1
+version             17322
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: French documentation
 long_description    French documentation
 
-checksums           md5     07e07a08e6149ac95be135974ba37a99 \
-                    sha1    dc16efb8bb4c5e521edf4ff0e1b150f7e78f59ca \
-                    rmd160  b405bda5cde1460f74ac6c9ca16d6db0b2e7daa8
+checksums           md5     300889cb787fb8c3b562e3f918bd3328 \
+                    sha1    b00c557e6dbf0b4961b1dccd4290f630eb93f440 \
+                    rmd160  9219302498696d240548ad44b7c0eccbacf2f5a9
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-german/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-german/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-german/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-documentation-german
-version             13822
-revision            1
+version             16981
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: German documentation
 long_description    German documentation
 
-checksums           md5     e2e660af226363eba898cae50b92b4c8 \
-                    sha1    afe4c10bf2e4460a813a53056ffe48b1fb7a1753 \
-                    rmd160  ed937922f011a7682309cac9cb50f5145e130f3d
+checksums           md5     cf8a81ab09ee70fdeb99e4c9d3f539e7 \
+                    sha1    5ec6563ddb0c6f367993312d951552ab62e73f37 \
+                    rmd160  7395b66795e0cccd30c1ca8a8f8191f1ec84aa2a
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-italian/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-italian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-italian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-italian
 version             15708
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Italian documentation
 long_description    Italian documentation
 
-checksums           md5     cb6afc09a52f2781c1daa5247c737d34 \
-                    sha1    2a4936c5a7d4a9e9253c5d06307b9b8a81e16ebf \
-                    rmd160  7d3c322a1c4f22083276f993e6c5b417a87201c1
+checksums           md5     094616e436ce99ef52a1b288b6863fb9 \
+                    sha1    ff9da9add3f873d12adafc8a9138d6f851afd6f9 \
+                    rmd160  8ddb962f6519d19ca268ecbbb968c5e564b0e0bc
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-japanese/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-japanese/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-japanese/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-japanese
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Japanese documentation
 long_description    Japanese documentation
 
-checksums           md5     1add20b620ff178c829deef456fc962f \
-                    sha1    d1d38d292b2c521f69a3ce189932b2c34788cc2b \
-                    rmd160  3513fb2d78e97915f0bd7b1cfbced70e8d6f415a
+checksums           md5     c7ae9e3c738504d37bbea6296af795a4 \
+                    sha1    18424cb6249d9791cdc88ddf80e45c555e360a26 \
+                    rmd160  dfe8a6577834aa89ad429e1d88a647450b64cf79
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-korean/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-korean/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-korean/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-korean
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Korean documentation
 long_description    Korean documentation
 
-checksums           md5     1ff167627bd6357680644206bb7b4f52 \
-                    sha1    0a72d8b402028dc3db898af2e46bce503488681e \
-                    rmd160  369e7fe9eac548c6c722587a3eba73d391cfaa6f
+checksums           md5     9779337608a289046ca0ca5d7940162a \
+                    sha1    7ab2f703b94ecf3ce20854be3107cfb8633ca029 \
+                    rmd160  63676140cfcff3f9dd763c49d180630448e91fcd
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-mongolian/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-mongolian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-mongolian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-mongolian
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Mongolian documentation
 long_description    Mongolian documentation
 
-checksums           md5     b93b6ec51030f41cf56b7ef9c8862f28 \
-                    sha1    e9b0a529a1f35829abe714dcde1850118c0331c3 \
-                    rmd160  3faba98e3dc9a0860fe6bfdb23af4c2b528dbc43
+checksums           md5     fbdc8e66f267a03ffb39e8b3aba4b4aa \
+                    sha1    89d031c6e4d284d8367e80ce05b8b5aa0d894525 \
+                    rmd160  5d5c7602280364dced42aecb4ed3054261619b7e
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-polish/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-polish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-polish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-polish
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Polish documentation
 long_description    Polish documentation
 
-checksums           md5     a52a84596892c97147169890bd9330ea \
-                    sha1    8886f1840e91234f569da3e16ea1b3a696467b12 \
-                    rmd160  d11b70ee017d392e6ba1c6bdbe4c23e23ec89372
+checksums           md5     a42ddd464a66c034211debf9bd46b100 \
+                    sha1    e3c6149cd1dbdf3f16a8893d5514a2941540153c \
+                    rmd160  d0ea95e0e9c5123022c34682d59b1ca07fbdc334
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-portuguese/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-portuguese/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-portuguese/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-portuguese
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Portuguese documentation
 long_description    Portuguese documentation
 
-checksums           md5     0f1217b45a9206c72a796cbda2259bcb \
-                    sha1    5f208b59ec871344575d69dc34ecbd6a465c1cee \
-                    rmd160  f617c35c4e7e70f96db30609f389242c42b952ca
+checksums           md5     36e98a8d9268851ac61fba50a5151db8 \
+                    sha1    489cd5da4f86325cef6305fe4158b497519fc01f \
+                    rmd160  a1d45dce91d0140f262424b98d731982ca826a4e
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-russian/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-russian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-russian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-russian
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Russian documentation
 long_description    Russian documentation
 
-checksums           md5     f39c10a3305a77ec3c7b4ce273746088 \
-                    sha1    bc22ed8acee79412b35a2b57c0e74d34baafcdf0 \
-                    rmd160  5130f2b5b7151006636a1e3c3a374b7f2e395ab1
+checksums           md5     60749018c1b0713a495becdb85934d2a \
+                    sha1    2c683b9ba62c17ccbc5f93c7779fa9c4225d896a \
+                    rmd160  19186cc6e4de4409c475746a37496660c96e3926
 
 depends_lib         port:texlive-documentation-base
 

Deleted: trunk/dports/tex/texlive-documentation-serbian/Portfile
===================================================================
--- users/dports/ports/tex/texlive-documentation-serbian/Portfile	2010-11-10 02:07:55 UTC (rev 73311)
+++ trunk/dports/tex/texlive-documentation-serbian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,23 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem          1.0
-PortGroup           texlive 1.0
-
-name                texlive-documentation-serbian
-version             19112
-revision            0
-
-categories          tex
-maintainers         dports
-description         TeX Live: Serbian documentation
-long_description    Serbian documentation
-
-checksums           md5     af6bc87b463dd698337a00fbb30d26d7 \
-                    sha1    98ed05467a814ba5713eee1790a2ee41d5e652ef \
-                    rmd160  0228ea30b002eedea4dfeae181f12d039a2a69ab
-
-depends_lib         port:texlive-documentation-base
-
-
-texlive.texmfport

Copied: trunk/dports/tex/texlive-documentation-serbian/Portfile (from rev 73311, users/dports/ports/tex/texlive-documentation-serbian/Portfile)
===================================================================
--- trunk/dports/tex/texlive-documentation-serbian/Portfile	                        (rev 0)
+++ trunk/dports/tex/texlive-documentation-serbian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,23 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+PortGroup           texlive 1.0
+
+name                texlive-documentation-serbian
+version             19112
+revision            0
+
+categories          tex
+maintainers         dports
+description         TeX Live: Serbian documentation
+long_description    Serbian documentation
+
+checksums           md5     af6bc87b463dd698337a00fbb30d26d7 \
+                    sha1    98ed05467a814ba5713eee1790a2ee41d5e652ef \
+                    rmd160  0228ea30b002eedea4dfeae181f12d039a2a69ab
+
+depends_lib         port:texlive-documentation-base
+
+
+texlive.texmfport

Modified: trunk/dports/tex/texlive-documentation-slovenian/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-slovenian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-slovenian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-slovenian
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Slovenian documentation
 long_description    Slovenian documentation
 
-checksums           md5     06102a377d5e5d59cba3cb7ec5fe2409 \
-                    sha1    6a5edfd0e9b0fb87970f46d2736298f9240bb974 \
-                    rmd160  3d109d522c16fbafdb8ab19fc7bdf8b76dcaab9e
+checksums           md5     ca795c1345722c16515234aeaee3d96a \
+                    sha1    35369badb94926e378c07e4d5aef8b422bc168ca \
+                    rmd160  64909578cab210765433c0b4705a8b3a43793bac
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-spanish/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-spanish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-spanish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-documentation-spanish
-version             13822
-revision            1
+version             16564
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Spanish documentation
 long_description    Spanish documentation
 
-checksums           md5     f686e0d5f08de2f85bf6405b8743bba5 \
-                    sha1    7ef596f09a5b90468e87b6e90663fc3c3c7c2b1d \
-                    rmd160  2d03b69e10f3a82844c052424c8c384201c9a184
+checksums           md5     0a2e7215ee5d1e9ff9f7ad3753595076 \
+                    sha1    6d1869cdb4da5944e537a3aaac7c3e3696056e0c \
+                    rmd160  aafe590fd7dff3772bcedb6439ac380670ff5eef
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-thai/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-thai/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-thai/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-thai
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Thai documentation
 long_description    Thai documentation
 
-checksums           md5     0b4b2e1c16222948c7b24c33e4691803 \
-                    sha1    ffa4be22954ee235b29ab0cbc6c3738fe8d1003d \
-                    rmd160  127b6e272c90ca839c10037568985d81cf1fc784
+checksums           md5     e54a7aee2f624d8883d82f7852d83ee9 \
+                    sha1    f23245790fd4f330f77911b4d34430c04f927ff4 \
+                    rmd160  75ff3744aaaa96b60c60f7f71d0a5d8589385301
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-turkish/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-turkish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-turkish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-turkish
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Turkish documentation
 long_description    Turkish documentation
 
-checksums           md5     a379ac5fa4fea90430e22c1f3c30ed94 \
-                    sha1    daeb6ae4f5156d497dc62ea727406a45135de2c1 \
-                    rmd160  3bb3074118e6a161df0d4503a3a32d0c7d5a8dd4
+checksums           md5     c1324518183d16a26437825ddd16c0fb \
+                    sha1    4e37bae2e99d381cfb3e7b02779b4d880b467e22 \
+                    rmd160  c34c9420ba84faaaa89ab36d935176d860b896a7
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-ukrainian/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-ukrainian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-ukrainian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-ukrainian
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Ukrainian documentation
 long_description    Ukrainian documentation
 
-checksums           md5     c7b5adbf14a0031f0f9b88cb07dfe909 \
-                    sha1    38d4c8b8049018d17c2579f86e0c1792c7a80fa1 \
-                    rmd160  e45e6fe735a224ccc591e6beff5aab67bf5a5c1e
+checksums           md5     ff268440e7b68127aba3c5fb095caba7 \
+                    sha1    bd8d18bec83dd61ed36d887fe4f9430814293fdb \
+                    rmd160  b76035839fb241db75940221f6837bef7bffe476
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-documentation-vietnamese/Portfile
===================================================================
--- trunk/dports/tex/texlive-documentation-vietnamese/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-documentation-vietnamese/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-documentation-vietnamese
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Vietnamese documentation
 long_description    Vietnamese documentation
 
-checksums           md5     f1b5c91846d33239bb65a9b7b1dbe238 \
-                    sha1    2938265dcc8bf0510af584a0ef3a19214bf1575d \
-                    rmd160  ffb0c53cbab6395a370deb5dae6c6bc36e896da3
+checksums           md5     cb30cb15e21c9c0ab61b97561e3dd397 \
+                    sha1    00afe77336e7f3b696aed25644bbe2cfd8da9981 \
+                    rmd160  70c0b793611afcc29f5ebac8f2a353459e89caa7
 
 depends_lib         port:texlive-documentation-base
 

Modified: trunk/dports/tex/texlive-fonts-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-fonts-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-fonts-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-fonts-extra
-version             13989
-revision            1
+version             19491
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Extra fonts
 long_description    Extra fonts
 
-checksums           md5     2b393c3b78e7ee835f70b2be4027fec2 \
-                    sha1    407a36735f16ec612764108d21200b913059a5bd \
-                    rmd160  b739ce5ddae731b05bf299e221842aae83e8f34a
+checksums           md5     0531d502c09a8264890a0dc2ba5ca7c9 \
+                    sha1    b1daa77ff40f96d3244d66afc87671f71dcd31f6 \
+                    rmd160  9580a9f28b05303c5195bd994dffa47a4ae8cbb3
 
 depends_lib         port:texlive-basic
 
@@ -30,17 +30,13 @@
     {Map augie.map} \
     {Map auncial.map} \
     {Map aurical.map} \
+    {Map ybv.map} \
     {Map belleek.map} \
     {Map bera.map} \
     {Map pbsi.map} \
     {Map cmin.map} \
+    {Map ccicons.map} \
     {Map cm-lgc.map} \
-    {MixedMap cm-super-t1.map} \
-    {MixedMap cm-super-t2a.map} \
-    {MixedMap cm-super-t2b.map} \
-    {MixedMap cm-super-t2c.map} \
-    {MixedMap cm-super-ts1.map} \
-    {MixedMap cm-super-x2.map} \
     {MixedMap cmll.map} \
     {Map cyklop.map} \
     {Map dictsym.map} \
@@ -102,9 +98,11 @@
     {Map phaistos.map} \
     {MixedMap pigpen.map} \
     {Map recycle.map} \
+    {Map yrd.map} \
     {MixedMap semaf.map} \
     {Map icelandic.map} \
     {MixedMap trajan.map} \
+    {Map gptimes.map} \
     {Map yv1.map} \
     {Map yv2.map} \
     {Map yv3.map} \

Modified: trunk/dports/tex/texlive-fonts-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-fonts-recommended/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-fonts-recommended/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,21 +5,27 @@
 PortGroup           texlive 1.0
 
 name                texlive-fonts-recommended
-version             13822
-revision            1
+version             19478
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Recommended fonts
-long_description    Recommended fonts
+long_description    Recommended fonts, including the base 35 PostScript fonts, Latin Modern, TeX Gyre, and T1 and other encoding support for Computer Modern, in outline form.
 
-checksums           md5     e5905b068bd5620a4b7dbf98ab3ef61e \
-                    sha1    cd5833d237a02a63214db72dc329064ed76f4bd3 \
-                    rmd160  89bf141c6f743a38f7868bfaf93e27348eaee261
+checksums           md5     15d92d4564dd5392a1e9a7d155f3968d \
+                    sha1    bbb82b053e9c3d10d3cbc1aac36b366c52d1b90c \
+                    rmd160  ec24eca495b232735ed33e03e71ed575d4c060b0
 
 depends_lib         port:texlive-basic
 
 texlive.maps      \
+    {MixedMap cm-super-t1.map} \
+    {MixedMap cm-super-t2a.map} \
+    {MixedMap cm-super-t2b.map} \
+    {MixedMap cm-super-t2c.map} \
+    {MixedMap cm-super-ts1.map} \
+    {MixedMap cm-super-x2.map} \
     {Map zpeu.map} \
     {MixedMap eurosym.map} \
     {Map lm.map} \
@@ -38,5 +44,12 @@
     {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]}]
+        && [rpm-vercomp [lindex $vers 1] 19491] < 0} {
+        registry_deactivate texlive-fonts-extra "" [list ports_nodepcheck 1]
+    }
+}
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-fontutils/Portfile
===================================================================
--- trunk/dports/tex/texlive-fontutils/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-fontutils/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,76 +5,21 @@
 PortGroup           texlive 1.0
 
 name                texlive-fontutils
-version             15606
-revision            3
+version             16392
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: TeX and Outline font utilities
 long_description    Programs for conversion between font formats, testing fonts, virtual fonts, .gf and .pk manipulation, mft, fontinst, etc. Manipulating OpenType, TrueType, PostScript Type 1, etc.
 
-checksums           md5     472326b366b6af75534376abf2493ed6 \
-                    sha1    7f8d869d9e0e0de5b2ba3c41aaae78358420d663 \
-                    rmd160  1d5903c46b43ae523ccdec69258ffe6e21e0e4c7
+checksums           md5     aee4ebe702b6324a309eff531f54d7f5 \
+                    sha1    125141e470cccd5a78a26bfaba93d03f441ea5e0 \
+                    rmd160  cc9a2a67243a755f16ddc0289d906820ab3f02ed
 
 depends_lib         port:texlive-basic
 
-patchfiles          patch-epstopdf-stdin.diff
+texlive.binaries    afm2afm afm2pl autoinst cfftot1 cmap2enc epstopdf font2afm fontinst mag mkt1font mmafm mmpfb ot2kpx otfinfo otftotfm pfb2pfa pfm2kpx pk2bm pltotf ps2pk repstopdf showglyphs t1dotlessj t1lint t1rawafm t1reencode t1testpage tftopl ttf2afm ttf2pk ttf2tfm ttfdump ttftotype42 vftovp vpl2ovp vpl2vpl vptovf
 
-texlive.exclude     texmf/doc/man/man1/afm2pl.1 \
-                    texmf/doc/man/man1/bbox.1 \
-                    texmf/doc/man/man1/cfftot1.1 \
-                    texmf/doc/man/man1/epsffit.1 \
-                    texmf/doc/man/man1/extractres.1 \
-                    texmf/doc/man/man1/fixdlsrps.1 \
-                    texmf/doc/man/man1/fixfmps.1 \
-                    texmf/doc/man/man1/fixmacps.1 \
-                    texmf/doc/man/man1/fixpsditps.1 \
-                    texmf/doc/man/man1/fixpspps.1 \
-                    texmf/doc/man/man1/fixscribeps.1 \
-                    texmf/doc/man/man1/fixtpps.1 \
-                    texmf/doc/man/man1/fixwfwps.1 \
-                    texmf/doc/man/man1/fixwpps.1 \
-                    texmf/doc/man/man1/fixwwps.1 \
-                    texmf/doc/man/man1/getafm.1 \
-                    texmf/doc/man/man1/includeres.1 \
-                    texmf/doc/man/man1/mag.1 \
-                    texmf/doc/man/man1/mmafm.1 \
-                    texmf/doc/man/man1/mmpfb.1 \
-                    texmf/doc/man/man1/otfinfo.1 \
-                    texmf/doc/man/man1/otftotfm.1 \
-                    texmf/doc/man/man1/pfb2pfa.1 \
-                    texmf/doc/man/man1/pk2bm.1 \
-                    texmf/doc/man/man1/pltotf.1 \
-                    texmf/doc/man/man1/ps2eps.1 \
-                    texmf/doc/man/man1/ps2frag.1 \
-                    texmf/doc/man/man1/ps2pk.1 \
-                    texmf/doc/man/man1/psbook.1 \
-                    texmf/doc/man/man1/pslatex.1 \
-                    texmf/doc/man/man1/psmerge.1 \
-                    texmf/doc/man/man1/psnup.1 \
-                    texmf/doc/man/man1/psresize.1 \
-                    texmf/doc/man/man1/psselect.1 \
-                    texmf/doc/man/man1/pstops.1 \
-                    texmf/doc/man/man1/t1ascii.1 \
-                    texmf/doc/man/man1/t1asm.1 \
-                    texmf/doc/man/man1/t1binary.1 \
-                    texmf/doc/man/man1/t1disasm.1 \
-                    texmf/doc/man/man1/t1dotless.1 \
-                    texmf/doc/man/man1/t1dotlessj.1 \
-                    texmf/doc/man/man1/t1lint.1 \
-                    texmf/doc/man/man1/t1mac.1 \
-                    texmf/doc/man/man1/t1rawafm.1 \
-                    texmf/doc/man/man1/t1reencode.1 \
-                    texmf/doc/man/man1/t1testpage.1 \
-                    texmf/doc/man/man1/t1unmac.1 \
-                    texmf/doc/man/man1/tftopl.1 \
-                    texmf/doc/man/man1/ttf2afm.1 \
-                    texmf/doc/man/man1/ttf2pk.1 \
-                    texmf/doc/man/man1/ttf2tfm.1 \
-                    texmf/doc/man/man1/ttfdump.1 \
-                    texmf/doc/man/man1/ttftotype42.1 \
-                    texmf/doc/man/man1/vftovp.1 \
-                    texmf/doc/man/man1/vptovf.1
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-formats-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-formats-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-formats-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-formats-extra
-version             13822
-revision            1
+version             18686
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Extra formats
-long_description    A collection of TeX `formats', ie large-scale macro packages designed to be dumped into .fmt file
+long_description    Collected TeX `formats', i.e., large-scale macro packages designed to be dumped into .fmt files, other than most common ones, such as latex and context.
 
-checksums           md5     1a0bf83a94800961ca738fe21fb25daf \
-                    sha1    c6275e58e11616c62fc11fb0917eaffbfb563955 \
-                    rmd160  3b86d6c16757f474d6fd1ba61a55253bd69dd5f3
+checksums           md5     a34b5473d01fa33fbc8ce283b4c20d1e \
+                    sha1    81b0869affd93e2b345cc50feae5d8325b265dfe \
+                    rmd160  172860163d41e1125c6c380863e1f5bcd7745c51
 
 depends_lib         port:texlive-basic
 
@@ -27,6 +27,6 @@
     {1 phyzzx pdftex - {physe.ini}} \
     {1 texsis pdftex - {-translate-file=cp227.tcx texsis.ini}}
 
-texlive.excludemanpages yes
+depends_lib-append  port:texlive-latex
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-games/Portfile
===================================================================
--- trunk/dports/tex/texlive-games/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-games/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-games
 version             15166
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Games typesetting
 long_description    Setups for typesetting various games, including chess.
 
-checksums           md5     e5118c04299a7bff32c8a11d6aa4d99f \
-                    sha1    87744bd9a1fc2afa654c5c2946d7ca3aaee12777 \
-                    rmd160  7a2fd8e5186a88150ddcfbed97cba07360888285
+checksums           md5     00686628170b8e0c5c4c5c8ef0ff4f9b \
+                    sha1    8a7e5eb579ffbce7820273fdd8d722a282bc586c \
+                    rmd160  b8de8b3f1f0aa9bcc3405c9c99795578b08b217a
 
 depends_lib         port:texlive-latex
 

Modified: trunk/dports/tex/texlive-generic-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-generic-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-generic-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-generic-extra
-version             15267
-revision            1
+version             19036
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Extra generic packages
 long_description    Extra packages that work with multiple formats, typically both TeX and LaTeX.
 
-checksums           md5     2d025ea058879a1b26ea052240754ac8 \
-                    sha1    7d2b828d98f588f717b552c856540c578562bbce \
-                    rmd160  454585038a8782c0e0415cf226f2b45cb8567f95
+checksums           md5     07f61d2b3b2e92f3e752e445360209e6 \
+                    sha1    a675f633940202e723070f1c487e43cc33140afe \
+                    rmd160  7d9c5a61991883667129eaebe2c7da2a172fcff4
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-generic-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-generic-recommended/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-generic-recommended/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-generic-recommended
-version             13822
-revision            1
+version             16866
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Recommended generic packages
 long_description    Recommended packages that work with multiple formats.
 
-checksums           md5     bae56001ced68a9e6b3c000163423c77 \
-                    sha1    b68ccf031532e876a3bc4efd816d58a5a271bc4c \
-                    rmd160  81c06b22f0ed762309ebfd6c7ea4db49a5cef8e3
+checksums           md5     e126f499f3c68857a6a07f8ad22b2337 \
+                    sha1    d93e7151cfbe331fae64f9b44f22183bef85c76d \
+                    rmd160  993ed41b610eb47b26096ca04811398b83db7593
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-htmlxml/Portfile
===================================================================
--- trunk/dports/tex/texlive-htmlxml/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-htmlxml/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,24 +6,35 @@
 
 name                texlive-htmlxml
 version             13822
-revision            2
+revision            3
 
 categories          tex
 maintainers         dports
 description         TeX Live: HTML/SGML/XML support
-long_description    Packages to convert LaTeX to XML/HTML, and typeset XML/SGML
+long_description    Packages to convert LaTeX to XML/HTML, and typset XML/SGML
 
-checksums           md5     1fa7abc8975c94e6584217296241ae40 \
-                    sha1    03201da211a657ad553b4e9b34d2e2b9b053aa17 \
-                    rmd160  46fa303c39e7078ca7bf0e8eebcc729b9e391799
+checksums           md5     520c29559cd5530e1d8ee88279eab36a \
+                    sha1    f07ef1495aac348fb6e377b0b6d6a6db85109d34 \
+                    rmd160  47bbb3d75292b88f4d8dbcf91f3f7143e97766ee
 
-depends_lib         port:texlive-basic port:texlive-fonts-recommended port:texlive-latex port:texlive-latex-recommended
+depends_lib         port:texlive-basic port:texlive-fonts-recommended port:texlive-latex
 
 texlive.formats      \
     {1 jadetex pdftex language.dat {*jadetex.ini}} \
     {1 pdfjadetex pdftex language.dat {*pdfjadetex.ini}} \
-    {1 xmltex pdftex language.dat {xmltex.ini}} \
-    {1 pdfxmltex pdftex language.dat {pdfxmltex.ini}}
+    {1 xmltex pdftex language.dat {*xmltex.ini}} \
+    {1 pdfxmltex pdftex language.dat {*pdfxmltex.ini}}
 
+texlive.binaries    ht htcontext htlatex htmex httex httexi htxelatex htxetex mk4ht t4ht tex4ht
 
+texlive.exclude     texmf-dist/scripts/tex4ht/ht.sh \
+                    texmf-dist/scripts/tex4ht/htcontext.sh \
+                    texmf-dist/scripts/tex4ht/htlatex.sh \
+                    texmf-dist/scripts/tex4ht/htmex.sh \
+                    texmf-dist/scripts/tex4ht/httex.sh \
+                    texmf-dist/scripts/tex4ht/httexi.sh \
+                    texmf-dist/scripts/tex4ht/htxelatex.sh \
+                    texmf-dist/scripts/tex4ht/htxetex.sh \
+                    texmf-dist/scripts/tex4ht/mk4ht.pl
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-humanities/Portfile
===================================================================
--- trunk/dports/tex/texlive-humanities/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-humanities/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-humanities
-version             13822
-revision            1
+version             19344
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Humanities packages
 long_description    Packages for law, linguistics, the social sciences, the humanities, etc.
 
-checksums           md5     e0757ca8506984238e1c15e17f47cde7 \
-                    sha1    cd8a5028ba074c3c450493b5ec6f67e0f38ae4ba \
-                    rmd160  ad3b99cbb69f5eb80219e05f2742b4ad6f09bd5f
+checksums           md5     ac754578bc39ebc43531f92cb11a2623 \
+                    sha1    ba60f525baf6b4ad5694458836ab95dab8c968d9 \
+                    rmd160  3c9aa6f1b48c8f5e5b40eb0c2270c73bd9d605fe
 
 depends_lib         port:texlive-latex
 

Modified: trunk/dports/tex/texlive-lang-african/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-african/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-african/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-african
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: African scripts
 long_description    Support for typesetting some African scripts
 
-checksums           md5     790f0c8109617576f1def54dc73988d8 \
-                    sha1    4ac40820e160683ecbef8e84d2f0a376a4084481 \
-                    rmd160  9b4b6677aea2f8d99cc577d101c3c62167caee00
+checksums           md5     e0e42c6eb80e2a151dc47f9cb6659973 \
+                    sha1    a718ff8e249560f504951e9bc02d91367276764d \
+                    rmd160  8d7002b7811e3ba3b55593bc6265ef0d3f818d9d
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-arabic/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-arabic/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-arabic/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-arabic
-version             14727
-revision            1
+version             17780
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Arabic
 long_description    Support for typesetting Arabic.
 
-checksums           md5     598858c1de85b5da0e9a97fbeb553d94 \
-                    sha1    2b91ef7acd4c1bcd7add556304ebf1045a6d83b5 \
-                    rmd160  15dc5fd7d7f08732ad14db89658cd0889785e455
+checksums           md5     cc2346f75f26a51458bc5e0ccb45f107 \
+                    sha1    a177ef6d8d4559dc0da6ebc55c5b02a0198b81ba \
+                    rmd160  57a397626ec684357e04467dd3a0219b0d1d9d6a
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-armenian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-armenian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-armenian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-armenian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Armenian
 long_description    Support for typesetting Armenian.
 
-checksums           md5     cc485f09ef73dfab2e584eda132d9390 \
-                    sha1    da17847bea013267f93ad9fb56c5067cd3eadd4f \
-                    rmd160  3e893b2a1f3bba517ccb7ad1cc90b81c4fdaaedc
+checksums           md5     ddb705a2355d0bff58251c881f7dc795 \
+                    sha1    398ec3a6a3c80d803c684cecfe18591f07165680 \
+                    rmd160  2a893036f598601bab694739b960d380b593a7b0
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-cjk/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-cjk/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-cjk/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,20 +5,24 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-cjk
-version             15132
-revision            1
+version             18686
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Chinese, Japanese, Korean
 long_description    CJK (Chinese, Japanese, Korean) macros, fonts, documentation, also Thai since there is some overlap in the fonts.
 
-checksums           md5     53ca8240c7ba13684acf90aa22e617b9 \
-                    sha1    87a29ea4c6facee0cb870dc75babcff081685a44 \
-                    rmd160  c69195d777395fde2b09fe1a96b4c9112d2830c2
+checksums           md5     9dbadaf9d3913e243857343c97adc4ff \
+                    sha1    412f5e9b797daf9ddd9d46abc8b6afd6f1f6f426 \
+                    rmd160  a42d701a9b1eb3dcb973e4c52dd804a946b7411a
 
 depends_lib         port:texlive-basic port:texlive-documentation-chinese
 
+texlive.formats      \
+    {1 ptex ptex - {ptex.ini}} \
+    {1 platex ptex language.ptx {platex.ini}}
+
 texlive.languages      \
     {pinyin loadhyph-zh-latn.tex 1 1 {}}
 
@@ -37,6 +41,8 @@
     {Map mr2j.map} \
     {Map mrj.map}
 
-texlive.exclude     texmf/doc/man/man1/hbf2gf.1
+texlive.binaries    bg5+latex bg5+pdflatex bg5conv bg5latex bg5pdflatex cef5conv cef5latex cef5pdflatex cefconv ceflatex cefpdflatex cefsconv cefslatex cefspdflatex extconv gbklatex gbkpdflatex hbf2gf makejvf mendex pbibtex pdvitype ppltotf ptex ptftopl sjisconv sjislatex sjispdflatex
 
+depends_lib-append port:texlive-latex
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-croatian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-croatian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-croatian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-croatian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Croatian
 long_description    Support for typesetting Croatian.
 
-checksums           md5     5bc92c0ca275f8ef2b42a7e982545d70 \
-                    sha1    37149d014d513b305a390c5747b0ff93cad4a58f \
-                    rmd160  7121f98945829318ed0d1962886b9d5647704f36
+checksums           md5     d7c441edb9b1152d20d48f1eb911607a \
+                    sha1    030a67d23fbf38212f6e70d8d1fe74b3e6b99205 \
+                    rmd160  0952d507ba49705459a0aaf6cbd28047ddfe4d9f
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-cyrillic/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-cyrillic/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-cyrillic/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-cyrillic
-version             15492
-revision            1
+version             16705
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Cyrillic
 long_description    Support for typesetting Cyrillic.
 
-checksums           md5     ac2e8771031e030f3f3ec23d6a0ac37b \
-                    sha1    365ef23efa3674ed09a3d37a1e7d7fded8a7dda6 \
-                    rmd160  8ed7360889b0a0aba9822eb688545413b9e44a0a
+checksums           md5     856774740ebb80d054efaa5f8a66f47b \
+                    sha1    8d43c5c936c67e99bd2b36b82a8866ca3a121b0b \
+                    rmd160  3389f6c8567c685993cf30b5da5a768aa1ec795a
 
 depends_lib         port:texlive-basic port:texlive-latex
 
@@ -32,6 +32,7 @@
 texlive.maps      \
     {Map cmcyr.map}
 
-texlive.excludemanpages yes
+texlive.binaries    rubibtex rumakeindex
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-czechslovak/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-czechslovak/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-czechslovak/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-czechslovak
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Czech/Slovak
 long_description    Support for typesetting Czech/Slovak.
 
-checksums           md5     297f663d2930828dc4f7362bcd5985d4 \
-                    sha1    0ef494e313da69809e91851a6b9484d883238b78 \
-                    rmd160  352e7332ad5dfc055002e900dbb36eab499543d3
+checksums           md5     2c8db8969867ce31a077c55a6f985d2e \
+                    sha1    b8c65c77c053c5dd8d598cbba77649628f91f05b \
+                    rmd160  d1d0f57b9e7c18b5b9e9544d6c9d85bb650fb02f
 
 depends_lib         port:texlive-basic port:texlive-latex
 
@@ -33,5 +33,7 @@
     {MixedMap csother.map} \
     {MixedMap cstext.map}
 
-texlive.excludemanpages yes
+texlive.binaries    vlna
+
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-danish/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-danish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-danish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-danish
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Danish
 long_description    Support for typesetting Danish.
 
-checksums           md5     6203764124d7bfccbaa29d863013c935 \
-                    sha1    2ff1535025a92088d687b8446d31236412e2eceb \
-                    rmd160  9fb5144b82229d3657677a1775c9f105d98ac4b8
+checksums           md5     da96ece14f104dd567005177f05c766c \
+                    sha1    b06ef7f42b670679b9207b40f8d8803ac32029b9 \
+                    rmd160  f1db250094cd915123eb3efa30a75c180e659603
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-dutch/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-dutch/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-dutch/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-dutch
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Dutch
 long_description    Support for typesetting Dutch.
 
-checksums           md5     a185590492fad0d7c59ae5422d826598 \
-                    sha1    82eef1973174f9f0c32e466f61f999f3828da61b \
-                    rmd160  b67eb37b6c2a026ee696e317d5cbbe00b2491e73
+checksums           md5     43a278b90a9113e2f7645da447d45699 \
+                    sha1    2e208657aabb718ab8e0e1fcd7d8aa6dc826e3af \
+                    rmd160  b24505fcc2c5ec5d1232dfb5b46f02a6d023cf78
 
 depends_lib         port:texlive-basic
 

Deleted: trunk/dports/tex/texlive-lang-english/Portfile
===================================================================
--- users/dports/ports/tex/texlive-lang-english/Portfile	2010-11-10 02:07:55 UTC (rev 73311)
+++ trunk/dports/tex/texlive-lang-english/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,27 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem          1.0
-PortGroup           texlive 1.0
-
-name                texlive-lang-english
-version             18615
-revision            0
-
-categories          tex
-maintainers         dports
-description         TeX Live: US and UK English
-long_description    Support for typesetting US and UK English.
-
-checksums           md5     87b13e5770ecfd072ff12c285667851c \
-                    sha1    eeb28eb41c52088f9186ef20f1868334f88e7494 \
-                    rmd160  8727e25faffd3af293977ab708b15dfdde3ddf90
-
-depends_lib         port:texlive-basic
-
-texlive.languages      \
-    {ukenglish loadhyph-en-gb.tex 2 3 {british UKenglish}} \
-    {usenglishmax loadhyph-en-us.tex 2 3 {}}
-
-
-texlive.texmfport

Copied: trunk/dports/tex/texlive-lang-english/Portfile (from rev 73311, users/dports/ports/tex/texlive-lang-english/Portfile)
===================================================================
--- trunk/dports/tex/texlive-lang-english/Portfile	                        (rev 0)
+++ trunk/dports/tex/texlive-lang-english/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,27 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+PortGroup           texlive 1.0
+
+name                texlive-lang-english
+version             18615
+revision            0
+
+categories          tex
+maintainers         dports
+description         TeX Live: US and UK English
+long_description    Support for typesetting US and UK English.
+
+checksums           md5     87b13e5770ecfd072ff12c285667851c \
+                    sha1    eeb28eb41c52088f9186ef20f1868334f88e7494 \
+                    rmd160  8727e25faffd3af293977ab708b15dfdde3ddf90
+
+depends_lib         port:texlive-basic
+
+texlive.languages      \
+    {ukenglish loadhyph-en-gb.tex 2 3 {british UKenglish}} \
+    {usenglishmax loadhyph-en-us.tex 2 3 {}}
+
+
+texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-finnish/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-finnish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-finnish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-finnish
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Finnish
 long_description    Support for typesetting Finnish.
 
-checksums           md5     ffe7418fcb1f305de7d2b10c6064e015 \
-                    sha1    517cdf886ef637f9fe3c2a00fe800f07bc8101af \
-                    rmd160  1979d0efc6742a679e418197868fa55ad55f8f65
+checksums           md5     65dc2f849d0eae8e562d4fd87d5da56e \
+                    sha1    233b3a5cdc370ef478d3b28e82083e24a27994e4 \
+                    rmd160  ecdb1817497f1e8f2fbe30d33a48cb85bdb2e2fa
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-french/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-french/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-french/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-french
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: French
 long_description    Support for typesetting French.
 
-checksums           md5     f1d2aaad6aa7ce62a5999a11c704fc46 \
-                    sha1    c800fd49c77bc16cf28e9e3e723903d25e9b62f4 \
-                    rmd160  bebae738176dd605c928d2dca3cd2f4ec29e1434
+checksums           md5     9e6b21e662f3ab33936e6133314f244a \
+                    sha1    cac62f566ac6ce2ab53df5034b7c2da1cd0bfc47 \
+                    rmd160  531974dcd060e59a0568828c61e7ac1bafd49242
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-german/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-german/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-german/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-german
-version             14751
-revision            1
+version             16731
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: German
 long_description    Support for typesetting German.
 
-checksums           md5     c69a44afdb4f1d68c06b8bf58e257e6f \
-                    sha1    179857fd0677c20b3628b3979e81ff7dd4df40a3 \
-                    rmd160  8c64b4001cc11c1aa2c659a1cbde3e21997b0752
+checksums           md5     e9dc19f8430c248459dff894d681c211 \
+                    sha1    de9844d6a308a43e8ad6587edde596f7e4134fbf \
+                    rmd160  aaaa9a9e5b8dc047c436ce07ecc57416f9b8753a
 
 depends_lib         port:texlive-basic
 
@@ -23,7 +23,8 @@
     {german-x-2009-06-19 dehypht-x-2009-06-19.tex 2 2 {german-x-latest}} \
     {ngerman-x-2009-06-19 dehyphn-x-2009-06-19.tex 2 2 {ngerman-x-latest}} \
     {german loadhyph-de-1901.tex 2 2 {}} \
-    {ngerman loadhyph-de-1996.tex 2 2 {}}
+    {ngerman loadhyph-de-1996.tex 2 2 {}} \
+    {swissgerman loadhyph-de-ch-1901.tex 2 2 {}}
 
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-greek/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-greek/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-greek/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-greek
 version             15748
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Greek
 long_description    Support for typesetting Greek.
 
-checksums           md5     72938c72073037eb8345b996c0adf9c2 \
-                    sha1    07c1a65b7ff10bd9fc08f62a9f4a1a3b53872e4b \
-                    rmd160  587dfc84caeca69a5b42c2b61b77b1afd2f531a4
+checksums           md5     93827f0cd81fce1bb1dc9b5a91dec9a7 \
+                    sha1    355f18cdf0c31e9c68c63712a02caa0076810387 \
+                    rmd160  c3d250bd3996fb251f175053ea2b76ebd9610206
 
 depends_lib         port:texlive-basic
 
@@ -33,5 +33,7 @@
     {MixedMap iby.map} \
     {Map kerkis.map}
 
+texlive.binaries    mkgrkindex
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-hebrew/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-hebrew/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-hebrew/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-hebrew
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Hebrew
 long_description    Support for typesetting Hebrew.
 
-checksums           md5     007dfa74c86a81bddef84859457796ae \
-                    sha1    7411375e804db48ac007a5174e6cc92861c7d842 \
-                    rmd160  c1876432436d27ef49230f4bc2f2d9a506e097a8
+checksums           md5     f4144bc509d79a3ed42ec4ba16192507 \
+                    sha1    51bec5b91b36ec8260043cd0d0803beb5c9afc34 \
+                    rmd160  f07a1d36f31cf49dc78601551159ed52fd495fc1
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-hungarian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-hungarian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-hungarian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-hungarian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Hungarian
 long_description    Support for typesetting Hungarian.
 
-checksums           md5     14ca9fff074754714651dd2e6e21a94e \
-                    sha1    cd7f0eb98769953cd9884e7514012ca3a213c61f \
-                    rmd160  c36fb776d9bb712f70a6b40f35db95927a8cd1e6
+checksums           md5     975901955b23737967ee43a4066a0ca4 \
+                    sha1    653d86ce58ba1c97e30464ec9d1473ff147398b8 \
+                    rmd160  74d8c371b8d16f1ebab0c8a75bf3c974ef191e08
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-indic/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-indic/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-indic/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,21 +5,32 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-indic
-version             14727
-revision            1
+version             17578
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Indic scripts
 long_description    Support for typesetting some Indic scripts.
 
-checksums           md5     493dfe34287f70ffc9c92c2412c0405f \
-                    sha1    bad0a1d9f03c6fc2c925be8e1d2994d7f0e1865a \
-                    rmd160  c732534cc80c416fa507889bef8f5ba3212c7d0b
+checksums           md5     4e16de71ea8e93f332391fe3eaf21833 \
+                    sha1    f46ea7c513c0bd70b850ffcd84993447b30963ba \
+                    rmd160  69000415d5ba0d340eb54d61afe20dd554aedf4a
 
 depends_lib         port:texlive-basic
 
 texlive.languages      \
+    {assamese loadhyph-as.tex 1 1 {}} \
+    {bengali loadhyph-bn.tex 1 1 {}} \
+    {gujarati loadhyph-gu.tex 1 1 {}} \
+    {hindi loadhyph-hi.tex 1 1 {}} \
+    {kannada loadhyph-kn.tex 1 1 {}} \
+    {malayalam loadhyph-ml.tex 1 1 {}} \
+    {marathi loadhyph-mr.tex 1 1 {}} \
+    {oriya loadhyph-or.tex 1 1 {}} \
+    {panjabi loadhyph-pa.tex 1 1 {}} \
+    {tamil loadhyph-ta.tex 1 1 {}} \
+    {telugu loadhyph-te.tex 1 1 {}} \
     {sanskrit loadhyph-sa.tex 1 5 {}}
 
 texlive.maps      \
@@ -27,5 +38,7 @@
     {Map skt.map} \
     {MixedMap dvng.map}
 
+texlive.binaries    devnag ebong
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-italian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-italian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-italian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-italian
-version             13822
-revision            1
+version             19087
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Italian
 long_description    Italian
 
-checksums           md5     8c02a50a766b881848955fe65eeb0728 \
-                    sha1    6497ef7d8925de00243aab79aade63c8e2d5b65a \
-                    rmd160  6face87c87cca5ebac88efc7587bb0b1537bebd3
+checksums           md5     30fb16606ae7bfc16f12705bfb8cdc2f \
+                    sha1    7990bb5906d4f1adc1d2fa4d4a4306316e2be9d0 \
+                    rmd160  c8f975e01e02d38c6ef68a41d5010a4302ea908e
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-latin/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-latin/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-latin/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-latin
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Latin
 long_description    Support for typesetting Latin.
 
-checksums           md5     7d09fa7a5e079162ecadbffcc6f5f252 \
-                    sha1    72f9b18610f1c8fc472b62f30462d581a8698886 \
-                    rmd160  713b26b6491fcf8b878e8af528c2e24ec4238257
+checksums           md5     7d28d8bbdc8f5b94282f784f64deeda2 \
+                    sha1    ac63664cc1c071de8ebe2a4baaefcdab4c3fd9e7 \
+                    rmd160  e82b0eb0eed40979748dfcc02c1d7047148ddcc6
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-latvian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-latvian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-latvian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-latvian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Latvian
 long_description    Support for typesetting Latvian.
 
-checksums           md5     d2d89e270fedf0e102673abfced362b6 \
-                    sha1    d150032dc579b96deebfe6c93e205c99873bba31 \
-                    rmd160  b321c57b399c691fbd986f18c40de8ff52af9041
+checksums           md5     9352332972b72cf5a08c7fc2fa2131f2 \
+                    sha1    4d983ccfd7004e5202cf6b54d5ba3eb3007f0252 \
+                    rmd160  47fdce50ae87b941e78948f321b0ac987b300d33
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-lithuanian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-lithuanian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-lithuanian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-lithuanian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Lithuanian
 long_description    Support for typesetting Lithuanian.
 
-checksums           md5     4ca184e4f4c9866245a0d2ec09fa5d3a \
-                    sha1    e32fa8f80c7d9297d20d41075964ce89e69f4cca \
-                    rmd160  f4ba34c137ffe600592a02c06ec1d52e3d49f88a
+checksums           md5     808d214288d4cab51964b7a81dc38665 \
+                    sha1    fdabc9d5244e7fff3727b498542657d854fd453a \
+                    rmd160  95e2ca42755281d305cc7e4841d3e088d4897d34
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-mongolian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-mongolian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-mongolian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,22 +6,22 @@
 
 name                texlive-lang-mongolian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Mongolian
 long_description    Support for typesetting Mongolian.
 
-checksums           md5     f210d756978df9b58400625d233f7b21 \
-                    sha1    a35ba0b5a478427aab111d865e6dd50f80012776 \
-                    rmd160  f9cace7ade7dbc7d06ecc200150daf4f09c02f48
+checksums           md5     ba03ef01f39cb80c4e22b41082eed932 \
+                    sha1    7a1eaeb1a8987976b3bcd59299588afd7644c52e \
+                    rmd160  94722ba6923aa6d8e89d2fc9295e9fc1a9b6d9f4
 
 depends_lib         port:texlive-basic
 
 texlive.languages      \
     {mongolian loadhyph-mn-cyrl.tex 2 2 {}} \
-    {mongolian2a loadhyph-mn-cyrl-x-2a.tex 2 2 {}}
+    {mongolianlmc loadhyph-mn-cyrl-x-lmc.tex 2 2 {}}
 
 texlive.maps      \
     {MixedMap mongolian.map}

Modified: trunk/dports/tex/texlive-lang-norwegian/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-norwegian/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-norwegian/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-norwegian
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Norwegian
 long_description    Support for typesetting Norwegian.
 
-checksums           md5     6100ce26e97b9fc24f0422ee7c47c8e6 \
-                    sha1    c4a0ab6fd630cec3e9f8af0e98c038423f9ca894 \
-                    rmd160  5483e42816535063fe1dd99d16c317e1fc69ca8d
+checksums           md5     f2c81b866d27a12e08f261959d145f9b \
+                    sha1    922f4bcf8660980e62f885043607094ad463663f \
+                    rmd160  b2a164464c7885c945e84dbe5309d36fac688fc6
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-other/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-other/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-other/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-lang-other
-version             14574
-revision            1
+version             18620
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Other hyphenation files
 long_description    Hyphenation patterns for languages with no other support.
 
-checksums           md5     e7053cb7eeb62e9cbfcd56bb2c876c53 \
-                    sha1    69ba9d447bf98312350a23806fe6910712b28f05 \
-                    rmd160  85116e6a6865d31f59daa996277130f563120bc2
+checksums           md5     13eef34c27c6bf2ae38183c4e48d542f \
+                    sha1    ddf563a5f44d512b043294e55e19a9af41358098 \
+                    rmd160  a6b9efcabaad7b2410c5d419f070d95a3a31aeee
 
 depends_lib         port:texlive-basic
 
@@ -33,7 +33,9 @@
     {slovenian loadhyph-sl.tex 2 2 {slovene}} \
     {turkish loadhyph-tr.tex 2 2 {}} \
     {uppersorbian loadhyph-hsb.tex 2 2 {}} \
-    {welsh loadhyph-cy.tex 2 3 {}}
+    {welsh loadhyph-cy.tex 2 3 {}} \
+    {lao loadhyph-lo.tex 1 1 {}} \
+    {armenian loadhyph-hy.tex 1 2 {}}
 
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-polish/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-polish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-polish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-polish
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Polish
 long_description    Support for typesetting Polish.
 
-checksums           md5     3b68ac26442276d748648efc389ef470 \
-                    sha1    d20907fd26600b40ac995afa7acef09cc850369d \
-                    rmd160  af724c8a5228b40afbb50fc2ce3b7569ea60e739
+checksums           md5     b3fafeb4601a7a7ad04f2d3b899d9b95 \
+                    sha1    de5cf72266f4c5a8355cdea4dc28432ff9d4efd6 \
+                    rmd160  6cbd15acde3923679e0f9219a94989849e1fc418
 
 depends_lib         port:texlive-latex port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-portuguese/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-portuguese/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-portuguese/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-portuguese
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Portuguese
 long_description    Portuguese
 
-checksums           md5     27f2d3a4b489f7fc37d4ffb7ce42fcc3 \
-                    sha1    39498dcaf4630c0ac89e3a6c2b6c5e006f15d4ea \
-                    rmd160  d2688c13b5772cf48bda611c9683708a27d9be02
+checksums           md5     29eb6b27c3ebd4b42abaa53707d3d2db \
+                    sha1    de122d789092140ab2633c2b364980432113e4a2 \
+                    rmd160  4be161d7b264c6cb86004f97698955c5b01d865e
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-spanish/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-spanish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-spanish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-spanish
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Spanish
 long_description    Spanish
 
-checksums           md5     cf82a8733b6674cc40ba4c4886252edb \
-                    sha1    91a1fce77cab4c50740d6c492506e18b752bc23c \
-                    rmd160  e38a73767881ba1d81cab61338af0b2abbd79a16
+checksums           md5     a3123596ca5894ae6096d600534b0990 \
+                    sha1    21dcbd629ec86d0a0ebca936ee0538cf0e2b759c \
+                    rmd160  e32c22df2b8895144042db9e6cd03c1de4d96b1c
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-swedish/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-swedish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-swedish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-swedish
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Swedish
 long_description    Support for typesetting Swedish.
 
-checksums           md5     7cff2229ccb1067c4384cf853c5bb432 \
-                    sha1    0175b73db88b63e5d6ce33fbf7923808aa37f646 \
-                    rmd160  9284c7495d0ac4c19c1d9b64983f8373692eb16f
+checksums           md5     574db59b99c72d220e7b2828bac1202b \
+                    sha1    9775239df22466dcffec48e8e3eddd4904270023 \
+                    rmd160  0bb8f62b1fb710b05137eaf3b11bea0239024573
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-lang-tibetan/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-tibetan/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-tibetan/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-tibetan
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Tibetan
 long_description    Support for typesetting Tibetan.
 
-checksums           md5     d21fb090673de015a06a4454c37ea599 \
-                    sha1    707f0de0b3c95bd8ebddd8bc9bc42879d06dfd87 \
-                    rmd160  7fd27e150d0ca15534cd3d93d9b28c73cd08af7b
+checksums           md5     d73496a73d582a860070fcd54ff3f21e \
+                    sha1    e53942705f0a65d66682f8f8a9c0f828bfd85e23 \
+                    rmd160  8c7ef30db5823aeed0830ee0e93bdd1451eb00ea
 
 depends_lib         port:texlive-basic
 

Deleted: trunk/dports/tex/texlive-lang-turkmen/Portfile
===================================================================
--- users/dports/ports/tex/texlive-lang-turkmen/Portfile	2010-11-10 02:07:55 UTC (rev 73311)
+++ trunk/dports/tex/texlive-lang-turkmen/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -1,26 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem          1.0
-PortGroup           texlive 1.0
-
-name                texlive-lang-turkmen
-version             17578
-revision            0
-
-categories          tex
-maintainers         dports
-description         TeX Live: Turkmen
-long_description    Support for typesetting Turkmen.
-
-checksums           md5     a7febc30fb9614661251a38cb4c4721e \
-                    sha1    ad044867d1f3bb4f15dcd1c586efda8aa7867bce \
-                    rmd160  5342d061063a8fb5123d284031334a51c457e31c
-
-depends_lib         port:texlive-basic
-
-texlive.languages      \
-    {turkmen loadhyph-tk.tex 2 2 {}}
-
-
-texlive.texmfport

Copied: trunk/dports/tex/texlive-lang-turkmen/Portfile (from rev 73311, users/dports/ports/tex/texlive-lang-turkmen/Portfile)
===================================================================
--- trunk/dports/tex/texlive-lang-turkmen/Portfile	                        (rev 0)
+++ trunk/dports/tex/texlive-lang-turkmen/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -0,0 +1,26 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+PortGroup           texlive 1.0
+
+name                texlive-lang-turkmen
+version             17578
+revision            0
+
+categories          tex
+maintainers         dports
+description         TeX Live: Turkmen
+long_description    Support for typesetting Turkmen.
+
+checksums           md5     a7febc30fb9614661251a38cb4c4721e \
+                    sha1    ad044867d1f3bb4f15dcd1c586efda8aa7867bce \
+                    rmd160  5342d061063a8fb5123d284031334a51c457e31c
+
+depends_lib         port:texlive-basic
+
+texlive.languages      \
+    {turkmen loadhyph-tk.tex 2 2 {}}
+
+
+texlive.texmfport

Modified: trunk/dports/tex/texlive-lang-ukenglish/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-ukenglish/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-ukenglish/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,21 +6,26 @@
 
 name                texlive-lang-ukenglish
 version             14727
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: UK English
 long_description    Support for typesetting UK English.
 
-checksums           md5     89777d7618439703a1be79d22a483927 \
-                    sha1    15c064a343545b62c890db011e1c3e1088200a15 \
-                    rmd160  b2b2863acd1175e406da6ce38eea481bb24a3082
+homepage            http://www.tug.org/texlive/
+platforms           darwin
+supported_archs     noarch
+master_sites        http://flute.csail.mit.edu/texlive/
 
-depends_lib         port:texlive-basic
+replaced_by         texlive-lang-english
 
-texlive.languages      \
-    {ukenglish loadhyph-en-gb.tex 2 3 {british UKenglish}}
+pre-fetch {
+    ui_msg "$name has been replaced by texlive-lang-english."
+    return -code error "$name cannot be installed"
+}
 
-
-texlive.texmfport
+use_configure       no
+build               {}
+destroot            {}
+livecheck.type      none

Modified: trunk/dports/tex/texlive-lang-vietnamese/Portfile
===================================================================
--- trunk/dports/tex/texlive-lang-vietnamese/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-lang-vietnamese/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-lang-vietnamese
 version             15272
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Vietnamese
 long_description    Support for typesetting Vietnamese.
 
-checksums           md5     e5a4165598492847a1913b63efe1a690 \
-                    sha1    4b9db412131fa35fd15721b30bf1736c18a41c34 \
-                    rmd160  19914bbbaf8ab326855b529d85329ace085aa322
+checksums           md5     bcd05521b35066d8102241dc7d9acd7d \
+                    sha1    9605743dad35826bae161e9c62c5b13cf6bd3dc7 \
+                    rmd160  3b0cd4663087f986d7577b2e2b2c0abf45f8485f
 
 depends_lib         port:texlive-basic
 
@@ -23,10 +23,8 @@
     {Map arevvn.map} \
     {Map chartervn.map} \
     {Map cmbrightvn.map} \
-    {Map comicvn.map} \
     {Map concretevn.map} \
     {Map grotesqvn.map} \
-    {Map mscorevn.map} \
     {Map txttvn.map} \
     {Map urwvn.map} \
     {MixedMap vnrother.map} \

Modified: trunk/dports/tex/texlive-latex/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-latex/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,25 +5,26 @@
 PortGroup           texlive 1.0
 
 name                texlive-latex
-version             15495
-revision            1
+version             18674
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Basic LaTeX packages
 long_description    These packages are mandated by the core LaTeX team, or at least very strongly recommended.
 
-checksums           md5     643df1236150b1817ed95cf123b9d00f \
-                    sha1    2238ad75b4c2e2185c7328ca0565694750cd5767 \
-                    rmd160  36d4ca2a0b61147852efe207fbae2e9472ef7f85
+checksums           md5     6621ebb9ac0a33e766778bccfd1e502c \
+                    sha1    e1265ddbdd1c1cd907bc56b0dda37171be3c4450 \
+                    rmd160  f3b0aecb325aacb67ac8dd6859f9d7d78e1418fe
 
 depends_lib         port:texlive-basic
 
 texlive.formats      \
     {1 latex pdftex language.dat {-translate-file=cp227.tcx *latex.ini}} \
     {1 pdflatex pdftex language.dat {-translate-file=cp227.tcx *pdflatex.ini}} \
-    {1 dvilualatex luatex language.dat {dvilualatex.ini}} \
-    {1 lualatex luatex language.dat {lualatex.ini}}
+    {1 dvilualatex luatex language.dat,language.dat.lua {dvilualatex.ini}} \
+    {1 lualatex luatex language.dat,language.dat.lua {lualatex.ini}} \
+    {1 mptopdf pdftex - {-translate-file=cp227.tcx mptopdf.tex}}
 
 texlive.maps      \
     {Map charter.map} \
@@ -31,6 +32,13 @@
     {Map pazo.map} \
     {Map utopia.map}
 
-texlive.excludemanpages yes
+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]}]
+        && [rpm-vercomp [lindex $vers 1] 18549] < 0} {
+        registry_deactivate texlive-context "" [list ports_nodepcheck 1]
+    }
+}
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-latex-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-latex-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-latex-extra
-version             15852
-revision            1
+version             19538
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: LaTeX supplementary packages
 long_description    A large collection of add-on packages for LaTeX.
 
-checksums           md5     9515580bb7fa726d13f8d78930538270 \
-                    sha1    0ef160a12455b8b49fa7f29530a05f8daafd4336 \
-                    rmd160  904e40628daccec402957cf90aecc5bc9f6acd14
+checksums           md5     65a4e86c147ffac2eba46d390e0a5224 \
+                    sha1    37fdb358431feee651f2acd168a4958489ecc03a \
+                    rmd160  875963b3df7770da47bafc4c9f13a7fc7269bd7a
 
 depends_lib         port:texlive-latex port:texlive-pictures
 
@@ -24,5 +24,7 @@
     {MixedMap esint.map} \
     {MixedMap manfnt.map}
 
+texlive.binaries    authorindex makeglossaries pdfannotextractor pdfthumb perltex ppower4 splitindex svn-multi vpe
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-latex-recommended/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex-recommended/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-latex-recommended/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,20 +5,23 @@
 PortGroup           texlive 1.0
 
 name                texlive-latex-recommended
-version             15271
-revision            1
+version             18261
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: LaTeX recommended packages
 long_description    A collection of recommended add-on packages for LaTeX which have widespread use
 
-checksums           md5     5ebb35bc4577b8712c10ff635702a0bb \
-                    sha1    f8b3fde0c1dda08f2282793de8be365c1fc5db39 \
-                    rmd160  00a10ecd1d8cd2e035ed17d4cba42ab5b60eb55e
+checksums           md5     f2c8a5423eee10fb387661053dac1cda \
+                    sha1    ecec90551d112c36e48291c55d6f4d6c0209f6d7 \
+                    rmd160  26518c4ab71cf4eb155eaa032cbe236c8dfc3afc
 
 depends_lib         port:texlive-latex
 
-texlive.excludemanpages yes
+texlive.binaries    thumbpdf
 
+# beamer requires pgf; see #25478
+depends_lib-append port:pgf
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-latex3/Portfile
===================================================================
--- trunk/dports/tex/texlive-latex3/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-latex3/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-latex3
-version             15560
-revision            1
+version             16052
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: LaTeX3 packages
 long_description    LaTeX3 packages
 
-checksums           md5     919148eb4725a066e1362a425ce0397e \
-                    sha1    ea493ad28cf4bb70d3d4d7f1d4691a345073926f \
-                    rmd160  e740be79eff90e3083b394cec585219b6f1a5565
+checksums           md5     cf3137ea5cc4425ec4f65bf32137ce12 \
+                    sha1    375f3d1d850c8b94f6b7e29e5ff1ef5f57c36d33 \
+                    rmd160  415e99f43ed4402b2053884590998327fa08a322
 
 depends_lib         port:texlive-latex
 

Modified: trunk/dports/tex/texlive-luatex/Portfile
===================================================================
--- trunk/dports/tex/texlive-luatex/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-luatex/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,19 +5,21 @@
 PortGroup           texlive 1.0
 
 name                texlive-luatex
-version             13992
-revision            1
+version             18256
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: LuaTeX packages
 long_description    Packages for LuaTeX, a Unicode-aware extension of pdfTeX, using Lua  as an embedded scripting and extension language. http://luatex.org/
 
-checksums           md5     330b10f24c8a01cfbc924b63058ff06a \
-                    sha1    237471228190992887c18986265cdd40a43659a8 \
-                    rmd160  d174352d192f9327a2ea0ba9f41630a9e990c0a9
+checksums           md5     f49cd20d17d40e5ed18e9c79dffc9e18 \
+                    sha1    025e0827030ff9fc6c82df8d56a9afe774bc75b3 \
+                    rmd160  8ad8529bd1ab21e7503a92f0ba2046a11d56a1e3
 
 depends_lib         port:texlive-basic
 
+texlive.binaries    mkluatexfontdb
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-math-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-math-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-math-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-math-extra
-version             15560
-revision            1
+version             19348
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Advanced math typesetting
 long_description    Extra math
 
-checksums           md5     c0e35fc0cefcd40bd72fae28856267b6 \
-                    sha1    40cf5b307ef3cd83e8d3fdc3887faf7bfc75475e \
-                    rmd160  5d700af753db727bfe352223334a998328f75f87
+checksums           md5     a3a01ad0dbfcc2059821a4c1a03971cf \
+                    sha1    87bc710f7ca4fd36c47c30d90fd8f61f53c5a2b2 \
+                    rmd160  536054ee365b87f4e2c4c729400097ae8f561b96
 
 depends_lib         port:texlive-fonts-recommended port:texlive-latex
 
@@ -26,6 +26,12 @@
     {MixedMap stmaryrd.map} \
     {MixedMap yhmath.map}
 
-texlive.excludemanpages yes
+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]}]
+        && [rpm-vercomp [lindex $vers 1] 19538] < 0} {
+        registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
+    }
+}
 
 texlive.texmfport

Modified: trunk/dports/tex/texlive-metapost/Portfile
===================================================================
--- trunk/dports/tex/texlive-metapost/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-metapost/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-metapost
 version             15388
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: MetaPost (and Metafont) drawing packages
 long_description    MetaPost (and Metafont) drawing packages
 
-checksums           md5     c17dea96501c30086734613d53bc59d1 \
-                    sha1    a224319a8ecfebf02d4efedef5b2ffa1b4d42eb4 \
-                    rmd160  d74468994632c2259c45047241efa1d68b1dc6cf
+checksums           md5     c41470a1a7863341937a45c396f28969 \
+                    sha1    6a2382f9e280fdbf92419ca874eb53454008f737 \
+                    rmd160  2e0dff0e5f11b547b9163cbd3120de4ee4f5cfcc
 
 depends_lib         port:texlive-basic
 
@@ -23,6 +23,7 @@
     {1 mpost mpost - {mpost.mp}} \
     {1 mfplain mpost - {mfplain.ini}}
 
-texlive.excludemanpages yes
+texlive.binaries    dvitomp mpost
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-music/Portfile
===================================================================
--- trunk/dports/tex/texlive-music/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-music/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,21 +6,23 @@
 
 name                texlive-music
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Music typesetting
 long_description    Music-related fonts and packages.
 
-checksums           md5     aa320c7a391ce27baa3840004207df8c \
-                    sha1    79ac11c06670a17a06e6d494b12d273d66584fa6 \
-                    rmd160  2eaf2f637fbd7a21f7f6b396a171584ae7c8db32
+checksums           md5     71a3643055b7c3b79776a248ef23fe35 \
+                    sha1    e3551182fb47b3a1cae1841e59b78d323b18b419 \
+                    rmd160  c4f6dc09e2e4bec4869f50d54abecf82c4ea3069
 
 depends_lib         port:texlive-latex
 
 texlive.maps      \
     {MixedMap musix.map}
 
+texlive.binaries    musixflx
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-omega/Portfile
===================================================================
--- trunk/dports/tex/texlive-omega/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-omega/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -6,16 +6,16 @@
 
 name                texlive-omega
 version             13822
-revision            1
+revision            2
 
 categories          tex
 maintainers         dports
 description         TeX Live: Omega
 long_description    Omega, a 16-bit extended TeX by John Plaice and Yannis Haralambous
 
-checksums           md5     2869a0e3da8e4bce7940107b5a44bc35 \
-                    sha1    7c5bf877e60c44af94b02fec72235c752ded7277 \
-                    rmd160  8e6d2bae4fe200f737d0315cd6dca6c6f48e009d
+checksums           md5     8e7896b994caaa1e7046e84f106d3a75 \
+                    sha1    2f0a9d4f2244dcc8e406a1d6881f995808f314e2 \
+                    rmd160  e6034d798cb854ab2dccd1dc86127eedf9a5363b
 
 depends_lib         port:texlive-basic port:texlive-latex
 
@@ -26,6 +26,7 @@
 texlive.maps      \
     {Map omega.map}
 
-texlive.excludemanpages yes
+texlive.binaries    aleph odvicopy odvitype ofm2opl omfonts opl2ofm otangle otp2ocp outocp ovf2ovp ovp2ovf
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-pictures/Portfile
===================================================================
--- trunk/dports/tex/texlive-pictures/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-pictures/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,22 +5,34 @@
 PortGroup           texlive 1.0
 
 name                texlive-pictures
-version             15543
-revision            1
+version             19330
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Graphics packages and programs
 long_description    Graphics packages and programs
 
-checksums           md5     77d0ef49ff619676a2b76c44d039b141 \
-                    sha1    4b453c469ffcdc3f157449b1195ec6a11f8881bf \
-                    rmd160  a8526a233ce2301e09299da304d405f67b233716
+checksums           md5     3398656e965287e83b3e8b254b651c17 \
+                    sha1    f631f6cbb0b6b8eae76a71c1873c586709c36d4f \
+                    rmd160  38306e42e8d1504f9800a9cb7476f493313d6ed9
 
 depends_lib         port:texlive-basic
 
 texlive.maps      \
+    {Map knitfont.map} \
     {MixedMap xypic.map}
 
+texlive.binaries    cachepic epspdf epspdftk fig4latex mathspic
 
+# 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]}]
+        && [rpm-vercomp [lindex $vers 1] 19538] < 0} {
+        registry_deactivate texlive-latex-extra "" [list ports_nodepcheck 1]
+    }
+}
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-plain-extra/Portfile
===================================================================
--- trunk/dports/tex/texlive-plain-extra/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-plain-extra/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-plain-extra
-version             15279
-revision            1
+version             19038
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Plain TeX supplementary packages
 long_description    Add-on packages and macros that work with plain TeX.
 
-checksums           md5     f9425d61d27d8438cef1cd0624df77d8 \
-                    sha1    587f81956dda8b591e00996be71600e47e4ea0c0 \
-                    rmd160  1b5d4aa90694efaf91c1e977d32d776c75ab92d3
+checksums           md5     684b99d09c1f666c373d866331ef3f44 \
+                    sha1    b161560645e37b48a6b11e7dad005af6a2578127 \
+                    rmd160  01a433270ef4ad97a46854f7d2f792b1a61b0668
 
 depends_lib         port:texlive-basic
 

Modified: trunk/dports/tex/texlive-pstricks/Portfile
===================================================================
--- trunk/dports/tex/texlive-pstricks/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-pstricks/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,19 +5,21 @@
 PortGroup           texlive 1.0
 
 name                texlive-pstricks
-version             15485
-revision            1
+version             19037
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: PSTricks packages
 long_description    PSTricks packages
 
-checksums           md5     0f8c891e80a9e219afb245cf0ec26d4a \
-                    sha1    60216bb98047316c0e87e0b5029e49ca1b545da1 \
-                    rmd160  8092209fd85c3c7b8713dbb8760e7a12f046a317
+checksums           md5     baa01d75d0180e4a4ee8c3a2d487055d \
+                    sha1    37412768ebd5b2197a747bd2ed2781765db900ca \
+                    rmd160  9a7ef4ac0abd01ee6c214ab42104fd4effa717a7
 
 depends_lib         port:texlive-basic port:texlive-generic-recommended
 
+texlive.binaries    pst2pdf
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-publishers/Portfile
===================================================================
--- trunk/dports/tex/texlive-publishers/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-publishers/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-publishers
-version             14434
-revision            1
+version             19046
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Support for publishers, theses, standards, conferences, etc.
 long_description    Support for publishers, theses, standards, conferences, etc.
 
-checksums           md5     36227da770add7d229d7806c0f1c9787 \
-                    sha1    6f95af39729923f357fb6914b203afbcdec1a4f9 \
-                    rmd160  871f42c17147ccdf2825dfcb6b4c498708e11ca0
+checksums           md5     7bd9d765582452f481cf224d7ef06190 \
+                    sha1    904fc759e73c4d330677415fb4312bfbbf5dc1e7 \
+                    rmd160  ffbe22146fbd170ab0703899a5493d2454442c4a
 
 depends_lib         port:texlive-latex
 

Modified: trunk/dports/tex/texlive-science/Portfile
===================================================================
--- trunk/dports/tex/texlive-science/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-science/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,22 +5,24 @@
 PortGroup           texlive 1.0
 
 name                texlive-science
-version             13945
-revision            1
+version             17277
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: Typesetting for natural and computer sciences
 long_description    Typesetting for natural and computer sciences
 
-checksums           md5     3366614049ad9ffd330c5af2199f11b3 \
-                    sha1    86f2341833479ad9f71795336c1c15587ab37688 \
-                    rmd160  9b168425ad6bffb47e130c14bfd5304d4c16b6b3
+checksums           md5     cd91eed5c1376b4646507ade634603cc \
+                    sha1    22c0011acc16db7b481cf7c7a87cad8d1a1be752 \
+                    rmd160  64bd2dca822fc82bebc336f21fbdbbe0e1d02a28
 
 depends_lib         port:texlive-latex
 
 texlive.maps      \
     {Map chemarrow.map}
 
+texlive.binaries    ulqda
 
+
 texlive.texmfport

Modified: trunk/dports/tex/texlive-xetex/Portfile
===================================================================
--- trunk/dports/tex/texlive-xetex/Portfile	2010-11-10 03:47:40 UTC (rev 73313)
+++ trunk/dports/tex/texlive-xetex/Portfile	2010-11-10 04:19:13 UTC (rev 73314)
@@ -5,17 +5,17 @@
 PortGroup           texlive 1.0
 
 name                texlive-xetex
-version             14329
-revision            1
+version             17780
+revision            0
 
 categories          tex
 maintainers         dports
 description         TeX Live: XeTeX packages
 long_description    Packages for XeTeX, the Unicode/OpenType-enabled TeX by Jonathan Kew, http://scripts.sil.org/xetex.
 
-checksums           md5     7a9ebc1c23e0def88aace0bb7bd703f3 \
-                    sha1    53e8213f9b63fdbb954ab00779f248b6c0d48e33 \
-                    rmd160  2e267d8bc23f4bf93bfb576bd836ea03d0ad6902
+checksums           md5     52cb3cec276bdda21b9fc997ccd2f28e \
+                    sha1    213151c9e882c520e72aaa728ac49d5776e20496 \
+                    rmd160  487d3bde3f6c8d4cb74178c3b4f08da3fe4e780e
 
 depends_lib         port:texlive-basic
 
@@ -23,5 +23,7 @@
     {1 xetex xetex language.def {-etex xetex.ini}} \
     {1 xelatex xetex language.dat {-etex xelatex.ini}}
 
+texlive.binaries    T1Wrap teckit_compile xdv2pdf xdvipdfmx xetex
 
+
 texlive.texmfport


Property changes on: trunk/dports/tex/texlive_base
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive_base:68610-68885
   + /users/dports/ports/tex/texlive_base:68610-68885,72668-73311


Property changes on: trunk/dports/tex/texlive_texmf-docs
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive_texmf-docs:68610-68885
   + /users/dports/ports/tex/texlive_texmf-docs:68610-68885,72668-73311


Property changes on: trunk/dports/tex/texlive_texmf-full
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive_texmf-full:68610-68885
   + /users/dports/ports/tex/texlive_texmf-full:68610-68885,72668-73311


Property changes on: trunk/dports/tex/texlive_texmf-minimal
___________________________________________________________________
Modified: svn:mergeinfo
   - /users/dports/ports/tex/texlive_texmf-minimal:68610-68885
   + /users/dports/ports/tex/texlive_texmf-minimal:68610-68885,72668-73311
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101109/ef72969d/attachment-0001.html>


More information about the macports-changes mailing list