From 85a426ccdf4aa02c77cf09571a4b3d6757223822 Mon Sep 17 00:00:00 2001
From: "Matthew X. Economou" <xenophon@irtnog.org>
Date: Fri, 24 Jul 2015 16:27:52 -0400
Subject: [PATCH 1/3] Add new `salt:python_git` key.

This key defaults to a value of `python-git`.
---
 salt/defaults.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/salt/defaults.yaml b/salt/defaults.yaml
index de663e1..40a8e68 100644
--- a/salt/defaults.yaml
+++ b/salt/defaults.yaml
@@ -18,6 +18,8 @@ salt:
   salt_api: salt-api
   salt_ssh: salt-ssh
 
+  python_git: python-git
+
   master:
     gitfs_provider: gitpython
 

From b47799083031c7268e6b0b60313e47e5ddf8dbbd Mon Sep 17 00:00:00 2001
From: "Matthew X. Economou" <xenophon@irtnog.org>
Date: Fri, 24 Jul 2015 16:30:02 -0400
Subject: [PATCH 2/3] Use the py27-GitPython package when installing GitPython
 on FreeBSD.

---
 salt/map.jinja | 1 +
 1 file changed, 1 insertion(+)

diff --git a/salt/map.jinja b/salt/map.jinja
index 9878a77..9018018 100644
--- a/salt/map.jinja
+++ b/salt/map.jinja
@@ -48,6 +48,7 @@ that differ from whats in defaults.yaml
       'salt_syndic': 'py27-salt',
       'salt_cloud': 'py27-salt',
       'salt_api': 'py27-salt',
+      'python_git': 'py27-GitPython',
       'config_path': '/usr/local/etc/salt',
       'minion_service': 'salt_minion',
       'master_service': 'salt_master',

From ef275bd138aa58e9aa4f7fedc9d842d3c05986eb Mon Sep 17 00:00:00 2001
From: "Matthew X. Economou" <xenophon@irtnog.org>
Date: Fri, 24 Jul 2015 16:31:00 -0400
Subject: [PATCH 3/3] Allow customizing the GitPython package name.

---
 salt/gitfs/gitpython.sls | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/salt/gitfs/gitpython.sls b/salt/gitfs/gitpython.sls
index 7fa09ef..f1a48e6 100644
--- a/salt/gitfs/gitpython.sls
+++ b/salt/gitfs/gitpython.sls
@@ -8,6 +8,7 @@ GitPython:
 {% else %}
 
 python-git:
-  pkg.installed
+  pkg.installed:
+    - name: {{ salt_settings.python_git }}
 
 {% endif %}