[101690] trunk/dports/shells/zsh/Portfile

[larryv at macports.org]

Revision: 101690
          https://trac.macports.org/changeset/101690
Author:   larryv at macports.org
Date:     2013-01-17 02:07:19 -0800 (Thu, 17 Jan 2013)
Log Message:
-----------
zsh: Always install extra documentation; remove +doc variant.

Modified Paths:
--------------
    trunk/dports/shells/zsh/Portfile

Modified: trunk/dports/shells/zsh/Portfile
===================================================================
--- trunk/dports/shells/zsh/Portfile	2013-01-17 08:48:18 UTC (rev 101689)
+++ trunk/dports/shells/zsh/Portfile	2013-01-17 10:07:19 UTC (rev 101690)
@@ -5,7 +5,7 @@
 
 name                zsh
 version             5.0.2
-revision            1
+revision            2
 categories          shells
 platforms           darwin
 maintainers         larryv
@@ -29,16 +29,22 @@
                     ftp://ftp.zsh.org/pub/ \
                     ftp://ftp.fu-berlin.de/unix/shells/zsh/ \
                     ftp://ftp.icm.edu.pl/vol/rzm1/zsh/
+distfiles-append    ${distname}-doc${extract.suffix}
 checksums           ${distname}${extract.suffix} \
-                    rmd160  eea2328a28e9f022ab9f49583622a9c3bd6114a7 \
-                    sha256  eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03
+                        rmd160  eea2328a28e9f022ab9f49583622a9c3bd6114a7 \
+                        sha256  eb220ae5a8076191ec6b4c6a5a2f18122d074a19f25b45f0320b44b8166c5a03 \
+                    ${distname}-doc${extract.suffix} \
+                        rmd160  a42bd1b85cae98158391d6aa120c6f9d4735ef7b \
+                        sha256  99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1
 
 depends_lib         port:libiconv \
                     port:ncurses \
                     port:gdbm \
                     port:pcre
 
-configure.args      --enable-libs="-lncurses" \
+set doc ${prefix}/share/doc/${name}
+configure.args      --htmldir=${doc}/html \
+                    --enable-libs="-lncurses" \
                     --enable-pcre \
                     --with-tcsetpgrp \
                     DL_EXT=bundle
@@ -46,6 +52,9 @@
 test.run            yes
 test.target         check
 
+destroot.target-append  install.html \
+                        install.info
+
 notes "
 To set MacPorts' ${name} as default login shell, run:
 
@@ -64,21 +73,11 @@
     system -W ${man} "soelim man1/zshall.1 > zshall.1.soelim"
     move -force ${man}/zshall.1.soelim ${man}/man1/zshall.1
 
-    xinstall -d ${destroot}${prefix}/share/doc/${name}
+    # .../share/doc/zsh is created by "make install.html"
     xinstall -m 0644 -W ${worksrcpath} \
-        ChangeLog FEATURES LICENCE META-FAQ NEWS README \
-        ${destroot}${prefix}/share/doc/${name}
-}
+        ChangeLog FEATURES LICENCE META-FAQ NEWS README ${destroot}${doc}
 
-variant doc description {Install extra documentation} {
-    distfiles-append    ${distname}-doc${extract.suffix}
-    checksums-append    ${distname}-doc${extract.suffix} \
-                        rmd160  a42bd1b85cae98158391d6aa120c6f9d4735ef7b \
-                        sha256  99ee08cfc91935af8714bd98db652f016d6c7a8a71ba7c6d6223910cd0b7fbf1
-    post-destroot {
-        eval xinstall -m 644 [glob ${worksrcpath}/Doc/*.html] \
-          ${destroot}${prefix}/share/doc/${name}
-        eval xinstall -m 644 [glob ${worksrcpath}/Doc/*.pdf] \
-          ${destroot}${prefix}/share/doc/${name}
-    }
+    # There doesn't seem to be a make target for installing the PDFs.
+    xinstall -d ${destroot}${prefix}/share/doc/${name}/pdf
+    eval xinstall -m 0644 [glob ${worksrcpath}/Doc/*.pdf] ${destroot}${doc}/pdf
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130117/3afd6a70/attachment.html>