devel/git*: Update manpages path

Move manpages to ${PREFIX}/share/man

Sponsored by:	Rubicon Communications, LLC ("Netgate")

devel/git-cvs/pkg-plist

@@ -2,7 +2,7 @@ bin/git-cvsserver
 libexec/git-core/git-cvsexportcommit
 libexec/git-core/git-cvsimport
 libexec/git-core/git-cvsserver
-man/man1/git-cvsexportcommit.1.gz
-man/man1/git-cvsimport.1.gz
-man/man1/git-cvsserver.1.gz
-man/man7/gitcvs-migration.7.gz
+share/man/man1/git-cvsexportcommit.1.gz
+share/man/man1/git-cvsimport.1.gz
+share/man/man1/git-cvsserver.1.gz
+share/man/man7/gitcvs-migration.7.gz

devel/git-gui/pkg-plist

@@ -2,9 +2,9 @@ bin/gitk
 libexec/git-core/git-citool
 libexec/git-core/git-gui
 libexec/git-core/git-gui--askpass
-man/man1/git-citool.1.gz
-man/man1/git-gui.1.gz
-man/man1/gitk.1.gz
+share/man/man1/git-citool.1.gz
+share/man/man1/git-gui.1.gz
+share/man/man1/gitk.1.gz
 share/git-gui/lib/about.tcl
 share/git-gui/lib/blame.tcl
 share/git-gui/lib/branch.tcl

devel/git-p4/pkg-plist

@@ -1,2 +1,2 @@
 libexec/git-core/git-p4
-man/man1/git-p4.1.gz
+share/man/man1/git-p4.1.gz

devel/git-svn/pkg-plist

@@ -1,2 +1,2 @@
 libexec/git-core/git-svn
-man/man1/git-svn.1.gz
+share/man/man1/git-svn.1.gz

devel/git/Makefile

@@ -1,5 +1,6 @@
 PORTNAME=	git
 DISTVERSION=	2.43.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	KERNEL_ORG/software/scm/git
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
@@ -197,6 +198,8 @@ post-extract-HTMLDOCS-on:
 		${EXTRACT_AFTER_ARGS}
 
 post-patch:
+	@${REINPLACE_CMD} -e '/^mandir/s/\?=/=/' \
+		${WRKSRC}/contrib/subtree/Makefile
 .for FILE in ${RMMAN1}
 	@${RM} ${WRKDIR}/man1/${FILE}
 .endfor
@@ -244,11 +247,11 @@ post-build-CONTRIB-on:
 
 post-install:
 	(cd ${WRKDIR}/man1/ && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man1)
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man1)
 	(cd ${WRKDIR}/man5/ && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man5)
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man5)
 	(cd ${WRKDIR}/man7/ && \
-		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/man/man7)
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man7)
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git
 	${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \
 		${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/
@@ -313,11 +316,11 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/gitk-git/po/*.msg \
 		${STAGEDIR}${PREFIX}/share/gitk/lib/msgs/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-citool.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-gui.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/gitk.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 
 .elif ${SUBPORT} == cvs
 
@@ -331,13 +334,13 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/git-cvsserver \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-cvsimport.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-cvsexportcommit.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-cvsserver.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_DATA} ${WRKDIR}/man7/gitcvs-migration.7 \
-		${STAGEDIR}${PREFIX}/man/man7/
+		${STAGEDIR}${PREFIX}/share/man/man7/
 
 .elif ${SUBPORT} == p4
 
@@ -346,7 +349,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/git-p4.py \
 		${STAGEDIR}${PREFIX}/libexec/git-core/git-p4
 	${INSTALL_DATA} ${WRKDIR}/man1/git-p4.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 
 .elif ${SUBPORT} == svn
 
@@ -355,7 +358,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/git-svn \
 		${STAGEDIR}${PREFIX}/libexec/git-core/
 	${INSTALL_DATA} ${WRKDIR}/man1/git-svn.1 \
-		${STAGEDIR}${PREFIX}/man/man1/
+		${STAGEDIR}${PREFIX}/share/man/man1/
 .endif
 
 .include <bsd.port.mk>

devel/git/files/patch-Makefile

@@ -1,12 +1,10 @@
---- Makefile.orig	2022-10-02 23:02:46 UTC
+--- Makefile.orig	2023-11-20 02:07:41 UTC
 +++ Makefile
-@@ -542,17 +542,17 @@ bindir = $(prefix)/bin
-
+@@ -606,16 +606,16 @@ mandir = $(prefix)/share/man
  prefix = $(HOME)
  bindir = $(prefix)/bin
--mandir = $(prefix)/share/man
+ mandir = $(prefix)/share/man
 -infodir = $(prefix)/share/info
-+mandir = $(prefix)/man
 +infodir = $(prefix)/info
  gitexecdir = libexec/git-core
  mergetoolsdir = $(gitexecdir)/mergetools
@@ -23,7 +21,7 @@
  ETC_GITCONFIG = $(sysconfdir)/gitconfig
  ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes
  lib = lib
-@@ -577,8 +577,8 @@ INSTALL = install
+@@ -640,8 +640,8 @@ INSTALL = install
  TAR = tar
  FIND = find
  INSTALL = install
@@ -34,7 +32,7 @@
  XGETTEXT = xgettext
  MSGCAT = msgcat
  MSGFMT = msgfmt
-@@ -1539,9 +1539,9 @@ ifndef NO_OPENSSL
+@@ -1650,9 +1650,9 @@ ifndef NO_OPENSSL
 
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@ -47,7 +45,7 @@
  	else
  		OPENSSL_LINK =
  	endif
-@@ -2442,7 +2442,7 @@ else # NO_PERL
+@@ -2559,7 +2559,7 @@ else # NO_PERL
  	chmod +x $@+ && \
  	mv $@+ $@
  else # NO_PERL
@@ -56,7 +54,7 @@
  	$(QUIET_GEN) \
  	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
-@@ -2458,7 +2458,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py
+@@ -2575,7 +2575,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py
  $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
  $(SCRIPT_PYTHON_GEN): % : %.py
  	$(QUIET_GEN) \
@@ -65,7 +63,7 @@
  	    $< >$@+ && \
  	chmod +x $@+ && \
  	mv $@+ $@
-@@ -3238,7 +3238,7 @@ install: all
+@@ -3451,7 +3451,7 @@ install: all
  	$(INSTALL) $(SCRIPTS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) -m 644 $(SCRIPT_LIB) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
  	$(INSTALL) $(INSTALL_STRIP) $(install_bindir_xprograms) '$(DESTDIR_SQ)$(bindir_SQ)'