1 files changed, 24 insertions, 9 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index afeb5c1ac1..a541e2a536 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=git
 pkgver=2.13.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A distributed version control system"
 url="https://www.git-scm.com/"
 arch="all"
@@ -15,12 +15,13 @@ subpackages="$pkgname-doc
 	$pkgname-bash-completion:completion:noarch
 	perl-$pkgname-svn:_perl_git_svn:noarch
 	perl-$pkgname:_perl_git:noarch
-	$pkgname-svn::noarch
-	$pkgname-email::noarch
+	$pkgname-svn
+	$pkgname-email
+	$pkgname-fast-import:_fast_import
 	$pkgname-cvs::noarch
 	$pkgname-p4::noarch
 	$pkgname-daemon
-	$pkgname-gitweb::noarch
+	$pkgname-gitweb
 	$pkgname-subtree::noarch
 	$pkgname-subtree-doc:subtree_doc:noarch
 	$pkgname-perl:_git_perl:noarch
@@ -94,7 +95,8 @@ email() {
 	pkgdesc="Git tools for sending email"
 	replaces="git"
 	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/*email* "$subpkgdir"/$_gitcoredir
+	mv "$pkgdir"/$_gitcoredir/*email* "$pkgdir"/$_gitcoredir/*imap* \
+		"$subpkgdir"/$_gitcoredir
 }
 
 svn() {
@@ -104,7 +106,9 @@ svn() {
 	replaces=""
 
 	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/git-svn "$subpkgdir"/$_gitcoredir/
+	mv "$pkgdir"/$_gitcoredir/git-svn \
+		"$pkgdir"$_gitcoredir/git-remote-testsvn \
+		"$subpkgdir"/$_gitcoredir/
 }
 
 cvs() {
@@ -117,9 +121,16 @@ cvs() {
 		|| return 1
 }
 
+_fast_import() {
+	pkgdesc="Git backend for fast Git data importers"
+	depends="git=$pkgver-r$pkgrel"
+	mkdir -p "$subpkgdir"/$_gitcoredir
+	mv "$pkgdir"/$_gitcoredir/git-fast-import "$subpkgdir"/$_gitcoredir/
+}
+
 p4() {
 	pkgdesc="Git tools for working with Perforce depots"
-	depends="git=$pkgver-r$pkgrel"
+	depends="git=$pkgver-r$pkgrel git-fast-import=$pkgver-r$pkgrel"
 	replaces="git"
 	mkdir -p "$subpkgdir"/$_gitcoredir/mergetools
 	mv "$pkgdir"/$_gitcoredir/*p4* "$subpkgdir"/$_gitcoredir/ || return 1
@@ -132,7 +143,10 @@ daemon() {
 	depends="git=$pkgver-r$pkgrel"
 	replaces="git"
 	mkdir -p "$subpkgdir"/$_gitcoredir
-	mv "$pkgdir"/$_gitcoredir/git-daemon "$subpkgdir"/$_gitcoredir \
+	mv "$pkgdir"/$_gitcoredir/git-daemon \
+		"$pkgdir"/$_gitcoredir/git-http-backend \
+		"$pkgdir"/$_gitcoredir/git-shell \
+		"$subpkgdir"/$_gitcoredir \
 		|| return 1
 	mv "$pkgdir"/etc "$subpkgdir"/ || return 1
 }
@@ -141,8 +155,9 @@ gitweb() {
 	pkgdesc="Simple web interface to git repositories"
 	depends="git=$pkgver-r$pkgrel perl"
 	replaces="git"
-	mkdir -p "$subpkgdir"/usr/share
+	mkdir -p "$subpkgdir"/usr/share "$subpkgdir"$_gitcoredir
 	mv "$pkgdir"/usr/share/gitweb "$subpkgdir"/usr/share/
+	mv "$pkgdir"/$_gitcoredir/git-instaweb "$subpkgdir"$_gitcoredir
 }
 
 completion() {