Revision: 121497 https://trac.macports.org/changeset/121497 Author: ciserlohn@macports.org Date: 2014-06-27 05:10:25 -0700 (Fri, 27 Jun 2014) Log Message: ----------- git: update to version 2.0.1; use default html doc dir Modified Paths: -------------- trunk/dports/devel/git/Portfile trunk/dports/devel/git/files/git-subtree.1.diff trunk/dports/devel/git/files/patch-Makefile.diff Modified: trunk/dports/devel/git/Portfile =================================================================== --- trunk/dports/devel/git/Portfile 2014-06-27 06:07:22 UTC (rev 121496) +++ trunk/dports/devel/git/Portfile 2014-06-27 12:10:25 UTC (rev 121497) @@ -4,8 +4,7 @@ PortSystem 1.0 name git -version 2.0.0 -revision 1 +version 2.0.1 description A fast version control system long_description Git is a fast, scalable, distributed open source version \ control system focusing on speed and efficiency. @@ -20,11 +19,11 @@ git-manpages-${version}${extract.suffix} checksums git-${version}${extract.suffix} \ - rmd160 151248c8823d868e61c9c87cc55561977f586dcd \ - sha256 c6a370e95326701037dfe32f8e66f39cdd28557ca84ffdb282d6042c37a98b68 \ + rmd160 1fc03cefc4bafd3e6a1c0772fdf6a6a7354a4047 \ + sha256 02609a06fb40db1f6a968867c0e82bcb959b85902747830de0fda53228712daf \ git-manpages-${version}${extract.suffix} \ - rmd160 864c701d441afe3277917d3e0633b9b769abac70 \ - sha256 12523fe1c8de8b88997b5483313e143c96c0a116c19a498ddbbfe573ed98bded \ + rmd160 da2272d6f54459d1d568ef99061aa143477067c7 \ + sha256 a8b2af48319a197c2359db9b4f01448827dd9a796e68510e162faee66ae11052 \ depends_run port:rsync @@ -90,7 +89,7 @@ xinstall -m 644 ${worksrcpath}/contrib/subtree/git-subtree.1 ${workpath}/man1 } -set docdestroot ${destroot}${prefix}/share/doc/git-core +set docdestroot ${destroot}${prefix}/share/doc/git-doc post-destroot { foreach f {1 5 7} { @@ -159,8 +158,8 @@ variant doc description {Install HTML and plaintext documentation} { distfiles-append git-htmldocs-${version}${extract.suffix} checksums-append git-htmldocs-${version}${extract.suffix} \ - rmd160 422a3764a328e5123c21a720689fc3bce8118932 \ - sha256 19d34736cc50e3a4b5641e0998191d67d89d3146b8652e7abd88780ca475dbcb + rmd160 6362d2d448764046e962594333b1dbdc6ef10767 \ + sha256 5e65f6ce3a69cee1dab018374a46214b8a4797d360fcb18d5f49660d0b7b48fb patchfiles-append git-subtree.html.diff Modified: trunk/dports/devel/git/files/git-subtree.1.diff =================================================================== --- trunk/dports/devel/git/files/git-subtree.1.diff 2014-06-27 06:07:22 UTC (rev 121496) +++ trunk/dports/devel/git/files/git-subtree.1.diff 2014-06-27 12:10:25 UTC (rev 121497) @@ -8,10 +8,10 @@ +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 03/17/2014 +.\" Manual: Git Manual -+.\" Source: Git 2.0.0 ++.\" Source: Git 2.0.1 +.\" Language: English +.\" -+.TH "GIT\-SUBTREE" "1" "03/17/2014" "Git 2\&.0\&.0" "Git Manual" ++.TH "GIT\-SUBTREE" "1" "03/17/2014" "Git 2\&.0\&.1" "Git Manual" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- Modified: trunk/dports/devel/git/files/patch-Makefile.diff =================================================================== --- trunk/dports/devel/git/files/patch-Makefile.diff 2014-06-27 06:07:22 UTC (rev 121496) +++ trunk/dports/devel/git/files/patch-Makefile.diff 2014-06-27 12:10:25 UTC (rev 121497) @@ -1,14 +1,5 @@ --- a/Makefile.orig 2012-03-12 18:30:26.000000000 -0500 +++ b/Makefile 2012-03-18 04:27:52.000000000 -0500 -@@ -380,7 +380,7 @@ - gitwebdir = $(sharedir)/gitweb - localedir = $(sharedir)/locale - template_dir = share/git-core/templates --htmldir = $(prefix)/share/doc/git-doc -+htmldir = $(prefix)/share/doc/git-core - ETC_GITCONFIG = $(sysconfdir)/gitconfig - ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes - lib = lib @@ -1007,7 +1007,7 @@ ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto) dep_check = $(shell $(CC) $(ALL_CFLAGS) \