- Update to version 0.9.3 which adds support for Yahoo! and LifeJournal

Submitted by:	Vladimir Grebenschikov <vova@sw.ru>
Approved by:	arved (mentor)

15 files changed, 282 insertions, 249 deletions

diff --git a/net-im/sim-im/Makefile b/net-im/sim-im/Makefile
index fd24507c6368..530227ede2c7 100644
--- a/net-im/sim-im/Makefile
+++ b/net-im/sim-im/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 
 PORTNAME=	simicq
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/mi/m-i/}
-DISTNAME=	${PORTNAME:S/icq//}-${PORTVERSION}
+DISTNAME=	${PORTNAME:S/icq//}-${PORTVERSION}-2
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Plugin-based instant messenger
 
-LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 USE_GMAKE=	yes
 USE_QT_VER=	3
 USE_PERL5_BUILD=	yes
@@ -53,12 +53,6 @@ pre-everything::
 	@${ECHO_MSG} "You can disable KDE support by defining WITHOUT_KDE."
 .endif
 
-post-extract:
-.for i in _core filter forward icq remote
-	@${TOUCH} ${WRKSRC}/plugins/${i}/Makefile.in
-.endfor
-	@${RM} -f ${WRKSRC}/plugins/remote/simctrl.o
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
 		${CONFIGURE_WRKSRC}/configure
diff --git a/net-im/sim-im/distinfo b/net-im/sim-im/distinfo
index 7643b46ff542..2f8dac231a3f 100644
--- a/net-im/sim-im/distinfo
+++ b/net-im/sim-im/distinfo
@@ -1,2 +1,2 @@
-MD5 (sim-0.9.2.tar.gz) = 977db89295f52c4d7742e5f643b66f64
-SIZE (sim-0.9.2.tar.gz) = 3101316
+MD5 (sim-0.9.3-2.tar.gz) = b16e462076540acc13da81832ae79d00
+SIZE (sim-0.9.3-2.tar.gz) = 3728770
diff --git a/net-im/sim-im/files/patch-weather.cpp b/net-im/sim-im/files/patch-weather.cpp
new file mode 100644
index 000000000000..34f44292749c
--- /dev/null
+++ b/net-im/sim-im/files/patch-weather.cpp
@@ -0,0 +1,22 @@
+--- plugins/weather/weather.cpp.orig	Fri Apr  2 12:21:54 2004
++++ plugins/weather/weather.cpp	Fri Apr  2 12:23:55 2004
+@@ -534,8 +534,8 @@
+     res = res.replace(QRegExp("\\%h"), number(getHumidity()) + "%");
+     res = res.replace(QRegExp("\\%w"), number(getWind_speed()) + " " + i18n(getUS()));
+     res = res.replace(QRegExp("\\%x"), QString::number(getWind_speed() * 10 / 36) + " " + i18n("m/s"));
+-    res = res.replace(QRegExp("\\%g"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust()) + i18n(getUS()) + ")" : "");
+-    res = res.replace(QRegExp("\\%y"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust() * 10 / 36) + " " + i18n("m/s") + ")" : "");
++    res = res.replace(QRegExp("\\%g"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust()) + i18n(getUS()) + ")" : QString(""));
++    res = res.replace(QRegExp("\\%y"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust() * 10 / 36) + " " + i18n("m/s") + ")" : QString(""));
+     res = res.replace(QRegExp("\\%p"), number(getPressure()) + " " + i18n(getUP()));
+     res = res.replace(QRegExp("\\%a"), number(getPressure() * 75 / 100));
+     res = res.replace(QRegExp("\\%q"), i18n("weather", getPressureD()));
+@@ -545,7 +545,7 @@
+     res = res.replace(QRegExp("\\%r"), getSun_raise());
+     res = res.replace(QRegExp("\\%s"), getSun_set());
+     res = res.replace(QRegExp("\\%c"), i18n_conditions(getConditions()));
+-    res = res.replace(QRegExp("\\%v"), i18n("weather", getVisibility()) + (atol(getVisibility()) ? QString(" ") + i18n(getUD()) : ""));
++    res = res.replace(QRegExp("\\%v"), i18n("weather", getVisibility()) + (atol(getVisibility()) ? QString(" ") + i18n(getUD()) : QString("")));
+     return res;
+ }
+ 
diff --git a/net-im/sim-im/pkg-descr b/net-im/sim-im/pkg-descr
index bfe655f30734..d360feb72d62 100644
--- a/net-im/sim-im/pkg-descr
+++ b/net-im/sim-im/pkg-descr
@@ -1,6 +1,5 @@
 SIM (Simple Instant Messenger) is a plugin-based instant messenger with
-support for various protocols.
-(QT is needed, can be build for KDE).
+support for various protocols (QT is needed, can be build for KDE).
 
 All protocols support richtext-messages, file transfer, typing notification,
 server-side contact list (with postponed synchronization - you can change
@@ -12,5 +11,7 @@ Supported protocols:
     * Oscar - ICQ and AIM support
     * Jabber
     * MSN
+    * Yahoo!
+    * LiveJournal
 
 WWW: http://sim-icq.sourceforge.net/
diff --git a/net-im/sim-im/pkg-plist b/net-im/sim-im/pkg-plist
index 3e4ad49a7568..b10461b9c1e7 100644
--- a/net-im/sim-im/pkg-plist
+++ b/net-im/sim-im/pkg-plist
@@ -7,41 +7,46 @@ lib/libsimui.la
 lib/libsimui.so
 lib/libsimui.so.0
 lib/menu/sim-kde.menu
+lib/sim/__homedir.so
+lib/sim/__migrate.so
+lib/sim/_core.so
+lib/sim/about.so
+lib/sim/action.so
+lib/sim/autoaway.so
+lib/sim/background.so
+lib/sim/dock.so
+lib/sim/filter.so
+lib/sim/floaty.so
+lib/sim/forward.so
+lib/sim/gpg.so
+lib/sim/icons.so
+lib/sim/icq.so
+lib/sim/jabber.so
+lib/sim/livejournal.so
+lib/sim/logger.so
+%%SSL%%lib/sim/msn.so
+lib/sim/navigate.so
+lib/sim/netmonitor.so
+%%KDE%%lib/sim/ontop.so
+lib/sim/osd.so
+lib/sim/proxy.so
+lib/sim/remote.so
+lib/sim/replace.so
+lib/sim/shortcuts.so
+lib/sim/sound.so
+%%SPELL%%lib/sim/spell.so
+lib/sim/splash.so
+lib/sim/styles.so
+%%KDE%%lib/sim/transparent.so
+lib/sim/update.so
+lib/sim/weather.so
+lib/sim/yahoo.so
+lib/sim/zodiak.so
 share/applnk/Internet/sim.desktop
 share/apps/sim/COPYING
+share/apps/sim/pict/connect.gif
 share/apps/sim/pict/connect.mng
 share/apps/sim/pict/splash.png
-share/apps/sim/plugins/__homedir.so
-share/apps/sim/plugins/__migrate.so
-share/apps/sim/plugins/_core.so
-share/apps/sim/plugins/about.so
-share/apps/sim/plugins/action.so
-share/apps/sim/plugins/autoaway.so
-share/apps/sim/plugins/background.so
-share/apps/sim/plugins/dock.so
-share/apps/sim/plugins/filter.so
-share/apps/sim/plugins/floaty.so
-share/apps/sim/plugins/forward.so
-share/apps/sim/plugins/gpg.so
-share/apps/sim/plugins/icons.so
-share/apps/sim/plugins/icq.so
-share/apps/sim/plugins/jabber.so
-share/apps/sim/plugins/logger.so
-%%SSL%%share/apps/sim/plugins/msn.so
-share/apps/sim/plugins/navigate.so
-share/apps/sim/plugins/netmonitor.so
-%%KDE%%share/apps/sim/plugins/ontop.so
-share/apps/sim/plugins/osd.so
-share/apps/sim/plugins/proxy.so
-share/apps/sim/plugins/remote.so
-share/apps/sim/plugins/shortcuts.so
-share/apps/sim/plugins/sound.so
-%%SPELL%%share/apps/sim/plugins/spell.so
-share/apps/sim/plugins/splash.so
-share/apps/sim/plugins/styles.so
-%%KDE%%share/apps/sim/plugins/transparent.so
-share/apps/sim/plugins/update.so
-share/apps/sim/plugins/zodiak.so
 share/apps/sim/sounds/alert.wav
 share/apps/sim/sounds/auth.wav
 share/apps/sim/sounds/contacts.wav
@@ -50,24 +55,42 @@ share/apps/sim/sounds/file.wav
 share/apps/sim/sounds/filedone.wav
 share/apps/sim/sounds/mailpager.wav
 share/apps/sim/sounds/message.wav
+share/apps/sim/sounds/message2.wav
 share/apps/sim/sounds/msgsent.wav
 share/apps/sim/sounds/sms.wav
 share/apps/sim/sounds/startup.wav
 share/apps/sim/sounds/system.wav
 share/apps/sim/sounds/url.wav
+share/apps/sim/sounds/vip-online.wav
 share/apps/sim/sounds/web.wav
+share/apps/sim/styles/SIM.2.xsl
+share/apps/sim/styles/SIM.3.xsl
+share/apps/sim/styles/SIM.4.(2+3).xsl
 share/apps/sim/styles/SIM.xsl
+share/apps/sim/styles/Separated.2.xsl
+share/apps/sim/styles/Separated.3.xsl
+share/apps/sim/styles/Separated.4.xsl
+share/apps/sim/styles/Separated.5.(2+3).xsl
+share/apps/sim/styles/Separated.6.(2+4).xsl
+share/apps/sim/styles/Separated.7.(3+4).xsl
+share/apps/sim/styles/Separated.8.(2+3+4).xsl
+share/apps/sim/styles/Separated.xsl
 share/apps/sim/styles/XChat.xsl
 share/apps/sim/styles/XChat2seconds.xsl
 share/apps/sim/styles/XChat3fullDate.xsl
 share/icons/hicolor/16x16/apps/sim.png
+share/icons/hicolor/22x22/apps/sim.png
 share/icons/hicolor/32x32/apps/sim.png
+share/icons/hicolor/48x48/apps/sim.png
+share/icons/hicolor/64x64/apps/sim.png
 share/icons/locolor/16x16/apps/sim.png
+share/icons/locolor/22x22/apps/sim.png
 share/icons/locolor/32x32/apps/sim.png
 share/locale/bg/LC_MESSAGES/sim.mo
 share/locale/ca/LC_MESSAGES/sim.mo
 share/locale/cs/LC_MESSAGES/sim.mo
 share/locale/de/LC_MESSAGES/sim.mo
+share/locale/el/LC_MESSAGES/sim.mo
 share/locale/es/LC_MESSAGES/sim.mo
 share/locale/fr/LC_MESSAGES/sim.mo
 share/locale/he/LC_MESSAGES/sim.mo
@@ -87,60 +110,31 @@ share/services/simctrl.desktop
 @unexec rmdir %D/share/services 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
-@dirrm share/apps/sim/plugins
 @dirrm share/apps/sim/pict
 @dirrm share/apps/sim
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrm lib/sim
 @unexec rmdir %D/lib/menu 2>/dev/null || true
diff --git a/net-im/simicq/Makefile b/net-im/simicq/Makefile
index fd24507c6368..530227ede2c7 100644
--- a/net-im/simicq/Makefile
+++ b/net-im/simicq/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 
 PORTNAME=	simicq
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/mi/m-i/}
-DISTNAME=	${PORTNAME:S/icq//}-${PORTVERSION}
+DISTNAME=	${PORTNAME:S/icq//}-${PORTVERSION}-2
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Plugin-based instant messenger
 
-LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 USE_GMAKE=	yes
 USE_QT_VER=	3
 USE_PERL5_BUILD=	yes
@@ -53,12 +53,6 @@ pre-everything::
 	@${ECHO_MSG} "You can disable KDE support by defining WITHOUT_KDE."
 .endif
 
-post-extract:
-.for i in _core filter forward icq remote
-	@${TOUCH} ${WRKSRC}/plugins/${i}/Makefile.in
-.endfor
-	@${RM} -f ${WRKSRC}/plugins/remote/simctrl.o
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
 		${CONFIGURE_WRKSRC}/configure
diff --git a/net-im/simicq/distinfo b/net-im/simicq/distinfo
index 7643b46ff542..2f8dac231a3f 100644
--- a/net-im/simicq/distinfo
+++ b/net-im/simicq/distinfo
@@ -1,2 +1,2 @@
-MD5 (sim-0.9.2.tar.gz) = 977db89295f52c4d7742e5f643b66f64
-SIZE (sim-0.9.2.tar.gz) = 3101316
+MD5 (sim-0.9.3-2.tar.gz) = b16e462076540acc13da81832ae79d00
+SIZE (sim-0.9.3-2.tar.gz) = 3728770
diff --git a/net-im/simicq/files/patch-weather.cpp b/net-im/simicq/files/patch-weather.cpp
new file mode 100644
index 000000000000..34f44292749c
--- /dev/null
+++ b/net-im/simicq/files/patch-weather.cpp
@@ -0,0 +1,22 @@
+--- plugins/weather/weather.cpp.orig	Fri Apr  2 12:21:54 2004
++++ plugins/weather/weather.cpp	Fri Apr  2 12:23:55 2004
+@@ -534,8 +534,8 @@
+     res = res.replace(QRegExp("\\%h"), number(getHumidity()) + "%");
+     res = res.replace(QRegExp("\\%w"), number(getWind_speed()) + " " + i18n(getUS()));
+     res = res.replace(QRegExp("\\%x"), QString::number(getWind_speed() * 10 / 36) + " " + i18n("m/s"));
+-    res = res.replace(QRegExp("\\%g"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust()) + i18n(getUS()) + ")" : "");
+-    res = res.replace(QRegExp("\\%y"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust() * 10 / 36) + " " + i18n("m/s") + ")" : "");
++    res = res.replace(QRegExp("\\%g"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust()) + i18n(getUS()) + ")" : QString(""));
++    res = res.replace(QRegExp("\\%y"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust() * 10 / 36) + " " + i18n("m/s") + ")" : QString(""));
+     res = res.replace(QRegExp("\\%p"), number(getPressure()) + " " + i18n(getUP()));
+     res = res.replace(QRegExp("\\%a"), number(getPressure() * 75 / 100));
+     res = res.replace(QRegExp("\\%q"), i18n("weather", getPressureD()));
+@@ -545,7 +545,7 @@
+     res = res.replace(QRegExp("\\%r"), getSun_raise());
+     res = res.replace(QRegExp("\\%s"), getSun_set());
+     res = res.replace(QRegExp("\\%c"), i18n_conditions(getConditions()));
+-    res = res.replace(QRegExp("\\%v"), i18n("weather", getVisibility()) + (atol(getVisibility()) ? QString(" ") + i18n(getUD()) : ""));
++    res = res.replace(QRegExp("\\%v"), i18n("weather", getVisibility()) + (atol(getVisibility()) ? QString(" ") + i18n(getUD()) : QString("")));
+     return res;
+ }
+ 
diff --git a/net-im/simicq/pkg-descr b/net-im/simicq/pkg-descr
index bfe655f30734..d360feb72d62 100644
--- a/net-im/simicq/pkg-descr
+++ b/net-im/simicq/pkg-descr
@@ -1,6 +1,5 @@
 SIM (Simple Instant Messenger) is a plugin-based instant messenger with
-support for various protocols.
-(QT is needed, can be build for KDE).
+support for various protocols (QT is needed, can be build for KDE).
 
 All protocols support richtext-messages, file transfer, typing notification,
 server-side contact list (with postponed synchronization - you can change
@@ -12,5 +11,7 @@ Supported protocols:
     * Oscar - ICQ and AIM support
     * Jabber
     * MSN
+    * Yahoo!
+    * LiveJournal
 
 WWW: http://sim-icq.sourceforge.net/
diff --git a/net-im/simicq/pkg-plist b/net-im/simicq/pkg-plist
index 3e4ad49a7568..b10461b9c1e7 100644
--- a/net-im/simicq/pkg-plist
+++ b/net-im/simicq/pkg-plist
@@ -7,41 +7,46 @@ lib/libsimui.la
 lib/libsimui.so
 lib/libsimui.so.0
 lib/menu/sim-kde.menu
+lib/sim/__homedir.so
+lib/sim/__migrate.so
+lib/sim/_core.so
+lib/sim/about.so
+lib/sim/action.so
+lib/sim/autoaway.so
+lib/sim/background.so
+lib/sim/dock.so
+lib/sim/filter.so
+lib/sim/floaty.so
+lib/sim/forward.so
+lib/sim/gpg.so
+lib/sim/icons.so
+lib/sim/icq.so
+lib/sim/jabber.so
+lib/sim/livejournal.so
+lib/sim/logger.so
+%%SSL%%lib/sim/msn.so
+lib/sim/navigate.so
+lib/sim/netmonitor.so
+%%KDE%%lib/sim/ontop.so
+lib/sim/osd.so
+lib/sim/proxy.so
+lib/sim/remote.so
+lib/sim/replace.so
+lib/sim/shortcuts.so
+lib/sim/sound.so
+%%SPELL%%lib/sim/spell.so
+lib/sim/splash.so
+lib/sim/styles.so
+%%KDE%%lib/sim/transparent.so
+lib/sim/update.so
+lib/sim/weather.so
+lib/sim/yahoo.so
+lib/sim/zodiak.so
 share/applnk/Internet/sim.desktop
 share/apps/sim/COPYING
+share/apps/sim/pict/connect.gif
 share/apps/sim/pict/connect.mng
 share/apps/sim/pict/splash.png
-share/apps/sim/plugins/__homedir.so
-share/apps/sim/plugins/__migrate.so
-share/apps/sim/plugins/_core.so
-share/apps/sim/plugins/about.so
-share/apps/sim/plugins/action.so
-share/apps/sim/plugins/autoaway.so
-share/apps/sim/plugins/background.so
-share/apps/sim/plugins/dock.so
-share/apps/sim/plugins/filter.so
-share/apps/sim/plugins/floaty.so
-share/apps/sim/plugins/forward.so
-share/apps/sim/plugins/gpg.so
-share/apps/sim/plugins/icons.so
-share/apps/sim/plugins/icq.so
-share/apps/sim/plugins/jabber.so
-share/apps/sim/plugins/logger.so
-%%SSL%%share/apps/sim/plugins/msn.so
-share/apps/sim/plugins/navigate.so
-share/apps/sim/plugins/netmonitor.so
-%%KDE%%share/apps/sim/plugins/ontop.so
-share/apps/sim/plugins/osd.so
-share/apps/sim/plugins/proxy.so
-share/apps/sim/plugins/remote.so
-share/apps/sim/plugins/shortcuts.so
-share/apps/sim/plugins/sound.so
-%%SPELL%%share/apps/sim/plugins/spell.so
-share/apps/sim/plugins/splash.so
-share/apps/sim/plugins/styles.so
-%%KDE%%share/apps/sim/plugins/transparent.so
-share/apps/sim/plugins/update.so
-share/apps/sim/plugins/zodiak.so
 share/apps/sim/sounds/alert.wav
 share/apps/sim/sounds/auth.wav
 share/apps/sim/sounds/contacts.wav
@@ -50,24 +55,42 @@ share/apps/sim/sounds/file.wav
 share/apps/sim/sounds/filedone.wav
 share/apps/sim/sounds/mailpager.wav
 share/apps/sim/sounds/message.wav
+share/apps/sim/sounds/message2.wav
 share/apps/sim/sounds/msgsent.wav
 share/apps/sim/sounds/sms.wav
 share/apps/sim/sounds/startup.wav
 share/apps/sim/sounds/system.wav
 share/apps/sim/sounds/url.wav
+share/apps/sim/sounds/vip-online.wav
 share/apps/sim/sounds/web.wav
+share/apps/sim/styles/SIM.2.xsl
+share/apps/sim/styles/SIM.3.xsl
+share/apps/sim/styles/SIM.4.(2+3).xsl
 share/apps/sim/styles/SIM.xsl
+share/apps/sim/styles/Separated.2.xsl
+share/apps/sim/styles/Separated.3.xsl
+share/apps/sim/styles/Separated.4.xsl
+share/apps/sim/styles/Separated.5.(2+3).xsl
+share/apps/sim/styles/Separated.6.(2+4).xsl
+share/apps/sim/styles/Separated.7.(3+4).xsl
+share/apps/sim/styles/Separated.8.(2+3+4).xsl
+share/apps/sim/styles/Separated.xsl
 share/apps/sim/styles/XChat.xsl
 share/apps/sim/styles/XChat2seconds.xsl
 share/apps/sim/styles/XChat3fullDate.xsl
 share/icons/hicolor/16x16/apps/sim.png
+share/icons/hicolor/22x22/apps/sim.png
 share/icons/hicolor/32x32/apps/sim.png
+share/icons/hicolor/48x48/apps/sim.png
+share/icons/hicolor/64x64/apps/sim.png
 share/icons/locolor/16x16/apps/sim.png
+share/icons/locolor/22x22/apps/sim.png
 share/icons/locolor/32x32/apps/sim.png
 share/locale/bg/LC_MESSAGES/sim.mo
 share/locale/ca/LC_MESSAGES/sim.mo
 share/locale/cs/LC_MESSAGES/sim.mo
 share/locale/de/LC_MESSAGES/sim.mo
+share/locale/el/LC_MESSAGES/sim.mo
 share/locale/es/LC_MESSAGES/sim.mo
 share/locale/fr/LC_MESSAGES/sim.mo
 share/locale/he/LC_MESSAGES/sim.mo
@@ -87,60 +110,31 @@ share/services/simctrl.desktop
 @unexec rmdir %D/share/services 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
-@dirrm share/apps/sim/plugins
 @dirrm share/apps/sim/pict
 @dirrm share/apps/sim
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrm lib/sim
 @unexec rmdir %D/lib/menu 2>/dev/null || true
diff --git a/net/simicq/Makefile b/net/simicq/Makefile
index fd24507c6368..530227ede2c7 100644
--- a/net/simicq/Makefile
+++ b/net/simicq/Makefile
@@ -5,18 +5,18 @@
 # $FreeBSD$
 
 PORTNAME=	simicq
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.9.3
 CATEGORIES=	net kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/mi/m-i/}
-DISTNAME=	${PORTNAME:S/icq//}-${PORTVERSION}
+DISTNAME=	${PORTNAME:S/icq//}-${PORTVERSION}-2
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Plugin-based instant messenger
 
-LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron
+LIB_DEPENDS=	xslt.2:${PORTSDIR}/textproc/libxslt
 
+WRKSRC=		${WRKDIR}/${DISTNAME:S/-2//}
 USE_GMAKE=	yes
 USE_QT_VER=	3
 USE_PERL5_BUILD=	yes
@@ -53,12 +53,6 @@ pre-everything::
 	@${ECHO_MSG} "You can disable KDE support by defining WITHOUT_KDE."
 .endif
 
-post-extract:
-.for i in _core filter forward icq remote
-	@${TOUCH} ${WRKSRC}/plugins/${i}/Makefile.in
-.endfor
-	@${RM} -f ${WRKSRC}/plugins/remote/simctrl.o
-
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
 		${CONFIGURE_WRKSRC}/configure
diff --git a/net/simicq/distinfo b/net/simicq/distinfo
index 7643b46ff542..2f8dac231a3f 100644
--- a/net/simicq/distinfo
+++ b/net/simicq/distinfo
@@ -1,2 +1,2 @@
-MD5 (sim-0.9.2.tar.gz) = 977db89295f52c4d7742e5f643b66f64
-SIZE (sim-0.9.2.tar.gz) = 3101316
+MD5 (sim-0.9.3-2.tar.gz) = b16e462076540acc13da81832ae79d00
+SIZE (sim-0.9.3-2.tar.gz) = 3728770
diff --git a/net/simicq/files/patch-weather.cpp b/net/simicq/files/patch-weather.cpp
new file mode 100644
index 000000000000..34f44292749c
--- /dev/null
+++ b/net/simicq/files/patch-weather.cpp
@@ -0,0 +1,22 @@
+--- plugins/weather/weather.cpp.orig	Fri Apr  2 12:21:54 2004
++++ plugins/weather/weather.cpp	Fri Apr  2 12:23:55 2004
+@@ -534,8 +534,8 @@
+     res = res.replace(QRegExp("\\%h"), number(getHumidity()) + "%");
+     res = res.replace(QRegExp("\\%w"), number(getWind_speed()) + " " + i18n(getUS()));
+     res = res.replace(QRegExp("\\%x"), QString::number(getWind_speed() * 10 / 36) + " " + i18n("m/s"));
+-    res = res.replace(QRegExp("\\%g"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust()) + i18n(getUS()) + ")" : "");
+-    res = res.replace(QRegExp("\\%y"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust() * 10 / 36) + " " + i18n("m/s") + ")" : "");
++    res = res.replace(QRegExp("\\%g"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust()) + i18n(getUS()) + ")" : QString(""));
++    res = res.replace(QRegExp("\\%y"), getWindGust() ? QString("(") + i18n("gust ") + number(getWindGust() * 10 / 36) + " " + i18n("m/s") + ")" : QString(""));
+     res = res.replace(QRegExp("\\%p"), number(getPressure()) + " " + i18n(getUP()));
+     res = res.replace(QRegExp("\\%a"), number(getPressure() * 75 / 100));
+     res = res.replace(QRegExp("\\%q"), i18n("weather", getPressureD()));
+@@ -545,7 +545,7 @@
+     res = res.replace(QRegExp("\\%r"), getSun_raise());
+     res = res.replace(QRegExp("\\%s"), getSun_set());
+     res = res.replace(QRegExp("\\%c"), i18n_conditions(getConditions()));
+-    res = res.replace(QRegExp("\\%v"), i18n("weather", getVisibility()) + (atol(getVisibility()) ? QString(" ") + i18n(getUD()) : ""));
++    res = res.replace(QRegExp("\\%v"), i18n("weather", getVisibility()) + (atol(getVisibility()) ? QString(" ") + i18n(getUD()) : QString("")));
+     return res;
+ }
+ 
diff --git a/net/simicq/pkg-descr b/net/simicq/pkg-descr
index bfe655f30734..d360feb72d62 100644
--- a/net/simicq/pkg-descr
+++ b/net/simicq/pkg-descr
@@ -1,6 +1,5 @@
 SIM (Simple Instant Messenger) is a plugin-based instant messenger with
-support for various protocols.
-(QT is needed, can be build for KDE).
+support for various protocols (QT is needed, can be build for KDE).
 
 All protocols support richtext-messages, file transfer, typing notification,
 server-side contact list (with postponed synchronization - you can change
@@ -12,5 +11,7 @@ Supported protocols:
     * Oscar - ICQ and AIM support
     * Jabber
     * MSN
+    * Yahoo!
+    * LiveJournal
 
 WWW: http://sim-icq.sourceforge.net/
diff --git a/net/simicq/pkg-plist b/net/simicq/pkg-plist
index 3e4ad49a7568..b10461b9c1e7 100644
--- a/net/simicq/pkg-plist
+++ b/net/simicq/pkg-plist
@@ -7,41 +7,46 @@ lib/libsimui.la
 lib/libsimui.so
 lib/libsimui.so.0
 lib/menu/sim-kde.menu
+lib/sim/__homedir.so
+lib/sim/__migrate.so
+lib/sim/_core.so
+lib/sim/about.so
+lib/sim/action.so
+lib/sim/autoaway.so
+lib/sim/background.so
+lib/sim/dock.so
+lib/sim/filter.so
+lib/sim/floaty.so
+lib/sim/forward.so
+lib/sim/gpg.so
+lib/sim/icons.so
+lib/sim/icq.so
+lib/sim/jabber.so
+lib/sim/livejournal.so
+lib/sim/logger.so
+%%SSL%%lib/sim/msn.so
+lib/sim/navigate.so
+lib/sim/netmonitor.so
+%%KDE%%lib/sim/ontop.so
+lib/sim/osd.so
+lib/sim/proxy.so
+lib/sim/remote.so
+lib/sim/replace.so
+lib/sim/shortcuts.so
+lib/sim/sound.so
+%%SPELL%%lib/sim/spell.so
+lib/sim/splash.so
+lib/sim/styles.so
+%%KDE%%lib/sim/transparent.so
+lib/sim/update.so
+lib/sim/weather.so
+lib/sim/yahoo.so
+lib/sim/zodiak.so
 share/applnk/Internet/sim.desktop
 share/apps/sim/COPYING
+share/apps/sim/pict/connect.gif
 share/apps/sim/pict/connect.mng
 share/apps/sim/pict/splash.png
-share/apps/sim/plugins/__homedir.so
-share/apps/sim/plugins/__migrate.so
-share/apps/sim/plugins/_core.so
-share/apps/sim/plugins/about.so
-share/apps/sim/plugins/action.so
-share/apps/sim/plugins/autoaway.so
-share/apps/sim/plugins/background.so
-share/apps/sim/plugins/dock.so
-share/apps/sim/plugins/filter.so
-share/apps/sim/plugins/floaty.so
-share/apps/sim/plugins/forward.so
-share/apps/sim/plugins/gpg.so
-share/apps/sim/plugins/icons.so
-share/apps/sim/plugins/icq.so
-share/apps/sim/plugins/jabber.so
-share/apps/sim/plugins/logger.so
-%%SSL%%share/apps/sim/plugins/msn.so
-share/apps/sim/plugins/navigate.so
-share/apps/sim/plugins/netmonitor.so
-%%KDE%%share/apps/sim/plugins/ontop.so
-share/apps/sim/plugins/osd.so
-share/apps/sim/plugins/proxy.so
-share/apps/sim/plugins/remote.so
-share/apps/sim/plugins/shortcuts.so
-share/apps/sim/plugins/sound.so
-%%SPELL%%share/apps/sim/plugins/spell.so
-share/apps/sim/plugins/splash.so
-share/apps/sim/plugins/styles.so
-%%KDE%%share/apps/sim/plugins/transparent.so
-share/apps/sim/plugins/update.so
-share/apps/sim/plugins/zodiak.so
 share/apps/sim/sounds/alert.wav
 share/apps/sim/sounds/auth.wav
 share/apps/sim/sounds/contacts.wav
@@ -50,24 +55,42 @@ share/apps/sim/sounds/file.wav
 share/apps/sim/sounds/filedone.wav
 share/apps/sim/sounds/mailpager.wav
 share/apps/sim/sounds/message.wav
+share/apps/sim/sounds/message2.wav
 share/apps/sim/sounds/msgsent.wav
 share/apps/sim/sounds/sms.wav
 share/apps/sim/sounds/startup.wav
 share/apps/sim/sounds/system.wav
 share/apps/sim/sounds/url.wav
+share/apps/sim/sounds/vip-online.wav
 share/apps/sim/sounds/web.wav
+share/apps/sim/styles/SIM.2.xsl
+share/apps/sim/styles/SIM.3.xsl
+share/apps/sim/styles/SIM.4.(2+3).xsl
 share/apps/sim/styles/SIM.xsl
+share/apps/sim/styles/Separated.2.xsl
+share/apps/sim/styles/Separated.3.xsl
+share/apps/sim/styles/Separated.4.xsl
+share/apps/sim/styles/Separated.5.(2+3).xsl
+share/apps/sim/styles/Separated.6.(2+4).xsl
+share/apps/sim/styles/Separated.7.(3+4).xsl
+share/apps/sim/styles/Separated.8.(2+3+4).xsl
+share/apps/sim/styles/Separated.xsl
 share/apps/sim/styles/XChat.xsl
 share/apps/sim/styles/XChat2seconds.xsl
 share/apps/sim/styles/XChat3fullDate.xsl
 share/icons/hicolor/16x16/apps/sim.png
+share/icons/hicolor/22x22/apps/sim.png
 share/icons/hicolor/32x32/apps/sim.png
+share/icons/hicolor/48x48/apps/sim.png
+share/icons/hicolor/64x64/apps/sim.png
 share/icons/locolor/16x16/apps/sim.png
+share/icons/locolor/22x22/apps/sim.png
 share/icons/locolor/32x32/apps/sim.png
 share/locale/bg/LC_MESSAGES/sim.mo
 share/locale/ca/LC_MESSAGES/sim.mo
 share/locale/cs/LC_MESSAGES/sim.mo
 share/locale/de/LC_MESSAGES/sim.mo
+share/locale/el/LC_MESSAGES/sim.mo
 share/locale/es/LC_MESSAGES/sim.mo
 share/locale/fr/LC_MESSAGES/sim.mo
 share/locale/he/LC_MESSAGES/sim.mo
@@ -87,60 +110,31 @@ share/services/simctrl.desktop
 @unexec rmdir %D/share/services 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk/application 2>/dev/null || true
 @unexec rmdir %D/share/mimelnk 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/zh_TW 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/tr 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sw 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/share/locale/he/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/he 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/bg 2>/dev/null || true
-@unexec rmdir %D/share/locale 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
 @unexec rmdir %D/share/icons 2>/dev/null || true
 @dirrm share/apps/sim/styles
 @dirrm share/apps/sim/sounds
-@dirrm share/apps/sim/plugins
 @dirrm share/apps/sim/pict
 @dirrm share/apps/sim
 @unexec rmdir %D/share/apps 2>/dev/null || true
 @unexec rmdir %D/share/applnk/Internet 2>/dev/null || true
 @unexec rmdir %D/share/applnk 2>/dev/null || true
+@dirrm lib/sim
 @unexec rmdir %D/lib/menu 2>/dev/null || true