Upgrade to 2.2.1.

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

15 files changed, 55 insertions, 90 deletions

diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 2960df37148f..42d7e7fffe93 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeutils
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES?=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index bdd12d90fd29..562818721e98 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeutils-2.2.tar.bz2) = 2ee57c259669232cb301359fb9000d08
+MD5 (KDE/kdeutils-2.2.1.tar.bz2) = a511f6be6949d5b1c2f943f3f9ce27a5
diff --git a/deskutils/kcharselect/pkg-plist b/deskutils/kcharselect/pkg-plist
index ae31b3d6f094..451d3587f1ef 100644
--- a/deskutils/kcharselect/pkg-plist
+++ b/deskutils/kcharselect/pkg-plist
@@ -245,7 +245,10 @@ share/icons/locolor/16x16/apps/klprfax.png
 share/icons/locolor/32x32/apps/klprfax.png
 share/services/arkpart.desktop
 @dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/16x16/apps
@@ -280,11 +283,16 @@ share/services/arkpart.desktop
 @dirrm share/apps/kjots/pics
 @dirrm share/apps/kjots
 @dirrm share/apps/kicker/applets
+@dirrm share/apps/kicker
 @dirrm share/apps/khexedit/toolbar
 @dirrm share/apps/khexedit
 @dirrm share/apps/kfloppy/pics
 @dirrm share/apps/kfloppy
 @dirrm share/apps/kfind/icons/locolor/22x22/actions
+@dirrm share/apps/kfind/icons/locolor/22x22
+@dirrm share/apps/kfind/icons/locolor
+@dirrm share/apps/kfind/icons
+@dirrm share/apps/kfind
 @dirrm share/apps/kedit
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
@@ -305,6 +313,7 @@ share/services/arkpart.desktop
 @dirrm share/applnk/System
 @dirrm share/applnk/Settings/PowerControl
 @dirrm share/applnk/Settings/Information
+@dirrm share/applnk/Settings
 @dirrm share/applnk/Editors
 @dirrm share/applnk
 @dirrm lib/kde2
diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile
index 6d6aa04d5f13..0e10fb385d36 100644
--- a/deskutils/kdepim/Makefile
+++ b/deskutils/kdepim/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim/distinfo b/deskutils/kdepim/distinfo
index e926ebdcfc1f..291838009c90 100644
--- a/deskutils/kdepim/distinfo
+++ b/deskutils/kdepim/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
+MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955
diff --git a/deskutils/kdepim/pkg-plist b/deskutils/kdepim/pkg-plist
index 2018b1d43fc7..c9d488388eb2 100644
--- a/deskutils/kdepim/pkg-plist
+++ b/deskutils/kdepim/pkg-plist
@@ -3,8 +3,6 @@ bin/ical2vcal
 bin/kandy
 bin/kandy_client
 bin/korganizer
-include/ical.h
-include/icalss.h
 include/kgantt/KGantt.h
 include/kgantt/KGanttBarConfig.h
 include/kgantt/KGanttItem.h
@@ -13,11 +11,6 @@ include/kgantt/xQGanttBarView.h
 include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
-include/libicalvcal/icalvcal.h
-include/libicalvcal/port.h
-include/libicalvcal/vcaltmp.h
-include/libicalvcal/vcc.h
-include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -61,18 +54,6 @@ include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
-lib/libical.a
-lib/libical.la
-lib/libical.so
-lib/libical.so.0
-lib/libicalss.a
-lib/libicalss.la
-lib/libicalss.so
-lib/libicalss.so.0
-lib/libicalvcal.a
-lib/libicalvcal.la
-lib/libicalvcal.so
-lib/libicalvcal.so.0
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.1
@@ -287,15 +268,23 @@ share/icons/hicolor/48x48/apps/korganizer.png
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions
+@dirrm share/apps/korganizer/icons/hicolor/22x22
 @dirrm share/apps/korganizer/icons/hicolor/16x16/actions
+@dirrm share/apps/korganizer/icons/hicolor/16x16
 @dirrm share/apps/korganizer/icons/hicolor
+@dirrm share/apps/korganizer/icons
 @dirrm share/apps/korganizer
 @dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/32x32
 @dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22
 @dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16
+@dirrm share/apps/kgantt/icons/hicolor
+@dirrm share/apps/kgantt/icons
+@dirrm share/apps/kgantt
 @dirrm share/apps/kandy
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Applications
 @dirrm include/rmm
-@dirrm include/libicalvcal
 @dirrm include/kgantt
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 6d6aa04d5f13..0e10fb385d36 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim3/distinfo b/deskutils/kdepim3/distinfo
index e926ebdcfc1f..291838009c90 100644
--- a/deskutils/kdepim3/distinfo
+++ b/deskutils/kdepim3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
+MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955
diff --git a/deskutils/kdepim3/pkg-plist b/deskutils/kdepim3/pkg-plist
index 2018b1d43fc7..c9d488388eb2 100644
--- a/deskutils/kdepim3/pkg-plist
+++ b/deskutils/kdepim3/pkg-plist
@@ -3,8 +3,6 @@ bin/ical2vcal
 bin/kandy
 bin/kandy_client
 bin/korganizer
-include/ical.h
-include/icalss.h
 include/kgantt/KGantt.h
 include/kgantt/KGanttBarConfig.h
 include/kgantt/KGanttItem.h
@@ -13,11 +11,6 @@ include/kgantt/xQGanttBarView.h
 include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
-include/libicalvcal/icalvcal.h
-include/libicalvcal/port.h
-include/libicalvcal/vcaltmp.h
-include/libicalvcal/vcc.h
-include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -61,18 +54,6 @@ include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
-lib/libical.a
-lib/libical.la
-lib/libical.so
-lib/libical.so.0
-lib/libicalss.a
-lib/libicalss.la
-lib/libicalss.so
-lib/libicalss.so.0
-lib/libicalvcal.a
-lib/libicalvcal.la
-lib/libicalvcal.so
-lib/libicalvcal.so.0
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.1
@@ -287,15 +268,23 @@ share/icons/hicolor/48x48/apps/korganizer.png
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions
+@dirrm share/apps/korganizer/icons/hicolor/22x22
 @dirrm share/apps/korganizer/icons/hicolor/16x16/actions
+@dirrm share/apps/korganizer/icons/hicolor/16x16
 @dirrm share/apps/korganizer/icons/hicolor
+@dirrm share/apps/korganizer/icons
 @dirrm share/apps/korganizer
 @dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/32x32
 @dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22
 @dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16
+@dirrm share/apps/kgantt/icons/hicolor
+@dirrm share/apps/kgantt/icons
+@dirrm share/apps/kgantt
 @dirrm share/apps/kandy
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Applications
 @dirrm include/rmm
-@dirrm include/libicalvcal
 @dirrm include/kgantt
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 6d6aa04d5f13..0e10fb385d36 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index e926ebdcfc1f..291838009c90 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
+MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index 2018b1d43fc7..c9d488388eb2 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -3,8 +3,6 @@ bin/ical2vcal
 bin/kandy
 bin/kandy_client
 bin/korganizer
-include/ical.h
-include/icalss.h
 include/kgantt/KGantt.h
 include/kgantt/KGanttBarConfig.h
 include/kgantt/KGanttItem.h
@@ -13,11 +11,6 @@ include/kgantt/xQGanttBarView.h
 include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
-include/libicalvcal/icalvcal.h
-include/libicalvcal/port.h
-include/libicalvcal/vcaltmp.h
-include/libicalvcal/vcc.h
-include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -61,18 +54,6 @@ include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
-lib/libical.a
-lib/libical.la
-lib/libical.so
-lib/libical.so.0
-lib/libicalss.a
-lib/libicalss.la
-lib/libicalss.so
-lib/libicalss.so.0
-lib/libicalvcal.a
-lib/libicalvcal.la
-lib/libicalvcal.so
-lib/libicalvcal.so.0
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.1
@@ -287,15 +268,23 @@ share/icons/hicolor/48x48/apps/korganizer.png
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions
+@dirrm share/apps/korganizer/icons/hicolor/22x22
 @dirrm share/apps/korganizer/icons/hicolor/16x16/actions
+@dirrm share/apps/korganizer/icons/hicolor/16x16
 @dirrm share/apps/korganizer/icons/hicolor
+@dirrm share/apps/korganizer/icons
 @dirrm share/apps/korganizer
 @dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/32x32
 @dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22
 @dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16
+@dirrm share/apps/kgantt/icons/hicolor
+@dirrm share/apps/kgantt/icons
+@dirrm share/apps/kgantt
 @dirrm share/apps/kandy
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Applications
 @dirrm include/rmm
-@dirrm include/libicalvcal
 @dirrm include/kgantt
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 6d6aa04d5f13..0e10fb385d36 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdepim
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	deskutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index e926ebdcfc1f..291838009c90 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdepim-2.2.tar.bz2) = b3fcd7e804589886596048b59e10014e
+MD5 (KDE/kdepim-2.2.1.tar.bz2) = 2b72725439279241b75c8048a79ca955
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index 2018b1d43fc7..c9d488388eb2 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -3,8 +3,6 @@ bin/ical2vcal
 bin/kandy
 bin/kandy_client
 bin/korganizer
-include/ical.h
-include/icalss.h
 include/kgantt/KGantt.h
 include/kgantt/KGanttBarConfig.h
 include/kgantt/KGanttItem.h
@@ -13,11 +11,6 @@ include/kgantt/xQGanttBarView.h
 include/kgantt/xQGanttBarViewPort.h
 include/kgantt/xQGanttListView.h
 include/kgantt/xQGanttListViewPort.h
-include/libicalvcal/icalvcal.h
-include/libicalvcal/port.h
-include/libicalvcal/vcaltmp.h
-include/libicalvcal/vcc.h
-include/libicalvcal/vobject.h
 include/rmm/Address.h
 include/rmm/AddressList.h
 include/rmm/AddressList_generated.h
@@ -61,18 +54,6 @@ include/rmm/Text.h
 include/rmm/Text_generated.h
 include/rmm/Token.h
 include/rmm/Utilities.h
-lib/libical.a
-lib/libical.la
-lib/libical.so
-lib/libical.so.0
-lib/libicalss.a
-lib/libicalss.la
-lib/libicalss.so
-lib/libicalss.so.0
-lib/libicalvcal.a
-lib/libicalvcal.la
-lib/libicalvcal.so
-lib/libicalvcal.so.0
 lib/libkcal.la
 lib/libkcal.so
 lib/libkcal.so.1
@@ -287,15 +268,23 @@ share/icons/hicolor/48x48/apps/korganizer.png
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/emptybox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions/checkedbox
 @dirrm share/apps/korganizer/icons/hicolor/22x22/actions
+@dirrm share/apps/korganizer/icons/hicolor/22x22
 @dirrm share/apps/korganizer/icons/hicolor/16x16/actions
+@dirrm share/apps/korganizer/icons/hicolor/16x16
 @dirrm share/apps/korganizer/icons/hicolor
+@dirrm share/apps/korganizer/icons
 @dirrm share/apps/korganizer
 @dirrm share/apps/kgantt/icons/hicolor/32x32/actions
+@dirrm share/apps/kgantt/icons/hicolor/32x32
 @dirrm share/apps/kgantt/icons/hicolor/22x22/actions
+@dirrm share/apps/kgantt/icons/hicolor/22x22
 @dirrm share/apps/kgantt/icons/hicolor/16x16/actions
+@dirrm share/apps/kgantt/icons/hicolor/16x16
+@dirrm share/apps/kgantt/icons/hicolor
+@dirrm share/apps/kgantt/icons
+@dirrm share/apps/kgantt
 @dirrm share/apps/kandy
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Applications
 @dirrm include/rmm
-@dirrm include/libicalvcal
 @dirrm include/kgantt