3 files changed, 23 insertions, 7 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 1583645b03de..fc2ee096a242 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.17
-PORTREVISION=	2
+PORTVERSION=	0.18
 CATEGORIES=	devel
-MASTER_SITES=	SF
+MASTER_SITES=	http://download.geany.org/ SF
 
 MAINTAINER=	ar@null.lv
 COMMENT=	A fast and lightweight GTK+ IDE
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index ef40fa5e7cf9..5eb076b01e13 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,3 +1,3 @@
-MD5 (geany-0.17.tar.bz2) = 097f619f5f0800098a2438a216a28e7b
-SHA256 (geany-0.17.tar.bz2) = 2daee54b16d19a16bda557d3c7fd0bde900640afd46f1b7529c07cc24019fd84
-SIZE (geany-0.17.tar.bz2) = 2336257 
+MD5 (geany-0.18.tar.bz2) = d8e301f6933c828e2c36b3afdb3f4c34
+SHA256 (geany-0.18.tar.bz2) = 7cb387d394b58b9ee1119dc6770b437e4a4c9e72b591b0bd431e54558f51212d
+SIZE (geany-0.18.tar.bz2) = 2457351 
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index edae30daed70..8c8af36339a1 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -6,6 +6,7 @@ include/geany/encodings.h
 include/geany/filetypes.h
 include/geany/geany.h
 include/geany/geanyfunctions.h
+include/geany/geanyplugin.h
 include/geany/highlighting.h
 include/geany/keybindings.h
 include/geany/main.h
@@ -56,7 +57,9 @@ share/icons/hicolor/16x16/apps/classviewer-namespace.png
 share/icons/hicolor/16x16/apps/classviewer-other.png
 share/icons/hicolor/16x16/apps/classviewer-struct.png
 share/icons/hicolor/16x16/apps/classviewer-var.png
-share/pixmaps/geany.png
+share/icons/hicolor/16x16/apps/geany.png
+share/icons/hicolor/48x48/apps/geany.png
+share/icons/hicolor/scalable/apps/geany.svg
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
@@ -87,6 +90,7 @@ share/pixmaps/geany.png
 %%DATADIR%%/GPL-2
 %%DATADIR%%/filetype_extensions.conf
 %%DATADIR%%/filetypes.actionscript
+%%DATADIR%%/filetypes.ada
 %%DATADIR%%/filetypes.asm
 %%DATADIR%%/filetypes.c
 %%DATADIR%%/filetypes.caml
@@ -151,22 +155,35 @@ share/pixmaps/geany.png
 %%NLS%%share/locale/it/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ko/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/lb/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/geany.mo
+%%NLS%%@dirrmtry share/locale/lb/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lb
 @dirrm lib/geany
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry share/icons/hicolor/scalable/apps
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
 @dirrmtry share/applications
 @dirrm include/geany/tagmanager
 @dirrm include/geany/scintilla