Update to 2.26.1, set comment LICENSE (needs AND).

seahorse 2.26.1
---------------

    * PGP UIDs display in order reported by key server, and fix
      parsing of HKP PGP search UIDs. [Adam Schreiber]
    * Fix problem opening preferences window twice. [Adam Schreiber]
    * Set authorized_keys properly when sending SSH keys to a
      remote system. [Andreas Moog, Stef Walter]
    * Fix crash when entering hkp: url manually. [Stef Walter]

4 files changed, 19 insertions, 16 deletions

diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 76d3ed6a5a8..68ddd49f49f 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.79 2009/03/22 19:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.80 2009/05/18 15:32:02 wiz Exp $
 
-DISTNAME=	seahorse-2.26.0
+DISTNAME=	seahorse-2.26.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/seahorse/2.26/}
 EXTRACT_SUFX=	.tar.bz2
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/projects/seahorse/
 COMMENT=	GnuPG front end and bonobo component for GNOME
 
+#LICENSE=	gnu-gpl-v2 AND gnu-fdl-v1.1 AND gnu-lgpl-v2
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=		gnupg>=1.2.1:../../security/gnupg
diff --git a/security/seahorse/PLIST b/security/seahorse/PLIST
index c7c8a1ca915..3201eed0786 100644
--- a/security/seahorse/PLIST
+++ b/security/seahorse/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2009/03/15 18:32:43 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.21 2009/05/18 15:32:02 wiz Exp $
 bin/seahorse
 bin/seahorse-daemon
 include/libcryptui/cryptui-key-chooser.h
@@ -72,6 +72,7 @@ share/icons/hicolor/32x32/apps/seahorse.png
 share/icons/hicolor/48x48/apps/seahorse-preferences.png
 share/icons/hicolor/48x48/apps/seahorse.png
 share/locale/ar/LC_MESSAGES/seahorse.mo
+share/locale/as/LC_MESSAGES/seahorse.mo
 share/locale/az/LC_MESSAGES/seahorse.mo
 share/locale/be@latin/LC_MESSAGES/seahorse.mo
 share/locale/bg/LC_MESSAGES/seahorse.mo
diff --git a/security/seahorse/distinfo b/security/seahorse/distinfo
index 03e3d326752..fa1cc31771d 100644
--- a/security/seahorse/distinfo
+++ b/security/seahorse/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.27 2009/03/15 18:32:44 jmcneill Exp $
+$NetBSD: distinfo,v 1.28 2009/05/18 15:32:02 wiz Exp $
 
-SHA1 (seahorse-2.26.0.tar.bz2) = 701699685003202ec68de28d2d584cf682a210d4
-RMD160 (seahorse-2.26.0.tar.bz2) = 2183c09bea1ed99ccdc20bd3ee2e3f2bce1f3d7f
-Size (seahorse-2.26.0.tar.bz2) = 2151482 bytes
-SHA1 (patch-aa) = 312f108adf95a33dc24b4025de7c0d74b9d2df3d
+SHA1 (seahorse-2.26.1.tar.bz2) = b1d6a94797895690c034ba0016930a56694877d5
+RMD160 (seahorse-2.26.1.tar.bz2) = 75e58a0c5cced19aefa3290bf39df5f8a88329d8
+Size (seahorse-2.26.1.tar.bz2) = 2197974 bytes
+SHA1 (patch-aa) = d7fa3f1cc936062343ec5047636485604672eca6
 SHA1 (patch-ab) = 0abe419541669a41aaf48e3a41efdcfc031ed0ed
diff --git a/security/seahorse/patches/patch-aa b/security/seahorse/patches/patch-aa
index f278b841559..3a4a845a6e1 100644
--- a/security/seahorse/patches/patch-aa
+++ b/security/seahorse/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2008/10/27 16:51:59 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2009/05/18 15:32:02 wiz Exp $
 
---- configure.orig	2008-10-27 14:54:33.000000000 +0000
+--- configure.orig	2009-04-12 14:33:21.000000000 +0000
 +++ configure
-@@ -17343,7 +17343,7 @@ _ACEOF
+@@ -17853,7 +17853,7 @@ _ACEOF
  
  fi
  
@@ -11,8 +11,8 @@ $NetBSD: patch-aa,v 1.10 2008/10/27 16:51:59 wiz Exp $
    WITH_PGP_TRUE=
    WITH_PGP_FALSE='#'
  else
-@@ -18602,7 +18602,7 @@ else
- echo "${ECHO_T}yes" >&6; }
+@@ -19016,7 +19016,7 @@ else
+ $as_echo "yes" >&6; }
  	enable_pkcs11="yes"
  fi
 -	if test "$enable_pkcs11" == "yes"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-aa,v 1.10 2008/10/27 16:51:59 wiz Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define WITH_PKCS11 1
-@@ -18613,7 +18613,7 @@ _ACEOF
+@@ -19027,7 +19027,7 @@ _ACEOF
  	fi
  fi
  
@@ -29,7 +29,7 @@ $NetBSD: patch-aa,v 1.10 2008/10/27 16:51:59 wiz Exp $
    WITH_PKCS11_TRUE=
    WITH_PKCS11_FALSE='#'
  else
-@@ -18738,7 +18738,7 @@ _ACEOF
+@@ -19152,7 +19152,7 @@ _ACEOF
  
  fi
  
@@ -38,7 +38,7 @@ $NetBSD: patch-aa,v 1.10 2008/10/27 16:51:59 wiz Exp $
    WITH_SSH_TRUE=
    WITH_SSH_FALSE='#'
  else
-@@ -18795,7 +18795,7 @@ if test "$enable_tests" != "yes"; then
+@@ -19209,7 +19209,7 @@ if test "$enable_tests" != "yes"; then
      enable_tests="no"
  fi