[96028] trunk/dports/devel/git-core/Portfile

raimue at macports.org raimue at macports.org
Sun Jul 29 04:14:39 PDT 2012


Revision: 96028
          https://trac.macports.org/changeset/96028
Author:   raimue at macports.org
Date:     2012-07-29 04:14:36 -0700 (Sun, 29 Jul 2012)
Log Message:
-----------
devel/git-core:
Split installation of +doc variant, so this works now when running extract and
destroot in separate steps, closes #29707

Modified Paths:
--------------
    trunk/dports/devel/git-core/Portfile

Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile	2012-07-29 10:21:57 UTC (rev 96027)
+++ trunk/dports/devel/git-core/Portfile	2012-07-29 11:14:36 UTC (rev 96028)
@@ -87,12 +87,6 @@
     }
     set docdestroot ${destroot}${prefix}/share/doc/${name}
     xinstall -d ${docdestroot}
-    if {[variant_isset doc]} {
-        system "cd ${docdestroot} && ${extract.cmd} ${extract.pre_args} \
-            ${distpath}/git-htmldocs-${version}${extract.suffix} \
-            ${extract.post_args}"
-    }
-
     file copy ${worksrcpath}/contrib ${docdestroot}
 
     foreach badfile [exec find ${destroot} -name perllocal.pod] {
@@ -125,6 +119,21 @@
     checksums-append        git-htmldocs-${version}${extract.suffix} \
                             rmd160  20193aec11c1f0d14ccd534fb8c5c94569db8f80 \
                             sha256  c68de95ceb7ef73b1a6f0a1ab7e52942dc8e71accfec366c71072dcbf3365e0f
+
+    post-extract {
+        file mkdir ${workpath}/htmldocs
+        system -W ${workpath}/htmldocs "${extract.cmd} ${extract.pre_args} \
+            ${distpath}/git-htmldocs-${version}${extract.suffix} \
+            ${extract.post_args}"
+    }
+
+    post-destroot {
+        set docdestroot ${destroot}${prefix}/share/doc/${name}
+        xinstall -d ${docdestroot}
+        foreach f [glob ${workpath}/htmldocs/*] {
+            file copy ${f} ${docdestroot}
+        }
+    }
 }
 
 variant gitweb description {Install gitweb.cgi} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120729/9b07af05/attachment.html>


More information about the macports-changes mailing list