Update geany to 0.20.

Based on PR#44957, and
* Update HOMEPAGE and MASTER_SITES
* add portability fix patch for configure script.
* exactly add dependency on glib2 and gettext-lib.
* rpath fix for geany.pc.
* not to force CC=gcc other than SunOS && sunpro.

Geany 0.20 (January 5, 2011)

    Bugs:
    * Improve compatibility with GVFS using GIO to save documents (Alexey
      Antipov).
    * Fix crash when closing a modified document (usually without a
      trailing newline) and choosing Save (fixes #3111058).
    * Fix crash when using 'Send Selection to Terminal' and the VTE
      is not loaded, and when using Ctrl-A after enabling the 'Load VTE'
      pref (Dimitar Zhekov).
    * Fix a slightly wrong encoding detection on Windows (#3019573).
    * Fix issue with single-line commenting/uncommenting blocks when using
      Windows line endings.
    * Fix saving project indent prefs straight after using project
      properties.
    * Fix wrongly changing edited keybindings when cancelling the
      Preferences dialog.
    * Fix auto-displaying of sidebar, tab bar, symbols and documents tabs
      when only plugin tabs are visible (fixes #3101867).
    * Save build commands for filetype None (Lex Trotman).
    * Waf: Check for libsocket on OpenSolaris to fix build.

    Interface:
    * Color build command fields light grey unless overridden (Lex
      Trotman).
    * Replace /home/user with ~ in the documents list (Jon
      Strait).
    * Display 'new instance' on title bar for 2nd instances (Eugene
      Arshinov).
    * Don't add duplicates to combo box histories.
    * Reorganise Find in Files dialog and add Files pattern to filter
      search results.
    * Implement 'Select All' for the VTE widget.
    * Reorganise editor popup menu for shorter size - some items were moved
      to submenus.
    * Move Go to Marker menu items to Search menu.
    * Group Open dialog encoding options by submenus (Adam Ples; #3047717).
    * Show mimetype icon in sidebar Documents list and notebook popup menu
      (Colomban Wendling).

    Documents:
    * Ensure inserted templates always have proper line ending characters
      according to the current document's preference.
    * Add per-document indent width setting (Jiří Techet).
    * Add 'Project->Apply Default Indentation' menu command to override
      every document's indentation settings.
    * Display better error messages when saving a document fails (Dimitar
      Zhekov).
    * Don't prompt for reloading if the document has not been edited
      (Jiří Techet).
    * Add Close button to the detected file changed dialog.

    Editor:
    * Fix wrong snippet indentation when original cursor line has
      non-indentation whitespace (david).
    * Fix passing quoted arguments when using 'Send Selection to'. This
      means e.g. sed 's/\./(dot)/g' now works.
    * Add alternative color scheme based on Python colors
      (View->Editor->Color Schemes).
    * Replace HTML automatic <table> tag completion with a 'table' snippet
      (Eugene Arshinov).
    * Auto-indent after an HTML/XML line without a closing tag (Eugene
      Arshinov).
    * Respect 'Smart' home key pref for Shift[+Alt]+Home (fixes #3100290,
      Dimitar Zhekov).
    * Scroll to the current line when moving the cursor to the next
      cursor position in a snippet (#3139490).
    * If the current word's tag is on the current line, make Go to Tag
      Definition look for a tag declaration instead and vice versa.
    * Make Reflow Lines/Block command use the current indented block, not
      the whole paragraph (which could have mixed indentation).

    Configuration:
    * Load insertion templates from system path, don't create them in
      the user's config dir.
    * File templates are now reloaded on saving.

    Prefs:
    * Add 'Ensure consistent line endings' file saving pref (Manuel Bua).
    * Add 'statusbar_template' hidden pref (Dimitar Zhekov).
    * Add 'new_document_after_close' hidden pref to open a new document
      automatically after closing all documents.
    * Add hidden pref 'find_selection_type' with option to use the X
      selection or to repeat the last search when there's no selection,
      both off by default.
    * Add 'gio_unsafe_save_backup' hidden pref (Lex Trotman).
    * Add filetypes.common 'fold_symbol_highlight' color setting.
    * Add 'symbol_list_sort_mode' per-filetype setting.

    Keybindings:
    * Fix Alt+[0-9] switching tabs even when other modifiers are also held.
    * Add snippet keybinding support (Eugene Arshinov).
    * Add 'Insert New Line Before/After Current' keybindings (Eugene
      Arshinov).

    Filetypes:
    * Add Forth filetype (Thomas Huth).
    * Add Lisp filetype (Mário Silva).
    * Add Erlang filetype (Taylor Venable).
    * Ada: Fix wrong comments.
    * C++: Disable user fold points with new lexer property
      fold.cpp.comment.explicit.
    * Python: Update list of builtins for Python 2.6, simplify
      Compile/Syntax Check command. Use named styles for color scheme
      support (use alt.conf color scheme if you want the old colors).
    * Matlab: Support Octave # comment char.
    * Txt2Tags: add highlighting (Forgeot Eric - #3020632).
    * Make: fix possible infinite loop in tag parser.
    * D: Parse template functions, ignore /+ +/ comments, ignore
      unittest blocks, add keywords 'ref', 'macro' and D2 keywords.
    * Vala: Parse functions with contracts (#3080232).
    * Markdown, reStructuredText and Txt2Tags: Sort tags by line number by
      default.
    * Basic: Parse property, constructor, destructor as functions
      (pottersson; #2992167).
    * HTML: Add HTML5 element names and attributes (Ross McKay).
    * PHP: Parse final functions (fixes #3111171).
    * Markup: Add xml_indent_tags filetype setting for documents using the
      HTML/XML lexers (Eugene Arshinov).

    Plugins:
    * File Browser: Add history to path entry.
    * HTML Characters: Only automatically replace characters when the
      current document is a Markup document.

    Internationalisation:
    * Add translations: kk.
    * Update translations: cs, de, de, en_GB, es, fi, fr, hu, ja, nl, pt,
                           sl, sv, tr, zh_CN.

    Manual:
    * Update 'Custom filetypes', 'Ignore Tags' sections.
    * Add 'HTML Characters', 'Configuration file paths', 'Color schemes
      menu' sections.
    * Explain how to grep the Scintilla source for lexer properties.

    HACKING:
    * Add 'Bugs to watch out for' section.

    API:
    * Improve Stash GUI example.
    * Fix not loading plugins built against a newer API when Geany doesn't
      provide the required version given in PLUGIN_VERSION_CHECK().
    * Make GEANY_API_VERSION, GEANY_ABI_VERSION macros instead of enums
      so you can protect code with '#if GEANY_API_VERSION >= 200'.
    * Add signals "build-start", "project-dialog-create" and
      "project-dialog-confirmed" - to append a Project Properties
      notebook tab (Jiří Techet).
    * Add macro foreach_range().
    * Add GeanyMainWidgets::message_window_notebook (#3061342).
    * Add main_widgets.project_menu (Jiří Techet).
    * Add msgwin_set_messages_dir() (Jiří Techet).
    * Add highlighting_is_{string,comment,code}_style(),
      editor_find_snippet(), editor_insert_snippet(),
      utils_find_open_xml_tag() (Eugene Arshinov).
    * Add ui_combo_box_add_to_history(), editor_goto_pos(),
      dialogs_show_input(), Add sci_get_lexer().
    * Add filetypes_get_display_name() as "None" is no longer translated.


Geany 0.19.2 (December 01, 2010)
    Fixes:
    * Fix bug where Geany did not always report an error message when
      saving a document fails.


Geany 0.19.1 (August 18, 2010)

    Fixes:
    * Fix broken autocompletion after using scope completion.
    * Fix scrolling the editor line in view (e.g. after loading a session
      and switching document tabs).
    * Fix using filetype extension patterns with upper case letters on
      Windows (#3028856).
    * Fix a slightly wrong encoding detection on Windows (#3019573).
    * Re-enable comment folding.
    * Fix not loading plugins built against a newer API when Geany doesn't
      provide the required version given in PLUGIN_VERSION_CHECK().
    * Fix infinite loop in Markdown lexer (patch by Colomban Wendling,
      thanks).
    * Fix saving non-project filetype error regex.
    * Focus toolbar item when pressing Go to Line keybinding only when
      it's not in the toolbar's drop down overflow menu (#3027454).
    * Escape the name of the current document for markup when using
      document name for menu items (#3038844).
    * File Browser: Allow Find in Files when no items are selected.
    * Fix build menu translation problems.
    * Fix segfault on Tools->Reload Configuration when no documents are
      open (#3037079).
    * Fix building with Waf on Solaris.
    * Fix a memory leak (thanks to Daniel Marjamäki).
    * Use g_free instead of free (patch by Daniel Marjamäki, thanks).

    Tweaks:
    * Always use white background color when printing (except for text
      with a white foreground) to save ink (#2968998).
    * Limit build error editor indicators to 50, but parse all errors in
      the Compiler tab (#3019823).
    * Align notebook tab close buttons centred vertically (thanks to
      Robux.Biz (galyuk)).
    * Show the Project Properties build tab when choosing 'Set Build
      Commands' when a project is open to prevent confusion with
      non-project commands.

    Manual:
    * Fix wording - restarting is required for hidden prefs.
    * Fix Grep --exclude-dir example.


Geany 0.19 (June 12, 2010)

    General:
    * Build system reworked to be much more configurable (by Lex Trotman).
    * Use POSIX system/GNU regex engine for find & replace. This alters
      regex syntax - we now support '?' operator and match newlines.
    * Support adding custom filetype files.
    * Add new command line option --list-documents to return a list
      of currently opened documents
    * Remove deprecated --debug flag. Please use --verbose/-v instead.

    Interface:
    * Add option 'System Default' for toolbar icon style and size to use
      the GTK default value.
    * Allow '+<number>' and '-<number>' as values for Goto Line inputs
      to jump relative to the current line.
    * Add preference to add new document tabs beside the current one
      (patch by Colomban Wendling).
    * Enable type-ahead find for sidebar symbols and documents tabs
      (patch by Thomas Martitz).
    * Make Ctrl-click on any notebook tab switch to the last used
      document.
    * Add 'Edit->Commands' menu.
    * Add 'Edit->Plugin Preferences' menu item and keybinding.
    * Add 'View->Editor->Color Schemes' menu (only shown if color
      scheme files exist).

    Prefs:
    * Hide 'Tabs and Spaces: Hard tab width' preference - it should
      always be 8. (Hidden setting kept in case users have modified it).
    * Add sidebar position interface pref.
    * Add project long line marker customisation (patch from Eugene
      Arshinov).

    Editor:
    * Update Scintilla to 2.12.
    * Add preference and support for virtual spaces.
    * Add word part autocompletion for the current selected item when
      pressing keybinding (default Tab) - Enter still completes normally.
    * Remove LaTeX autocompletion from Geany's core and move it to the
      geanyLaTeX plugin.

    Filetypes:
    * New filetype: Txt2Tags (patch by Eric Forgeot).
    * New filetype: Abc (patch by Eric Forgeot).
    * New filetype: Verilog (patch from Kelvin Gardiner).
    * New custom filetype: Genie.
    * Improvements in symbol parsing of PHP and Python files.
    * Add R tagmanager symbol parser (patch by Jon Senior).
    * Update Perl tag parser from ctags - removes support for
      buggy local/my/our but parses constant/format/labels.
    * Parse more VHDL tags (patch from Kelvin Gardiner).
    * Highlight D & Java types from a global tags file.
    * Parse Python lambda functions (patch from Colomban Wendling).

    Keybindings:
    * Add keybindings to switch to the sidebar's Document and Symbol list as
      well as to the Message Window's current tab (patch by Eugene Arshinov).
    * Add 'Remove Markers' and 'Remove Error Indicators' keybindings.
    * Make 'Reflow block/lines(s)' keybinding use line breaking column when
      enabled (patch by Lex Trotman).
    * Add 'Select to previous/next word part' keybindings.
    * Add 'Switch to Messages' focus keybinding.
    * Add 'Move line(s) up/down' keybindings.
    * Make Switch to Editor keybinding reshow the document statistics line.

    Templates:
    * Move filetype template defaults into custom file template files.
    * Read custom file templates from system as well as user dir.
    * Add new special template wildcard "{command:...}" to use the output
      of a shell command in templates.
    * Support {ob}, {cb} and {pc} to escape wildcard strings with {, }, %
      for snippets, fileheader and file templates.
    * Add {project}, {description} template wildcards (#2954737).
    * Reload templates when saving a document in the templates config dir.

    Configuration files:
    * Support more filetypes.common folding icon styles: arrows, +/- and no
      lines (#2935059).
    * Support Scintilla lexer properties in [lexer_properties] filetypes.*
      group.
    * Add filetypes.xml asp.default.language property (Ross McKay).

    Plugins:
    * Classbuilder: Add support for creating PHP classes
                    (patch by Ondrej Donek).
    * HTMLchars: Make plugin remember whether replacement of special
                 characters was activated.

    Windows:
    * Support very long build commands.
    * Add a preference for choosing between GTK and native File Open/Save
      dialogs (only available on Windows).

    Internationalisation:
    * Added translations: ast.
    * Updated translations: de, en_GB, es, fr, gl, ja, nl, pt, ru, sl, sv,
                            tr, vi, zh_CN.

    API:
    * Improve documentation contents page.
    * Add Stash mini-library setting, pref & widget functions to API.
    * Add plugin_configure_single() plugin symbol which is easier to
      implement than plugin_configure().
    * Add new plugin signals: "document-before-save", "document-filetype-set",
      "geany-startup-complete".
    * Add PLUGIN_SET_TRANSLATABLE_INFO macro to the plugin API so plugins' meta
      information can be translated already in the plugin manager dialog
      (patch by Colomban Wendling).
    * Use full function name for GeanyFunctions function pointers. This
      avoids naming conflicts e.g. with C++'s 'new' keyword.
    * GeanyKeyBinding label fields can now contain underscores, which won't
      be displayed by Geany. This saves adding near-duplicate translation
      strings.
    * Add GeanyKeyGroup callback support.
    * Add more Scintilla function wrappers, foreach_dir(), foreach_str(),
      utils_get_file_list_full(), document_get_notebook_page(),
      editor_insert_text_block().
    * Don't install unnecessary headers.
    * Remove deprecated header pluginmacros.h - use geanyfunctions.h
      instead.
    * Deprecate documents_foreach(), use foreach_document() instead.
    * Deprecate PLUGIN_KEY_GROUP() macro - use plugin_set_key_group()
      instead.


Geany 0.18.1 (February 14, 2010)

    Build fixes:
    * Define G_GNUC_WARN_UNUSED_RESULT to fix build on GLib 2.8.
    * Use AC_PATH_PROG instead of 'which' for portability (patch by Erik
      Southworth, thanks).

    Incompatibilities:
    * Remove filetypes.common invert_all option - use 'Invert syntax
      highlighting colors' pref instead (fixes #2854525).

    Bug fixes:
    * Fix 'Open Selected File' for unsaved new documents.
    * Fix updating main menu accelerators after changing keybindings
      (thanks to Lex Trotman).
    * Fix using 'Insert date' keybinding when a custom date string has
      not been set.
    * Set the cursor color for the split window plugin.
    * Remove plugin from plugin manager dialog on unloading if it no
      longer exists or is incompatible.
    * Fix 'Reflow block' command when at the last paragraph and there's
      no last newline (patch by Eugene Arshinov, thanks).
    * Fix opening filenames beginning with two dots (closes #2858487).
    * Show Find in Files stderr output in messages window instead of
      debug window so that invalid regex messages can be seen easily.
    * Speed up sorting in utils_get_file_list(). This reduces the file
      browser delay on displaying a big directory, e.g. /usr/bin.
    * Fix a bug with not w3c compatible HTML code on export plugin
    * Fix non-working Home and End keys on numpads.
    * Fix loading of files on network resources on Windows.
    * Fix wrong alignment of printed pages when page headers are disabled
      (closes #2856822).

    Improvements:
    * Extend auto_latex() function to check whether an environment has
      been closed within the next lines to avoid auto adding double
      \end{}.
    * Replace some icons which could cause licensing problems by icons
      from the Rodent icon theme.

    Filetype fixes:
    * Parse contents of D extern{} and version{} blocks.
    * Fix creating D interface tags properly.
    * Parse D functions with contracts (fixes #1885480).
    * Parse D alias statement like typedef.
    * Improve parsing of LaTeX, PHP and Python files.

    Documentation:
    * Add 'Scope autocompletion' section.
    * Add 'Tools menu items' section to explain configuration files
      submenu, reload configuration item.
    * Minor updates/fixes.

    API:
    * Add gcc commands to build a plugin to the HowTo.

    HACKING file:
    * Add section 'Plugin API/ABI design'.
    * Add 'Compiler options & warnings' section.
    * Update Style section to be clearer about code alignment and show
      some example code.
    * Add 'Doc-comments' plugin API subsection.

    Internationalisation:
    * Added translations: gl


Geany 0.18 (August 16, 2009)

    General:
    * Fix scrolling horizontally after finding a search match with the
      search bar or Find Next/Previous which is off-screen.
    * Remove relative/untidy path elements from filenames when opening
      documents (#2823998).
    * Create initial template files with proper platform-specific line
      ending characters.
    * Improve inserting of comment templates like File header or licence
      notices.

    Interface:
    * Add 'Show Paths' documents list popup item.
    * Add filetypes.common to 'Configuration Files' menu.
    * Implement a graphical toolbar editor.
    * Add 'Build' toolbar button to the default layout.
    * Add 'Replace' toolbar button (closes #2798225).
    * Use a more Tango like icon for 'Save All' (by Jesse Mayes, thanks).
    * Add a popup menu for the keybinding list in the preferences dialog
      to easily expand and collapse all groups.

    Keybindings:
    * Implement Most-Recently-Used document switching when pressing
      'Switch to last used document' keybinding (Ctrl-Tab).
    * Add 'Mark All' keybinding (Ctrl-Shift-M).
    * Add 'Reflow lines/block' keybinding, (Ctrl-J; thanks to
      Eugene Arshinov).
    * Make the Scintilla keybindings 'Delete to end of line' and
      'Go to end of display line' configurable.
    * Switching notebook tabs now works for the currently used notebook
      widget instead of always using the documents notebook.

    Editor:
    * Fix a redraw when documents were first drawn uncolourised.
    * Delay highlighting matching braces by 100ms to speed up scrolling
      with the arrow keys.
    * Support 'tab indents, space aligns' style when indenting (#2789109).
    * Add 'Autocomplete all words in document' pref; also used when forcing
      autocompletion and there's no symbol names to show.
    * Add 'Drop rest of word on completion' pref.
    * Update Scintilla to version 1.79.
    * Improve displaying and reshowing of calltips.

    Syntax highlighting:
    * Reload color schemes via Tools menu (thanks to Eugene Arshinov).
    * Implement named styles support for filetypes.* using a
      filetypes.common [named_styles] section; used as
      "style=named_style,bold". (See the manual for details).
    * Allow style definitions with missing fields to use the
      filetypes.common default style's fields.
    * Make C-like filetype styles use named styles & default background
      color. (Anyone who wants to likewise update any other filetype's
      styles, please let us know ;-)).
    * Allow indentation of wrapped lines (see style 'line_wrap_indent').
    * Add new styles 'line_height' and 'marker_mark'.

    Filetypes:
    * Add Markdown filetype (thanks to Jon Strait).
    * Highlight D WYSIWYG backtick `strings` and r"strings" (#1895745).
    * Minor improvements for filetypes: Fortran, Haxe, HTML, Lua,
      Matlab, Pascal, Python, Tcl.

    Tags:
    * Read custom system global tags files from $prefix/share/geany/tags
      (#2778923).
    * Autocomplete scoped fields like struct members when typing '.' (and
      also '->' or '::' in C/C++) if the language's tag parser supports it.
    * Save field tags for C/C++ when generating a global tags file (you may
      want to regenerate your tag files).
    * Parse Python calltips.
    * Show relative paths in Diff filename tags.
    * Group reStructuredText symbol list items by scope level.

    Plugin API:
    * Add geanyplugin.h single include.
    * Add plugin_signal_connect() for connecting plugin signals at
      runtime and also for connecting to any GObject signal.
    * Add documents_foreach(), filetypes[], documents[], utils_strdupa()
      and various foreach_type() macros.
    * Make GeanyDocument::file_type always be non-NULL.

    Windows:
    * Fix quoting the build command string on Windows (closes #2791769).
    * Fix LaTeX view commands on Windows (part of #2807688).
    * Expand system environment variables (%variableName%) on Windows when
      running Build commands.

    Internationalisation:
    * Added translations: lb, sl, pt_PT
    * Updated translations: ca, cs, de, en_GB, fi, fr, ja, pt_BR, ru, tr

4 files changed, 68 insertions, 19 deletions

diff --git a/devel/geany/Makefile b/devel/geany/Makefile
index 11e06f994ba..e3f01371a6d 100644
--- a/devel/geany/Makefile
+++ b/devel/geany/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2011/04/22 13:43:18 obache Exp $
+# $NetBSD: Makefile,v 1.19 2011/05/12 13:12:18 obache Exp $
 
-DISTNAME=	geany-0.17
-PKGREVISION=	6
+DISTNAME=	geany-0.20
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geany/}
+MASTER_SITES=	http://download.geany.org/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://geany.uvena.de/
+HOMEPAGE=	http://www.geany.org/
 COMMENT=	Geany integrated development environment (IDE)
+#LICENSE=	gnu-gpl-v2 (or later) AND internal scintilla License.
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,6 +17,8 @@ USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config msgfmt gmake perl:run intltool
 USE_LANGUAGES=		c c++
 
+PKGCONFIG_OVERRIDE+=	geany.pc.in
+
 CONFIGURE_ARGS+=	--enable-plugins
 CONFIGURE_ARGS+=	--enable-vte
 CONFIGURE_ARGS+=	--enable-socket
@@ -28,11 +30,11 @@ MAKE_FLAGS+=		CCLD=${CXX:Q}
 .if ${OPSYS} == "SunOS" && !empty(PKGSRC_COMPILER:Msunpro)
 CONFIGURE_ARGS+=	CC=sunpro
 BUILDLINK_TRANSFORM+=	rm:-lstdc++
-.else
-CONFIGURE_ARGS+=	CC=gcc
 .endif
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/geany/PLIST b/devel/geany/PLIST
index 8c755e6269a..dca3d33cf0a 100644
--- a/devel/geany/PLIST
+++ b/devel/geany/PLIST
@@ -1,27 +1,24 @@
-@comment $NetBSD: PLIST,v 1.6 2009/07/18 19:37:42 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2011/05/12 13:12:18 obache Exp $
 bin/geany
-include/geany/dialogs.h
 include/geany/document.h
 include/geany/editor.h
 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
 include/geany/msgwindow.h
 include/geany/plugindata.h
-include/geany/pluginmacros.h
-include/geany/plugins.h
 include/geany/prefs.h
 include/geany/project.h
 include/geany/scintilla/SciLexer.h
 include/geany/scintilla/Scintilla.h
 include/geany/scintilla/Scintilla.iface
 include/geany/scintilla/ScintillaWidget.h
-include/geany/sciwrappers.h
 include/geany/search.h
+include/geany/stash.h
 include/geany/support.h
 include/geany/tagmanager/tm_file_entry.h
 include/geany/tagmanager/tm_project.h
@@ -52,8 +49,10 @@ share/doc/geany/README
 share/doc/geany/ScintillaLicense.txt
 share/doc/geany/THANKS
 share/doc/geany/TODO
+share/doc/geany/html/images/build_menu_commands_dialog.png
 share/doc/geany/html/images/find_dialog.png
 share/doc/geany/html/images/find_in_files_dialog.png
+share/doc/geany/html/images/main_window.png
 share/doc/geany/html/images/pref_dialog_edit_completions.png
 share/doc/geany/html/images/pref_dialog_edit_display.png
 share/doc/geany/html/images/pref_dialog_edit_features.png
@@ -73,8 +72,12 @@ share/doc/geany/html/index.html
 share/doc/geany/manual.txt
 share/geany/GPL-2
 share/geany/c99.tags
+share/geany/colorschemes/alt.conf
 share/geany/filetype_extensions.conf
+share/geany/filetypes.Genie.conf
+share/geany/filetypes.abc
 share/geany/filetypes.actionscript
+share/geany/filetypes.ada
 share/geany/filetypes.asm
 share/geany/filetypes.c
 share/geany/filetypes.caml
@@ -87,8 +90,10 @@ share/geany/filetypes.css
 share/geany/filetypes.d
 share/geany/filetypes.diff
 share/geany/filetypes.docbook
+share/geany/filetypes.erlang
 share/geany/filetypes.f77
 share/geany/filetypes.ferite
+share/geany/filetypes.forth
 share/geany/filetypes.fortran
 share/geany/filetypes.freebasic
 share/geany/filetypes.glsl
@@ -98,8 +103,10 @@ share/geany/filetypes.html
 share/geany/filetypes.java
 share/geany/filetypes.javascript
 share/geany/filetypes.latex
+share/geany/filetypes.lisp
 share/geany/filetypes.lua
 share/geany/filetypes.makefile
+share/geany/filetypes.markdown
 share/geany/filetypes.matlab
 share/geany/filetypes.nsis
 share/geany/filetypes.pascal
@@ -113,16 +120,32 @@ share/geany/filetypes.ruby
 share/geany/filetypes.sh
 share/geany/filetypes.sql
 share/geany/filetypes.tcl
+share/geany/filetypes.txt2tags
 share/geany/filetypes.vala
+share/geany/filetypes.verilog
 share/geany/filetypes.vhdl
 share/geany/filetypes.xml
 share/geany/filetypes.yaml
 share/geany/html_entities.tags
-share/geany/latex.tags
 share/geany/pascal.tags
 share/geany/php.tags
 share/geany/python.tags
 share/geany/snippets.conf
+share/geany/templates/bsd
+share/geany/templates/changelog
+share/geany/templates/fileheader
+share/geany/templates/files/file.html
+share/geany/templates/files/file.php
+share/geany/templates/files/file.rb
+share/geany/templates/files/file.tex
+share/geany/templates/files/main.c
+share/geany/templates/files/main.cxx
+share/geany/templates/files/main.d
+share/geany/templates/files/main.java
+share/geany/templates/files/main.py
+share/geany/templates/files/program.pas
+share/geany/templates/function
+share/geany/templates/gpl
 share/geany/ui_toolbar.xml
 share/icons/hicolor/16x16/apps/classviewer-class.png
 share/icons/hicolor/16x16/apps/classviewer-macro.png
@@ -132,6 +155,10 @@ 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
+share/locale/ast/LC_MESSAGES/geany.mo
 share/locale/be/LC_MESSAGES/geany.mo
 share/locale/bg/LC_MESSAGES/geany.mo
 share/locale/ca/LC_MESSAGES/geany.mo
@@ -142,19 +169,23 @@ share/locale/en_GB/LC_MESSAGES/geany.mo
 share/locale/es/LC_MESSAGES/geany.mo
 share/locale/fi/LC_MESSAGES/geany.mo
 share/locale/fr/LC_MESSAGES/geany.mo
+share/locale/gl/LC_MESSAGES/geany.mo
 share/locale/hu/LC_MESSAGES/geany.mo
 share/locale/it/LC_MESSAGES/geany.mo
 share/locale/ja/LC_MESSAGES/geany.mo
+share/locale/kk/LC_MESSAGES/geany.mo
 share/locale/ko/LC_MESSAGES/geany.mo
+share/locale/lb/LC_MESSAGES/geany.mo
 share/locale/nl/LC_MESSAGES/geany.mo
 share/locale/pl/LC_MESSAGES/geany.mo
+share/locale/pt/LC_MESSAGES/geany.mo
 share/locale/pt_BR/LC_MESSAGES/geany.mo
 share/locale/ro/LC_MESSAGES/geany.mo
 share/locale/ru/LC_MESSAGES/geany.mo
+share/locale/sl/LC_MESSAGES/geany.mo
 share/locale/sv/LC_MESSAGES/geany.mo
 share/locale/tr/LC_MESSAGES/geany.mo
 share/locale/uk/LC_MESSAGES/geany.mo
 share/locale/vi/LC_MESSAGES/geany.mo
 share/locale/zh_CN/LC_MESSAGES/geany.mo
 share/locale/zh_TW/LC_MESSAGES/geany.mo
-share/pixmaps/geany.png
diff --git a/devel/geany/distinfo b/devel/geany/distinfo
index 212574817a7..5847e22cdd8 100644
--- a/devel/geany/distinfo
+++ b/devel/geany/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/07/18 19:37:42 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/05/12 13:12:18 obache Exp $
 
-SHA1 (geany-0.17.tar.gz) = 2a4b39e0dd8f539fda2d57e77ed78aba19fd09d6
-RMD160 (geany-0.17.tar.gz) = 6f51b1dab47052260f64cb8e6ec4c74288a40878
-Size (geany-0.17.tar.gz) = 3190575 bytes
+SHA1 (geany-0.20.tar.gz) = 95ff73f40ee7488d49f2feaf97edabaafe9c3bc6
+RMD160 (geany-0.20.tar.gz) = 71e75e332b0181fea30ddd323c9da160c7f85977
+Size (geany-0.20.tar.gz) = 4021130 bytes
+SHA1 (patch-configure) = d3e12911b2cf60e88d9912336e8bda68d1ca1c4c
diff --git a/devel/geany/patches/patch-configure b/devel/geany/patches/patch-configure
new file mode 100644
index 00000000000..d25baefeae8
--- /dev/null
+++ b/devel/geany/patches/patch-configure
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2011/05/12 13:12:18 obache Exp $
+
+* portability fix.
+
+--- configure.orig	2011-05-12 12:28:08.000000000 +0000
++++ configure
+@@ -21196,7 +21196,7 @@ if test -d ".git" -a "x${GIT}" != "x" -a
+ then
+ 	# check for git-svn repo first - find-rev (v1.5.4.1) doesn't always fail with git-only repo
+ 	git svn info &>/dev/null
+-	if test "x$?" == "x0"; then
++	if test "x$?" = "x0"; then
+ 		REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
+ 				git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null ||
+ 				git svn find-rev master 2>/dev/null || echo 0`