Don't overwrite files that are installed by shared-mime-info. Add run time

depend on shared-mime-info for this.


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

3 files changed, 122 insertions, 9 deletions

diff --git a/security/gnome-keyring3/Makefile b/security/gnome-keyring3/Makefile
index 6fdab7f14..da03db3fd 100644
--- a/security/gnome-keyring3/Makefile
+++ b/security/gnome-keyring3/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.19 2011/10/18 22:38:14 kwm Exp $
+#   $MCom: ports/security/gnome-keyring3/Makefile,v 1.20 2011/11/15 03:05:08 avl Exp $
 #
 
 PORTNAME=	gnome-keyring
 PORTVERSION=	3.2.2
+PORTREVISION=	1
 CATEGORIES=	security gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -22,7 +23,8 @@ LIB_DEPENDS=	gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring \
 		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
+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
+		update-mime-database:${PORTSDIR}/misc/shared-mime-info
 
 CONFLICTS=	gnome-keyring-2.[0-9]*
 
diff --git a/security/gnome-keyring3/files/patch-gcr_gcr-crypto-types.xml b/security/gnome-keyring3/files/patch-gcr_gcr-crypto-types.xml
new file mode 100644
index 000000000..8d85b746f
--- /dev/null
+++ b/security/gnome-keyring3/files/patch-gcr_gcr-crypto-types.xml
@@ -0,0 +1,118 @@
+--- 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 cfa51dac3..0ad07abaa 100644
--- a/security/gnome-keyring3/pkg-plist
+++ b/security/gnome-keyring3/pkg-plist
@@ -240,20 +240,13 @@ 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