3 files changed, 17 insertions, 13 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 2b16109ab501..fe12b4b7cb4c 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.15
+PORTVERSION=	0.16
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -19,7 +19,7 @@ USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lgnuregex"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
 		NLS	"Enable Native Language support"		on
@@ -44,10 +44,6 @@ CONFIGURE_ARGS+=--disable-vte
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|gcc|${CC} ${CFLAGS}|' ${WRKSRC}/scintilla/Makefile.in
-.for file in tagmanager/lregex.c src/encodings.c
-	@${REINPLACE_CMD} -e 's|<regex\.h>|<gnu/regex.h>|g' ${WRKSRC}/${file}
-.endfor
 .if defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|doc||' ${WRKSRC}/Makefile.in
 .endif
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index b5ac2fbc900d..198d2107771e 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.15.tar.bz2) = 1bf32cc81251e00995a9ed948e39ff89
-SHA256 (geany-0.15.tar.bz2) = dbc3a204329a40a86294aa8c5ff3c9007808aa3db17f89dfc102056aa1c7367d
-SIZE (geany-0.15.tar.bz2) = 2269527
+MD5 (geany-0.16.tar.bz2) = 36ede942a6e4ad4660e918c98cb9cf15
+SHA256 (geany-0.16.tar.bz2) = e481bfde0645b3a0c004bd9fb999f767cf4d76305cd7d0bf24cf7a0ae3d30de8
+SIZE (geany-0.16.tar.bz2) = 2286258
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 19daff416896..f48449d1bf87 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -5,6 +5,7 @@ include/geany/editor.h
 include/geany/encodings.h
 include/geany/filetypes.h
 include/geany/geany.h
+include/geany/geanyfunctions.h
 include/geany/highlighting.h
 include/geany/keybindings.h
 include/geany/msgwindow.h
@@ -29,6 +30,7 @@ include/geany/tagmanager/tm_tagmanager.h
 include/geany/tagmanager/tm_work_object.h
 include/geany/tagmanager/tm_workspace.h
 include/geany/templates.h
+include/geany/toolbar.h
 include/geany/ui_utils.h
 include/geany/utils.h
 lib/geany/classbuilder.la
@@ -68,13 +70,14 @@ share/pixmaps/geany.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_completions.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_display.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_indentation.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_edit_features.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen_misc.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_gen_startup.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_printing.png
-%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_search.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_templ.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_toolbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_tools.png
@@ -87,6 +90,7 @@ share/pixmaps/geany.png
 %%DATADIR%%/filetypes.asm
 %%DATADIR%%/filetypes.c
 %%DATADIR%%/filetypes.caml
+%%DATADIR%%/filetypes.cmake
 %%DATADIR%%/filetypes.common
 %%DATADIR%%/filetypes.conf
 %%DATADIR%%/filetypes.cpp
@@ -108,7 +112,8 @@ share/pixmaps/geany.png
 %%DATADIR%%/filetypes.latex
 %%DATADIR%%/filetypes.lua
 %%DATADIR%%/filetypes.makefile
-%%DATADIR%%/filetypes.oms
+%%DATADIR%%/filetypes.matlab
+%%DATADIR%%/filetypes.nsis
 %%DATADIR%%/filetypes.pascal
 %%DATADIR%%/filetypes.perl
 %%DATADIR%%/filetypes.php
@@ -120,15 +125,18 @@ share/pixmaps/geany.png
 %%DATADIR%%/filetypes.sh
 %%DATADIR%%/filetypes.sql
 %%DATADIR%%/filetypes.tcl
+%%DATADIR%%/filetypes.vala
 %%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
-%%DATADIR%%/global.tags
+%%DATADIR%%/filetypes.yaml
+%%DATADIR%%/c99.tags
 %%DATADIR%%/html_entities.tags
 %%DATADIR%%/latex.tags
 %%DATADIR%%/pascal.tags
 %%DATADIR%%/php.tags
 %%DATADIR%%/python.tags
 %%DATADIR%%/snippets.conf
+%%DATADIR%%/ui_toolbar.xml
 %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/geany.mo