Ticket #51818: Portfile.2.diff

(a) Portfile vs. (b) Portfile-0.8.1

@@ -7 +7 @@
 PortGroup           texlive 1.0
 
 name                LaTeXML
-version             0.8.2
+version             0.8.1
+revision            1
 license             public-domain
 maintainers         nist.gov:bruce.miller
 description         LaTeXML converts TeX to XML/HTML/MathML
@@ -16 +17 @@
 
 # Written in Perl, but it is an application, not just modules
 PortGroup           perl5 1.0
-perl5.branches      5.24
+perl5.branches      5.22
 perl5.setup         ${name} ${version}
 perl5.link_binaries_suffix
 
@@ -27 +28 @@
 supported_archs     noarch
 
 master_sites        ${homepage}/releases/
-checksums           rmd160 6dbf960277cdcf30605ce93335e3383673c1ff66 \
-                    sha256 3d41a3012760d31d721b569d8c1b430cde1df2b68fcc3c66f41ec640965caabf
+checksums           rmd160 312f0a3d74db75a9210220ab8ea4a1c3f95c6f71 \
+                    sha256 ea264e1c11210e219a46b7699a578d8632c7bbb6eaea5b06d2eb094122cbab2f
 # Use:
-# openssl rmd160 LaTeXML-0.8.2.tar.gz
-# openssl sha256 LaTeXML-0.8.2.tar.gz
+# openssl rmd160 LaTeXML-0.8.0.tar.gz
+# openssl sha256 LaTeXML-0.8.0.tar.gz
 
 #============================================================
 # Dependencies
@@ -44 +45 @@
         port:p${perl5.major}-json-xs \
         port:p${perl5.major}-libwww-perl \
         port:p${perl5.major}-parse-recdescent \
-        port:p${perl5.major}-text-unidecode \
         port:p${perl5.major}-time-hires \
         port:p${perl5.major}-uri \
         port:p${perl5.major}-xml-libxml \
@@ -60 +60 @@
 # - it can install its own style files for use within tex/latex
 # We could simply depend on texlive, but some folks prefer MacTeX
 # and object to 2nd multi-GB download!  So we define variants.
-options latexml.found_tex
-default latexml.found_tex no
 
-# No texmf install via Makefile.
-pre-configure {
-   configure.args-append   TEXMF=
-  }
-# We don't want dependencies on texlive, but want to cooperate.
-# We'll install style files where texlive expects or will expect.
-post-destroot {
-    xinstall -d ${texlive_texmfdist}/tex/latex/latexml
-    foreach sty [glob ${worksrcpath}/lib/LaTeXML/texmf/*.sty] {
-        file copy -force ${sty} ${texlive_texmfdist}/tex/latex/latexml/
-    }
-}
-# invoke mktexlsr IFF texlive already installed;
-# otherwise texlive will do it if it's ever installed.
-post-activate {
-    if [file executable ${prefix}/bin/mktexlsr] {
-        latexml.found_tex yes
-        ${texlive.mktexlsr}
-    }
-}
-# Remove style files
-post-uninstall {
-    foreach sty [glob -nocomplain ${texlive_texmfdist}/tex/latex/latexml/*.sty] {
-        delete ${sty}
+notes "${name} works best with some version of TeX installed. \
+   Please consider +texlive variant, or PRE-install MacTeX and use +mactex variant."
+
+# The texlive variant depends on texlive
+# and install latexml's stylefiles to texlive's texmf
+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
+    pre-configure {
+        configure.args-append   TEXMF=${texlive_texmfports}
     }
-    if [file executable ${prefix}/bin/mktexlsr] {
-        ${texlive.mktexlsr}
+    post-activate {
+        texlive.mktexlsr
     }
 }
 
 # The mactex variant expects MacTeX to be installed
-# and installs latexml's stylefiles to MacTeX's texmf (local)
-options latexml.mactex_bin
-options latexml.mactex_texmf
-default latexml.mactex_bin ""
-default latexml.mactex_texmf ""
-set latexml.mactex_candidates { \
-   "/Library/TeX/texbin" \
-   "/usr/texbin" \
-}
-variant mactex description {Build with MacTeX support} {
-    # First, check if MacTeX actually seems to be there...
-    foreach dir ${latexml.mactex_candidates} {
-        if [file executable "${dir}/kpsewhich"] {
-            latexml.mactex_bin ${dir}
-            break
-        }
-    }
-    if { ${latexml.mactex_bin} != "" } {
-        latexml.mactex_texmf \
-            [exec ${latexml.mactex_bin}/kpsewhich --expand-var='\$TEXMFLOCAL']
-        regsub -all {'} ${latexml.mactex_texmf} "" latexml.mactex_texmf
-        latexml.found_tex yes
-    } else {
-        return -code error "Cannot find MacTeX installation; aborting"
-    }
-
-    post-destroot {
-        xinstall -d ${latexml.mactex_texmf}/tex/latex/latexml
-        foreach sty [glob ${worksrcpath}/lib/LaTeXML/texmf/*.sty] {
-            file copy -force ${sty} ${latexml.mactex_texmf}/tex/latex/latexml/
+# and installs latexml's stylefiles to MacTeX's texmf
+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 "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)"
     post-activate {
-        system "${latexml.mactex_bin}/mktexlsr"
-    }
-    # Remove style files
-    post-uninstall {
-        foreach sty [glob -nocomplain ${latexml.mactex_texmf}/tex/latex/latexml/*.sty] {
-            delete ${sty}
-        }
-        system "${latexml.mactex_bin}/mktexlsr"
+        system /usr/texbin/mktexlsr
     }
-    notes "Using MacTeX for TeX: will install styles to MacTeX's texmf-local \
-        ${latexml.mactex_texmf} \
-        (which is outside macport's common directory structure)"
+
     # AND, since we're installing files outside macports' normal directories
     destroot.violate_mtree  yes
 }
 
-post-activate {
-    if {! ${latexml.found_tex}} {
-        ui_msg "${name} works best with some version of TeX installed. \
-    Please consider installing texlive, or PRE-install MacTeX and use +mactex variant."
-    }
-}
-
 #============================================================