Upgrade KDE to 2.2.2:

 * General:
 	- Support for objprelink.
 	- Hack for autoconf 2.13/automake 1.4.  Note that we can't use
	  the standard USE_AUTO* because they change things in work/*;
	  KDE has its own way of doing that.
 	- Light cleanup of extra dirs in the PLISTs provided by
	   my mkplistpkg[1] script.
 	- Speedups of both compile and runtime through the usage of
	  --disable-debug and --enable-final.  The latter did not work
	  with the kdemultimedia package, unfortunately.
	- Patch updates.
 * audio/kdemultimedia2:
	- Patch to fix KSCD on FreeBSD[2].  It works very well now.
 * deskutils/kdepim:
 	- Enable kpilot[3].  Pull in the latest pilot-link stuff.
 * devel/kdesdk,
 * devel/kdevelop:
 	- No specific changes.
 * devel/qt-designer:
 	- Make this port depend almost entirely on qt23 to make it more
	  maintainable, so I don't have to keep hacking the patches to
	  get them to apply.
 * editors/koffice,
 * games/kdegames,
 * graphics/kdegraphics:
 	- No specific changes.
 * misc/kdeaddons:
	- SDL is required now.  Cull SDL PLIST_SUB and such.
	- Fix breakage from hardcoding "sdl-config".
 * misc/kdeutils2:
	- Fix problem with klaptopdaemon[4] where it didn't properly
	  display the battery time.  This patch is untested, but applied.
 * net/kdenetwork2:
	- Fix DCC for KSIRC[5].
	- Remove ktalkd from the build.  It requires some weird thing
	  in the configure script that I don't have time to look at.
 * sysutils/kdeadmin:
	- No specific changes.
 * textproc/kdoc:
	- Remove bogus requirement that kdoc requires Perl 5.6.0; it sure
	  seems to operate fine with >= 5.005.  But I'll let time tell.
 * www/quanta:
	- No specific changes (--disable-debug support only).
 * x11/kde2:
	- No specific changes.
 * x11/kdebase2:
	- Fix ksysguard compile by merging the files from the HEAD branch
	  of KDE CVS that were missing at release time for FreeBSD[6].  :\
 * x11/kdelibs2:
	- Recognize CUPS' spinoff[7].
	- Add libxslt dependency since it was removed from kdelibs.
	- Fix libxml compile problems[8] (accomplished by upgrading).
	- Remove libkformula from port Makefile; this library has been
	  spun off into koffice.
	- Fix mode problems with DCOP[9].  This allows you to save files
	  properly.  It also seems to be a FreeBSD specific problem.
	- Fix bashisms in kdeprint/imagetops script[10].
 * x11-clocks/kdetoys2:
 	- No specific changes.
 * x11-toolkits/qt23:
	- Do NOT upgrade to QT 2.3.2[11].
	- Allow devel/qt-designer to depend on this port entirely for the
	  patches by adding a perlre to accomplish this.
 * x11-wm/kdeartwork:
	- No specific changes.

Thanks to the FreeBSD/KDE[1] team[12] who helped me test these out!

[1]  http://freebsd.kde.org/;
     http://www.databits.net/cgi-bin/cvsweb.cgi/scripts/portbuild/mkplistpkg
[2]  Submitted by:	Matthew Holmes <matt@speakeasy.net>
[3]  PR:		31914
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[4]  PR:		28475
     Submitted by:	Arun Sharma <arun@sharmas.dhs.org>
[5]  Submitted by:	Luc Morin <luc_m@videotron.ca>
[6]  Found at:	http://webcvs.kde.org/kdebase/ksysguard/ksysguardd/FreeBSD/
[7]  PR:		32321
     Reported by:	gad
     Submitted by:	James A. Halstead <jah4007@cs.rit.edu>
[8]  PR:		32055
     Reported by:	William Richard <wrichard@trivalley.com>, others
[9]  PR:		31629
     Submitted by:	Alan Eldridge <alane@geeksrus.net>
[10] PR:		32358
     Submitted by:	Alexander N. Kabaev <ak03@gte.com>
[11] PR:		31809
     Requested by:	Nathan Ahlstrom <nrahlstr@winternet.com> (denied)
[12] http://freebsd.kde.org/contact.shtml;
     http://lists.csociety.org/pipermail/kde-freebsd;
     http://lists.csociety.org/listinfo/kde-freebsd

1 files changed, 11 insertions, 27 deletions

diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 5466b74..3b9d785 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -229,7 +229,6 @@ lib/kde2/libkcm_kwinoptions.la
 lib/kde2/libkcm_kwinoptions.so
 lib/kde2/libkcm_launch.la
 lib/kde2/libkcm_launch.so
-lib/kde2/libkcm_launch.so.0
 lib/kde2/libkcm_locale.la
 lib/kde2/libkcm_locale.so
 lib/kde2/libkcm_midi.la
@@ -277,7 +276,6 @@ lib/kde2/libkonqsidebartree_dirtree.la
 lib/kde2/libkonqsidebartree_dirtree.so
 lib/kde2/libkonqsidebartree_history.la
 lib/kde2/libkonqsidebartree_history.so
-lib/kde2/libkonqsidebartree_history.so.0
 lib/kde2/libkonqsound.la
 lib/kde2/libkonqsound.so
 lib/kde2/libkonqtree.la
@@ -1146,9 +1144,6 @@ share/apps/konsole/konsole_part.rc
 share/apps/konsole/linux.desktop
 share/apps/konsole/linux.keytab
 share/apps/konsole/mc.desktop
-share/apps/konsole/pics/brightness.png
-share/apps/konsole/pics/colourness.png
-share/apps/konsole/pics/contrast.png
 share/apps/konsole/shell.desktop
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
@@ -1284,8 +1279,14 @@ share/config/imsmaprc
 share/config/interferencerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
+share/config/kdm/Xaccess
+share/config/kdm/Xreset
+share/config/kdm/Xservers
+share/config/kdm/Xsession
+share/config/kdm/Xsetup
+share/config/kdm/Xstartup
+share/config/kdm/Xwilling
 share/config/kdm/kdmrc
-share/config/kdm/README
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/konsolerc
@@ -2158,6 +2159,8 @@ share/locale/l10n/hr/entry.desktop
 share/locale/l10n/hr/flag.png
 share/locale/l10n/hu/entry.desktop
 share/locale/l10n/hu/flag.png
+share/locale/l10n/id/entry.desktop
+share/locale/l10n/id/flag.png
 share/locale/l10n/ie/entry.desktop
 share/locale/l10n/ie/flag.png
 share/locale/l10n/il/entry.desktop
@@ -2426,18 +2429,12 @@ share/wallpapers/simple_wallpaper.jpg
 share/wallpapers/sunday_brunch.jpg
 share/wallpapers/vegetative_fog.jpg
 @dirrm share/wallpapers
-@exec mkdir %D/share/templates/.source/emptydir
-@exec chmod 644 %D/share/templates/.source/emptydir
-@unexec rmdir %D/share/templates/.source/emptydir
+@dirrm share/templates/.source/emptydir
 @dirrm share/templates/.source
 @dirrm share/templates
 @dirrm share/sounds
-@dirrm share/servicetypes
 @dirrm share/services/useragentstrings
 @dirrm share/services/searchproviders
-@dirrm share/services/kded
-@dirrm share/services
-@dirrm share/mimelnk/application
 @dirrm share/locale/l10n/za
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
@@ -2479,6 +2476,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/locale/l10n/is
 @dirrm share/locale/l10n/il
 @dirrm share/locale/l10n/ie
+@dirrm share/locale/l10n/id
 @dirrm share/locale/l10n/hu
 @dirrm share/locale/l10n/hr
 @dirrm share/locale/l10n/hn
@@ -2512,22 +2510,13 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/locale/l10n/ag
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/locale/C
-@dirrm share/locale
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
-@dirrm share/icons/hicolor/48x48/filesystems
 @dirrm share/icons/hicolor/48x48/apps
-@dirrm share/icons/hicolor/32x32/filesystems
 @dirrm share/icons/hicolor/32x32/apps
-@dirrm share/icons/hicolor/32x32/actions
-@dirrm share/icons/hicolor/22x22/actions
-@dirrm share/icons/hicolor/16x16/filesystems
-@dirrm share/icons/hicolor/16x16/apps
-@dirrm share/icons/hicolor/16x16/actions
 @dirrm share/fonts/override
 @dirrm share/fonts
 @dirrm share/doc/HTML/en/kwrite
@@ -2552,9 +2541,7 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/doc/HTML/en/kcontrol
 @dirrm share/doc/HTML/en/kate
 @dirrm share/doc/HTML/en/kaddressbook
-@dirrm share/doc/HTML/en
 @dirrm share/config/kdm
-@dirrm share/config
 @dirrm share/autostart
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
@@ -2572,7 +2559,6 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kscreensaver
 @dirrm share/apps/kpersonalizer/pics
 @dirrm share/apps/kpersonalizer
-@dirrm share/apps/konsole/pics
 @dirrm share/apps/konsole
 @dirrm share/apps/konqueror/tiles
 @dirrm share/apps/konqueror/profiles
@@ -2658,7 +2644,6 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/apps/kdcop
 @dirrm share/apps/kcontrol/pics
 @dirrm share/apps/kcontrol
-@dirrm share/apps/kconf_update
 @dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
@@ -2755,6 +2740,5 @@ share/wallpapers/vegetative_fog.jpg
 @dirrm share/applnk/Applications
 @dirrm share/applnk/.hidden
 @dirrm share/applnk
-@dirrm lib/kde2
 @dirrm include/kwin
 @dirrm include/kate