diff --git a/devel/geany-plugin-addons/Makefile b/devel/geany-plugin-addons/Makefile index d26c95cd8638..9ada60ea18cd 100644 --- a/devel/geany-plugin-addons/Makefile +++ b/devel/geany-plugin-addons/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-addons PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/addons.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-autoclose/Makefile b/devel/geany-plugin-autoclose/Makefile index c0dfa1623b63..44b831bd4630 100644 --- a/devel/geany-plugin-autoclose/Makefile +++ b/devel/geany-plugin-autoclose/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-autoclose PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/autoclose.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-automark/Makefile b/devel/geany-plugin-automark/Makefile index d52b0244af20..b7253efa89f2 100644 --- a/devel/geany-plugin-automark/Makefile +++ b/devel/geany-plugin-automark/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-automark PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/automark.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-codenav/Makefile b/devel/geany-plugin-codenav/Makefile index f00b0a2905fb..0d41f19ea86b 100644 --- a/devel/geany-plugin-codenav/Makefile +++ b/devel/geany-plugin-codenav/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-codenav PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/codenav.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-commander/Makefile b/devel/geany-plugin-commander/Makefile index eac836ce841f..c0cfd5e15730 100644 --- a/devel/geany-plugin-commander/Makefile +++ b/devel/geany-plugin-commander/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-commander PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/commander.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-ctags/Makefile b/devel/geany-plugin-ctags/Makefile index ca9bf005dc33..752098abb230 100644 --- a/devel/geany-plugin-ctags/Makefile +++ b/devel/geany-plugin-ctags/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-ctags PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanyctags.html RUN_DEPENDS= exctags:devel/ctags .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-debugger/Makefile b/devel/geany-plugin-debugger/Makefile index 8b57443d7eb6..0955fca30d71 100644 --- a/devel/geany-plugin-debugger/Makefile +++ b/devel/geany-plugin-debugger/Makefile @@ -1,15 +1,14 @@ PORTNAME= geany-plugin-debugger PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/debugger.html USES= gnome xorg USE_XORG= x11 xext USE_GNOME= vte3 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-defineformat/Makefile b/devel/geany-plugin-defineformat/Makefile index dca26230f281..3296b0a899e7 100644 --- a/devel/geany-plugin-defineformat/Makefile +++ b/devel/geany-plugin-defineformat/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-defineformat PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/defineformat.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-doc/Makefile b/devel/geany-plugin-doc/Makefile index b059a0d0b42c..0a6bc6d76544 100644 --- a/devel/geany-plugin-doc/Makefile +++ b/devel/geany-plugin-doc/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-doc PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanydoc.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-extrasel/Makefile b/devel/geany-plugin-extrasel/Makefile index 2d55207bc3d6..5fbd1bea47d3 100644 --- a/devel/geany-plugin-extrasel/Makefile +++ b/devel/geany-plugin-extrasel/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-extrasel PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanyextrasel.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-gendoc/Makefile b/devel/geany-plugin-gendoc/Makefile index 71ea4de5b978..069500216af7 100644 --- a/devel/geany-plugin-gendoc/Makefile +++ b/devel/geany-plugin-gendoc/Makefile @@ -1,14 +1,13 @@ PORTNAME= geany-plugin-gendoc PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanygendoc.html LIB_DEPENDS= libctpl.so:textproc/ctpl RUN_DEPENDS= ${LOCALBASE}/bin/rst2html:textproc/py-docutils .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-geniuspaste/Makefile b/devel/geany-plugin-geniuspaste/Makefile index c4bf6273076a..bb5e65f3c8dd 100644 --- a/devel/geany-plugin-geniuspaste/Makefile +++ b/devel/geany-plugin-geniuspaste/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-geniuspaste PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geniuspaste.html LIB_DEPENDS= libsoup-2.4.so:devel/libsoup .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-git-changebar/Makefile b/devel/geany-plugin-git-changebar/Makefile index 836e837bac9c..5cdbd552109a 100644 --- a/devel/geany-plugin-git-changebar/Makefile +++ b/devel/geany-plugin-git-changebar/Makefile @@ -1,15 +1,14 @@ PORTNAME= geany-plugin-git-changebar PORTVERSION= ${GEANY_VER} -PORTREVISION= 3 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/git-changebar.html LIB_DEPENDS= libgit2.so:devel/libgit2 OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-git-changebar/files/patch-git-changebar_src_gcb-plugin.c b/devel/geany-plugin-git-changebar/files/patch-git-changebar_src_gcb-plugin.c deleted file mode 100644 index 50e1498290e3..000000000000 --- a/devel/geany-plugin-git-changebar/files/patch-git-changebar_src_gcb-plugin.c +++ /dev/null @@ -1,137 +0,0 @@ ---- git-changebar/src/gcb-plugin.c.orig 2021-09-19 13:29:36 UTC -+++ git-changebar/src/gcb-plugin.c -@@ -32,11 +32,19 @@ - #include - #include - --#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 22) ) -+#ifdef LIBGIT2_VER_MINOR -+# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) \ -+ ((LIBGIT2_VER_MAJOR == (MAJOR) && LIBGIT2_VER_MINOR >= (MINOR)) || \ -+ LIBGIT2_VER_MAJOR > (MAJOR)) -+#else /* ! defined(LIBGIT2_VER_MINOR) */ -+# define CHECK_LIBGIT2_VERSION(MAJOR, MINOR) 0 -+#endif -+ -+#if ! CHECK_LIBGIT2_VERSION(0, 22) - # define git_libgit2_init git_threads_init - # define git_libgit2_shutdown git_threads_shutdown - #endif --#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 23) ) -+#if ! CHECK_LIBGIT2_VERSION(0, 23) - /* 0.23 added @p binary_cb */ - # define git_diff_buffers(old_buffer, old_len, old_as_path, \ - new_buffer, new_len, new_as_path, options, \ -@@ -45,7 +53,7 @@ - new_buffer, new_len, new_as_path, options, \ - file_cb, hunk_cb, line_cb, payload) - #endif --#if ! defined (LIBGIT2_VER_MINOR) || ( (LIBGIT2_VER_MAJOR == 0) && (LIBGIT2_VER_MINOR < 28) ) -+#if ! CHECK_LIBGIT2_VERSION(0, 28) - # define git_buf_dispose git_buf_free - # define git_error_last giterr_last - #endif -@@ -211,30 +219,19 @@ static const struct { - }; - - --/* workaround https://github.com/libgit2/libgit2/pull/3187 */ --static int --gcb_git_buf_grow (git_buf *buf, -- size_t target_size) --{ -- if (buf->asize == 0) { -- if (target_size == 0) { -- target_size = buf->size; -- } -- if ((target_size & 7) == 0) { -- target_size++; -- } -- } -- return git_buf_grow (buf, target_size); --} --#define git_buf_grow gcb_git_buf_grow -- - static void - buf_zero (git_buf *buf) - { - if (buf) { - buf->ptr = NULL; - buf->size = 0; -+#if ! CHECK_LIBGIT2_VERSION(1, 4) - buf->asize = 0; -+#else -+ /* we don't really need this field, but the documentation states that all -+ * fields should be set to 0, so fill it as well */ -+ buf->reserved = 0; -+#endif - } - } - -@@ -248,6 +245,52 @@ clear_cached_blob_contents (void) - G_blob_contents_tag = 0; - } - -+/* similar to old git_blob_filtered_content() but makes sure the caller owns -+ * the data in the output buffer -- and uses a boolean return */ -+static gboolean -+get_blob_contents (git_buf *out, -+ git_blob *blob, -+ const char *as_path, -+ int check_for_binary_data) -+{ -+/* libgit2 1.4 changed buffer API quite a bit */ -+#if ! CHECK_LIBGIT2_VERSION(1, 4) -+ gboolean success = TRUE; -+ -+ if (git_blob_filtered_content (out, blob, as_path, -+ check_for_binary_data) != 0) -+ return FALSE; -+ -+ /* Workaround for https://github.com/libgit2/libgit2/pull/3187 -+ * We want to own the buffer, which git_buf_grow(buf, 0) was supposed to do, -+ * but there is a corner case where it doesn't do what it should and -+ * truncates the buffer contents, so we fix this manually. */ -+ if (out->asize == 0) { -+ size_t target_size = out->size; -+ if ((target_size & 7) == 0) { -+ target_size++; -+ } -+ success = (git_buf_grow (out, target_size) == 0); -+ } -+ -+ return success; -+#else /* libgit2 >= 1.4 */ -+ /* Here we can assume we will always get a buffer we own (at least as of -+ * 2022-06-05 it is the case), so there's no need for a pendent to the -+ * previous git_buf_grow() shenanigans. -+ * This code path does the same as the older git_blob_filtered_content() -+ * but with non-deprecated API */ -+ git_blob_filter_options opts = GIT_BLOB_FILTER_OPTIONS_INIT; -+ -+ if (check_for_binary_data) -+ opts.flags |= GIT_BLOB_FILTER_CHECK_FOR_BINARY; -+ else -+ opts.flags &= ~GIT_BLOB_FILTER_CHECK_FOR_BINARY; -+ -+ return git_blob_filter(out, blob, as_path, &opts) == 0; -+#endif -+} -+ - /* get the file blob for @relpath at HEAD */ - static gboolean - repo_get_file_blob_contents (git_repository *repo, -@@ -271,11 +314,8 @@ repo_get_file_blob_contents (git_repository *repo, - git_blob *blob; - - if (git_blob_lookup (&blob, repo, git_tree_entry_id (entry)) == 0) { -- if (git_blob_filtered_content (contents, blob, relpath, -- check_for_binary_data) == 0 && -- git_buf_grow (contents, 0) == 0) { -- success = TRUE; -- } -+ success = get_blob_contents (contents, blob, relpath, -+ check_for_binary_data); - git_blob_free (blob); - } - git_tree_entry_free (entry); diff --git a/devel/geany-plugin-insertnum/Makefile b/devel/geany-plugin-insertnum/Makefile index 039724ca0154..83c6ee5c7568 100644 --- a/devel/geany-plugin-insertnum/Makefile +++ b/devel/geany-plugin-insertnum/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-insertnum PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanyinsertnum.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-latex/Makefile b/devel/geany-plugin-latex/Makefile index 94c2c8b69753..a919ea739a51 100644 --- a/devel/geany-plugin-latex/Makefile +++ b/devel/geany-plugin-latex/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-latex PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanylatex.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-lineoperations/Makefile b/devel/geany-plugin-lineoperations/Makefile index 665c66d45cce..d34022f5b42c 100644 --- a/devel/geany-plugin-lineoperations/Makefile +++ b/devel/geany-plugin-lineoperations/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-lineoperations PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/lineoperations.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-lipsum/Makefile b/devel/geany-plugin-lipsum/Makefile index cef6fc1e3529..ad29155bce6b 100644 --- a/devel/geany-plugin-lipsum/Makefile +++ b/devel/geany-plugin-lipsum/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-lipsum PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanylipsum.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-lua/Makefile b/devel/geany-plugin-lua/Makefile index 68fead90e292..ccfbd566f1af 100644 --- a/devel/geany-plugin-lua/Makefile +++ b/devel/geany-plugin-lua/Makefile @@ -1,17 +1,16 @@ PORTNAME= geany-plugin-lua PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanylua.html USES= lua:51 shebangfix SHEBANG_FILES= geanylua/util/mkiface.lua \ geanylua/util/mk-keytab.lua \ geanylua/util/keywords.lua .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-macro/Makefile b/devel/geany-plugin-macro/Makefile index 6112097cb362..1d1a75ca8532 100644 --- a/devel/geany-plugin-macro/Makefile +++ b/devel/geany-plugin-macro/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-macro PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanymacro.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-markdown/Makefile b/devel/geany-plugin-markdown/Makefile index 5f2cfe6a2dec..2a1cf73f995f 100644 --- a/devel/geany-plugin-markdown/Makefile +++ b/devel/geany-plugin-markdown/Makefile @@ -1,16 +1,15 @@ PORTNAME= geany-plugin-markdown PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/markdown.html LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-miniscript/Makefile b/devel/geany-plugin-miniscript/Makefile index 417b8a1ccf06..255e4cdadef3 100644 --- a/devel/geany-plugin-miniscript/Makefile +++ b/devel/geany-plugin-miniscript/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-miniscript PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanyminiscript.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-numberedbookmarks/Makefile b/devel/geany-plugin-numberedbookmarks/Makefile index 391dd85b88d5..11d2436f7c09 100644 --- a/devel/geany-plugin-numberedbookmarks/Makefile +++ b/devel/geany-plugin-numberedbookmarks/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-numberedbookmarks PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanynumberedbookmarks.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-overview/Makefile b/devel/geany-plugin-overview/Makefile index af376d419f68..12ec54d41812 100644 --- a/devel/geany-plugin-overview/Makefile +++ b/devel/geany-plugin-overview/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-overview PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/overview.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-pairtaghighlighter/Makefile b/devel/geany-plugin-pairtaghighlighter/Makefile index 0a79f7f63522..33778ed18d25 100644 --- a/devel/geany-plugin-pairtaghighlighter/Makefile +++ b/devel/geany-plugin-pairtaghighlighter/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-pairtaghighlighter PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/pairtaghighlighter.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile index e23a4372d4aa..f8a03d2b4f90 100644 --- a/devel/geany-plugin-pg/Makefile +++ b/devel/geany-plugin-pg/Makefile @@ -1,16 +1,15 @@ PORTNAME= geany-plugin-pg PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanypg.html LIB_DEPENDS= libgpgme.so:security/gpgme \ libassuan.so:security/libassuan \ libgpg-error.so:security/libgpg-error RUN_DEPENDS= gpg2:security/gnupg .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-pohelper/Makefile b/devel/geany-plugin-pohelper/Makefile index 6b0760e86292..4650e1658add 100644 --- a/devel/geany-plugin-pohelper/Makefile +++ b/devel/geany-plugin-pohelper/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-pohelper PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/pohelper.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-pretty-printer/Makefile b/devel/geany-plugin-pretty-printer/Makefile index 39709e29bf3a..02edf40a093f 100644 --- a/devel/geany-plugin-pretty-printer/Makefile +++ b/devel/geany-plugin-pretty-printer/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-pretty-printer PORTVERSION= ${GEANY_VER} -PORTREVISION= 3 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/pretty-printer.html USE_GNOME= libxml2 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-prj/Makefile b/devel/geany-plugin-prj/Makefile index 4a64dd4341b8..3b68fb0fc8ff 100644 --- a/devel/geany-plugin-prj/Makefile +++ b/devel/geany-plugin-prj/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-prj PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanyprj.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-projectorganizer/Makefile b/devel/geany-plugin-projectorganizer/Makefile index dabe40f4dc62..b68b9190f2ff 100644 --- a/devel/geany-plugin-projectorganizer/Makefile +++ b/devel/geany-plugin-projectorganizer/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-projectorganizer PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/projectorganizer.html OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-scope/Makefile b/devel/geany-plugin-scope/Makefile index 539018eb493a..39f6d647aef2 100644 --- a/devel/geany-plugin-scope/Makefile +++ b/devel/geany-plugin-scope/Makefile @@ -1,18 +1,14 @@ PORTNAME= geany-plugin-scope PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/scope.html -LIB_DEPENDS= libpcre2-8.so:devel/pcre2 \ - libgnutls.so:security/gnutls - USES= gnome xorg USE_XORG= x11 xext USE_GNOME= vte3 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-scope/files/patch-scope_src_stack.c b/devel/geany-plugin-scope/files/patch-scope_src_stack.c deleted file mode 100644 index 9bf9045ab218..000000000000 --- a/devel/geany-plugin-scope/files/patch-scope_src_stack.c +++ /dev/null @@ -1,30 +0,0 @@ -From 0a4e3146cc97517ae09c1d854973ca26e46af33b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 30 Aug 2022 22:33:46 -0700 -Subject: [PATCH] scope: Use FALSE instead of NULL for gboolean - -Fixes warnings with clang 15+ - -scope/src/stack.c:168:11: error: incompatible pointer to integer conversion initializing 'gboolean' (aka 'int') with an expression of type 'void *' [-Wint-conversion] - gboolean entry = NULL; - ^ ~~~~ -1 error generated. - -Signed-off-by: Khem Raj ---- - scope/src/stack.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scope/src/stack.c b/scope/src/stack.c -index b03909feb..ce6e2a472 100644 ---- scope/src/stack.c -+++ scope/src/stack.c -@@ -165,7 +165,7 @@ void on_stack_follow(GArray *nodes) - gboolean stack_entry(void) - { - GtkTreeIter iter; -- gboolean entry = NULL; -+ gboolean entry = FALSE; - - if (gtk_tree_selection_get_selected(selection, NULL, &iter)) - { diff --git a/devel/geany-plugin-sendmail/Makefile b/devel/geany-plugin-sendmail/Makefile index 497ac1383c63..55a462f5c0ac 100644 --- a/devel/geany-plugin-sendmail/Makefile +++ b/devel/geany-plugin-sendmail/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-sendmail PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanysendmail.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-shiftcolumn/Makefile b/devel/geany-plugin-shiftcolumn/Makefile index f002323070b3..f9b96fda2a25 100644 --- a/devel/geany-plugin-shiftcolumn/Makefile +++ b/devel/geany-plugin-shiftcolumn/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-shiftcolumn PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/shiftcolumn.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-spellcheck/Makefile b/devel/geany-plugin-spellcheck/Makefile index 38baa3a1344b..4eb9b46c22a3 100644 --- a/devel/geany-plugin-spellcheck/Makefile +++ b/devel/geany-plugin-spellcheck/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-spellcheck PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/spellcheck.html LIB_DEPENDS= libenchant.so:textproc/enchant .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-tableconvert/Makefile b/devel/geany-plugin-tableconvert/Makefile index 06c5059672b1..afa0e5640c6c 100644 --- a/devel/geany-plugin-tableconvert/Makefile +++ b/devel/geany-plugin-tableconvert/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-tableconvert PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/tableconvert.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-treebrowser/Makefile b/devel/geany-plugin-treebrowser/Makefile index 4434610c7ee6..0230112d663c 100644 --- a/devel/geany-plugin-treebrowser/Makefile +++ b/devel/geany-plugin-treebrowser/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-treebrowser PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/treebrowser.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-updatechecker/Makefile b/devel/geany-plugin-updatechecker/Makefile index 030634c154cf..7cb2cd1282ec 100644 --- a/devel/geany-plugin-updatechecker/Makefile +++ b/devel/geany-plugin-updatechecker/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-updatechecker PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/updatechecker.html LIB_DEPENDS= libsoup-2.4.so:devel/libsoup .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-utilslib/Makefile b/devel/geany-plugin-utilslib/Makefile index 9536fc104597..852920defabf 100644 --- a/devel/geany-plugin-utilslib/Makefile +++ b/devel/geany-plugin-utilslib/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-utilslib PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/ OPTIONS_DEFINE= DOCS .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile index 08345a4916cf..fddee5d65402 100644 --- a/devel/geany-plugin-vc/Makefile +++ b/devel/geany-plugin-vc/Makefile @@ -1,20 +1,19 @@ PORTNAME= geany-plugin-vc PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/geanyvc.html LIB_DEPENDS= libgtkspell3-3.so:textproc/gtkspell3 \ libenchant-2.so:textproc/enchant2 OPTIONS_DEFINE= GTKSPELL OPTIONS_DEFAULT= GTKSPELL GTKSPELL_DESC= Spell checking support via GtkSpell GTKSPELL_CONFIGURE_ENABLE= gtkspell .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-vimode/Makefile b/devel/geany-plugin-vimode/Makefile index df5552e232eb..f32ba46902fc 100644 --- a/devel/geany-plugin-vimode/Makefile +++ b/devel/geany-plugin-vimode/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-vimode PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/vimode.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-workbench/Makefile b/devel/geany-plugin-workbench/Makefile index 6f62df75ae6d..2e19eb119f52 100644 --- a/devel/geany-plugin-workbench/Makefile +++ b/devel/geany-plugin-workbench/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugin-workbench PORTVERSION= ${GEANY_VER} -PORTREVISION= 3 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/workbench.html LIB_DEPENDS= libgit2.so:devel/libgit2 .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugin-xmlsnippets/Makefile b/devel/geany-plugin-xmlsnippets/Makefile index 5fc0d200c3d5..62e81acb5874 100644 --- a/devel/geany-plugin-xmlsnippets/Makefile +++ b/devel/geany-plugin-xmlsnippets/Makefile @@ -1,11 +1,10 @@ PORTNAME= geany-plugin-xmlsnippets PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Geany plugin: ${${GEANY_PLUGIN}_DESC} WWW= https://plugins.geany.org/xmlsnippets.html .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugins-l10n/Makefile b/devel/geany-plugins-l10n/Makefile index f368227bdc6a..6a9bbff7e781 100644 --- a/devel/geany-plugins-l10n/Makefile +++ b/devel/geany-plugins-l10n/Makefile @@ -1,13 +1,12 @@ PORTNAME= geany-plugins-l10n PORTVERSION= ${GEANY_VER} -PORTREVISION= 1 CATEGORIES= devel MAINTAINER= madpilot@FreeBSD.org COMMENT= Localization messages for Geany plugins WWW= https://plugins.geany.org NO_ARCH= yes .include "${.CURDIR}/../geany-plugins/files/Makefile.common" .include diff --git a/devel/geany-plugins/distinfo b/devel/geany-plugins/distinfo index d98c08523b83..fe7e26162bca 100644 --- a/devel/geany-plugins/distinfo +++ b/devel/geany-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1633817856 -SHA256 (geany-plugins-1.38.tar.bz2) = 1c578a7ebb390aa8882f195acd3d8da3ceb73925d291b28dec90cd3e5fd20586 -SIZE (geany-plugins-1.38.tar.bz2) = 3414888 +TIMESTAMP = 1697738173 +SHA256 (geany-plugins-2.0.tar.bz2) = 9fc2ec5c99a74678fb9e8cdfbd245d3e2061a448d70fd110a6aefb62dd514705 +SIZE (geany-plugins-2.0.tar.bz2) = 3181264 diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common index 7c7211aa0fd6..71d0b10c57a4 100644 --- a/devel/geany-plugins/files/Makefile.common +++ b/devel/geany-plugins/files/Makefile.common @@ -1,52 +1,52 @@ .include "${.CURDIR}/../../devel/geany-plugins/files/bsd.geany-plugins.mk" MASTER_SITES= http://plugins.geany.org/geany-plugins/ DISTNAME= geany-plugins-${PORTVERSION} DISTINFO_FILE= ${.CURDIR}/../../devel/geany-plugins/distinfo GNU_CONFIGURE= yes USES+= gettext-tools gmake gnome libtool pkgconfig tar:bzip2 -USE_GNOME+= gtk30 intltool +USE_GNOME+= intltool -LIB_DEPENDS+= libgeany.so:devel/geany \ - libharfbuzz.so:print/harfbuzz +LIB_DEPENDS+= libgeany.so:devel/geany # geany-plugins-l10n is not a plugin, thus special treatment .if ${PORTNAME} == "geany-plugins-l10n" GEANY_PLUGIN= po po_SWITCH= --enable-nls USES+= localbase .else .if ${PORTNAME} == "geany-plugin-markdown" # required by this plugin on GCC only archs USES+= compiler:c++11-lang .endif INSTALL_TARGET= install-strip -USE_GNOME+= cairo gdkpixbuf2 +LIB_DEPENDS+= libharfbuzz.so:print/harfbuzz +USE_GNOME+= cairo gdkpixbuf2 gtk30 .endif GEANY_PLUGIN?= ${PORTNAME:S,geany-plugin-,,} ${GEANY_PLUGIN}_DIR?= ${GEANY_PLUGIN} ${GEANY_PLUGIN}_SWITCH?= --enable-${${GEANY_PLUGIN}_DIR} CONFIGURE_ARGS+= ${${GEANY_PLUGIN}_SWITCH} BUILD_WRKSRC= ${WRKSRC}/${${GEANY_PLUGIN}_DIR} INSTALL_WRKSRC= ${BUILD_WRKSRC} DATADIR= share/geany-plugins DOCSDIR= share/doc/geany-plugins .if ${GEANY_UTIL:M${GEANY_PLUGIN}} LIB_DEPENDS+= libgeanypluginutils.so:devel/geany-plugin-utilslib CONFIGURE_ARGS+= --enable-utilslib pre-build: (cd ${WRKSRC}/utils; ${DO_MAKE_BUILD} ${ALL_TARGET}) .endif post-configure: ${FIND} ${BUILD_WRKSRC} -name Makefile | ${XARGS} \ ${REINPLACE_CMD} -e '/^geanypluginsdir/s,${LOCALBASE},${PREFIX},' diff --git a/devel/geany-plugins/files/bsd.geany-plugins.mk b/devel/geany-plugins/files/bsd.geany-plugins.mk index 3235d7247e42..74541f2670b8 100644 --- a/devel/geany-plugins/files/bsd.geany-plugins.mk +++ b/devel/geany-plugins/files/bsd.geany-plugins.mk @@ -1,105 +1,105 @@ -GEANY_VER= 1.38 +GEANY_VER= 2.0 GEANY_PLUGINS= addons \ autoclose \ automark \ codenav \ commander \ ctags \ debugger \ defineformat \ doc \ extrasel \ gendoc \ geniuspaste \ git-changebar \ insertnum \ latex \ lineoperations \ lipsum \ lua \ macro \ markdown \ miniscript \ numberedbookmarks \ overview \ pairtaghighlighter \ pg \ pohelper \ pretty-printer \ projectorganizer \ prj \ scope \ sendmail \ shiftcolumn \ spellcheck \ tableconvert \ treebrowser \ updatechecker \ vc \ vimode \ workbench \ xmlsnippets addons_DESC= various small addons autoclose_DESC= brackets autocompletion automark_DESC= highlights all words that match selected word codenav_DESC= some facilities for navigating in the code commander_DESC= command panel for rapid access to any action ctags_DESC= generate and query ctags files debugger_DESC= debugging support (via GDB currently) defineformat_DESC= on-the-fly \#define formatter doc_DESC= execute command on the word at cursor position extrasel_DESC= additional selection tools gendoc_DESC= generate documentation from the sources comments geniuspaste_DESC= pastebins support git-changebar_DESC= highlight changed files tracked with Git insertnum_DESC= replace selection with integer numbers latex_DESC= LaTeX support lineoperations_DESC= Simple line functions that can be applied to an open file lipsum_DESC= Lorem Ipsum generator lua_DESC= Lua scripting macro_DESC= user defined macros markdown_DESC= real-time preview of rendered Markdown miniscript_DESC= pipe text/documents via script (shell, perl, awk, etc.) numberedbookmarks_DESC= additional numbered bookmarks overview_DESC= zoomed-out view of open files pairtaghighlighter_DESC= highlight matching opening/closing HTML tags pg_DESC= encrypt, decrypt and verify signatures with GnuPG pohelper_DESC= support for gettext translation files pretty-printer_DESC= formats XML and make it human-readable projectorganizer_DESC= extension of Geany's project management prj_DESC= alternative project manager scope_DESC= graphical GDB front-end sendmail_DESC= send a document as attachment shiftcolumn_DESC= move blocks of text horizontally spellcheck_DESC= spell check via Enchant tableconvert_DESC= convert tabulator separated selection into a table treebrowser_DESC= alternate file browser updatechecker_DESC= check for new version of Geany utilslib_DESC= utility library vc_DESC= access to different version-control systems vimode_DESC= vim-mode plugin for Geany written by a guy who does not use Vim workbench_DESC= manage multiple projects in geany xmlsnippets_DESC= XML/HTML tag autocompletion doc_DIR= geanydoc ctags_DIR= geanyctags extrasel_DIR= geanyextrasel gendoc_DIR= geanygendoc insertnum_DIR= geanyinsertnum latex_DIR= latex lipsum_DIR= lipsum lua_DIR= geanylua macro_DIR= geanymacro miniscript_DIR= geanyminiscript numberedbookmarks_DIR= geanynumberedbookmarks pg_DIR= geanypg prj_DIR= geanyprj utilslib_DIR= utils vc_DIR= geanyvc git-changebar_SWITCH= --enable-gitchangebar pretty-printer_SWITCH= --enable-pretty_printer GEANY_UTIL= debugger numberedbookmarks scope treebrowser workbench