5 files changed, 105 insertions, 29 deletions
diff --git a/x11/kdebase11/files/patch-ai b/x11/kdebase11/files/patch-ai
index 7f7cbf8176c..fe823137c46 100644
--- a/x11/kdebase11/files/patch-ai
+++ b/x11/kdebase11/files/patch-ai
@@ -1,23 +1,13 @@
-*** kfm/kfmsu2.in~	Sun Jul  5 15:53:02 1998
---- kfm/kfmsu2.in	Sun Jul  5 15:53:58 1998
+*** kfm/kfmsu2.in~	Sat Dec 19 22:05:05 1998
+--- kfm/kfmsu2.in	Tue Dec 29 00:47:31 1998
 ***************
-*** 2,10 ****
-  echo "--------------"
-  echo ""
-! echo "Allowing root user to use this display"
-! xhost +local:root
+*** 7,10 ****
   echo ""
   echo "Logging in as super user"
-! su - root -c "export DISPLAY=$DISPLAY; @kde_bindir@/kfm -sw >/dev/null"
-! xhost -local:root
-  
---- 2,10 ----
-  echo "--------------"
-  echo ""
-! echo "Allowing ALL (!) local users to use this display"
-! xhost +local:
+! su - root -c "DISPLAY=$DISPLAY; export DISPLAY; @kde_bindir@/kfm -sw >/dev/null"
+  xhost -local:
+--- 7,10 ----
   echo ""
   echo "Logging in as super user"
 ! su root -c "echo DISPLAY=$DISPLAY @kde_bindir@/kfm -sw | /bin/sh > /dev/null"
-! xhost -local:
-  
+  xhost -local:
diff --git a/x11/kdebase11/files/patch-an b/x11/kdebase11/files/patch-an
index e588a6d758e..714bdf65dfc 100644
--- a/x11/kdebase11/files/patch-an
+++ b/x11/kdebase11/files/patch-an
@@ -1,19 +1,15 @@
-*** kvt/Makefile.in.orig	Sun Sep 13 12:49:42 1998
---- kvt/Makefile.in	Sun Sep 13 12:50:42 1998
+*** kvt/Makefile.in~	Sat Dec 19 22:29:29 1998
+--- kvt/Makefile.in	Tue Dec 29 00:59:07 1998
 ***************
-*** 148,154 ****
-  xdmconfigsubdir = @xdmconfigsubdir@
+*** 166,170 ****
   
   INCLUDES= $(all_includes)
-! LDADD	= $(all_libraries) -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBCURSES) $(KDE_RPATH) $(LIBSOCKET)
+! LDADD	=       $(LIBCURSES) $(LIB_KDEUI)
+  LDFLAGS = $(all_libraries) $(KDE_RPATH)
   DISTCLEANFILES = main.moc
-  
-  bin_PROGRAMS = kvt
---- 148,154 ----
-  xdmconfigsubdir = @xdmconfigsubdir@
+--- 166,170 ----
   
   INCLUDES= $(all_includes)
-! LDADD	= $(all_libraries) -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBUTIL) $(LIBCURSES) $(KDE_RPATH) $(LIBSOCKET)
+! LDADD	= $(LIBUTIL) $(LIBCURSES) $(LIB_KDEUI)
+  LDFLAGS = $(all_libraries) $(KDE_RPATH)
   DISTCLEANFILES = main.moc
-  
-  bin_PROGRAMS = kvt
diff --git a/x11/kdebase11/files/patch-ap b/x11/kdebase11/files/patch-ap
new file mode 100644
index 00000000000..329f1904eca
--- /dev/null
+++ b/x11/kdebase11/files/patch-ap
@@ -0,0 +1,44 @@
+*** kwmmodules/kpager/Makefile.in~	Sat Dec 19 22:29:36 1998
+--- kwmmodules/kpager/Makefile.in	Tue Dec 29 01:29:59 1998
+***************
+*** 217,221 ****
+  
+  .SUFFIXES:
+! .SUFFIXES: .S .c .cpp .lo .o .s
+  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+  	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kwmmodules/kpager/Makefile
+--- 217,225 ----
+  
+  .SUFFIXES:
+! .SUFFIXES: .S .c .cpp .lo .o .s .h .moc
+! 
+! .h.moc:
+! 	$(MOC) $< -o $@
+! 
+  $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+  	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kwmmodules/kpager/Makefile
+***************
+*** 419,425 ****
+  mostlyclean distclean maintainer-clean
+  
+- 
+- %.moc: %.h
+- 	$(MOC) $< -o $@
+  
+  kpager.cpp:kpager.moc
+--- 423,426 ----
+*** kdm/Makefile.in~	Fri Jul 10 20:35:33 1998
+--- kdm/Makefile.in	Fri Oct 30 20:34:51 1998
+***************
+*** 507,511 ****
+  
+  #CFLAGS   = -Wall -Wno-implicit -Wno-return-type
+  CFLAGS   += -DHAVE_CONFIG_H
+! CXXFLAGS += -DHAVE_CONFIG_H
+  
+--- 507,511 ----
+  
+  #CFLAGS   = -Wall -Wno-implicit -Wno-return-type
+  CFLAGS   += -DHAVE_CONFIG_H
+! CXXFLAGS += -DHAVE_CONFIG_H -DHAVE_GETUSERSHELL
+  
diff --git a/x11/kdebase11/files/patch-aq b/x11/kdebase11/files/patch-aq
new file mode 100644
index 00000000000..0f521a22d2b
--- /dev/null
+++ b/x11/kdebase11/files/patch-aq
@@ -0,0 +1,31 @@
+*** kdm/kdmconfig.cpp~	Sat Dec 19 22:05:02 1998
+--- kdm/kdmconfig.cpp	Tue Dec 29 00:38:07 1998
+***************
+*** 65,68 ****
+--- 65,79 ----
+            QString  nu = kc->readEntry( "NoUsers");
+            QStrList no_users;
++ #ifdef HAVE_GETUSERSHELL
++           QStrList valid_shells;
++           QString shell;
++           setusershell();
++           for( shell = getusershell(); shell.isEmpty() == 0; ) {
++                if( valid_shells.contains( shell) == 0)
++                    valid_shells.append( shell);
++                shell = getusershell();
++           }
++           endusershell();
++ #endif
+            semsplit( nu, no_users);
+            struct passwd *ps;
+***************
+*** 72,75 ****
+--- 83,90 ----
+                 if( CHECK_STRING(ps->pw_dir) &&
+                     CHECK_STRING(ps->pw_shell) &&
++ #ifdef HAVE_GETUSERSHELL
++                    ( valid_shells.isEmpty() || 
++                      ( valid_shells.contains( ps->pw_shell) != 0)) &&
++ #endif
+                     //CHECK_STRING(ps->pw_gecos) && // many users didn't want this check (tanghus)
+                     ( no_users.contains( ps->pw_name) == 0)){
diff --git a/x11/kdebase11/files/patch-at b/x11/kdebase11/files/patch-at
new file mode 100644
index 00000000000..8b4dcc5645b
--- /dev/null
+++ b/x11/kdebase11/files/patch-at
@@ -0,0 +1,15 @@
+*** kdm/config/kdmrc~	Thu Dec 31 14:59:39 1998
+--- kdm/config/kdmrc	Sun Jan  3 15:41:31 1999
+***************
+*** 9,13 ****
+  SortUsers=true
+  #Users=root;johndoe
+! NoUsers=bin;daemon;games;halt;mail;man;news;nobody;reboot;shutdown;sync;uucp;xten;
+  GreetString=K Desktop Environment [HOSTNAME]
+  UserView=true
+--- 9,13 ----
+  SortUsers=true
+  #Users=root;johndoe
+! NoUsers=bin;bind;daemon;games;halt;kmem;mail;man;mta;news;nobody;operator;pop;reboot;shutdown;sync;tty;uucp;xten;
+  GreetString=K Desktop Environment [HOSTNAME]
+  UserView=true