11 files changed, 357 insertions, 380 deletions

diff --git a/net-im/tkabber-devel/Makefile b/net-im/tkabber-devel/Makefile
index 7591900ed9a2..eb02bb4b3e39 100644
--- a/net-im/tkabber-devel/Makefile
+++ b/net-im/tkabber-devel/Makefile
@@ -1,48 +1,53 @@
-# New ports collection makefile for:	tkabber
-# Date created:				22 October 2003
-# Whom:					Alexander Timoshenko <gonzo@univ.kiev.ua>
+# New ports collection makefile for:	tkabber-devel
+# Date created:				09 July 2005
+# Whom:					Denis Shaposhnikov <dsh@vlink.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tkabber
-PORTVERSION=	0.9.7
+PORTVERSION=	0.9.8.a.20050621
 CATEGORIES=	net
-MASTER_SITES=	http://www.jabber.ru/files/tkabber/
+MASTER_SITES=	http://neva.vlink.ru/distfiles/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	alexander.timoshenko@gmail.com
-COMMENT=	Tcl/Tk based jabber client
-
-TCLLIBVER!=	${MAKE} -C ${.CURDIR}/../../devel/tcllib -V PORTVERSION 2>/dev/null \
-		|| (cd ${.CURDIR}/../../devel/tcllib; ${MAKE} -V PORTVERSION)
+MAINTAINER=	dsh@vlink.ru
+COMMENT=	Tcl/Tk based jabber client, development version
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		${LOCALBASE}/lib/tcllib${TCLLIBVER}/pkgIndex.tcl:${PORTSDIR}/devel/tcllib \
+		${LOCALBASE}/lib/tcllib1.7/pkgIndex.tcl:${PORTSDIR}/devel/tcllib \
 		${LOCALBASE}/lib/tls/pkgIndex.tcl:${PORTSDIR}/devel/tcltls \
 		${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+CONFLICTS=	tkabber-[0-9]*
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_BZIP2=	yes
 
 SUBDIRS=	aniemoteicons emoticons-tkabber ifaceck ifacetk plugins \
 		jabberlib-tclxml pixmaps sounds textundo msgs mclistbox-1.02
 
 do-install:
 	${ECHO} -e "#!/bin/sh\nexec wish8.4 ${DATADIR}/tkabber.tcl \
-		-name tkabber \"\$$@\"\n" > ${PREFIX}/bin/tkabber
-	${CHMOD} +x ${PREFIX}/bin/tkabber
+		-name tkabber \"\$$@\"\n" > ${WRKDIR}/tkabber.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/tkabber.sh ${PREFIX}/bin/tkabber
+
 	${MKDIR} ${DATADIR}
-	${CP} ${WRKSRC}/*.tcl ${DATADIR}
+	${CP} ${WRKSRC}/*.tcl ${DATADIR}/
 .for i in ${SUBDIRS}
-	${CP} -R ${WRKSRC}/${i} ${DATADIR}
+	${CP} -R ${WRKSRC}/${i} ${DATADIR}/
 .endfor
+
 	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}/
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in tkabber.html tkabber.xml
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.for i in AUTHORS COPYING ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/net-im/tkabber-devel/distinfo b/net-im/tkabber-devel/distinfo
index 53bbf34f9903..372430c60e86 100644
--- a/net-im/tkabber-devel/distinfo
+++ b/net-im/tkabber-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tkabber-0.9.7.tar.gz) = 41a0f24239415edb8e3d2cd86e532f38
-SIZE (tkabber-0.9.7.tar.gz) = 714184
+MD5 (tkabber-0.9.8.a.20050621.tar.bz2) = 675d215cfafb3a8bf889d2104c4e4fdf
+SIZE (tkabber-0.9.8.a.20050621.tar.bz2) = 608799
diff --git a/net-im/tkabber-devel/files/patch-login.tcl b/net-im/tkabber-devel/files/patch-login.tcl
deleted file mode 100644
index 22f7687b9d12..000000000000
--- a/net-im/tkabber-devel/files/patch-login.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
---- login.tcl.orig	Tue Aug  3 14:35:36 2004
-+++ login.tcl	Tue Aug  3 14:35:54 2004
-@@ -36,10 +36,10 @@
- custom::defvar loginconf(usedigest) 1 \
-     [::msgcat::mc "Use hashed password transmission."] \
-     -group Login -type boolean
--custom::defvar loginconf(resource) "tkabber" \
-+custom::defvar loginconf(resource) "TKabber" \
-     [::msgcat::mc "Resource."] \
-     -group Login -type string
--custom::defvar loginconf(server) "localhost" \
-+custom::defvar loginconf(server) "jabber.ru" \
-     [::msgcat::mc "Server name."] \
-     -group Login -type string
- custom::defvar loginconf(port) "5222" \
diff --git a/net-im/tkabber-devel/files/patch-tkabber.tcl b/net-im/tkabber-devel/files/patch-tkabber.tcl
deleted file mode 100644
index 194b89eea4b9..000000000000
--- a/net-im/tkabber-devel/files/patch-tkabber.tcl
+++ /dev/null
@@ -1,19 +0,0 @@
---- tkabber.tcl.orig	Tue Jul 27 17:37:59 2004
-+++ tkabber.tcl	Tue Aug  3 14:34:43 2004
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using the correct interpreter \
--exec wish "$0" -name tkabber "$@"
-+exec wish8.4 "$0" -name tkabber "$@"
- 
- # $Id: tkabber.tcl,v 1.219 2004/07/10 20:05:04 aleksey Exp $
- 
-@@ -118,7 +118,7 @@
-             debugmsg tkabber "closed $chan '$res'"
-         }
-     }
--    exit $status
-+    quit $status
- }
- 
- namespace eval ssj {}
diff --git a/net-im/tkabber-devel/pkg-plist b/net-im/tkabber-devel/pkg-plist
index 9544a24466fb..dd0e33b4453d 100644
--- a/net-im/tkabber-devel/pkg-plist
+++ b/net-im/tkabber-devel/pkg-plist
@@ -2,7 +2,6 @@ bin/tkabber
 %%DATADIR%%/Tclx.tcl
 %%DATADIR%%/aniemoteicons/aniemoteicons.tcl
 %%DATADIR%%/aniemoteicons/anigif.tcl
-%%DATADIR%%/avatars.tcl
 %%DATADIR%%/balloon.tcl
 %%DATADIR%%/browser.tcl
 %%DATADIR%%/chats.tcl
@@ -38,21 +37,21 @@ bin/tkabber
 %%DATADIR%%/ifacetk/iface.tcl
 %%DATADIR%%/ifacetk/ilogin.tcl
 %%DATADIR%%/ifacetk/iroster.tcl
+%%DATADIR%%/ifacetk/unix.xrdb
 %%DATADIR%%/iq.tcl
 %%DATADIR%%/itemedit.tcl
 %%DATADIR%%/jabberlib-tclxml/jabberlib.tcl
+%%DATADIR%%/jabberlib-tclxml/ntlm.tcl
 %%DATADIR%%/jabberlib-tclxml/pkgIndex.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/pkgIndex.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.1.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/sgmlparser.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.1.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.1.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xml__tcl.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xmldep.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xpath.tcl
+%%DATADIR%%/jabberlib-tclxml/transports.tcl
 %%DATADIR%%/jabberlib-tclxml/wrapper.tcl
 %%DATADIR%%/jidlink.tcl
 %%DATADIR%%/joingrdialog.tcl
@@ -77,11 +76,11 @@ bin/tkabber
 %%DATADIR%%/msgs/ua.msg
 %%DATADIR%%/muc.tcl
 %%DATADIR%%/negotiate.tcl
-%%DATADIR%%/pixmaps/amibulb/browser/aim_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/icq_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/msn_online.gif
+%%DATADIR%%/pixmaps/amibulb/browser/aim.gif
+%%DATADIR%%/pixmaps/amibulb/browser/icq.gif
+%%DATADIR%%/pixmaps/amibulb/browser/msn.gif
 %%DATADIR%%/pixmaps/amibulb/browser/user.gif
-%%DATADIR%%/pixmaps/amibulb/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/amibulb/browser/yahoo.gif
 %%DATADIR%%/pixmaps/amibulb/docking/tkabber.ico
 %%DATADIR%%/pixmaps/amibulb/roster/available-away.gif
 %%DATADIR%%/pixmaps/amibulb/roster/available-chat.gif
@@ -90,33 +89,34 @@ bin/tkabber
 %%DATADIR%%/pixmaps/amibulb/roster/available.gif
 %%DATADIR%%/pixmaps/amibulb/roster/group-closed.gif
 %%DATADIR%%/pixmaps/amibulb/roster/group-opened.gif
-%%DATADIR%%/pixmaps/amibulb/roster/icondef.xml
 %%DATADIR%%/pixmaps/amibulb/roster/invisible.gif
 %%DATADIR%%/pixmaps/amibulb/roster/stalker.gif
 %%DATADIR%%/pixmaps/amibulb/roster/unavailable.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/browser/aim_online.gif
-%%DATADIR%%/pixmaps/default/browser/gg_online.gif
-%%DATADIR%%/pixmaps/default/browser/glade-message.gif
-%%DATADIR%%/pixmaps/default/browser/group_on.gif
-%%DATADIR%%/pixmaps/default/browser/icq_online.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/default/browser/aim.gif
+%%DATADIR%%/pixmaps/default/browser/conference.gif
+%%DATADIR%%/pixmaps/default/browser/gg.gif
+%%DATADIR%%/pixmaps/default/browser/icq.gif
 %%DATADIR%%/pixmaps/default/browser/jud.gif
-%%DATADIR%%/pixmaps/default/browser/msn_online.gif
-%%DATADIR%%/pixmaps/default/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/default/browser/unknown.gif
+%%DATADIR%%/pixmaps/default/browser/message.gif
+%%DATADIR%%/pixmaps/default/browser/msn.gif
 %%DATADIR%%/pixmaps/default/browser/user.gif
-%%DATADIR%%/pixmaps/default/browser/weather_online.gif
-%%DATADIR%%/pixmaps/default/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/default/browser/weather.gif
+%%DATADIR%%/pixmaps/default/browser/yahoo.gif
 %%DATADIR%%/pixmaps/default/docking/available-away.gif
 %%DATADIR%%/pixmaps/default/docking/available-chat.gif
 %%DATADIR%%/pixmaps/default/docking/available-dnd.gif
 %%DATADIR%%/pixmaps/default/docking/available-xa.gif
 %%DATADIR%%/pixmaps/default/docking/available.gif
+%%DATADIR%%/pixmaps/default/docking/blank.gif
 %%DATADIR%%/pixmaps/default/docking/invisible.gif
+%%DATADIR%%/pixmaps/default/docking/message-personal.gif
+%%DATADIR%%/pixmaps/default/docking/message-server.gif
+%%DATADIR%%/pixmaps/default/docking/message.gif
 %%DATADIR%%/pixmaps/default/docking/tkabber.ico
 %%DATADIR%%/pixmaps/default/docking/unavailable.gif
 %%DATADIR%%/pixmaps/default/roster/available-away.gif
@@ -124,10 +124,10 @@ bin/tkabber
 %%DATADIR%%/pixmaps/default/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/default/roster/available-xa.gif
 %%DATADIR%%/pixmaps/default/roster/available.gif
+%%DATADIR%%/pixmaps/default/roster/conference-available.gif
+%%DATADIR%%/pixmaps/default/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/default/roster/group-closed.gif
 %%DATADIR%%/pixmaps/default/roster/group-opened.gif
-%%DATADIR%%/pixmaps/default/roster/group_off.gif
-%%DATADIR%%/pixmaps/default/roster/group_on.gif
 %%DATADIR%%/pixmaps/default/roster/invisible.gif
 %%DATADIR%%/pixmaps/default/roster/stalker.gif
 %%DATADIR%%/pixmaps/default/roster/unavailable.gif
@@ -156,9 +156,12 @@ bin/tkabber
 %%DATADIR%%/pixmaps/default/services/msn_offline.xpm
 %%DATADIR%%/pixmaps/default/services/msn_online.xpm
 %%DATADIR%%/pixmaps/default/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/default/services/rss.xpm
-%%DATADIR%%/pixmaps/default/services/rss2.xpm
-%%DATADIR%%/pixmaps/default/services/rss3.xpm
+%%DATADIR%%/pixmaps/default/services/rss_away.xpm
+%%DATADIR%%/pixmaps/default/services/rss_chat.xpm
+%%DATADIR%%/pixmaps/default/services/rss_dnd.xpm
+%%DATADIR%%/pixmaps/default/services/rss_offline.xpm
+%%DATADIR%%/pixmaps/default/services/rss_online.xpm
+%%DATADIR%%/pixmaps/default/services/rss_xa.xpm
 %%DATADIR%%/pixmaps/default/services/sms.xpm
 %%DATADIR%%/pixmaps/default/services/weather_away.gif
 %%DATADIR%%/pixmaps/default/services/weather_chat.gif
@@ -172,23 +175,23 @@ bin/tkabber
 %%DATADIR%%/pixmaps/default/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/default/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/default/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/default/tkabber/bookmark.xpm
-%%DATADIR%%/pixmaps/default/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-online.gif
+%%DATADIR%%/pixmaps/default/tkabber/chat-bookmark.xpm
 %%DATADIR%%/pixmaps/default/tkabber/gpg-badsigned.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-encrypted.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-signed.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-unencrypted.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/default/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/tkabber/mainlogo.gif
 %%DATADIR%%/pixmaps/default/tkabber/new-msg.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_bk.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_case.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_exact.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_fw.gif
+%%DATADIR%%/pixmaps/default/tkabber/tkabber-logo.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-away.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-chat.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-dnd.gif
@@ -196,20 +199,23 @@ bin/tkabber
 %%DATADIR%%/pixmaps/feather22/roster/available.gif
 %%DATADIR%%/pixmaps/feather22/roster/invisible.gif
 %%DATADIR%%/pixmaps/feather22/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/glade-message.gif
-%%DATADIR%%/pixmaps/gabber/browser/group_on.gif
-%%DATADIR%%/pixmaps/gabber/browser/icq_online.gif
+%%DATADIR%%/pixmaps/gabber/browser/aim.gif
+%%DATADIR%%/pixmaps/gabber/browser/conference.gif
+%%DATADIR%%/pixmaps/gabber/browser/icq.gif
 %%DATADIR%%/pixmaps/gabber/browser/jud.gif
-%%DATADIR%%/pixmaps/gabber/browser/msn_online.gif
+%%DATADIR%%/pixmaps/gabber/browser/message.gif
+%%DATADIR%%/pixmaps/gabber/browser/msn.gif
 %%DATADIR%%/pixmaps/gabber/browser/user.gif
-%%DATADIR%%/pixmaps/gabber/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/gabber/browser/yahoo.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-away.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-chat.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-dnd.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-xa.gif
 %%DATADIR%%/pixmaps/gabber/docking/available.gif
 %%DATADIR%%/pixmaps/gabber/docking/invisible.gif
+%%DATADIR%%/pixmaps/gabber/docking/message-personal.gif
+%%DATADIR%%/pixmaps/gabber/docking/message-server.gif
+%%DATADIR%%/pixmaps/gabber/docking/message.gif
 %%DATADIR%%/pixmaps/gabber/docking/tkabber.ico
 %%DATADIR%%/pixmaps/gabber/docking/unavailable.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-away.gif
@@ -217,11 +223,10 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gabber/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-xa.gif
 %%DATADIR%%/pixmaps/gabber/roster/available.gif
-%%DATADIR%%/pixmaps/gabber/roster/glade-groupchat-menu.xpm
+%%DATADIR%%/pixmaps/gabber/roster/conference-available.gif
+%%DATADIR%%/pixmaps/gabber/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/gabber/roster/group-closed.gif
 %%DATADIR%%/pixmaps/gabber/roster/group-opened.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_off.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_on.gif
 %%DATADIR%%/pixmaps/gabber/roster/stalker.gif
 %%DATADIR%%/pixmaps/gabber/roster/unavailable.gif
 %%DATADIR%%/pixmaps/gabber/services/aim_away.xpm
@@ -243,9 +248,12 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gabber/services/msn_offline.xpm
 %%DATADIR%%/pixmaps/gabber/services/msn_online.xpm
 %%DATADIR%%/pixmaps/gabber/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss2.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss3.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_away.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_chat.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_dnd.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_offline.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_online.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_xa.xpm
 %%DATADIR%%/pixmaps/gabber/services/sms.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_away.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_chat.xpm
@@ -253,16 +261,16 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gabber/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/jb.gif
-%%DATADIR%%/pixmaps/gush/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gush/browser/icq_online.gif
-%%DATADIR%%/pixmaps/gush/browser/msn_online.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/gush/browser/aim.gif
+%%DATADIR%%/pixmaps/gush/browser/icq.gif
+%%DATADIR%%/pixmaps/gush/browser/msn.gif
 %%DATADIR%%/pixmaps/gush/browser/user.gif
-%%DATADIR%%/pixmaps/gush/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/gush/browser/yahoo.gif
 %%DATADIR%%/pixmaps/gush/docking/tkabber.ico
 %%DATADIR%%/pixmaps/gush/roster/available-away.gif
 %%DATADIR%%/pixmaps/gush/roster/available-chat.gif
@@ -275,11 +283,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gush/roster/invisible.gif
 %%DATADIR%%/pixmaps/gush/roster/stalker.gif
 %%DATADIR%%/pixmaps/gush/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gush/tkabber/jb.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/icq/docking/available-away.gif
 %%DATADIR%%/pixmaps/icq/docking/available-chat.gif
 %%DATADIR%%/pixmaps/icq/docking/available-dnd.gif
@@ -297,20 +305,20 @@ bin/tkabber
 %%DATADIR%%/pixmaps/icq/roster/send.gif
 %%DATADIR%%/pixmaps/icq/roster/stalker.gif
 %%DATADIR%%/pixmaps/icq/roster/unavailable.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/icq/tkabber/jb.gif
-%%DATADIR%%/pixmaps/icq/tkabber/mainlogo.gif
 %%DATADIR%%/pixmaps/icq/tkabber/new-msg.gif
-%%DATADIR%%/pixmaps/jajc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/group_on.gif
-%%DATADIR%%/pixmaps/jajc/browser/icq_online.gif
+%%DATADIR%%/pixmaps/icq/tkabber/tkabber-logo.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/jajc/browser/aim.gif
+%%DATADIR%%/pixmaps/jajc/browser/conference.gif
+%%DATADIR%%/pixmaps/jajc/browser/icq.gif
 %%DATADIR%%/pixmaps/jajc/browser/jud.gif
-%%DATADIR%%/pixmaps/jajc/browser/msn_online.gif
+%%DATADIR%%/pixmaps/jajc/browser/msn.gif
 %%DATADIR%%/pixmaps/jajc/browser/user.gif
-%%DATADIR%%/pixmaps/jajc/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/jajc/browser/yahoo.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-away.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-chat.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-dnd.gif
@@ -323,11 +331,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jajc/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/jajc/roster/available-xa.gif
 %%DATADIR%%/pixmaps/jajc/roster/available.gif
+%%DATADIR%%/pixmaps/jajc/roster/conference-available.gif
+%%DATADIR%%/pixmaps/jajc/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/jajc/roster/group-closed.gif
 %%DATADIR%%/pixmaps/jajc/roster/group-opened.gif
 %%DATADIR%%/pixmaps/jajc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_off.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_on.gif
 %%DATADIR%%/pixmaps/jajc/roster/group_opened.gif
 %%DATADIR%%/pixmaps/jajc/roster/unavailable.gif
 %%DATADIR%%/pixmaps/jajc/services/aim_away.xpm
@@ -356,11 +364,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jajc/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/jajc/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/jajc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/jb.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-away.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-chat.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-dnd.gif
@@ -368,18 +376,16 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jarl/roster/available.gif
 %%DATADIR%%/pixmaps/jarl/roster/invisible.gif
 %%DATADIR%%/pixmaps/jarl/roster/unavailable.gif
-%%DATADIR%%/pixmaps/kroc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/gg_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/glade-message.gif
-%%DATADIR%%/pixmaps/kroc/browser/group_on.gif
-%%DATADIR%%/pixmaps/kroc/browser/icq_online.gif
+%%DATADIR%%/pixmaps/kroc/browser/aim.gif
+%%DATADIR%%/pixmaps/kroc/browser/conference.gif
+%%DATADIR%%/pixmaps/kroc/browser/gg.gif
+%%DATADIR%%/pixmaps/kroc/browser/icq.gif
 %%DATADIR%%/pixmaps/kroc/browser/jud.gif
-%%DATADIR%%/pixmaps/kroc/browser/msn_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/kroc/browser/unknown.gif
+%%DATADIR%%/pixmaps/kroc/browser/message.gif
+%%DATADIR%%/pixmaps/kroc/browser/msn.gif
 %%DATADIR%%/pixmaps/kroc/browser/user.gif
-%%DATADIR%%/pixmaps/kroc/browser/weather_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/kroc/browser/weather.gif
+%%DATADIR%%/pixmaps/kroc/browser/yahoo.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-away.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-chat.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-dnd.gif
@@ -393,12 +399,10 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/kroc/roster/available-xa.gif
 %%DATADIR%%/pixmaps/kroc/roster/available.gif
+%%DATADIR%%/pixmaps/kroc/roster/conference-available.gif
+%%DATADIR%%/pixmaps/kroc/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/kroc/roster/group-closed.gif
 %%DATADIR%%/pixmaps/kroc/roster/group-opened.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_off.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_on.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_opened.gif
 %%DATADIR%%/pixmaps/kroc/roster/invisible.gif
 %%DATADIR%%/pixmaps/kroc/roster/stalker.gif
 %%DATADIR%%/pixmaps/kroc/roster/unavailable.gif
@@ -427,9 +431,12 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/services/msn_offline.xpm
 %%DATADIR%%/pixmaps/kroc/services/msn_online.xpm
 %%DATADIR%%/pixmaps/kroc/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss2.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss3.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_away.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_chat.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_dnd.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_offline.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_online.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_xa.xpm
 %%DATADIR%%/pixmaps/kroc/services/sms.xpm
 %%DATADIR%%/pixmaps/kroc/services/weather_away.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_chat.gif
@@ -443,26 +450,26 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/kroc/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/kroc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-online.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-badsigned.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-encrypted.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-signed.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-unencrypted.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/jb.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/new-msg.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_bk.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_case.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_exact.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_fw.gif
-%%DATADIR%%/pixmaps/psi/browser/aim_online.gif
-%%DATADIR%%/pixmaps/psi/browser/icq_online.gif
-%%DATADIR%%/pixmaps/psi/browser/msn_online.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/psi/browser/aim.gif
+%%DATADIR%%/pixmaps/psi/browser/icq.gif
+%%DATADIR%%/pixmaps/psi/browser/msn.gif
 %%DATADIR%%/pixmaps/psi/browser/user.gif
-%%DATADIR%%/pixmaps/psi/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/psi/browser/yahoo.gif
 %%DATADIR%%/pixmaps/psi/roster/available-away.gif
 %%DATADIR%%/pixmaps/psi/roster/available-chat.gif
 %%DATADIR%%/pixmaps/psi/roster/available-dnd.gif
@@ -472,11 +479,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/psi/roster/group-opened.gif
 %%DATADIR%%/pixmaps/psi/roster/stalker.gif
 %%DATADIR%%/pixmaps/psi/roster/unavailable.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/psi/tkabber/jb.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-show-online.gif
 %%DATADIR%%/plugins.tcl
 %%DATADIR%%/plugins/chat/bookmark_highlighted.tcl
 %%DATADIR%%/plugins/chat/clear.tcl
@@ -501,20 +508,26 @@ bin/tkabber
 %%DATADIR%%/plugins/chat/logger.tcl
 %%DATADIR%%/plugins/chat/me_command.tcl
 %%DATADIR%%/plugins/chat/nick_colors.tcl
+%%DATADIR%%/plugins/chat/open_chat.tcl
 %%DATADIR%%/plugins/chat/open_window.tcl
 %%DATADIR%%/plugins/chat/popupmenu.tcl
+%%DATADIR%%/plugins/chat/search.tcl
 %%DATADIR%%/plugins/chat/send_message.tcl
 %%DATADIR%%/plugins/chat/unisymbols.tcl
 %%DATADIR%%/plugins/filetransfer/http.tcl
 %%DATADIR%%/plugins/filetransfer/jidlink.tcl
 %%DATADIR%%/plugins/filetransfer/si.tcl
 %%DATADIR%%/plugins/general/autoaway.tcl
+%%DATADIR%%/plugins/general/avatars.tcl
 %%DATADIR%%/plugins/general/clientinfo.tcl
 %%DATADIR%%/plugins/general/conferenceinfo.tcl
 %%DATADIR%%/plugins/general/message_archive.tcl
+%%DATADIR%%/plugins/general/offline.tcl
 %%DATADIR%%/plugins/general/presenceinfo.tcl
 %%DATADIR%%/plugins/general/rawxml.tcl
+%%DATADIR%%/plugins/general/sound.tcl
 %%DATADIR%%/plugins/general/stats.tcl
+%%DATADIR%%/plugins/general/subscribe_gateway.tcl
 %%DATADIR%%/plugins/general/tkcon.tcl
 %%DATADIR%%/plugins/iq/browse.tcl
 %%DATADIR%%/plugins/iq/last.tcl
@@ -529,6 +542,7 @@ bin/tkabber
 %%DATADIR%%/plugins/unix/ispell.tcl
 %%DATADIR%%/plugins/unix/menu.tcl
 %%DATADIR%%/plugins/unix/menu8.4.tcl
+%%DATADIR%%/plugins/unix/systray.tcl
 %%DATADIR%%/plugins/unix/wmdock.tcl
 %%DATADIR%%/plugins/windows/console.tcl
 %%DATADIR%%/plugins/windows/mousewheel.tcl
@@ -539,7 +553,6 @@ bin/tkabber
 %%DATADIR%%/roster.tcl
 %%DATADIR%%/search.tcl
 %%DATADIR%%/si.tcl
-%%DATADIR%%/sound.tcl
 %%DATADIR%%/sounds/default/chat_their_message.wav
 %%DATADIR%%/sounds/default/connected.wav
 %%DATADIR%%/sounds/default/groupchat_server_message.wav
@@ -568,11 +581,11 @@ bin/tkabber
 %%EXAMPLESDIR%%/config.tcl
 %%EXAMPLESDIR%%/dark.xrdb
 %%EXAMPLESDIR%%/dark2.xrdb
-%%EXAMPLESDIR%%/ermine.xrdb
 %%EXAMPLESDIR%%/green.xrdb
 %%EXAMPLESDIR%%/ice.xrdb
 %%EXAMPLESDIR%%/light.xrdb
 %%EXAMPLESDIR%%/mtr-config.tcl
+%%EXAMPLESDIR%%/ocean-deep.xrdb
 %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/build.sh
 %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/tclCarbonNotification.tcl
 %%EXAMPLESDIR%%/teo-config.tcl
@@ -584,7 +597,9 @@ bin/tkabber
 %%EXAMPLESDIR%%/tools/rssbot
 %%EXAMPLESDIR%%/tools/rssbot.tcl
 %%EXAMPLESDIR%%/warm.xrdb
-
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/tkabber.html
 %%PORTDOCS%%%%DOCSDIR%%/tkabber.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -592,15 +607,23 @@ bin/tkabber
 @dirrm %%DATADIR%%/emoticons-tkabber
 @dirrm %%DATADIR%%/ifaceck
 @dirrm %%DATADIR%%/ifacetk
+@dirrm %%DATADIR%%/plugins/mac
+@dirrm %%DATADIR%%/plugins/filetransfer
+@dirrm %%DATADIR%%/plugins/general
+@dirrm %%DATADIR%%/plugins/iq
+@dirrm %%DATADIR%%/plugins/jidlink
+@dirrm %%DATADIR%%/plugins/chat
+@dirrm %%DATADIR%%/plugins/macintosh
+@dirrm %%DATADIR%%/plugins/si
+@dirrm %%DATADIR%%/plugins/unix
+@dirrm %%DATADIR%%/plugins/windows
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/jabberlib-tclxml/tclxml
 @dirrm %%DATADIR%%/jabberlib-tclxml
-@dirrm %%DATADIR%%/mclistbox-1.02
-@dirrm %%DATADIR%%/msgs
-@dirrm %%DATADIR%%/pixmaps/amibulb/browser
-@dirrm %%DATADIR%%/pixmaps/amibulb/docking
-@dirrm %%DATADIR%%/pixmaps/amibulb/roster
-@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber
-@dirrm %%DATADIR%%/pixmaps/amibulb
+@dirrm %%DATADIR%%/pixmaps/icq/docking
+@dirrm %%DATADIR%%/pixmaps/icq/roster
+@dirrm %%DATADIR%%/pixmaps/icq/tkabber
+@dirrm %%DATADIR%%/pixmaps/icq
 @dirrm %%DATADIR%%/pixmaps/default/browser
 @dirrm %%DATADIR%%/pixmaps/default/docking
 @dirrm %%DATADIR%%/pixmaps/default/roster
@@ -620,10 +643,11 @@ bin/tkabber
 @dirrm %%DATADIR%%/pixmaps/gush/roster
 @dirrm %%DATADIR%%/pixmaps/gush/tkabber
 @dirrm %%DATADIR%%/pixmaps/gush
-@dirrm %%DATADIR%%/pixmaps/icq/docking
-@dirrm %%DATADIR%%/pixmaps/icq/roster
-@dirrm %%DATADIR%%/pixmaps/icq/tkabber
-@dirrm %%DATADIR%%/pixmaps/icq
+@dirrm %%DATADIR%%/pixmaps/amibulb/browser
+@dirrm %%DATADIR%%/pixmaps/amibulb/docking
+@dirrm %%DATADIR%%/pixmaps/amibulb/roster
+@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber
+@dirrm %%DATADIR%%/pixmaps/amibulb
 @dirrm %%DATADIR%%/pixmaps/jajc/browser
 @dirrm %%DATADIR%%/pixmaps/jajc/docking
 @dirrm %%DATADIR%%/pixmaps/jajc/roster
@@ -643,20 +667,13 @@ bin/tkabber
 @dirrm %%DATADIR%%/pixmaps/psi/tkabber
 @dirrm %%DATADIR%%/pixmaps/psi
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/plugins/chat
-@dirrm %%DATADIR%%/plugins/filetransfer
-@dirrm %%DATADIR%%/plugins/general
-@dirrm %%DATADIR%%/plugins/iq
-@dirrm %%DATADIR%%/plugins/jidlink
-@dirrm %%DATADIR%%/plugins/si
-@dirrm %%DATADIR%%/plugins/unix
-@dirrm %%DATADIR%%/plugins/windows
-@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/sounds/default
 @dirrm %%DATADIR%%/sounds/psi
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/textundo
+@dirrm %%DATADIR%%/msgs
+@dirrm %%DATADIR%%/mclistbox-1.02
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0
 @dirrm %%EXAMPLESDIR%%/tools
+@dirrm %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0
 @dirrm %%EXAMPLESDIR%%
diff --git a/net/Makefile b/net/Makefile
index b0cab6ef54fa..754c7c828cdc 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -816,6 +816,7 @@
     SUBDIR += tinyfugue
     SUBDIR += tinyldap
     SUBDIR += tkabber
+    SUBDIR += tkabber-devel
     SUBDIR += tn3270
     SUBDIR += tn5250
     SUBDIR += torrentsniff
diff --git a/net/tkabber-devel/Makefile b/net/tkabber-devel/Makefile
index 7591900ed9a2..eb02bb4b3e39 100644
--- a/net/tkabber-devel/Makefile
+++ b/net/tkabber-devel/Makefile
@@ -1,48 +1,53 @@
-# New ports collection makefile for:	tkabber
-# Date created:				22 October 2003
-# Whom:					Alexander Timoshenko <gonzo@univ.kiev.ua>
+# New ports collection makefile for:	tkabber-devel
+# Date created:				09 July 2005
+# Whom:					Denis Shaposhnikov <dsh@vlink.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	tkabber
-PORTVERSION=	0.9.7
+PORTVERSION=	0.9.8.a.20050621
 CATEGORIES=	net
-MASTER_SITES=	http://www.jabber.ru/files/tkabber/
+MASTER_SITES=	http://neva.vlink.ru/distfiles/
+PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	alexander.timoshenko@gmail.com
-COMMENT=	Tcl/Tk based jabber client
-
-TCLLIBVER!=	${MAKE} -C ${.CURDIR}/../../devel/tcllib -V PORTVERSION 2>/dev/null \
-		|| (cd ${.CURDIR}/../../devel/tcllib; ${MAKE} -V PORTVERSION)
+MAINTAINER=	dsh@vlink.ru
+COMMENT=	Tcl/Tk based jabber client, development version
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
-		${LOCALBASE}/lib/tcllib${TCLLIBVER}/pkgIndex.tcl:${PORTSDIR}/devel/tcllib \
+		${LOCALBASE}/lib/tcllib1.7/pkgIndex.tcl:${PORTSDIR}/devel/tcllib \
 		${LOCALBASE}/lib/tls/pkgIndex.tcl:${PORTSDIR}/devel/tcltls \
 		${LOCALBASE}/lib/bwidget/pkgIndex.tcl:${PORTSDIR}/x11-toolkits/bwidget
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
+CONFLICTS=	tkabber-[0-9]*
 NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+USE_BZIP2=	yes
 
 SUBDIRS=	aniemoteicons emoticons-tkabber ifaceck ifacetk plugins \
 		jabberlib-tclxml pixmaps sounds textundo msgs mclistbox-1.02
 
 do-install:
 	${ECHO} -e "#!/bin/sh\nexec wish8.4 ${DATADIR}/tkabber.tcl \
-		-name tkabber \"\$$@\"\n" > ${PREFIX}/bin/tkabber
-	${CHMOD} +x ${PREFIX}/bin/tkabber
+		-name tkabber \"\$$@\"\n" > ${WRKDIR}/tkabber.sh
+	${INSTALL_SCRIPT} ${WRKDIR}/tkabber.sh ${PREFIX}/bin/tkabber
+
 	${MKDIR} ${DATADIR}
-	${CP} ${WRKSRC}/*.tcl ${DATADIR}
+	${CP} ${WRKSRC}/*.tcl ${DATADIR}/
 .for i in ${SUBDIRS}
-	${CP} -R ${WRKSRC}/${i} ${DATADIR}
+	${CP} -R ${WRKSRC}/${i} ${DATADIR}/
 .endfor
+
 	${MKDIR} ${EXAMPLESDIR}
-	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/* ${EXAMPLESDIR}/
+
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-.for i in tkabber.html tkabber.xml
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}
+.for i in AUTHORS COPYING ChangeLog
+	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/tkabber-devel/distinfo b/net/tkabber-devel/distinfo
index 53bbf34f9903..372430c60e86 100644
--- a/net/tkabber-devel/distinfo
+++ b/net/tkabber-devel/distinfo
@@ -1,2 +1,2 @@
-MD5 (tkabber-0.9.7.tar.gz) = 41a0f24239415edb8e3d2cd86e532f38
-SIZE (tkabber-0.9.7.tar.gz) = 714184
+MD5 (tkabber-0.9.8.a.20050621.tar.bz2) = 675d215cfafb3a8bf889d2104c4e4fdf
+SIZE (tkabber-0.9.8.a.20050621.tar.bz2) = 608799
diff --git a/net/tkabber-devel/files/patch-login.tcl b/net/tkabber-devel/files/patch-login.tcl
deleted file mode 100644
index 22f7687b9d12..000000000000
--- a/net/tkabber-devel/files/patch-login.tcl
+++ /dev/null
@@ -1,15 +0,0 @@
---- login.tcl.orig	Tue Aug  3 14:35:36 2004
-+++ login.tcl	Tue Aug  3 14:35:54 2004
-@@ -36,10 +36,10 @@
- custom::defvar loginconf(usedigest) 1 \
-     [::msgcat::mc "Use hashed password transmission."] \
-     -group Login -type boolean
--custom::defvar loginconf(resource) "tkabber" \
-+custom::defvar loginconf(resource) "TKabber" \
-     [::msgcat::mc "Resource."] \
-     -group Login -type string
--custom::defvar loginconf(server) "localhost" \
-+custom::defvar loginconf(server) "jabber.ru" \
-     [::msgcat::mc "Server name."] \
-     -group Login -type string
- custom::defvar loginconf(port) "5222" \
diff --git a/net/tkabber-devel/files/patch-tkabber.tcl b/net/tkabber-devel/files/patch-tkabber.tcl
deleted file mode 100644
index 194b89eea4b9..000000000000
--- a/net/tkabber-devel/files/patch-tkabber.tcl
+++ /dev/null
@@ -1,19 +0,0 @@
---- tkabber.tcl.orig	Tue Jul 27 17:37:59 2004
-+++ tkabber.tcl	Tue Aug  3 14:34:43 2004
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # the next line restarts using the correct interpreter \
--exec wish "$0" -name tkabber "$@"
-+exec wish8.4 "$0" -name tkabber "$@"
- 
- # $Id: tkabber.tcl,v 1.219 2004/07/10 20:05:04 aleksey Exp $
- 
-@@ -118,7 +118,7 @@
-             debugmsg tkabber "closed $chan '$res'"
-         }
-     }
--    exit $status
-+    quit $status
- }
- 
- namespace eval ssj {}
diff --git a/net/tkabber-devel/pkg-plist b/net/tkabber-devel/pkg-plist
index 9544a24466fb..dd0e33b4453d 100644
--- a/net/tkabber-devel/pkg-plist
+++ b/net/tkabber-devel/pkg-plist
@@ -2,7 +2,6 @@ bin/tkabber
 %%DATADIR%%/Tclx.tcl
 %%DATADIR%%/aniemoteicons/aniemoteicons.tcl
 %%DATADIR%%/aniemoteicons/anigif.tcl
-%%DATADIR%%/avatars.tcl
 %%DATADIR%%/balloon.tcl
 %%DATADIR%%/browser.tcl
 %%DATADIR%%/chats.tcl
@@ -38,21 +37,21 @@ bin/tkabber
 %%DATADIR%%/ifacetk/iface.tcl
 %%DATADIR%%/ifacetk/ilogin.tcl
 %%DATADIR%%/ifacetk/iroster.tcl
+%%DATADIR%%/ifacetk/unix.xrdb
 %%DATADIR%%/iq.tcl
 %%DATADIR%%/itemedit.tcl
 %%DATADIR%%/jabberlib-tclxml/jabberlib.tcl
+%%DATADIR%%/jabberlib-tclxml/ntlm.tcl
 %%DATADIR%%/jabberlib-tclxml/pkgIndex.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/pkgIndex.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/sgml-8.1.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/sgmlparser.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/tclparser-8.1.tcl
-%%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.0.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xml-8.1.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xml__tcl.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xmldep.tcl
 %%DATADIR%%/jabberlib-tclxml/tclxml/xpath.tcl
+%%DATADIR%%/jabberlib-tclxml/transports.tcl
 %%DATADIR%%/jabberlib-tclxml/wrapper.tcl
 %%DATADIR%%/jidlink.tcl
 %%DATADIR%%/joingrdialog.tcl
@@ -77,11 +76,11 @@ bin/tkabber
 %%DATADIR%%/msgs/ua.msg
 %%DATADIR%%/muc.tcl
 %%DATADIR%%/negotiate.tcl
-%%DATADIR%%/pixmaps/amibulb/browser/aim_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/icq_online.gif
-%%DATADIR%%/pixmaps/amibulb/browser/msn_online.gif
+%%DATADIR%%/pixmaps/amibulb/browser/aim.gif
+%%DATADIR%%/pixmaps/amibulb/browser/icq.gif
+%%DATADIR%%/pixmaps/amibulb/browser/msn.gif
 %%DATADIR%%/pixmaps/amibulb/browser/user.gif
-%%DATADIR%%/pixmaps/amibulb/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/amibulb/browser/yahoo.gif
 %%DATADIR%%/pixmaps/amibulb/docking/tkabber.ico
 %%DATADIR%%/pixmaps/amibulb/roster/available-away.gif
 %%DATADIR%%/pixmaps/amibulb/roster/available-chat.gif
@@ -90,33 +89,34 @@ bin/tkabber
 %%DATADIR%%/pixmaps/amibulb/roster/available.gif
 %%DATADIR%%/pixmaps/amibulb/roster/group-closed.gif
 %%DATADIR%%/pixmaps/amibulb/roster/group-opened.gif
-%%DATADIR%%/pixmaps/amibulb/roster/icondef.xml
 %%DATADIR%%/pixmaps/amibulb/roster/invisible.gif
 %%DATADIR%%/pixmaps/amibulb/roster/stalker.gif
 %%DATADIR%%/pixmaps/amibulb/roster/unavailable.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/amibulb/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/browser/aim_online.gif
-%%DATADIR%%/pixmaps/default/browser/gg_online.gif
-%%DATADIR%%/pixmaps/default/browser/glade-message.gif
-%%DATADIR%%/pixmaps/default/browser/group_on.gif
-%%DATADIR%%/pixmaps/default/browser/icq_online.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/amibulb/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/default/browser/aim.gif
+%%DATADIR%%/pixmaps/default/browser/conference.gif
+%%DATADIR%%/pixmaps/default/browser/gg.gif
+%%DATADIR%%/pixmaps/default/browser/icq.gif
 %%DATADIR%%/pixmaps/default/browser/jud.gif
-%%DATADIR%%/pixmaps/default/browser/msn_online.gif
-%%DATADIR%%/pixmaps/default/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/default/browser/unknown.gif
+%%DATADIR%%/pixmaps/default/browser/message.gif
+%%DATADIR%%/pixmaps/default/browser/msn.gif
 %%DATADIR%%/pixmaps/default/browser/user.gif
-%%DATADIR%%/pixmaps/default/browser/weather_online.gif
-%%DATADIR%%/pixmaps/default/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/default/browser/weather.gif
+%%DATADIR%%/pixmaps/default/browser/yahoo.gif
 %%DATADIR%%/pixmaps/default/docking/available-away.gif
 %%DATADIR%%/pixmaps/default/docking/available-chat.gif
 %%DATADIR%%/pixmaps/default/docking/available-dnd.gif
 %%DATADIR%%/pixmaps/default/docking/available-xa.gif
 %%DATADIR%%/pixmaps/default/docking/available.gif
+%%DATADIR%%/pixmaps/default/docking/blank.gif
 %%DATADIR%%/pixmaps/default/docking/invisible.gif
+%%DATADIR%%/pixmaps/default/docking/message-personal.gif
+%%DATADIR%%/pixmaps/default/docking/message-server.gif
+%%DATADIR%%/pixmaps/default/docking/message.gif
 %%DATADIR%%/pixmaps/default/docking/tkabber.ico
 %%DATADIR%%/pixmaps/default/docking/unavailable.gif
 %%DATADIR%%/pixmaps/default/roster/available-away.gif
@@ -124,10 +124,10 @@ bin/tkabber
 %%DATADIR%%/pixmaps/default/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/default/roster/available-xa.gif
 %%DATADIR%%/pixmaps/default/roster/available.gif
+%%DATADIR%%/pixmaps/default/roster/conference-available.gif
+%%DATADIR%%/pixmaps/default/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/default/roster/group-closed.gif
 %%DATADIR%%/pixmaps/default/roster/group-opened.gif
-%%DATADIR%%/pixmaps/default/roster/group_off.gif
-%%DATADIR%%/pixmaps/default/roster/group_on.gif
 %%DATADIR%%/pixmaps/default/roster/invisible.gif
 %%DATADIR%%/pixmaps/default/roster/stalker.gif
 %%DATADIR%%/pixmaps/default/roster/unavailable.gif
@@ -156,9 +156,12 @@ bin/tkabber
 %%DATADIR%%/pixmaps/default/services/msn_offline.xpm
 %%DATADIR%%/pixmaps/default/services/msn_online.xpm
 %%DATADIR%%/pixmaps/default/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/default/services/rss.xpm
-%%DATADIR%%/pixmaps/default/services/rss2.xpm
-%%DATADIR%%/pixmaps/default/services/rss3.xpm
+%%DATADIR%%/pixmaps/default/services/rss_away.xpm
+%%DATADIR%%/pixmaps/default/services/rss_chat.xpm
+%%DATADIR%%/pixmaps/default/services/rss_dnd.xpm
+%%DATADIR%%/pixmaps/default/services/rss_offline.xpm
+%%DATADIR%%/pixmaps/default/services/rss_online.xpm
+%%DATADIR%%/pixmaps/default/services/rss_xa.xpm
 %%DATADIR%%/pixmaps/default/services/sms.xpm
 %%DATADIR%%/pixmaps/default/services/weather_away.gif
 %%DATADIR%%/pixmaps/default/services/weather_chat.gif
@@ -172,23 +175,23 @@ bin/tkabber
 %%DATADIR%%/pixmaps/default/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/default/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/default/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/default/tkabber/bookmark.xpm
-%%DATADIR%%/pixmaps/default/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/default/tkabber/glade-online.gif
+%%DATADIR%%/pixmaps/default/tkabber/chat-bookmark.xpm
 %%DATADIR%%/pixmaps/default/tkabber/gpg-badsigned.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-encrypted.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-signed.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-unencrypted.gif
 %%DATADIR%%/pixmaps/default/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/default/tkabber/jb.gif
-%%DATADIR%%/pixmaps/default/tkabber/mainlogo.gif
 %%DATADIR%%/pixmaps/default/tkabber/new-msg.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_bk.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_case.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_exact.gif
 %%DATADIR%%/pixmaps/default/tkabber/search_fw.gif
+%%DATADIR%%/pixmaps/default/tkabber/tkabber-logo.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/default/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-away.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-chat.gif
 %%DATADIR%%/pixmaps/feather22/roster/available-dnd.gif
@@ -196,20 +199,23 @@ bin/tkabber
 %%DATADIR%%/pixmaps/feather22/roster/available.gif
 %%DATADIR%%/pixmaps/feather22/roster/invisible.gif
 %%DATADIR%%/pixmaps/feather22/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gabber/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gabber/browser/glade-message.gif
-%%DATADIR%%/pixmaps/gabber/browser/group_on.gif
-%%DATADIR%%/pixmaps/gabber/browser/icq_online.gif
+%%DATADIR%%/pixmaps/gabber/browser/aim.gif
+%%DATADIR%%/pixmaps/gabber/browser/conference.gif
+%%DATADIR%%/pixmaps/gabber/browser/icq.gif
 %%DATADIR%%/pixmaps/gabber/browser/jud.gif
-%%DATADIR%%/pixmaps/gabber/browser/msn_online.gif
+%%DATADIR%%/pixmaps/gabber/browser/message.gif
+%%DATADIR%%/pixmaps/gabber/browser/msn.gif
 %%DATADIR%%/pixmaps/gabber/browser/user.gif
-%%DATADIR%%/pixmaps/gabber/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/gabber/browser/yahoo.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-away.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-chat.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-dnd.gif
 %%DATADIR%%/pixmaps/gabber/docking/available-xa.gif
 %%DATADIR%%/pixmaps/gabber/docking/available.gif
 %%DATADIR%%/pixmaps/gabber/docking/invisible.gif
+%%DATADIR%%/pixmaps/gabber/docking/message-personal.gif
+%%DATADIR%%/pixmaps/gabber/docking/message-server.gif
+%%DATADIR%%/pixmaps/gabber/docking/message.gif
 %%DATADIR%%/pixmaps/gabber/docking/tkabber.ico
 %%DATADIR%%/pixmaps/gabber/docking/unavailable.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-away.gif
@@ -217,11 +223,10 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gabber/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/gabber/roster/available-xa.gif
 %%DATADIR%%/pixmaps/gabber/roster/available.gif
-%%DATADIR%%/pixmaps/gabber/roster/glade-groupchat-menu.xpm
+%%DATADIR%%/pixmaps/gabber/roster/conference-available.gif
+%%DATADIR%%/pixmaps/gabber/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/gabber/roster/group-closed.gif
 %%DATADIR%%/pixmaps/gabber/roster/group-opened.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_off.gif
-%%DATADIR%%/pixmaps/gabber/roster/group_on.gif
 %%DATADIR%%/pixmaps/gabber/roster/stalker.gif
 %%DATADIR%%/pixmaps/gabber/roster/unavailable.gif
 %%DATADIR%%/pixmaps/gabber/services/aim_away.xpm
@@ -243,9 +248,12 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gabber/services/msn_offline.xpm
 %%DATADIR%%/pixmaps/gabber/services/msn_online.xpm
 %%DATADIR%%/pixmaps/gabber/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss2.xpm
-%%DATADIR%%/pixmaps/gabber/services/rss3.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_away.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_chat.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_dnd.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_offline.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_online.xpm
+%%DATADIR%%/pixmaps/gabber/services/rss_xa.xpm
 %%DATADIR%%/pixmaps/gabber/services/sms.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_away.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_chat.xpm
@@ -253,16 +261,16 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gabber/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/gabber/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gabber/tkabber/jb.gif
-%%DATADIR%%/pixmaps/gush/browser/aim_online.gif
-%%DATADIR%%/pixmaps/gush/browser/icq_online.gif
-%%DATADIR%%/pixmaps/gush/browser/msn_online.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/gabber/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/gush/browser/aim.gif
+%%DATADIR%%/pixmaps/gush/browser/icq.gif
+%%DATADIR%%/pixmaps/gush/browser/msn.gif
 %%DATADIR%%/pixmaps/gush/browser/user.gif
-%%DATADIR%%/pixmaps/gush/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/gush/browser/yahoo.gif
 %%DATADIR%%/pixmaps/gush/docking/tkabber.ico
 %%DATADIR%%/pixmaps/gush/roster/available-away.gif
 %%DATADIR%%/pixmaps/gush/roster/available-chat.gif
@@ -275,11 +283,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/gush/roster/invisible.gif
 %%DATADIR%%/pixmaps/gush/roster/stalker.gif
 %%DATADIR%%/pixmaps/gush/roster/unavailable.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/gush/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/gush/tkabber/jb.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/gush/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/icq/docking/available-away.gif
 %%DATADIR%%/pixmaps/icq/docking/available-chat.gif
 %%DATADIR%%/pixmaps/icq/docking/available-dnd.gif
@@ -297,20 +305,20 @@ bin/tkabber
 %%DATADIR%%/pixmaps/icq/roster/send.gif
 %%DATADIR%%/pixmaps/icq/roster/stalker.gif
 %%DATADIR%%/pixmaps/icq/roster/unavailable.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/icq/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/icq/tkabber/jb.gif
-%%DATADIR%%/pixmaps/icq/tkabber/mainlogo.gif
 %%DATADIR%%/pixmaps/icq/tkabber/new-msg.gif
-%%DATADIR%%/pixmaps/jajc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/jajc/browser/group_on.gif
-%%DATADIR%%/pixmaps/jajc/browser/icq_online.gif
+%%DATADIR%%/pixmaps/icq/tkabber/tkabber-logo.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/icq/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/jajc/browser/aim.gif
+%%DATADIR%%/pixmaps/jajc/browser/conference.gif
+%%DATADIR%%/pixmaps/jajc/browser/icq.gif
 %%DATADIR%%/pixmaps/jajc/browser/jud.gif
-%%DATADIR%%/pixmaps/jajc/browser/msn_online.gif
+%%DATADIR%%/pixmaps/jajc/browser/msn.gif
 %%DATADIR%%/pixmaps/jajc/browser/user.gif
-%%DATADIR%%/pixmaps/jajc/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/jajc/browser/yahoo.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-away.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-chat.gif
 %%DATADIR%%/pixmaps/jajc/docking/available-dnd.gif
@@ -323,11 +331,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jajc/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/jajc/roster/available-xa.gif
 %%DATADIR%%/pixmaps/jajc/roster/available.gif
+%%DATADIR%%/pixmaps/jajc/roster/conference-available.gif
+%%DATADIR%%/pixmaps/jajc/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/jajc/roster/group-closed.gif
 %%DATADIR%%/pixmaps/jajc/roster/group-opened.gif
 %%DATADIR%%/pixmaps/jajc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_off.gif
-%%DATADIR%%/pixmaps/jajc/roster/group_on.gif
 %%DATADIR%%/pixmaps/jajc/roster/group_opened.gif
 %%DATADIR%%/pixmaps/jajc/roster/unavailable.gif
 %%DATADIR%%/pixmaps/jajc/services/aim_away.xpm
@@ -356,11 +364,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jajc/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/jajc/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/jajc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/jajc/tkabber/jb.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/jajc/tkabber/toolbar-show-online.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-away.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-chat.gif
 %%DATADIR%%/pixmaps/jarl/roster/available-dnd.gif
@@ -368,18 +376,16 @@ bin/tkabber
 %%DATADIR%%/pixmaps/jarl/roster/available.gif
 %%DATADIR%%/pixmaps/jarl/roster/invisible.gif
 %%DATADIR%%/pixmaps/jarl/roster/unavailable.gif
-%%DATADIR%%/pixmaps/kroc/browser/aim_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/gg_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/glade-message.gif
-%%DATADIR%%/pixmaps/kroc/browser/group_on.gif
-%%DATADIR%%/pixmaps/kroc/browser/icq_online.gif
+%%DATADIR%%/pixmaps/kroc/browser/aim.gif
+%%DATADIR%%/pixmaps/kroc/browser/conference.gif
+%%DATADIR%%/pixmaps/kroc/browser/gg.gif
+%%DATADIR%%/pixmaps/kroc/browser/icq.gif
 %%DATADIR%%/pixmaps/kroc/browser/jud.gif
-%%DATADIR%%/pixmaps/kroc/browser/msn_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/service-jabber.gif
-%%DATADIR%%/pixmaps/kroc/browser/unknown.gif
+%%DATADIR%%/pixmaps/kroc/browser/message.gif
+%%DATADIR%%/pixmaps/kroc/browser/msn.gif
 %%DATADIR%%/pixmaps/kroc/browser/user.gif
-%%DATADIR%%/pixmaps/kroc/browser/weather_online.gif
-%%DATADIR%%/pixmaps/kroc/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/kroc/browser/weather.gif
+%%DATADIR%%/pixmaps/kroc/browser/yahoo.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-away.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-chat.gif
 %%DATADIR%%/pixmaps/kroc/docking/available-dnd.gif
@@ -393,12 +399,10 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/roster/available-dnd.gif
 %%DATADIR%%/pixmaps/kroc/roster/available-xa.gif
 %%DATADIR%%/pixmaps/kroc/roster/available.gif
+%%DATADIR%%/pixmaps/kroc/roster/conference-available.gif
+%%DATADIR%%/pixmaps/kroc/roster/conference-unavailable.gif
 %%DATADIR%%/pixmaps/kroc/roster/group-closed.gif
 %%DATADIR%%/pixmaps/kroc/roster/group-opened.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_closed.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_off.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_on.gif
-%%DATADIR%%/pixmaps/kroc/roster/group_opened.gif
 %%DATADIR%%/pixmaps/kroc/roster/invisible.gif
 %%DATADIR%%/pixmaps/kroc/roster/stalker.gif
 %%DATADIR%%/pixmaps/kroc/roster/unavailable.gif
@@ -427,9 +431,12 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/services/msn_offline.xpm
 %%DATADIR%%/pixmaps/kroc/services/msn_online.xpm
 %%DATADIR%%/pixmaps/kroc/services/msn_xa.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss2.xpm
-%%DATADIR%%/pixmaps/kroc/services/rss3.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_away.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_chat.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_dnd.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_offline.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_online.xpm
+%%DATADIR%%/pixmaps/kroc/services/rss_xa.xpm
 %%DATADIR%%/pixmaps/kroc/services/sms.xpm
 %%DATADIR%%/pixmaps/kroc/services/weather_away.gif
 %%DATADIR%%/pixmaps/kroc/services/weather_chat.gif
@@ -443,26 +450,26 @@ bin/tkabber
 %%DATADIR%%/pixmaps/kroc/services/yahoo_offline.xpm
 %%DATADIR%%/pixmaps/kroc/services/yahoo_online.xpm
 %%DATADIR%%/pixmaps/kroc/services/yahoo_xa.xpm
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/glade-online.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-badsigned.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-encrypted.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-signed.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-unencrypted.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/gpg-unsigned.gif
-%%DATADIR%%/pixmaps/kroc/tkabber/jb.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/new-msg.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_bk.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_case.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_exact.gif
 %%DATADIR%%/pixmaps/kroc/tkabber/search_fw.gif
-%%DATADIR%%/pixmaps/psi/browser/aim_online.gif
-%%DATADIR%%/pixmaps/psi/browser/icq_online.gif
-%%DATADIR%%/pixmaps/psi/browser/msn_online.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/kroc/tkabber/toolbar-show-online.gif
+%%DATADIR%%/pixmaps/psi/browser/aim.gif
+%%DATADIR%%/pixmaps/psi/browser/icq.gif
+%%DATADIR%%/pixmaps/psi/browser/msn.gif
 %%DATADIR%%/pixmaps/psi/browser/user.gif
-%%DATADIR%%/pixmaps/psi/browser/yahoo_online.gif
+%%DATADIR%%/pixmaps/psi/browser/yahoo.gif
 %%DATADIR%%/pixmaps/psi/roster/available-away.gif
 %%DATADIR%%/pixmaps/psi/roster/available-chat.gif
 %%DATADIR%%/pixmaps/psi/roster/available-dnd.gif
@@ -472,11 +479,11 @@ bin/tkabber
 %%DATADIR%%/pixmaps/psi/roster/group-opened.gif
 %%DATADIR%%/pixmaps/psi/roster/stalker.gif
 %%DATADIR%%/pixmaps/psi/roster/unavailable.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-groupchat.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-new-user.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-offline.gif
-%%DATADIR%%/pixmaps/psi/tkabber/glade-online.gif
-%%DATADIR%%/pixmaps/psi/tkabber/jb.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-add-user.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-disco.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-join-conference.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-show-offline.gif
+%%DATADIR%%/pixmaps/psi/tkabber/toolbar-show-online.gif
 %%DATADIR%%/plugins.tcl
 %%DATADIR%%/plugins/chat/bookmark_highlighted.tcl
 %%DATADIR%%/plugins/chat/clear.tcl
@@ -501,20 +508,26 @@ bin/tkabber
 %%DATADIR%%/plugins/chat/logger.tcl
 %%DATADIR%%/plugins/chat/me_command.tcl
 %%DATADIR%%/plugins/chat/nick_colors.tcl
+%%DATADIR%%/plugins/chat/open_chat.tcl
 %%DATADIR%%/plugins/chat/open_window.tcl
 %%DATADIR%%/plugins/chat/popupmenu.tcl
+%%DATADIR%%/plugins/chat/search.tcl
 %%DATADIR%%/plugins/chat/send_message.tcl
 %%DATADIR%%/plugins/chat/unisymbols.tcl
 %%DATADIR%%/plugins/filetransfer/http.tcl
 %%DATADIR%%/plugins/filetransfer/jidlink.tcl
 %%DATADIR%%/plugins/filetransfer/si.tcl
 %%DATADIR%%/plugins/general/autoaway.tcl
+%%DATADIR%%/plugins/general/avatars.tcl
 %%DATADIR%%/plugins/general/clientinfo.tcl
 %%DATADIR%%/plugins/general/conferenceinfo.tcl
 %%DATADIR%%/plugins/general/message_archive.tcl
+%%DATADIR%%/plugins/general/offline.tcl
 %%DATADIR%%/plugins/general/presenceinfo.tcl
 %%DATADIR%%/plugins/general/rawxml.tcl
+%%DATADIR%%/plugins/general/sound.tcl
 %%DATADIR%%/plugins/general/stats.tcl
+%%DATADIR%%/plugins/general/subscribe_gateway.tcl
 %%DATADIR%%/plugins/general/tkcon.tcl
 %%DATADIR%%/plugins/iq/browse.tcl
 %%DATADIR%%/plugins/iq/last.tcl
@@ -529,6 +542,7 @@ bin/tkabber
 %%DATADIR%%/plugins/unix/ispell.tcl
 %%DATADIR%%/plugins/unix/menu.tcl
 %%DATADIR%%/plugins/unix/menu8.4.tcl
+%%DATADIR%%/plugins/unix/systray.tcl
 %%DATADIR%%/plugins/unix/wmdock.tcl
 %%DATADIR%%/plugins/windows/console.tcl
 %%DATADIR%%/plugins/windows/mousewheel.tcl
@@ -539,7 +553,6 @@ bin/tkabber
 %%DATADIR%%/roster.tcl
 %%DATADIR%%/search.tcl
 %%DATADIR%%/si.tcl
-%%DATADIR%%/sound.tcl
 %%DATADIR%%/sounds/default/chat_their_message.wav
 %%DATADIR%%/sounds/default/connected.wav
 %%DATADIR%%/sounds/default/groupchat_server_message.wav
@@ -568,11 +581,11 @@ bin/tkabber
 %%EXAMPLESDIR%%/config.tcl
 %%EXAMPLESDIR%%/dark.xrdb
 %%EXAMPLESDIR%%/dark2.xrdb
-%%EXAMPLESDIR%%/ermine.xrdb
 %%EXAMPLESDIR%%/green.xrdb
 %%EXAMPLESDIR%%/ice.xrdb
 %%EXAMPLESDIR%%/light.xrdb
 %%EXAMPLESDIR%%/mtr-config.tcl
+%%EXAMPLESDIR%%/ocean-deep.xrdb
 %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/build.sh
 %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0/tclCarbonNotification.tcl
 %%EXAMPLESDIR%%/teo-config.tcl
@@ -584,7 +597,9 @@ bin/tkabber
 %%EXAMPLESDIR%%/tools/rssbot
 %%EXAMPLESDIR%%/tools/rssbot.tcl
 %%EXAMPLESDIR%%/warm.xrdb
-
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/tkabber.html
 %%PORTDOCS%%%%DOCSDIR%%/tkabber.xml
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
@@ -592,15 +607,23 @@ bin/tkabber
 @dirrm %%DATADIR%%/emoticons-tkabber
 @dirrm %%DATADIR%%/ifaceck
 @dirrm %%DATADIR%%/ifacetk
+@dirrm %%DATADIR%%/plugins/mac
+@dirrm %%DATADIR%%/plugins/filetransfer
+@dirrm %%DATADIR%%/plugins/general
+@dirrm %%DATADIR%%/plugins/iq
+@dirrm %%DATADIR%%/plugins/jidlink
+@dirrm %%DATADIR%%/plugins/chat
+@dirrm %%DATADIR%%/plugins/macintosh
+@dirrm %%DATADIR%%/plugins/si
+@dirrm %%DATADIR%%/plugins/unix
+@dirrm %%DATADIR%%/plugins/windows
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/jabberlib-tclxml/tclxml
 @dirrm %%DATADIR%%/jabberlib-tclxml
-@dirrm %%DATADIR%%/mclistbox-1.02
-@dirrm %%DATADIR%%/msgs
-@dirrm %%DATADIR%%/pixmaps/amibulb/browser
-@dirrm %%DATADIR%%/pixmaps/amibulb/docking
-@dirrm %%DATADIR%%/pixmaps/amibulb/roster
-@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber
-@dirrm %%DATADIR%%/pixmaps/amibulb
+@dirrm %%DATADIR%%/pixmaps/icq/docking
+@dirrm %%DATADIR%%/pixmaps/icq/roster
+@dirrm %%DATADIR%%/pixmaps/icq/tkabber
+@dirrm %%DATADIR%%/pixmaps/icq
 @dirrm %%DATADIR%%/pixmaps/default/browser
 @dirrm %%DATADIR%%/pixmaps/default/docking
 @dirrm %%DATADIR%%/pixmaps/default/roster
@@ -620,10 +643,11 @@ bin/tkabber
 @dirrm %%DATADIR%%/pixmaps/gush/roster
 @dirrm %%DATADIR%%/pixmaps/gush/tkabber
 @dirrm %%DATADIR%%/pixmaps/gush
-@dirrm %%DATADIR%%/pixmaps/icq/docking
-@dirrm %%DATADIR%%/pixmaps/icq/roster
-@dirrm %%DATADIR%%/pixmaps/icq/tkabber
-@dirrm %%DATADIR%%/pixmaps/icq
+@dirrm %%DATADIR%%/pixmaps/amibulb/browser
+@dirrm %%DATADIR%%/pixmaps/amibulb/docking
+@dirrm %%DATADIR%%/pixmaps/amibulb/roster
+@dirrm %%DATADIR%%/pixmaps/amibulb/tkabber
+@dirrm %%DATADIR%%/pixmaps/amibulb
 @dirrm %%DATADIR%%/pixmaps/jajc/browser
 @dirrm %%DATADIR%%/pixmaps/jajc/docking
 @dirrm %%DATADIR%%/pixmaps/jajc/roster
@@ -643,20 +667,13 @@ bin/tkabber
 @dirrm %%DATADIR%%/pixmaps/psi/tkabber
 @dirrm %%DATADIR%%/pixmaps/psi
 @dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/plugins/chat
-@dirrm %%DATADIR%%/plugins/filetransfer
-@dirrm %%DATADIR%%/plugins/general
-@dirrm %%DATADIR%%/plugins/iq
-@dirrm %%DATADIR%%/plugins/jidlink
-@dirrm %%DATADIR%%/plugins/si
-@dirrm %%DATADIR%%/plugins/unix
-@dirrm %%DATADIR%%/plugins/windows
-@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%/sounds/default
 @dirrm %%DATADIR%%/sounds/psi
 @dirrm %%DATADIR%%/sounds
 @dirrm %%DATADIR%%/textundo
+@dirrm %%DATADIR%%/msgs
+@dirrm %%DATADIR%%/mclistbox-1.02
 @dirrm %%DATADIR%%
-@dirrm %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0
 @dirrm %%EXAMPLESDIR%%/tools
+@dirrm %%EXAMPLESDIR%%/tclCarbonNotification-1.0.0
 @dirrm %%EXAMPLESDIR%%