diff options
Diffstat (limited to 'devel/git')
| -rw-r--r-- | devel/git/Makefile | 21 | ||||
| -rw-r--r-- | devel/git/distinfo | 14 | ||||
| -rw-r--r-- | devel/git/files/patch-configure.ac | 17 | ||||
| -rw-r--r-- | devel/git/pkg-plist | 60 |
4 files changed, 22 insertions, 90 deletions
diff --git a/devel/git/Makefile b/devel/git/Makefile index 12b9fc972980..be4423fe4fd3 100644 --- a/devel/git/Makefile +++ b/devel/git/Makefile @@ -1,5 +1,5 @@ PORTNAME= git -DISTVERSION= 2.50.0 +DISTVERSION= 2.51.0 CATEGORIES= devel MASTER_SITES= KERNEL_ORG/software/scm/git DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -61,7 +61,6 @@ SHEBANG_FILES= Documentation/*.perl \ contrib/*/*/*.pl \ contrib/contacts/git-contacts \ contrib/fast-import/import-zips.py \ - contrib/hooks/update-paranoid \ git-p4.py \ templates/hooks/fsmonitor-watchman.sample TEST_TARGET= test @@ -71,7 +70,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 +92,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 +125,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 @@ -225,7 +219,7 @@ post-patch: .if ${SUBPORT} == gui @${REINPLACE_CMD} -e "/exec wish/s,wish,${WISH}," \ ${WRKSRC}/gitk-git/gitk \ - ${WRKSRC}/git-gui/git-gui--askpass + ${WRKSRC}/git-gui/git-gui--askpass.sh .endif post-patch-CONTRIB-on: @@ -254,11 +248,6 @@ post-install: ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man5) (cd ${WRKDIR}/man7/ && \ ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man/man7) - ${MKDIR} ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git - ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git.el \ - ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/ - ${INSTALL_DATA} ${WRKSRC}/contrib/emacs/git-blame.el \ - ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/git/ @${MKDIR} ${STAGEDIR}${PREFIX}/etc/bash_completion.d ${INSTALL_SCRIPT} ${WRKSRC}/contrib/completion/git-completion.bash \ ${STAGEDIR}${PREFIX}/etc/bash_completion.d/ @@ -306,8 +295,8 @@ do-install: ${STAGEDIR}${PREFIX}/libexec/git-core/ ${LN} ${STAGEDIR}${PREFIX}/libexec/git-core/git-gui \ ${STAGEDIR}${PREFIX}/libexec/git-core/git-citool - ${INSTALL_SCRIPT} ${WRKSRC}/git-gui/git-gui--askpass \ - ${STAGEDIR}${PREFIX}/libexec/git-core/ + ${INSTALL_SCRIPT} ${WRKSRC}/git-gui/git-gui--askpass.sh \ + ${STAGEDIR}${PREFIX}/libexec/git-core/git-gui--askpass ${INSTALL_DATA} ${WRKSRC}/git-gui/lib/tclIndex \ ${STAGEDIR}${PREFIX}/share/git-gui/lib/ ${INSTALL_DATA} ${WRKSRC}/git-gui/lib/*.ico \ diff --git a/devel/git/distinfo b/devel/git/distinfo index e56d8b21a27a..97d9bc2835ce 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 = 1755609765 +SHA256 (git-2.51.0.tar.xz) = 60a7c2251cc2e588d5cd87bae567260617c6de0c22dca9cdbfc4c7d2b8990b62 +SIZE (git-2.51.0.tar.xz) = 7857228 +SHA256 (git-manpages-2.51.0.tar.xz) = c10aea63316865ace762078a6e67fc3cf117b11a5c9d4a2a52cb3762ae22ed35 +SIZE (git-manpages-2.51.0.tar.xz) = 602200 +SHA256 (git-htmldocs-2.51.0.tar.xz) = dd33897c676ea140d57a652758e458756fa93582801cfd1d7e1f62acd5fa7580 +SIZE (git-htmldocs-2.51.0.tar.xz) = 1627664 diff --git a/devel/git/files/patch-configure.ac b/devel/git/files/patch-configure.ac index d75441bb721f..37c1d7ac2a2a 100644 --- a/devel/git/files/patch-configure.ac +++ b/devel/git/files/patch-configure.ac @@ -12,20 +12,3 @@ # # 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. - # -+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], - [AC_MSG_RESULT([no]) - HAVE_SYSINFO=]) -+) - GIT_CONF_SUBST([HAVE_SYSINFO]) - - # diff --git a/devel/git/pkg-plist b/devel/git/pkg-plist index 143acb19e58e..de0df5fd2882 100644 --- a/devel/git/pkg-plist +++ b/devel/git/pkg-plist @@ -890,25 +890,34 @@ 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.51.0.adoc %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.0.adoc %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.1.adoc %%DOCS%%%%DOCSDIR%%/RelNotes/2.5.2.adoc @@ -965,6 +974,7 @@ share/man/man7/gitworkflows.7.gz %%DOCS%%%%DOCSDIR%%/cmds-userinterfaces.adoc %%DOCS%%%%DOCSDIR%%/config.adoc %%DOCS%%%%DOCSDIR%%/date-formats.adoc +%%DOCS%%%%DOCSDIR%%/diff-context-options.adoc %%DOCS%%%%DOCSDIR%%/diff-format.adoc %%DOCS%%%%DOCSDIR%%/diff-generate-patch.adoc %%DOCS%%%%DOCSDIR%%/diff-options.adoc @@ -1498,8 +1508,6 @@ share/man/man7/gitworkflows.7.gz %%DOCS%%%%DOCSDIR%%/urls.adoc %%DOCS%%%%DOCSDIR%%/user-manual.adoc %%DOCS%%%%DOCSDIR%%/user-manual.html -share/emacs/site-lisp/git/git-blame.el -share/emacs/site-lisp/git/git.el %%GITWEB%%@sample %%ETCDIR%%/gitweb.conf.sample %%GITWEB%%%%EXAMPLESDIR%%/gitweb/gitweb.cgi %%GITWEB%%%%EXAMPLESDIR%%/gitweb/static/git-favicon.png @@ -1570,10 +1578,6 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/diff-highlight/diff-highlight.perl %%CONTRIB%%share/git-core/contrib/diff-highlight/t/Makefile %%CONTRIB%%share/git-core/contrib/diff-highlight/t/t9400-diff-highlight.sh -%%CONTRIB%%share/git-core/contrib/emacs/README -%%CONTRIB%%share/git-core/contrib/emacs/git-blame.el -%%CONTRIB%%share/git-core/contrib/emacs/git.el -%%CONTRIB%%share/git-core/contrib/examples/README %%CONTRIB%%share/git-core/contrib/fast-import/git-import.perl %%CONTRIB%%share/git-core/contrib/fast-import/git-import.sh %%CONTRIB%%share/git-core/contrib/fast-import/git-p4.README @@ -1582,15 +1586,9 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/fast-import/import-zips.py %%CONTRIB%%share/git-core/contrib/git-jump/README %%CONTRIB%%share/git-core/contrib/git-jump/git-jump -%%CONTRIB%%share/git-core/contrib/git-resurrect.sh %%CONTRIB%%share/git-core/contrib/git-shell-commands/README %%CONTRIB%%share/git-core/contrib/git-shell-commands/help %%CONTRIB%%share/git-core/contrib/git-shell-commands/list -%%CONTRIB%%share/git-core/contrib/hooks/multimail/README.Git -%%CONTRIB%%share/git-core/contrib/hooks/post-receive-email -%%CONTRIB%%share/git-core/contrib/hooks/pre-auto-gc-battery -%%CONTRIB%%share/git-core/contrib/hooks/setgitperms.perl -%%CONTRIB%%share/git-core/contrib/hooks/update-paranoid %%CONTRIB%%share/git-core/contrib/libgit-rs/Cargo.lock %%CONTRIB%%share/git-core/contrib/libgit-rs/Cargo.toml %%CONTRIB%%share/git-core/contrib/libgit-rs/README.md @@ -1609,42 +1607,7 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/libgit-sys/src/lib.rs %%CONTRIB%%share/git-core/contrib/long-running-filter/example.pl %%CONTRIB%%share/git-core/contrib/meson.build -%%CONTRIB%%share/git-core/contrib/mw-to-git/.gitignore -%%CONTRIB%%share/git-core/contrib/mw-to-git/.perlcriticrc -%%CONTRIB%%share/git-core/contrib/mw-to-git/Git/Mediawiki.pm -%%CONTRIB%%share/git-core/contrib/mw-to-git/Makefile -%%CONTRIB%%share/git-core/contrib/mw-to-git/bin-wrapper/git -%%CONTRIB%%share/git-core/contrib/mw-to-git/git-mw.perl -%%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.perl -%%CONTRIB%%share/git-core/contrib/mw-to-git/git-remote-mediawiki.txt -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/.gitignore -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/Makefile -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/README -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/install-wiki.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/push-pull-tests.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9361-mw-to-git-push-pull.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9364-pull-by-rev.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/t9365-continuing-queries.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw-lib.sh -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test-gitmw.pl -%%CONTRIB%%share/git-core/contrib/mw-to-git/t/test.config -%%CONTRIB%%share/git-core/contrib/persistent-https/LICENSE -%%CONTRIB%%share/git-core/contrib/persistent-https/Makefile -%%CONTRIB%%share/git-core/contrib/persistent-https/README -%%CONTRIB%%share/git-core/contrib/persistent-https/client.go -%%CONTRIB%%share/git-core/contrib/persistent-https/main.go -%%CONTRIB%%share/git-core/contrib/persistent-https/proxy.go -%%CONTRIB%%share/git-core/contrib/persistent-https/socket.go -%%CONTRIB%%share/git-core/contrib/remote-helpers/README -%%CONTRIB%%share/git-core/contrib/remote-helpers/git-remote-bzr -%%CONTRIB%%share/git-core/contrib/remote-helpers/git-remote-hg -%%CONTRIB%%share/git-core/contrib/remotes2config.sh %%CONTRIB%%share/git-core/contrib/rerere-train.sh -%%CONTRIB%%share/git-core/contrib/stats/git-common-hash -%%CONTRIB%%share/git-core/contrib/stats/mailmap.pl %%CONTRIB%%share/git-core/contrib/stats/packinfo.pl %%CONTRIB%%share/git-core/contrib/subtree/.gitignore %%CONTRIB%%share/git-core/contrib/subtree/COPYING @@ -1657,13 +1620,10 @@ share/emacs/site-lisp/git/git.el %%CONTRIB%%share/git-core/contrib/subtree/t/Makefile %%CONTRIB%%share/git-core/contrib/subtree/t/t7900-subtree.sh %%CONTRIB%%share/git-core/contrib/subtree/todo -%%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/README -%%CONTRIB%%share/git-core/contrib/thunderbird-patch-inline/appp.sh %%CONTRIB%%share/git-core/contrib/update-unicode/README %%CONTRIB%%share/git-core/contrib/update-unicode/update_unicode.sh %%CONTRIB%%share/git-core/contrib/vscode/README.md %%CONTRIB%%share/git-core/contrib/vscode/init.sh -%%CONTRIB%%share/git-core/contrib/workdir/git-new-workdir share/git-core/templates/description share/git-core/templates/hooks/applypatch-msg.sample share/git-core/templates/hooks/commit-msg.sample |