Upgrade to 2.2.1.

Submitted by:		SASAKI Katuhiro <sahiro@crest.ocn.ne.jp>
(with slight modifications)

4 files changed, 175 insertions, 9 deletions

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