[109564] trunk/dports/devel/git-core/Portfile
cal at macports.org
cal at macports.org
Sat Aug 17 08:55:20 PDT 2013
Revision: 109564
https://trac.macports.org/changeset/109564
Author: cal at macports.org
Date: 2013-08-17 08:55:19 -0700 (Sat, 17 Aug 2013)
Log Message:
-----------
git-core: make destroot re-runnable, maintainer timeout, #39843
Modified Paths:
--------------
trunk/dports/devel/git-core/Portfile
Modified: trunk/dports/devel/git-core/Portfile
===================================================================
--- trunk/dports/devel/git-core/Portfile 2013-08-17 15:53:33 UTC (rev 109563)
+++ trunk/dports/devel/git-core/Portfile 2013-08-17 15:55:19 UTC (rev 109564)
@@ -73,7 +73,7 @@
destroot.target install
pre-destroot {
eval destroot.args ${build.args}
- copy ${worksrcpath}/contrib/subtree/git-subtree.1 ${workpath}/man1
+ xinstall -m 644 ${worksrcpath}/contrib/subtree/git-subtree.1 ${workpath}/man1
}
set docdestroot ${destroot}${prefix}/share/doc/${name}
@@ -108,7 +108,8 @@
xinstall -m 755 ${worksrcpath}/contrib/subtree/git-subtree.sh \
${destroot}${prefix}/libexec/git-core/git-subtree
- file copy ${worksrcpath}/contrib ${share_path}
+ file delete -force ${share_path}/contrib
+ copy ${worksrcpath}/contrib ${share_path}
}
@@ -147,12 +148,13 @@
}
pre-destroot {
- copy ${worksrcpath}/contrib/subtree/git-subtree.html ${workpath}/htmldocs
+ xinstall -m 644 ${worksrcpath}/contrib/subtree/git-subtree.html ${workpath}/htmldocs
}
post-destroot {
foreach f [glob ${workpath}/htmldocs/*] {
- file copy ${f} ${docdestroot}
+ file delete -force "${docdestroot}/[file tail ${f}]"
+ copy ${f} ${docdestroot}
}
}
}
@@ -197,7 +199,6 @@
pre-destroot {
xinstall -m 755 "${worksrcpath}/contrib/credential/osxkeychain/git-credential-osxkeychain" \
"${destroot}${prefix}/bin/"
- system -W "${worksrcpath}/contrib/credential/osxkeychain" "make clean"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130817/d51961ba/attachment.html>
More information about the macports-changes
mailing list