svn commit: r528684 - in head: deskutils/basket devel/cargo-tree devel/geany-plugin-git-changebar devel/geany-plugin-workbench devel/geany-plugins devel/git-absorb devel/gitaly devel/gitg devel/grv...

Tobias Kortkamp tobik at FreeBSD.org
Thu Mar 19 05:48:11 UTC 2020 

Author: tobik
Date: Thu Mar 19 05:47:59 2020
New Revision: 528684
URL: https://svnweb.freebsd.org/changeset/ports/528684

Log:
  devel/libgit2: Update to 0.99.0
  
  - Switch to the release tarballs libgit2 now publishes
  - Drop CURL option since it is no longer used
  - Use system libpcre instead of the bundled one
  - Hook up tests
  - Bump consumers for ABI changes
  
  Changes:	https://github.com/libgit2/libgit2/releases/tag/v0.99.0
  ABI:		https://abi-laboratory.pro/tracker/timeline/libgit2/

Added:
  head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_credentials.go   (contents, props changed)
  head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_merge.go   (contents, props changed)
  head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_odb.go   (contents, props changed)
  head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_stash.go   (contents, props changed)
  head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_wrapper.c   (contents, props changed)
Deleted:
  head/lang/rust/files/libgit2/
  head/security/cargo-audit/files/
Modified:
  head/deskutils/basket/Makefile
  head/deskutils/basket/distinfo
  head/devel/cargo-tree/Makefile
  head/devel/geany-plugin-git-changebar/Makefile
  head/devel/geany-plugin-workbench/Makefile
  head/devel/geany-plugins/distinfo
  head/devel/git-absorb/Makefile
  head/devel/gitaly/Makefile
  head/devel/gitg/Makefile
  head/devel/grv/Makefile
  head/devel/interactive_rebase_tool/Makefile
  head/devel/kf5-ktexteditor/Makefile
  head/devel/libgit2-glib/Makefile
  head/devel/libgit2-glib/distinfo
  head/devel/libgit2-glib/pkg-plist
  head/devel/libgit2/Makefile
  head/devel/libgit2/distinfo
  head/devel/libgit2/pkg-plist
  head/devel/py-gitless/Makefile
  head/devel/py-pygit2/Makefile
  head/devel/py-pygit2/distinfo
  head/devel/py-pygit2/pkg-descr
  head/devel/rubygem-bugspots/Makefile
  head/devel/rubygem-gitlab_git/Makefile
  head/devel/rubygem-licensee/Makefile
  head/devel/rubygem-licensee8/Makefile
  head/devel/rubygem-rugged/Makefile
  head/devel/rubygem-rugged/distinfo
  head/editors/jucipp/Makefile
  head/editors/kate/Makefile
  head/lang/julia06/Makefile
  head/lang/julia07/Makefile
  head/lang/julia10/Makefile
  head/lang/julia11/Makefile
  head/lang/rust/Makefile
  head/net-mgmt/rubygem-oxidized/Makefile
  head/security/cargo-audit/Makefile
  head/shells/starship/Makefile
  head/sysutils/exa/Makefile
  head/sysutils/fusefs-gitfs/Makefile
  head/textproc/bat/Makefile
  head/textproc/rubygem-github-linguist/Makefile
  head/www/gitlab-ce/Makefile
  head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile
  head/www/rubygem-gollum-rugged_adapter/Makefile
  head/www/stagit/Makefile

Modified: head/deskutils/basket/Makefile
==============================================================================
--- head/deskutils/basket/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/deskutils/basket/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -5,8 +5,11 @@ PORTNAME=	basket
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.49a-46
 DISTVERSIONSUFFIX=	-g60e38c6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	deskutils kde
+
+PATCH_SITES=	https://github.com/basket-notepads/basket/commit/
+PATCHFILES=	094580f207b5ba9f44e9af00834f9c93f06fb440.patch:-p1
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Desktop organization tool

Modified: head/deskutils/basket/distinfo
==============================================================================
--- head/deskutils/basket/distinfo	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/deskutils/basket/distinfo	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1545340462
+TIMESTAMP = 1584082836
 SHA256 (basket-notepads-basket-v2.49a-46-g60e38c6_GH0.tar.gz) = 24415255f9c2446cd7b3b972fa001ecd9dcaa20fe6c64b326828c5b5a1961464
 SIZE (basket-notepads-basket-v2.49a-46-g60e38c6_GH0.tar.gz) = 4688562
+SHA256 (094580f207b5ba9f44e9af00834f9c93f06fb440.patch) = 2c1ce9ed5b800c1b1c1055a69169f2b2a90290136e9cc0bafe92e33acd179fe9
+SIZE (094580f207b5ba9f44e9af00834f9c93f06fb440.patch) = 1016

Modified: head/devel/cargo-tree/Makefile
==============================================================================
--- head/devel/cargo-tree/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/cargo-tree/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,7 @@
 
 PORTNAME=	cargo-tree
 DISTVERSION=	0.29.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

Modified: head/devel/geany-plugin-git-changebar/Makefile
==============================================================================
--- head/devel/geany-plugin-git-changebar/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/geany-plugin-git-changebar/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,11 @@
 
 PORTNAME=	geany-plugin-git-changebar
 PORTVERSION=	${GEANY_VER}
+PORTREVISION=	1
 CATEGORIES=	devel
+
+PATCH_SITES=	https://github.com/geany/geany-plugins/commit/
+PATCHFILES=	9497d829e1b207eb83575dc6f617feecfb89bc16.patch:-p1
 
 MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}

Modified: head/devel/geany-plugin-workbench/Makefile
==============================================================================
--- head/devel/geany-plugin-workbench/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/geany-plugin-workbench/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,11 @@
 
 PORTNAME=	geany-plugin-workbench
 PORTVERSION=	${GEANY_VER}
+PORTREVISION=	1
 CATEGORIES=	devel
+
+PATCH_SITES=	https://github.com/geany/geany-plugins/commit/
+PATCHFILES=	9497d829e1b207eb83575dc6f617feecfb89bc16.patch:-p1
 
 MAINTAINER=	madpilot at FreeBSD.org
 COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}

Modified: head/devel/geany-plugins/distinfo
==============================================================================
--- head/devel/geany-plugins/distinfo	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/geany-plugins/distinfo	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,3 +1,5 @@
-TIMESTAMP = 1569769290
+TIMESTAMP = 1584076857
 SHA256 (geany-plugins-1.36.tar.bz2) = ebe18dd699292174622e8cb8745b020ada8a5be3b604ab980af36e8518df7ce6
 SIZE (geany-plugins-1.36.tar.bz2) = 3379066
+SHA256 (9497d829e1b207eb83575dc6f617feecfb89bc16.patch) = ecf3c6725c3d9f482274ecdbce66459d168162690beec2c8ff5b6ae9e0e8b318
+SIZE (9497d829e1b207eb83575dc6f617feecfb89bc16.patch) = 2345

Modified: head/devel/git-absorb/Makefile
==============================================================================
--- head/devel/git-absorb/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/git-absorb/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,7 @@
 
 PORTNAME=	git-absorb
 DISTVERSION=	0.5.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel
 
 MAINTAINER=	greg at unrelenting.technology

Modified: head/devel/gitaly/Makefile
==============================================================================
--- head/devel/gitaly/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/gitaly/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitaly
 DISTVERSION=	12.8.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	mfechner at FreeBSD.org

Modified: head/devel/gitg/Makefile
==============================================================================
--- head/devel/gitg/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/gitg/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gitg
 PORTVERSION=	3.32.1
+PORTREVISION=	1
 CATEGORIES=	devel deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome

Modified: head/devel/grv/Makefile
==============================================================================
--- head/devel/grv/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/grv/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 PORTNAME=	grv
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	dmgk at FreeBSD.org

Added: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_credentials.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_credentials.go	Thu Mar 19 05:47:59 2020	(r528684)
@@ -0,0 +1,21 @@
+--- vendor/gopkg.in/libgit2/git2go.v27/credentials.go.orig	2019-01-04 13:40:18 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/credentials.go
+@@ -2,6 +2,9 @@ package git
+ 
+ /*
+ #include <git2.h>
++#include <git2/sys/cred.h>
++
++git_credtype_t _go_git_cred_credtype(git_cred *cred);
+ */
+ import "C"
+ import "unsafe"
+@@ -27,7 +30,7 @@ func (o *Cred) HasUsername() bool {
+ }
+ 
+ func (o *Cred) Type() CredType {
+-	return (CredType)(o.ptr.credtype)
++	return (CredType)(C._go_git_cred_credtype(o.ptr))
+ }
+ 
+ func credFromC(ptr *C.git_cred) *Cred {

Added: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_merge.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_merge.go	Thu Mar 19 05:47:59 2020	(r528684)
@@ -0,0 +1,20 @@
+--- vendor/gopkg.in/libgit2/git2go.v27/merge.go.orig	2019-01-04 13:40:18 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/merge.go
+@@ -132,7 +132,7 @@ func (mo *MergeOptions) toC() *C.git_merge_options {
+ 	}
+ 	return &C.git_merge_options{
+ 		version:          C.uint(mo.Version),
+-		flags:            C.git_merge_flag_t(mo.TreeFlags),
++		flags:            C.uint32_t(mo.TreeFlags),
+ 		rename_threshold: C.uint(mo.RenameThreshold),
+ 		target_limit:     C.uint(mo.TargetLimit),
+ 		file_favor:       C.git_merge_file_favor_t(mo.FileFavor),
+@@ -374,7 +374,7 @@ func populateCMergeFileOptions(c *C.git_merge_file_opt
+ 	c.our_label = C.CString(options.OurLabel)
+ 	c.their_label = C.CString(options.TheirLabel)
+ 	c.favor = C.git_merge_file_favor_t(options.Favor)
+-	c.flags = C.git_merge_file_flag_t(options.Flags)
++	c.flags = C.uint32_t(options.Flags)
+ 	c.marker_size = C.ushort(options.MarkerSize)
+ }
+ 

Added: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_odb.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_odb.go	Thu Mar 19 05:47:59 2020	(r528684)
@@ -0,0 +1,11 @@
+--- vendor/gopkg.in/libgit2/git2go.v27/odb.go.orig	2019-01-04 13:40:18 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/odb.go
+@@ -210,7 +210,7 @@ func (v *Odb) NewWriteStream(size int64, otype ObjectT
+ 	runtime.LockOSThread()
+ 	defer runtime.UnlockOSThread()
+ 
+-	ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.git_off_t(size), C.git_otype(otype))
++	ret := C.git_odb_open_wstream(&stream.ptr, v.ptr, C.git_object_size_t(size), C.git_object_t(otype))
+ 	runtime.KeepAlive(v)
+ 	if ret < 0 {
+ 		return nil, MakeGitError(ret)

Added: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_stash.go
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_stash.go	Thu Mar 19 05:47:59 2020	(r528684)
@@ -0,0 +1,11 @@
+--- vendor/gopkg.in/libgit2/git2go.v27/stash.go.orig	2019-01-04 13:40:18 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/stash.go
+@@ -171,7 +171,7 @@ func (opts *StashApplyOptions) toC() (
+ 
+ 		optsC = &C.git_stash_apply_options{
+ 			version: C.GIT_STASH_APPLY_OPTIONS_VERSION,
+-			flags:   C.git_stash_apply_flags(opts.Flags),
++			flags:   C.uint32_t(opts.Flags),
+ 		}
+ 		populateCheckoutOpts(&optsC.checkout_options, &opts.CheckoutOptions)
+ 		if opts.ProgressCallback != nil {

Added: head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_wrapper.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_wrapper.c	Thu Mar 19 05:47:59 2020	(r528684)
@@ -0,0 +1,21 @@
+--- vendor/gopkg.in/libgit2/git2go.v27/wrapper.c.orig	2020-03-13 07:17:07 UTC
++++ vendor/gopkg.in/libgit2/git2go.v27/wrapper.c
+@@ -2,6 +2,7 @@
+ #include <git2.h>
+ #include <git2/sys/odb_backend.h>
+ #include <git2/sys/refdb_backend.h>
++#include <git2/sys/cred.h>
+ 
+ typedef int (*gogit_submodule_cbk)(git_submodule *sm, const char *name, void *payload);
+ 
+@@ -178,6 +179,10 @@ int _go_git_writestream_close(git_writestream *stream)
+ void _go_git_writestream_free(git_writestream *stream)
+ {
+ 	stream->free(stream);
++}
++
++git_credtype_t _go_git_cred_credtype(git_cred *cred) {
++	return cred->credtype;
+ }
+ 
+ /* EOF */

Modified: head/devel/interactive_rebase_tool/Makefile
==============================================================================
--- head/devel/interactive_rebase_tool/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/interactive_rebase_tool/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,7 @@
 
 PORTNAME=	interactive_rebase_tool
 DISTVERSION=	1.2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	petteri.valkonen at iki.fi

Modified: head/devel/kf5-ktexteditor/Makefile
==============================================================================
--- head/devel/kf5-ktexteditor/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/kf5-ktexteditor/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,6 +2,7 @@
 
 PORTNAME=	ktexteditor
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks
 
 MAINTAINER=	kde at FreeBSD.org
@@ -9,7 +10,6 @@ COMMENT=	KF5 advanced embeddable text editor
 
 LIB_DEPENDS=	libgit2.so:devel/libgit2 \
 		libeditorconfig.so:editors/editorconfig-core-c
-
 
 USES=		cmake compiler:c++11-lib gettext kde:5 pkgconfig qt:5 tar:xz
 USE_KDE=	archive auth codecs completion config configwidgets \

Modified: head/devel/libgit2-glib/Makefile
==============================================================================
--- head/devel/libgit2-glib/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/libgit2-glib/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -4,8 +4,7 @@
 # Also update devel/libgit2, devel/rubygem-rugged, devel/py-pygit2
 
 PORTNAME=	libgit2-glib
-PORTVERSION=	0.28.0.1
-PORTREVISION=	1
+PORTVERSION=	0.99.0.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
@@ -23,8 +22,19 @@ USES=		compiler:c11 gnome localbase \
 		meson pkgconfig python:3.4+,build tar:xz
 USE_GNOME=	glib20 introspection
 USE_LDCONFIG=	yes
-INSTALLS_ICONS=	yes
 MESON_ARGS=	-Dpython=false
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
+
+# XXX: meson_vapi_link.py does not respect STAGEDIR for some reason and silently
+# fails when building as user and touches the external fs when building as root.
+# Neutralize it.  We replicate what it does in post-install.
+post-patch:
+	@${ECHO_CMD} '#!/bin/sh' > ${WRKSRC}/meson_vapi_link.py
+
+post-install:
+	${RLN} ${STAGEDIR}${PREFIX}/share/vala/vapi/libgit2-glib-1.0.deps \
+		${STAGEDIR}${PREFIX}/share/vala/vapi/ggit-1.0.deps
+	${RLN} ${STAGEDIR}${PREFIX}/share/vala/vapi/libgit2-glib-1.0.vapi \
+		${STAGEDIR}${PREFIX}/share/vala/vapi/ggit-1.0.vapi
 
 .include <bsd.port.mk>

Modified: head/devel/libgit2-glib/distinfo
==============================================================================
--- head/devel/libgit2-glib/distinfo	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/libgit2-glib/distinfo	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558699378
-SHA256 (gnome/libgit2-glib-0.28.0.1.tar.xz) = e70118481241a841d5261bdd4caa3158b2ffcb5ccf9d4f32b6cf6563b83a0f28
-SIZE (gnome/libgit2-glib-0.28.0.1.tar.xz) = 138928
+TIMESTAMP = 1584066374
+SHA256 (gnome/libgit2-glib-0.99.0.1.tar.xz) = e05a75c444d9c8d5991afc4a5a64cd97d731ce21aeb7c1c651ade1a3b465b9de
+SIZE (gnome/libgit2-glib-0.99.0.1.tar.xz) = 140996

Modified: head/devel/libgit2-glib/pkg-plist
==============================================================================
--- head/devel/libgit2-glib/pkg-plist	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/libgit2-glib/pkg-plist	Thu Mar 19 05:47:59 2020	(r528684)
@@ -71,7 +71,7 @@ include/libgit2-glib-1.0/libgit2-glib/ggit.h
 lib/girepository-1.0/Ggit-1.0.typelib
 lib/libgit2-glib-1.0.so
 lib/libgit2-glib-1.0.so.0
-lib/libgit2-glib-1.0.so.0.2800.0
+lib/libgit2-glib-1.0.so.0.9900.0
 libdata/pkgconfig/libgit2-glib-1.0.pc
 share/gir-1.0/Ggit-1.0.gir
 share/vala/vapi/ggit-1.0.deps

Modified: head/devel/libgit2/Makefile
==============================================================================
--- head/devel/libgit2/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/libgit2/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -6,43 +6,49 @@
 # Tools/scripts/search_lib_depends_and_bump.sh devel/libgit2
 
 PORTNAME=	libgit2
-PORTVERSION=	0.28.4
-DISTVERSIONPREFIX=	v
+PORTVERSION=	0.99.0
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/libgit2/libgit2/releases/download/v${PORTVERSION}/
 
+PATCH_SITES=	https://github.com/libgit2/libgit2/commit/
+PATCHFILES=	3828ea67b97fc56dead976f319792ead3aa7e623.patch:-p1 \
+		6d25dbdc5c3924336f61bc6091df64821acb95f2.patch:-p1
+
 MAINTAINER=	mfechner at FreeBSD.org
 COMMENT=	Portable, pure C implementation of the Git core
 
 LICENSE=	GPLv2
 
-USES=		cmake pathfix pkgconfig python:build ssl
+LIB_DEPENDS=	libpcre.so:devel/pcre
+
+USES=		cmake pkgconfig ssl
 USE_LDCONFIG=	yes
-USE_GITHUB=	yes
-GH_ACCOUNT=	libgit2
+CMAKE_OFF=	BUILD_CLAR
 
-PLIST_SUB=	PORTVERSION=${PORTVERSION} SHLIB_VER=${PORTVERSION:R:E}
+PLIST_SUB=	PORTVERSION=${PORTVERSION} \
+		SHLIB_VER=${PORTVERSION:R}
 
-OPTIONS_DEFINE=	SSH THREADS CURL
-OPTIONS_DEFAULT=SSH THREADS CURL
+OPTIONS_DEFINE=	SSH THREADS
+OPTIONS_DEFAULT=SSH THREADS
 SSH_DESC=	Enable SSH support through libssh2
-CURL_DESC=	Enable HTTP support through cURL
 
 SSH_LIB_DEPENDS=	libssh2.so:security/libssh2
-SSH_CMAKE_ON=		-DUSE_SSH=ON
-SSH_CMAKE_OFF=		-DUSE_SSH=OFF
-THREADS_CMAKE_ON=	-DTHREADSAFE=ON
-THREADS_CMAKE_OFF=	-DTHREADSAFE=OFF
-CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
-CURL_CMAKE_ON=		-DCURL=ON
-CURL_CMAKE_OFF=		-DCURL=OFF
+SSH_CMAKE_BOOL=		USE_SSH
+THREADS_CMAKE_BOOL=	THREADSAFE
 
 .include <bsd.port.pre.mk>
 
-post-patch:
-	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*zlib/ d" ${WRKSRC}/CMakeLists.txt
 .if ${SSL_DEFAULT} == base
+post-patch:
 	@${REINPLACE_CMD} -e "/LIBGIT2_PC_REQUIRES.*openssl/ d" \
-		${WRKSRC}/src/CMakeLists.txt
+		${WRKSRC}/cmake/Modules/SelectHTTPSBackend.cmake
 .endif
+
+do-test:
+	@cd ${BUILD_WRKSRC} && \
+		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} \
+		-DBUILD_CLAR=ON ${CMAKE_SOURCE_PATH} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.post.mk>

Modified: head/devel/libgit2/distinfo
==============================================================================
--- head/devel/libgit2/distinfo	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/libgit2/distinfo	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1576046793
-SHA256 (libgit2-libgit2-v0.28.4_GH0.tar.gz) = 30f3877469d09f2e4a21be933b4e2800560d16646028dd800744dc5f7fb0c749
-SIZE (libgit2-libgit2-v0.28.4_GH0.tar.gz) = 4991720
+TIMESTAMP = 1584488391
+SHA256 (libgit2-0.99.0.tar.gz) = 174024310c1563097a6613a0d3f7539d11a9a86517cd67ce533849065de08a11
+SIZE (libgit2-0.99.0.tar.gz) = 5307975
+SHA256 (3828ea67b97fc56dead976f319792ead3aa7e623.patch) = 24228aa70d3846140450aab253b41c82d8aab75ccc1e50eb848f84e42de79b5b
+SIZE (3828ea67b97fc56dead976f319792ead3aa7e623.patch) = 1491
+SHA256 (6d25dbdc5c3924336f61bc6091df64821acb95f2.patch) = 3bd76965dfc1b4976c2f00ef788e39f1eef6896ea50f2fa6541a92d309619fb7
+SIZE (6d25dbdc5c3924336f61bc6091df64821acb95f2.patch) = 1226

Modified: head/devel/libgit2/pkg-plist
==============================================================================
--- head/devel/libgit2/pkg-plist	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/libgit2/pkg-plist	Thu Mar 19 05:47:59 2020	(r528684)
@@ -6,6 +6,7 @@ include/git2/blame.h
 include/git2/blob.h
 include/git2/branch.h
 include/git2/buffer.h
+include/git2/cert.h
 include/git2/checkout.h
 include/git2/cherrypick.h
 include/git2/clone.h
@@ -13,6 +14,8 @@ include/git2/commit.h
 include/git2/common.h
 include/git2/config.h
 include/git2/cred_helpers.h
+include/git2/credential.h
+include/git2/credential_helpers.h
 include/git2/deprecated.h
 include/git2/describe.h
 include/git2/diff.h
@@ -23,7 +26,6 @@ include/git2/graph.h
 include/git2/ignore.h
 include/git2/index.h
 include/git2/indexer.h
-include/git2/inttypes.h
 include/git2/mailmap.h
 include/git2/merge.h
 include/git2/message.h
@@ -58,6 +60,8 @@ include/git2/submodule.h
 include/git2/sys/alloc.h
 include/git2/sys/commit.h
 include/git2/sys/config.h
+include/git2/sys/cred.h
+include/git2/sys/credential.h
 include/git2/sys/diff.h
 include/git2/sys/filter.h
 include/git2/sys/hashsig.h
@@ -72,7 +76,6 @@ include/git2/sys/reflog.h
 include/git2/sys/refs.h
 include/git2/sys/repository.h
 include/git2/sys/stream.h
-include/git2/sys/time.h
 include/git2/sys/transport.h
 include/git2/tag.h
 include/git2/trace.h

Modified: head/devel/py-gitless/Makefile
==============================================================================
--- head/devel/py-gitless/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/py-gitless/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}clint>=0.5.1:devel
 		git:devel/git
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>=0:devel/py-nose@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.5+
 USE_PYTHON=	autoplist concurrent distutils
 USE_LOCALE=	en_US.UTF-8
 

Modified: head/devel/py-pygit2/Makefile
==============================================================================
--- head/devel/py-pygit2/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/py-pygit2/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -4,7 +4,7 @@
 # Also update devel/libgit2, devel/libgit2-glib, devel/rubygem-rugged
 
 PORTNAME=	pygit2
-PORTVERSION=	0.28.2
+PORTVERSION=	1.1.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libgit2.so:devel/libgit2
 RUN_DEPENDS=	${MY_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
-USES=		python
+USES=		python:3.5+
 USE_PYTHON=	autoplist distutils
 MAKE_ENV=	LIBGIT2=${LOCALBASE}
 PYDISTUTILS_TEST_TARGET?=	test
@@ -30,6 +30,6 @@ do-test:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_TEST_TARGET} ${PYDISTUTILS_TESTARGS})
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_pygit2.so ${STAGEDIR}${PYTHON_SITELIBDIR}/pygit2/_libgit2*.so
+	${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/pygit2/_*git2*.so \
 
 .include <bsd.port.mk>

Modified: head/devel/py-pygit2/distinfo
==============================================================================
--- head/devel/py-pygit2/distinfo	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/py-pygit2/distinfo	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1558863763
-SHA256 (pygit2-0.28.2.tar.gz) = 4d8c3fbbf2e5793a9984681a94e6ac2f1bc91a92cbac762dbdfbea296b917f86
-SIZE (pygit2-0.28.2.tar.gz) = 496469
+TIMESTAMP = 1584067930
+SHA256 (pygit2-1.1.1.tar.gz) = 9255d507d5d87bf22dfd57997a78908010331fc21f9a83eca121a53f657beb3c
+SIZE (pygit2-1.1.1.tar.gz) = 217896

Modified: head/devel/py-pygit2/pkg-descr
==============================================================================
--- head/devel/py-pygit2/pkg-descr	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/py-pygit2/pkg-descr	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,5 +1,4 @@
-Pygit2 is a set of Python bindings to the libgit2 shared library, libgit2
-implements the core of Git. Pygit2 works with Python 2.7, 3.2, 3.3, 3.4 and
-pypy.
+Pygit2 is a set of Python bindings to the libgit2 shared library,
+libgit2 implements the core of Git.
 
-WWW: https://www.pygit2.org/
+WWW: https://www.pygit2.org

Modified: head/devel/rubygem-bugspots/Makefile
==============================================================================
--- head/devel/rubygem-bugspots/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/rubygem-bugspots/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	bugspots
 PORTVERSION=	0.2.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

Modified: head/devel/rubygem-gitlab_git/Makefile
==============================================================================
--- head/devel/rubygem-gitlab_git/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/rubygem-gitlab_git/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,7 @@
 
 PORTNAME=	gitlab_git
 PORTVERSION=	10.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

Modified: head/devel/rubygem-licensee/Makefile
==============================================================================
--- head/devel/rubygem-licensee/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/rubygem-licensee/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 
 PORTNAME=	licensee
 PORTVERSION=	9.7.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

Modified: head/devel/rubygem-licensee8/Makefile
==============================================================================
--- head/devel/rubygem-licensee8/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/rubygem-licensee8/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	licensee
 PORTVERSION=	8.9.2
+PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 PKGNAMESUFFIX=	8

Modified: head/devel/rubygem-rugged/Makefile
==============================================================================
--- head/devel/rubygem-rugged/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/rubygem-rugged/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -4,7 +4,7 @@
 # Also update devel/libgit2, devel/libgit2-glib, devel/py-pygit2
 
 PORTNAME=	rugged
-PORTVERSION=	0.28.4
+PORTVERSION=	0.99.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 

Modified: head/devel/rubygem-rugged/distinfo
==============================================================================
--- head/devel/rubygem-rugged/distinfo	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/devel/rubygem-rugged/distinfo	Thu Mar 19 05:47:59 2020	(r528684)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1576046879
-SHA256 (rubygem/rugged-0.28.4.gem) = 8b5c6695aac92ec9c0f400c072df51a30ea5faebe56a9b43903dd138bd59b9ad
-SIZE (rubygem/rugged-0.28.4.gem) = 1475584
+TIMESTAMP = 1584068021
+SHA256 (rubygem/rugged-0.99.0.gem) = df23853a4073b6f094b12ecf70a0e7fd3e20ce03a7da3a543b0919a53eef3313
+SIZE (rubygem/rugged-0.99.0.gem) = 1485824

Modified: head/editors/jucipp/Makefile
==============================================================================
--- head/editors/jucipp/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/editors/jucipp/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -4,6 +4,7 @@
 PORTNAME=	jucipp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.1
+PORTREVISION=	1
 CATEGORIES=	editors
 
 MAINTAINER=	info at babaei.net

Modified: head/editors/kate/Makefile
==============================================================================
--- head/editors/kate/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/editors/kate/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,6 +2,7 @@
 
 PORTNAME=	kate
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	editors kde kde-applications
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/lang/julia06/Makefile
==============================================================================
--- head/lang/julia06/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/lang/julia06/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -4,7 +4,7 @@
 PORTNAME=	julia
 PORTVERSION=	0.6.4
 DISTVERSIONSUFFIX=	-full
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	06

Modified: head/lang/julia07/Makefile
==============================================================================
--- head/lang/julia07/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/lang/julia07/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -4,7 +4,7 @@
 PORTNAME=	julia
 PORTVERSION=	0.7.0
 DISTVERSIONSUFFIX=	-full
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	07

Modified: head/lang/julia10/Makefile
==============================================================================
--- head/lang/julia10/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/lang/julia10/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,8 +3,8 @@
 
 PORTNAME=	julia
 PORTVERSION=	1.0.4
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-full
+PORTREVISION=	3
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	10

Modified: head/lang/julia11/Makefile
==============================================================================
--- head/lang/julia11/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/lang/julia11/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,8 +3,8 @@
 
 PORTNAME=	julia
 PORTVERSION=	1.1.1
-PORTREVISION=	2
 DISTVERSIONSUFFIX=	-full
+PORTREVISION=	3
 CATEGORIES=	lang math
 MASTER_SITES=	https://github.com/JuliaLang/julia/releases/download/v${PORTVERSION}/
 PKGNAMESUFFIX=	11

Modified: head/lang/rust/Makefile
==============================================================================
--- head/lang/rust/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/lang/rust/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 
 PORTNAME=	rust
 PORTVERSION?=	1.42.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/:src \
 		LOCAL/tobik/rust:bootstrap \
@@ -82,12 +82,6 @@ _CARGO_BOOTSTRAP=	${BOOTSTRAPS_DATE_${ARCH}:U${BOOTSTR
 
 .include <bsd.port.pre.mk>
 
-.if exists(${PATCHDIR}/libgit2)
-# lang/rust-bootstrap builds the bundled libgit2 and using the patch
-# to fix runtime with system libgit2 is incompatible with it.  Keep
-# it separate.
-EXTRA_PATCHES+=	${PATCHDIR}/libgit2
-.endif
 .if exists(${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX})
 EXTRA_PATCHES+=	${PATCHDIR}/${ARCH}${BOOTSTRAPS_SUFFIX}
 .endif

Modified: head/net-mgmt/rubygem-oxidized/Makefile
==============================================================================
--- head/net-mgmt/rubygem-oxidized/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/net-mgmt/rubygem-oxidized/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	oxidized
 PORTVERSION=	0.26.3
+PORTREVISION=	1
 CATEGORIES=	net-mgmt rubygems
 MASTER_SITES=	RG
 

Modified: head/security/cargo-audit/Makefile
==============================================================================
--- head/security/cargo-audit/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/security/cargo-audit/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 PORTNAME=	cargo-audit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.11.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security
 
 MAINTAINER=	tobik at FreeBSD.org

Modified: head/shells/starship/Makefile
==============================================================================
--- head/shells/starship/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/shells/starship/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,7 +2,7 @@
 
 PORTNAME=	starship
 DISTVERSION=	0.13.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	shells
 MASTER_SITES=	CRATESIO
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}

Modified: head/sysutils/exa/Makefile
==============================================================================
--- head/sysutils/exa/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/sysutils/exa/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 PORTNAME=	exa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	tobik at FreeBSD.org

Modified: head/sysutils/fusefs-gitfs/Makefile
==============================================================================
--- head/sysutils/fusefs-gitfs/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/sysutils/fusefs-gitfs/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitfs
 DISTVERSION=	0.5.2
+PORTREVISION=	1
 CATEGORIES=	sysutils devel
 PKGNAMEPREFIX=	fusefs-
 
@@ -24,7 +25,7 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	PressLabs
 
 NO_ARCH=	yes
-USES=		python
+USES=		python:3.5+
 USE_PYTHON=	autoplist distutils concurrent optsuffix
 
 post-patch:

Modified: head/textproc/bat/Makefile
==============================================================================
--- head/textproc/bat/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/textproc/bat/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 PORTNAME=	bat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.12.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	textproc
 
 MAINTAINER=	pizzamig at FreeBSD.org

Modified: head/textproc/rubygem-github-linguist/Makefile
==============================================================================
--- head/textproc/rubygem-github-linguist/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/textproc/rubygem-github-linguist/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,6 +2,7 @@
 
 PORTNAME=	github-linguist
 PORTVERSION=	7.6.1
+PORTREVISION=	1
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 

Modified: head/www/gitlab-ce/Makefile
==============================================================================
--- head/www/gitlab-ce/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/www/gitlab-ce/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,7 +3,7 @@
 
 PORTNAME=	gitlab-ce
 PORTVERSION=	12.8.6
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www devel
 
 MAINTAINER=	mfechner at FreeBSD.org

Modified: head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile
==============================================================================
--- head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/www/rubygem-gitlab-gollum-rugged_adapter/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -2,6 +2,7 @@
 
 PORTNAME=	gitlab-gollum-rugged_adapter
 PORTVERSION=	0.4.4.2
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 

Modified: head/www/rubygem-gollum-rugged_adapter/Makefile
==============================================================================
--- head/www/rubygem-gollum-rugged_adapter/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/www/rubygem-gollum-rugged_adapter/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	gollum-rugged_adapter
 PORTVERSION=	0.4.4
+PORTREVISION=	1
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 

Modified: head/www/stagit/Makefile
==============================================================================
--- head/www/stagit/Makefile	Thu Mar 19 05:20:13 2020	(r528683)
+++ head/www/stagit/Makefile	Thu Mar 19 05:47:59 2020	(r528684)
@@ -3,6 +3,7 @@
 
 PORTNAME=	stagit
 PORTVERSION=	0.9.3
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://codemadness.org/releases/stagit/

More information about the svn-ports-all mailing list