- Updated to 0.21

- Added LICENSE
- Use gnomehack instead of homebrew REINPLACE_CMD
- Switched to bsd.port.options.mk
- Updated WWW

  ChangeLog:
  http://www.geany.org/Documentation/ReleaseNotes

PR:		ports/161240
Submitted by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Approved by:	ar@null.lv (maintainer; timeout - 15 days)

4 files changed, 41 insertions, 32 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index d3b3b4877c86..791a5292f0bc 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -6,18 +6,20 @@
 #
 
 PORTNAME=	geany
-PORTVERSION=	0.20
+PORTVERSION=	0.21
 CATEGORIES=	devel editors
 MASTER_SITES=	http://download.geany.org/ SF
 
 MAINTAINER=	ar@null.lv
 COMMENT=	A fast and lightweight GTK+ IDE
 
+LICENSE=	GPLv2
+
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk20
+USE_GNOME=	gnomehack gtk20
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
@@ -26,7 +28,7 @@ OPTIONS=	VTE	"Enable Virtual Terminal Emulation support"	on \
 
 MAN1=		geany.1
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
@@ -51,12 +53,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '/^SUBDIRS/ s|po||' ${WRKSRC}/Makefile.in
 .endif
 
-post-configure:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/geany.desktop ${PREFIX}/share/applications/
 	${INSTALL_MAN} ${WRKSRC}/doc/geany.1 ${MAN1PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 0d19777b7968..329a05b818ce 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,2 +1,2 @@
-SHA256 (geany-0.20.tar.bz2) = 59ae065c5ab007eea7dd3f2df6ca0cde61b326ce2d6aa2d5b44f5554fd2895bd
-SIZE (geany-0.20.tar.bz2) = 3010953
+SHA256 (geany-0.21.tar.bz2) = cc0609d4c4d3bd8cf772bc4994d51cb1f79a12da5a82f2335a381293c5123a8c
+SIZE (geany-0.21.tar.bz2) = 3109890
diff --git a/devel/geany/pkg-descr b/devel/geany/pkg-descr
index fd1ba0fe16b3..37bd37699cc9 100644
--- a/devel/geany/pkg-descr
+++ b/devel/geany/pkg-descr
@@ -3,4 +3,4 @@ developed to provide a small and fast IDE, which has only a few dependencies
 on other packages. Another goal was to be as independent as possible from a
 special Desktop Environment like KDE or GNOME.
 
-WWW: http://geany.uvena.de/
+WWW: http://www.geany.org
diff --git a/devel/geany/pkg-plist b/devel/geany/pkg-plist
index 31f065ced0b4..6be5b36b0f13 100644
--- a/devel/geany/pkg-plist
+++ b/devel/geany/pkg-plist
@@ -45,25 +45,14 @@ lib/geany/splitwindow.la
 lib/geany/splitwindow.so
 libdata/pkgconfig/geany.pc
 share/applications/geany.desktop
-share/icons/hicolor/16x16/apps/classviewer-class.png
-share/icons/hicolor/16x16/apps/classviewer-macro.png
-share/icons/hicolor/16x16/apps/classviewer-member.png
-share/icons/hicolor/16x16/apps/classviewer-method.png
-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/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
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/ScintillaLicense.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/THANKS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%PORTDOCS%%%%DOCSDIR%%/html/images/build_menu_commands_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/find_in_files_dialog.png
@@ -75,19 +64,25 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_files.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_interface_interface.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface_notebook.png
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_interface_toolbar.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_keys.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_printing.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
+%%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_various.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/pref_dialog_vte.png
 %%PORTDOCS%%%%DOCSDIR%%/html/images/replace_dialog.png
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%DATADIR%%/GPL-2
+%%DATADIR%%/c99.tags
+%%DATADIR%%/colorschemes/alt.conf
 %%DATADIR%%/filetype_extensions.conf
+%%DATADIR%%/filetypes.Cython.conf
 %%DATADIR%%/filetypes.Genie.conf
+%%DATADIR%%/filetypes.Scala.conf
 %%DATADIR%%/filetypes.abc
 %%DATADIR%%/filetypes.actionscript
 %%DATADIR%%/filetypes.ada
@@ -95,6 +90,7 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%DATADIR%%/filetypes.c
 %%DATADIR%%/filetypes.caml
 %%DATADIR%%/filetypes.cmake
+%%DATADIR%%/filetypes.cobol
 %%DATADIR%%/filetypes.common
 %%DATADIR%%/filetypes.conf
 %%DATADIR%%/filetypes.cpp
@@ -116,8 +112,8 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%DATADIR%%/filetypes.java
 %%DATADIR%%/filetypes.javascript
 %%DATADIR%%/filetypes.latex
-%%DATADIR%%/filetypes.lua
 %%DATADIR%%/filetypes.lisp
+%%DATADIR%%/filetypes.lua
 %%DATADIR%%/filetypes.makefile
 %%DATADIR%%/filetypes.markdown
 %%DATADIR%%/filetypes.matlab
@@ -139,19 +135,14 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%DATADIR%%/filetypes.vhdl
 %%DATADIR%%/filetypes.xml
 %%DATADIR%%/filetypes.yaml
-%%DATADIR%%/c99.tags
 %%DATADIR%%/html_entities.tags
 %%DATADIR%%/pascal.tags
 %%DATADIR%%/php.tags
 %%DATADIR%%/python.tags
 %%DATADIR%%/snippets.conf
-%%DATADIR%%/ui_toolbar.xml
-%%DATADIR%%/colorschemes/alt.conf
 %%DATADIR%%/templates/bsd
 %%DATADIR%%/templates/changelog
 %%DATADIR%%/templates/fileheader
-%%DATADIR%%/templates/function
-%%DATADIR%%/templates/gpl
 %%DATADIR%%/templates/files/file.html
 %%DATADIR%%/templates/files/file.php
 %%DATADIR%%/templates/files/file.rb
@@ -161,7 +152,22 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%DATADIR%%/templates/files/main.d
 %%DATADIR%%/templates/files/main.java
 %%DATADIR%%/templates/files/main.py
+%%DATADIR%%/templates/files/main.vala
 %%DATADIR%%/templates/files/program.pas
+%%DATADIR%%/templates/function
+%%DATADIR%%/templates/gpl
+%%DATADIR%%/ui_toolbar.xml
+share/icons/hicolor/16x16/apps/classviewer-class.png
+share/icons/hicolor/16x16/apps/classviewer-macro.png
+share/icons/hicolor/16x16/apps/classviewer-member.png
+share/icons/hicolor/16x16/apps/classviewer-method.png
+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/icons/hicolor/16x16/apps/geany.png
+share/icons/hicolor/48x48/apps/geany.png
+share/icons/hicolor/scalable/apps/geany.svg
 %%NLS%%share/locale/ast/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/be/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/geany.mo
@@ -171,6 +177,7 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%NLS%%share/locale/el/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/es/LC_MESSAGES/geany.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/geany.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/geany.mo
@@ -195,7 +202,10 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/geany.mo
 %%NLS%%@dirrmtry share/locale/lb/LC_MESSAGES
 %%NLS%%@dirrmtry share/locale/lb
-@dirrm lib/geany
+%%NLS%%@dirrmtry share/locale/kk/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/kk
+%%NLS%%@dirrmtry share/locale/ast/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/ast
 @dirrm %%DATADIR%%/templates/files
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/colorschemes
@@ -204,6 +214,7 @@ share/icons/hicolor/scalable/apps/geany.svg
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+@dirrm lib/geany
 @dirrm include/geany/tagmanager
 @dirrm include/geany/scintilla
 @dirrm include/geany