Update to 3.1.91.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16246 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 73 insertions, 20 deletions

diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index 8838f0c75..f4e61ffd1 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -3,12 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.13 2011/06/10 22:59:07 mezz Exp $
+#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.14 2011/07/03 11:57:45 kwm Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	3.0.3
-PORTREVISION=	1
+PORTVERSION=	3.1.91
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -16,7 +15,8 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A program that keeps passwords and other secrets
 
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
+		update-mime-database:${PORTSDIR}/misc/shared-mime-info
 LIB_DEPENDS=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
@@ -25,15 +25,15 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 CONFLICTS=	gnome-keyring-2.[0-9]*
 
 LATEST_LINK=	gnome-keyring3
-USE_BZIP2=	yes
+USE_XZ=		yes
 USE_GNOME=	gnomehack gnomeprefix gtk30 ltverhack intlhack
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
-		--with-root-certs=${LOCALBASE}/share/certs \
-		--with-gtk=3.0
+		--with-root-certs=${LOCALBASE}/share/certs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 GLIB_SCHEMAS=	org.gnome.crypto.cache.gschema.xml \
diff --git a/security/gnome-keyring3/distinfo b/security/gnome-keyring3/distinfo
index 5ebf07bb8..45e7ca38c 100644
--- a/security/gnome-keyring3/distinfo
+++ b/security/gnome-keyring3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-keyring-3.0.3.tar.bz2) = a06c34e474d93da62bf96a816e58cb5730e181d6523730f041f34c58a0d5e94e
-SIZE (gnome3/gnome-keyring-3.0.3.tar.bz2) = 1911499
+SHA256 (gnome3/gnome-keyring-3.1.91.tar.xz) = 6a5b448b33804e86375f61325e5037efbc84d56f35f44976c0cb0e107b252f62
+SIZE (gnome3/gnome-keyring-3.1.91.tar.xz) = 1570728
diff --git a/security/gnome-keyring3/pkg-plist b/security/gnome-keyring3/pkg-plist
index 7b3154cdb..272819729 100644
--- a/security/gnome-keyring3/pkg-plist
+++ b/security/gnome-keyring3/pkg-plist
@@ -1,3 +1,4 @@
+bin/gcr-viewer
 bin/gnome-keyring
 bin/gnome-keyring-3
 bin/gnome-keyring-daemon
@@ -5,28 +6,39 @@ etc/xdg/autostart/gnome-keyring-gpg.desktop
 etc/xdg/autostart/gnome-keyring-pkcs11.desktop
 etc/xdg/autostart/gnome-keyring-secrets.desktop
 etc/xdg/autostart/gnome-keyring-ssh.desktop
-include/gck/gck.h
-include/gck/pkcs11.h
-include/gck/pkcs11n.h
-include/gck/pkcs11x.h
+include/gck-1/gck/gck.h
+include/gck-1/gck/pkcs11.h
+include/gck-1/gck/pkcs11n.h
+include/gck-1/gck/pkcs11x.h
 include/gcr-3/gcr/gcr-certificate-basics-widget.h
 include/gcr-3/gcr/gcr-certificate-chain.h
 include/gcr-3/gcr/gcr-certificate-details-widget.h
 include/gcr-3/gcr/gcr-certificate-renderer.h
 include/gcr-3/gcr/gcr-certificate-widget.h
 include/gcr-3/gcr/gcr-certificate.h
+include/gcr-3/gcr/gcr-collection-model.h
+include/gcr-3/gcr/gcr-collection.h
+include/gcr-3/gcr/gcr-column.h
+include/gcr-3/gcr/gcr-combo-selector.h
+include/gcr-3/gcr/gcr-comparable.h
+include/gcr-3/gcr/gcr-deprecated.h
+include/gcr-3/gcr/gcr-enum-types.h
 include/gcr-3/gcr/gcr-importer.h
 include/gcr-3/gcr/gcr-key-renderer.h
 include/gcr-3/gcr/gcr-key-widget.h
 include/gcr-3/gcr/gcr-library.h
+include/gcr-3/gcr/gcr-list-selector.h
 include/gcr-3/gcr/gcr-parser.h
 include/gcr-3/gcr/gcr-pkcs11-certificate.h
 include/gcr-3/gcr/gcr-renderer.h
+include/gcr-3/gcr/gcr-simple-collection.h
 include/gcr-3/gcr/gcr-simple-certificate.h
+include/gcr-3/gcr/gcr-tree-selector.h
 include/gcr-3/gcr/gcr-trust.h
 include/gcr-3/gcr/gcr-types.h
 include/gcr-3/gcr/gcr-unlock-options-widget.h
 include/gcr-3/gcr/gcr-unlock-options.h
+include/gcr-3/gcr/gcr-viewer-window.h
 include/gcr-3/gcr/gcr-viewer.h
 include/gcr-3/gcr/gcr.h
 lib/gnome-keyring/devel/gkm-gnome2-store-standalone.a
@@ -44,14 +56,14 @@ lib/gnome-keyring/devel/gkm-ssh-store-standalone.so
 lib/gnome-keyring/devel/gkm-xdg-store-standalone.a
 lib/gnome-keyring/devel/gkm-xdg-store-standalone.la
 lib/gnome-keyring/devel/gkm-xdg-store-standalone.so
-lib/libgck.a
-lib/libgck.la
-lib/libgck.so
-lib/libgck.so.0
+lib/libgck-1.a
+lib/libgck-1.la
+lib/libgck-1.so
+lib/libgck-1.so.0
 lib/libgcr-3.a
 lib/libgcr-3.la
 lib/libgcr-3.so
-lib/libgcr-3.so.0
+lib/libgcr-3.so.1
 lib/libmock-test-module.a
 lib/libmock-test-module.la
 lib/libmock-test-module.so
@@ -61,12 +73,14 @@ lib/pam_gnome_keyring.so
 lib/pkcs11/gnome-keyring-pkcs11.a
 lib/pkcs11/gnome-keyring-pkcs11.la
 lib/pkcs11/gnome-keyring-pkcs11.so
-libdata/pkgconfig/gck-0.pc
+libdata/pkgconfig/gck-1.pc
 libdata/pkgconfig/gcr-3.pc
 libexec/gnome-keyring-prompt
 libexec/gnome-keyring-prompt-3
 share/GConf/gsettings/org.gnome.crypto.cache.convert
 share/GConf/gsettings/org.gnome.crypto.pgp.convert
+share/GConf/gsettings/org.gnome.crypto.pgp_keyservers.convert
+share/applications/gcr-viewer.desktop
 share/applications/gnome-keyring-prompt.desktop
 share/dbus-1/services/org.freedesktop.secrets.service
 share/dbus-1/services/org.gnome.keyring.service
@@ -100,16 +114,28 @@ share/doc/gcr-3/GcrSimpleCertificate.html
 share/doc/gcr-3/certificate-widget.png
 share/doc/gcr-3/certificates.html
 share/doc/gcr-3/ch01.html
+share/doc/gcr-3/collections.html
+share/doc/gcr-3/combo-selector.png
 share/doc/gcr-3/gcr-3.devhelp
 share/doc/gcr-3/gcr-3.devhelp2
 share/doc/gcr-3/gcr-GcrCertificate.html
 share/doc/gcr-3/gcr-GcrCertificateWidget.html
+share/doc/gcr-3/gcr-GcrCollection.html
+share/doc/gcr-3/gcr-GcrCollectionModel.html
+share/doc/gcr-3/gcr-GcrColumn.html
+share/doc/gcr-3/gcr-GcrComboSelector.html
+share/doc/gcr-3/gcr-GcrComparable.html
 share/doc/gcr-3/gcr-GcrKeyWidget.html
+share/doc/gcr-3/gcr-GcrListSelector.html
 share/doc/gcr-3/gcr-GcrRenderer.html
+share/doc/gcr-3/gcr-GcrSimpleCollection.html
+share/doc/gcr-3/gcr-GcrTreeSelector.html
 share/doc/gcr-3/gcr-GcrViewer.html
 share/doc/gcr-3/gcr-Library-Settings.html
 share/doc/gcr-3/gcr-Trust-Storage-and-Lookups.html
 share/doc/gcr-3/gcr-gcr-misc.html
+share/doc/gcr-3/list-selector.png
+share/doc/gcr-3/tree-selector.png
 share/doc/gcr-3/home.png
 share/doc/gcr-3/index.html
 share/doc/gcr-3/index.sgml
@@ -124,6 +150,14 @@ share/doc/gcr-3/widgets.html
 share/gcr-3/ui/gcr-import-dialog.ui
 share/gcr-3/ui/gcr-unlock-options-widget.ui
 share/gnome-keyring-3/ui/gku-prompt.ui
+share/icons/hicolor/16x16/apps/gcr-key-pair.png
+share/icons/hicolor/16x16/apps/gcr-key.png
+share/icons/hicolor/24x24/apps/gcr-key-pair.png
+share/icons/hicolor/24x24/apps/gcr-key.png
+share/icons/hicolor/32x32/apps/gcr-key-pair.png
+share/icons/hicolor/32x32/apps/gcr-key.png
+share/icons/hicolor/48x48/apps/gcr-key-pair.png
+share/icons/hicolor/48x48/apps/gcr-key.png
 share/locale/af/LC_MESSAGES/gnome-keyring.mo
 share/locale/ar/LC_MESSAGES/gnome-keyring.mo
 share/locale/as/LC_MESSAGES/gnome-keyring.mo
@@ -207,6 +241,22 @@ share/locale/xh/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-keyring.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
+share/mime/application/pkcs10+pem.xml
+share/mime/application/pkcs10.xml
+share/mime/application/pkcs12+pem.xml
+share/mime/application/pkcs7-mime+pem.xml
+share/mime/application/pkcs7-mime.xml
+share/mime/application/pkcs7-signature.xml
+share/mime/application/pkcs8+pem.xml
+share/mime/application/pkcs8.xml
+share/mime/application/pkix-cert+pem.xml
+share/mime/application/pkix-cert.xml
+share/mime/application/pkix-crl+pem.xml
+share/mime/application/pkix-crl.xml
+share/mime/application/x-pem-file.xml
+share/mime/application/x-pem-key.xml
+share/mime/application/x-pkcs12.xml
+share/mime/packages/gcr-crypto-types.xml
 @dirrm share/gnome-keyring-3/ui
 @dirrm share/gnome-keyring-3
 @dirrm share/gcr-3/ui
@@ -219,7 +269,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrm lib/gnome-keyring
 @dirrm include/gcr-3/gcr
 @dirrm include/gcr-3
-@dirrm include/gck
+@dirrm include/gck-1/gck
+@dirrm include/gck-1
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -256,3 +307,5 @@ share/locale/zh_TW/LC_MESSAGES/gnome-keyring.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime