SecBSD/ports
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPDATE: devel/git 2.46.0 -> 2.48.1

Browse source
This commit is contained in:
purplerain 2025-01-28 16:49:10 +00:00
parent 130fdb79de
commit 2b9f697767
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
5 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
devel/git/Makefile
View file

@ -2,7 +2,7 @@ COMMENT-main = distributed version control system
COMMENT-svn = subversion interoperability tools COMMENT-svn = subversion interoperability tools
COMMENT-x11 = graphical tools COMMENT-x11 = graphical tools
V = 2.46.0 V = 2.48.1
DISTNAME = git-${V} DISTNAME = git-${V}
CATEGORIES = devel CATEGORIES = devel
@ -113,6 +113,10 @@ TEST_ENV = GIT_TEST_OPTS=${GIT_TEST_OPTS:Q} \
# one expensive test needs explicit enabling # one expensive test needs explicit enabling
TEST_ENV += GIT_TEST_CLONE_2GB=true TEST_ENV += GIT_TEST_CLONE_2GB=true
# XXX with 2.48.0 'make fake' failed due to missing asiidoc.conf
# add the target generating it for now
ALL_TARGET = all man
post-extract: post-extract:
@mkdir -p ${WRKSRC}/doc @mkdir -p ${WRKSRC}/doc
${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${DOC_DISTFILE} ${TAR} -C ${WRKSRC}/doc -xzf ${FULLDISTDIR}/${DOC_DISTFILE}

8
devel/git/distinfo
View file

@ -1,4 +1,4 @@
SHA256 (git-2.46.0.tar.gz) = sTiBHhaDj2aaJRbkDwnVBQDhx/xUG1q1DOhLmFheUjA= SHA256 (git-2.48.1.tar.gz) = UbTQOx4xG6ZzWRIQ+U8kpMV4FFPh6xiIIuPZzcBMIhI=
SHA256 (git-manpages-2.46.0.tar.gz) = obGFMxHXNMokL8shY81X2Oi0lWPNF809CAz8pS9p3rU= SHA256 (git-manpages-2.48.1.tar.gz) = iHQkZpJtPWgr5SFEcK6St5poeWqdFx05N2Oldn3lpYE=
SIZE (git-2.46.0.tar.gz) = 11242129 SIZE (git-2.48.1.tar.gz) = 11457025
SIZE (git-manpages-2.46.0.tar.gz) = 987724 SIZE (git-manpages-2.48.1.tar.gz) = 998141

2
devel/git/patches/patch-builtin_gc_c
View file

@ -3,7 +3,7 @@ Replace sysctl HW_PHYSMEM/MEMSIZE/whatever madness with sysconf.
Index: builtin/gc.c Index: builtin/gc.c
--- builtin/gc.c.orig --- builtin/gc.c.orig
+++ builtin/gc.c +++ builtin/gc.c
@@ -312,20 +312,13 @@ static uint64_t total_ram(void) @@ -369,20 +369,13 @@ static uint64_t total_ram(void)
if (!sysinfo(&si)) if (!sysinfo(&si))
return si.totalram; return si.totalram;

11
devel/git/patches/patch-config_mak_uname
View file

@ -1,12 +1,17 @@
OpenBSD wants DIR_HAS_BSD_GROUP_SEMANTICS, just like FreeBSD
Index: config.mak.uname Index: config.mak.uname
--- config.mak.uname.orig --- config.mak.uname.orig
+++ config.mak.uname +++ config.mak.uname
@@ -292,7 +292,7 @@ ifeq ($(uname_S),FreeBSD) @@ -293,9 +293,8 @@ ifeq ($(uname_S),FreeBSD)
FREAD_READS_DIRECTORIES = UnfortunatelyYes FREAD_READS_DIRECTORIES = UnfortunatelyYes
FILENO_IS_A_MACRO = UnfortunatelyYes FILENO_IS_A_MACRO = UnfortunatelyYes
endif endif
-ifeq ($(uname_S),OpenBSD) -ifeq ($(uname_S),OpenBSD)
- NO_STRCASESTR = YesPlease
- NO_MEMMEM = YesPlease
+ifeq ($(uname_S),SecBSD) +ifeq ($(uname_S),SecBSD)
NO_STRCASESTR = YesPlease + DIR_HAS_BSD_GROUP_SEMANTICS = YesPlease
NO_MEMMEM = YesPlease
USE_ST_TIMESPEC = YesPlease USE_ST_TIMESPEC = YesPlease
NEEDS_LIBICONV = YesPlease
BASIC_CFLAGS += -I/usr/local/include

4
devel/git/pkg/PLIST-main
View file

@ -213,6 +213,7 @@ libexec/git/mergetools/smerge
libexec/git/mergetools/tkdiff libexec/git/mergetools/tkdiff
libexec/git/mergetools/tortoisemerge libexec/git/mergetools/tortoisemerge
libexec/git/mergetools/vimdiff libexec/git/mergetools/vimdiff
libexec/git/mergetools/vscode
libexec/git/mergetools/winmerge libexec/git/mergetools/winmerge
libexec/git/mergetools/xxdiff libexec/git/mergetools/xxdiff
@bin libexec/git/scalar @bin libexec/git/scalar
@ -412,13 +413,10 @@ libexec/git/mergetools/xxdiff
@man man/man7/gittutorial.7 @man man/man7/gittutorial.7
@man man/man7/gitworkflows.7 @man man/man7/gitworkflows.7
share/doc/pkg-readmes/${PKGSTEM} share/doc/pkg-readmes/${PKGSTEM}
share/emacs/
share/emacs/site-lisp/
share/emacs/site-lisp/git-blame.el share/emacs/site-lisp/git-blame.el
share/emacs/site-lisp/git.el share/emacs/site-lisp/git.el
share/git-core/ share/git-core/
share/git-core/templates/ share/git-core/templates/
share/git-core/templates/branches/
share/git-core/templates/description share/git-core/templates/description
share/git-core/templates/hooks/ share/git-core/templates/hooks/
share/git-core/templates/hooks/applypatch-msg.sample share/git-core/templates/hooks/applypatch-msg.sample