aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwxs <wxs@FreeBSD.org>2010-03-15 01:00:01 +0800
committerwxs <wxs@FreeBSD.org>2010-03-15 01:00:01 +0800
commitfbd4a15b47a5fe6916044f6f2fbe7c2a1fb4af73 (patch)
treeaf7ea9053186ab934f8bb65a9b01d8c100b4c1c3
parent23a086e8f44ff5c38cb6ff8b0d3ff6c30fdac4b8 (diff)
downloadfreebsd-ports-gnome-fbd4a15b47a5fe6916044f6f2fbe7c2a1fb4af73.tar.gz
freebsd-ports-gnome-fbd4a15b47a5fe6916044f6f2fbe7c2a1fb4af73.tar.zst
freebsd-ports-gnome-fbd4a15b47a5fe6916044f6f2fbe7c2a1fb4af73.zip
- Update to 1.7.0.2
- [1]: Add a dependency on textproc/docbook-xsl. The port used to fetch files during build if HTMLDOCS was selected. This eliminates the need to do that. PR: ports/143483 Submitted by: Anatoly Borodin <anatoly.borodin@gmail.com>
-rw-r--r--devel/git/Makefile5
-rw-r--r--devel/git/distinfo18
-rw-r--r--devel/git/files/patch-Documentation__Makefile9
-rw-r--r--devel/git/pkg-plist1
4 files changed, 17 insertions, 16 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 9b573ff37956..675d88b21d95 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= git
-PORTVERSION= 1.7.0.1
+PORTVERSION= 1.7.0.2
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_KERNEL_ORG}
MASTER_SITE_SUBDIR= software/scm/${PORTNAME}
@@ -222,7 +222,8 @@ PLIST_SUB+= CURL="@comment "
.ifdef (WITH_HTMLDOCS)
RUN_DEPENDS+= ${LOCALBASE}/bin/asciidoc:${PORTSDIR}/textproc/asciidoc \
- ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+ ${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt \
+ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
PLIST_SUB+= HTMLDOCS=""
.else
PLIST_SUB+= HTMLDOCS="@comment "
diff --git a/devel/git/distinfo b/devel/git/distinfo
index c0f79101510f..ff49216ee15c 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,9 +1,9 @@
-MD5 (git-1.7.0.1.tar.bz2) = c4315200efc90ea0f243cf0e86cda1f1
-SHA256 (git-1.7.0.1.tar.bz2) = df36a3dd77d63595e8098dee52e730523ab495b506aeb7b9dfa4964c7803cdc5
-SIZE (git-1.7.0.1.tar.bz2) = 2430993
-MD5 (git-manpages-1.7.0.1.tar.bz2) = 25f70e07db86b247e929a12cfc5bd1c5
-SHA256 (git-manpages-1.7.0.1.tar.bz2) = e693b7a03dc3868db9a9aaa4d9fa6d56ea876f06e45bc4f4571ee0c9fce0581a
-SIZE (git-manpages-1.7.0.1.tar.bz2) = 272127
-MD5 (git-1.7.0.1.tar.bz2.sign) = 2558c0d77c0b10f5bda99b665759c979
-SHA256 (git-1.7.0.1.tar.bz2.sign) = efb2cc5c13dd69f202a193e37d71511709ef09a0887d3093461e68faba423d90
-SIZE (git-1.7.0.1.tar.bz2.sign) = 248
+MD5 (git-1.7.0.2.tar.bz2) = 76518fa774b36de81d160b85fa4f19c1
+SHA256 (git-1.7.0.2.tar.bz2) = 5601df7fc282fdd66de196b282694eb77dcfc50438f01587de144b3ead1a6b2f
+SIZE (git-1.7.0.2.tar.bz2) = 2435028
+MD5 (git-manpages-1.7.0.2.tar.bz2) = 58e0c6b194d989de8f7c4c7193315287
+SHA256 (git-manpages-1.7.0.2.tar.bz2) = 3a65a0a4c5cc34f357fcc6a2ec48f430c13a6a89524b4af89bd5b163563db3ab
+SIZE (git-manpages-1.7.0.2.tar.bz2) = 272164
+MD5 (git-1.7.0.2.tar.bz2.sign) = 03f5f165afd1f027b1e1d1cb3e163da0
+SHA256 (git-1.7.0.2.tar.bz2.sign) = 49c525dcdc466ba415429abde944cbeb59af3eb0896ee223afcad23afc4c22ea
+SIZE (git-1.7.0.2.tar.bz2.sign) = 248
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile
index d800a19023c7..93b5766ac493 100644
--- a/devel/git/files/patch-Documentation__Makefile
+++ b/devel/git/files/patch-Documentation__Makefile
@@ -1,6 +1,6 @@
---- Documentation/Makefile.orig 2009-06-04 02:26:40.000000000 -0400
-+++ Documentation/Makefile 2009-06-15 16:13:05.000000000 -0400
-@@ -29,10 +29,10 @@
+--- Documentation/Makefile.orig 2010-03-07 17:13:40.000000000 -0500
++++ Documentation/Makefile 2010-03-14 12:02:57.551179596 -0400
+@@ -30,10 +30,10 @@
DOC_MAN5=$(patsubst %.txt,%.5,$(MAN5_TXT))
DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
@@ -14,7 +14,7 @@
mandir?=$(prefix)/share/man
man1dir=$(mandir)/man1
man5dir=$(mandir)/man5
-@@ -142,7 +142,7 @@
+@@ -162,7 +162,7 @@
endif
endif
@@ -22,4 +22,3 @@
+all: html
html: $(DOC_HTML)
-
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 1979e6c29336..bbaac8f5212b 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -753,6 +753,7 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.6.6.2.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.1.txt
+%%HTMLDOCS%%%%DOCSDIR%%/RelNotes-1.7.0.2.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/INSTALL
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/README
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/git-favicon.png