From nobody Thu Feb 29 08:25:06 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tlkmf5jH4z5CScX; Thu, 29 Feb 2024 08:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tlkmf4HRbz4nY2; Thu, 29 Feb 2024 08:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709195106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4rU5qy4UbjtkP3NCwdsIAQqtb4UzVIEGt4ePqBMmXl0=; b=WfUIWuVn8J8FvbERCG0Gwcd9Z80IfmgproMXyXq9sFwbGYvMcZsLnEdsHED2gEgBJ31xi7 mc8YSnUfvlwrFpVunqbvcSZNXSyEopz9x+AolY0EECUmspc917dNSNDfDnby6I2JKlapOR zQf72AFc9Pvad0ddlNKBIsp3pyBo0rP6AE1DbPr/DKFXod0ROd0CNkkDPMSozcOKZQWuDV Opjbq0LqLjlz0FGCPJ1tgfTEJ0sc7SwZ4IPlOVE3z1aGKFc5EpWZkgC6rmJa/HFqpeL71K GyCN0vjUUKTXNH+ZaDDMLXFDuEOcx3KnXuH6jbd1U1ClQktkRv1a/yrEzC7YnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709195106; a=rsa-sha256; cv=none; b=Pysc2l5yWaeVCN9z1FDJ3lZ5ZHJOjXW71ZSbj4xBzymCHXy+HL+rWodfXXTBnUsJQ7ZmoA O+SERAOXrBER5BlSIi3GyPpJVCsA9Q9LjE0WuKIcoePaz142BHuKHSY4VR01SX/AKhYYbs 11tCXQYeIoUnd+IDKwt+AokDsYwovMi2Jb2QKRAnOQOY8fChgDf3id6wTVzjoPisbVbup3 8jTJsN1KiE7jaWYyBdgdrDzmD4HSs9XlnCmfc98nI2liOgS33OIFrFjtufIlFqIbcUlDUL yFKxHEo27xgn8vrfF5MGsTG5EZf7qixgU8CU/4XZO0UJ1qxNs+WM+sdtgSxMOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709195106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4rU5qy4UbjtkP3NCwdsIAQqtb4UzVIEGt4ePqBMmXl0=; b=N0AmcbLLS4ePgCA97nKZqqh9nV3bds0dYSKnrUlLLRj/U4zfDmVW4aXMUbOU9DlKqnGkdq 6Zhum/D0RGbRJrQGSgtbD4zorvBataCcxejMUladtr2TWPqIynZuULeGyAk56057ifqk/4 XexJM70ykH2D6CCW3//oxt251K6GIyP8zevQomm0B049DF4gYV2qp38b8MVOCSFqO2B0Vb fEq16pMETKXYFKec6Wei8ZPiAtEQu5kNyQoagOQjE7adI9Uak17lUXuvMc7v4Cd5RF80b3 ++NkFwKOVimxhBsAs8Fqb29hx4f9ExGB8XBdNiJn1iyOP0VlCMZATUA1QBjy6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tlkmf3mSkzZ84; Thu, 29 Feb 2024 08:25:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41T8P6tC010475; Thu, 29 Feb 2024 08:25:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41T8P63N010472; Thu, 29 Feb 2024 08:25:06 GMT (envelope-from git) Date: Thu, 29 Feb 2024 08:25:06 GMT Message-Id: <202402290825.41T8P63N010472@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: a99af2ec54e0 - main - devel/git: Update to 2.44.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a99af2ec54e00a1ea2f5f7fb698c025882a195c6 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a99af2ec54e00a1ea2f5f7fb698c025882a195c6 commit a99af2ec54e00a1ea2f5f7fb698c025882a195c6 Author: Yasuhiro Kimura AuthorDate: 2024-02-26 10:19:10 +0000 Commit: Yasuhiro Kimura CommitDate: 2024-02-29 08:24:08 +0000 devel/git: Update to 2.44.0 ReleaseNotes: https://raw.githubusercontent.com/git/git/v2.44.0/Documentation/RelNotes/2.44.0.txt PR: 277327 Approved by: maintainer --- devel/git/Makefile | 2 +- devel/git/distinfo | 14 +++++++------- devel/git/files/patch-Makefile | 12 ++++++------ devel/git/pkg-plist | 4 ++++ 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/devel/git/Makefile b/devel/git/Makefile index 44a5a4d2e893..326b4ae0f033 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,5 @@ PORTNAME= git -DISTVERSION= 2.43.2 +DISTVERSION= 2.44.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ diff --git a/devel/git/distinfo b/devel/git/distinfo index e31a9edce1d5..ebb1516be025 100644 --- a/devel/git/distinfo +++ b/devel/git/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1707931702 -SHA256 (git-2.43.2.tar.xz) = f612c1abc63557d50ad3849863fc9109670139fc9901e574460ec76e0511adb9 -SIZE (git-2.43.2.tar.xz) = 7388636 -SHA256 (git-manpages-2.43.2.tar.xz) = 3739b021aa186a59de42153b70306684e7da85715d37a1b3bfe614c3dda0cab1 -SIZE (git-manpages-2.43.2.tar.xz) = 570496 -SHA256 (git-htmldocs-2.43.2.tar.xz) = 9b3265e3a825f6eaac3ef29b2ae82aeffd71f30e039f2e173f9df95e15d6ebf7 -SIZE (git-htmldocs-2.43.2.tar.xz) = 1545440 +TIMESTAMP = 1708942187 +SHA256 (git-2.44.0.tar.xz) = e358738dcb5b5ea340ce900a0015c03ae86e804e7ff64e47aa4631ddee681de3 +SIZE (git-2.44.0.tar.xz) = 7429952 +SHA256 (git-manpages-2.44.0.tar.xz) = 777be83bd54e301988fc49708cae3b5ce4b0971c2ca3b7a720be58e2f4633fcb +SIZE (git-manpages-2.44.0.tar.xz) = 573444 +SHA256 (git-htmldocs-2.44.0.tar.xz) = 808f1221940de2a32d7b4a3f675f968a7d0a75058a12a791afcda58b01a6e820 +SIZE (git-htmldocs-2.44.0.tar.xz) = 1557284 diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile index 15107caa5c09..559f041a40a7 100644 --- a/devel/git/files/patch-Makefile +++ b/devel/git/files/patch-Makefile @@ -1,4 +1,4 @@ ---- Makefile.orig 2023-11-20 02:07:41 UTC +--- Makefile.orig 2024-02-23 00:37:50 UTC +++ Makefile @@ -606,16 +606,16 @@ mandir = $(prefix)/share/man prefix = $(HOME) @@ -32,20 +32,20 @@ XGETTEXT = xgettext MSGCAT = msgcat MSGFMT = msgfmt -@@ -1650,9 +1650,9 @@ ifndef NO_OPENSSL +@@ -1665,9 +1665,9 @@ ifndef NO_OPENSSL ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl - ifdef OPENSSLDIR - BASIC_CFLAGS += -I$(OPENSSLDIR)/include -- OPENSSL_LINK = -L$(OPENSSLDIR)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLDIR)/$(lib) +- OPENSSL_LINK = $(call libpath_template,$(OPENSSLDIR)/$(lib)) + ifdef OPENSSLBASE + BASIC_CFLAGS += -I$(OPENSSLBASE)/include + OPENSSL_LINK = -L$(OPENSSLBASE)/$(lib) $(CC_LD_DYNPATH)$(OPENSSLBASE)/$(lib) else OPENSSL_LINK = endif -@@ -2559,7 +2559,7 @@ else # NO_PERL +@@ -2574,7 +2574,7 @@ else # NO_PERL chmod +x $@+ && \ mv $@+ $@ else # NO_PERL @@ -54,7 +54,7 @@ $(QUIET_GEN) \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \ -@@ -2575,7 +2575,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py +@@ -2590,7 +2590,7 @@ $(SCRIPT_PYTHON_GEN): % : %.py $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS $(SCRIPT_PYTHON_GEN): % : %.py $(QUIET_GEN) \ @@ -63,7 +63,7 @@ $< >$@+ && \ chmod +x $@+ && \ mv $@+ $@ -@@ -3451,7 +3451,7 @@ install: all +@@ -3467,7 +3467,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)' diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 99892a8b1157..d9789ec60170 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -143,6 +143,7 @@ libexec/git-core/git-remote-fd %%CURL%%libexec/git-core/git-remote-https libexec/git-core/git-repack libexec/git-core/git-replace +libexec/git-core/git-replay libexec/git-core/git-request-pull libexec/git-core/git-rerere libexec/git-core/git-reset @@ -320,6 +321,7 @@ share/man/man1/git-remote-fd.1.gz share/man/man1/git-remote.1.gz share/man/man1/git-repack.1.gz share/man/man1/git-replace.1.gz +share/man/man1/git-replay.1.gz share/man/man1/git-request-pull.1.gz share/man/man1/git-rerere.1.gz share/man/man1/git-reset.1.gz @@ -828,6 +830,8 @@ share/man/man7/gitworkflows.7.gz %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.2.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.43.3.txt +%%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.44.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.0.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.1.txt %%HTMLDOCS%%%%DOCSDIR%%/RelNotes/2.2.2.txt