18 files changed, 311 insertions, 340 deletions

diff --git a/x11-clocks/kdetoys11/Makefile b/x11-clocks/kdetoys11/Makefile
index bd0de0d6e1db..2c3d4bd12c6c 100644
--- a/x11-clocks/kdetoys11/Makefile
+++ b/x11-clocks/kdetoys11/Makefile
@@ -1,41 +1,21 @@
 # New ports collection makefile for:	kdetoys-i18n
-# Version required:	1.1.1
+# Version required:	1.1.2
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kdetoys-1.1.1
-PKGNAME=	kdetoys-i18n-1.1.1
-CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.kde.gr.jp/~imura/
-MASTER_SITES+=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
-DISTFILES=	kdetoys-1.1.1.tar.bz2 \
-		kdelnkfiles-ja-19990809.tar.bz2
+MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 
-MAINTAINER=     imura@kde.gr.jp
+CATEGORIES=	x11-clocks kde
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kfilei18n.2:${PORTSDIR}/x11/kdelibs11-i18n \
-		qti18n.2:${PORTSDIR}/x11-toolkits/qt-i18n
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11-i18n
+MAINTAINER=	imura@kde.gr.jp
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${DISTNAME}
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_NEWGCC=	yes
-CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4"
-CXXFLAGS?=	${CFLAGS}
+KDE_NAME=	kdetoys
 
-.if defined(QT_GIF_AVAILABLE)
-RESTRICTED=	requires Qt compiled with gif reading support
-.else
-FORBIDDEN=	requires Qt compiled with gif reading support
-.endif
+.include "${MASTERDIR}/Makefile"
 
-.include <bsd.port.mk>
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
diff --git a/x11-clocks/kdetoys11/distinfo b/x11-clocks/kdetoys11/distinfo
index 4b265f8a5e6e..1d075d1fe04d 100644
--- a/x11-clocks/kdetoys11/distinfo
+++ b/x11-clocks/kdetoys11/distinfo
@@ -1,2 +1 @@
-MD5 (kdetoys-1.1.1.tar.bz2) = b4124c917d2230ebfbc567f4a9e510a3
-MD5 (kdelnkfiles-ja-19990809.tar.bz2) = 72fc66f45d454a905e212a44217baf98
+MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
diff --git a/x11-clocks/kdetoys11/files/patch-ba b/x11-clocks/kdetoys11/files/patch-ba
new file mode 100644
index 000000000000..386ea82efbe2
--- /dev/null
+++ b/x11-clocks/kdetoys11/files/patch-ba
@@ -0,0 +1,39 @@
+--- kmoon/pics/Makefile.in.orig	Tue Aug 24 23:08:20 1999
++++ kmoon/pics/Makefile.in	Mon Aug 30 23:39:51 1999
+@@ -157,7 +157,7 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-pics_DATA =  	moon1.gif    moon14.gif   moon19.gif   moon22.gif   moon27.gif   	moon5.gif    moon10.gif   moon15.gif   moon23.gif   moon9.gif    	moon28.gif   moon6.gif    moon11.gif   moon16.gif   moon2.gif    	moon24.gif   moon29.gif   moon7.gif    moon12.gif   moon17.gif   	moon20.gif   moon25.gif   moon3.gif    moon8.gif    moon13.gif   	moon18.gif   moon21.gif   moon26.gif   moon4.gif    
++pics_DATA =  	moon1.xpm    moon14.xpm   moon19.xpm   moon22.xpm   moon27.xpm   	moon5.xpm    moon10.xpm   moon15.xpm   moon23.xpm   moon9.xpm    	moon28.xpm   moon6.xpm    moon11.xpm   moon16.xpm   moon2.xpm    	moon24.xpm   moon29.xpm   moon7.xpm    moon12.xpm   moon17.xpm   	moon20.xpm   moon25.xpm   moon3.xpm    moon8.xpm    moon13.xpm   	moon18.xpm   moon21.xpm   moon26.xpm   moon4.xpm    
+ 
+ 
+ picsdir = $(kde_datadir)/kmoon/pics
+@@ -177,6 +177,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
++.SUFFIXES: .gif .xpm
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kmoon/pics/Makefile
+ 
+@@ -284,6 +285,8 @@
+ mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
++.gif.xpm:
++	$(LOCALBASE)/bin/convert $< $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kmoon/kmoon.cpp.orig	Fri Aug 27 02:43:57 1999
++++ kmoon/kmoon.cpp	Fri Aug 27 02:44:12 1999
+@@ -97,7 +97,7 @@
+ 
+     for (int i = 1; i <= 29; i++) {
+ 	QString name;
+-	name.sprintf("%s/kmoon/pics/moon%d.gif",
++	name.sprintf("%s/kmoon/pics/moon%d.xpm",
+ 		     KApplication::kde_datadir().data(),
+ 		     i);
+ 	QImage *p = new QImage(name);
diff --git a/x11-clocks/kdetoys11/files/patch-bb b/x11-clocks/kdetoys11/files/patch-bb
new file mode 100644
index 000000000000..cd2f97541dfd
--- /dev/null
+++ b/x11-clocks/kdetoys11/files/patch-bb
@@ -0,0 +1,52 @@
+--- kworldwatch/pics/Makefile.in.orig	Tue Aug 24 23:08:20 1999
++++ kworldwatch/pics/Makefile.in	Mon Aug 30 23:40:51 1999
+@@ -156,7 +156,7 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ 
+-data_DATA = flag-blue.xpm flag-green.xpm flag-yellow.xpm flag-red.xpm             world.gif world2.gif world_dark.gif
++data_DATA = flag-blue.xpm flag-green.xpm flag-yellow.xpm flag-red.xpm             world.xpm world2.xpm world_dark.xpm
+ 
+ 
+ datadir = $(kde_datadir)/kworldwatch/pics
+@@ -174,6 +174,7 @@
+ GZIP_ENV = --best
+ all: all-redirect
+ .SUFFIXES:
++.SUFFIXES: .gif .xpm
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps kworldwatch/pics/Makefile
+ 
+@@ -281,6 +282,8 @@
+ mostlyclean-generic distclean-generic clean-generic \
+ maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+ 
++.gif.xpm:
++	$(LOCALBASE)/bin/convert $< $@
+ 
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+--- kworldwatch/world.cpp.orig	Fri Aug 27 02:50:27 1999
++++ kworldwatch/world.cpp	Fri Aug 27 02:50:41 1999
+@@ -37,10 +37,10 @@
+   QFontMetrics metric(font);
+   KIconLoader  iconLoader;
+ 
+-  cleanMap = iconLoader.loadIcon("world.gif");
++  cleanMap = iconLoader.loadIcon("world.xpm");
+   if (cleanMap.isNull())
+     abort();
+-  darkMap = iconLoader.loadIcon("world_dark.gif");
++  darkMap = iconLoader.loadIcon("world_dark.xpm");
+   if (darkMap.isNull())
+     abort();
+   map = cleanMap;
+@@ -259,7 +259,7 @@
+     button(klocale->translate("Close"), this)
+ {
+   KIconLoader iconLoader;
+-  QPixmap back(iconLoader.loadIcon("world2.gif"));
++  QPixmap back(iconLoader.loadIcon("world2.xpm"));
+ 
+   setCaption(klocale->translate("About KDE World Watch"));
+   setFixedSize(back.width(), back.height());
diff --git a/x11-clocks/kdetoys11/pkg-descr b/x11-clocks/kdetoys11/pkg-descr
index d27252281d5f..90ae45773bea 100644
--- a/x11-clocks/kdetoys11/pkg-descr
+++ b/x11-clocks/kdetoys11/pkg-descr
@@ -1,8 +1 @@
 KDE provides an integrated X11 based environment, much like CDE.
-
-* This port is RESTRICTED because the applications will *not* work
-* unless you define QT_GIF_AVAILABLE in qt-i18n and recompile it. 
-* It requires a separate license from UNISYS !!
-*
-* See also:
-*  http://corp2.unisys.com/LeadStory/lzwfaq.html
diff --git a/x11-clocks/kdetoys11/pkg-plist b/x11-clocks/kdetoys11/pkg-plist
index c9d0c10c726e..58fd567ff5f7 100644
--- a/x11-clocks/kdetoys11/pkg-plist
+++ b/x11-clocks/kdetoys11/pkg-plist
@@ -1,55 +1,49 @@
 bin/kmoon
 bin/kworldwatch
-bin/kodo
-share/applnk/Utilities/kmoon.kdelnk
 share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kodo.kdelnk
-share/apps/kmoon/pics/moon1.gif
-share/apps/kmoon/pics/moon10.gif
-share/apps/kmoon/pics/moon11.gif
-share/apps/kmoon/pics/moon12.gif
-share/apps/kmoon/pics/moon13.gif
-share/apps/kmoon/pics/moon14.gif
-share/apps/kmoon/pics/moon15.gif
-share/apps/kmoon/pics/moon16.gif
-share/apps/kmoon/pics/moon17.gif
-share/apps/kmoon/pics/moon18.gif
-share/apps/kmoon/pics/moon19.gif
-share/apps/kmoon/pics/moon20.gif
-share/apps/kmoon/pics/moon21.gif
-share/apps/kmoon/pics/moon22.gif
-share/apps/kmoon/pics/moon23.gif
-share/apps/kmoon/pics/moon24.gif
-share/apps/kmoon/pics/moon25.gif
-share/apps/kmoon/pics/moon26.gif
-share/apps/kmoon/pics/moon27.gif
-share/apps/kmoon/pics/moon28.gif
-share/apps/kmoon/pics/moon29.gif
-share/apps/kmoon/pics/moon2.gif
-share/apps/kmoon/pics/moon3.gif
-share/apps/kmoon/pics/moon4.gif
-share/apps/kmoon/pics/moon5.gif
-share/apps/kmoon/pics/moon6.gif
-share/apps/kmoon/pics/moon7.gif
-share/apps/kmoon/pics/moon8.gif
-share/apps/kmoon/pics/moon9.gif
+share/applnk/Utilities/kmoon.kdelnk
+share/apps/kmoon/pics/moon1.xpm
+share/apps/kmoon/pics/moon10.xpm
+share/apps/kmoon/pics/moon11.xpm
+share/apps/kmoon/pics/moon12.xpm
+share/apps/kmoon/pics/moon13.xpm
+share/apps/kmoon/pics/moon14.xpm
+share/apps/kmoon/pics/moon15.xpm
+share/apps/kmoon/pics/moon16.xpm
+share/apps/kmoon/pics/moon17.xpm
+share/apps/kmoon/pics/moon18.xpm
+share/apps/kmoon/pics/moon19.xpm
+share/apps/kmoon/pics/moon2.xpm
+share/apps/kmoon/pics/moon20.xpm
+share/apps/kmoon/pics/moon21.xpm
+share/apps/kmoon/pics/moon22.xpm
+share/apps/kmoon/pics/moon23.xpm
+share/apps/kmoon/pics/moon24.xpm
+share/apps/kmoon/pics/moon25.xpm
+share/apps/kmoon/pics/moon26.xpm
+share/apps/kmoon/pics/moon27.xpm
+share/apps/kmoon/pics/moon28.xpm
+share/apps/kmoon/pics/moon29.xpm
+share/apps/kmoon/pics/moon3.xpm
+share/apps/kmoon/pics/moon4.xpm
+share/apps/kmoon/pics/moon5.xpm
+share/apps/kmoon/pics/moon6.xpm
+share/apps/kmoon/pics/moon7.xpm
+share/apps/kmoon/pics/moon8.xpm
+share/apps/kmoon/pics/moon9.xpm
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
-share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
-share/apps/kworldwatch/pics/world.gif
-share/apps/kworldwatch/pics/world2.gif
-share/apps/kworldwatch/pics/world_dark.gif
-share/apps/kodo/57-2.gif
-share/doc/HTML/en/kodo/index.html
-share/doc/HTML/en/kodo/logotp3.gif
-share/doc/HTML/en/kodo/guide.gif
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/icons/mini/kodo.xpm
+share/apps/kworldwatch/pics/flag-yellow.xpm
+share/apps/kworldwatch/pics/world.xpm
+share/apps/kworldwatch/pics/world2.xpm
+share/apps/kworldwatch/pics/world_dark.xpm
 share/icons/kmoon.xpm
 share/icons/kworldwatch.xpm
-share/icons/kodo.xpm
+share/icons/large/kmoon.xpm
+share/icons/large/kworldwatch.xpm
+share/icons/mini/kmoon.xpm
+share/icons/mini/kworldwatch.xpm
 share/locale/br/LC_MESSAGES/kmoon.mo
 share/locale/br/LC_MESSAGES/kworldwatch.mo
 share/locale/cs/LC_MESSAGES/kmoon.mo
@@ -60,6 +54,8 @@ share/locale/de/LC_MESSAGES/kmoon.mo
 share/locale/de/LC_MESSAGES/kworldwatch.mo
 share/locale/es/LC_MESSAGES/kmoon.mo
 share/locale/es/LC_MESSAGES/kworldwatch.mo
+share/locale/et/LC_MESSAGES/kmoon.mo
+share/locale/et/LC_MESSAGES/kworldwatch.mo
 share/locale/fi/LC_MESSAGES/kmoon.mo
 share/locale/fi/LC_MESSAGES/kworldwatch.mo
 share/locale/fr/LC_MESSAGES/kmoon.mo
@@ -68,22 +64,24 @@ share/locale/hr/LC_MESSAGES/kmoon.mo
 share/locale/hr/LC_MESSAGES/kworldwatch.mo
 share/locale/is/LC_MESSAGES/kmoon.mo
 share/locale/is/LC_MESSAGES/kworldwatch.mo
+share/locale/ja/LC_MESSAGES/kmoon.mo
+share/locale/ja/LC_MESSAGES/kworldwatch.mo
 share/locale/no/LC_MESSAGES/kmoon.mo
 share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pl/LC_MESSAGES/kmoon.mo
 share/locale/pl/LC_MESSAGES/kworldwatch.mo
+share/locale/pt/LC_MESSAGES/kmoon.mo
+share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pt_BR/LC_MESSAGES/kmoon.mo
 share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
 share/locale/ro/LC_MESSAGES/kworldwatch.mo
 share/locale/sk/LC_MESSAGES/kmoon.mo
 share/locale/sk/LC_MESSAGES/kworldwatch.mo
+share/locale/sl/LC_MESSAGES/kmoon.mo
+share/locale/sl/LC_MESSAGES/kworldwatch.mo
 share/locale/sv/LC_MESSAGES/kmoon.mo
 share/locale/sv/LC_MESSAGES/kworldwatch.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
-@dirrm share/doc/HTML/en/kodo
-@dirrm share/apps/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index bd0de0d6e1db..2c3d4bd12c6c 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -1,41 +1,21 @@
 # New ports collection makefile for:	kdetoys-i18n
-# Version required:	1.1.1
+# Version required:	1.1.2
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kdetoys-1.1.1
-PKGNAME=	kdetoys-i18n-1.1.1
-CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.kde.gr.jp/~imura/
-MASTER_SITES+=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
-DISTFILES=	kdetoys-1.1.1.tar.bz2 \
-		kdelnkfiles-ja-19990809.tar.bz2
+MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 
-MAINTAINER=     imura@kde.gr.jp
+CATEGORIES=	x11-clocks kde
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kfilei18n.2:${PORTSDIR}/x11/kdelibs11-i18n \
-		qti18n.2:${PORTSDIR}/x11-toolkits/qt-i18n
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11-i18n
+MAINTAINER=	imura@kde.gr.jp
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${DISTNAME}
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_NEWGCC=	yes
-CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4"
-CXXFLAGS?=	${CFLAGS}
+KDE_NAME=	kdetoys
 
-.if defined(QT_GIF_AVAILABLE)
-RESTRICTED=	requires Qt compiled with gif reading support
-.else
-FORBIDDEN=	requires Qt compiled with gif reading support
-.endif
+.include "${MASTERDIR}/Makefile"
 
-.include <bsd.port.mk>
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
diff --git a/x11-clocks/kdetoys2/distinfo b/x11-clocks/kdetoys2/distinfo
index 4b265f8a5e6e..1d075d1fe04d 100644
--- a/x11-clocks/kdetoys2/distinfo
+++ b/x11-clocks/kdetoys2/distinfo
@@ -1,2 +1 @@
-MD5 (kdetoys-1.1.1.tar.bz2) = b4124c917d2230ebfbc567f4a9e510a3
-MD5 (kdelnkfiles-ja-19990809.tar.bz2) = 72fc66f45d454a905e212a44217baf98
+MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
diff --git a/x11-clocks/kdetoys2/pkg-descr b/x11-clocks/kdetoys2/pkg-descr
index d27252281d5f..90ae45773bea 100644
--- a/x11-clocks/kdetoys2/pkg-descr
+++ b/x11-clocks/kdetoys2/pkg-descr
@@ -1,8 +1 @@
 KDE provides an integrated X11 based environment, much like CDE.
-
-* This port is RESTRICTED because the applications will *not* work
-* unless you define QT_GIF_AVAILABLE in qt-i18n and recompile it. 
-* It requires a separate license from UNISYS !!
-*
-* See also:
-*  http://corp2.unisys.com/LeadStory/lzwfaq.html
diff --git a/x11-clocks/kdetoys2/pkg-plist b/x11-clocks/kdetoys2/pkg-plist
index c9d0c10c726e..58fd567ff5f7 100644
--- a/x11-clocks/kdetoys2/pkg-plist
+++ b/x11-clocks/kdetoys2/pkg-plist
@@ -1,55 +1,49 @@
 bin/kmoon
 bin/kworldwatch
-bin/kodo
-share/applnk/Utilities/kmoon.kdelnk
 share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kodo.kdelnk
-share/apps/kmoon/pics/moon1.gif
-share/apps/kmoon/pics/moon10.gif
-share/apps/kmoon/pics/moon11.gif
-share/apps/kmoon/pics/moon12.gif
-share/apps/kmoon/pics/moon13.gif
-share/apps/kmoon/pics/moon14.gif
-share/apps/kmoon/pics/moon15.gif
-share/apps/kmoon/pics/moon16.gif
-share/apps/kmoon/pics/moon17.gif
-share/apps/kmoon/pics/moon18.gif
-share/apps/kmoon/pics/moon19.gif
-share/apps/kmoon/pics/moon20.gif
-share/apps/kmoon/pics/moon21.gif
-share/apps/kmoon/pics/moon22.gif
-share/apps/kmoon/pics/moon23.gif
-share/apps/kmoon/pics/moon24.gif
-share/apps/kmoon/pics/moon25.gif
-share/apps/kmoon/pics/moon26.gif
-share/apps/kmoon/pics/moon27.gif
-share/apps/kmoon/pics/moon28.gif
-share/apps/kmoon/pics/moon29.gif
-share/apps/kmoon/pics/moon2.gif
-share/apps/kmoon/pics/moon3.gif
-share/apps/kmoon/pics/moon4.gif
-share/apps/kmoon/pics/moon5.gif
-share/apps/kmoon/pics/moon6.gif
-share/apps/kmoon/pics/moon7.gif
-share/apps/kmoon/pics/moon8.gif
-share/apps/kmoon/pics/moon9.gif
+share/applnk/Utilities/kmoon.kdelnk
+share/apps/kmoon/pics/moon1.xpm
+share/apps/kmoon/pics/moon10.xpm
+share/apps/kmoon/pics/moon11.xpm
+share/apps/kmoon/pics/moon12.xpm
+share/apps/kmoon/pics/moon13.xpm
+share/apps/kmoon/pics/moon14.xpm
+share/apps/kmoon/pics/moon15.xpm
+share/apps/kmoon/pics/moon16.xpm
+share/apps/kmoon/pics/moon17.xpm
+share/apps/kmoon/pics/moon18.xpm
+share/apps/kmoon/pics/moon19.xpm
+share/apps/kmoon/pics/moon2.xpm
+share/apps/kmoon/pics/moon20.xpm
+share/apps/kmoon/pics/moon21.xpm
+share/apps/kmoon/pics/moon22.xpm
+share/apps/kmoon/pics/moon23.xpm
+share/apps/kmoon/pics/moon24.xpm
+share/apps/kmoon/pics/moon25.xpm
+share/apps/kmoon/pics/moon26.xpm
+share/apps/kmoon/pics/moon27.xpm
+share/apps/kmoon/pics/moon28.xpm
+share/apps/kmoon/pics/moon29.xpm
+share/apps/kmoon/pics/moon3.xpm
+share/apps/kmoon/pics/moon4.xpm
+share/apps/kmoon/pics/moon5.xpm
+share/apps/kmoon/pics/moon6.xpm
+share/apps/kmoon/pics/moon7.xpm
+share/apps/kmoon/pics/moon8.xpm
+share/apps/kmoon/pics/moon9.xpm
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
-share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
-share/apps/kworldwatch/pics/world.gif
-share/apps/kworldwatch/pics/world2.gif
-share/apps/kworldwatch/pics/world_dark.gif
-share/apps/kodo/57-2.gif
-share/doc/HTML/en/kodo/index.html
-share/doc/HTML/en/kodo/logotp3.gif
-share/doc/HTML/en/kodo/guide.gif
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/icons/mini/kodo.xpm
+share/apps/kworldwatch/pics/flag-yellow.xpm
+share/apps/kworldwatch/pics/world.xpm
+share/apps/kworldwatch/pics/world2.xpm
+share/apps/kworldwatch/pics/world_dark.xpm
 share/icons/kmoon.xpm
 share/icons/kworldwatch.xpm
-share/icons/kodo.xpm
+share/icons/large/kmoon.xpm
+share/icons/large/kworldwatch.xpm
+share/icons/mini/kmoon.xpm
+share/icons/mini/kworldwatch.xpm
 share/locale/br/LC_MESSAGES/kmoon.mo
 share/locale/br/LC_MESSAGES/kworldwatch.mo
 share/locale/cs/LC_MESSAGES/kmoon.mo
@@ -60,6 +54,8 @@ share/locale/de/LC_MESSAGES/kmoon.mo
 share/locale/de/LC_MESSAGES/kworldwatch.mo
 share/locale/es/LC_MESSAGES/kmoon.mo
 share/locale/es/LC_MESSAGES/kworldwatch.mo
+share/locale/et/LC_MESSAGES/kmoon.mo
+share/locale/et/LC_MESSAGES/kworldwatch.mo
 share/locale/fi/LC_MESSAGES/kmoon.mo
 share/locale/fi/LC_MESSAGES/kworldwatch.mo
 share/locale/fr/LC_MESSAGES/kmoon.mo
@@ -68,22 +64,24 @@ share/locale/hr/LC_MESSAGES/kmoon.mo
 share/locale/hr/LC_MESSAGES/kworldwatch.mo
 share/locale/is/LC_MESSAGES/kmoon.mo
 share/locale/is/LC_MESSAGES/kworldwatch.mo
+share/locale/ja/LC_MESSAGES/kmoon.mo
+share/locale/ja/LC_MESSAGES/kworldwatch.mo
 share/locale/no/LC_MESSAGES/kmoon.mo
 share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pl/LC_MESSAGES/kmoon.mo
 share/locale/pl/LC_MESSAGES/kworldwatch.mo
+share/locale/pt/LC_MESSAGES/kmoon.mo
+share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pt_BR/LC_MESSAGES/kmoon.mo
 share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
 share/locale/ro/LC_MESSAGES/kworldwatch.mo
 share/locale/sk/LC_MESSAGES/kmoon.mo
 share/locale/sk/LC_MESSAGES/kworldwatch.mo
+share/locale/sl/LC_MESSAGES/kmoon.mo
+share/locale/sl/LC_MESSAGES/kworldwatch.mo
 share/locale/sv/LC_MESSAGES/kmoon.mo
 share/locale/sv/LC_MESSAGES/kworldwatch.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
-@dirrm share/doc/HTML/en/kodo
-@dirrm share/apps/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index bd0de0d6e1db..2c3d4bd12c6c 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -1,41 +1,21 @@
 # New ports collection makefile for:	kdetoys-i18n
-# Version required:	1.1.1
+# Version required:	1.1.2
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kdetoys-1.1.1
-PKGNAME=	kdetoys-i18n-1.1.1
-CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.kde.gr.jp/~imura/
-MASTER_SITES+=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
-DISTFILES=	kdetoys-1.1.1.tar.bz2 \
-		kdelnkfiles-ja-19990809.tar.bz2
+MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 
-MAINTAINER=     imura@kde.gr.jp
+CATEGORIES=	x11-clocks kde
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kfilei18n.2:${PORTSDIR}/x11/kdelibs11-i18n \
-		qti18n.2:${PORTSDIR}/x11-toolkits/qt-i18n
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11-i18n
+MAINTAINER=	imura@kde.gr.jp
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${DISTNAME}
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_NEWGCC=	yes
-CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4"
-CXXFLAGS?=	${CFLAGS}
+KDE_NAME=	kdetoys
 
-.if defined(QT_GIF_AVAILABLE)
-RESTRICTED=	requires Qt compiled with gif reading support
-.else
-FORBIDDEN=	requires Qt compiled with gif reading support
-.endif
+.include "${MASTERDIR}/Makefile"
 
-.include <bsd.port.mk>
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index 4b265f8a5e6e..1d075d1fe04d 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1,2 +1 @@
-MD5 (kdetoys-1.1.1.tar.bz2) = b4124c917d2230ebfbc567f4a9e510a3
-MD5 (kdelnkfiles-ja-19990809.tar.bz2) = 72fc66f45d454a905e212a44217baf98
+MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
diff --git a/x11-clocks/kdetoys3/pkg-descr b/x11-clocks/kdetoys3/pkg-descr
index d27252281d5f..90ae45773bea 100644
--- a/x11-clocks/kdetoys3/pkg-descr
+++ b/x11-clocks/kdetoys3/pkg-descr
@@ -1,8 +1 @@
 KDE provides an integrated X11 based environment, much like CDE.
-
-* This port is RESTRICTED because the applications will *not* work
-* unless you define QT_GIF_AVAILABLE in qt-i18n and recompile it. 
-* It requires a separate license from UNISYS !!
-*
-* See also:
-*  http://corp2.unisys.com/LeadStory/lzwfaq.html
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index c9d0c10c726e..58fd567ff5f7 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -1,55 +1,49 @@
 bin/kmoon
 bin/kworldwatch
-bin/kodo
-share/applnk/Utilities/kmoon.kdelnk
 share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kodo.kdelnk
-share/apps/kmoon/pics/moon1.gif
-share/apps/kmoon/pics/moon10.gif
-share/apps/kmoon/pics/moon11.gif
-share/apps/kmoon/pics/moon12.gif
-share/apps/kmoon/pics/moon13.gif
-share/apps/kmoon/pics/moon14.gif
-share/apps/kmoon/pics/moon15.gif
-share/apps/kmoon/pics/moon16.gif
-share/apps/kmoon/pics/moon17.gif
-share/apps/kmoon/pics/moon18.gif
-share/apps/kmoon/pics/moon19.gif
-share/apps/kmoon/pics/moon20.gif
-share/apps/kmoon/pics/moon21.gif
-share/apps/kmoon/pics/moon22.gif
-share/apps/kmoon/pics/moon23.gif
-share/apps/kmoon/pics/moon24.gif
-share/apps/kmoon/pics/moon25.gif
-share/apps/kmoon/pics/moon26.gif
-share/apps/kmoon/pics/moon27.gif
-share/apps/kmoon/pics/moon28.gif
-share/apps/kmoon/pics/moon29.gif
-share/apps/kmoon/pics/moon2.gif
-share/apps/kmoon/pics/moon3.gif
-share/apps/kmoon/pics/moon4.gif
-share/apps/kmoon/pics/moon5.gif
-share/apps/kmoon/pics/moon6.gif
-share/apps/kmoon/pics/moon7.gif
-share/apps/kmoon/pics/moon8.gif
-share/apps/kmoon/pics/moon9.gif
+share/applnk/Utilities/kmoon.kdelnk
+share/apps/kmoon/pics/moon1.xpm
+share/apps/kmoon/pics/moon10.xpm
+share/apps/kmoon/pics/moon11.xpm
+share/apps/kmoon/pics/moon12.xpm
+share/apps/kmoon/pics/moon13.xpm
+share/apps/kmoon/pics/moon14.xpm
+share/apps/kmoon/pics/moon15.xpm
+share/apps/kmoon/pics/moon16.xpm
+share/apps/kmoon/pics/moon17.xpm
+share/apps/kmoon/pics/moon18.xpm
+share/apps/kmoon/pics/moon19.xpm
+share/apps/kmoon/pics/moon2.xpm
+share/apps/kmoon/pics/moon20.xpm
+share/apps/kmoon/pics/moon21.xpm
+share/apps/kmoon/pics/moon22.xpm
+share/apps/kmoon/pics/moon23.xpm
+share/apps/kmoon/pics/moon24.xpm
+share/apps/kmoon/pics/moon25.xpm
+share/apps/kmoon/pics/moon26.xpm
+share/apps/kmoon/pics/moon27.xpm
+share/apps/kmoon/pics/moon28.xpm
+share/apps/kmoon/pics/moon29.xpm
+share/apps/kmoon/pics/moon3.xpm
+share/apps/kmoon/pics/moon4.xpm
+share/apps/kmoon/pics/moon5.xpm
+share/apps/kmoon/pics/moon6.xpm
+share/apps/kmoon/pics/moon7.xpm
+share/apps/kmoon/pics/moon8.xpm
+share/apps/kmoon/pics/moon9.xpm
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
-share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
-share/apps/kworldwatch/pics/world.gif
-share/apps/kworldwatch/pics/world2.gif
-share/apps/kworldwatch/pics/world_dark.gif
-share/apps/kodo/57-2.gif
-share/doc/HTML/en/kodo/index.html
-share/doc/HTML/en/kodo/logotp3.gif
-share/doc/HTML/en/kodo/guide.gif
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/icons/mini/kodo.xpm
+share/apps/kworldwatch/pics/flag-yellow.xpm
+share/apps/kworldwatch/pics/world.xpm
+share/apps/kworldwatch/pics/world2.xpm
+share/apps/kworldwatch/pics/world_dark.xpm
 share/icons/kmoon.xpm
 share/icons/kworldwatch.xpm
-share/icons/kodo.xpm
+share/icons/large/kmoon.xpm
+share/icons/large/kworldwatch.xpm
+share/icons/mini/kmoon.xpm
+share/icons/mini/kworldwatch.xpm
 share/locale/br/LC_MESSAGES/kmoon.mo
 share/locale/br/LC_MESSAGES/kworldwatch.mo
 share/locale/cs/LC_MESSAGES/kmoon.mo
@@ -60,6 +54,8 @@ share/locale/de/LC_MESSAGES/kmoon.mo
 share/locale/de/LC_MESSAGES/kworldwatch.mo
 share/locale/es/LC_MESSAGES/kmoon.mo
 share/locale/es/LC_MESSAGES/kworldwatch.mo
+share/locale/et/LC_MESSAGES/kmoon.mo
+share/locale/et/LC_MESSAGES/kworldwatch.mo
 share/locale/fi/LC_MESSAGES/kmoon.mo
 share/locale/fi/LC_MESSAGES/kworldwatch.mo
 share/locale/fr/LC_MESSAGES/kmoon.mo
@@ -68,22 +64,24 @@ share/locale/hr/LC_MESSAGES/kmoon.mo
 share/locale/hr/LC_MESSAGES/kworldwatch.mo
 share/locale/is/LC_MESSAGES/kmoon.mo
 share/locale/is/LC_MESSAGES/kworldwatch.mo
+share/locale/ja/LC_MESSAGES/kmoon.mo
+share/locale/ja/LC_MESSAGES/kworldwatch.mo
 share/locale/no/LC_MESSAGES/kmoon.mo
 share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pl/LC_MESSAGES/kmoon.mo
 share/locale/pl/LC_MESSAGES/kworldwatch.mo
+share/locale/pt/LC_MESSAGES/kmoon.mo
+share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pt_BR/LC_MESSAGES/kmoon.mo
 share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
 share/locale/ro/LC_MESSAGES/kworldwatch.mo
 share/locale/sk/LC_MESSAGES/kmoon.mo
 share/locale/sk/LC_MESSAGES/kworldwatch.mo
+share/locale/sl/LC_MESSAGES/kmoon.mo
+share/locale/sl/LC_MESSAGES/kworldwatch.mo
 share/locale/sv/LC_MESSAGES/kmoon.mo
 share/locale/sv/LC_MESSAGES/kworldwatch.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
-@dirrm share/doc/HTML/en/kodo
-@dirrm share/apps/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index bd0de0d6e1db..2c3d4bd12c6c 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -1,41 +1,21 @@
 # New ports collection makefile for:	kdetoys-i18n
-# Version required:	1.1.1
+# Version required:	1.1.2
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kdetoys-1.1.1
-PKGNAME=	kdetoys-i18n-1.1.1
-CATEGORIES=	x11-clocks kde
-MASTER_SITES=	http://www.kde.gr.jp/~imura/
-MASTER_SITES+=	$(MASTER_SITE_KDE)
-MASTER_SITE_SUBDIR= stable/1.1.1/distribution/tar/generic/source/bz2
-DISTFILES=	kdetoys-1.1.1.tar.bz2 \
-		kdelnkfiles-ja-19990809.tar.bz2
+MASTERDIR=	${.CURDIR}/../../audio/kdemultimedia11-i18n
 
-MAINTAINER=     imura@kde.gr.jp
+CATEGORIES=	x11-clocks kde
 
-BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
-LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
-		kfilei18n.2:${PORTSDIR}/x11/kdelibs11-i18n \
-		qti18n.2:${PORTSDIR}/x11-toolkits/qt-i18n
-RUN_DEPENDS=	kwm:${PORTSDIR}/x11/kdebase11-i18n
+MAINTAINER=	imura@kde.gr.jp
 
-EXTRACT_AFTER_ARGS=	| ${TAR} -xf - ${DISTNAME}
+BUILD_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_LIBTOOL=	yes
-USE_NEWGCC=	yes
-CONFIGURE_ENV=	X_EXTRA_LIBS="-lxpg4"
-CXXFLAGS?=	${CFLAGS}
+KDE_NAME=	kdetoys
 
-.if defined(QT_GIF_AVAILABLE)
-RESTRICTED=	requires Qt compiled with gif reading support
-.else
-FORBIDDEN=	requires Qt compiled with gif reading support
-.endif
+.include "${MASTERDIR}/Makefile"
 
-.include <bsd.port.mk>
+CONFIGURE_ENV+=	DO_NOT_COMPILE=mouse
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index 4b265f8a5e6e..1d075d1fe04d 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1,2 +1 @@
-MD5 (kdetoys-1.1.1.tar.bz2) = b4124c917d2230ebfbc567f4a9e510a3
-MD5 (kdelnkfiles-ja-19990809.tar.bz2) = 72fc66f45d454a905e212a44217baf98
+MD5 (kdetoys-1.1.2.tar.bz2) = 0bf12bd887b497a3ba35beea198cd63f
diff --git a/x11-clocks/kdetoys4/pkg-descr b/x11-clocks/kdetoys4/pkg-descr
index d27252281d5f..90ae45773bea 100644
--- a/x11-clocks/kdetoys4/pkg-descr
+++ b/x11-clocks/kdetoys4/pkg-descr
@@ -1,8 +1 @@
 KDE provides an integrated X11 based environment, much like CDE.
-
-* This port is RESTRICTED because the applications will *not* work
-* unless you define QT_GIF_AVAILABLE in qt-i18n and recompile it. 
-* It requires a separate license from UNISYS !!
-*
-* See also:
-*  http://corp2.unisys.com/LeadStory/lzwfaq.html
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index c9d0c10c726e..58fd567ff5f7 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -1,55 +1,49 @@
 bin/kmoon
 bin/kworldwatch
-bin/kodo
-share/applnk/Utilities/kmoon.kdelnk
 share/applnk/Utilities/KWorldWatch.kdelnk
-share/applnk/Utilities/kodo.kdelnk
-share/apps/kmoon/pics/moon1.gif
-share/apps/kmoon/pics/moon10.gif
-share/apps/kmoon/pics/moon11.gif
-share/apps/kmoon/pics/moon12.gif
-share/apps/kmoon/pics/moon13.gif
-share/apps/kmoon/pics/moon14.gif
-share/apps/kmoon/pics/moon15.gif
-share/apps/kmoon/pics/moon16.gif
-share/apps/kmoon/pics/moon17.gif
-share/apps/kmoon/pics/moon18.gif
-share/apps/kmoon/pics/moon19.gif
-share/apps/kmoon/pics/moon20.gif
-share/apps/kmoon/pics/moon21.gif
-share/apps/kmoon/pics/moon22.gif
-share/apps/kmoon/pics/moon23.gif
-share/apps/kmoon/pics/moon24.gif
-share/apps/kmoon/pics/moon25.gif
-share/apps/kmoon/pics/moon26.gif
-share/apps/kmoon/pics/moon27.gif
-share/apps/kmoon/pics/moon28.gif
-share/apps/kmoon/pics/moon29.gif
-share/apps/kmoon/pics/moon2.gif
-share/apps/kmoon/pics/moon3.gif
-share/apps/kmoon/pics/moon4.gif
-share/apps/kmoon/pics/moon5.gif
-share/apps/kmoon/pics/moon6.gif
-share/apps/kmoon/pics/moon7.gif
-share/apps/kmoon/pics/moon8.gif
-share/apps/kmoon/pics/moon9.gif
+share/applnk/Utilities/kmoon.kdelnk
+share/apps/kmoon/pics/moon1.xpm
+share/apps/kmoon/pics/moon10.xpm
+share/apps/kmoon/pics/moon11.xpm
+share/apps/kmoon/pics/moon12.xpm
+share/apps/kmoon/pics/moon13.xpm
+share/apps/kmoon/pics/moon14.xpm
+share/apps/kmoon/pics/moon15.xpm
+share/apps/kmoon/pics/moon16.xpm
+share/apps/kmoon/pics/moon17.xpm
+share/apps/kmoon/pics/moon18.xpm
+share/apps/kmoon/pics/moon19.xpm
+share/apps/kmoon/pics/moon2.xpm
+share/apps/kmoon/pics/moon20.xpm
+share/apps/kmoon/pics/moon21.xpm
+share/apps/kmoon/pics/moon22.xpm
+share/apps/kmoon/pics/moon23.xpm
+share/apps/kmoon/pics/moon24.xpm
+share/apps/kmoon/pics/moon25.xpm
+share/apps/kmoon/pics/moon26.xpm
+share/apps/kmoon/pics/moon27.xpm
+share/apps/kmoon/pics/moon28.xpm
+share/apps/kmoon/pics/moon29.xpm
+share/apps/kmoon/pics/moon3.xpm
+share/apps/kmoon/pics/moon4.xpm
+share/apps/kmoon/pics/moon5.xpm
+share/apps/kmoon/pics/moon6.xpm
+share/apps/kmoon/pics/moon7.xpm
+share/apps/kmoon/pics/moon8.xpm
+share/apps/kmoon/pics/moon9.xpm
 share/apps/kworldwatch/pics/flag-blue.xpm
 share/apps/kworldwatch/pics/flag-green.xpm
-share/apps/kworldwatch/pics/flag-yellow.xpm
 share/apps/kworldwatch/pics/flag-red.xpm
-share/apps/kworldwatch/pics/world.gif
-share/apps/kworldwatch/pics/world2.gif
-share/apps/kworldwatch/pics/world_dark.gif
-share/apps/kodo/57-2.gif
-share/doc/HTML/en/kodo/index.html
-share/doc/HTML/en/kodo/logotp3.gif
-share/doc/HTML/en/kodo/guide.gif
-share/icons/mini/kmoon.xpm
-share/icons/mini/kworldwatch.xpm
-share/icons/mini/kodo.xpm
+share/apps/kworldwatch/pics/flag-yellow.xpm
+share/apps/kworldwatch/pics/world.xpm
+share/apps/kworldwatch/pics/world2.xpm
+share/apps/kworldwatch/pics/world_dark.xpm
 share/icons/kmoon.xpm
 share/icons/kworldwatch.xpm
-share/icons/kodo.xpm
+share/icons/large/kmoon.xpm
+share/icons/large/kworldwatch.xpm
+share/icons/mini/kmoon.xpm
+share/icons/mini/kworldwatch.xpm
 share/locale/br/LC_MESSAGES/kmoon.mo
 share/locale/br/LC_MESSAGES/kworldwatch.mo
 share/locale/cs/LC_MESSAGES/kmoon.mo
@@ -60,6 +54,8 @@ share/locale/de/LC_MESSAGES/kmoon.mo
 share/locale/de/LC_MESSAGES/kworldwatch.mo
 share/locale/es/LC_MESSAGES/kmoon.mo
 share/locale/es/LC_MESSAGES/kworldwatch.mo
+share/locale/et/LC_MESSAGES/kmoon.mo
+share/locale/et/LC_MESSAGES/kworldwatch.mo
 share/locale/fi/LC_MESSAGES/kmoon.mo
 share/locale/fi/LC_MESSAGES/kworldwatch.mo
 share/locale/fr/LC_MESSAGES/kmoon.mo
@@ -68,22 +64,24 @@ share/locale/hr/LC_MESSAGES/kmoon.mo
 share/locale/hr/LC_MESSAGES/kworldwatch.mo
 share/locale/is/LC_MESSAGES/kmoon.mo
 share/locale/is/LC_MESSAGES/kworldwatch.mo
+share/locale/ja/LC_MESSAGES/kmoon.mo
+share/locale/ja/LC_MESSAGES/kworldwatch.mo
 share/locale/no/LC_MESSAGES/kmoon.mo
 share/locale/no/LC_MESSAGES/kworldwatch.mo
-share/locale/pt/LC_MESSAGES/kmoon.mo
-share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pl/LC_MESSAGES/kmoon.mo
 share/locale/pl/LC_MESSAGES/kworldwatch.mo
+share/locale/pt/LC_MESSAGES/kmoon.mo
+share/locale/pt/LC_MESSAGES/kworldwatch.mo
 share/locale/pt_BR/LC_MESSAGES/kmoon.mo
 share/locale/pt_BR/LC_MESSAGES/kworldwatch.mo
 share/locale/ro/LC_MESSAGES/kworldwatch.mo
 share/locale/sk/LC_MESSAGES/kmoon.mo
 share/locale/sk/LC_MESSAGES/kworldwatch.mo
+share/locale/sl/LC_MESSAGES/kmoon.mo
+share/locale/sl/LC_MESSAGES/kworldwatch.mo
 share/locale/sv/LC_MESSAGES/kmoon.mo
 share/locale/sv/LC_MESSAGES/kworldwatch.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/kmoon.mo
-@dirrm share/doc/HTML/en/kodo
-@dirrm share/apps/kodo
 @dirrm share/apps/kworldwatch/pics
 @dirrm share/apps/kworldwatch
 @dirrm share/apps/kmoon/pics