Update to 1.0. Take maintainership.

Upstream did not provide a list of changes from 1.0beta2.

5 files changed, 97 insertions, 98 deletions

diff --git a/graphics/geeqie/Makefile b/graphics/geeqie/Makefile
index 6fe71d70a92..767a506065a 100644
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2009/08/26 19:57:41 sno Exp $
+# $NetBSD: Makefile,v 1.8 2010/02/20 20:50:34 gdt Exp $
 #
 
-DISTNAME=	geeqie-1.0beta2
-PKGREVISION=	2
+DISTNAME=	geeqie-1.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=geeqie/}
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	gdt@NetBSD.org
 HOMEPAGE=	http://geeqie.sourceforge.net/
 COMMENT=	Image viewer
 LICENSE=	gnu-gpl-v2
diff --git a/graphics/geeqie/PLIST b/graphics/geeqie/PLIST
index 61b6cba2e96..16c28dafa18 100644
--- a/graphics/geeqie/PLIST
+++ b/graphics/geeqie/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/07/23 23:08:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/02/20 20:50:34 gdt Exp $
 bin/geeqie
 lib/geeqie/geeqie-import
 lib/geeqie/geeqie-rotate
@@ -11,55 +11,75 @@ share/doc/${PKGNAME}/ChangeLog
 share/doc/${PKGNAME}/README
 share/doc/${PKGNAME}/README.lirc
 share/doc/${PKGNAME}/TODO
-share/doc/${PKGNAME}/html/collections.html
-share/doc/${PKGNAME}/html/credits.html
-share/doc/${PKGNAME}/html/faq.html
-share/doc/${PKGNAME}/html/gnu_fdl.txt
-share/doc/${PKGNAME}/html/image_management.html
-share/doc/${PKGNAME}/html/image_management_copy_move.html
-share/doc/${PKGNAME}/html/image_management_delete.html
-share/doc/${PKGNAME}/html/image_management_external_editing.html
-share/doc/${PKGNAME}/html/image_management_rename.html
-share/doc/${PKGNAME}/html/image_presentation.html
-share/doc/${PKGNAME}/html/image_presentation_fullscreen.html
-share/doc/${PKGNAME}/html/image_presentation_slideshow.html
-share/doc/${PKGNAME}/html/image_search.html
-share/doc/${PKGNAME}/html/image_search_finding_duplicates.html
-share/doc/${PKGNAME}/html/image_search_search.html
+share/doc/${PKGNAME}/html/AdvancedFeatures.html
+share/doc/${PKGNAME}/html/Authors.html
+share/doc/${PKGNAME}/html/BasicFeatures.html
+share/doc/${PKGNAME}/html/Cancelbutton.html
+share/doc/${PKGNAME}/html/Commandline.html
+share/doc/${PKGNAME}/html/Copyright.html
+share/doc/${PKGNAME}/html/GuideCollections.html
+share/doc/${PKGNAME}/html/GuideCredits.html
+share/doc/${PKGNAME}/html/GuideFaq.html
+share/doc/${PKGNAME}/html/GuideGnuFdl.html
+share/doc/${PKGNAME}/html/GuideImageManagement.html
+share/doc/${PKGNAME}/html/GuideImageManagementCopyMove.html
+share/doc/${PKGNAME}/html/GuideImageManagementDelete.html
+share/doc/${PKGNAME}/html/GuideImageManagementExternalEditing.html
+share/doc/${PKGNAME}/html/GuideImageManagementRename.html
+share/doc/${PKGNAME}/html/GuideImagePresentation.html
+share/doc/${PKGNAME}/html/GuideImagePresentationFullscreen.html
+share/doc/${PKGNAME}/html/GuideImagePresentationSlideshow.html
+share/doc/${PKGNAME}/html/GuideImageSearch.html
+share/doc/${PKGNAME}/html/GuideImageSearchFindingDuplicates.html
+share/doc/${PKGNAME}/html/GuideImageSearchSearch.html
+share/doc/${PKGNAME}/html/GuideIndex-info.html
+share/doc/${PKGNAME}/html/GuideIndex.html
+share/doc/${PKGNAME}/html/GuideIntroduction.html
+share/doc/${PKGNAME}/html/GuideMainWindow.html
+share/doc/${PKGNAME}/html/GuideMainWindowFilePane.html
+share/doc/${PKGNAME}/html/GuideMainWindowFolderPane.html
+share/doc/${PKGNAME}/html/GuideMainWindowImagePane.html
+share/doc/${PKGNAME}/html/GuideMainWindowLayout.html
+share/doc/${PKGNAME}/html/GuideMainWindowMenus.html
+share/doc/${PKGNAME}/html/GuideMainWindowNavigation.html
+share/doc/${PKGNAME}/html/GuideMainWindowStatusBar.html
+share/doc/${PKGNAME}/html/GuideOptions.html
+share/doc/${PKGNAME}/html/GuideOptionsBehavior.html
+share/doc/${PKGNAME}/html/GuideOptionsColor.html
+share/doc/${PKGNAME}/html/GuideOptionsFiltering.html
+share/doc/${PKGNAME}/html/GuideOptionsGeneral.html
+share/doc/${PKGNAME}/html/GuideOptionsHidden.html
+share/doc/${PKGNAME}/html/GuideOptionsImage.html
+share/doc/${PKGNAME}/html/GuideOptionsKeyboard.html
+share/doc/${PKGNAME}/html/GuideOptionsLayout.html
+share/doc/${PKGNAME}/html/GuideOptionsMetadata.html
+share/doc/${PKGNAME}/html/GuideOptionsWindow.html
+share/doc/${PKGNAME}/html/GuideOtherWindows.html
+share/doc/${PKGNAME}/html/GuideOtherWindowsImageProperties.html
+share/doc/${PKGNAME}/html/GuideOtherWindowsImageWindow.html
+share/doc/${PKGNAME}/html/GuideOtherWindowsPanView.html
+share/doc/${PKGNAME}/html/GuidePrinting.html
+share/doc/${PKGNAME}/html/GuideReference.html
+share/doc/${PKGNAME}/html/GuideReferenceCommandLine.html
+share/doc/${PKGNAME}/html/GuideReferenceKeyboardShortcuts.html
+share/doc/${PKGNAME}/html/GuideReferenceManagement.html
+share/doc/${PKGNAME}/html/GuideReferenceThumbnails.html
+share/doc/${PKGNAME}/html/GuideSidebars.html
+share/doc/${PKGNAME}/html/GuideSidebarsInfo.html
+share/doc/${PKGNAME}/html/GuideSidebarsSortManager.html
+share/doc/${PKGNAME}/html/Imageviewing.html
+share/doc/${PKGNAME}/html/Layouttab.html
+share/doc/${PKGNAME}/html/LegalNotice.html
+share/doc/${PKGNAME}/html/License.html
+share/doc/${PKGNAME}/html/Miscellaneous.html
+share/doc/${PKGNAME}/html/Papertab.html
+share/doc/${PKGNAME}/html/Preview.html
+share/doc/${PKGNAME}/html/Printbutton.html
+share/doc/${PKGNAME}/html/Printertab.html
+share/doc/${PKGNAME}/html/Rememberprintsettings.html
+share/doc/${PKGNAME}/html/Texttab.html
+share/doc/${PKGNAME}/html/Thecollectionwindow.html
 share/doc/${PKGNAME}/html/index.html
-share/doc/${PKGNAME}/html/introduction.html
-share/doc/${PKGNAME}/html/main_window.html
-share/doc/${PKGNAME}/html/main_window_file_pane.html
-share/doc/${PKGNAME}/html/main_window_folder_pane.html
-share/doc/${PKGNAME}/html/main_window_image_pane.html
-share/doc/${PKGNAME}/html/main_window_layout.html
-share/doc/${PKGNAME}/html/main_window_menus.html
-share/doc/${PKGNAME}/html/main_window_navigation.html
-share/doc/${PKGNAME}/html/main_window_status_bar.html
-share/doc/${PKGNAME}/html/options.html
-share/doc/${PKGNAME}/html/options_advanced.html
-share/doc/${PKGNAME}/html/options_editor_commands.html
-share/doc/${PKGNAME}/html/options_filtering.html
-share/doc/${PKGNAME}/html/options_general.html
-share/doc/${PKGNAME}/html/options_hidden.html
-share/doc/${PKGNAME}/html/options_image.html
-share/doc/${PKGNAME}/html/options_properties.html
-share/doc/${PKGNAME}/html/options_window.html
-share/doc/${PKGNAME}/html/other_windows.html
-share/doc/${PKGNAME}/html/other_windows_image_properties.html
-share/doc/${PKGNAME}/html/other_windows_image_window.html
-share/doc/${PKGNAME}/html/other_windows_pan_view.html
-share/doc/${PKGNAME}/html/printing.html
-share/doc/${PKGNAME}/html/reference.html
-share/doc/${PKGNAME}/html/reference_command_line.html
-share/doc/${PKGNAME}/html/reference_keyboard_shortcuts.html
-share/doc/${PKGNAME}/html/reference_management.html
-share/doc/${PKGNAME}/html/reference_thumbnails.html
-share/doc/${PKGNAME}/html/sidebars.html
-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
@@ -94,6 +114,8 @@ share/locale/ro/LC_MESSAGES/geeqie.mo
 share/locale/ru/LC_MESSAGES/geeqie.mo
 share/locale/sk/LC_MESSAGES/geeqie.mo
 share/locale/sl/LC_MESSAGES/geeqie.mo
+share/locale/sr/LC_MESSAGES/geeqie.mo
+share/locale/sr@latin/LC_MESSAGES/geeqie.mo
 share/locale/sv/LC_MESSAGES/geeqie.mo
 share/locale/th/LC_MESSAGES/geeqie.mo
 share/locale/tr/LC_MESSAGES/geeqie.mo
diff --git a/graphics/geeqie/distinfo b/graphics/geeqie/distinfo
index 7e517fe27c1..3a5fbee5c3e 100644
--- a/graphics/geeqie/distinfo
+++ b/graphics/geeqie/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/07/24 10:51:15 drochner Exp $
+$NetBSD: distinfo,v 1.4 2010/02/20 20:50:34 gdt Exp $
 
-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-ac) = f4ceb73b0ce87e50c38b758575ab0a441c245b84
+SHA1 (geeqie-1.0.tar.gz) = 8494a557d67d20e6ad720645ec789dd2b33a3266
+RMD160 (geeqie-1.0.tar.gz) = f410b5f7bca872f4e67dc2b9f9ffe8e0cedf291a
+Size (geeqie-1.0.tar.gz) = 1934236 bytes
+SHA1 (patch-ac) = 4109912f790351c4cc14d6db753c9571a421ae36
diff --git a/graphics/geeqie/patches/patch-aa b/graphics/geeqie/patches/patch-aa
deleted file mode 100644
index 8cf72659180..00000000000
--- a/graphics/geeqie/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/07/23 23:08:37 wiz Exp $
-
---- configure.orig	2009-07-02 17:46:06.000000000 +0000
-+++ configure
-@@ -4612,7 +4612,7 @@ fi
- 
- if test "x${enable_debug_flags}" != "xno"
- then
--  if test "x${enable_developer}" == "xyes"
-+  if test "x${enable_developer}" = "xyes"
-   then
-     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-ac b/graphics/geeqie/patches/patch-ac
index 467eef952f7..3acd84598f7 100644
--- a/graphics/geeqie/patches/patch-ac
+++ b/graphics/geeqie/patches/patch-ac
@@ -1,22 +1,32 @@
-$NetBSD: patch-ac,v 1.2 2009/07/24 10:51:16 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2010/02/20 20:50:34 gdt Exp $
 
---- src/main.c.orig	2009-07-02 19:45:20.000000000 +0200
+--- src/main.c.orig	2010-02-17 21:21:19.000000000 +0000
 +++ src/main.c
-@@ -698,7 +698,7 @@ void exit_program(void)
+@@ -709,6 +709,7 @@ void exit_program(void)
   */
  /* FIXME: this probably needs some better ifdefs. Please report any compilation problems */
  
--#ifdef SIGBUS
 +#if 0
+ #if defined(SIGBUS) && defined(SA_SIGINFO)
  static void sigbus_handler_cb(int signum, siginfo_t *info, void *context)
  {
- 	unsigned long pagesize = sysconf(_SC_PAGE_SIZE);
-@@ -709,7 +709,7 @@ static void sigbus_handler_cb(int signum
+@@ -717,9 +718,11 @@ static void sigbus_handler_cb(int signum
+ 	mmap((void *)(((unsigned long)info->si_addr / pagesize) * pagesize), pagesize, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ }
+ #endif
++#endif /* 0 */
  
  static void setup_sigbus_handler(void)
  {
--#ifdef SIGBUS
 +#if 0
+ #if defined(SIGBUS) && defined(SA_SIGINFO)
  	struct sigaction sigbus_action;
  	sigfillset(&sigbus_action.sa_mask);
- 	sigbus_action.sa_sigaction = sigbus_handler_cb;
+@@ -728,6 +731,7 @@ static void setup_sigbus_handler(void)
+ 
+ 	sigaction(SIGBUS, &sigbus_action, NULL);
+ #endif
++#endif /* 0 */
+ }
+ 
+ gint main(gint argc, gchar *argv[])