Update to KDE 2.2:

 * All patches except sysutils/kdeadmin/files/patch-rpmMessages.c:
	- Either obsoleted or merged into KDE.
 * All pkg-plists:
	- Huge diffs are due to mass conversion from static HTML pages
	  to XML/XSL versions.
 * audio/kdemultimedia2:
	- aRts + Noatun, etc. now work and play MP3s et al properly,
	  using the mpg123 aRtsplugin.  Remove mpeglib[,_artsplug]
	  from compile.
 * converters/kdesupport2:
	- Obsolete.  No longer used in this version of KDE.
 * deskutils/kdepim:
	- Use autoconf and account for brokenness in the configure
	  script by replacing invocations of INSTALL under libical
	  with the proper incantations.
	- Per David O'Brien's request, move libimap to libkimap;
	  this was performed by Rik Hemsley <rikkus@kde.org>.
 * devel/kdesdk:
	- New module with some helpful tools.  One in particular that
	  seems demanded is ``kbabel'', which, as I've been told, is
	  a translator's wet dream.
	- Workaround dumb problem in kbabel's libgettext (which I could
	  not figure out how to remove) by replacing its error() with
	  errc().  KBabel seems to run fine with this patch.
 * devel/kdevelop:
	- Fix lame check for libkdeui.so.* by replacing it with just
	  a check for libkdeui.so.  It's been/being removed from
	  kdevelop after 2.2.
 * editors/koffice:
	- Fix kivio compile errors by substituting in PTHREAD_LIBS
	  in the correct place.  Compensate for kivio's dependency
	  on pthreads by changing kivio to use LD_PRELOAD=/usr/lib/libc_r.so
	  in kivio.desktop.
 * games/kdegames2:
	- Some new games.
 * graphics/kdegraphics2:
	- Fix link errors in libkscan and kamera where they
	  require gettext (ie: add -lintl).
	- Fix compile error in kamera.cpp which is dependent on a
	  correctly done gphoto2.. of course, this will only help
	  people who've manually installed gphoto2 themselves.
 * net/kdenetwork2:
	- Mimelib was moved here (reason for removal of kdesupport2).
 * misc/kdeaddons:
	- New module to FreeBSD ports; some simple addons for KDE2.
	  Suggested by Lauri Watts <lauri@kde.org>.
 * misc/kdeutils2:
	- Added a couple manpages.
 * x11-clocks/kdetoys2:
	- Some new apps.
 * sysutils/kdeadmin:
	- Remove kuser from compile because it has some problems.  ;\
 * x11/kdelibs2:
	- Add libFAM dependency to help people who run FAM; FAM
	  increases the overall desktop responsiveness.
	  Submitted by Lauri Watts <lauri@kde.org>.
	- Add CUPS dependency to bring in KDE's new print system.
	- Add bzip2/libxml2 dependencies to support the new help kioslave.
	- Disable installation of libltdl stuff to prevent conflicts
	  with other stuff.  Submitted by wjv.
	- Add pkg-req script to avoid conflicts with kdelibs11; add
	  to Makefile too.  Submitted by benno.
	- Be sure to remove the pth header conflicts stuff from the
	  arts/mcop_mt section.
	- Fix problem with configure trying to find -lfam in the
	  wrong place.
	- Remove kspell and api subdirs from doc; we don't need them,
	  and there are problems trying to build/install them.
	  Submitted by Lauri Watts <lauri@kde.org>.
 * x11/kdebase2:
	- Solve link permissions problem by changing the modes on
	  files installed by kdesktop/init/Templates to 644.
	  Submitted by Jim Durham <durham@w2xo.pgh.pa.us>.
 * x11/kde2:
	- Bump version; no other changes.

Special thanks to Lauri Watts <lauri@kde.org> for helping me test
packages generated by these changes on a virgin system.  I believe
that this is the best-tested update I've ever done for KDE, and it
really shines this time around.

I just noticed there are a couple other PRs in the PR db that need
to be addressed.  I will take care of those by tomorrow.  Sorry...

PR:			22735, 28549
Blanket approval by:	demon (kdesdk, kdevelop)

3 files changed, 0 insertions, 131 deletions

diff --git a/x11/kdebase4-runtime/files/patch-ProcessList.c b/x11/kdebase4-runtime/files/patch-ProcessList.c
deleted file mode 100644
index 8574a62341eb..000000000000
--- a/x11/kdebase4-runtime/files/patch-ProcessList.c
+++ /dev/null
@@ -1,108 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c	Mon Jan 22 07:12:05 2001
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c.new	Mon Mar  5 08:56:20 2001
-@@ -29,6 +29,9 @@
- #include <sys/time.h>
- #include <sys/param.h>
- #include <sys/user.h>
-+#if __FreeBSD_version > 500015
-+#include <sys/priority.h>
-+#endif
- #include <unistd.h>
- #include <pwd.h>
- #include <dirent.h>
-@@ -162,7 +165,6 @@
- 	static char *statuses[] = { "idle","run","sleep","stop","zombie" };
- 	
- 	ProcessInfo* ps;
--	int userTime, sysTime;
- 	struct passwd* pwent;
- 	int mib[4];
- 	struct kinfo_proc p;
-@@ -188,40 +190,56 @@
- 	if (sysctl(mib, 4, &p, &len, NULL, 0) == -1 || !len)
- 		return -1;
- 
-+#if __FreeBSD_version >= 500015
-+        ps->pid       = p.ki_pid;
-+        ps->ppid      = p.ki_ppid;
-+        ps->uid       = p.ki_uid;    
-+        ps->gid       = p.ki_pgid;
-+        ps->priority  = p.ki_pri.pri_user;
-+        ps->niceLevel = p.ki_nice;
-+#else
-         ps->pid       = p.kp_proc.p_pid;
-         ps->ppid      = p.kp_eproc.e_ppid;
-         ps->uid       = p.kp_eproc.e_ucred.cr_uid;
-         ps->gid       = p.kp_eproc.e_pgid;
-         ps->priority  = p.kp_proc.p_priority;
-         ps->niceLevel = p.kp_proc.p_nice;
-+#endif
- 
-         /* this isn't usertime -- it's total time (??) */
--#if __FreeBSD_version >= 300000
-+#if __FreeBSD_version >= 500015
-+        ps->userTime = p.ki_runtime / 10000;
-+#elif __FreeBSD_version >= 300000
-         ps->userTime = p.kp_proc.p_runtime / 10000;
- #else
--        ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100
-+	 ps->userTime = p.kp_proc.p_rtime.tv_sec*100+p.kp_proc.p_rtime.tv_usec/100;
- #endif
-         ps->sysTime  = 0;
--        ps->userLoad = p.kp_proc.p_pctcpu / 100;
-         ps->sysLoad  = 0;
- 
--        /* memory */
--        ps->vmSize   = (p.kp_eproc.e_vm.vm_tsize +
--                       p.kp_eproc.e_vm.vm_dsize +
--                       p.kp_eproc.e_vm.vm_ssize) * getpagesize();
--        ps->vmRss    = p.kp_eproc.e_vm.vm_rssize * getpagesize();
--
--        /* process name */
--        strncpy(ps->name,p.kp_proc.p_comm? p.kp_proc.p_comm:"????",sizeof(ps->name));
--        ps->name[sizeof(ps->name)-1]='\0';
--	
--        /* find out user name with the process uid */
--        pwent = getpwuid(ps->uid);
-+        /* memory, process name, process uid */
-+	/* find out user name with process uid */
-+	pwent = getpwuid(ps->uid);
- 	strncpy(ps->userName,pwent&&pwent->pw_name? pwent->pw_name:"????",sizeof(ps->userName));
--        ps->userName[sizeof(ps->userName)-1]='\0';
--	
--        /* status, a character, not a number */
--        strcpy(ps->status,(p.kp_proc.p_stat>=1)&&(p.kp_proc.p_stat<=5)? statuses[p.kp_proc.p_stat-1]:"????");
-+	ps->userName[sizeof(ps->userName)-1]='\0';
-+
-+#if __FreeBSD_version >= 500015
-+        ps->userLoad = p.ki_pctcpu / 100;
-+	ps->vmSize   = (p.ki_vmspace->vm_tsize +
-+			p.ki_vmspace->vm_dsize +
-+			p.ki_vmspace->vm_ssize) * getpagesize();
-+	ps->vmRss    = p.ki_vmspace->vm_rssize * getpagesize();
-+	strncpy(ps->name,p.ki_comm? p.ki_comm:"????",sizeof(ps->name));
-+	strcpy(ps->status,(p.ki_stat>=1)&&(p.ki_stat<=5)? statuses[p.ki_stat-1]:"????");
-+#else
-+        ps->userLoad = p.kp_proc.p_pctcpu / 100;
-+	ps->vmSize   = (p.kp_eproc.e_vm.vm_tsize +
-+			p.kp_eproc.e_vm.vm_dsize +
-+			p.kp_eproc.e_vm.vm_ssize) * getpagesize();
-+	ps->vmRss    = p.kp_eproc.e_vm.vm_rssize * getpagesize();
-+	strncpy(ps->name,p.kp_proc.p_comm? p.kp_proc.p_comm:"????",sizeof(ps->name));
-+	strcpy(ps->status,(p.kp_proc.p_stat>=1)&&(p.kp_proc.p_stat<=5)? statuses[p.kp_proc.p_stat-1]:"????");
-+#endif
- 
-         /* process command line */
-         /*strncpy(ps->cmdline,p.kp_proc.p_args->ar_args,sizeof(ps->cmdline));
-@@ -296,7 +314,11 @@
-         sysctl(mib, 3, p, &len, NULL, 0);
- 
- 	for (num = 0; num < len / sizeof(struct kinfo_proc); num++)
-+#if __FreeBSD_version >= 500015
-+		updateProcess(p[num].ki_pid);
-+#else
- 		updateProcess(p[num].kp_proc.p_pid);
-+#endif
- 
- 	cleanupProcessList();
- 
diff --git a/x11/kdebase4-runtime/files/patch-TEPty.C b/x11/kdebase4-runtime/files/patch-TEPty.C
deleted file mode 100644
index 796ec243efbf..000000000000
--- a/x11/kdebase4-runtime/files/patch-TEPty.C
+++ /dev/null
@@ -1,11 +0,0 @@
---- konsole/src/TEPty.C	Sun Feb 18 10:28:28 2001
-+++ konsole/src/TEPty.C.new	Fri Feb 23 02:55:58 2001
-@@ -238,7 +238,7 @@
- #ifdef HAVE_UTEMPTER
-   removeLineFromUtmp(ttynam, fd);
- #elif defined(USE_LOGIN)
--  char *tty_name=ttyname(0);
-+  char *tty_name=ttyname(fd);
-   if (tty_name)
-   {
-   	if (strncmp(tty_name, "/dev/", 5) == 0)
diff --git a/x11/kdebase4-runtime/files/patch-kdeeject b/x11/kdebase4-runtime/files/patch-kdeeject
deleted file mode 100644
index 8a5870ad25ff..000000000000
--- a/x11/kdebase4-runtime/files/patch-kdeeject
+++ /dev/null
@@ -1,12 +0,0 @@
---- kdesktop/kdeeject	Wed Dec 13 13:25:02 2000
-+++ kdesktop/kdeeject.new	Fri Feb 23 02:59:54 2001
-@@ -11,7 +11,8 @@
-   # TODO: On bsd, it should be 'cdcontrol -f $1 eject'
-   # Checking for stuff in the PATH is ugly with sh though.
-   # I guess this is the reason for making this a kde app...
--  if eject $1; then
-+  dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
-+  if cdcontrol -f $dev eject; then
-     # Success -> update icon
-     dcop kdesktop default refreshIcons
-     exit 0