diff options
| author | jmmv <jmmv@pkgsrc.org> | 2004-11-06 17:40:15 +0000 |
|---|---|---|
| committer | jmmv <jmmv@pkgsrc.org> | 2004-11-06 17:40:15 +0000 |
| commit | 9a7ec15d7bd2456cdefb8878bacc3edf903a86a6 (patch) | |
| tree | c5715ca9a5c9d2c14130ccf3845306d27f7cb5e1 /security/gpgme | |
| parent | cbea826e0170e4b0701eaa6e66d21aafaed2ce78 (diff) | |
| download | pkgsrc-9a7ec15d7bd2456cdefb8878bacc3edf903a86a6.tar.gz | |
Let this build if gnupg 1.2.x is not installed (i.e., gnupg-devel exists).
A test program was trying to run 'gpg', bypassing the binary name given
through the --with-gpg flag to configure.
XXX This still has a chance to break. If gnupg-devel is built w/o the
gpgsm option and gpgme is being built w/ it, no gpg binary will be found.
This is one of the those damages produced by build options...
Diffstat (limited to 'security/gpgme')
| -rw-r--r-- | security/gpgme/distinfo | 5 | ||||
| -rw-r--r-- | security/gpgme/patches/patch-ab | 17 | ||||
| -rw-r--r-- | security/gpgme/patches/patch-ai | 13 |
3 files changed, 29 insertions, 6 deletions
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo index 2775a66b5da..9ad0236a0bf 100644 --- a/security/gpgme/distinfo +++ b/security/gpgme/distinfo @@ -1,11 +1,12 @@ -$NetBSD: distinfo,v 1.13 2004/11/04 20:41:21 shannonjr Exp $ +$NetBSD: distinfo,v 1.14 2004/11/06 17:40:15 jmmv Exp $ SHA1 (gpgme-1.0.1.tar.gz) = d35fa8fc20783ea853d9e4d01fed7e1a9d3160f6 Size (gpgme-1.0.1.tar.gz) = 815046 bytes SHA1 (patch-aa) = 27f98c23d89a0a030398e1e5cfefff84b23d2658 -SHA1 (patch-ab) = 5f91749ba67cf68eb21d7544a03c6047b8219891 +SHA1 (patch-ab) = c47b732622deaa2eb3269d7ae753ab553c4fa54e SHA1 (patch-ac) = c702392423c1ed48cca43f8e35a2c510a8d68460 SHA1 (patch-ae) = 88d215ad657730349ffa19462799b64238a30426 SHA1 (patch-af) = f8d035b0e2d9a245377aec33a8576e5a432d76b7 SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5 SHA1 (patch-ah) = 852e362f143c754149e0600a7b7f3a47a569f41e +SHA1 (patch-ai) = 5b7958ef6ed51936e948451e03dd835c1b90414c diff --git a/security/gpgme/patches/patch-ab b/security/gpgme/patches/patch-ab index 01b596f87f8..ae08b83e284 100644 --- a/security/gpgme/patches/patch-ab +++ b/security/gpgme/patches/patch-ab @@ -1,8 +1,17 @@ -$NetBSD: patch-ab,v 1.2 2004/11/03 15:48:31 jmmv Exp $ +$NetBSD: patch-ab,v 1.3 2004/11/06 17:40:15 jmmv Exp $ ---- tests/gpg/mkdemodirs.orig Wed Oct 17 06:08:55 2001 -+++ tests/gpg/mkdemodirs Wed Jan 30 14:17:56 2002 -@@ -25,7 +25,9 @@ +--- tests/gpg/mkdemodirs.orig 2001-11-22 04:01:26.000000000 +0100 ++++ tests/gpg/mkdemodirs +@@ -2,7 +2,7 @@ + + set -e + +-GPG="gpg --batch --quiet --no-secmem-warning" ++GPG="${GPG:-gpg} --batch --quiet --no-secmem-warning" + NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India + Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo + Sierra Tango Uniform Victor Whisky XRay Yankee Zulu' +@@ -25,7 +25,9 @@ GPGDEMO="$GPG --homedir . --trustdb-name echo -n "Creating:" for name in $NAMES; do echo -n " $name" diff --git a/security/gpgme/patches/patch-ai b/security/gpgme/patches/patch-ai new file mode 100644 index 00000000000..39a17c2cbc8 --- /dev/null +++ b/security/gpgme/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.1 2004/11/06 17:40:15 jmmv Exp $ + +--- tests/gpg/Makefile.in.orig 2004-10-22 20:52:26.000000000 +0200 ++++ tests/gpg/Makefile.in +@@ -732,7 +732,7 @@ all-local: ./pubring.gpg + $(GPG) --homedir . --allow-secret-key-import --import Alpha/Secret.gpg Zulu/Secret.gpg + + ./Alpha/Secret.gpg: secdemo.asc +- srcdir=$(srcdir) $(srcdir)/mkdemodirs ++ srcdir=$(srcdir) GPG=$(GPG) $(srcdir)/mkdemodirs + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. + .NOEXPORT: |