devel/geany:

- Update to 1.24.1
- Fix build without NLS option [1]
- Convert to options helpers

devel/geany-plugin*:
- Update to 1.24, add new plugins:
   geany-plugin-autoclose
   geany-plugin-defineformat
   geany-plugin-geanypy
   geany-plugin-pairtaghighlighter
   geany-plugin-pohelper
- Fix build without NLS option

Reported by:	Kamil Szczesny <mailto.kamils@gmail.com> [1]

56 files changed, 172 insertions, 73 deletions

diff --git a/devel/Makefile b/devel/Makefile
index e7781a5afaef..19a31607fb56 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -493,12 +493,15 @@
     SUBDIR += gdcm
     SUBDIR += geany
     SUBDIR += geany-plugin-addons
+    SUBDIR += geany-plugin-autoclose
     SUBDIR += geany-plugin-codenav
     SUBDIR += geany-plugin-commander
     SUBDIR += geany-plugin-debugger
+    SUBDIR += geany-plugin-defineformat
     SUBDIR += geany-plugin-devhelp
     SUBDIR += geany-plugin-doc
     SUBDIR += geany-plugin-extrasel
+    SUBDIR += geany-plugin-geanypy
     SUBDIR += geany-plugin-gendoc
     SUBDIR += geany-plugin-geniuspaste
     SUBDIR += geany-plugin-gproject
@@ -510,7 +513,9 @@
     SUBDIR += geany-plugin-miniscript
     SUBDIR += geany-plugin-multiterm
     SUBDIR += geany-plugin-numberedbookmarks
+    SUBDIR += geany-plugin-pairtaghighlighter
     SUBDIR += geany-plugin-pg
+    SUBDIR += geany-plugin-pohelper
     SUBDIR += geany-plugin-pretty-printer
     SUBDIR += geany-plugin-prj
     SUBDIR += geany-plugin-scope
diff --git a/devel/geany-plugin-addons/Makefile b/devel/geany-plugin-addons/Makefile
index 7d0bcbb88be7..3a10d1ccbc91 100644
--- a/devel/geany-plugin-addons/Makefile
+++ b/devel/geany-plugin-addons/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-addons
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-autoclose/Makefile b/devel/geany-plugin-autoclose/Makefile
new file mode 100644
index 000000000000..15623c9c3848
--- /dev/null
+++ b/devel/geany-plugin-autoclose/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-autoclose
+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-autoclose/pkg-descr b/devel/geany-plugin-autoclose/pkg-descr
new file mode 100644
index 000000000000..040bf042c349
--- /dev/null
+++ b/devel/geany-plugin-autoclose/pkg-descr
@@ -0,0 +1,3 @@
+Auto-close plugin enables brackets autocompletion feature.
+
+WWW: http://plugins.geany.org/autoclose.html
diff --git a/devel/geany-plugin-autoclose/pkg-plist b/devel/geany-plugin-autoclose/pkg-plist
new file mode 100644
index 000000000000..7d4e4ee64af6
--- /dev/null
+++ b/devel/geany-plugin-autoclose/pkg-plist
@@ -0,0 +1,6 @@
+lib/geany/autoclose.so
+%%DOCSDIR%%/autoclose/AUTHORS
+%%DOCSDIR%%/autoclose/COPYING
+%%DOCSDIR%%/autoclose/ChangeLog
+%%DOCSDIR%%/autoclose/NEWS
+%%DOCSDIR%%/autoclose/README
diff --git a/devel/geany-plugin-codenav/Makefile b/devel/geany-plugin-codenav/Makefile
index 9b6e919b9ce2..c67f49fbf7d8 100644
--- a/devel/geany-plugin-codenav/Makefile
+++ b/devel/geany-plugin-codenav/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-codenav
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-commander/Makefile b/devel/geany-plugin-commander/Makefile
index 37dfb264b340..5426fe066039 100644
--- a/devel/geany-plugin-commander/Makefile
+++ b/devel/geany-plugin-commander/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-commander
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-debugger/Makefile b/devel/geany-plugin-debugger/Makefile
index fdd097563ae9..1fa5bec8a1ba 100644
--- a/devel/geany-plugin-debugger/Makefile
+++ b/devel/geany-plugin-debugger/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-debugger
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-defineformat/Makefile b/devel/geany-plugin-defineformat/Makefile
new file mode 100644
index 000000000000..31508c2a9573
--- /dev/null
+++ b/devel/geany-plugin-defineformat/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-defineformat
+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-defineformat/pkg-descr b/devel/geany-plugin-defineformat/pkg-descr
new file mode 100644
index 000000000000..20d44bbb6a10
--- /dev/null
+++ b/devel/geany-plugin-defineformat/pkg-descr
@@ -0,0 +1,4 @@
+Define formatter plugin provides support for on-the-fly formatting
+for multiline #define macros.
+
+WWW: http://plugins.geany.org/defineformat.html
diff --git a/devel/geany-plugin-defineformat/pkg-plist b/devel/geany-plugin-defineformat/pkg-plist
new file mode 100644
index 000000000000..1d5def79609b
--- /dev/null
+++ b/devel/geany-plugin-defineformat/pkg-plist
@@ -0,0 +1,6 @@
+lib/geany/defineformat.so
+%%DOCSDIR%%/defineformat/AUTHORS
+%%DOCSDIR%%/defineformat/COPYING
+%%DOCSDIR%%/defineformat/ChangeLog
+%%DOCSDIR%%/defineformat/NEWS
+%%DOCSDIR%%/defineformat/README
diff --git a/devel/geany-plugin-devhelp/Makefile b/devel/geany-plugin-devhelp/Makefile
index 8ca0763014e6..ee19d3939d44 100644
--- a/devel/geany-plugin-devhelp/Makefile
+++ b/devel/geany-plugin-devhelp/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-devhelp
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	3
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-doc/Makefile b/devel/geany-plugin-doc/Makefile
index 6c034ff65ace..f609d8c875c4 100644
--- a/devel/geany-plugin-doc/Makefile
+++ b/devel/geany-plugin-doc/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-doc
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-extrasel/Makefile b/devel/geany-plugin-extrasel/Makefile
index e742a8fd3dc9..63e510ccd62a 100644
--- a/devel/geany-plugin-extrasel/Makefile
+++ b/devel/geany-plugin-extrasel/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-extrasel
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-geanypy/Makefile b/devel/geany-plugin-geanypy/Makefile
new file mode 100644
index 000000000000..52acc68ff044
--- /dev/null
+++ b/devel/geany-plugin-geanypy/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-geanypy
+PORTVERSION=	${GEANY_VER}
+CATEGORIES=	devel
+
+MAINTAINER=	makc@FreeBSD.org
+COMMENT=	Geany plugin: ${${GEANY_PLUGIN}_DESC}
+
+USE_GNOME=	pygtk2
+
+.include "${.CURDIR}/../geany-plugins/files/Makefile.common"
+.include <bsd.port.mk>
diff --git a/devel/geany-plugin-geanypy/pkg-descr b/devel/geany-plugin-geanypy/pkg-descr
new file mode 100644
index 000000000000..88ff7ecef81f
--- /dev/null
+++ b/devel/geany-plugin-geanypy/pkg-descr
@@ -0,0 +1,3 @@
+GeanyPy provides support for plugins written in Python.
+
+WWW: http://plugins.geany.org/geanypy.html
diff --git a/devel/geany-plugin-geanypy/pkg-plist b/devel/geany-plugin-geanypy/pkg-plist
new file mode 100644
index 000000000000..dd97e91fde07
--- /dev/null
+++ b/devel/geany-plugin-geanypy/pkg-plist
@@ -0,0 +1,21 @@
+lib/geany/geanypy.so
+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
+lib/geany/geanypy/geany/signalmanager.pyc
+%%PORTDOCS%%%%DOCSDIR%%/geanypy/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/geanypy/COPYING
+%%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-gendoc/Makefile b/devel/geany-plugin-gendoc/Makefile
index 385feb42bebc..634b4af14d73 100644
--- a/devel/geany-plugin-gendoc/Makefile
+++ b/devel/geany-plugin-gendoc/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-gendoc
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-geniuspaste/Makefile b/devel/geany-plugin-geniuspaste/Makefile
index b833f611f480..19cc5e172e41 100644
--- a/devel/geany-plugin-geniuspaste/Makefile
+++ b/devel/geany-plugin-geniuspaste/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-geniuspaste
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-gproject/Makefile b/devel/geany-plugin-gproject/Makefile
index 7a83c5b7646f..bd492569804e 100644
--- a/devel/geany-plugin-gproject/Makefile
+++ b/devel/geany-plugin-gproject/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-gproject
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-insertnum/Makefile b/devel/geany-plugin-insertnum/Makefile
index 7e59097170bb..4db7815710f4 100644
--- a/devel/geany-plugin-insertnum/Makefile
+++ b/devel/geany-plugin-insertnum/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-insertnum
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-latex/Makefile b/devel/geany-plugin-latex/Makefile
index d287a52cdc55..b7170d1c2f68 100644
--- a/devel/geany-plugin-latex/Makefile
+++ b/devel/geany-plugin-latex/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-latex
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-lipsum/Makefile b/devel/geany-plugin-lipsum/Makefile
index f7b95280991d..bdc6d08345f7 100644
--- a/devel/geany-plugin-lipsum/Makefile
+++ b/devel/geany-plugin-lipsum/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-lipsum
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-lua/Makefile b/devel/geany-plugin-lua/Makefile
index e0293407a7b3..1db946098d4f 100644
--- a/devel/geany-plugin-lua/Makefile
+++ b/devel/geany-plugin-lua/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-lua
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-macro/Makefile b/devel/geany-plugin-macro/Makefile
index d2b6758d8cd5..62ea8134ecb5 100644
--- a/devel/geany-plugin-macro/Makefile
+++ b/devel/geany-plugin-macro/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-macro
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-miniscript/Makefile b/devel/geany-plugin-miniscript/Makefile
index 0b64c5043452..67d899121c1f 100644
--- a/devel/geany-plugin-miniscript/Makefile
+++ b/devel/geany-plugin-miniscript/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-miniscript
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-multiterm/Makefile b/devel/geany-plugin-multiterm/Makefile
index 15e8c8506861..d9199a261d7c 100644
--- a/devel/geany-plugin-multiterm/Makefile
+++ b/devel/geany-plugin-multiterm/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-multiterm
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-numberedbookmarks/Makefile b/devel/geany-plugin-numberedbookmarks/Makefile
index 796d0ff288d2..c9350af74b7d 100644
--- a/devel/geany-plugin-numberedbookmarks/Makefile
+++ b/devel/geany-plugin-numberedbookmarks/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-numberedbookmarks
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-pairtaghighlighter/Makefile b/devel/geany-plugin-pairtaghighlighter/Makefile
new file mode 100644
index 000000000000..965d4a1cc711
--- /dev/null
+++ b/devel/geany-plugin-pairtaghighlighter/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-pairtaghighlighter
+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-pairtaghighlighter/pkg-descr b/devel/geany-plugin-pairtaghighlighter/pkg-descr
new file mode 100644
index 000000000000..23a9b3d255a7
--- /dev/null
+++ b/devel/geany-plugin-pairtaghighlighter/pkg-descr
@@ -0,0 +1,4 @@
+Pair Tag Highlighter plugin finds and highlights matching opening/closing
+HTML tags.
+
+WWW: http://plugins.geany.org/pairtaghighlighter.html
diff --git a/devel/geany-plugin-pairtaghighlighter/pkg-plist b/devel/geany-plugin-pairtaghighlighter/pkg-plist
new file mode 100644
index 000000000000..bd87fde24ec7
--- /dev/null
+++ b/devel/geany-plugin-pairtaghighlighter/pkg-plist
@@ -0,0 +1,6 @@
+lib/geany/pairtaghighlighter.so
+%%DOCSDIR%%/pairtaghighlighter/AUTHORS
+%%DOCSDIR%%/pairtaghighlighter/COPYING
+%%DOCSDIR%%/pairtaghighlighter/ChangeLog
+%%DOCSDIR%%/pairtaghighlighter/NEWS
+%%DOCSDIR%%/pairtaghighlighter/README
diff --git a/devel/geany-plugin-pg/Makefile b/devel/geany-plugin-pg/Makefile
index 3e0a5b1b849e..b4daffd04a9b 100644
--- a/devel/geany-plugin-pg/Makefile
+++ b/devel/geany-plugin-pg/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-pg
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-pohelper/Makefile b/devel/geany-plugin-pohelper/Makefile
new file mode 100644
index 000000000000..6043b8001793
--- /dev/null
+++ b/devel/geany-plugin-pohelper/Makefile
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+PORTNAME=	geany-plugin-pohelper
+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-pohelper/pkg-descr b/devel/geany-plugin-pohelper/pkg-descr
new file mode 100644
index 000000000000..3b14ec16f624
--- /dev/null
+++ b/devel/geany-plugin-pohelper/pkg-descr
@@ -0,0 +1,3 @@
+Translation Helper plugin provides support for gettext translation files.
+
+WWW: http://plugins.geany.org/pohelper.html
diff --git a/devel/geany-plugin-pohelper/pkg-plist b/devel/geany-plugin-pohelper/pkg-plist
new file mode 100644
index 000000000000..9404886f014f
--- /dev/null
+++ b/devel/geany-plugin-pohelper/pkg-plist
@@ -0,0 +1,7 @@
+lib/geany/pohelper.so
+%%DOCSDIR%%/pohelper/AUTHORS
+%%DOCSDIR%%/pohelper/COPYING
+%%DOCSDIR%%/pohelper/ChangeLog
+%%DOCSDIR%%/pohelper/NEWS
+%%DOCSDIR%%/pohelper/README
+%%DATADIR%%/pohelper/menus.ui
diff --git a/devel/geany-plugin-pretty-printer/Makefile b/devel/geany-plugin-pretty-printer/Makefile
index 9c539b8e9f0f..0dec8f097126 100644
--- a/devel/geany-plugin-pretty-printer/Makefile
+++ b/devel/geany-plugin-pretty-printer/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-pretty-printer
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-prj/Makefile b/devel/geany-plugin-prj/Makefile
index 3090c5a184bb..4e6157fd53fd 100644
--- a/devel/geany-plugin-prj/Makefile
+++ b/devel/geany-plugin-prj/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-prj
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-scope/Makefile b/devel/geany-plugin-scope/Makefile
index 8c165d780fe3..ef995c081ae6 100644
--- a/devel/geany-plugin-scope/Makefile
+++ b/devel/geany-plugin-scope/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-scope
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-sendmail/Makefile b/devel/geany-plugin-sendmail/Makefile
index fc26ed108d3c..b168e0634086 100644
--- a/devel/geany-plugin-sendmail/Makefile
+++ b/devel/geany-plugin-sendmail/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-sendmail
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-shiftcolumn/Makefile b/devel/geany-plugin-shiftcolumn/Makefile
index 2701e8a3359a..83aa2f7cc3d8 100644
--- a/devel/geany-plugin-shiftcolumn/Makefile
+++ b/devel/geany-plugin-shiftcolumn/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-shiftcolumn
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-spellcheck/Makefile b/devel/geany-plugin-spellcheck/Makefile
index f61f0c753bd2..1b2d26b926e4 100644
--- a/devel/geany-plugin-spellcheck/Makefile
+++ b/devel/geany-plugin-spellcheck/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-spellcheck
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-tableconvert/Makefile b/devel/geany-plugin-tableconvert/Makefile
index 028125f33283..607f9bbf8589 100644
--- a/devel/geany-plugin-tableconvert/Makefile
+++ b/devel/geany-plugin-tableconvert/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-tableconvert
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-treebrowser/Makefile b/devel/geany-plugin-treebrowser/Makefile
index 5598d78178b7..71543c3b8eb3 100644
--- a/devel/geany-plugin-treebrowser/Makefile
+++ b/devel/geany-plugin-treebrowser/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-treebrowser
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-updatechecker/Makefile b/devel/geany-plugin-updatechecker/Makefile
index 5965f7f61b55..2f934b4d23e7 100644
--- a/devel/geany-plugin-updatechecker/Makefile
+++ b/devel/geany-plugin-updatechecker/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-updatechecker
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-vc/Makefile b/devel/geany-plugin-vc/Makefile
index 9b8eee3c00c9..3c81b98e0c9e 100644
--- a/devel/geany-plugin-vc/Makefile
+++ b/devel/geany-plugin-vc/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-vc
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-webhelper/Makefile b/devel/geany-plugin-webhelper/Makefile
index ffdc8702da8e..666b2b07c918 100644
--- a/devel/geany-plugin-webhelper/Makefile
+++ b/devel/geany-plugin-webhelper/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-webhelper
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugin-xmlsnippets/Makefile b/devel/geany-plugin-xmlsnippets/Makefile
index 164b30d7d303..d87cdfb61cfe 100644
--- a/devel/geany-plugin-xmlsnippets/Makefile
+++ b/devel/geany-plugin-xmlsnippets/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	geany-plugin-xmlsnippets
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	makc@FreeBSD.org
diff --git a/devel/geany-plugins-l10n/pkg-plist b/devel/geany-plugins-l10n/pkg-plist
index 1505f1a569be..e3b5a032294b 100644
--- a/devel/geany-plugins-l10n/pkg-plist
+++ b/devel/geany-plugins-l10n/pkg-plist
@@ -5,6 +5,7 @@ share/locale/de/LC_MESSAGES/geany-plugins.mo
 share/locale/es/LC_MESSAGES/geany-plugins.mo
 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/nl/LC_MESSAGES/geany-plugins.mo
 share/locale/pt/LC_MESSAGES/geany-plugins.mo
diff --git a/devel/geany-plugins/Makefile b/devel/geany-plugins/Makefile
index f6933af97cf3..b08604b7b83a 100644
--- a/devel/geany-plugins/Makefile
+++ b/devel/geany-plugins/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	geany-plugins
 PORTVERSION=	${GEANY_VER}
-PORTREVISION=	1
 CATEGORIES=	devel
 DISTFILES=	# none
 
@@ -17,13 +16,13 @@ NO_MTREE=	yes
 .include "${.CURDIR}/files/bsd.geany-plugins.mk"
 
 OPTIONS_DEFINE=		NLS
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
 
 # NLS option first, then plugins sorted in GEANY_PLUGINS_ALL
 NO_OPTIONS_SORT=	yes
 
 .for plugin in ${GEANY_PLUGINS_ALL}
 OPTIONS_DEFINE+=	${plugin:tu}
+OPTIONS_DEFAULT+=	${plugin:tu}
 ${plugin:tu}_DESC=	${${plugin}_DESC}
 ${plugin:tu}_RUN_DEPENDS=	geany-plugin-${plugin}>=0:${PORTSDIR}/devel/geany-plugin-${plugin}
 .endfor
diff --git a/devel/geany-plugins/distinfo b/devel/geany-plugins/distinfo
index 37ba0b62302e..7ec3012d5775 100644
--- a/devel/geany-plugins/distinfo
+++ b/devel/geany-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geany-plugins-1.23.tar.bz2) = ff26860edd1cbaea88c73bd8c2bd02f9ba04046674f05d3696baf66582e2bf58
-SIZE (geany-plugins-1.23.tar.bz2) = 2811640
+SHA256 (geany-plugins-1.24.tar.bz2) = dcc0414b29ae0160fc3a7adb0a1d6cbd5bd6bfb1900dab03e8774b3cebf6f2ec
+SIZE (geany-plugins-1.24.tar.bz2) = 3039764
diff --git a/devel/geany-plugins/files/Makefile.common b/devel/geany-plugins/files/Makefile.common
index 3608ecf1a8be..b6d7e5525f1d 100644
--- a/devel/geany-plugins/files/Makefile.common
+++ b/devel/geany-plugins/files/Makefile.common
@@ -9,22 +9,18 @@ DISTINFO_FILE=	${.CURDIR}/../../devel/geany-plugins/distinfo
 BUILD_DEPENDS+=	${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany
 RUN_DEPENDS+=	${LOCALBASE}/bin/geany:${PORTSDIR}/devel/geany
 
-CONFLICTS_INSTALL=	geany-plugins-0.*
-
 EXTRA_PATCHES=  ${.CURDIR}/../../devel/geany-plugins/files/extrapatch-configure
 
 GNU_CONFIGURE=	yes
-USES+=		gmake libtool pkgconfig tar:bzip2
+USES+=		gettext-tools gmake libtool pkgconfig tar:bzip2
 USE_GNOME+=	gtk20
 
 # geany-plugins-l10n is not a plugin, thus special treatment
 .if ${PORTNAME} == "geany-plugins-l10n"
-GEANY_PLUGIN=	NLS
-NLS_DIR=	po
-NLS_SWITCH=	--enable-nls
+GEANY_PLUGIN=	po
+po_SWITCH=	--enable-nls
 CPPFLAGS+=	-I${LOCALBASE}/include
-LIBS+=		-L${LOCALBASE}/lib
-USES+=		gettext
+LDFLAGS+=	-L${LOCALBASE}/lib
 .endif
 
 GEANY_PLUGIN?=			${PORTNAME:S,geany-plugin-,,}
@@ -43,7 +39,7 @@ DOCSDIR=	share/doc/geany-plugins
 
 .if ${PORTNAME} != "geany-plugins-l10n"
 . if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
+USES+=	gettext-runtime
 . else
 CONFIGURE_ARGS+=	--disable-nls
 . endif
diff --git a/devel/geany-plugins/files/bsd.geany-plugins.mk b/devel/geany-plugins/files/bsd.geany-plugins.mk
index 4987c65b3c2e..a1d857581c70 100644
--- a/devel/geany-plugins/files/bsd.geany-plugins.mk
+++ b/devel/geany-plugins/files/bsd.geany-plugins.mk
@@ -1,13 +1,16 @@
 # $FreeBSD$
 
-GEANY_VER=	1.23
+GEANY_VER=	1.24
 GEANY_PLUGINS_ALL=	addons \
+			autoclose \
 			codenav \
 			commander \
 			debugger \
+			defineformat \
 			devhelp \
 			doc \
 			extrasel \
+			geanypy \
 			gendoc \
 			geniuspaste \
 			gproject \
@@ -19,7 +22,9 @@ GEANY_PLUGINS_ALL=	addons \
 			miniscript \
 			multiterm \
 			numberedbookmarks \
+			pairtaghighlighter \
 			pg \
+			pohelper \
 			pretty-printer \
 			prj \
 			scope \
@@ -36,11 +41,14 @@ GEANY_PLUGINS_ALL=	addons \
 # markdown plugin is excluded, requires peg-markdown
 
 addons_DESC=		various small addons
+autoclose_DESC=		brackets autocompletion
 codenav_DESC=		some facilities for navigating in the code
 commander_DESC=		command panel for rapid access to any action
 debugger_DESC=		debugging support (via GDB currently)
+defineformat_DESC=	on-the-fly \#define formatter
 devhelp_DESC=		API documentation browser
 doc_DESC=		execute command on the word at cursor position
+geanypy_DESC=		support for Python plugins
 extrasel_DESC=		additional selection tools
 gendoc_DESC=		generate documentation from the sources comments
 geniuspaste_DESC=	pastebins support
@@ -54,7 +62,9 @@ macro_DESC=		user defined macros
 miniscript_DESC=	pipe text/documents via script (shell, perl, awk, etc.)
 multiterm_DESC=		multi-tabbed virtual terminals emulator
 numberedbookmarks_DESC=	additional numbered bookmarks
+pairtaghighlighter_DESC=	highlights 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
 prj_DESC=		alternative project manager
 scope_DESC=		graphical GDB front-end
diff --git a/devel/geany-plugins/files/extrapatch-configure b/devel/geany-plugins/files/extrapatch-configure
index ed7044c36f58..4877444b2289 100644
--- a/devel/geany-plugins/files/extrapatch-configure
+++ b/devel/geany-plugins/files/extrapatch-configure
@@ -1,6 +1,6 @@
---- ./configure.orig	2013-03-10 17:01:27.000000000 +0000
-+++ ./configure	2013-03-21 00:22:04.580741068 +0000
-@@ -21101,69 +21101,3 @@
+--- configure.orig	2014-04-13 17:12:39 UTC
++++ configure
+@@ -23223,69 +23223,3 @@ fi
      expanded_docdir=$(eval echo $expanded_docdir)
  
  
@@ -9,7 +9,7 @@
 -${PACKAGE}-${VERSION}
 -
 -  Build Environment:
--    Geany version:                ${GEANY_VERSION}
+-    Geany version:                ${GEANY_VERSION} (GTK${GP_GTK_VERSION_MAJOR})
 -    Install prefix:               ${prefix}
 -    Datadir:                      ${expanded_datadir}/${PACKAGE_TARNAME}
 -    Libdir:                       ${expanded_libdir}/${PACKAGE_TARNAME}
diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 135fa7c3f072..c3db89e87456 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	geany
-PORTVERSION=	1.23.1
-PORTREVISION=	2
+PORTVERSION=	1.24.1
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF
 
@@ -15,30 +14,23 @@ LICENSE=	GPLv2
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_GNOME=	gtk20
-USES=		gmake libtool pathfix pkgconfig tar:bzip2
+USES=		desktop-file-utils gettext-tools \
+		gmake libtool pathfix pkgconfig tar:bzip2
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	VTE NLS DOCS
-OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
-VTE_DESC=	Embedded virtual terminal
+OPTIONS_DEFAULT=	VTE
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
+NLS_USES=	gettext-runtime
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
+VTE_DESC=	Embedded virtual terminal
+VTE_CONFIGURE_ENABLE=	vte
+VTE_USE=	GNOME=vte
 
-.if ${PORT_OPTIONS:MVTE}
-USE_GNOME+=	vte
-CONFIGURE_ARGS+=--enable-vte
-.else
-CONFIGURE_ARGS+=--disable-vte
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 .if !${PORT_OPTIONS:MDOCS}
@@ -48,7 +40,4 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
 .endif
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${STAGEDIR}${MANPREFIX}/man/man1/
-
 .include <bsd.port.mk>
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index c538c0070044..84cf1822b48c 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geany-1.23.1.tar.bz2) = 8815b16e59d8679ec359a1a5754fee05e77f7bca53083c939654bfc77d978fad
-SIZE (geany-1.23.1.tar.bz2) = 3622524
+SHA256 (geany-1.24.1.tar.bz2) = 7fb505d9b01fe6874890525f837644a6a38c23a372bb068c65ef3673108a8c33
+SIZE (geany-1.24.1.tar.bz2) = 3990492
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 9093125e27a1..d439074d4b99 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -7,6 +7,7 @@ include/geany/filetypes.h
 include/geany/geany.h
 include/geany/geanyfunctions.h
 include/geany/geanyplugin.h
+include/geany/gtkcompat.h
 include/geany/highlighting.h
 include/geany/keybindings.h
 include/geany/msgwindow.h
@@ -21,6 +22,7 @@ include/geany/search.h
 include/geany/stash.h
 include/geany/support.h
 include/geany/tagmanager/tm_file_entry.h
+include/geany/tagmanager/tm_parser.h
 include/geany/tagmanager/tm_project.h
 include/geany/tagmanager/tm_source_file.h
 include/geany/tagmanager/tm_symbol.h
@@ -76,9 +78,12 @@ share/applications/geany.desktop
 %%DATADIR%%/c99.tags
 %%DATADIR%%/colorschemes/alt.conf
 %%DATADIR%%/filetype_extensions.conf
+%%DATADIR%%/filetypes.CUDA.conf
+%%DATADIR%%/filetypes.Clojure.conf
 %%DATADIR%%/filetypes.Cython.conf
 %%DATADIR%%/filetypes.Genie.conf
 %%DATADIR%%/filetypes.Go.conf
+%%DATADIR%%/filetypes.Graphviz.conf
 %%DATADIR%%/filetypes.Scala.conf
 %%DATADIR%%/filetypes.abaqus
 %%DATADIR%%/filetypes.abc
@@ -86,6 +91,7 @@ share/applications/geany.desktop
 %%DATADIR%%/filetypes.ada
 %%DATADIR%%/filetypes.asciidoc
 %%DATADIR%%/filetypes.asm
+%%DATADIR%%/filetypes.batch
 %%DATADIR%%/filetypes.c
 %%DATADIR%%/filetypes.caml
 %%DATADIR%%/filetypes.cmake
@@ -122,10 +128,12 @@ share/applications/geany.desktop
 %%DATADIR%%/filetypes.perl
 %%DATADIR%%/filetypes.php
 %%DATADIR%%/filetypes.po
+%%DATADIR%%/filetypes.powershell
 %%DATADIR%%/filetypes.python
 %%DATADIR%%/filetypes.r
 %%DATADIR%%/filetypes.restructuredtext
 %%DATADIR%%/filetypes.ruby
+%%DATADIR%%/filetypes.rust
 %%DATADIR%%/filetypes.sh
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
@@ -135,6 +143,7 @@ share/applications/geany.desktop
 %%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/filetypes.yaml
+%%DATADIR%%/geany.css
 %%DATADIR%%/geany.glade
 %%DATADIR%%/geany.gtkrc
 %%DATADIR%%/html_entities.tags
@@ -155,6 +164,7 @@ share/applications/geany.desktop
 %%DATADIR%%/templates/files/main.java
 %%DATADIR%%/templates/files/main.py
 %%DATADIR%%/templates/files/main.vala
+%%DATADIR%%/templates/files/module.erl
 %%DATADIR%%/templates/files/program.pas
 %%DATADIR%%/templates/function
 %%DATADIR%%/templates/gpl