diff options
author | shannonjr <shannonjr> | 2004-11-08 23:53:20 +0000 |
---|---|---|
committer | shannonjr <shannonjr> | 2004-11-08 23:53:20 +0000 |
commit | 8cf41a3a9ca68109fb7789c68ab2426d1aab910d (patch) | |
tree | 78721aec2a43d896720894d787f170305202c057 /misc/kdepim3 | |
parent | e89eb1a9ca324d547009401cecd251d543f333c8 (diff) | |
download | pkgsrc-8cf41a3a9ca68109fb7789c68ab2426d1aab910d.tar.gz |
This package has copied several files from gpgme verbatim
that have been patched recently to correctly use getenv_r,
ttyname_r and strerror_r. This update applies the same
changes to the copied files.
Diffstat (limited to 'misc/kdepim3')
-rw-r--r-- | misc/kdepim3/Makefile | 4 | ||||
-rw-r--r-- | misc/kdepim3/distinfo | 6 | ||||
-rw-r--r-- | misc/kdepim3/patches/patch-ba | 24 | ||||
-rw-r--r-- | misc/kdepim3/patches/patch-bb | 43 | ||||
-rw-r--r-- | misc/kdepim3/patches/patch-bc | 24 | ||||
-rw-r--r-- | misc/kdepim3/patches/patch-bd | 13 |
6 files changed, 112 insertions, 2 deletions
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile index aefb0115d2c..a7932962322 100644 --- a/misc/kdepim3/Makefile +++ b/misc/kdepim3/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.33 2004/10/13 12:29:05 markd Exp $ +# $NetBSD: Makefile,v 1.34 2004/11/08 23:53:20 shannonjr Exp $ DISTNAME= kdepim-${_KDE_VERSION} +PKGREVISION= 1 CATEGORIES= misc COMMENT= Personal Information Management tools for the KDE desktop @@ -34,4 +35,5 @@ BUILDLINK_DEPMETHOD.qt3-tools= full .include "../../security/gpgme/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" +.include "../../devel/librfuncs/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kdepim3/distinfo b/misc/kdepim3/distinfo index 0cec7595f04..0d59dd112cc 100644 --- a/misc/kdepim3/distinfo +++ b/misc/kdepim3/distinfo @@ -1,6 +1,10 @@ -$NetBSD: distinfo,v 1.23 2004/10/13 12:29:05 markd Exp $ +$NetBSD: distinfo,v 1.24 2004/11/08 23:53:20 shannonjr Exp $ SHA1 (kdepim-3.3.1.tar.bz2) = b9928e5bceda7f871d02d861a589fdc133649565 Size (kdepim-3.3.1.tar.bz2) = 10007944 bytes SHA1 (patch-aa) = d9eef6f9f0301cc19897e84d632ccb3127761a4f SHA1 (patch-ab) = 47280379fa8c570720dd1801f5da2e5c93685423 +SHA1 (patch-ba) = f524c671e3089a73c78cb0e5a8b6e19c0ddf360c +SHA1 (patch-bb) = 9667cce7382544a40f91b7f62f594cfc52953661 +SHA1 (patch-bc) = fc1d54789656b670345fcfaa67d0f9b8e90ffbf4 +SHA1 (patch-bd) = 1d8b147e2fdf78132bfcb4b002bff7dd5c74bd99 diff --git a/misc/kdepim3/patches/patch-ba b/misc/kdepim3/patches/patch-ba new file mode 100644 index 00000000000..0060972c415 --- /dev/null +++ b/misc/kdepim3/patches/patch-ba @@ -0,0 +1,24 @@ +$NetBSD: patch-ba,v 1.1 2004/11/08 23:53:20 shannonjr Exp $ + +--- libkdenetwork/libgpgme-copy/gpgme/error.c.orig 2004-02-10 14:11:07.000000000 -0700 ++++ libkdenetwork/libgpgme-copy/gpgme/error.c +@@ -21,6 +21,10 @@ + #include <config.h> + #endif + ++#if HAVE_RFUNCS_H ++#include <rfuncs.h> ++#endif ++ + #include <gpgme.h> + + /* Return a pointer to a string containing a description of the error +@@ -42,7 +46,7 @@ gpgme_strerror (gpgme_error_t err) + int + gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen) + { +- return gpg_strerror_r (err, buf, buflen); ++ return strerror_r (err, buf, buflen); + } + + diff --git a/misc/kdepim3/patches/patch-bb b/misc/kdepim3/patches/patch-bb new file mode 100644 index 00000000000..28ff90f74fe --- /dev/null +++ b/misc/kdepim3/patches/patch-bb @@ -0,0 +1,43 @@ +$NetBSD: patch-bb,v 1.1 2004/11/08 23:53:20 shannonjr Exp $ + +--- libkdenetwork/libgpgme-copy/gpgme/get-env.c.orig 2004-02-10 14:11:07.000000000 -0700 ++++ libkdenetwork/libgpgme-copy/gpgme/get-env.c +@@ -21,6 +21,9 @@ + #include <config.h> + #endif + #include <stdlib.h> ++#if HAVE_RFUNCS_H ++#include <rfuncs.h> ++#endif + #include <errno.h> + #include <string.h> + +@@ -52,7 +55,26 @@ _gpgme_getenv (const char *name, char ** + + #else + +-/* FIXME: Implement this when we have the specification for it. */ +-#error Use of getenv_r not implemented. ++/* Retrieve the environment variable NAME and return a copy of it in a ++ malloc()'ed buffer in *VALUE. If the environment variable is not ++ set, return NULL in *VALUE. */ ++gpgme_error_t ++_gpgme_getenv (const char *name, char **value) ++{ ++ char env_value[256]; ++ int err; ++ if (err = getenv_r (name, env_value, 256)) ++ *value = NULL; ++ else ++ { ++ *value = strdup (env_value); ++ if (!*value) ++ err = ENOMEM; ++ } ++ if (err != 0 && err != ENOENT) ++ return gpg_error_from_errno (err); ++ else ++ return (0); ++} + + #endif diff --git a/misc/kdepim3/patches/patch-bc b/misc/kdepim3/patches/patch-bc new file mode 100644 index 00000000000..e90641e801d --- /dev/null +++ b/misc/kdepim3/patches/patch-bc @@ -0,0 +1,24 @@ +$NetBSD: patch-bc,v 1.1 2004/11/08 23:53:20 shannonjr Exp $ + +--- libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c.orig 2004-06-25 02:57:52.000000000 -0600 ++++ libkdenetwork/libgpgme-copy/gpgme/engine-gpgsm.c +@@ -27,6 +27,9 @@ + #include <sys/types.h> + #include <assert.h> + #include <unistd.h> ++#if HAVE_RFUNCS_H ++#include <rfuncs.h> ++#endif + #include <locale.h> + #include <fcntl.h> /* FIXME */ + #include <errno.h> +@@ -448,7 +451,8 @@ gpgsm_new (void **engine, const char *lc + + if (isatty (1)) + { +- if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname))) ++ /* ttyname_r() return numeric status */ ++ if (err = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname))) + { + err = gpg_error_from_errno (errno); + goto leave; diff --git a/misc/kdepim3/patches/patch-bd b/misc/kdepim3/patches/patch-bd new file mode 100644 index 00000000000..f2591b83517 --- /dev/null +++ b/misc/kdepim3/patches/patch-bd @@ -0,0 +1,13 @@ +$NetBSD: patch-bd,v 1.1 2004/11/08 23:53:20 shannonjr Exp $ + +--- configure.orig 2004-10-04 02:21:15.000000000 -0600 ++++ configure +@@ -31936,7 +31936,7 @@ fi + + + +-for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h ++for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h rfuncs.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + if eval "test \"\${$as_ac_Header+set}\" = set"; then |