git 1.7.9.2-1 màj port

(cherry picked from commit 4494c5041cc82ed245f23fdae4a2b096a038f14b)

5 files changed, 73 insertions, 44 deletions

diff --git a/git/.footprint.i686 b/git/.footprint.i686
index d4984d896..5ddea17df 100644
--- a/git/.footprint.i686
+++ b/git/.footprint.i686
@@ -36,6 +36,9 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-commit-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-config
 -rwxr-xr-x	root/root	usr/lib/git-core/git-count-objects
+-rwxr-xr-x	root/root	usr/lib/git-core/git-credential-cache
+-rwxr-xr-x	root/root	usr/lib/git-core/git-credential-cache--daemon
+-rwxr-xr-x	root/root	usr/lib/git-core/git-credential-store
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cvsexportcommit
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cvsimport
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cvsserver
@@ -167,22 +170,22 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-web--browse
 -rwxr-xr-x	root/root	usr/lib/git-core/git-whatchanged
 -rwxr-xr-x	root/root	usr/lib/git-core/git-write-tree
-drwxrwxr-x	root/root	usr/lib/git-core/mergetools/
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/araxis
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/bc3
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/defaults
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/diffuse
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/ecmerge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/emerge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/kdiff3
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/kompare
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/meld
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/opendiff
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/p4merge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/tkdiff
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/tortoisemerge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/vim
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/xxdiff
+drwxr-xr-x	root/root	usr/lib/git-core/mergetools/
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/araxis
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/bc3
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/defaults
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/diffuse
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/ecmerge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/emerge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/kdiff3
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/kompare
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/meld
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/opendiff
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/p4merge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/tkdiff
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/tortoisemerge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/vim
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/xxdiff
 drwxr-xr-x	root/root	usr/lib/perl5/
 drwxr-xr-x	root/root	usr/lib/perl5/site/
 drwxr-xr-x	root/root	usr/lib/perl5/site/auto/
@@ -248,6 +251,7 @@ drwxr-xr-x	root/root	usr/share/git-gui/lib/
 -rw-r--r--	root/root	usr/share/git-gui/lib/error.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/git-gui.ico
 -rw-r--r--	root/root	usr/share/git-gui/lib/index.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/line.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/logo.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/merge.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/mergetool.tcl
@@ -286,6 +290,7 @@ drwxr-xr-x	root/root	usr/share/gitweb/static/
 -rw-r--r--	root/root	usr/share/gitweb/static/git-logo.png
 -rw-r--r--	root/root	usr/share/gitweb/static/gitweb.css
 -rw-r--r--	root/root	usr/share/gitweb/static/gitweb.js
+drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-add.1.gz
@@ -312,6 +317,9 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-commit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-count-objects.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-cache--daemon.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-cache.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-store.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsexportcommit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsimport.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsserver.1.gz
@@ -366,6 +374,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-mv.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-name-rev.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-notes.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-p4.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-objects.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-redundant.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-refs.1.gz
@@ -432,8 +441,10 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-write-tree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gitk.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/gitweb.1.gz
 drwxr-xr-x	root/root	usr/share/man/man3/
 -r--r--r--	root/root	usr/share/man/man3/Git.3.gz
+-r--r--r--	root/root	usr/share/man/man3/Git::I18N.3.gz
 -r--r--r--	root/root	usr/share/man/man3/private-Error.3.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/gitattributes.5.gz
@@ -441,9 +452,11 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/gitignore.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/gitmodules.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/gitrepository-layout.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/gitweb.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/gitcli.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitcore-tutorial.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/gitcredentials.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitcvs-migration.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitdiffcore.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitglossary.7.gz
@@ -457,3 +470,5 @@ drwxr-xr-x	root/root	usr/share/perl5/base/
 drwxr-xr-x	root/root	usr/share/perl5/site/
 -r--r--r--	root/root	usr/share/perl5/site/Error.pm
 -r--r--r--	root/root	usr/share/perl5/site/Git.pm
+drwxr-xr-x	root/root	usr/share/perl5/site/Git/
+-r--r--r--	root/root	usr/share/perl5/site/Git/I18N.pm
diff --git a/git/.footprint.x86_64 b/git/.footprint.x86_64
index d4984d896..5ddea17df 100644
--- a/git/.footprint.x86_64
+++ b/git/.footprint.x86_64
@@ -36,6 +36,9 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-commit-tree
 -rwxr-xr-x	root/root	usr/lib/git-core/git-config
 -rwxr-xr-x	root/root	usr/lib/git-core/git-count-objects
+-rwxr-xr-x	root/root	usr/lib/git-core/git-credential-cache
+-rwxr-xr-x	root/root	usr/lib/git-core/git-credential-cache--daemon
+-rwxr-xr-x	root/root	usr/lib/git-core/git-credential-store
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cvsexportcommit
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cvsimport
 -rwxr-xr-x	root/root	usr/lib/git-core/git-cvsserver
@@ -167,22 +170,22 @@ drwxr-xr-x	root/root	usr/lib/git-core/
 -rwxr-xr-x	root/root	usr/lib/git-core/git-web--browse
 -rwxr-xr-x	root/root	usr/lib/git-core/git-whatchanged
 -rwxr-xr-x	root/root	usr/lib/git-core/git-write-tree
-drwxrwxr-x	root/root	usr/lib/git-core/mergetools/
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/araxis
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/bc3
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/defaults
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/diffuse
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/ecmerge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/emerge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/kdiff3
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/kompare
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/meld
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/opendiff
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/p4merge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/tkdiff
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/tortoisemerge
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/vim
--rw-rw-r--	root/root	usr/lib/git-core/mergetools/xxdiff
+drwxr-xr-x	root/root	usr/lib/git-core/mergetools/
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/araxis
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/bc3
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/defaults
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/diffuse
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/ecmerge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/emerge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/kdiff3
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/kompare
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/meld
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/opendiff
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/p4merge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/tkdiff
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/tortoisemerge
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/vim
+-rw-r--r--	root/root	usr/lib/git-core/mergetools/xxdiff
 drwxr-xr-x	root/root	usr/lib/perl5/
 drwxr-xr-x	root/root	usr/lib/perl5/site/
 drwxr-xr-x	root/root	usr/lib/perl5/site/auto/
@@ -248,6 +251,7 @@ drwxr-xr-x	root/root	usr/share/git-gui/lib/
 -rw-r--r--	root/root	usr/share/git-gui/lib/error.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/git-gui.ico
 -rw-r--r--	root/root	usr/share/git-gui/lib/index.tcl
+-rw-r--r--	root/root	usr/share/git-gui/lib/line.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/logo.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/merge.tcl
 -rw-r--r--	root/root	usr/share/git-gui/lib/mergetool.tcl
@@ -286,6 +290,7 @@ drwxr-xr-x	root/root	usr/share/gitweb/static/
 -rw-r--r--	root/root	usr/share/gitweb/static/git-logo.png
 -rw-r--r--	root/root	usr/share/gitweb/static/gitweb.css
 -rw-r--r--	root/root	usr/share/gitweb/static/gitweb.js
+drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-add.1.gz
@@ -312,6 +317,9 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-commit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-config.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-count-objects.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-cache--daemon.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-cache.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-credential-store.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsexportcommit.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsimport.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-cvsserver.1.gz
@@ -366,6 +374,7 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-mv.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-name-rev.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-notes.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/git-p4.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-objects.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-redundant.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git-pack-refs.1.gz
@@ -432,8 +441,10 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/git-write-tree.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/git.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/gitk.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/gitweb.1.gz
 drwxr-xr-x	root/root	usr/share/man/man3/
 -r--r--r--	root/root	usr/share/man/man3/Git.3.gz
+-r--r--r--	root/root	usr/share/man/man3/Git::I18N.3.gz
 -r--r--r--	root/root	usr/share/man/man3/private-Error.3.gz
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/gitattributes.5.gz
@@ -441,9 +452,11 @@ drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/gitignore.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/gitmodules.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/gitrepository-layout.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/gitweb.conf.5.gz
 drwxr-xr-x	root/root	usr/share/man/man7/
 -rw-r--r--	root/root	usr/share/man/man7/gitcli.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitcore-tutorial.7.gz
+-rw-r--r--	root/root	usr/share/man/man7/gitcredentials.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitcvs-migration.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitdiffcore.7.gz
 -rw-r--r--	root/root	usr/share/man/man7/gitglossary.7.gz
@@ -457,3 +470,5 @@ drwxr-xr-x	root/root	usr/share/perl5/base/
 drwxr-xr-x	root/root	usr/share/perl5/site/
 -r--r--r--	root/root	usr/share/perl5/site/Error.pm
 -r--r--r--	root/root	usr/share/perl5/site/Git.pm
+drwxr-xr-x	root/root	usr/share/perl5/site/Git/
+-r--r--r--	root/root	usr/share/perl5/site/Git/I18N.pm
diff --git a/git/.md5sum.i686 b/git/.md5sum.i686
index 7d9ce28b5..b36d86a93 100644
--- a/git/.md5sum.i686
+++ b/git/.md5sum.i686
@@ -1,2 +1,2 @@
-7cfb3e7ea585037272a7ad8e35f4ac0a  git-1.7.7.1.tar.gz
-b6ec6c3a08855b7393284675643be95c  git-manpages-1.7.7.1.tar.gz
+f2f0fc821ab074862c4a96de3f4cefbe  git-1.7.9.2.tar.gz
+5cbad0fe26ca4d15007c7b3a8bc2fa1b  git-manpages-1.7.9.2.tar.gz
diff --git a/git/.md5sum.x86_64 b/git/.md5sum.x86_64
index 7d9ce28b5..b36d86a93 100644
--- a/git/.md5sum.x86_64
+++ b/git/.md5sum.x86_64
@@ -1,2 +1,2 @@
-7cfb3e7ea585037272a7ad8e35f4ac0a  git-1.7.7.1.tar.gz
-b6ec6c3a08855b7393284675643be95c  git-manpages-1.7.7.1.tar.gz
+f2f0fc821ab074862c4a96de3f4cefbe  git-1.7.9.2.tar.gz
+5cbad0fe26ca4d15007c7b3a8bc2fa1b  git-manpages-1.7.9.2.tar.gz
diff --git a/git/Pkgfile b/git/Pkgfile
index ed57dfe82..15b1eaa26 100644
--- a/git/Pkgfile
+++ b/git/Pkgfile
@@ -6,21 +6,20 @@
 # Run on: curl,libidn,expat
 
 name=git
-version=1.7.7.1
+version=1.7.9.2
 release=1
 source=(http://git-core.googlecode.com/files/$name-{,manpages-}$version.tar.gz)
 
 build() {
-	export PYTHON_PATH='/usr/bin/python2'
 	cd $name-$version
-
-	sed -i -e '23,24d' -e '26d' perl/Makefile.PL
-
-	make CFLAGS="$CFLAGS" prefix=/usr gitexecdir=/usr/lib/git-core \
-	     DESTDIR=$PKG install
+	./configure --prefix=/usr \
+		--libexecdir=/usr/lib \
+		--with-gitconfig=/etc/gitconfig \
+		--with-python=/usr/bin/python2
+	make
+	make DESTDIR=$PKG install
 
 	cd $SRC
-
 	for i in man*; do
 		install -d $PKG/usr/share/man/$i
 		install -m 644 $i/* $PKG/usr/share/man/$i;