diff options
| author | drochner <drochner@pkgsrc.org> | 2009-12-16 18:52:49 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-12-16 18:52:49 +0000 |
| commit | e014ebe7ae6ea8c75b4de0bcff13bc9586a0d02a (patch) | |
| tree | 8f194104a420cc0b0275f6a953f7c0a6ea96eee3 /security | |
| parent | 2ac837ef719474efb880676011894d6e85c446f3 (diff) | |
| download | pkgsrc-e014ebe7ae6ea8c75b4de0bcff13bc9586a0d02a.tar.gz | |
don't install the gpg-zip.1 manpage, avoids CONFLICT with gnupg1,
noticed by OBATA Akio per mail to pkgsrc-users.
This makes most sense to me since gnupg2 doesn't install a gpg-zip
intentionally. Since possible clients of gpg-zip should have a
dependency on gnupg1, we can't take over easily. Once we are sure
that gnupg2 can fully replace gnupg1, we might consider to install
eg symlinks gpg->gpg2 etc and make gnupg1 obsolete, but this needs
careful testing.
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnupg2/Makefile | 4 | ||||
| -rw-r--r-- | security/gnupg2/PLIST.gpgsm | 3 | ||||
| -rw-r--r-- | security/gnupg2/distinfo | 3 | ||||
| -rw-r--r-- | security/gnupg2/patches/patch-ak | 13 |
4 files changed, 18 insertions, 5 deletions
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile index f5e49fc2df6..220801cb8d6 100644 --- a/security/gnupg2/Makefile +++ b/security/gnupg2/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2009/12/15 20:10:40 drochner Exp $ +# $NetBSD: Makefile,v 1.25 2009/12/16 18:52:49 drochner Exp $ # DISTNAME= gnupg-2.0.13 -#PKGREVISION= 3 +PKGREVISION= 1 PKGNAME= ${DISTNAME:S/gnupg/gnupg2/} CATEGORIES= security MASTER_SITES= ftp://ftp.gnupg.org/gcrypt/gnupg/ diff --git a/security/gnupg2/PLIST.gpgsm b/security/gnupg2/PLIST.gpgsm index b57b6206aa6..ad05a42af2c 100644 --- a/security/gnupg2/PLIST.gpgsm +++ b/security/gnupg2/PLIST.gpgsm @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.gpgsm,v 1.7 2009/12/15 20:10:41 drochner Exp $ +@comment $NetBSD: PLIST.gpgsm,v 1.8 2009/12/16 18:52:49 drochner Exp $ bin/gpg-connect-agent bin/gpg2 bin/gpgconf @@ -21,7 +21,6 @@ libexec/gpg-check-pattern man/man1/gpg-agent.1 man/man1/gpg-connect-agent.1 man/man1/gpg-preset-passphrase.1 -man/man1/gpg-zip.1 man/man1/gpg2.1 man/man1/gpgconf.1 man/man1/gpgparsemail.1 diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo index f265a584172..7f2468dad78 100644 --- a/security/gnupg2/distinfo +++ b/security/gnupg2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2009/12/16 09:09:06 wiz Exp $ +$NetBSD: distinfo,v 1.14 2009/12/16 18:52:49 drochner Exp $ SHA1 (gnupg-2.0.13.tar.bz2) = 2ff42aff14cdddafc291d44ac1968af5f09a9d4d RMD160 (gnupg-2.0.13.tar.bz2) = a2291f4d5923b50bca980b726e2fe0c31c2589a9 @@ -16,3 +16,4 @@ SHA1 (patch-af) = 908fd76d67f837367121e493d239f8b377eb1c3f SHA1 (patch-ah) = 0c9e061611ebfe22441a161aca016436a70ccc60 SHA1 (patch-ai) = 555b8768c30f470e98e5be62a4a4bea29eefdf78 SHA1 (patch-aj) = 20be6b455167962ffa556979d8d0f167dd14131e +SHA1 (patch-ak) = 74b26ce441ea99ff28a09a3f0c643456daf48f35 diff --git a/security/gnupg2/patches/patch-ak b/security/gnupg2/patches/patch-ak new file mode 100644 index 00000000000..6ffc8e90f52 --- /dev/null +++ b/security/gnupg2/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 2009/12/16 18:52:49 drochner Exp $ + +--- doc/Makefile.am.orig 2009-12-16 18:23:55.000000000 +0000 ++++ doc/Makefile.am +@@ -67,7 +67,7 @@ myman_sources = gnupg7.texi gpg.texi gpg + myman_pages = gpg2.1 gpgsm.1 gpg-agent.1 scdaemon.1 gpgv2.1 \ + watchgnupg.1 gpgconf.1 addgnupghome.8 gpg-preset-passphrase.1 \ + gpg-connect-agent.1 gpgparsemail.1 symcryptrun.1 \ +- gpgsm-gencert.sh.1 applygnupgdefaults.8 gpg-zip.1 ++ gpgsm-gencert.sh.1 applygnupgdefaults.8 + + man_MANS = $(myman_pages) + noinst_MANS = gnupg.7 |