5 files changed, 1 insertions, 106 deletions
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index 03ebdd3b883..ebcd0d07884 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/06/23 14:06:17 shannonjr Exp $
+# $NetBSD: Makefile,v 1.48 2005/07/25 13:21:31 markd Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 CATEGORIES=	misc
@@ -50,5 +50,4 @@ PLIST_SUBST+=	HAVE_SASL="@comment "
 .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/patches/patch-ba b/misc/kdepim3/patches/patch-ba
deleted file mode 100644
index 0060972c415..00000000000
--- a/misc/kdepim3/patches/patch-ba
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index 28ff90f74fe..00000000000
--- a/misc/kdepim3/patches/patch-bb
+++ /dev/null
@@ -1,43 +0,0 @@
-$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
deleted file mode 100644
index e90641e801d..00000000000
--- a/misc/kdepim3/patches/patch-bc
+++ /dev/null
@@ -1,24 +0,0 @@
-$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
deleted file mode 100644
index 78017afd83e..00000000000
--- a/misc/kdepim3/patches/patch-bd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.2 2005/03/23 22:07:08 markd Exp $
-
---- configure.orig	2005-03-05 01:59:53.000000000 +1300
-+++ configure
-@@ -32683,7 +32683,7 @@ fi
- 
- 
- 
--for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.h
-+for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h unistd.h values.h sys/limits.h err.h sys/cdefs.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