aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/kde2/Makefile2
-rw-r--r--x11/kde3/Makefile2
-rw-r--r--x11/kde4-baseapps/Makefile3
-rw-r--r--x11/kde4-baseapps/distinfo2
-rw-r--r--x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kde4-baseapps/pkg-plist150
-rw-r--r--x11/kde4-runtime/Makefile3
-rw-r--r--x11/kde4-runtime/distinfo2
-rw-r--r--x11/kde4-runtime/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kde4-runtime/pkg-plist150
-rw-r--r--x11/kde4-workspace/Makefile3
-rw-r--r--x11/kde4-workspace/distinfo2
-rw-r--r--x11/kde4-workspace/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kde4-workspace/pkg-plist150
-rw-r--r--x11/kde4/Makefile2
-rw-r--r--x11/kdebase2/Makefile3
-rw-r--r--x11/kdebase2/distinfo2
-rw-r--r--x11/kdebase2/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kdebase2/pkg-plist150
-rw-r--r--x11/kdebase3/Makefile3
-rw-r--r--x11/kdebase3/distinfo2
-rw-r--r--x11/kdebase3/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kdebase3/pkg-plist150
-rw-r--r--x11/kdebase4-runtime/Makefile3
-rw-r--r--x11/kdebase4-runtime/distinfo2
-rw-r--r--x11/kdebase4-runtime/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kdebase4-runtime/pkg-plist150
-rw-r--r--x11/kdebase4-workspace/Makefile3
-rw-r--r--x11/kdebase4-workspace/distinfo2
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kdebase4-workspace/pkg-plist150
-rw-r--r--x11/kdebase4/Makefile3
-rw-r--r--x11/kdebase4/distinfo2
-rw-r--r--x11/kdebase4/files/patch-kdm::kfrontend::genkdmconf.c29
-rw-r--r--x11/kdebase4/pkg-plist150
-rw-r--r--x11/kdelibs2/Makefile5
-rw-r--r--x11/kdelibs2/distinfo2
-rw-r--r--x11/kdelibs2/files/patch-netsupp.cpp11
-rw-r--r--x11/kdelibs2/pkg-plist63
-rw-r--r--x11/kdelibs3/Makefile5
-rw-r--r--x11/kdelibs3/distinfo2
-rw-r--r--x11/kdelibs3/pkg-plist63
-rw-r--r--x11/kdelibs4/Makefile5
-rw-r--r--x11/kdelibs4/distinfo2
-rw-r--r--x11/kdelibs4/pkg-plist63
45 files changed, 1511 insertions, 188 deletions
diff --git a/x11/kde2/Makefile b/x11/kde2/Makefile
index bea6b9018e14..162e065022fa 100644
--- a/x11/kde2/Makefile
+++ b/x11/kde2/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kde
-PORTVERSION= 2.2
+PORTVERSION= 2.2.1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kde3/Makefile b/x11/kde3/Makefile
index bea6b9018e14..162e065022fa 100644
--- a/x11/kde3/Makefile
+++ b/x11/kde3/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kde
-PORTVERSION= 2.2
+PORTVERSION= 2.2.1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kde4-runtime/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kde4-runtime/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kde4-workspace/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kde4-workspace/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kde4/Makefile b/x11/kde4/Makefile
index bea6b9018e14..162e065022fa 100644
--- a/x11/kde4/Makefile
+++ b/x11/kde4/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= kde
-PORTVERSION= 2.2
+PORTVERSION= 2.2.1
CATEGORIES= x11 kde
MASTER_SITES= # empty
DISTFILES= # none
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase2/distinfo b/x11/kdebase2/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kdebase2/distinfo
+++ b/x11/kdebase2/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kdebase2/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kdebase2/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kdebase2/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kdebase2/pkg-plist b/x11/kdebase2/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kdebase2/pkg-plist
+++ b/x11/kdebase2/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kdebase3/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kdebase3/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kdebase3/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kdebase4-runtime/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 1c3645a48843..a78f50c90742 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdebase
-PORTVERSION= 2.2
-PORTREVISION= 2
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index acffeec39966..f0d9e99b49aa 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdebase-2.2.tar.bz2) = 15e0232aa73029ac10346157b6eb079b
+MD5 (KDE/kdebase-2.2.1.tar.bz2) = 14c7e9a73f5b60c6b4ed7c14acbfb69a
diff --git a/x11/kdebase4/files/patch-kdm::kfrontend::genkdmconf.c b/x11/kdebase4/files/patch-kdm::kfrontend::genkdmconf.c
new file mode 100644
index 000000000000..84fdeaf99ba2
--- /dev/null
+++ b/x11/kdebase4/files/patch-kdm::kfrontend::genkdmconf.c
@@ -0,0 +1,29 @@
+--- kdm/kfrontend/genkdmconf.c.orig Wed Sep 5 08:15:47 2001
++++ kdm/kfrontend/genkdmconf.c Tue Oct 23 04:04:22 2001
+@@ -212,7 +212,7 @@
+ */
+
+ #ifndef HALT_CMD
+-# ifdef BSD
++# if defined(BSD) || defined(__FreeBSD__)
+ # define HALT_CMD "/sbin/shutdown -h now"
+ # define REBOOT_CMD "/sbin/shutdown -r now"
+ # elif defined(__SVR4)
+@@ -1606,7 +1606,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -a -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
+@@ -1628,7 +1628,7 @@
+ #endif
+ "\n"
+ "#exec sessreg -d -l $DISPLAY "
+-#ifdef BSD
++#if defined(BSD) || defined(__FreeBSD__)
+ "-x " KDMCONF "/Xservers "
+ #endif
+ "$USER\n"
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 5f31cba960b3..4a0f4994bf3a 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -787,6 +787,8 @@ share/apps/kcmkeys/standard/app-unix3.kksrc
share/apps/kcmkeys/standard/app-win3.kksrc
share/apps/kcmlocale/pics/background.png
share/apps/kcmusb/usb.ids
+share/apps/kconf_update/klipper-1-2.pl
+share/apps/kconf_update/klipperrc.upd
share/apps/kconf_update/konsole.upd
share/apps/kcontrol/kcontrolui.rc
share/apps/kcontrol/pics/energybig.png
@@ -1282,7 +1284,13 @@ share/config/imsmaprc
share/config/interferencerc
share/config/kdesktop_custom_menu1
share/config/kdesktop_custom_menu2
-share/config/kdm/README
+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/klipperrc
share/config/konqsidebartng.rc
@@ -1380,14 +1388,149 @@ share/doc/HTML/en/kcontrol/thememgr.docbook
share/doc/HTML/en/kdebugdialog/common
share/doc/HTML/en/kdebugdialog/index.cache.bz2
share/doc/HTML/en/kdebugdialog/index.docbook
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter-2.png
+share/doc/HTML/en/kdeprint/KDE-printingmanager-im-controlcenter.png
+share/doc/HTML/en/kdeprint/PPD-options-for-HP8100mopier.png
+share/doc/HTML/en/kdeprint/PPD-options-for-infotecP450.png
+share/doc/HTML/en/kdeprint/PrintQueue-KJobViewer.png
+share/doc/HTML/en/kdeprint/add-printer-wizard-confirmation-1.png
+share/doc/HTML/en/kdeprint/big-ppd-esppp-gui.png
share/doc/HTML/en/kdeprint/common
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-50Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio-70Percent-scaled.png
+share/doc/HTML/en/kdeprint/cups-filterarchitecture-kivio.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-2.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-3.png
+share/doc/HTML/en/kdeprint/cups-server-configuration-4.png
+share/doc/HTML/en/kdeprint/cups-server-configuration.png
+share/doc/HTML/en/kdeprint/cupsaddpostscriptprinter_fromcommandline.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard1.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard2_backendselection.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard3_networkscan_results.png
share/doc/HTML/en/kdeprint/cupsaddprinterwizard4_networkscan_config.png
+share/doc/HTML/en/kdeprint/cupsaddprinterwizard5_networkscan_SMBresults.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_broadcastaddress_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browse_relay_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browserelay_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browseinterval_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsetimeouts_browsetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseaddress_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browsepoll_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingconnection_browseport_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browseshortnames_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_browsingonoff_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsinggeneral_implicitclasses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_add_button.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseallowdeny_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_browsingmasks_browseorder_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalive_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_keepalivetimeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkclients_maxclients_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_hostnamelookups_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_maxrequestsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_portsaddresses_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_networkgeneral_timeout_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_accesspermissions_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_allowfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authclass_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authgroupname_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_authtype_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_denyfrom_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_encryption_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_order_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_securityconfig_systemgroup_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_data_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_executables_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_fontpath_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_requestroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_serverroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_temdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverdirectories_tempdir_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_servercertificate_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverencryptionconfig_serverkey_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_group_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_remoteroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_serveradmin_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_servername_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servergeneral_user_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultcharset_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_defaultlanguage.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverhttpconfig_documenttroot_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_accesslog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_errorlog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_loglevel_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_maxlogsize_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_serverlogging_pagelog_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_filterlimit_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservehistory_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_preservejobfiles_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_printcap_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfig_servermiscellaneous_ripcache_blurb.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration10_browsinggeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingconnections.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration11_browsingmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration12_browsingtimeouts.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration14_browsingrelay.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15a_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15b_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration15c_resourceallprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration1_welcome.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration2_general.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration3_logging.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration4_directories.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration5_HTTP.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration6_encryption.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration7_miscellanious.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration8_networkgeneral.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration9_networkclients.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaccessmasks.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminaddprinters_defineaccess.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_resourceadminauthorization.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview.png
+share/doc/HTML/en/kdeprint/cupsserverconfiguration_securityoverview1.png
+share/doc/HTML/en/kdeprint/hi32-action-wizard.png
+share/doc/HTML/en/kdeprint/iconview-printerwindow.png
share/doc/HTML/en/kdeprint/index.cache.bz2
share/doc/HTML/en/kdeprint/index.docbook
+share/doc/HTML/en/kdeprint/info-tab.png
+share/doc/HTML/en/kdeprint/ipp-scan-result-1.png
+share/doc/HTML/en/kdeprint/kcontrol-icon.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol-2.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-jobcontrol.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-spartanicview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printmanager-toolbarplusinfoview.png
+share/doc/HTML/en/kdeprint/kcontrolcenter-printsystem.png
+share/doc/HTML/en/kdeprint/kcron_to_be_printed.png
+share/doc/HTML/en/kdeprint/kdeprint-jobviewer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_class_stopped.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_remote.png
+share/doc/HTML/en/kdeprint/kdeprint_printer_stopped.png
+share/doc/HTML/en/kdeprint/kprinter-as-netscape-printcommand.png
+share/doc/HTML/en/kdeprint/kprinter-dialog.png
+share/doc/HTML/en/kdeprint/kprinter-fonts.png
+share/doc/HTML/en/kdeprint/kprinter-kivio.png
+share/doc/HTML/en/kdeprint/kprinter.png
+share/doc/HTML/en/kdeprint/kprinter_called_from_run_command.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special.png
+share/doc/HTML/en/kdeprint/kprinter_with_kcron_developer_special_nodeco.png
+share/doc/HTML/en/kdeprint/printericons-meanings.png
+share/doc/HTML/en/kdeprint/ps-boxes.png
+share/doc/HTML/en/kdeprint/selecting-printingsystem.png
+share/doc/HTML/en/kdeprint/smb-scan-result-2.png
+share/doc/HTML/en/kdeprint/smb-scan-result-3.png
+share/doc/HTML/en/kdeprint/steinbruch.png
+share/doc/HTML/en/kdeprint/steinbruch_scaled.png
+share/doc/HTML/en/kdeprint/taskbar-icons.png
+share/doc/HTML/en/kdeprint/test_size_withdecoration.png
+share/doc/HTML/en/kdeprint/test_size_without_decoration.png
+share/doc/HTML/en/kdeprint/xpp-fonts.png
share/doc/HTML/en/kdesu/common
share/doc/HTML/en/kdesu/index.cache.bz2
share/doc/HTML/en/kdesu/index.docbook
@@ -1560,8 +1703,6 @@ share/doc/HTML/en/kwrite/index.docbook
share/fonts/9x15.pcf.gz
share/fonts/console8x16.pcf.gz
share/fonts/console8x8.pcf.gz
-share/fonts/fonts.dir
-share/fonts/override/fonts.dir
share/icons/hicolor/16x16/actions/view_choose.png
share/icons/hicolor/16x16/actions/view_detailed.png
share/icons/hicolor/16x16/actions/view_icon.png
@@ -1951,9 +2092,7 @@ share/icons/hicolor/48x48/apps/xv.png
share/icons/hicolor/48x48/filesystems/file_important.png
share/icons/hicolor/48x48/filesystems/folder_important.png
share/icons/locolor/16x16/apps/bell.png
-share/icons/licolor/16x16/apps/gvim.png
share/icons/locolor/32x32/apps/bell.png
-share/icons/locolor/32x32/apps/gvim.png
share/locale/C/entry.desktop
share/locale/C/flag.png
share/locale/l10n/C/entry.desktop
@@ -2586,7 +2725,6 @@ share/wallpapers/vegetative_fog.jpg
@dirrm share/apps/clockapplet
@dirrm share/applnk/ksysguard
@dirrm share/applnk/WordProcessing
-@dirrm share/applnk/Utilities/XUtilities
@dirrm share/applnk/Utilities
@dirrm share/applnk/Toys
@dirrm share/applnk/System/Terminal
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 9a50eec2f8de..2fe7dd86c537 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.2
-PORTREVISION= 3
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -33,7 +32,7 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \
- --enable-debug --disable-final
+ --disable-final
.if ${MACHINE_ARCH} == "alpha"
CFLAGS= -O0 ${KDE_CFLAGS}
diff --git a/x11/kdelibs2/distinfo b/x11/kdelibs2/distinfo
index 14bb38169a46..0fe3f4482c9a 100644
--- a/x11/kdelibs2/distinfo
+++ b/x11/kdelibs2/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-2.2.tar.bz2) = 2aca0c00143f4f7bc1ee7afdbe892912
+MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f
diff --git a/x11/kdelibs2/files/patch-netsupp.cpp b/x11/kdelibs2/files/patch-netsupp.cpp
deleted file mode 100644
index d6c285747933..000000000000
--- a/x11/kdelibs2/files/patch-netsupp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdecore/netsupp.cpp.orig Thu Aug 16 17:00:37 2001
-+++ kdecore/netsupp.cpp Thu Aug 16 16:52:30 2001
-@@ -781,7 +781,7 @@
- if (name != NULL && ((*name == '*' && name[1] == '\0') || *name == '\0'))
- name = NULL;
- // Treat service of "*" as NULL, which I guess means no port (0)
-- if (serv != NULL && (*serv == '*' && serv[1] == '\0') || *serv == '\0')
-+ if (serv != NULL && ((*serv == '*' && serv[1] == '\0') || *serv == '\0'))
- serv = NULL;
-
- if (name == NULL && serv == NULL) // what the hell do you want?
diff --git a/x11/kdelibs2/pkg-plist b/x11/kdelibs2/pkg-plist
index 3a6791c60a8d..990f3f257b84 100644
--- a/x11/kdelibs2/pkg-plist
+++ b/x11/kdelibs2/pkg-plist
@@ -556,6 +556,9 @@ lib/libartscbackend.so.0
lib/libartsdsp.la
lib/libartsdsp.so
lib/libartsdsp.so.0
+lib/libartsdsp_st.la
+lib/libartsdsp_st.so
+lib/libartsdsp_st.so.0
lib/libartsflow.la
lib/libartsflow.so
lib/libartsflow.so.0
@@ -1006,20 +1009,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/nl/lang.entities
share/apps/ksgmltools2/customization/nl/strings.entities
share/apps/ksgmltools2/customization/nl/user.entities
-share/apps/ksgmltools2/customization/no-NY/catalog
-share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/no-NY/lang.entities
-share/apps/ksgmltools2/customization/no-NY/strings.entities
-share/apps/ksgmltools2/customization/no-NY/user.entities
share/apps/ksgmltools2/customization/no/catalog
share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
@@ -1034,6 +1023,20 @@ share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
share/apps/ksgmltools2/customization/no/lang.entities
share/apps/ksgmltools2/customization/no/strings.entities
share/apps/ksgmltools2/customization/no/user.entities
+share/apps/ksgmltools2/customization/no-NY/catalog
+share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/no-NY/lang.entities
+share/apps/ksgmltools2/customization/no-NY/strings.entities
+share/apps/ksgmltools2/customization/no-NY/user.entities
share/apps/ksgmltools2/customization/pl/catalog
share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
@@ -1048,20 +1051,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pl/lang.entities
share/apps/ksgmltools2/customization/pl/strings.entities
share/apps/ksgmltools2/customization/pl/user.entities
-share/apps/ksgmltools2/customization/pt-BR/catalog
-share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/pt-BR/lang.entities
-share/apps/ksgmltools2/customization/pt-BR/strings.entities
-share/apps/ksgmltools2/customization/pt-BR/user.entities
share/apps/ksgmltools2/customization/pt/catalog
share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
@@ -1076,6 +1065,20 @@ share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pt/lang.entities
share/apps/ksgmltools2/customization/pt/strings.entities
share/apps/ksgmltools2/customization/pt/user.entities
+share/apps/ksgmltools2/customization/pt-BR/catalog
+share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/pt-BR/lang.entities
+share/apps/ksgmltools2/customization/pt-BR/strings.entities
+share/apps/ksgmltools2/customization/pt-BR/user.entities
share/apps/ksgmltools2/customization/ro/catalog
share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook
@@ -2684,15 +2687,15 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/ksgmltools2/customization/ru
@dirrm share/apps/ksgmltools2/customization/ro/entities
@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt
@dirrm share/apps/ksgmltools2/customization/pl/entities
@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no-NY/entities
@dirrm share/apps/ksgmltools2/customization/no-NY
+@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nl/entities
@dirrm share/apps/ksgmltools2/customization/nl
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 9a50eec2f8de..2fe7dd86c537 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.2
-PORTREVISION= 3
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -33,7 +32,7 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \
- --enable-debug --disable-final
+ --disable-final
.if ${MACHINE_ARCH} == "alpha"
CFLAGS= -O0 ${KDE_CFLAGS}
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 14bb38169a46..0fe3f4482c9a 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-2.2.tar.bz2) = 2aca0c00143f4f7bc1ee7afdbe892912
+MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 3a6791c60a8d..990f3f257b84 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -556,6 +556,9 @@ lib/libartscbackend.so.0
lib/libartsdsp.la
lib/libartsdsp.so
lib/libartsdsp.so.0
+lib/libartsdsp_st.la
+lib/libartsdsp_st.so
+lib/libartsdsp_st.so.0
lib/libartsflow.la
lib/libartsflow.so
lib/libartsflow.so.0
@@ -1006,20 +1009,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/nl/lang.entities
share/apps/ksgmltools2/customization/nl/strings.entities
share/apps/ksgmltools2/customization/nl/user.entities
-share/apps/ksgmltools2/customization/no-NY/catalog
-share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/no-NY/lang.entities
-share/apps/ksgmltools2/customization/no-NY/strings.entities
-share/apps/ksgmltools2/customization/no-NY/user.entities
share/apps/ksgmltools2/customization/no/catalog
share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
@@ -1034,6 +1023,20 @@ share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
share/apps/ksgmltools2/customization/no/lang.entities
share/apps/ksgmltools2/customization/no/strings.entities
share/apps/ksgmltools2/customization/no/user.entities
+share/apps/ksgmltools2/customization/no-NY/catalog
+share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/no-NY/lang.entities
+share/apps/ksgmltools2/customization/no-NY/strings.entities
+share/apps/ksgmltools2/customization/no-NY/user.entities
share/apps/ksgmltools2/customization/pl/catalog
share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
@@ -1048,20 +1051,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pl/lang.entities
share/apps/ksgmltools2/customization/pl/strings.entities
share/apps/ksgmltools2/customization/pl/user.entities
-share/apps/ksgmltools2/customization/pt-BR/catalog
-share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/pt-BR/lang.entities
-share/apps/ksgmltools2/customization/pt-BR/strings.entities
-share/apps/ksgmltools2/customization/pt-BR/user.entities
share/apps/ksgmltools2/customization/pt/catalog
share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
@@ -1076,6 +1065,20 @@ share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pt/lang.entities
share/apps/ksgmltools2/customization/pt/strings.entities
share/apps/ksgmltools2/customization/pt/user.entities
+share/apps/ksgmltools2/customization/pt-BR/catalog
+share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/pt-BR/lang.entities
+share/apps/ksgmltools2/customization/pt-BR/strings.entities
+share/apps/ksgmltools2/customization/pt-BR/user.entities
share/apps/ksgmltools2/customization/ro/catalog
share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook
@@ -2684,15 +2687,15 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/ksgmltools2/customization/ru
@dirrm share/apps/ksgmltools2/customization/ro/entities
@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt
@dirrm share/apps/ksgmltools2/customization/pl/entities
@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no-NY/entities
@dirrm share/apps/ksgmltools2/customization/no-NY
+@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nl/entities
@dirrm share/apps/ksgmltools2/customization/nl
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 9a50eec2f8de..2fe7dd86c537 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= kdelibs
-PORTVERSION= 2.2
-PORTREVISION= 3
+PORTVERSION= 2.2.1
CATEGORIES?= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
@@ -33,7 +32,7 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--enable-cups --disable-ltdl-install \
- --enable-debug --disable-final
+ --disable-final
.if ${MACHINE_ARCH} == "alpha"
CFLAGS= -O0 ${KDE_CFLAGS}
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 14bb38169a46..0fe3f4482c9a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdelibs-2.2.tar.bz2) = 2aca0c00143f4f7bc1ee7afdbe892912
+MD5 (KDE/kdelibs-2.2.1.tar.bz2) = 3aa73b3fe7095b3bab3081bece73f56f
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 3a6791c60a8d..990f3f257b84 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -556,6 +556,9 @@ lib/libartscbackend.so.0
lib/libartsdsp.la
lib/libartsdsp.so
lib/libartsdsp.so.0
+lib/libartsdsp_st.la
+lib/libartsdsp_st.so
+lib/libartsdsp_st.so.0
lib/libartsflow.la
lib/libartsflow.so
lib/libartsflow.so.0
@@ -1006,20 +1009,6 @@ share/apps/ksgmltools2/customization/nl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/nl/lang.entities
share/apps/ksgmltools2/customization/nl/strings.entities
share/apps/ksgmltools2/customization/nl/user.entities
-share/apps/ksgmltools2/customization/no-NY/catalog
-share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/no-NY/lang.entities
-share/apps/ksgmltools2/customization/no-NY/strings.entities
-share/apps/ksgmltools2/customization/no-NY/user.entities
share/apps/ksgmltools2/customization/no/catalog
share/apps/ksgmltools2/customization/no/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/no/entities/gpl-notice.docbook
@@ -1034,6 +1023,20 @@ share/apps/ksgmltools2/customization/no/entities/update-doc.docbook
share/apps/ksgmltools2/customization/no/lang.entities
share/apps/ksgmltools2/customization/no/strings.entities
share/apps/ksgmltools2/customization/no/user.entities
+share/apps/ksgmltools2/customization/no-NY/catalog
+share/apps/ksgmltools2/customization/no-NY/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/no-NY/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/no-NY/lang.entities
+share/apps/ksgmltools2/customization/no-NY/strings.entities
+share/apps/ksgmltools2/customization/no-NY/user.entities
share/apps/ksgmltools2/customization/pl/catalog
share/apps/ksgmltools2/customization/pl/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pl/entities/gpl-notice.docbook
@@ -1048,20 +1051,6 @@ share/apps/ksgmltools2/customization/pl/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pl/lang.entities
share/apps/ksgmltools2/customization/pl/strings.entities
share/apps/ksgmltools2/customization/pl/user.entities
-share/apps/ksgmltools2/customization/pt-BR/catalog
-share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
-share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
-share/apps/ksgmltools2/customization/pt-BR/lang.entities
-share/apps/ksgmltools2/customization/pt-BR/strings.entities
-share/apps/ksgmltools2/customization/pt-BR/user.entities
share/apps/ksgmltools2/customization/pt/catalog
share/apps/ksgmltools2/customization/pt/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/pt/entities/gpl-notice.docbook
@@ -1076,6 +1065,20 @@ share/apps/ksgmltools2/customization/pt/entities/update-doc.docbook
share/apps/ksgmltools2/customization/pt/lang.entities
share/apps/ksgmltools2/customization/pt/strings.entities
share/apps/ksgmltools2/customization/pt/user.entities
+share/apps/ksgmltools2/customization/pt-BR/catalog
+share/apps/ksgmltools2/customization/pt-BR/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/pt-BR/lang.entities
+share/apps/ksgmltools2/customization/pt-BR/strings.entities
+share/apps/ksgmltools2/customization/pt-BR/user.entities
share/apps/ksgmltools2/customization/ro/catalog
share/apps/ksgmltools2/customization/ro/entities/fdl-notice.docbook
share/apps/ksgmltools2/customization/ro/entities/gpl-notice.docbook
@@ -2684,15 +2687,15 @@ share/servicetypes/kurifilterplugin.desktop
@dirrm share/apps/ksgmltools2/customization/ru
@dirrm share/apps/ksgmltools2/customization/ro/entities
@dirrm share/apps/ksgmltools2/customization/ro
-@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR/entities
@dirrm share/apps/ksgmltools2/customization/pt-BR
+@dirrm share/apps/ksgmltools2/customization/pt/entities
@dirrm share/apps/ksgmltools2/customization/pt
@dirrm share/apps/ksgmltools2/customization/pl/entities
@dirrm share/apps/ksgmltools2/customization/pl
-@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no-NY/entities
@dirrm share/apps/ksgmltools2/customization/no-NY
+@dirrm share/apps/ksgmltools2/customization/no/entities
@dirrm share/apps/ksgmltools2/customization/no
@dirrm share/apps/ksgmltools2/customization/nl/entities
@dirrm share/apps/ksgmltools2/customization/nl