Upgrade to 2.2.1.

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

6 files changed, 86 insertions, 84 deletions

diff --git a/x11-themes/kdeartwork3/Makefile b/x11-themes/kdeartwork3/Makefile
index 536c9657a2aa..ce3224202514 100644
--- a/x11-themes/kdeartwork3/Makefile
+++ b/x11-themes/kdeartwork3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeartwork
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11-themes/kdeartwork3/distinfo b/x11-themes/kdeartwork3/distinfo
index db64e1750807..c828bdddabbe 100644
--- a/x11-themes/kdeartwork3/distinfo
+++ b/x11-themes/kdeartwork3/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-2.2.tar.bz2) = d7b9fc0714f222729d12653f766e08de
+MD5 (KDE/kdeartwork-2.2.1.tar.bz2) = 5ff35f2bb8956ac518993f55854cb5eb
diff --git a/x11-themes/kdeartwork3/pkg-plist b/x11-themes/kdeartwork3/pkg-plist
index f29bdee0a0cc..d456939d81b1 100644
--- a/x11-themes/kdeartwork3/pkg-plist
+++ b/x11-themes/kdeartwork3/pkg-plist
@@ -1,49 +1,15 @@
-lib/b3style.so
 lib/b3style.la
-lib/ksgistyle.so
+lib/b3style.so
 lib/ksgistyle.la
-lib/kstephighcolor.so
+lib/ksgistyle.so
 lib/kstephighcolor.la
+lib/kstephighcolor.so
 share/apps/kstyle/themes/b3.themerc
 share/apps/kstyle/themes/ksgistyle.themerc
 share/apps/kstyle/themes/kstep-highcolor.themerc
-share/apps/kwin/icewm-themes/Model/closeA.xpm
-share/apps/kwin/icewm-themes/Model/closeI.xpm
-share/apps/kwin/icewm-themes/Model/frameAB.xpm
-share/apps/kwin/icewm-themes/Model/frameABL.xpm
-share/apps/kwin/icewm-themes/Model/frameABR.xpm
-share/apps/kwin/icewm-themes/Model/frameAL.xpm
-share/apps/kwin/icewm-themes/Model/frameAR.xpm
-share/apps/kwin/icewm-themes/Model/frameAT.xpm
-share/apps/kwin/icewm-themes/Model/frameATL.xpm
-share/apps/kwin/icewm-themes/Model/frameATR.xpm
-share/apps/kwin/icewm-themes/Model/frameIB.xpm
-share/apps/kwin/icewm-themes/Model/frameIBL.xpm
-share/apps/kwin/icewm-themes/Model/frameIBR.xpm
-share/apps/kwin/icewm-themes/Model/frameIL.xpm
-share/apps/kwin/icewm-themes/Model/frameIR.xpm
-share/apps/kwin/icewm-themes/Model/frameIT.xpm
-share/apps/kwin/icewm-themes/Model/frameITL.xpm
-share/apps/kwin/icewm-themes/Model/frameITR.xpm
-share/apps/kwin/icewm-themes/Model/maximizeA.xpm
-share/apps/kwin/icewm-themes/Model/maximizeI.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonA.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonI.xpm
-share/apps/kwin/icewm-themes/Model/minimizeA.xpm
-share/apps/kwin/icewm-themes/Model/minimizeI.xpm
-share/apps/kwin/icewm-themes/Model/restoreA.xpm
-share/apps/kwin/icewm-themes/Model/restoreI.xpm
-share/apps/kwin/icewm-themes/Model/titleAB.xpm
-share/apps/kwin/icewm-themes/Model/titleAL.xpm
-share/apps/kwin/icewm-themes/Model/titleAM.xpm
-share/apps/kwin/icewm-themes/Model/titleAT.xpm
-share/apps/kwin/icewm-themes/Model/titleIB.xpm
-share/apps/kwin/icewm-themes/Model/titleIL.xpm
-share/apps/kwin/icewm-themes/Model/titleIM.xpm
-share/apps/kwin/icewm-themes/Model/titleIT.xpm
-share/apps/kwin/icewm-themes/Model/default.theme
 share/apps/kwin/icewm-themes/MenschMaschine/closeA.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/closeI.xpm
+share/apps/kwin/icewm-themes/MenschMaschine/default.theme
 share/apps/kwin/icewm-themes/MenschMaschine/frameAB.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/frameABL.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/frameABR.xpm
@@ -78,9 +44,44 @@ share/apps/kwin/icewm-themes/MenschMaschine/titleIL.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/titleIM.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/titleIR.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/titleIT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/default.theme
+share/apps/kwin/icewm-themes/Model/closeA.xpm
+share/apps/kwin/icewm-themes/Model/closeI.xpm
+share/apps/kwin/icewm-themes/Model/default.theme
+share/apps/kwin/icewm-themes/Model/frameAB.xpm
+share/apps/kwin/icewm-themes/Model/frameABL.xpm
+share/apps/kwin/icewm-themes/Model/frameABR.xpm
+share/apps/kwin/icewm-themes/Model/frameAL.xpm
+share/apps/kwin/icewm-themes/Model/frameAR.xpm
+share/apps/kwin/icewm-themes/Model/frameAT.xpm
+share/apps/kwin/icewm-themes/Model/frameATL.xpm
+share/apps/kwin/icewm-themes/Model/frameATR.xpm
+share/apps/kwin/icewm-themes/Model/frameIB.xpm
+share/apps/kwin/icewm-themes/Model/frameIBL.xpm
+share/apps/kwin/icewm-themes/Model/frameIBR.xpm
+share/apps/kwin/icewm-themes/Model/frameIL.xpm
+share/apps/kwin/icewm-themes/Model/frameIR.xpm
+share/apps/kwin/icewm-themes/Model/frameIT.xpm
+share/apps/kwin/icewm-themes/Model/frameITL.xpm
+share/apps/kwin/icewm-themes/Model/frameITR.xpm
+share/apps/kwin/icewm-themes/Model/maximizeA.xpm
+share/apps/kwin/icewm-themes/Model/maximizeI.xpm
+share/apps/kwin/icewm-themes/Model/menuButtonA.xpm
+share/apps/kwin/icewm-themes/Model/menuButtonI.xpm
+share/apps/kwin/icewm-themes/Model/minimizeA.xpm
+share/apps/kwin/icewm-themes/Model/minimizeI.xpm
+share/apps/kwin/icewm-themes/Model/restoreA.xpm
+share/apps/kwin/icewm-themes/Model/restoreI.xpm
+share/apps/kwin/icewm-themes/Model/titleAB.xpm
+share/apps/kwin/icewm-themes/Model/titleAL.xpm
+share/apps/kwin/icewm-themes/Model/titleAM.xpm
+share/apps/kwin/icewm-themes/Model/titleAT.xpm
+share/apps/kwin/icewm-themes/Model/titleIB.xpm
+share/apps/kwin/icewm-themes/Model/titleIL.xpm
+share/apps/kwin/icewm-themes/Model/titleIM.xpm
+share/apps/kwin/icewm-themes/Model/titleIT.xpm
 share/sounds/KDE_Logout_new.wav
 share/sounds/KDE_Startup_new.wav
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
 @dirrm share/apps/kwin/icewm-themes/Model
+@dirrm share/apps/kwin/icewm-themes/MenschMaschine
 @dirrm share/apps/kwin/icewm-themes
+@dirrm share/apps/kwin
diff --git a/x11-themes/kdeartwork4/Makefile b/x11-themes/kdeartwork4/Makefile
index 536c9657a2aa..ce3224202514 100644
--- a/x11-themes/kdeartwork4/Makefile
+++ b/x11-themes/kdeartwork4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdeartwork
-PORTVERSION=	2.2
+PORTVERSION=	2.2.1
 CATEGORIES=	x11-wm kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index db64e1750807..c828bdddabbe 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1 +1 @@
-MD5 (KDE/kdeartwork-2.2.tar.bz2) = d7b9fc0714f222729d12653f766e08de
+MD5 (KDE/kdeartwork-2.2.1.tar.bz2) = 5ff35f2bb8956ac518993f55854cb5eb
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist
index f29bdee0a0cc..d456939d81b1 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-themes/kdeartwork4/pkg-plist
@@ -1,49 +1,15 @@
-lib/b3style.so
 lib/b3style.la
-lib/ksgistyle.so
+lib/b3style.so
 lib/ksgistyle.la
-lib/kstephighcolor.so
+lib/ksgistyle.so
 lib/kstephighcolor.la
+lib/kstephighcolor.so
 share/apps/kstyle/themes/b3.themerc
 share/apps/kstyle/themes/ksgistyle.themerc
 share/apps/kstyle/themes/kstep-highcolor.themerc
-share/apps/kwin/icewm-themes/Model/closeA.xpm
-share/apps/kwin/icewm-themes/Model/closeI.xpm
-share/apps/kwin/icewm-themes/Model/frameAB.xpm
-share/apps/kwin/icewm-themes/Model/frameABL.xpm
-share/apps/kwin/icewm-themes/Model/frameABR.xpm
-share/apps/kwin/icewm-themes/Model/frameAL.xpm
-share/apps/kwin/icewm-themes/Model/frameAR.xpm
-share/apps/kwin/icewm-themes/Model/frameAT.xpm
-share/apps/kwin/icewm-themes/Model/frameATL.xpm
-share/apps/kwin/icewm-themes/Model/frameATR.xpm
-share/apps/kwin/icewm-themes/Model/frameIB.xpm
-share/apps/kwin/icewm-themes/Model/frameIBL.xpm
-share/apps/kwin/icewm-themes/Model/frameIBR.xpm
-share/apps/kwin/icewm-themes/Model/frameIL.xpm
-share/apps/kwin/icewm-themes/Model/frameIR.xpm
-share/apps/kwin/icewm-themes/Model/frameIT.xpm
-share/apps/kwin/icewm-themes/Model/frameITL.xpm
-share/apps/kwin/icewm-themes/Model/frameITR.xpm
-share/apps/kwin/icewm-themes/Model/maximizeA.xpm
-share/apps/kwin/icewm-themes/Model/maximizeI.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonA.xpm
-share/apps/kwin/icewm-themes/Model/menuButtonI.xpm
-share/apps/kwin/icewm-themes/Model/minimizeA.xpm
-share/apps/kwin/icewm-themes/Model/minimizeI.xpm
-share/apps/kwin/icewm-themes/Model/restoreA.xpm
-share/apps/kwin/icewm-themes/Model/restoreI.xpm
-share/apps/kwin/icewm-themes/Model/titleAB.xpm
-share/apps/kwin/icewm-themes/Model/titleAL.xpm
-share/apps/kwin/icewm-themes/Model/titleAM.xpm
-share/apps/kwin/icewm-themes/Model/titleAT.xpm
-share/apps/kwin/icewm-themes/Model/titleIB.xpm
-share/apps/kwin/icewm-themes/Model/titleIL.xpm
-share/apps/kwin/icewm-themes/Model/titleIM.xpm
-share/apps/kwin/icewm-themes/Model/titleIT.xpm
-share/apps/kwin/icewm-themes/Model/default.theme
 share/apps/kwin/icewm-themes/MenschMaschine/closeA.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/closeI.xpm
+share/apps/kwin/icewm-themes/MenschMaschine/default.theme
 share/apps/kwin/icewm-themes/MenschMaschine/frameAB.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/frameABL.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/frameABR.xpm
@@ -78,9 +44,44 @@ share/apps/kwin/icewm-themes/MenschMaschine/titleIL.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/titleIM.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/titleIR.xpm
 share/apps/kwin/icewm-themes/MenschMaschine/titleIT.xpm
-share/apps/kwin/icewm-themes/MenschMaschine/default.theme
+share/apps/kwin/icewm-themes/Model/closeA.xpm
+share/apps/kwin/icewm-themes/Model/closeI.xpm
+share/apps/kwin/icewm-themes/Model/default.theme
+share/apps/kwin/icewm-themes/Model/frameAB.xpm
+share/apps/kwin/icewm-themes/Model/frameABL.xpm
+share/apps/kwin/icewm-themes/Model/frameABR.xpm
+share/apps/kwin/icewm-themes/Model/frameAL.xpm
+share/apps/kwin/icewm-themes/Model/frameAR.xpm
+share/apps/kwin/icewm-themes/Model/frameAT.xpm
+share/apps/kwin/icewm-themes/Model/frameATL.xpm
+share/apps/kwin/icewm-themes/Model/frameATR.xpm
+share/apps/kwin/icewm-themes/Model/frameIB.xpm
+share/apps/kwin/icewm-themes/Model/frameIBL.xpm
+share/apps/kwin/icewm-themes/Model/frameIBR.xpm
+share/apps/kwin/icewm-themes/Model/frameIL.xpm
+share/apps/kwin/icewm-themes/Model/frameIR.xpm
+share/apps/kwin/icewm-themes/Model/frameIT.xpm
+share/apps/kwin/icewm-themes/Model/frameITL.xpm
+share/apps/kwin/icewm-themes/Model/frameITR.xpm
+share/apps/kwin/icewm-themes/Model/maximizeA.xpm
+share/apps/kwin/icewm-themes/Model/maximizeI.xpm
+share/apps/kwin/icewm-themes/Model/menuButtonA.xpm
+share/apps/kwin/icewm-themes/Model/menuButtonI.xpm
+share/apps/kwin/icewm-themes/Model/minimizeA.xpm
+share/apps/kwin/icewm-themes/Model/minimizeI.xpm
+share/apps/kwin/icewm-themes/Model/restoreA.xpm
+share/apps/kwin/icewm-themes/Model/restoreI.xpm
+share/apps/kwin/icewm-themes/Model/titleAB.xpm
+share/apps/kwin/icewm-themes/Model/titleAL.xpm
+share/apps/kwin/icewm-themes/Model/titleAM.xpm
+share/apps/kwin/icewm-themes/Model/titleAT.xpm
+share/apps/kwin/icewm-themes/Model/titleIB.xpm
+share/apps/kwin/icewm-themes/Model/titleIL.xpm
+share/apps/kwin/icewm-themes/Model/titleIM.xpm
+share/apps/kwin/icewm-themes/Model/titleIT.xpm
 share/sounds/KDE_Logout_new.wav
 share/sounds/KDE_Startup_new.wav
-@dirrm share/apps/kwin/icewm-themes/MenschMaschine
 @dirrm share/apps/kwin/icewm-themes/Model
+@dirrm share/apps/kwin/icewm-themes/MenschMaschine
 @dirrm share/apps/kwin/icewm-themes
+@dirrm share/apps/kwin