- Update devel/geany and devel/geany-plugins* to 1.27

- Remove patch included upstream
- Add devel/geany-plugin-lineoperations for new module

PR:		209490
Submitted by:	me
Approved by:	maintainer timeout

13 files changed, 45 insertions, 51 deletions

diff --git a/devel/Makefile b/devel/Makefile
index b684904..d9e23ef 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -622,6 +622,7 @@
     SUBDIR += geany-plugin-git-changebar
     SUBDIR += geany-plugin-insertnum
     SUBDIR += geany-plugin-latex
+    SUBDIR += geany-plugin-lineoperations
     SUBDIR += geany-plugin-lipsum
     SUBDIR += geany-plugin-lua
     SUBDIR += geany-plugin-macro
diff --git a/devel/geany-plugin-geanypy/pkg-plist b/devel/geany-plugin-geanypy/pkg-plist
index dd97e91..b56346f 100644
--- a/devel/geany-plugin-geanypy/pkg-plist
+++ b/devel/geany-plugin-geanypy/pkg-plist
@@ -1,12 +1,11 @@
 lib/geany/geanypy.so
+lib/geany/console.py
+lib/geany/demo.py
+lib/geany/hello.py
 lib/geany/geanypy/geany/__init__.py
 lib/geany/geanypy/geany/__init__.pyc
 lib/geany/geanypy/geany/console.py
 lib/geany/geanypy/geany/console.pyc
-lib/geany/geanypy/geany/loader.py
-lib/geany/geanypy/geany/loader.pyc
-lib/geany/geanypy/geany/manager.py
-lib/geany/geanypy/geany/manager.pyc
 lib/geany/geanypy/geany/plugin.py
 lib/geany/geanypy/geany/plugin.pyc
 lib/geany/geanypy/geany/signalmanager.py
@@ -16,6 +15,3 @@ lib/geany/geanypy/geany/signalmanager.pyc
 %%PORTDOCS%%%%DOCSDIR%%/geanypy/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/geanypy/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/geanypy/README
-share/geany/geanypy/plugins/console.py
-share/geany/geanypy/plugins/demo.py
-share/geany/geanypy/plugins/hello.py
diff --git a/devel/geany-plugin-geniuspaste/pkg-plist b/devel/geany-plugin-geniuspaste/pkg-plist
index 538ce0b..3bd2e4e 100644
--- a/devel/geany-plugin-geniuspaste/pkg-plist
+++ b/devel/geany-plugin-geniuspaste/pkg-plist
@@ -1,4 +1,11 @@
 lib/geany/geniuspaste.so
+%%DATADIR%%/geniuspaste/pastebins/codepad.org.conf
+%%DATADIR%%/geniuspaste/pastebins/dpaste.de.conf
+%%DATADIR%%/geniuspaste/pastebins/fpaste.org.conf
+%%DATADIR%%/geniuspaste/pastebins/paste.debian.net.conf
+%%DATADIR%%/geniuspaste/pastebins/pastebin.geany.org.conf
+%%DATADIR%%/geniuspaste/pastebins/sprunge.us.conf
+%%DATADIR%%/geniuspaste/pastebins/tinypaste.com.conf
 %%DOCSDIR%%/geniuspaste/AUTHORS
 %%DOCSDIR%%/geniuspaste/COPYING
 %%DOCSDIR%%/geniuspaste/ChangeLog
diff --git a/devel/geany-plugin-git-changebar/files/patch-libgit023 b/devel/geany-plugin-git-changebar/files/patch-libgit023
deleted file mode 100644
index 84a0aac..0000000
--- a/devel/geany-plugin-git-changebar/files/patch-libgit023
+++ /dev/null
@@ -1,38 +0,0 @@
-commit 37aa25a1a4508c3d7559c0a2d00663b9c8d322c6
-Author: Colomban Wendling <ban@herbesfolles.org>
-Date:   Thu Sep 10 14:29:14 2015 +0200
-
-    git-changebar: Add support for libgit2 >= 0.23
-    
-    Closes #283.
-
-diff --git git-changebar/src/gcb-plugin.c git-changebar/src/gcb-plugin.c
-index 81393c2..6f42a3e 100644
---- git-changebar/src/gcb-plugin.c
-+++ git-changebar/src/gcb-plugin.c
-@@ -36,6 +36,15 @@
- # define git_libgit2_init     git_threads_init
- # define git_libgit2_shutdown git_threads_shutdown
- #endif
-+#if ! defined (LIBGIT2_SOVERSION) || LIBGIT2_SOVERSION < 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, \
-+                          file_cb, binary_cb, hunk_cb, line_cb, payload) \
-+  git_diff_buffers (old_buffer, old_len, old_as_path, \
-+                    new_buffer, new_len, new_as_path, options, \
-+                    file_cb, hunk_cb, line_cb, payload)
-+#endif
- 
- 
- GeanyPlugin      *geany_plugin;
-@@ -656,7 +665,8 @@ diff_buf_to_doc (const git_buf   *old_buf,
-   opts.flags = GIT_DIFF_FORCE_TEXT;
-   
-   ret = git_diff_buffers (old_buf->ptr, old_buf->size, NULL,
--                          buf, len, NULL, &opts, NULL, hunk_cb, NULL, payload);
-+                          buf, len, NULL, &opts, NULL, NULL, hunk_cb, NULL,
-+                          payload);
-   
-   if (free_buf) {
-     g_free (buf);
diff --git a/devel/geany-plugin-lineoperations/Makefile b/devel/geany-plugin-lineoperations/Makefile
new file mode 100644
index 0000000..3798b7b
--- /dev/null
+++ b/devel/geany-plugin-lineoperations/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-lineoperations
+PORTVERSION=	${GEANY_VER}
+CATEGORIES=	devel
+
+MAINTAINER=	makc@FreeBSD.org
+COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
+
+.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+.include <bsd.port.mk>
diff --git a/devel/geany-plugin-lineoperations/pkg-descr b/devel/geany-plugin-lineoperations/pkg-descr
new file mode 100644
index 0000000..283dc5b
--- /dev/null
+++ b/devel/geany-plugin-lineoperations/pkg-descr
@@ -0,0 +1,4 @@
+Line Operations is an assortment of simple line functions that can
+be applied to an open file.
+
+WWW: http://plugins.geany.org/lineoperations.html
diff --git a/devel/geany-plugin-lineoperations/pkg-plist b/devel/geany-plugin-lineoperations/pkg-plist
new file mode 100644
index 0000000..0d9f35b
--- /dev/null
+++ b/devel/geany-plugin-lineoperations/pkg-plist
@@ -0,0 +1,6 @@
+lib/geany/lineoperations.so
+%%DOCSDIR%%/lineoperations/AUTHORS
+%%DOCSDIR%%/lineoperations/COPYING
+%%DOCSDIR%%/lineoperations/ChangeLog
+%%DOCSDIR%%/lineoperations/NEWS
+%%DOCSDIR%%/lineoperations/README
diff --git a/devel/geany-plugins-l10n/pkg-plist b/devel/geany-plugins-l10n/pkg-plist
index e3b5a03..a330b26 100644
--- a/devel/geany-plugins-l10n/pkg-plist
+++ b/devel/geany-plugins-l10n/pkg-plist
@@ -7,6 +7,7 @@ share/locale/fr/LC_MESSAGES/geany-plugins.mo
 share/locale/gl/LC_MESSAGES/geany-plugins.mo
 share/locale/it/LC_MESSAGES/geany-plugins.mo
 share/locale/ja/LC_MESSAGES/geany-plugins.mo
+share/locale/kk/LC_MESSAGES/geany-plugins.mo
 share/locale/nl/LC_MESSAGES/geany-plugins.mo
 share/locale/pt/LC_MESSAGES/geany-plugins.mo
 share/locale/pt_BR/LC_MESSAGES/geany-plugins.mo
diff --git a/devel/geany-plugins/distinfo b/devel/geany-plugins/distinfo
index f44bddc..d53dde3 100644
--- a/devel/geany-plugins/distinfo
+++ b/devel/geany-plugins/distinfo
@@ -1,2 +1,3 @@
-SHA256 (geany-plugins-1.25.tar.bz2) = 5c13ac1e173284462248ed2faae389a72364c5aa1538de628d2aaa7d286e244b
-SIZE (geany-plugins-1.25.tar.bz2) = 3230888
+TIMESTAMP = 1463152201
+SHA256 (geany-plugins-1.27.tar.bz2) = 03195a0b7a361ddb2ee4138f46fa87b6d9b9801ff00657456ab9c8b8908c0ce0
+SIZE (geany-plugins-1.27.tar.bz2) = 3196783
diff --git a/devel/geany-plugins/files/bsd.geany-plugins.mk b/devel/geany-plugins/files/bsd.geany-plugins.mk
index 18647a8..9e161504 100644
--- a/devel/geany-plugins/files/bsd.geany-plugins.mk
+++ b/devel/geany-plugins/files/bsd.geany-plugins.mk
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-GEANY_VER=	1.25
+GEANY_VER=	1.27
 GEANY_PLUGINS_ALL=	addons \
 			autoclose \
 			automark \
@@ -18,6 +18,7 @@ GEANY_PLUGINS_ALL=	addons \
 			git-changebar \
 			insertnum \
 			latex \
+			lineoperations \
 			lipsum \
 			lua \
 			macro \
@@ -60,6 +61,7 @@ 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
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 1e42cc0..e97e738 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geany
-PORTVERSION=	1.25
+PORTVERSION=	1.27
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF
 
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 69d89df..c69b792 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,2 +1,3 @@
-SHA256 (geany-1.25.tar.bz2) = 8ee41da28cead8c94d433e616d7ababa81727c63e9196ca6758ade3af14a49ef
-SIZE (geany-1.25.tar.bz2) = 4149876
+TIMESTAMP = 1463152025
+SHA256 (geany-1.27.tar.bz2) = 846ff699a5944c5c3c068ae0199d4c13946a668bfc6d03f8c79765667c20cadf
+SIZE (geany-1.27.tar.bz2) = 4303534
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index df22ff1..b52b400 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -20,6 +20,7 @@ include/geany/pluginutils.h
 include/geany/prefs.h
 include/geany/project.h
 include/geany/scintilla/SciLexer.h
+include/geany/scintilla/Sci_Position.h
 include/geany/scintilla/Scintilla.h
 include/geany/scintilla/Scintilla.iface
 include/geany/scintilla/ScintillaWidget.h
@@ -29,6 +30,7 @@ include/geany/spawn.h
 include/geany/stash.h
 include/geany/support.h
 include/geany/symbols.h
+include/geany/tagmanager/tm_parser.h
 include/geany/tagmanager/tm_source_file.h
 include/geany/tagmanager/tm_tag.h
 include/geany/tagmanager/tm_tagmanager.h