diff options
Diffstat (limited to 'devel/git')
| -rw-r--r-- | devel/git/Makefile | 9 | ||||
| -rw-r--r-- | devel/git/distinfo | 14 | ||||
| -rw-r--r-- | devel/git/files/patch-configure.ac | 86 | ||||
| -rw-r--r-- | devel/git/pkg-plist | 8 |
4 files changed, 89 insertions, 28 deletions
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 |