Activate utmp, wtmp and lastlog support for kvt.

Submitted by:	"Andrew J. Korty" <ajk@physics.purdue.edu>
Forwarded by:	Stefan Esser <se@mi.uni-koeln.de>

  BTW, this port installs some files missing in PLIST depending on
what program is installed on the system.
  Are there any hacks for this?

# I deleted @dirrm's which are included in kdelibs.

11 files changed, 197 insertions, 495 deletions

diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kdebase11/files/patch-an b/x11/kdebase11/files/patch-an
new file mode 100644
index 000000000000..e588a6d758e9
--- /dev/null
+++ b/x11/kdebase11/files/patch-an
@@ -0,0 +1,19 @@
+*** kvt/Makefile.in.orig	Sun Sep 13 12:49:42 1998
+--- kvt/Makefile.in	Sun Sep 13 12:50:42 1998
+***************
+*** 148,154 ****
+  xdmconfigsubdir = @xdmconfigsubdir@
+  
+  INCLUDES= $(all_includes)
+! LDADD	= $(all_libraries) -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBCURSES) $(KDE_RPATH) $(LIBSOCKET)
+  DISTCLEANFILES = main.moc
+  
+  bin_PROGRAMS = kvt
+--- 148,154 ----
+  xdmconfigsubdir = @xdmconfigsubdir@
+  
+  INCLUDES= $(all_includes)
+! LDADD	= $(all_libraries) -lkdeui -lkdecore -lqt -lXext -lX11 $(LIBUTIL) $(LIBCURSES) $(KDE_RPATH) $(LIBSOCKET)
+  DISTCLEANFILES = main.moc
+  
+  bin_PROGRAMS = kvt
diff --git a/x11/kdebase11/files/patch-ao b/x11/kdebase11/files/patch-ao
new file mode 100644
index 000000000000..21845750507c
--- /dev/null
+++ b/x11/kdebase11/files/patch-ao
@@ -0,0 +1,160 @@
+*** kvt/utmp.c.orig	Sun Aug 10 08:43:56 1997
+--- kvt/utmp.c	Sun Sep 13 13:42:02 1998
+***************
+*** 60,65 ****
+--- 60,70 ----
+  #include <utmp.h>
+  #include <unistd.h>
+  
++ #define UTMP_SUPPORT 1
++ #define HAVE_UTIL 1
++ #define USE_LASTLOG 1
++ #define USE_TTYENT 1
++ 
+  #ifdef HAVE_LASTLOG_H
+  #include <lastlog.h>
+  #endif
+***************
+*** 73,78 ****
+--- 78,95 ----
+  #include <stdio.h>
+  #include <memory.h>
+  
++ #if USE_LASTLOG
++ # include <paths.h>
++ #endif /* USE_LASTLOG */
++ 
++ #if USE_TTYENT
++ # include <ttyent.h>
++ #endif /* USE_TTYENT */
++ 
++ #if HAVE_UTIL
++ #include <sys/param.h>
++ #endif /* HAVE_UTIL */
++ 
+  void cleanutent(void);
+  void makeutent(char *);
+  
+***************
+*** 118,130 ****
+   **************************************************************************/
+  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
+   */
+  #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
+   */
+  #ifndef UTMP
+! #define UTMP _PATH_UTMP
+  #endif
+  
+  #ifndef USER_PROCESS
+***************
+*** 143,148 ****
+--- 159,166 ----
+   *************************************************************************/
+  #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];
+    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];
+    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) 
+  {
+    FILE *utmp;
++ #if USE_LASTLOG
++     FILE *llfp;
++     struct lastlog ll;
++ #endif /* USE_LASTLOG */
++ #if HAVE_UTIL
++     extern char *display_name;
++     char *p;
++     char wthost[MAXHOSTNAMELEN];
++ #endif /* HAVE_UTIL */
++ 
+    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);
+    fclose(utmp);
+    madeutent = 1;
++ 
++ #if USE_LASTLOG
++     /* make a lastlog entry */
++     ll.ll_time = (time_t) u->ut_time;
++     (void) strncpy(ll.ll_line, u->ut_line, sizeof ll.ll_line - 1);
++     ll.ll_line[sizeof ll.ll_line - 1] = '\0';
++     (void) strncpy(ll.ll_host, u->ut_host, sizeof ll.ll_host - 1);
++     ll.ll_host[sizeof ll.ll_host - 1] = '\0';
++     llfp = fopen(_PATH_LASTLOG, "a+");
++     if (llfp) {
++         (void) fseek(llfp, getuid(), 0);
++         (void) fwrite(&ll, sizeof ll, 1, llfp);
++         (void) fclose(llfp);
++     }
++ #endif /* USE_LASTLOG */
++ 
++ #if HAVE_UTIL
++     /* save ut_line for later */
++     (void) strncpy(global_ut_line, u->ut_line, sizeof global_ut_line);
++ 
++     /* finally, log the entry to wtmp */
++     (void) strncpy(wthost, display_name, sizeof wthost - 1);
++     wthost[sizeof wthost - 1] = '\0';
++     p = strchr(wthost, ':');
++     if (p)
++         *p = '\0';
++     logwtmp(global_ut_line, u->ut_name, wthost);
++ #endif /* HAVE_UTIL */
++ 
+    return(utmp_pos);
+  }
+  
+***************
+*** 250,255 ****
+--- 307,313 ----
+    memset(&u,0,sizeof(u));
+    fwrite((char *)&u,sizeof(struct utmp),1,ut);
+    fclose(ut);
++     logwtmp(global_ut_line, "", "");
+  }
+  
+  
diff --git a/x11/kdebase11/pkg-plist b/x11/kdebase11/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kdebase11/pkg-plist
+++ b/x11/kdebase11/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kdebase2/pkg-plist
+++ b/x11/kdebase2/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 01f5d41bbedf..0ef463989f6f 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -38,6 +38,7 @@ bin/klines.kss
 bin/klissie.kss
 bin/klock
 bin/kmenuedit
+bin/kmorph3d.kss
 bin/kpanel
 bin/kpolygon.kss
 bin/kpyro.kss
@@ -46,6 +47,7 @@ bin/krock.kss
 bin/krootwm
 bin/kscience.kss
 bin/kslip.kss
+bin/kspace.kss
 bin/kstartondesk
 bin/kswarm.kss
 bin/kvt
@@ -1416,57 +1418,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
-@dirrm share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrm share/locale/zh_TW.Big5
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sl/LC_MESSAGES
-@dirrm share/locale/sl
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
-@dirrm share/locale/mk/LC_MESSAGES
-@dirrm share/locale/mk
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/fi/LC_MESSAGES
-@dirrm share/locale/fi
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
-@dirrm share/locale/en_UK/LC_MESSAGES
-@dirrm share/locale/en_UK
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
-@dirrm share/locale
 @dirrm share/icons/mini
 @dirrm share/icons
 @dirrm share/doc/HTML/no/kcontrol/kcmsyssound
@@ -1496,12 +1447,9 @@ share/wallpapers/wood1.jpg
 @dirrm share/doc/HTML/en/kcontrol/kcminfo
 @dirrm share/doc/HTML/en/kcontrol/kcmbell
 @dirrm share/doc/HTML/en/kcontrol
-@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/kcontrol/kcmsyssound
 @dirrm share/doc/HTML/de/kcontrol
 @dirrm share/doc/HTML/de
-@dirrm share/doc/HTML
-@dirrm share/config
 @dirrm share/apps/kwm/pics
 @dirrm share/apps/kwm
 @dirrm share/apps/kscreensaver
@@ -1539,7 +1487,6 @@ share/wallpapers/wood1.jpg
 @dirrm share/apps/kappfinder/apps/Development
 @dirrm share/apps/kappfinder/apps
 @dirrm share/apps/kappfinder
-@dirrm share/apps
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/Windows