summaryrefslogtreecommitdiff
path: root/devel/git
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--devel/git-absorb/Makefile2
-rw-r--r--devel/git-branchless/Makefile2
-rw-r--r--devel/git-bug/Makefile2
-rw-r--r--devel/git-cinnabar/Makefile2
-rw-r--r--devel/git-cliff/Makefile1
-rw-r--r--devel/git-codereview/Makefile3
-rw-r--r--devel/git-codereview/distinfo6
-rw-r--r--devel/git-delta/Makefile2
-rw-r--r--devel/git-extras/Makefile2
-rw-r--r--devel/git-extras/distinfo6
-rw-r--r--devel/git-extras/pkg-plist6
-rw-r--r--devel/git-graph/Makefile2
-rw-r--r--devel/git-lfs/Makefile2
-rw-r--r--devel/git-modes/Makefile7
-rw-r--r--devel/git-modes/distinfo6
-rw-r--r--devel/git-repo-manager/Makefile2
-rw-r--r--devel/git-workspace/Makefile2
-rw-r--r--devel/git/Makefile9
-rw-r--r--devel/git/distinfo14
-rw-r--r--devel/git/files/patch-configure.ac86
-rw-r--r--devel/git/pkg-plist8
-rw-r--r--devel/gitaly/Makefile2
-rw-r--r--devel/gitaly/distinfo14
-rw-r--r--devel/gitaly/files/patch-Makefile67
-rw-r--r--devel/gitea-act_runner/Makefile6
-rw-r--r--devel/gitea-act_runner/distinfo10
-rw-r--r--devel/gitg/Makefile4
-rw-r--r--devel/gitid/Makefile19
-rw-r--r--devel/gitid/distinfo5
-rw-r--r--devel/gitid/pkg-descr4
-rw-r--r--devel/gitlab-runner/Makefile8
-rw-r--r--devel/gitlab-runner/distinfo18
-rw-r--r--devel/gitlab-shell/Makefile4
-rw-r--r--devel/gitlab-shell/distinfo10
-rw-r--r--devel/gitoxide/Makefile2
-rw-r--r--devel/gitty/Makefile2
-rw-r--r--devel/gitu/Makefile2
-rw-r--r--devel/gitui/Makefile2
38 files changed, 254 insertions, 97 deletions
diff --git a/devel/git-absorb/Makefile b/devel/git-absorb/Makefile
index dfe71de642ac..265762e96917 100644
--- a/devel/git-absorb/Makefile
+++ b/devel/git-absorb/Makefile
@@ -1,6 +1,6 @@
PORTNAME= git-absorb
DISTVERSION= 0.8.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= eduardo@FreeBSD.org
diff --git a/devel/git-branchless/Makefile b/devel/git-branchless/Makefile
index 13f41922b2d4..b73ee274f8fa 100644
--- a/devel/git-branchless/Makefile
+++ b/devel/git-branchless/Makefile
@@ -1,7 +1,7 @@
PORTNAME= git-branchless
DISTVERSIONPREFIX= v
DISTVERSION= 0.10.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/git-bug/Makefile b/devel/git-bug/Makefile
index e854034abf79..a2f188f79044 100644
--- a/devel/git-bug/Makefile
+++ b/devel/git-bug/Makefile
@@ -1,7 +1,7 @@
PORTNAME= git-bug
DISTVERSIONPREFIX= v
DISTVERSION= 0.8.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= devel
MAINTAINER= lcook@FreeBSD.org
diff --git a/devel/git-cinnabar/Makefile b/devel/git-cinnabar/Makefile
index 35af41951d40..1995c8ea9ebc 100644
--- a/devel/git-cinnabar/Makefile
+++ b/devel/git-cinnabar/Makefile
@@ -1,6 +1,6 @@
PORTNAME= git-cinnabar
DISTVERSION= 0.7.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MAINTAINER= jbeich@FreeBSD.org
diff --git a/devel/git-cliff/Makefile b/devel/git-cliff/Makefile
index b182edc2c67a..c12b0739cc73 100644
--- a/devel/git-cliff/Makefile
+++ b/devel/git-cliff/Makefile
@@ -1,6 +1,7 @@
PORTNAME= git-cliff
DISTVERSIONPREFIX= v
DISTVERSION= 2.9.1
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/git-codereview/Makefile b/devel/git-codereview/Makefile
index 16f799342746..872e2843c915 100644
--- a/devel/git-codereview/Makefile
+++ b/devel/git-codereview/Makefile
@@ -1,7 +1,6 @@
PORTNAME= git-codereview
DISTVERSIONPREFIX= v
-DISTVERSION= 1.15.0
-PORTREVISION= 2
+DISTVERSION= 1.16.0
CATEGORIES= devel
MAINTAINER= bofh@FreeBSD.org
diff --git a/devel/git-codereview/distinfo b/devel/git-codereview/distinfo
index 1cdc1e7b8180..4aa5500223ae 100644
--- a/devel/git-codereview/distinfo
+++ b/devel/git-codereview/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1746606284
-SHA256 (golang-review-v1.15.0_GH0.tar.gz) = 0a8d3ce0124e5bbf394607723a42942b9af91aaa7c03e0037c26bd462519a3b1
-SIZE (golang-review-v1.15.0_GH0.tar.gz) = 72301
+TIMESTAMP = 1752211093
+SHA256 (golang-review-v1.16.0_GH0.tar.gz) = 7e9d47d8025f1569c0a53c6030602e6eb049818d25c5fd0cad777efd21eeca20
+SIZE (golang-review-v1.16.0_GH0.tar.gz) = 72310
diff --git a/devel/git-delta/Makefile b/devel/git-delta/Makefile
index 3435bd46cacb..3a4ecc02210b 100644
--- a/devel/git-delta/Makefile
+++ b/devel/git-delta/Makefile
@@ -1,6 +1,6 @@
PORTNAME= delta
DISTVERSION= 0.18.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= devel
PKGNAMEPREFIX= git-
diff --git a/devel/git-extras/Makefile b/devel/git-extras/Makefile
index 5cc66c181da7..88ec12baf925 100644
--- a/devel/git-extras/Makefile
+++ b/devel/git-extras/Makefile
@@ -1,5 +1,5 @@
PORTNAME= git-extras
-DISTVERSION= 7.3.0
+DISTVERSION= 7.4.0
CATEGORIES= devel
MAINTAINER= igoro@FreeBSD.org
diff --git a/devel/git-extras/distinfo b/devel/git-extras/distinfo
index 8238d43df067..ffb1a1443cc0 100644
--- a/devel/git-extras/distinfo
+++ b/devel/git-extras/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1729422501
-SHA256 (tj-git-extras-7.3.0_GH0.tar.gz) = 89bae1a05731f4aaafb04066ea0186e181117b74fcfbf89d686cf205459220b7
-SIZE (tj-git-extras-7.3.0_GH0.tar.gz) = 186768
+TIMESTAMP = 1752401958
+SHA256 (tj-git-extras-7.4.0_GH0.tar.gz) = aaab3bab18709ec6825a875961e18a00e0c7d8214c39d6e3a63aeb99fa11c56e
+SIZE (tj-git-extras-7.4.0_GH0.tar.gz) = 197852
diff --git a/devel/git-extras/pkg-plist b/devel/git-extras/pkg-plist
index a03e8a0a5f99..3a25a65a855d 100644
--- a/devel/git-extras/pkg-plist
+++ b/devel/git-extras/pkg-plist
@@ -11,6 +11,7 @@ bin/git-clear
bin/git-clear-soft
bin/git-coauthor
bin/git-commits-since
+bin/git-continue
bin/git-contrib
bin/git-count
bin/git-cp
@@ -72,7 +73,9 @@ bin/git-sync
bin/git-touch
bin/git-undo
bin/git-unlock
+bin/git-unwip
bin/git-utimes
+bin/git-wip
etc/bash_completion.d/git-extras
share/man/man1/git-abort.1.gz
share/man/man1/git-alias.1.gz
@@ -87,6 +90,7 @@ share/man/man1/git-clear-soft.1.gz
share/man/man1/git-clear.1.gz
share/man/man1/git-coauthor.1.gz
share/man/man1/git-commits-since.1.gz
+share/man/man1/git-continue.1.gz
share/man/man1/git-contrib.1.gz
share/man/man1/git-count.1.gz
share/man/man1/git-cp.1.gz
@@ -147,4 +151,6 @@ share/man/man1/git-sync.1.gz
share/man/man1/git-touch.1.gz
share/man/man1/git-undo.1.gz
share/man/man1/git-unlock.1.gz
+share/man/man1/git-unwip.1.gz
share/man/man1/git-utimes.1.gz
+share/man/man1/git-wip.1.gz
diff --git a/devel/git-graph/Makefile b/devel/git-graph/Makefile
index 7f802a025d12..6091cdaa1b4b 100644
--- a/devel/git-graph/Makefile
+++ b/devel/git-graph/Makefile
@@ -1,6 +1,6 @@
PORTNAME= git-graph
DISTVERSION= 0.6.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MAINTAINER= rodrigo@FreeBSD.org
diff --git a/devel/git-lfs/Makefile b/devel/git-lfs/Makefile
index 92617c1d9ad0..2c9c1759d1be 100644
--- a/devel/git-lfs/Makefile
+++ b/devel/git-lfs/Makefile
@@ -1,7 +1,7 @@
PORTNAME= git-lfs
DISTVERSIONPREFIX= v
DISTVERSION= 3.6.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/v${DISTVERSION}/
diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile
index 710d291d5b04..e095ec6aa6ab 100644
--- a/devel/git-modes/Makefile
+++ b/devel/git-modes/Makefile
@@ -1,7 +1,6 @@
PORTNAME= git-modes
DISTVERSIONPREFIX= v
-DISTVERSION= 1.4.4
-PORTREVISION= 1
+DISTVERSION= 1.4.5
PORTEPOCH= 1
CATEGORIES= devel elisp
PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX}
@@ -13,8 +12,8 @@ WWW= https://github.com/magit/git-modes
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR}
-RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.0.0.0:misc/compat.el@${EMACS_FLAVOR} \
+BUILD_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR}
+RUN_DEPENDS= compat.el${EMACS_PKGNAMESUFFIX}>=30.1.0.0:misc/compat.el@${EMACS_FLAVOR} \
git:devel/git
USES= emacs gmake
diff --git a/devel/git-modes/distinfo b/devel/git-modes/distinfo
index 940dd5f92678..579195cf8bfb 100644
--- a/devel/git-modes/distinfo
+++ b/devel/git-modes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1723785603
-SHA256 (magit-git-modes-v1.4.4_GH0.tar.gz) = f88178eafe6b92bb3ed8ff0727ca3f6033d2a561c581df0f141f796739d3de53
-SIZE (magit-git-modes-v1.4.4_GH0.tar.gz) = 18483
+TIMESTAMP = 1751940780
+SHA256 (magit-git-modes-v1.4.5_GH0.tar.gz) = 06f72578f326c96256de59ebc13353d19e3f19f7e74e3763aa716ce667abe4cd
+SIZE (magit-git-modes-v1.4.5_GH0.tar.gz) = 18571
diff --git a/devel/git-repo-manager/Makefile b/devel/git-repo-manager/Makefile
index 318eaa39438a..c307c283b496 100644
--- a/devel/git-repo-manager/Makefile
+++ b/devel/git-repo-manager/Makefile
@@ -1,7 +1,7 @@
PORTNAME= git-repo-manager
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.22
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/git-workspace/Makefile b/devel/git-workspace/Makefile
index e8545fdf09ce..c0089afea218 100644
--- a/devel/git-workspace/Makefile
+++ b/devel/git-workspace/Makefile
@@ -1,7 +1,7 @@
PORTNAME= git-workspace
DISTVERSIONPREFIX= v
DISTVERSION= 1.9.0
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 12b9fc972980..ec480863ce00 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,5 +1,5 @@
PORTNAME= git
-DISTVERSION= 2.50.0
+DISTVERSION= 2.50.1
CATEGORIES= devel
MASTER_SITES= KERNEL_ORG/software/scm/git
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
@@ -71,7 +71,7 @@ CONFIGURE_ARGS= --enable-pthreads=-pthread ac_cv_header_libcharset_h=no
.if ${SUBPORT} == core
OPTIONS_DEFINE= CONTRIB CURL DOCS GITWEB ICONV NLS PCRE2 PERL SEND_EMAIL \
- SUBTREE SYSINFO
+ SUBTREE
OPTIONS_DEFAULT=CONTRIB CURL GITWEB ICONV PCRE2 PERL SEND_EMAIL SUBTREE
. if ${FLAVOR:U} == lite
@@ -93,7 +93,6 @@ GITWEB_DESC= Install gitweb
PCRE2_DESC= Use Perl Compatible Regular Expressions (v2)
SEND_EMAIL_DESC=Enable the git-send-email(1) script
SUBTREE_DESC= Install git-subtree
-SYSINFO_DESC= Use libsysinfo
NLS_USES= gettext
NLS_MAKE_ARGS_OFF= NO_GETTEXT=yes
@@ -127,10 +126,6 @@ DOCS_DISTFILES= ${PORTNAME}-htmldocs-${DISTVERSION}${EXTRACT_SUFX}
SUBTREE_BUILD_DEPENDS= asciidoctor:textproc/rubygem-asciidoctor \
xmlto:textproc/xmlto
-SYSINFO_LIB_DEPENDS= libsysinfo.so:devel/libsysinfo
-SYSINFO_CONFIGURE_ON= --with-libsysinfo
-SYSINFO_LDFLAGS= -lsysinfo
-
.else
NO_ARCH= yes
diff --git a/devel/git/distinfo b/devel/git/distinfo
index e56d8b21a27a..2f31b7cd2f90 100644
--- a/devel/git/distinfo
+++ b/devel/git/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1750423147
-SHA256 (git-2.50.0.tar.xz) = dff3c000e400ace3a63b8a6f8b3b76b88ecfdffd4504a04aba4248372cdec045
-SIZE (git-2.50.0.tar.xz) = 7878256
-SHA256 (git-manpages-2.50.0.tar.xz) = 58e73c5271dc7ac0553648cb58b981690aab6f604eef7da14c579a6bccbe9211
-SIZE (git-manpages-2.50.0.tar.xz) = 598416
-SHA256 (git-htmldocs-2.50.0.tar.xz) = 790ffce64c9f439624c5cdc41249e0e6b86010f35eb74456e814de74a29b4bf3
-SIZE (git-htmldocs-2.50.0.tar.xz) = 1615020
+TIMESTAMP = 1751994170
+SHA256 (git-2.50.1.tar.xz) = 7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4
+SIZE (git-2.50.1.tar.xz) = 7880972
+SHA256 (git-manpages-2.50.1.tar.xz) = 7dd86882bbc22bef8852924de96b9cb378aad8532089e301c82093da3e7c5478
+SIZE (git-manpages-2.50.1.tar.xz) = 598416
+SHA256 (git-htmldocs-2.50.1.tar.xz) = d15ccd1518b822e317d14b63de4444bb288909294f117cbbfa385c60ab739bca
+SIZE (git-htmldocs-2.50.1.tar.xz) = 1615796
diff --git a/devel/git/files/patch-configure.ac b/devel/git/files/patch-configure.ac
index d75441bb721f..35ed793fa5c4 100644
--- a/devel/git/files/patch-configure.ac
+++ b/devel/git/files/patch-configure.ac
@@ -12,20 +12,78 @@
#
# Define PYTHON_PATH to provide path to Python.
GIT_ARG_SET_PATH(python, allow-without)
-@@ -1070,6 +1070,8 @@ GIT_CONF_SUBST([CHARSET_LIB])
- #
- # Define HAVE_SYSINFO=YesPlease if sysinfo is available.
+@@ -1068,32 +1068,6 @@ GIT_CONF_SUBST([CHARSET_LIB])
+ GIT_CONF_SUBST([CHARSET_LIB])
+
#
-+AC_ARG_WITH(libsysinfo,
-+AS_HELP_STRING([--with-libsysinfo],[support libsysinfo (default is NO)]),
- AC_DEFUN([HAVE_SYSINFO_SRC], [
- AC_LANG_PROGRAM([[
- #include <stdint.h>
-@@ -1091,6 +1093,7 @@ AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
- HAVE_SYSINFO=YesPlease],
+-# Define HAVE_SYSINFO=YesPlease if sysinfo is available.
+-#
+-AC_DEFUN([HAVE_SYSINFO_SRC], [
+-AC_LANG_PROGRAM([[
+-#include <stdint.h>
+-#include <sys/sysinfo.h>
+-]], [[
+-struct sysinfo si;
+-uint64_t t = 0;
+-if (!sysinfo(&si)) {
+- t = si.totalram;
+- if (si.mem_unit > 1)
+- t *= (uint64_t)si.mem_unit;
+-}
+-return t;
+-]])])
+-
+-AC_MSG_CHECKING([for sysinfo])
+-AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
+- [AC_MSG_RESULT([yes])
+- HAVE_SYSINFO=YesPlease],
+- [AC_MSG_RESULT([no])
+- HAVE_SYSINFO=])
+-GIT_CONF_SUBST([HAVE_SYSINFO])
+-
+-#
+ # Define HAVE_CLOCK_GETTIME=YesPlease if clock_gettime is available.
+ GIT_CHECK_FUNC(clock_gettime,
+ [HAVE_CLOCK_GETTIME=YesPlease],
+@@ -1220,6 +1194,41 @@ GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
[AC_MSG_RESULT([no])
- HAVE_SYSINFO=])
-+)
- GIT_CONF_SUBST([HAVE_SYSINFO])
+ HAVE_BSD_SYSCTL=])
+ GIT_CONF_SUBST([HAVE_BSD_SYSCTL])
++
++#
++# Define HAVE_SYSINFO=YesPlease if sysinfo is available.
++#
++
++HAVE_SYSINFO=
++# on a *BSD system, sysctl() takes precedence over the
++# sysinfo() compatibility library (if installed).
++
++if test -z "$HAVE_BSD_SYSCTL"; then
++
++ AC_DEFUN([HAVE_SYSINFO_SRC], [
++ AC_LANG_PROGRAM([[
++ #include <stdint.h>
++ #include <sys/sysinfo.h>
++ ]], [[
++ struct sysinfo si;
++ uint64_t t = 0;
++ if (!sysinfo(&si)) {
++ t = si.totalram;
++ if (si.mem_unit > 1)
++ t *= (uint64_t)si.mem_unit;
++ }
++ return t;
++ ]])])
++
++ AC_MSG_CHECKING([for sysinfo])
++ AC_COMPILE_IFELSE([HAVE_SYSINFO_SRC],
++ [AC_MSG_RESULT([yes])
++ HAVE_SYSINFO=YesPlease],
++ [AC_MSG_RESULT([no])
++ HAVE_SYSINFO=])
++ GIT_CONF_SUBST([HAVE_SYSINFO])
++
++fi
- #
+ ## Other checks.
+ # Define NO_SYMLINK_HEAD if you never want .git/HEAD to be a symbolic link.
diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist
index 143acb19e58e..295990bf78d1 100644
--- a/devel/git/pkg-plist
+++ b/devel/git/pkg-plist
@@ -890,25 +890,33 @@ share/man/man7/gitworkflows.7.gz
%%DOCS%%%%DOCSDIR%%/RelNotes/2.43.4.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.43.5.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.43.6.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.43.7.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.44.0.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.44.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.44.2.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.44.3.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.44.4.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.45.0.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.45.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.45.2.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.45.3.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.45.4.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.46.0.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.46.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.46.2.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.46.3.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.46.4.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.47.0.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.47.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.47.2.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.47.3.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.48.0.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.48.1.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.48.2.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.49.0.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.49.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.50.0.adoc
+%%DOCS%%%%DOCSDIR%%/RelNotes/2.50.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.5.0.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.5.1.adoc
%%DOCS%%%%DOCSDIR%%/RelNotes/2.5.2.adoc
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile
index 64bb1010af84..50b44de5e20d 100644
--- a/devel/gitaly/Makefile
+++ b/devel/gitaly/Makefile
@@ -25,9 +25,9 @@ CPE_VENDOR= gitlab
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
+GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT}
GO_MOD_DIST= gitlab
GO_MODULE= gitlab.com/gitlab-org/gitaly/v18
-GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT}
MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}"
# make sure to pass go build options into make process
diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo
index e3ab94cea4a9..326621df2ba3 100644
--- a/devel/gitaly/distinfo
+++ b/devel/gitaly/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1750904315
-SHA256 (go/devel_gitaly/gitaly-v18.1.1/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb
-SIZE (go/devel_gitaly/gitaly-v18.1.1/go.mod) = 13011
-SHA256 (go/devel_gitaly/gitaly-v18.1.1/gitaly-v18.1.1.tar.bz2) = 236e2019a33d359a62317a61a837658a1a8f110a19253e309ee3902793075e06
-SIZE (go/devel_gitaly/gitaly-v18.1.1/gitaly-v18.1.1.tar.bz2) = 4541238
-SHA256 (go/devel_gitaly/gitaly-v18.1.1/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb
-SIZE (go/devel_gitaly/gitaly-v18.1.1/git-v2.49.0.tar.bz2) = 9079092
+TIMESTAMP = 1752679148
+SHA256 (go/devel_gitaly/gitaly-v18.2.0/go.mod) = ec7c02d0d63b1125e6446a6c2ada6fc2efa12d332da58b7c9c9cd56103cc51ed
+SIZE (go/devel_gitaly/gitaly-v18.2.0/go.mod) = 13011
+SHA256 (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 8d1543f363464030eb72c83d6d32f6020e7c912de95fb3a33659995d20598d0f
+SIZE (go/devel_gitaly/gitaly-v18.2.0/gitaly-v18.2.0.tar.bz2) = 4543392
+SHA256 (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4
+SIZE (go/devel_gitaly/gitaly-v18.2.0/git-v2.50.0.tar.bz2) = 9249878
diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile
index 9345aecfdf54..871068592d17 100644
--- a/devel/gitaly/files/patch-Makefile
+++ b/devel/gitaly/files/patch-Makefile
@@ -1,6 +1,69 @@
---- Makefile.orig 2025-05-14 17:37:06 UTC
+--- Makefile.orig 2025-07-16 11:35:37 UTC
+++ Makefile
-@@ -717,12 +717,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi
+@@ -156,7 +156,6 @@ GIT_VERSION ?=
+ # GIT_VERSION_x_xx defines versions for each instance of bundled Git we ship. When a new
+ # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets,
+ # and add new targets under the "# These targets build specific releases of Git." section.
+-GIT_VERSION_2_49 ?= v2.49.0.gl2
+ GIT_VERSION_2_50 ?= v2.50.1.gl1
+ #
+ # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the
+@@ -168,7 +167,7 @@ ifeq (${GIT_VERSION:default=},)
+ ifeq (${GIT_VERSION:default=},)
+ # GIT_VERSION should be overridden to the default version of bundled Git. This is only
+ # necessary until https://gitlab.com/gitlab-org/gitaly/-/issues/6195 is complete.
+- override GIT_VERSION := ${GIT_VERSION_2_49}
++ override GIT_VERSION := ${GIT_VERSION_2_50}
+ # When GIT_VERSION is not explicitly set, we default to bundled Git.
+ export WITH_BUNDLED_GIT = YesPlease
+ else
+@@ -264,8 +263,7 @@ BUILD_GEM_NAME ?= gitaly
+ BUILD_GEM_NAME ?= gitaly
+
+ # Git binaries that are eventually embedded into the Gitaly binary.
+-GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.49, ${GIT_EXECUTABLES})) \
+- $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.50, ${GIT_EXECUTABLES}))
++GIT_PACKED_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/gitaly-, $(addsuffix -v2.50, ${GIT_EXECUTABLES}))
+
+ # All executables provided by Gitaly.
+ GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)))
+@@ -354,15 +352,13 @@ install: build
+
+ .PHONY: build-bundled-git
+ ## Build bundled Git binaries.
+-build-bundled-git: build-bundled-git-v2.49 build-bundled-git-v2.50
+-build-bundled-git-v2.49: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.49,${GIT_EXECUTABLES})
++build-bundled-git: build-bundled-git-v2.50
+ build-bundled-git-v2.50: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.50,${GIT_EXECUTABLES})
+
+ .PHONY: install-bundled-git
+ ## Install bundled Git binaries. The target directory can be modified by
+ ## setting PREFIX and DESTDIR.
+-install-bundled-git: install-bundled-git-v2.49 install-bundled-git-v2.50
+-install-bundled-git-v2.49: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.49,${GIT_EXECUTABLES})
++install-bundled-git: install-bundled-git-v2.50
+ install-bundled-git-v2.50: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.50,${GIT_EXECUTABLES})
+
+ ifdef WITH_BUNDLED_GIT
+@@ -684,17 +680,12 @@ ${DEPENDENCY_DIR}/git-distribution/build/git: ${DEPEND
+ ${Q}touch $@
+
+ # These targets build specific releases of Git.
+-${BUILD_DIR}/bin/gitaly-%-v2.49: override GIT_VERSION = ${GIT_VERSION_2_49}
+ ${BUILD_DIR}/bin/gitaly-%-v2.50: override GIT_VERSION = ${GIT_VERSION_2_50}
+
+ ifdef USE_MESON
+-${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/build/% | ${BUILD_DIR}/bin
+- ${Q}install $< $@
+ ${BUILD_DIR}/bin/gitaly-%-v2.50: ${DEPENDENCY_DIR}/git-v2.50/build/% | ${BUILD_DIR}/bin
+ ${Q}install $< $@
+ else
+-${BUILD_DIR}/bin/gitaly-%-v2.49: ${DEPENDENCY_DIR}/git-v2.49/% | ${BUILD_DIR}/bin
+- ${Q}install $< $@
+ ${BUILD_DIR}/bin/gitaly-%-v2.50: ${DEPENDENCY_DIR}/git-v2.50/% | ${BUILD_DIR}/bin
+ ${Q}install $< $@
+ endif
+@@ -731,12 +722,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi
# otherwise try to rebuild all targets depending on it whenever we build
# something else. We thus depend on the Makefile instead.
${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version
diff --git a/devel/gitea-act_runner/Makefile b/devel/gitea-act_runner/Makefile
index 1c2ef28342b2..762b74b2a238 100644
--- a/devel/gitea-act_runner/Makefile
+++ b/devel/gitea-act_runner/Makefile
@@ -1,7 +1,7 @@
PORTNAME= act_runner
DISTVERSIONPREFIX= v
-DISTVERSION= 0.2.11
-PORTREVISION= 7
+DISTVERSION= 0.2.12
+PORTREVISION= 1
CATEGORIES= devel
PKGNAMEPREFIX= gitea-
@@ -12,7 +12,7 @@ WWW= https://gitea.com/gitea/act_runner
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-USES= go:1.23,modules
+USES= go:modules
USE_RC_SUBR= ${PORTNAME}
GO_MODULE= gitea.com/gitea/act_runner
diff --git a/devel/gitea-act_runner/distinfo b/devel/gitea-act_runner/distinfo
index bc10c77f7e5e..dd85300a99fe 100644
--- a/devel/gitea-act_runner/distinfo
+++ b/devel/gitea-act_runner/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1727272002
-SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.11/v0.2.11.mod) = eb8b4a8da390a61f50140492d3984c1e54a7ab37b479558bb2593649dee0a90c
-SIZE (go/devel_gitea-act_runner/act_runner-v0.2.11/v0.2.11.mod) = 4570
-SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.11/v0.2.11.zip) = 931e2eb3a038eccd3d8098dc0995cf48da0cae18c5f67be5a85f60459d228e07
-SIZE (go/devel_gitea-act_runner/act_runner-v0.2.11/v0.2.11.zip) = 76193
+TIMESTAMP = 1751283659
+SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.mod) = af3158a6edb346e51556484bda235442ec48a5b0d0fcb81525b4f6c1c6fc2c93
+SIZE (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.mod) = 4647
+SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.zip) = a200dba3166fcd0e85fcd2303d26eb95ff55c488e0784ebd3304edb5b31ef8be
+SIZE (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.zip) = 77813
diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index c6ad411ddf99..674aba4c067d 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitg
PORTVERSION= 41
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
@@ -8,7 +8,7 @@ DIST_SUBDIR= gnome
PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/
PATCHFILES+= 1978973b1284.patch:-p1 # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/175
-MAINTAINER= kwm@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= GTK-based git repository viewer
WWW= https://wiki.gnome.org/Apps/Gitg
diff --git a/devel/gitid/Makefile b/devel/gitid/Makefile
new file mode 100644
index 000000000000..596c9c7bc173
--- /dev/null
+++ b/devel/gitid/Makefile
@@ -0,0 +1,19 @@
+PORTNAME= gitid
+DISTVERSIONPREFIX= v
+DISTVERSION= 1.1.0
+CATEGORIES= devel
+
+MAINTAINER= olgeni@FreeBSD.org
+COMMENT= Terminal-based tool to manage multiple Git identities
+WWW= https://github.com/nathabonfim59/gitid
+
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
+USES= go:modules
+
+GO_MODULE= github.com/nathabonfim59/gitid
+
+PLIST_FILES= bin/gitid
+
+.include <bsd.port.mk>
diff --git a/devel/gitid/distinfo b/devel/gitid/distinfo
new file mode 100644
index 000000000000..dab03efed2eb
--- /dev/null
+++ b/devel/gitid/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1752089277
+SHA256 (go/devel_gitid/gitid-v1.1.0/v1.1.0.mod) = d9b5b7ffc4dd8b9fcf7bd6a627ca0827c51a3fed351fc2bd3a4f3b6cc8d43a72
+SIZE (go/devel_gitid/gitid-v1.1.0/v1.1.0.mod) = 1022
+SHA256 (go/devel_gitid/gitid-v1.1.0/v1.1.0.zip) = a3bc18b2919c1536f3511e5a23e4f9ffe45fd7daa7dc9771934d0b1ebcba824c
+SIZE (go/devel_gitid/gitid-v1.1.0/v1.1.0.zip) = 10229
diff --git a/devel/gitid/pkg-descr b/devel/gitid/pkg-descr
new file mode 100644
index 000000000000..9e3f470f2b04
--- /dev/null
+++ b/devel/gitid/pkg-descr
@@ -0,0 +1,4 @@
+gitid is a terminal-based tool that helps developers manage multiple Git
+identities easily through an interactive interface. It allows you to switch
+between different Git configurations, add new identities, and delete unwanted
+ones, all from the command line using an intuitive keyboard-driven interface.
diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index b92498bed380..54adeb7579fa 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitlab-runner
DISTVERSIONPREFIX= v
-DISTVERSION= 18.1.0
+DISTVERSION= 18.2.0
CATEGORIES= devel
MASTER_SITES= https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
@@ -24,14 +24,14 @@ RUN_DEPENDS= bash:shells/bash \
ca_root_nss>=0:security/ca_root_nss \
git:devel/git
-USES= go:modules,1.23
+USES= go:modules,1.24
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
USE_RC_SUBR= gitlab_runner
# this branch removes the replace line in go.mod which breaks the way FreeBSD ports build go packages
-GO_MOD_DIST= https://gitlab.com/mfechner/gitlab-runner/-/raw/18-1-stable/
+GO_MOD_DIST= https://gitlab.com/mfechner/gitlab-runner/-/raw/18-2-stable/
-GITBRANCH= 18-1-stable
+GITBRANCH= 18-2-stable
GO_MODULE= gitlab.com/gitlab-org/gitlab-runner
_BUILD_DATE= $$(date -u +%Y-%m-%dT%H:%M:%S%z)
diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo
index 51425e3c6a0a..ed6591967591 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1750392269
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.1.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.1.0/prebuilt-x86_64.tar.xz) = 9594352
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.1.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.1.0/prebuilt-arm.tar.xz) = 9020896
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.1.0/go.mod) = ca085a6ecf35bd2c61bfd98bd4b43253b62a548290eee13c1ec354db6769c480
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.1.0/go.mod) = 13355
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.1.0/gitlab-runner-v18.1.0.tar.bz2) = c1b98d445bdb6168fed50743c39f906826f35cc3046b40fca48f48247142bb60
-SIZE (go/devel_gitlab-runner/gitlab-runner-v18.1.0/gitlab-runner-v18.1.0.tar.bz2) = 1954814
+TIMESTAMP = 1752812439
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.2.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.2.0/prebuilt-x86_64.tar.xz) = 9594352
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.2.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.2.0/prebuilt-arm.tar.xz) = 9020896
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.2.0/go.mod) = 1f65fc841cfae1552c4cfad630b0c1eced034de6f779acc5f20af9afaa001213
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.2.0/go.mod) = 13417
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.2.0/gitlab-runner-v18.2.0.tar.bz2) = bec5ff00af63e70af0000e92522b2ebdd1a21a7bafb3ef4e40ef8d3f0bd617cd
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.2.0/gitlab-runner-v18.2.0.tar.bz2) = 1962594
diff --git a/devel/gitlab-shell/Makefile b/devel/gitlab-shell/Makefile
index 4cc0e2c9205f..9e98e6868819 100644
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@@ -1,5 +1,5 @@
PORTNAME= gitlab-shell
-PORTVERSION= 14.42.0
+PORTVERSION= 14.43.0
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -13,7 +13,7 @@ LICENSE= MIT
# https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/720
#BUILD_DEPENDS= heimdal>=0:security/heimdal
-USES= gmake go:modules,no_targets,1.23 pkgconfig
+USES= gmake go:modules,no_targets,1.24 pkgconfig
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
diff --git a/devel/gitlab-shell/distinfo b/devel/gitlab-shell/distinfo
index c0fb1a1a36c4..c3fc85caa41c 100644
--- a/devel/gitlab-shell/distinfo
+++ b/devel/gitlab-shell/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1747896733
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.42.0/go.mod) = 03a99472d6dba82d6abef4c58ec01a339c8001966d7feebc3a41db804d736c1e
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.42.0/go.mod) = 6034
-SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.42.0/gitlab-shell-v14.42.0.tar.bz2) = a5b932818f580d4876dbf6e9fd4a4955a0b9ba22c620cbb2ee79cee741601086
-SIZE (go/devel_gitlab-shell/gitlab-shell-v14.42.0/gitlab-shell-v14.42.0.tar.bz2) = 173780
+TIMESTAMP = 1752677513
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.43.0/go.mod) = 0ce82c489c0d218be51dd0fc2ee44bca651c0d79e3a99b6aef3918a78bfbad8d
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.43.0/go.mod) = 6034
+SHA256 (go/devel_gitlab-shell/gitlab-shell-v14.43.0/gitlab-shell-v14.43.0.tar.bz2) = 05b56edd8b60f24217c72526a3ab0f0933841077be3a8f96bb77c2c2320c4a63
+SIZE (go/devel_gitlab-shell/gitlab-shell-v14.43.0/gitlab-shell-v14.43.0.tar.bz2) = 174499
diff --git a/devel/gitoxide/Makefile b/devel/gitoxide/Makefile
index 305d7759e2f8..c647eb026270 100644
--- a/devel/gitoxide/Makefile
+++ b/devel/gitoxide/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gitoxide
DISTVERSIONPREFIX= v
DISTVERSION= 0.41.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/gitty/Makefile b/devel/gitty/Makefile
index b0fea0a225fd..525e4c07f3af 100644
--- a/devel/gitty/Makefile
+++ b/devel/gitty/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gitty
DISTVERSIONPREFIX= v
DISTVERSION= 0.7.0
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= devel
MAINTAINER= dch@FreeBSD.org
diff --git a/devel/gitu/Makefile b/devel/gitu/Makefile
index 8219b9aca183..f2b92bf59048 100644
--- a/devel/gitu/Makefile
+++ b/devel/gitu/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gitu
DISTVERSIONPREFIX= v
DISTVERSION= 0.32.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org
diff --git a/devel/gitui/Makefile b/devel/gitui/Makefile
index 50b11ab95323..ec4917bcab5b 100644
--- a/devel/gitui/Makefile
+++ b/devel/gitui/Makefile
@@ -1,7 +1,7 @@
PORTNAME= gitui
DISTVERSIONPREFIX= v
DISTVERSION= 0.27.0 # After update, `make patch` and `make cargo-crates > Makefile.crates` to avoid fetching vendored openssl-src
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MAINTAINER= yuri@FreeBSD.org