Update to 3.4.1.

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

4 files changed, 16 insertions, 281 deletions

diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index da03db3fd..b9d6afd29 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.20 2011/11/15 03:05:08 avl Exp $
+#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.21 2012/05/06 20:48:54 kwm Exp $
 #
 
 PORTNAME=	gnome-keyring
-PORTVERSION=	3.2.2
-PORTREVISION=	1
+PORTVERSION=	3.4.1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -17,14 +16,14 @@ 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 \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info
+		gcr>=3.4.1:${PORTSDIR}/security/gcr
 LIB_DEPENDS=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
 		dbus-1.3:${PORTSDIR}/devel/dbus \
+		gcr:${PORTSDIR}/security/gcr \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		p11-kit.0:${PORTSDIR}/security/p11-kit \
 		gcrypt.18:${PORTSDIR}/security/libgcrypt
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 
 CONFLICTS=	gnome-keyring-2.[0-9]*
 
@@ -40,8 +39,7 @@ CONFIGURE_ARGS=	--with-pam-dir="${PREFIX}/lib" \
 		--with-root-certs=${LOCALBASE}/share/certs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-GLIB_SCHEMAS=	org.gnome.crypto.cache.gschema.xml \
-		org.gnome.crypto.pgp.gschema.xml
+GLIB_SCHEMAS=	org.gnome.crypto.cache.gschema.xml
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|make --version|${GMAKE} --version|g' \
diff --git a/security/gnome-keyring3/distinfo b/security/gnome-keyring3/distinfo
index 83d21df84..8bb47990c 100644
--- a/security/gnome-keyring3/distinfo
+++ b/security/gnome-keyring3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-keyring-3.2.2.tar.xz) = f4cdc2c492a9b0157d59439310093e611e1f718a16f7ee2391ac03aadacfaaa3
-SIZE (gnome3/gnome-keyring-3.2.2.tar.xz) = 1579860
+SHA256 (gnome3/gnome-keyring-3.4.1.tar.xz) = 9e90267721198cbe6ebc08f6390d24901d9c0de39b180cd2ad1bbcdd7b30b249
+SIZE (gnome3/gnome-keyring-3.4.1.tar.xz) = 1107820
diff --git a/security/gnome-keyring3/files/patch-gcr_gcr-crypto-types.xml b/security/gnome-keyring3/files/patch-gcr_gcr-crypto-types.xml
deleted file mode 100644
index 8d85b746f..000000000
--- a/security/gnome-keyring3/files/patch-gcr_gcr-crypto-types.xml
+++ /dev/null
@@ -1,118 +0,0 @@
---- gcr/gcr-crypto-types.xml.orig	2011-11-14 11:27:43.000000000 +0100
-+++ gcr/gcr-crypto-types.xml	2012-05-06 16:45:42.000000000 +0200
-@@ -9,20 +9,6 @@
- 		<glob weight="50" pattern="*.pem"/>
- 	</mime-type>
- 
--	<!--  Defined in: http://www.ietf.org/rfc/rfc2585.txt -->
--	<mime-type type="application/pkix-cert">
--		<comment>X.509 Certificate</comment>
--		<glob weight="75" pattern="*.cer"/>
--
--		<!-- Non standard: Common practice -->
--		<glob weight="55" pattern="*.crt"/>
--		<glob weight="55" pattern="*.cert"/>
--
--		<!-- Non standard: Common practice -->
--		<alias type="application/x-x509-ca-cert"/>
--		<alias type="application/x-x509-user-cert"/>
--	</mime-type>
--
- 	<!-- Non standard: OpenSSL PEM format -->
- 	<mime-type type="application/pkix-cert+pem">
- 		<comment>X.509 Certificate in PEM format</comment>
-@@ -32,14 +18,6 @@
- 		</magic>
- 	</mime-type>
- 
--	<!-- Defined in: http://www.ietf.org/rfc/rfc2585.txt -->
--	<mime-type type="application/pkix-crl">
--		<comment>Certificate Revocation List</comment>
--		<acronym>CRL</acronym>
--		<expanded-acronym>Certificate Revocation List</expanded-acronym>
--		<glob weight="75" pattern="*.crl"/>
--	</mime-type>
--
- 	<!-- Non standard: OpenSSL PEM format -->
- 	<mime-type type="application/pkix-crl+pem">
- 		<comment>Certificate Revocation List in PEM format</comment>
-@@ -49,19 +27,6 @@
- 		</magic>
- 	</mime-type>
- 
--	<!-- Non standard: Common practice -->
--	<mime-type type="application/x-pkcs12">
--		<comment>PKCS#12 Personal Key and Certificates</comment>
--		<acronym>PKCS#12</acronym>
--		<glob weight="75" pattern="*.p12"/>
--
--		<!-- Non standard: Microsoft practice -->
--		<glob weight="55" pattern="*.pfx"/>
--
--		<!-- Non standard: Rare practice, unclear this actually got into a spec -->
--		<alias type="application/pkcs12"/>
--	</mime-type>
--
- 	<!-- Non standard: OpenSSL PEM format -->
- 	<mime-type type="application/pkcs12+pem">
- 		<comment>PKCS#12 Personal Key and Certificates in PEM format</comment>
-@@ -71,16 +36,6 @@
- 		</magic>
- 	</mime-type>
- 
--	<!-- Defined in: http://www.ietf.org/rfc/rfc5958.txt -->
--	<mime-type type="application/pkcs8">
--		<comment>PKCS#8 Personal Key</comment>
--		<acronym>PKCS#8</acronym>
--		<glob weight="75" pattern="*.p8"/>
--
--		<!-- Non standard: Gnome keyring practice -->
--		<glob weight="55" pattern="*.pkcs8"/>
--	</mime-type>
--
- 	<!-- Non standard: OpenSSL PEM format -->
- 	<mime-type type="application/pkcs8+pem">
- 		<comment>PKCS#8 Personal Key in PEM format</comment>
-@@ -91,21 +46,6 @@
- 		</magic>
- 	</mime-type>
- 
--	<!-- Defined in: http://www.ietf.org/rfc/rfc2311.txt -->
--	<mime-type type="application/pkcs7-mime">
--		<comment>PKCS#7 Message and Certificates</comment>
--		<acronym>PKCS#7</acronym>
--		<glob pattern="*.p7c"/>
--		<glob pattern="*.p7m"/>
--
--		<!-- Not standard: Microsoft practice -->
--		<glob pattern="*.spc"/>
--		<glob pattern="*.p7b"/>
--
--		<!-- Non standard: Microsoft practice -->
--		<alias type="application/x-pkcs7-certificates"/>
--	</mime-type>
--
- 	<!-- Non standard: OpenSSL PEM format -->
- 	<mime-type type="application/pkcs7-mime+pem">
- 		<comment>PKCS#7 Message and Certificates in PEM format</comment>
-@@ -115,20 +55,6 @@
- 		</magic>
- 	</mime-type>
- 
--	<!-- Defined in http://www.ietf.org/rfc/rfc2311.txt -->
--	<mime-type type="application/pkcs7-signature">
--		<comment>PKCS#7 Signature</comment>
--		<acronym>PKCS#7</acronym>
--		<glob pattern="*.p7s"/>
--	</mime-type>
--
--	<!-- Defined in http://www.ietf.org/rfc/rfc2311.txt -->
--	<mime-type type="application/pkcs10">
--		<comment>PKCS#10 Certificate Request</comment>
--		<acronym>PKCS#10</acronym>
--		<glob pattern="*.p10"/>
--	</mime-type>
--
- 	<!-- Non standard: OpenSSL PEM format -->
- 	<mime-type type="application/pkcs10+pem">
- 		<comment>PKCS#10 Certificate Request in PEM format</comment>
diff --git a/security/gnome-keyring3/pkg-plist b/security/gnome-keyring3/pkg-plist
index 0ad07abaa..a6f86cedd 100644
--- a/security/gnome-keyring3/pkg-plist
+++ b/security/gnome-keyring3/pkg-plist
@@ -1,4 +1,3 @@
-bin/gcr-viewer
 bin/gnome-keyring
 bin/gnome-keyring-3
 bin/gnome-keyring-daemon
@@ -7,41 +6,6 @@ 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-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
 lib/gnome-keyring/devel/gkm-gnome2-store-standalone.la
 lib/gnome-keyring/devel/gkm-gnome2-store-standalone.so
@@ -57,105 +21,15 @@ 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-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.1
-lib/libmock-test-module.a
-lib/libmock-test-module.la
-lib/libmock-test-module.so
 lib/pam_gnome_keyring.a
 lib/pam_gnome_keyring.la
 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-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
-share/doc/gck/gck-Errors.html
-share/doc/gck/gck-GckAttribute.html
-share/doc/gck/gck-GckAttributes.html
-share/doc/gck/gck-GckEnumerator.html
-share/doc/gck/gck-GckModule-lists.html
-share/doc/gck/gck-GckModule.html
-share/doc/gck/gck-GckObject.html
-share/doc/gck/gck-GckSession.html
-share/doc/gck/gck-GckSlot.html
-share/doc/gck/gck-Miscellaneous-Functions.html
-share/doc/gck/gck-PKCS11-URIs.html
-share/doc/gck/gck.devhelp2
-share/doc/gck/pkcs11-links.html
-share/doc/gck/home.png
-share/doc/gck/index.html
-share/doc/gck/index.sgml
-share/doc/gck/reference.html
-share/doc/gck/left.png
-share/doc/gck/right.png
-share/doc/gck/style.css
-share/doc/gck/up.png
-share/doc/gcr-3/GcrCertificateChain.html
-share/doc/gcr-3/GcrImporter.html
-share/doc/gcr-3/GcrParser.html
-share/doc/gcr-3/GcrPkcs11Certificate.html
-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.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/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
-share/doc/gcr-3/key-widget.png
-share/doc/gcr-3/left.png
-share/doc/gcr-3/misc.html
-share/doc/gcr-3/right.png
-share/doc/gcr-3/storage.html
-share/doc/gcr-3/style.css
-share/doc/gcr-3/up.png
-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
@@ -197,6 +71,7 @@ share/locale/is/LC_MESSAGES/gnome-keyring.mo
 share/locale/it/LC_MESSAGES/gnome-keyring.mo
 share/locale/ja/LC_MESSAGES/gnome-keyring.mo
 share/locale/ka/LC_MESSAGES/gnome-keyring.mo
+share/locale/km/LC_MESSAGES/gnome-keyring.mo
 share/locale/kn/LC_MESSAGES/gnome-keyring.mo
 share/locale/ko/LC_MESSAGES/gnome-keyring.mo
 share/locale/lt/LC_MESSAGES/gnome-keyring.mo
@@ -239,31 +114,6 @@ 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/pkcs12+pem.xml
-share/mime/application/pkcs7-mime+pem.xml
-share/mime/application/pkcs8+pem.xml
-share/mime/application/pkix-cert+pem.xml
-share/mime/application/pkix-crl+pem.xml
-share/mime/application/x-pem-file.xml
-share/mime/application/x-pem-key.xml
-share/mime/packages/gcr-crypto-types.xml
-@dirrm share/gnome-keyring-3/ui
-@dirrm share/gnome-keyring-3
-@dirrm share/gcr-3/ui
-@dirrm share/gcr-3
-@dirrm share/doc/gcr-3
-@dirrm share/doc/gck
-@dirrmtry share/applications
-@dirrmtry lib/pkcs11
-@dirrm lib/gnome-keyring/devel
-@dirrm lib/gnome-keyring
-@dirrm include/gcr-3/gcr
-@dirrm include/gcr-3
-@dirrm include/gck-1/gck
-@dirrm include/gck-1
-@dirrmtry etc/pkcs11/modules
-@dirrmtry etc/pkcs11
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
@@ -286,6 +136,8 @@ share/mime/packages/gcr-crypto-types.xml
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/mai/LC_MESSAGES
 @dirrmtry share/locale/mai
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/en@shaw/LC_MESSAGES
 @dirrmtry share/locale/en@shaw
 @dirrmtry share/locale/dz/LC_MESSAGES
@@ -300,5 +152,8 @@ share/mime/packages/gcr-crypto-types.xml
 @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
+@dirrmtry lib/pkcs11
+@dirrm lib/gnome-keyring/devel
+@dirrm lib/gnome-keyring
+@dirrmtry etc/pkcs11/modules
+@dirrmtry etc/pkcs11