# HG changeset patch # User Wyllys Ingersoll # Date 1310998535 25200 # Node ID fdc3e8fcde4ad6409614bbd6a4ad8e5de630b678 # Parent 9f1b2b9b0fd9606b165f11df235680f7a15e6e71 7067219 libksba and libassuan conflict with gnupg diff -r 9f1b2b9b0fd9 -r fdc3e8fcde4a components/gnupg/gnupg.p5m --- a/components/gnupg/gnupg.p5m Mon Jul 18 05:47:13 2011 -0700 +++ b/components/gnupg/gnupg.p5m Mon Jul 18 07:15:35 2011 -0700 @@ -228,4 +228,4 @@ desc="GnuPG - secure communication and data storage utility" \ name="Gnu secure communication and data storage utility" # - +depend fmri=__TBD pkg.debug.depend.file=usr/lib/pinentry type=require diff -r 9f1b2b9b0fd9 -r fdc3e8fcde4a components/gpgme/gpgme.p5m --- a/components/gpgme/gpgme.p5m Mon Jul 18 05:47:13 2011 -0700 +++ b/components/gpgme/gpgme.p5m Mon Jul 18 07:15:35 2011 -0700 @@ -75,4 +75,4 @@ # license gpgme.license license="GPLv2, LGPLv2" # - +depend type=optional fmri=crypto/gnupg@2.0.17-0.169 diff -r 9f1b2b9b0fd9 -r fdc3e8fcde4a components/libassuan/libassuan.p5m --- a/components/libassuan/libassuan.p5m Mon Jul 18 05:47:13 2011 -0700 +++ b/components/libassuan/libassuan.p5m Mon Jul 18 07:15:35 2011 -0700 @@ -54,4 +54,4 @@ link path=usr/lib/$(MACH64)/libassuan.so target=libassuan.so.0.1.0 # license libassuan.license license="GPLv3, LGPLv2" - +depend type=optional fmri=crypto/gnupg@2.0.17-0.169 diff -r 9f1b2b9b0fd9 -r fdc3e8fcde4a components/libksba/libksba.p5m --- a/components/libksba/libksba.p5m Mon Jul 18 05:47:13 2011 -0700 +++ b/components/libksba/libksba.p5m Mon Jul 18 07:15:35 2011 -0700 @@ -54,4 +54,4 @@ link path=usr/lib/$(MACH64)/libksba.so target=libksba.so.8.10.0 # license libksba.license license="GPLv3" - +depend type=optional fmri=crypto/gnupg@2.0.17-0.169 diff -r 9f1b2b9b0fd9 -r fdc3e8fcde4a components/pinentry/pinentry.p5m --- a/components/pinentry/pinentry.p5m Mon Jul 18 05:47:13 2011 -0700 +++ b/components/pinentry/pinentry.p5m Mon Jul 18 07:15:35 2011 -0700 @@ -44,4 +44,4 @@ link path=usr/lib/pinentry target=pinentry-gtk-2 # license pinentry.license license="GPLv2" - +depend type=optional fmri=crypto/gnupg@2.0.17-0.169