Index: deskutils/basket/Makefile =================================================================== --- deskutils/basket/Makefile +++ deskutils/basket/Makefile @@ -5,8 +5,11 @@ 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@FreeBSD.org COMMENT= Desktop organization tool Index: deskutils/basket/distinfo =================================================================== --- deskutils/basket/distinfo +++ deskutils/basket/distinfo @@ -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 Index: devel/cargo-tree/Makefile =================================================================== --- devel/cargo-tree/Makefile +++ devel/cargo-tree/Makefile @@ -2,7 +2,7 @@ PORTNAME= cargo-tree DISTVERSION= 0.29.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: devel/geany-plugin-git-changebar/Makefile =================================================================== --- devel/geany-plugin-git-changebar/Makefile +++ devel/geany-plugin-git-changebar/Makefile @@ -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@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} Index: devel/geany-plugin-workbench/Makefile =================================================================== --- devel/geany-plugin-workbench/Makefile +++ devel/geany-plugin-workbench/Makefile @@ -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@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} Index: devel/geany-plugins/distinfo =================================================================== --- devel/geany-plugins/distinfo +++ devel/geany-plugins/distinfo @@ -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 Index: devel/git-absorb/Makefile =================================================================== --- devel/git-absorb/Makefile +++ devel/git-absorb/Makefile @@ -2,7 +2,7 @@ PORTNAME= git-absorb DISTVERSION= 0.5.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel MAINTAINER= greg@unrelenting.technology Index: devel/gitaly/Makefile =================================================================== --- devel/gitaly/Makefile +++ devel/gitaly/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitaly DISTVERSION= 12.8.6 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= mfechner@FreeBSD.org Index: devel/gitg/Makefile =================================================================== --- devel/gitg/Makefile +++ devel/gitg/Makefile @@ -3,6 +3,7 @@ PORTNAME= gitg PORTVERSION= 3.32.1 +PORTREVISION= 1 CATEGORIES= devel deskutils gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome Index: devel/grv/Makefile =================================================================== --- devel/grv/Makefile +++ devel/grv/Makefile @@ -3,7 +3,7 @@ PORTNAME= grv DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MAINTAINER= dmgk@FreeBSD.org Index: devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_credentials.go =================================================================== --- /dev/null +++ devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_credentials.go @@ -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 ++#include ++ ++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 { Index: devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_merge.go =================================================================== --- /dev/null +++ devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_merge.go @@ -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) + } + Index: devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_odb.go =================================================================== --- /dev/null +++ devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_odb.go @@ -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) Index: devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_stash.go =================================================================== --- /dev/null +++ devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_stash.go @@ -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 { Index: devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_wrapper.c =================================================================== --- /dev/null +++ devel/grv/files/patch-vendor_gopkg.in_libgit2_git2go.v27_wrapper.c @@ -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 + #include + #include ++#include + + 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 */ Index: devel/interactive_rebase_tool/Makefile =================================================================== --- devel/interactive_rebase_tool/Makefile +++ devel/interactive_rebase_tool/Makefile @@ -2,7 +2,7 @@ PORTNAME= interactive_rebase_tool DISTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel MAINTAINER= petteri.valkonen@iki.fi Index: devel/kf5-ktexteditor/Makefile =================================================================== --- devel/kf5-ktexteditor/Makefile +++ devel/kf5-ktexteditor/Makefile @@ -2,6 +2,7 @@ PORTNAME= ktexteditor DISTVERSION= ${KDE_FRAMEWORKS_VERSION} +PORTREVISION= 1 CATEGORIES= devel kde kde-frameworks MAINTAINER= kde@FreeBSD.org @@ -9,7 +10,6 @@ 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 \ Index: devel/libgit2-glib/Makefile =================================================================== --- devel/libgit2-glib/Makefile +++ devel/libgit2-glib/Makefile @@ -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 @@ 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 Index: devel/libgit2-glib/distinfo =================================================================== --- devel/libgit2-glib/distinfo +++ devel/libgit2-glib/distinfo @@ -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 Index: devel/libgit2-glib/pkg-plist =================================================================== --- devel/libgit2-glib/pkg-plist +++ devel/libgit2-glib/pkg-plist @@ -71,7 +71,7 @@ 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 Index: devel/libgit2/Makefile =================================================================== --- devel/libgit2/Makefile +++ devel/libgit2/Makefile @@ -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@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 -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 Index: devel/libgit2/distinfo =================================================================== --- devel/libgit2/distinfo +++ devel/libgit2/distinfo @@ -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 Index: devel/libgit2/pkg-plist =================================================================== --- devel/libgit2/pkg-plist +++ devel/libgit2/pkg-plist @@ -6,6 +6,7 @@ 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/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/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/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/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 Index: devel/py-gitless/Makefile =================================================================== --- devel/py-gitless/Makefile +++ devel/py-gitless/Makefile @@ -20,7 +20,7 @@ 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 Index: devel/py-pygit2/Makefile =================================================================== --- devel/py-pygit2/Makefile +++ devel/py-pygit2/Makefile @@ -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 @@ 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 @@ @(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 Index: devel/py-pygit2/distinfo =================================================================== --- devel/py-pygit2/distinfo +++ devel/py-pygit2/distinfo @@ -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 Index: devel/py-pygit2/pkg-descr =================================================================== --- devel/py-pygit2/pkg-descr +++ devel/py-pygit2/pkg-descr @@ -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 Index: devel/rubygem-bugspots/Makefile =================================================================== --- devel/rubygem-bugspots/Makefile +++ devel/rubygem-bugspots/Makefile @@ -3,6 +3,7 @@ PORTNAME= bugspots PORTVERSION= 0.2.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG Index: devel/rubygem-gitlab_git/Makefile =================================================================== --- devel/rubygem-gitlab_git/Makefile +++ devel/rubygem-gitlab_git/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab_git PORTVERSION= 10.7.0 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= devel rubygems MASTER_SITES= RG Index: devel/rubygem-licensee/Makefile =================================================================== --- devel/rubygem-licensee/Makefile +++ devel/rubygem-licensee/Makefile @@ -3,7 +3,7 @@ PORTNAME= licensee PORTVERSION= 9.7.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel rubygems MASTER_SITES= RG Index: devel/rubygem-licensee8/Makefile =================================================================== --- devel/rubygem-licensee8/Makefile +++ devel/rubygem-licensee8/Makefile @@ -3,6 +3,7 @@ PORTNAME= licensee PORTVERSION= 8.9.2 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= 8 Index: devel/rubygem-rugged/Makefile =================================================================== --- devel/rubygem-rugged/Makefile +++ devel/rubygem-rugged/Makefile @@ -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 Index: devel/rubygem-rugged/distinfo =================================================================== --- devel/rubygem-rugged/distinfo +++ devel/rubygem-rugged/distinfo @@ -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 Index: editors/jucipp/Makefile =================================================================== --- editors/jucipp/Makefile +++ editors/jucipp/Makefile @@ -4,6 +4,7 @@ PORTNAME= jucipp DISTVERSIONPREFIX= v DISTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= editors MAINTAINER= info@babaei.net Index: editors/kate/Makefile =================================================================== --- editors/kate/Makefile +++ editors/kate/Makefile @@ -2,6 +2,7 @@ PORTNAME= kate DISTVERSION= ${KDE_APPLICATIONS_VERSION} +PORTREVISION= 1 CATEGORIES= editors kde kde-applications MAINTAINER= kde@FreeBSD.org Index: lang/julia06/Makefile =================================================================== --- lang/julia06/Makefile +++ lang/julia06/Makefile @@ -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 Index: lang/julia07/Makefile =================================================================== --- lang/julia07/Makefile +++ lang/julia07/Makefile @@ -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 Index: lang/julia10/Makefile =================================================================== --- lang/julia10/Makefile +++ lang/julia10/Makefile @@ -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 Index: lang/julia11/Makefile =================================================================== --- lang/julia11/Makefile +++ lang/julia11/Makefile @@ -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 Index: lang/rust/Makefile =================================================================== --- lang/rust/Makefile +++ lang/rust/Makefile @@ -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 @@ .include -.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 Index: lang/rust/files/libgit2/patch-vendor_libgit2-sys_lib.rs =================================================================== --- lang/rust/files/libgit2/patch-vendor_libgit2-sys_lib.rs +++ lang/rust/files/libgit2/patch-vendor_libgit2-sys_lib.rs @@ -1,30 +0,0 @@ -Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 - ---- vendor/libgit2-sys/lib.rs.orig 2019-11-04 17:34:46 UTC -+++ vendor/libgit2-sys/lib.rs -@@ -331,7 +331,6 @@ pub struct git_remote_callbacks { - pub push_negotiation: Option, - pub transport: Option, - pub payload: *mut c_void, -- pub resolve_url: Option, - } - - #[repr(C)] -@@ -385,8 +384,6 @@ pub type git_push_negotiation = - - pub type git_push_update_reference_cb = - extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; --pub type git_url_resolve_cb = -- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; - - #[repr(C)] - pub struct git_push_update { -@@ -2280,7 +2277,7 @@ extern "C" { - source: *const git_tree, - ) -> c_int; - pub fn git_treebuilder_clear(bld: *mut git_treebuilder); -- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; -+ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; - pub fn git_treebuilder_free(bld: *mut git_treebuilder); - pub fn git_treebuilder_get( - bld: *mut git_treebuilder, Index: net-mgmt/rubygem-oxidized/Makefile =================================================================== --- net-mgmt/rubygem-oxidized/Makefile +++ net-mgmt/rubygem-oxidized/Makefile @@ -3,6 +3,7 @@ PORTNAME= oxidized PORTVERSION= 0.26.3 +PORTREVISION= 1 CATEGORIES= net-mgmt rubygems MASTER_SITES= RG Index: security/cargo-audit/Makefile =================================================================== --- security/cargo-audit/Makefile +++ security/cargo-audit/Makefile @@ -3,7 +3,7 @@ PORTNAME= cargo-audit DISTVERSIONPREFIX= v DISTVERSION= 0.11.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MAINTAINER= tobik@FreeBSD.org Index: security/cargo-audit/files/patch-cargo-crates_libgit2-sys-0.10.0_lib.rs =================================================================== --- security/cargo-audit/files/patch-cargo-crates_libgit2-sys-0.10.0_lib.rs +++ security/cargo-audit/files/patch-cargo-crates_libgit2-sys-0.10.0_lib.rs @@ -1,30 +0,0 @@ -Revert to libgit2 0.28 API per https://github.com/rust-lang/git2-rs/issues/458 - ---- cargo-crates/libgit2-sys-0.10.0/lib.rs.orig 2019-08-16 20:27:18 UTC -+++ cargo-crates/libgit2-sys-0.10.0/lib.rs -@@ -331,7 +331,6 @@ pub struct git_remote_callbacks { - pub push_negotiation: Option, - pub transport: Option, - pub payload: *mut c_void, -- pub resolve_url: Option, - } - - #[repr(C)] -@@ -385,8 +384,6 @@ pub type git_push_negotiation = - - pub type git_push_update_reference_cb = - extern "C" fn(*const c_char, *const c_char, *mut c_void) -> c_int; --pub type git_url_resolve_cb = -- extern "C" fn(*mut git_buf, *const c_char, c_int, *mut c_void) -> c_int; - - #[repr(C)] - pub struct git_push_update { -@@ -2233,7 +2230,7 @@ extern "C" { - source: *const git_tree, - ) -> c_int; - pub fn git_treebuilder_clear(bld: *mut git_treebuilder); -- pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> size_t; -+ pub fn git_treebuilder_entrycount(bld: *mut git_treebuilder) -> c_uint; - pub fn git_treebuilder_free(bld: *mut git_treebuilder); - pub fn git_treebuilder_get( - bld: *mut git_treebuilder, Index: shells/starship/Makefile =================================================================== --- shells/starship/Makefile +++ shells/starship/Makefile @@ -2,7 +2,7 @@ PORTNAME= starship DISTVERSION= 0.13.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= shells MASTER_SITES= CRATESIO DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Index: sysutils/exa/Makefile =================================================================== --- sysutils/exa/Makefile +++ sysutils/exa/Makefile @@ -3,7 +3,7 @@ PORTNAME= exa DISTVERSIONPREFIX= v DISTVERSION= 0.9.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= sysutils MAINTAINER= tobik@FreeBSD.org Index: sysutils/fusefs-gitfs/Makefile =================================================================== --- sysutils/fusefs-gitfs/Makefile +++ sysutils/fusefs-gitfs/Makefile @@ -2,6 +2,7 @@ PORTNAME= gitfs DISTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= sysutils devel PKGNAMEPREFIX= fusefs- @@ -24,7 +25,7 @@ GH_ACCOUNT= PressLabs NO_ARCH= yes -USES= python +USES= python:3.5+ USE_PYTHON= autoplist distutils concurrent optsuffix post-patch: Index: textproc/bat/Makefile =================================================================== --- textproc/bat/Makefile +++ textproc/bat/Makefile @@ -3,7 +3,7 @@ PORTNAME= bat DISTVERSIONPREFIX= v DISTVERSION= 0.12.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= textproc MAINTAINER= pizzamig@FreeBSD.org Index: textproc/rubygem-github-linguist/Makefile =================================================================== --- textproc/rubygem-github-linguist/Makefile +++ textproc/rubygem-github-linguist/Makefile @@ -2,6 +2,7 @@ PORTNAME= github-linguist PORTVERSION= 7.6.1 +PORTREVISION= 1 CATEGORIES= textproc rubygems MASTER_SITES= RG Index: www/gitlab-ce/Makefile =================================================================== --- www/gitlab-ce/Makefile +++ www/gitlab-ce/Makefile @@ -3,7 +3,7 @@ PORTNAME= gitlab-ce PORTVERSION= 12.8.6 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org Index: www/rubygem-gitlab-gollum-rugged_adapter/Makefile =================================================================== --- www/rubygem-gitlab-gollum-rugged_adapter/Makefile +++ www/rubygem-gitlab-gollum-rugged_adapter/Makefile @@ -2,6 +2,7 @@ PORTNAME= gitlab-gollum-rugged_adapter PORTVERSION= 0.4.4.2 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG Index: www/rubygem-gollum-rugged_adapter/Makefile =================================================================== --- www/rubygem-gollum-rugged_adapter/Makefile +++ www/rubygem-gollum-rugged_adapter/Makefile @@ -3,6 +3,7 @@ PORTNAME= gollum-rugged_adapter PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= www rubygems MASTER_SITES= RG Index: www/stagit/Makefile =================================================================== --- www/stagit/Makefile +++ www/stagit/Makefile @@ -3,6 +3,7 @@ PORTNAME= stagit PORTVERSION= 0.9.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://codemadness.org/releases/stagit/