diff --git a/devel/libgit2-glib/Makefile b/devel/libgit2-glib/Makefile index 9d6d9ecd1f42..4bb8164aa09b 100644 --- a/devel/libgit2-glib/Makefile +++ b/devel/libgit2-glib/Makefile @@ -4,11 +4,10 @@ # Also update devel/libgit2, devel/rubygem-rugged, devel/py-pygit2 PORTNAME= libgit2-glib -PORTVERSION= 0.26.0 -PORTREVISION= 2 +PORTVERSION= 0.27.7 CATEGORIES= devel gnome MASTER_SITES= GNOME -DIST_SUBDIR= gnome3 +DIST_SUBDIR= gnome MAINTAINER= gnome@FreeBSD.org COMMENT= Glib wrapper library around the libgit2 git access library @@ -19,15 +18,12 @@ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= vapigen:lang/vala LIB_DEPENDS= libgit2.so:devel/libgit2 -USES= compiler:c11 gmake libtool localbase \ - pathfix pkgconfig tar:xz -USE_GNOME= glib20 gnomeprefix introspection +USES= compiler:c11 gnome localbase \ + meson pkgconfig python:3.4+,build tar:xz +USE_GNOME= glib20 introspection USE_LDCONFIG= yes -GNU_CONFIGURE= yes INSTALLS_ICONS= yes -CONFIGURE_ARGS= --disable-python -INSTALL_TARGET= install-strip - -OPTIONS_DEFINE= DOCS +MESON_ARGS= -Dpython=false +BINARY_ALIAS= python3=${PYTHON_VERSION} .include diff --git a/devel/libgit2-glib/distinfo b/devel/libgit2-glib/distinfo index 306bc2ad0596..b7d070c86687 100644 --- a/devel/libgit2-glib/distinfo +++ b/devel/libgit2-glib/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1510681295 -SHA256 (gnome3/libgit2-glib-0.26.0.tar.xz) = 06b16cfcc3a53d9804858618d690e5509e9af2e2245b75f0479cadbbe39745c3 -SIZE (gnome3/libgit2-glib-0.26.0.tar.xz) = 420404 +TIMESTAMP = 1543786494 +SHA256 (gnome/libgit2-glib-0.27.7.tar.xz) = 1131df6d45e405756ef2d9b7613354d542ce99883f6a89582d6236d01bd2efc2 +SIZE (gnome/libgit2-glib-0.27.7.tar.xz) = 137784 diff --git a/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c b/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c deleted file mode 100644 index b7beae253cc3..000000000000 --- a/devel/libgit2-glib/files/patch-libgit2-glib_ggit-config.c +++ /dev/null @@ -1,13 +0,0 @@ -Fix the build with libgit2 0.27. - -Obtained from: https://git.archlinux.org/svntogit/packages.git/commit/trunk/libgit2-0.27.0.diff?h=packages/libgit2-glib&id=5c8af6b8236ed9a108ad980899477cb50ffeb324 ---- libgit2-glib/ggit-config.c.orig 2015-08-10 06:33:13 UTC -+++ libgit2-glib/ggit-config.c -@@ -295,6 +295,7 @@ ggit_config_add_file (GgitConfig *config, - ret = git_config_add_file_ondisk (_ggit_native_get (config), - path, - (git_config_level_t)level, -+ NULL, - force); - g_free (path); - diff --git a/devel/libgit2-glib/pkg-plist b/devel/libgit2-glib/pkg-plist index 20b913d6c147..0c00117fb4c0 100644 --- a/devel/libgit2-glib/pkg-plist +++ b/devel/libgit2-glib/pkg-plist @@ -71,69 +71,10 @@ 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.0.0 +lib/libgit2-glib-1.0.so.0.2707.0 libdata/pkgconfig/libgit2-glib-1.0.pc -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlob.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBlobOutputStream.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitBranch.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitCloneOptions.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitCommit.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitCommitParents.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitConfig.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitConfigEntry.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitCred.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitCredPlaintext.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitDiff.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitDiffDelta.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitDiffFile.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitDiffHunk.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitDiffLine.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitDiffOptions.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitIndex.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitIndexEntry.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitIndexEntryResolveUndo.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitNative.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitOId.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObject.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactory.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitObjectFactoryBase.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPatch.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitPushOptions.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRef.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRefSpec.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitReflog.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitReflogEntry.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRemote.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRepository.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitRevisionWalker.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitSignature.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitSubmodule.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitTag.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitTransferProgress.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitTree.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitTreeBuilder.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/GgitTreeEntry.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/annotation-glossary.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/api-index-deprecated.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/api-index-full.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/home.png -%%PORTDOCS%%%%DOCSDIR%%-1.0/index.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/left-insensitive.png -%%PORTDOCS%%%%DOCSDIR%%-1.0/left.png -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-Ggit-Main.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitAnnotatedCommit.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitBlameOptions.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitError.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMergeOptions.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitMessage.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0-GgitStatusOptions.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/libgit2-glib-1.0.devhelp2 -%%PORTDOCS%%%%DOCSDIR%%-1.0/right-insensitive.png -%%PORTDOCS%%%%DOCSDIR%%-1.0/right.png -%%PORTDOCS%%%%DOCSDIR%%-1.0/rn01.html -%%PORTDOCS%%%%DOCSDIR%%-1.0/style.css -%%PORTDOCS%%%%DOCSDIR%%-1.0/up-insensitive.png -%%PORTDOCS%%%%DOCSDIR%%-1.0/up.png share/gir-1.0/Ggit-1.0.gir share/vala/vapi/ggit-1.0.deps share/vala/vapi/ggit-1.0.vapi +share/vala/vapi/libgit2-glib-1.0.deps +share/vala/vapi/libgit2-glib-1.0.vapi