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, 54 insertions, 154 deletions

diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 44bfaff..c12d482 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeadmin
-PORTVERSION=	2.1.1
+PORTVERSION=	2.2
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/distribution/tar/generic/src
@@ -19,4 +19,7 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 
+pre-configure:
+	${PERL} -pi -e "s@DO_NOT_COMPILE qt@DO_NOT_COMPILE kuser qt@g" ${WRKSRC}/configure
+
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index caa15fc..f9e5928 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1 +1 @@
-MD5 (kdeadmin-2.1.1.tar.bz2) = 57fdfa9815d445edcae18f7f688942da
+MD5 (kdeadmin-2.2.tar.bz2) = 13ee99fa898fc177dd65dc2564fefd60
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 1801809..0fafa91 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -1,182 +1,79 @@
 bin/kcron
 bin/kpackage
-bin/kpackage_slack_l
-bin/printversion
-bin/kuser
 bin/kwuftpd
 bin/secpolicy
-lib/libkcm_ksysctrl.so
-lib/libkcm_ksysctrl.la
-share/doc/HTML/en/kcron/.anchors
-share/doc/HTML/en/kcron/commands.html
-share/doc/HTML/en/kcron/compilation.html
-share/doc/HTML/en/kcron/credits.html
-share/doc/HTML/en/kcron/faq.html
-share/doc/HTML/en/kcron/index.html
-share/doc/HTML/en/kcron/installation.html
-share/doc/HTML/en/kcron/introduction.html
-share/doc/HTML/en/kcron/manage-tasks.html
-share/doc/HTML/en/kcron/manage-variables.html
-share/doc/HTML/en/kcron/new-task.html
-share/doc/HTML/en/kcron/new-variable.html
-share/doc/HTML/en/kcron/printing-crontab.html
-share/doc/HTML/en/kcron/requirements.html
-share/doc/HTML/en/kcron/saving-crontab.html
-share/doc/HTML/en/kcron/using-kcron.html
+share/applnk/System/kcron.desktop
+share/applnk/System/kpackage.desktop
+share/applnk/System/kwuftpd.desktop
+share/apps/kpackage/kpackageui.rc
+share/apps/kpackage/pics/bnew.png
+share/apps/kpackage/pics/bsd.png
+share/apps/kpackage/pics/bupdated.png
+share/apps/kpackage/pics/cross.png
+share/apps/kpackage/pics/dbad.png
+share/apps/kpackage/pics/deb.png
+share/apps/kpackage/pics/dnew.png
+share/apps/kpackage/pics/dupdated.png
+share/apps/kpackage/pics/kiss.png
+share/apps/kpackage/pics/knew.png
+share/apps/kpackage/pics/kupdated.png
+share/apps/kpackage/pics/noball.png
+share/apps/kpackage/pics/ptick.png
+share/apps/kpackage/pics/question.png
+share/apps/kpackage/pics/rnew.png
+share/apps/kpackage/pics/rpm.png
+share/apps/kpackage/pics/rupdated.png
+share/apps/kpackage/pics/slack.png
+share/apps/kpackage/pics/snew.png
+share/apps/kpackage/pics/supdated.png
+share/apps/kpackage/pics/tick.png
+share/apps/kpackage/toolbar/ftin.xpm
+share/apps/kpackage/toolbar/ftout.xpm
 share/doc/HTML/en/kcron/common
+share/doc/HTML/en/kcron/index.cache.bz2
 share/doc/HTML/en/kcron/index.docbook
 share/doc/HTML/en/kcron/kcron.png
 share/doc/HTML/en/kcron/kcronstart.png
 share/doc/HTML/en/kcron/newtask.png
 share/doc/HTML/en/kcron/newvariable.png
 share/doc/HTML/en/kcron/print.png
-share/doc/HTML/en/kpackage/.anchors
-share/doc/HTML/en/kpackage/cache-menu.html
-share/doc/HTML/en/kpackage/credits-and-licenses.html
-share/doc/HTML/en/kpackage/help-menu.html
-share/doc/HTML/en/kpackage/index.html
-share/doc/HTML/en/kpackage/installation.html
-share/doc/HTML/en/kpackage/installing-packages.html
-share/doc/HTML/en/kpackage/integrating-available-packages-in-the-tree.html
-share/doc/HTML/en/kpackage/introduction.html
-share/doc/HTML/en/kpackage/menus.html
-share/doc/HTML/en/kpackage/onscreen-fundamentals.html
-share/doc/HTML/en/kpackage/package-information-panel.html
-share/doc/HTML/en/kpackage/packages-menu.html
-share/doc/HTML/en/kpackage/requirements.html
-share/doc/HTML/en/kpackage/root-access.html
-share/doc/HTML/en/kpackage/settings-menu.html
-share/doc/HTML/en/kpackage/special-menu.html
-share/doc/HTML/en/kpackage/the-package-tree-panel.html
-share/doc/HTML/en/kpackage/toolbar.html
-share/doc/HTML/en/kpackage/uninstalling-packages.html
 share/doc/HTML/en/kpackage/common
+share/doc/HTML/en/kpackage/index.cache.bz2
 share/doc/HTML/en/kpackage/index.docbook
-share/doc/HTML/en/ksysv/.anchors
-share/doc/HTML/en/ksysv/appendix.html
-share/doc/HTML/en/ksysv/authors.html
-share/doc/HTML/en/ksysv/configuration.html
-share/doc/HTML/en/ksysv/credits.html
-share/doc/HTML/en/ksysv/index.html
-share/doc/HTML/en/ksysv/introduction.html
-share/doc/HTML/en/ksysv/keyboard.html
-share/doc/HTML/en/ksysv/license.html
-share/doc/HTML/en/ksysv/onscreenfundamentals.html
-share/doc/HTML/en/ksysv/standard-semantics-of-runlevels.html
-share/doc/HTML/en/ksysv/the-menu-entries.html
 share/doc/HTML/en/ksysv/common
-share/doc/HTML/en/ksysv/index.cvlog
+share/doc/HTML/en/ksysv/index.cache.bz2
 share/doc/HTML/en/ksysv/index.docbook
-share/doc/HTML/en/kuser/.anchors
-share/doc/HTML/en/kuser/add-user.html
-share/doc/HTML/en/kuser/credits.html
-share/doc/HTML/en/kuser/customizing.html
-share/doc/HTML/en/kuser/group-properties.html
-share/doc/HTML/en/kuser/index.html
-share/doc/HTML/en/kuser/start.html
-share/doc/HTML/en/kuser/user-properties.html
-share/doc/HTML/en/kuser/using.html
 share/doc/HTML/en/kuser/common
+share/doc/HTML/en/kuser/index.cache.bz2
 share/doc/HTML/en/kuser/index.docbook
-share/doc/HTML/en/kwuftpd/.anchors
-share/doc/HTML/en/kwuftpd/about-ftp-accounts.html
-share/doc/HTML/en/kwuftpd/basic-ftp-setup.html
-share/doc/HTML/en/kwuftpd/credits-and-license.html
-share/doc/HTML/en/kwuftpd/directories.html
-share/doc/HTML/en/kwuftpd/index.html
-share/doc/HTML/en/kwuftpd/installation.html
-share/doc/HTML/en/kwuftpd/introduction.html
-share/doc/HTML/en/kwuftpd/logging.html
-share/doc/HTML/en/kwuftpd/menuref.html
-share/doc/HTML/en/kwuftpd/messages.html
-share/doc/HTML/en/kwuftpd/ratios.html
-share/doc/HTML/en/kwuftpd/security.html
-share/doc/HTML/en/kwuftpd/uploads.html
-share/doc/HTML/en/kwuftpd/user-classes.html
-share/doc/HTML/en/kwuftpd/using-kwuftpd.html
-share/doc/HTML/en/kwuftpd/virtual-hosts.html
 share/doc/HTML/en/kwuftpd/common
-share/doc/HTML/en/kwuftpd/logging.png
-share/doc/HTML/en/kwuftpd/index.docbook
 share/doc/HTML/en/kwuftpd/directories.png
+share/doc/HTML/en/kwuftpd/index.cache.bz2
+share/doc/HTML/en/kwuftpd/index.docbook
+share/doc/HTML/en/kwuftpd/logging.png
 share/doc/HTML/en/kwuftpd/messages.png
 share/doc/HTML/en/kwuftpd/ratios.png
 share/doc/HTML/en/kwuftpd/security.png
 share/doc/HTML/en/kwuftpd/uploads.png
 share/doc/HTML/en/kwuftpd/user_classes.png
 share/doc/HTML/en/kwuftpd/virtual.png
-share/apps/kpackage/pics/cross.xpm
-share/apps/kpackage/pics/dbad.xpm
-share/apps/kpackage/pics/deb.xpm
-share/apps/kpackage/pics/dnew.xpm
-share/apps/kpackage/pics/dupdated.xpm
-share/apps/kpackage/pics/ptick.xpm
-share/apps/kpackage/pics/question.xpm
-share/apps/kpackage/pics/rnew.xpm
-share/apps/kpackage/pics/rpm.xpm
-share/apps/kpackage/pics/rupdated.xpm
-share/apps/kpackage/pics/kiss.xpm
-share/apps/kpackage/pics/knew.xpm
-share/apps/kpackage/pics/kupdated.xpm
-share/apps/kpackage/pics/slack.xpm
-share/apps/kpackage/pics/snew.xpm
-share/apps/kpackage/pics/supdated.xpm
-share/apps/kpackage/pics/bsd.xpm
-share/apps/kpackage/pics/bnew.xpm
-share/apps/kpackage/pics/bupdated.xpm
-share/apps/kpackage/pics/tick.xpm
-share/apps/kpackage/pics/noball.xpm
-share/apps/kpackage/toolbar/ftin.xpm
-share/apps/kpackage/toolbar/ftout.xpm
-share/apps/kpackage/kpackageui.rc
-share/apps/ksysctrl/pci.ids
-share/apps/ksysctrl/README
-share/apps/ksysctrl/NEWS
-share/apps/ksysctrl/LICENSE
-share/apps/kuser/pics/group.png
-share/apps/kuser/pics/user.png
-share/apps/kuser/icons/locolor/22x22/actions/add_group.png
-share/apps/kuser/icons/locolor/22x22/actions/add_user.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_group.png
-share/apps/kuser/icons/locolor/22x22/actions/delete_user.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_group.png
-share/apps/kuser/icons/locolor/22x22/actions/edit_user.png
-share/apps/kuser/kuserui.rc
-share/mimelnk/application/x-debian-package.kdelnk
-share/icons/locolor/16x16/apps/kcron.png
-share/icons/locolor/16x16/apps/kuser.png
-share/icons/locolor/16x16/apps/kpackage.png
-share/icons/locolor/32x32/apps/kcron.png
-share/icons/locolor/32x32/apps/kpackage.png
-share/icons/locolor/32x32/apps/kuser.png
+share/icons/hicolor/16x16/apps/kcron.png
+share/icons/hicolor/16x16/apps/kpackage.png
+share/icons/hicolor/32x32/apps/kcron.png
 share/icons/hicolor/32x32/apps/kpackage.png
-share/icons/hicolor/32x32/apps/kuser.png
 share/icons/hicolor/48x48/apps/kpackage.png
-share/icons/hicolor/48x48/apps/kuser.png
-share/applnk/System/kcron.desktop
-share/applnk/System/kpackage.desktop
-share/applnk/System/kuser.desktop
-share/applnk/System/kwuftpd.desktop
-share/applnk/Settings/System/ksysctrl.desktop
-@dirrm share/doc/HTML/en/kcron
-@dirrm share/doc/HTML/en/kpackage
-@dirrm share/doc/HTML/en/ksysv
-@dirrm share/doc/HTML/en/kuser
+share/mimelnk/application/x-debian-package.desktop
+@dirrm share/mimelnk/application
+@dirrm share/icons/hicolor/48x48/apps
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/HTML/en/kwuftpd
-@dirrm share/apps/kpackage/pics
+@dirrm share/doc/HTML/en/kuser
+@dirrm share/doc/HTML/en/ksysv
+@dirrm share/doc/HTML/en/kpackage
+@dirrm share/doc/HTML/en/kcron
+@dirrm share/doc/HTML/en
 @dirrm share/apps/kpackage/toolbar
+@dirrm share/apps/kpackage/pics
 @dirrm share/apps/kpackage
-@dirrm share/apps/ksysctrl/toolbar
-@dirrm share/apps/ksysctrl/icons/locolor/16x16/apps
-@dirrm share/apps/ksysctrl/icons/locolor/16x16
-@dirrm share/apps/ksysctrl/icons/locolor/32x32/apps
-@dirrm share/apps/ksysctrl/icons/locolor/32x32
-@dirrm share/apps/ksysctrl/icons/locolor
-@dirrm share/apps/ksysctrl/icons
-@dirrm share/apps/ksysctrl
-@dirrm share/apps/kuser/pics
-@dirrm share/apps/kuser/icons/locolor/22x22/actions
-@dirrm share/apps/kuser/icons/locolor/22x22
-@dirrm share/apps/kuser/icons/locolor
-@dirrm share/apps/kuser/icons
-@dirrm share/apps/kuser
+@dirrm share/applnk/System