Update to 1.7.10.1

While here add iconv to CONFIGURE_ARGS to resolve build failures under
certain conditions.[1]

PR:		[1]: ports/167071
Submitted by:	Trond Endrestøl <Trond.Endrestol@ximalas.info>
This commit is contained in:
Wesley Shields 2012-05-06 19:07:13 +00:00
parent 4baf68ccaa
commit 25f2d77bea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=296097
3 changed files with 25 additions and 7 deletions

View file

@ -6,7 +6,7 @@
# #
PORTNAME= git PORTNAME= git
PORTVERSION= 1.7.9.6 PORTVERSION= 1.7.10.1
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
@ -251,6 +251,7 @@ PLIST_SUB+= PERLSUB="@comment "
USE_ICONV= yes USE_ICONV= yes
MAKE_ENV+= NEEDS_LIBICONV=yes \ MAKE_ENV+= NEEDS_LIBICONV=yes \
ICONVDIR=${LOCALBASE} ICONVDIR=${LOCALBASE}
CONFIGURE_ARGS+= --with-iconv=${LOCALBASE}
.else .else
MAKE_ENV+= NO_ICONV=1 MAKE_ENV+= NO_ICONV=1
.endif .endif

View file

@ -1,6 +1,6 @@
SHA256 (git-1.7.9.6.tar.gz) = 3952a9159740a25329c763266a93de9b76e77b680a1d03ea349bfe088aebeed1 SHA256 (git-1.7.10.1.tar.gz) = 8151eca62a43ce97462fbe0eccf318c72f351ee80f22e9dff28e76a14db1fa98
SIZE (git-1.7.9.6.tar.gz) = 3617878 SIZE (git-1.7.10.1.tar.gz) = 3804745
SHA256 (git-manpages-1.7.9.6.tar.gz) = 2d62746548e7e9b2335c8974977ad712665f1f6aa87a50bb7642d47446a0f081 SHA256 (git-manpages-1.7.10.1.tar.gz) = 076850cc12a053e3048da70808f77a842cc2d36ce3b54e059459144d17204fd3
SIZE (git-manpages-1.7.9.6.tar.gz) = 509941 SIZE (git-manpages-1.7.10.1.tar.gz) = 511094
SHA256 (git-htmldocs-1.7.9.6.tar.gz) = adc525f53dcb5183c4e2c4cd19fd562236e92b13670683828d2ad1a8fb8f5bde SHA256 (git-htmldocs-1.7.10.1.tar.gz) = d5a028837652b6cd593d454c9b56779db2ae962c35ae16bfa6696a8883ac5082
SIZE (git-htmldocs-1.7.9.6.tar.gz) = 1750543 SIZE (git-htmldocs-1.7.10.1.tar.gz) = 1761909

View file

@ -186,6 +186,7 @@ libexec/git-core/git-verify-tag
libexec/git-core/git-web--browse libexec/git-core/git-web--browse
libexec/git-core/git-whatchanged libexec/git-core/git-whatchanged
libexec/git-core/git-write-tree libexec/git-core/git-write-tree
libexec/git-core/mergetools/deltawalker
libexec/git-core/mergetools/xxdiff libexec/git-core/mergetools/xxdiff
libexec/git-core/mergetools/tortoisemerge libexec/git-core/mergetools/tortoisemerge
libexec/git-core/mergetools/tkdiff libexec/git-core/mergetools/tkdiff
@ -207,7 +208,13 @@ libexec/git-core/mergetools/araxis
%%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm %%PERLSUB%%%%SITE_PERL%%/Git/I18N.pm
lib/xemacs/site-lisp/git/git.el lib/xemacs/site-lisp/git/git.el
lib/xemacs/site-lisp/git/git-blame.el lib/xemacs/site-lisp/git/git-blame.el
%%NLS%%share/locale/da/LC_MESSAGES/git.mo
%%NLS%%share/locale/de/LC_MESSAGES/git.mo
%%NLS%%share/locale/is/LC_MESSAGES/git.mo %%NLS%%share/locale/is/LC_MESSAGES/git.mo
%%NLS%%share/locale/nl/LC_MESSAGES/git.mo
%%NLS%%share/locale/pt_PT/LC_MESSAGES/git.mo
%%NLS%%share/locale/sv/LC_MESSAGES/git.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/git.mo
share/emacs/site-lisp/git/git.el share/emacs/site-lisp/git/git.el
share/emacs/site-lisp/git/git-blame.el share/emacs/site-lisp/git/git-blame.el
share/git-core/templates/description share/git-core/templates/description
@ -598,6 +605,8 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-string-list.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-xdiff-interface.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/shallow.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-config.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-grep.html
%%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt %%HTMLDOCS%%%%DOCSDIR%%/technical/racy-git.txt
%%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html %%HTMLDOCS%%%%DOCSDIR%%/technical/api-tree-walking.html
@ -888,12 +897,14 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.5.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.6.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.7.7.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.2.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.3.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.3.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.5.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.8.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.1.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.2.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.2.txt
@ -901,11 +912,16 @@ share/git-core/templates/info/exclude
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.4.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.4.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.5.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.5.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.6.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.6.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.9.7.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.10.txt
%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/1.7.10.1.txt
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.js
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/gitweb.css
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png
%%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-logo.png
%%CONTRIB%%share/git-core/contrib/diffall/README
%%CONTRIB%%share/git-core/contrib/diffall/git-diffall
%%CONTRIB%%share/git-core/contrib/README %%CONTRIB%%share/git-core/contrib/README
%%CONTRIB%%share/git-core/contrib/blameview/README %%CONTRIB%%share/git-core/contrib/blameview/README
%%CONTRIB%%share/git-core/contrib/blameview/blameview.perl %%CONTRIB%%share/git-core/contrib/blameview/blameview.perl
@ -1029,6 +1045,7 @@ share/git-core/templates/info/exclude
%%CONTRIB%%@dirrm share/git-core/contrib/convert-objects %%CONTRIB%%@dirrm share/git-core/contrib/convert-objects
%%CONTRIB%%@dirrm share/git-core/contrib/credential/osxkeychain %%CONTRIB%%@dirrm share/git-core/contrib/credential/osxkeychain
%%CONTRIB%%@dirrm share/git-core/contrib/credential %%CONTRIB%%@dirrm share/git-core/contrib/credential
%%CONTRIB%%@dirrm share/git-core/contrib/diffall
%%CONTRIB%%@dirrm share/git-core/contrib/diff-highlight %%CONTRIB%%@dirrm share/git-core/contrib/diff-highlight
%%CONTRIB%%@dirrm share/git-core/contrib/emacs %%CONTRIB%%@dirrm share/git-core/contrib/emacs
%%CONTRIB%%@dirrm share/git-core/contrib/examples %%CONTRIB%%@dirrm share/git-core/contrib/examples