Index: devel/git/Makefile
===================================================================
--- devel/git/Makefile
+++ devel/git/Makefile
@@ -1,8 +1,7 @@
 # Created by: Eric Anholt
 
 PORTNAME=	git
-DISTVERSION=	2.32.0
-PORTREVISION=	1
+DISTVERSION=	2.33.0
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -57,9 +56,6 @@
 		git-p4.py \
 		contrib/hg-to-git/hg-to-git.py \
 		contrib/hooks/update-paranoid \
-		contrib/hooks/multimail/post-receive.example \
-		contrib/hooks/multimail/git_multimail.py \
-		contrib/hooks/multimail/migrate-mailhook-config \
 		contrib/fast-import/import-zips.py \
 		contrib/remote-helpers/git-remote-bzr \
 		contrib/remote-helpers/git-remote-hg \
Index: devel/git/distinfo
===================================================================
--- devel/git/distinfo
+++ devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1624378171
-SHA256 (git-2.32.0.tar.xz) = 68a841da3c4389847ecd3301c25eb7e4a51d07edf5f0168615ad6179e3a83623
-SIZE (git-2.32.0.tar.xz) = 6551348
-SHA256 (git-manpages-2.32.0.tar.xz) = 19e3cb0425c94d4ad82984f41522e77c8e35093e15a891f8e7195617201f6ac1
-SIZE (git-manpages-2.32.0.tar.xz) = 491868
-SHA256 (git-htmldocs-2.32.0.tar.xz) = 821bd3b5dfd31040bf9ed38ef02df3dcf063546127f07d59ec9669274e8b8818
-SIZE (git-htmldocs-2.32.0.tar.xz) = 1381664
+TIMESTAMP = 1629152705
+SHA256 (git-2.33.0.tar.xz) = bf3c6ab5f82e072aad4768f647cfb1ef60aece39855f83f080f9c0222dd20c4f
+SIZE (git-2.33.0.tar.xz) = 6548308
+SHA256 (git-manpages-2.33.0.tar.xz) = d6d38abe3fe45b74359e65d53e51db3aa92d7f551240b7f7a779746f24c4bc31
+SIZE (git-manpages-2.33.0.tar.xz) = 492900
+SHA256 (git-htmldocs-2.33.0.tar.xz) = 309c5d3cdd9a115f693c0e035298cc867a3b8ba8ce235fa1ac950a48cb4b0447
+SIZE (git-htmldocs-2.33.0.tar.xz) = 1393260
Index: devel/git/files/patch-Makefile
===================================================================
--- devel/git/files/patch-Makefile
+++ devel/git/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2019-02-24 16:31:46 UTC
+--- Makefile.orig	2021-08-11 20:06:58 UTC
 +++ Makefile
-@@ -535,16 +535,16 @@ ARFLAGS = rcs
+@@ -524,16 +524,16 @@ GIT-VERSION-FILE: FORCE
  
  prefix = $(HOME)
  bindir = $(prefix)/bin
@@ -22,7 +22,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -1383,9 +1383,9 @@ EXTLIBS += -lz
+@@ -1477,9 +1477,9 @@ EXTLIBS += -lz
  
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@ -35,19 +35,19 @@
  	else
  		OPENSSL_LINK =
  	endif
-@@ -2234,7 +2234,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
+@@ -2376,7 +2376,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
 -$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
 +$(SCRIPT_PERL_GEN) git-instaweb git-request-pull: % : unimplemented.sh
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	$(QUIET_GEN) \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
-@@ -2250,7 +2250,7 @@ ifndef NO_PYTHON
+@@ -2392,7 +2392,7 @@ ifndef NO_PYTHON
  $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
  $(SCRIPT_PYTHON_GEN): % : %.py
- 	$(QUIET_GEN)$(RM) $@ $@+ && \
+ 	$(QUIET_GEN) \
 -	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
 +	sed -e '1s|#!.*python.*|#!$(PYTHON_PATH_SQ)|' \
  	    $< >$@+ && \
Index: devel/git/pkg-plist
===================================================================
--- devel/git/pkg-plist
+++ devel/git/pkg-plist
@@ -1277,18 +1277,7 @@
 %%CONTRIB%%share/git-core/contrib/git-shell-commands/list
 %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.py
 %%CONTRIB%%share/git-core/contrib/hg-to-git/hg-to-git.txt
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/CHANGES
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/CONTRIBUTING.rst
 %%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.migrate-from-post-receive-email
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.rst
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/customizing-emails.rst
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gerrit.rst
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/gitolite.rst
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/doc/troubleshooting.rst
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/git_multimail.py
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/migrate-mailhook-config
-%%CONTRIB%%share/git-core/contrib/hooks/multimail/post-receive.example
 %%CONTRIB%%share/git-core/contrib/hooks/post-receive-email
 %%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery
 %%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl