diff options
Diffstat (limited to 'devel/git/files')
| -rw-r--r-- | devel/git/files/patch-Documentation__Makefile | 6 | ||||
| -rw-r--r-- | devel/git/files/patch-Makefile | 13 | ||||
| -rw-r--r-- | devel/git/files/patch-configure.ac | 79 |
3 files changed, 87 insertions, 11 deletions
diff --git a/devel/git/files/patch-Documentation__Makefile b/devel/git/files/patch-Documentation__Makefile index 5e4767180bdf..73a1d7208558 100644 --- a/devel/git/files/patch-Documentation__Makefile +++ b/devel/git/files/patch-Documentation__Makefile @@ -1,6 +1,6 @@ ---- Documentation/Makefile.orig 2025-03-14 16:40:00 UTC +--- Documentation/Makefile.orig 2025-06-16 05:42:57 UTC +++ Documentation/Makefile -@@ -143,11 +143,11 @@ DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER +@@ -144,11 +144,11 @@ DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER DOC_MAN5 = $(patsubst %.adoc,%.5,$(filter $(MAN_FILTER),$(MAN5_TXT))) DOC_MAN7 = $(patsubst %.adoc,%.7,$(filter $(MAN_FILTER),$(MAN7_TXT))) @@ -15,7 +15,7 @@ mandir ?= $(prefix)/share/man man1dir = $(mandir)/man1 man5dir = $(mandir)/man5 -@@ -245,7 +245,7 @@ endif +@@ -246,7 +246,7 @@ endif ASCIIDOC_EXTRA += -a 'git-default-editor=$(DEFAULT_EDITOR_SQ)' endif diff --git a/devel/git/files/patch-Makefile b/devel/git/files/patch-Makefile index 9173829d2894..b26e17562f15 100644 --- a/devel/git/files/patch-Makefile +++ b/devel/git/files/patch-Makefile @@ -1,11 +1,12 @@ ---- Makefile.orig 2025-01-10 17:43:46 UTC +--- Makefile.orig 2025-06-16 05:42:57 UTC +++ Makefile -@@ -613,16 +613,16 @@ mandir = $(prefix)/share/man +@@ -614,17 +614,17 @@ mandir = $(prefix)/share/man prefix = $(HOME) bindir = $(prefix)/bin mandir = $(prefix)/share/man -infodir = $(prefix)/share/info +infodir = $(prefix)/info + bash_completion_dir = $(prefix)/share/bash-completion/completions gitexecdir = libexec/git-core mergetoolsdir = $(gitexecdir)/mergetools sharedir = $(prefix)/share @@ -21,7 +22,7 @@ ETC_GITCONFIG = $(sysconfdir)/gitconfig ETC_GITATTRIBUTES = $(sysconfdir)/gitattributes lib = lib -@@ -647,8 +647,8 @@ INSTALL = install +@@ -649,8 +649,8 @@ INSTALL = install TAR = tar FIND = find INSTALL = install @@ -32,7 +33,7 @@ XGETTEXT = xgettext MSGCAT = msgcat MSGFMT = msgfmt -@@ -1696,9 +1696,9 @@ ifndef NO_OPENSSL +@@ -1723,9 +1723,9 @@ ifndef NO_OPENSSL ifndef NO_OPENSSL OPENSSL_LIBSSL = -lssl @@ -45,7 +46,7 @@ else OPENSSL_LINK = endif -@@ -2627,7 +2627,7 @@ else # NO_PERL +@@ -2672,7 +2672,7 @@ else # NO_PERL chmod +x $@+ && \ mv $@+ $@ else # NO_PERL @@ -54,7 +55,7 @@ $(QUIET_GEN) \ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@REASON@|NO_PERL=$(NO_PERL)|g' \ -@@ -3489,7 +3489,7 @@ install: all +@@ -3540,7 +3540,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/files/patch-configure.ac b/devel/git/files/patch-configure.ac index 188508a0a19e..35ed793fa5c4 100644 --- a/devel/git/files/patch-configure.ac +++ b/devel/git/files/patch-configure.ac @@ -1,9 +1,9 @@ # Specify 'allow-without' to allow --without-perl to be used # TODO: Upstream ---- configure.ac.orig 2018-04-02 17:44:04 UTC +--- configure.ac.orig 2025-06-16 05:42:57 UTC +++ configure.ac -@@ -414,7 +414,7 @@ GIT_PARSE_WITH_SET_MAKE_VAR(editor, DEFAULT_EDITOR, +@@ -396,7 +396,7 @@ GIT_ARG_SET_PATH(shell) GIT_ARG_SET_PATH(shell) # # Define PERL_PATH to provide path to Perl. @@ -12,3 +12,78 @@ # # Define PYTHON_PATH to provide path to Python. GIT_ARG_SET_PATH(python, allow-without) +@@ -1068,32 +1068,6 @@ GIT_CONF_SUBST([CHARSET_LIB]) + GIT_CONF_SUBST([CHARSET_LIB]) + + # +-# 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_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. |