Ignore existence of "login_cap.h" under NetBSD because we don't offer

the same interface as FreeBSD which KDE expects.

3 files changed, 91 insertions, 6 deletions

diff --git a/x11/kdebase/files/patch-sum b/x11/kdebase/files/patch-sum
index e518bfe2898..e5de31b3069 100644
--- a/x11/kdebase/files/patch-sum
+++ b/x11/kdebase/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.16 1999/12/12 19:07:16 jdolecek Exp $
+$NetBSD: patch-sum,v 1.17 2000/01/23 00:48:07 tron Exp $
 
 MD5 (patch-aa) = d2685fb9ec03eba0beb57af65ea0a4eb
 MD5 (patch-ab) = ef622a6d305665152f61df7a12f534a6
@@ -12,8 +12,9 @@ MD5 (patch-ai) = d3364f231ef943a3f2c379472b481ff6
 MD5 (patch-aj) = c7ff59709e6c2181787b54c45b54363d
 MD5 (patch-ak) = 023806a6c0a4afab0927b9c6f8512157
 MD5 (patch-al) = b6b6581538883ebd264540d0f0c43f5f
-MD5 (patch-am) = 8e77917d27c3fd117c65c750c420b0c2
+MD5 (patch-am) = cb8fcf355179de9a89859643c706aac4
 MD5 (patch-an) = 4b04e0bf15c1492b4b590a803643ec03
+MD5 (patch-ao) = 3ebefc8bc7895596969585a5e2bc18a3
 MD5 (patch-ap) = 2f714901d2e2d2b2472ce8bbaa3bde67
 MD5 (patch-aq) = 825a6d67066aa57a3e43e6a64460622c
 MD5 (patch-ar) = 18a1c34da9b75712359ae890edcb1021
diff --git a/x11/kdebase/patches/patch-am b/x11/kdebase/patches/patch-am
index a32016f791c..9862d021124 100644
--- a/x11/kdebase/patches/patch-am
+++ b/x11/kdebase/patches/patch-am
@@ -1,8 +1,7 @@
-$NetBSD: patch-am,v 1.5 1999/12/12 19:06:37 jdolecek Exp $
+$NetBSD: patch-am,v 1.6 2000/01/23 00:48:09 tron Exp $
 
-This patch is no longer needed in KDE2		jdolecek 1999/12/12
---- ./kdm/session.c	Fri Aug 20 20:35:10 1999
-+++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/session.c	Fri Nov 12 05:10:30 1999
+--- kdm/session.c.orig	Fri Aug 20 20:35:10 1999
++++ kdm/session.c	Sun Jan 23 01:22:47 2000
 @@ -50,6 +50,7 @@
  #include <pwd.h>
  #include <grp.h>
@@ -11,6 +10,15 @@ This patch is no longer needed in KDE2		jdolecek 1999/12/12
  #ifdef AIXV3
  # include <usersec.h>
  #endif
+@@ -103,7 +104,7 @@
+ char *crypt(char *key, char *salt);
+ #endif
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+ #include <login_cap.h>		/* BSDI-like login classes */
+ #define HAVE_SETUSERCONTEXT	/* assume we have setusercontext if we have
+ 				 * the header file
 @@ -1089,7 +1090,7 @@
      return env;
  }
diff --git a/x11/kdebase/patches/patch-ao b/x11/kdebase/patches/patch-ao
new file mode 100644
index 00000000000..c7df1606450
--- /dev/null
+++ b/x11/kdebase/patches/patch-ao
@@ -0,0 +1,76 @@
+$NetBSD: patch-ao,v 1.5 2000/01/23 00:48:10 tron Exp $
+
+--- kdm/kgreeter.cpp.orig	Mon Aug 16 13:36:34 1999
++++ kdm/kgreeter.cpp	Sun Jan 23 01:23:53 2000
+@@ -65,7 +65,7 @@
+ #include <shadow.h>
+ #endif
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+ #include <login_cap.h>		/* BSDI-like login classes */
+ #endif
+ 
+@@ -521,7 +521,7 @@
+      memset(swd->sp_pwdp, 0, strlen(swd->sp_pwdp));
+ #endif
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+      lc = login_getpwclass(pwd);
+ #endif
+ 
+@@ -531,7 +531,7 @@
+ 	 restrict_time())
+        rval = true;
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+      login_close(lc);
+      lc = NULL;
+ #endif
+@@ -539,7 +539,7 @@
+      return rval;
+ }
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+ bool
+ KGreeter::restrict_time()
+ {
+@@ -581,7 +581,7 @@
+ #define _PATH_NOLOGIN "/etc/nologin"
+ #endif
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+      /* Do we ignore a nologin file? */
+      if (login_getcapbool(lc, "ignorenologin", 0))
+        return false;
+@@ -597,7 +597,7 @@
+ 
+      QFile f;
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+      if (*file) {
+        f.setName(file);
+        f.open(IO_ReadOnly);
+@@ -632,7 +632,7 @@
+      // don't deny root to log in
+      if (!pwd->pw_uid) return false;
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+      bool quietlog = login_getcapbool(lc, "hushlogin", 0);
+      time_t warntime = login_getcaptime(lc, "warnexpire",
+ 				 DEFAULT_WARN, DEFAULT_WARN);
+@@ -694,7 +694,7 @@
+ }
+ #endif
+ 
+-#ifdef HAVE_LOGIN_CAP_H
++#if defined(HAVE_LOGIN_CAP_H) && !defined(__NetBSD__)
+ bool
+ KGreeter::restrict_nohome(){
+      // don't deny root to log in