Ticket #46896: patch-latexml-0.8.1-devans.diff

Portfile

@@ -6 +6 @@
 PortSystem          1.0
 
 name                LaTeXML
-version             0.8.0
-revision            1
-categories          tex
+version             0.8.1
 maintainers         nist.gov:bruce.miller
 description         LaTeXML converts TeX to XML/HTML/MathML
 long_description \
@@ -16 +14 @@
 
 # Written in Perl, but it is an application, not just modules
 PortGroup           perl5 1.0
-perl5.branches      5.8 5.10 5.12 5.14 5.16 5.18 5.20
+perl5.branches      5.16
 perl5.setup         ${name} ${version}
 perl5.link_binaries_suffix
 
+categories          tex
 homepage            http://dlmf.nist.gov/LaTeXML/
 
 platforms           darwin
+supported_archs     noarch
+
 master_sites        ${homepage}/releases/
-checksums           rmd160 cfafc6f4f5e276543333f907a1ec0db3c25e424f \
-                    sha256 a495019f2828f0734e9e41f0398f6c8d60ba6a934d4ccad4fea7d588ab060388
+checksums           rmd160 312f0a3d74db75a9210220ab8ea4a1c3f95c6f71 \
+                    sha256 ea264e1c11210e219a46b7699a578d8632c7bbb6eaea5b06d2eb094122cbab2f
 # Use:
 # openssl rmd160 LaTeXML-0.8.0.tar.gz
 # openssl sha256 LaTeXML-0.8.0.tar.gz
@@ -32 +33 @@
 
 #============================================================
 # Dependencies
-if {${perl5.major} ne ""} {
-    depends_lib-append \
+depends_lib-append \
         port:p${perl5.major}-archive-zip \
         port:p${perl5.major}-file-which \
         port:p${perl5.major}-getopt-long \
@@ -47 +47 @@
         port:p${perl5.major}-xml-libxml \
         port:p${perl5.major}-xml-libxslt \
         port:p${perl5.major}-perlmagick
-}
-# Also requires: DB_File, Pod::Parser and Test::More
-# but those should be in Perl's core modules.
 
+# Also requires: DB_File, Pod::Parser, Test::More & version
+# but those should be in any non-obsolete Perl's core modules.
+
 #============================================================
 # LaTeXML works MUCH better if there is a TeX installed.
 # - it uses some latex style files from texlive within bindings
@@ -63 +63 @@
 
 # The texlive variant depends on texlive
 # and install latexml's stylefiles to texlive's texmf
-variant texlive description {Build with (macports) texlive support} {
+variant texlive conflicts mactex description {Build with (macports) texlive support} {
     notes "Using texlive for TeX: will install styles to its texmf"
     depends_lib-append      port:texlive
-    configure.args-append   TEXMF=[exec kpsewhich --expand-var='\$TEXMFLOCAL']
+    pre-configure {
+        configure.args-append   TEXMF=[exec kpsewhich --expand-var='\$TEXMFLOCAL']
+    }
     post-activate {
         system "mktexlsr"
     }
@@ -74 +76 @@
 
 # The mactex variant expects MacTeX to be installed
 # and installs latexml's stylefiles to MacTeX's texmf
-variant mactex description {Build with MacTeX support} {
+variant mactex conflicts texlive description {Build with MacTeX support} {
     # check if MacTeX actually seems to be there...
     pre-configure {
         if {![file executable /usr/texbin/kpsewhich]} {
             ui_error "I cannot find MacTeX's kpswhich in /usr/texbin; aborting installation"
-            return -code error
+            return -code error "MacTeX not installed"
+        } else {
+            configure.args-append   TEXMF=[exec /usr/texbin/kpsewhich --expand-var='\$TEXMFLOCAL']
         }
     }
     notes "Using MacTeX for TeX: will install styles to MacTeX's texmf \
         (outside macport's common directory structure)"
-    configure.args-append   TEXMF=[exec /usr/texbin/kpsewhich --expand-var='\$TEXMFLOCAL']
     post-activate {
         system /usr/texbin/mktexlsr
     }