Update to 1.0beta2. Convert to user-destdir, set LICENSE.

    * active image follows keyboard focus
    * added simple desktop file editor
    * layout id "_current_" matches the currently active layout
    window
    * added a possibility to update existing bars from config
    * added tooltips to external editors on toolbar, added "load
    config" command to remote control
    * added possibility to update existing layout window from config
    * added function to reload external editors at any time
    * added more IPTC tags
    * implemented editing support in exif pane
    * fixed loading of desktop file icons, gtk seems to expect an
    icon name without extension
    * compute histogram in idle time
    * completely separated global and layout window options, layout
    window configuration is available under separate menu entry
    * do not allow to add keywords with the same name as siblings
    * added keyword tree filtering
    * show file name in advanced_exif
    * handle sidecar files for raw formats that are not known to
    exiv2
    * added a dialog for editing keyword tree
    * added a popup menu in keyword tree
    * Remove the toggle on advanced exif window menu item.
    * Advanced exif window: make all columns sortable and resizable.
    * Display icons in edit contextual menu.
    * In various Edit context menus, only display editors that
    match the file types in the selection.
    * allow dropping of multiple keywords
    * show a label instead of the default drag icon
    * implemented keywords editor as described at
    http://geeqie.wiki.sourceforge.net/keywords
    * Try to improve tab completion: when a key is pressed while
    tab completion menu is shown, the number of entries is reduced,
    dhowing all matching entries but the menu is no more closed
    after each key pressure. Number of possible entries in this
    menu was increased from 500 to 1000. Pressing TAB when path
    entry is empty now adds / (root directory).
    * added popup menu to the exif pane
    * indicate that the exif pane is empty
    * Display pixel coordinates and rgb, patch by Ruben Stein
    * reorder exif pane entries with drag and drop
    * overlay now survives image split
    * Add a directory separator at the end of names in tab completion
    list to indicate directories.
    * Align exif labels vertically (visually better since name is
    now smaller than value).
    * Enable 'Use profile from image' item of color management menu
    only if such profile information is available from image.
    * In the side bar, display the filename without the 'Filename:'
    prefix and makes it centered. Allow to select it for copy'n'paste.
    * Color profiles menu: test for file access before allowing to
    select it as input profile.
    * load icons for external editors
    * split overlay options between global and layout window
    * save and restore toolbar configuration
    * Add an indicator of the embedded color profile when recognized
    (a * just after sRGB or AdobeRGB compatible).
    * Color profiles menu: mark empty entries as inactive.
    * Add a tooltip showing current histogram state on bar histogram.
    * correctly save and restore overlay string
    * Save bar pane histogram state to rc file.
    * Add a contextual menu on bar pane histogram allowing to change
    channels and mode.
    * Drop histogram based on mean value.
    * config file format changed to XML
    * Add grid to bar histogram.
    * Fix bug 2599857: file list sort order was wrong in many cases.
    * separated "normal" and advanced exif, "Normal" exif is now
    in the generic bar, advanced exif is in separate window.
    * replaced bar_info with an universal bar
    * Start with "Fit to window" in "Leave Zoom at previous setting"
    mode
    * do not switch to the next image on mouse click in split mode,
    it interferes with image switching too much.
    * Speed up random slideshow, startup time decreases from minutes
    to seconds when amount of images is big. Patch by Kjell
    Morgenstern.
    * Do not show geeqie itself in editors menus.
    * read external editors from .desktop files
    * Invert Horizontally vs vertically zoom fit, it was a TRUE/FALSE
    mismatch, reported by Christopher Beland.
    * Remove harmful documentation.helpdir and documentation.htmldir
    options. These paths can still be modified through with-readmedir
    and --htmldir configure options. Reported by Christopher Beland.
    * show symlinks in filelist
    * added a status bar button for writting metadata immediately
    * metadata write mode (direct or sidecar) made configurable
    for each file format

6 files changed, 73 insertions, 24 deletions

diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 918790fe4c4..16094625a1a 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,18 +1,21 @@
-# $NetBSD: Makefile,v 1.3 2009/07/22 09:01:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2009/07/23 23:08:37 wiz Exp $
 #
 
-DISTNAME=	geeqie-1.0alpha3
+DISTNAME=	geeqie-1.0beta2
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geeqie/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://geeqie.sourceforge.net/
 COMMENT=	Image viewer
+LICENSE=	gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LANGUAGES=		c c++
-USE_TOOLS=		pkg-config gmake msgfmt
+USE_TOOLS=		gmake intltool msgfmt pkg-config
 
 .include "../../graphics/exiv2/buildlink3.mk"
 .include "../../graphics/lcms/buildlink3.mk"
diff --git a/graphics/geeqie/PLIST b/graphics/geeqie/PLIST
index 1b741e2ad63..61b6cba2e96 100644
--- a/graphics/geeqie/PLIST
+++ b/graphics/geeqie/PLIST
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:13 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/07/23 23:08:37 wiz Exp $
 bin/geeqie
+lib/geeqie/geeqie-import
+lib/geeqie/geeqie-rotate
+lib/geeqie/geeqie-symlink
+lib/geeqie/geeqie-ufraw
 man/man1/geeqie.1
 share/applications/geeqie.desktop
 share/doc/${PKGNAME}/COPYING
@@ -56,6 +60,14 @@ share/doc/${PKGNAME}/html/sidebars_exif.html
 share/doc/${PKGNAME}/html/sidebars_keywords.html
 share/doc/${PKGNAME}/html/sidebars_sort_manager.html
 share/doc/${PKGNAME}/html/style.css
+share/geeqie/applications/geeqie-import-geeqie.desktop
+share/geeqie/applications/geeqie-import-gqview.desktop
+share/geeqie/applications/geeqie-ufraw-id.desktop
+share/geeqie/applications/geeqie-ufraw-recursive.desktop
+share/geeqie/applications/geeqie-ufraw.desktop
+share/geeqie/applications/rotate.desktop
+share/geeqie/applications/symlink.desktop
+share/geeqie/template.desktop
 share/locale/ar/LC_MESSAGES/geeqie.mo
 share/locale/be/LC_MESSAGES/geeqie.mo
 share/locale/bg/LC_MESSAGES/geeqie.mo
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index 395334e3257..d83dfe25030 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/01/27 19:14:31 drochner Exp $
+$NetBSD: distinfo,v 1.2 2009/07/23 23:08:37 wiz Exp $
 
-SHA1 (geeqie-1.0alpha3.tar.gz) = 1b2b0bdc72abecbe3169a01150a4e80312add366
-RMD160 (geeqie-1.0alpha3.tar.gz) = df63dc777f7f922b137c296594f024204b0f03f4
-Size (geeqie-1.0alpha3.tar.gz) = 2067890 bytes
-SHA1 (patch-aa) = 3231333775de3560840cbfbcf31d241061e7afee
-SHA1 (patch-ab) = 797696787c781a735bc43daccdaabe9c657edac6
+SHA1 (geeqie-1.0beta2.tar.gz) = 2f26de077d90cad5a0499bfd5e8e3908947773de
+RMD160 (geeqie-1.0beta2.tar.gz) = 7cb29da6495eec48660102b105e0516375936737
+Size (geeqie-1.0beta2.tar.gz) = 1912367 bytes
+SHA1 (patch-aa) = 7991cc161efcc2ac0ac7d477019ed7e3092d9d1b
+SHA1 (patch-ab) = fd686d122a3e7766823a5670e22448c5c8ad54cc
+SHA1 (patch-ac) = eae6e5843473fd49aa07ca7d988deb24a16087f9
diff --git a/graphics/geeqie/patches/patch-aa b/graphics/geeqie/patches/patch-aa
index 8a2d1d2de9b..8cf72659180 100644
--- a/graphics/geeqie/patches/patch-aa
+++ b/graphics/geeqie/patches/patch-aa
@@ -1,13 +1,31 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/01/27 19:14:31 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2009/07/23 23:08:37 wiz Exp $
 
---- configure.orig	2009-01-25 19:54:13.000000000 +0100
+--- configure.orig	2009-07-02 17:46:06.000000000 +0000
 +++ configure
-@@ -2398,7 +2398,7 @@ if test "x${enable_debug_flags}" != "xno
+@@ -4612,7 +4612,7 @@ fi
+ 
+ if test "x${enable_debug_flags}" != "xno"
  then
-   CXXFLAGS="${CXXFLAGS} -g -O0 -Wunused-value -Wunused-variable -Wunused-function -Wunused-label -Wcomment -Wmissing-braces -Wparentheses -Wreturn-type -Wswitch -Wstrict-aliasing -Wextra -Wno-unused-parameter"
-   CFLAGS="${CFLAGS} -g -O0 -Wunused-value -Wunused-variable -Wunused-function -Wunused-label -Wcomment -Wimplicit-int -Werror-implicit-function-declaration -Wmissing-braces -Wparentheses -Wreturn-type -Wswitch -Wstrict-aliasing -Wextra -Wno-unused-parameter"
 -  if test "x${enable_developer}" == "xyes"
 +  if test "x${enable_developer}" = "xyes"
    then
-   CXXFLAGS="${CXXFLAGS} -Wall"
-   CFLAGS="${CFLAGS} -Wstrict-prototypes -Wall"
+     CXXFLAGS="${CXXFLAGS} -Wall"
+     CFLAGS="${CFLAGS} -Wstrict-prototypes -Wall"
+@@ -11852,7 +11852,7 @@ else
+ fi
+ 
+ 
+-if test "x${libgps}" == "xyes"; then
++if test "x${libgps}" = "xyes"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN" >&5
+@@ -11939,7 +11939,7 @@ else
+   HAVE_LIBCHAMPLAIN=disabled
+ fi
+ 
+-if test "x${libgps}" == "xyes"; then
++if test "x${libgps}" = "xyes"; then
+ 
+ pkg_failed=no
+ { $as_echo "$as_me:$LINENO: checking for LIBCHAMPLAIN_GTK" >&5
diff --git a/graphics/geeqie/patches/patch-ab b/graphics/geeqie/patches/patch-ab
index 455af98aa01..ec97614c18f 100644
--- a/graphics/geeqie/patches/patch-ab
+++ b/graphics/geeqie/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/01/27 19:14:31 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2009/07/23 23:08:37 wiz Exp $
 
---- po/Makefile.in.in.orig	2008-07-30 22:02:12.000000000 +0200
+--- po/Makefile.in.in.orig	2009-07-02 17:46:02.000000000 +0000
 +++ po/Makefile.in.in
-@@ -21,6 +21,7 @@ SHELL = /bin/sh
+@@ -21,6 +21,7 @@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
  
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
 +top_builddir = ..
- VPATH = @srcdir@
+ SHELL = @SHELL@
  
- prefix = @prefix@
+ srcdir = @srcdir@
diff --git a/graphics/geeqie/patches/patch-ac b/graphics/geeqie/patches/patch-ac
new file mode 100644
index 00000000000..0418e66c81c
--- /dev/null
+++ b/graphics/geeqie/patches/patch-ac
@@ -0,0 +1,15 @@
+$NetBSD: patch-ac,v 1.1 2009/07/23 23:08:37 wiz Exp $
+
+--- src/main.c.orig	2009-07-02 17:45:20.000000000 +0000
++++ src/main.c
+@@ -698,6 +698,10 @@ void exit_program(void)
+  */
+ /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
+ 
++#ifndef MAP_ANONYMOUS
++#define MAP_ANONYMOUS 0
++#endif
++
+ #ifdef SIGBUS
+ static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
+ {