(Forced commit.)

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)

1 files changed, 1 insertions, 1 deletions

diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index 7796e350a8b0..680092419572 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kde
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	x11 kde
 MASTER_SITES=	# empty
 DISTFILES=	# none