git: Rebuild against perl-5.20. Move perl modules to dependencies.

git/PKGBUILD

@@ -2,20 +2,31 @@
 
 pkgname=git
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The fast distributed version control system"
 arch=('i686' 'x86_64')
 url="http://git-scm.com/"
 license=('GPL2')
 groups=('VCS')
-depends=('curl' 'expat>=2.0' 'perl-Error' 'perl>=5.14.0' 'openssl' 'libpcre' 'vim')
+depends=('curl'
+         'expat>=2.0'
+         'perl-Error'
+         'perl>=5.14.0'
+         'openssl'
+         'libpcre'
+         'vim'
+         'perl-Authen-SASL'
+         'perl-libwww'
+         'perl-MIME-tools'
+         'perl-Net-SMTP-SSL'
+         'perl-TermReadKey')
 makedepends=('libcurl-devel' 'python2' 'less' 'openssh' 'rsync')
 optdepends=(#'tk: gitk and git gui'
-            'perl-libwww: git svn'
-            'perl-TermReadkey: git svn'
-            'perl-MIME-tools: git send-email'
-            'perl-Net-SMTP-SSL: git send-email TLS support'
-            'perl-Authen-SASL: git send-email TLS support'
+            #'perl-libwww: git svn'
+            #'perl-TermReadKey: git svn'
+            #'perl-MIME-tools: git send-email'
+            #'perl-Net-SMTP-SSL: git send-email TLS support'
+            #'perl-Authen-SASL: git send-email TLS support'
             'python2: various helper scripts'
             'subversion: git svn')
             #'cvsps: git cvsimport'
@@ -57,6 +68,7 @@ build() {
     --mandir=/usr/share/man
 
   make INSTALLDIRS=vendor all
+  make -C contrib/subtree prefix=/usr all
 }
 
 check() {
@@ -87,7 +99,10 @@ package() {
   # fancy git prompt
   mkdir -p "$pkgdir"/usr/share/git/
   install -m644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
-
+  # subtree installation
+  sed "s|libexec/git-core|lib/git-core|" -i contrib/subtree/Makefile
+  make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir" install
+  
   # the rest of the contrib stuff
   cp -a ./contrib/* $pkgdir/usr/share/git/