Upgrade KDE to Release 1.1.1.

5 files changed, 51 insertions, 96 deletions

diff --git a/x11/kdebase11/files/patch-ai b/x11/kdebase11/files/patch-ai
index fe823137c467..dfb68afdf648 100644
--- a/x11/kdebase11/files/patch-ai
+++ b/x11/kdebase11/files/patch-ai
@@ -1,13 +1,15 @@
-*** kfm/kfmsu2.in~	Sat Dec 19 22:05:05 1998
---- kfm/kfmsu2.in	Tue Dec 29 00:47:31 1998
+*** kfm/kfmsu2.in~	Wed Feb 17 09:39:57 1999
+--- kfm/kfmsu2.in	Mon May  3 18:16:31 1999
 ***************
-*** 7,10 ****
+*** 7,11 ****
   echo ""
   echo "Logging in as super user"
-! su - root -c "DISPLAY=$DISPLAY; export DISPLAY; @kde_bindir@/kfm -sw >/dev/null"
-  xhost -local:
---- 7,10 ----
+! 
+  # Test KDEDIR first, otherwise use hardcoded path (allows to move the KDE dir)
+  if test -f $KDEDIR/bin/kfm ; then
+--- 7,11 ----
   echo ""
   echo "Logging in as super user"
 ! su root -c "echo DISPLAY=$DISPLAY @kde_bindir@/kfm -sw | /bin/sh > /dev/null"
-  xhost -local:
+  # Test KDEDIR first, otherwise use hardcoded path (allows to move the KDE dir)
+  if test -f $KDEDIR/bin/kfm ; then
diff --git a/x11/kdebase11/files/patch-an b/x11/kdebase11/files/patch-an
index 714bdf65dfcb..342a1d205ea7 100644
--- a/x11/kdebase11/files/patch-an
+++ b/x11/kdebase11/files/patch-an
@@ -1,15 +1,15 @@
-*** kvt/Makefile.in~	Sat Dec 19 22:29:29 1998
---- kvt/Makefile.in	Tue Dec 29 00:59:07 1998
+*** kvt/Makefile.in~	Wed Apr 21 18:22:35 1999
+--- kvt/Makefile.in	Wed Apr 21 18:33:46 1999
 ***************
-*** 166,170 ****
+*** 174,178 ****
   
-  INCLUDES= $(all_includes)
-! LDADD	=       $(LIBCURSES) $(LIB_KDEUI)
+  INCLUDES = $(all_includes)
+! LDADD = $(LIBCURSES) $(LIB_KDEUI)
   LDFLAGS = $(all_libraries) $(KDE_RPATH)
-  DISTCLEANFILES = main.moc
---- 166,170 ----
+  METASOURCES = main.moc
+--- 174,178 ----
   
-  INCLUDES= $(all_includes)
+  INCLUDES = $(all_includes)
 ! LDADD	= $(LIBUTIL) $(LIBCURSES) $(LIB_KDEUI)
   LDFLAGS = $(all_libraries) $(KDE_RPATH)
-  DISTCLEANFILES = main.moc
+  METASOURCES = main.moc
diff --git a/x11/kdebase11/files/patch-ao b/x11/kdebase11/files/patch-ao
index 21845750507c..62d11535357e 100644
--- a/x11/kdebase11/files/patch-ao
+++ b/x11/kdebase11/files/patch-ao
@@ -1,10 +1,9 @@
-*** kvt/utmp.c.orig	Sun Aug 10 08:43:56 1997
---- kvt/utmp.c	Sun Sep 13 13:42:02 1998
+*** kvt/utmp.c.orig	Wed Feb 17 19:54:08 1999
+--- kvt/utmp.c	Wed Apr 21 18:37:34 1999
 ***************
-*** 60,65 ****
---- 60,70 ----
-  #include <utmp.h>
-  #include <unistd.h>
+*** 78,81 ****
+--- 78,86 ----
+  #endif
   
 + #define UTMP_SUPPORT 1
 + #define HAVE_UTIL 1
@@ -13,12 +12,10 @@
 + 
   #ifdef HAVE_LASTLOG_H
   #include <lastlog.h>
-  #endif
 ***************
-*** 73,78 ****
---- 78,95 ----
-  #include <stdio.h>
-  #include <memory.h>
+*** 95,98 ****
+--- 100,115 ----
+  #endif
   
 + #if USE_LASTLOG
 + # include <paths.h>
@@ -34,67 +31,52 @@
 + 
   void cleanutent(void);
   void makeutent(char *);
-  
 ***************
-*** 118,130 ****
-   **************************************************************************/
+*** 140,144 ****
   int utmp_pos; /* position of utmp-stamp */
   
 - 
   /*
    * on Sparcs login/logouts are logged at /var/adm/wtmp
-   * but talk(d)/finger only look at /etc/utmp
+--- 157,160 ----
+***************
+*** 146,150 ****
    */
   #ifndef UTMP
 ! #define UTMP "/etc/utmp"
   #endif
   
-  #ifndef USER_PROCESS
---- 135,146 ----
-   **************************************************************************/
-  int utmp_pos; /* position of utmp-stamp */
-  
-  /*
-   * on Sparcs login/logouts are logged at /var/adm/wtmp
-   * but talk(d)/finger only look at /etc/utmp
+--- 162,166 ----
    */
   #ifndef UTMP
 ! #define UTMP _PATH_UTMP
   #endif
   
-  #ifndef USER_PROCESS
 ***************
-*** 143,148 ****
---- 159,166 ----
-   *************************************************************************/
+*** 165,168 ****
+--- 181,186 ----
   #ifdef BSD
   
 + char global_ut_line[UT_LINESIZE];
 + 
   /**************************************************************************
    * get_tslot() - grabbed from xvt-1.0 - modified by David Perry
-   *
 ***************
-*** 156,162 ****
-    char buf[200], name[200];
+*** 178,182 ****
     int i;
     
 !   if ((fs = fopen(TTYTAB,"r")) == NULL)
       return(-1);
     i = 1;
-    while (fgets(buf,200,fs) != NULL) 
---- 174,180 ----
-    char buf[200], name[200];
+--- 196,200 ----
     int i;
     
 !   if ((fs = fopen(_PATH_TTYS,"r")) == NULL)
       return(-1);
     i = 1;
-    while (fgets(buf,200,fs) != NULL) 
 ***************
-*** 182,187 ****
---- 200,215 ----
-  int write_utmp(char *ttyname, struct utmp * u) 
+*** 204,207 ****
+--- 222,235 ----
   {
     FILE *utmp;
 + #if USE_LASTLOG
@@ -109,11 +91,9 @@
 + 
     if((utmp = fopen(UTMP,"r+")) == NULL)
       return -1;
-    utmp_pos = get_tslot(ttyname) * sizeof(struct utmp);
 ***************
-*** 191,196 ****
---- 219,253 ----
-    fwrite((char *)u, sizeof(struct utmp),1,utmp);
+*** 213,216 ****
+--- 241,273 ----
     fclose(utmp);
     madeutent = 1;
 + 
@@ -147,14 +127,11 @@
 + 
     return(utmp_pos);
   }
-  
 ***************
-*** 250,255 ****
---- 307,313 ----
-    memset(&u,0,sizeof(u));
+*** 277,280 ****
+--- 334,338 ----
     fwrite((char *)&u,sizeof(struct utmp),1,ut);
     fclose(ut);
 +     logwtmp(global_ut_line, "", "");
   }
   
-  
diff --git a/x11/kdebase11/files/patch-ap b/x11/kdebase11/files/patch-ap
index 53b5e91f43fa..5459e9b26948 100644
--- a/x11/kdebase11/files/patch-ap
+++ b/x11/kdebase11/files/patch-ap
@@ -1,34 +1,10 @@
-*** kwmmodules/kpager/Makefile.in~	Sat Dec 19 22:29:36 1998
---- kwmmodules/kpager/Makefile.in	Tue Dec 29 01:29:59 1998
+*** konsole/include/TEShell.h~	Wed Apr 21 19:42:11 1999
+--- konsole/include/TEShell.h	Wed Apr 21 19:41:35 1999
 ***************
-*** 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
-*** 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
+*** 17,20 ****
+--- 17,21 ----
+  #define SHELL_H
   
++ #include <sys/types.h>
+  #include <qobject.h>
+  #include <termios.h>
diff --git a/x11/kdebase11/files/patch-at b/x11/kdebase11/files/patch-at
index 92030910bbe1..e8e7df71ad7e 100644
--- a/x11/kdebase11/files/patch-at
+++ b/x11/kdebase11/files/patch-at
@@ -1,5 +1,5 @@
-*** kdm/config/kdmrc.cpp~	Thu Dec 31 14:59:39 1998
---- kdm/config/kdmrc.cpp	Sun Jan  3 15:41:31 1999
+*** kdm/config/kdmrc.in~	Tue Feb  9 23:13:14 1999
+--- kdm/config/kdmrc.in	Wed Apr 21 18:45:34 1999
 ***************
 *** 9,13 ****
   SortUsers=true