From 724151d0fafd45d67106b12d3599e7b204a09c1e Mon Sep 17 00:00:00 2001
From: Ting-Wei Lan <lantw44@gmail.com>
Date: Sat, 16 Oct 2021 15:06:11 +0800
Subject: wsbsd, pkgbuild: Adapt to git package split

https://cgit.freebsd.org/ports/commit/?id=ff5ded75bcda28c5
---
 pkgbuild.files/make.conf | 1 -
 pkgbuild.h               | 2 +-
 wsbsd.files/make.conf    | 3 +--
 wsbsd/wsbsd.pkg          | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgbuild.files/make.conf b/pkgbuild.files/make.conf
index fd9ff9d..e582125 100644
--- a/pkgbuild.files/make.conf
+++ b/pkgbuild.files/make.conf
@@ -12,7 +12,6 @@ VALID_CATEGORIES+= local
 DEFAULT_VERSIONS+= pgsql=11 bdb=5
 
 # packages options
-devel_git_SET=     SUBVERSION
 editors_vim_SET=   PERL PYTHON RUBY
 shells_bash_SET=   FDESCFS HELP
 www_lighttpd_SET=  LDAP WEBDAV
diff --git a/pkgbuild.h b/pkgbuild.h
index ee8eea1..d10f3f3 100644
--- a/pkgbuild.h
+++ b/pkgbuild.h
@@ -1,5 +1,5 @@
 // Basic packages
- bash bash-completion bind-tools cmdwatch git groff htop ldapvi
+ bash bash-completion bind-tools cmdwatch git git-svn groff htop ldapvi
  lighttpd lsof ncdu portlint pstree py38-ranger rsync screen
  subversion sudo texinfo tig tree vim@console w3m wget
 
diff --git a/wsbsd.files/make.conf b/wsbsd.files/make.conf
index e8bd892..f7d27b1 100644
--- a/wsbsd.files/make.conf
+++ b/wsbsd.files/make.conf
@@ -75,8 +75,7 @@ devel_cscope_SET=                       XCSCOPE
 devel_efl_SET=                          IBUS OPENJPEG SCIM V4L WEBP
 devel_efl_UNSET=                        DOXYGEN WAYLAND
 devel_gdb_SET=                          GUILE KGDB PYTHON SOURCE_HIGHLIGHT TUI
-devel_git_SET=                          CURL CVS GUI P4 PERL SEND_EMAIL \
-                                        SUBTREE SUBVERSION
+devel_git_SET=                          CURL PERL SEND_EMAIL SUBTREE
 devel_gvfs_SET=                         FUSE GOOGLE SAMBA
 devel_kcachegrind_SET=                  DOT VALGRIND
 devel_subversion_SET=                   BDB SERF
diff --git a/wsbsd/wsbsd.pkg b/wsbsd/wsbsd.pkg
index 8c839ea..b5e04bf 100644
--- a/wsbsd/wsbsd.pkg
+++ b/wsbsd/wsbsd.pkg
@@ -77,7 +77,7 @@
 #define GCC                 gcc6-aux gcc10 gcc11
 #define GDB                 gdb
 #define GOLANG              go
-#define GIT                 git gitg
+#define GIT                 git git-cvs git-gui git-p4 git-svn gitg
 #define INDENT              NULL
 #define MAKE                gmake bmake fmake
 #define MINGW               mingw32-gcc
-- 
cgit