Add gnomeicu2 --> ports/net/gnomeicu2, repo-copied from ports/net/gnomeicu

and update it to version 0.9.111.

Prompted by:	Kosta K <kosta_k@phreaker.net>

34 files changed, 714 insertions, 184 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 605467282f2c..9d11be9d9c2c 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -2138,6 +2138,7 @@ gnomegames2	ports/games/gnomegames2
 gnomehier	ports/misc/gnomehier
 gnomeiconedit	ports/graphics/gnomeiconedit
 gnomeicu	ports/net/gnomeicu
+gnomeicu2	ports/net/gnomeicu2
 gnomekiss	ports/games/gnomekiss
 gnomelibs	ports/x11/gnomelibs
 gnomemc		ports/x11-fm/gnomemc
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 95456665ce32..2cf91f1a2a5a 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -5,22 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeicu
-PORTVERSION=	0.98.3
+PORTNAME=	gnomeicu2
+PORTVERSION=	0.98.111
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
+DISTNAME=	gnomeicu-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS+=	gnet-config:${PORTSDIR}/net/gnet
+LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gnet.1:${PORTSDIR}/net/gnet \
+		gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade libpanel gdkpixbuf
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix gnomehack
 USE_GMAKE=		yes
+USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,7 +45,7 @@ SOCKSLIBS=	-lsocks5
 
 CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/net-im/gnomeicu/distinfo b/net-im/gnomeicu/distinfo
index 5e5f3663682f..144684291db3 100644
--- a/net-im/gnomeicu/distinfo
+++ b/net-im/gnomeicu/distinfo
@@ -1 +1 @@
-MD5 (gnomeicu-0.98.3.tar.bz2) = 2a11f615c4de3640c5e56499f7b42f8e
+MD5 (gnomeicu-0.98.111.tar.bz2) = 57f2295e28febcc6215970924312d4d2
diff --git a/net-im/gnomeicu/files/patch-configure b/net-im/gnomeicu/files/patch-configure
new file mode 100644
index 000000000000..c6ee752e9833
--- /dev/null
+++ b/net-im/gnomeicu/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/09/11 08:57:13	1.1
++++ configure	2002/09/11 08:57:46
+@@ -7490,6 +7490,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net-im/gnomeicu/files/patch-po::Makefile.in.in b/net-im/gnomeicu/files/patch-po::Makefile.in.in
deleted file mode 100644
index 62a7c83e66ea..000000000000
--- a/net-im/gnomeicu/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/07/20 11:41:22	1.1
-+++ po/Makefile.in.in	2002/07/20 11:41:34
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/net-im/gnomeicu/files/patch-src::icu_db.c b/net-im/gnomeicu/files/patch-src::icu_db.c
index 0a0196a73c92..3df66fcf8c50 100644
--- a/net-im/gnomeicu/files/patch-src::icu_db.c
+++ b/net-im/gnomeicu/files/patch-src::icu_db.c
@@ -1,14 +1,17 @@
---- src/icu_db.c.orig	Sat Jan  5 19:15:03 2002
-+++ src/icu_db.c	Sat Jan  5 19:16:00 2002
-@@ -33,7 +33,11 @@
+
+$FreeBSD$
+
+--- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
++++ src/icu_db.c	Wed Sep 11 11:45:05 2002
+@@ -27,7 +27,11 @@
+ 
+ #include <fcntl.h>
  #include <errno.h>
- #include <stdio.h>
- #include <string.h>
 +#if defined(HAVE_STDLIB_H)
 +#include <stdlib.h>
 +#else
  #include <malloc.h>
 +#endif
- 
- #if defined(HAVE_LIBGDBM)
- #include <gdbm.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/param.h>
diff --git a/net-im/gnomeicu/pkg-comment b/net-im/gnomeicu/pkg-comment
index bb39546ca3ca..0273d4c4e50c 100644
--- a/net-im/gnomeicu/pkg-comment
+++ b/net-im/gnomeicu/pkg-comment
@@ -1 +1 @@
-GNOME ICQ client
+GNOME2 ICQ client
diff --git a/net-im/gnomeicu/pkg-descr b/net-im/gnomeicu/pkg-descr
index 8e2bd46699a3..df8c0c64984b 100644
--- a/net-im/gnomeicu/pkg-descr
+++ b/net-im/gnomeicu/pkg-descr
@@ -1,6 +1,6 @@
  GnomeICU (previously GtkICQ) is an Internet based communications
  program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome, a growingly popular desktop environment.GnomeICU is released
+ Gnome2, a growingly popular desktop environment. GnomeICU is released
  under the GNU Public License, and is available free of charge.
 
 WWW: http://gnomeicu.sourceforge.net
diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index 14d1f5bbf0f8..4473d442ccdf 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/gnomeicu/pkg-plist
@@ -1,16 +1,139 @@
 bin/gnomeicu
 bin/gnomeicu-client
-etc/CORBA/servers/GnomeICU.gnorba
 etc/sound/events/GnomeICU.soundlist
-share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/apps/Internet/GnomeICU.desktop
+libdata/bonobo/servers/GNOME_GnomeICUApplet.server
+libexec/gnomeicu-applet
+share/gnome/applications/GnomeICU.desktop
+share/gnome/gnome-2.0/ui/GNOME_GnomeICUApplet.xml
+share/gnome/gnomeicu/emoticons/AIM/angel.xpm
+share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
+share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
+share/gnome/gnomeicu/emoticons/AIM/cry.xpm
+share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
+share/gnome/gnomeicu/emoticons/AIM/emoticon-data
+share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
+share/gnome/gnomeicu/emoticons/AIM/sad.xpm
+share/gnome/gnomeicu/emoticons/AIM/scream.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
+share/gnome/gnomeicu/emoticons/AIM/think.xpm
+share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
+share/gnome/gnomeicu/emoticons/AIM/wink.xpm
+share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
+share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
+share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
+share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
+share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
+share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
+share/gnome/gnomeicu/emoticons/Always/Whining.bmp
+share/gnome/gnomeicu/emoticons/Always/asl.gif
+share/gnome/gnomeicu/emoticons/Always/bat.gif
+share/gnome/gnomeicu/emoticons/Always/beer.gif
+share/gnome/gnomeicu/emoticons/Always/boy.gif
+share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
+share/gnome/gnomeicu/emoticons/Always/cake.gif
+share/gnome/gnomeicu/emoticons/Always/camera.gif
+share/gnome/gnomeicu/emoticons/Always/cat.gif
+share/gnome/gnomeicu/emoticons/Always/clock.gif
+share/gnome/gnomeicu/emoticons/Always/coffee.gif
+share/gnome/gnomeicu/emoticons/Always/cuffs.gif
+share/gnome/gnomeicu/emoticons/Always/dog.gif
+share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
+share/gnome/gnomeicu/emoticons/Always/emoticon-data
+share/gnome/gnomeicu/emoticons/Always/envelope.gif
+share/gnome/gnomeicu/emoticons/Always/film.gif
+share/gnome/gnomeicu/emoticons/Always/girl.gif
+share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
+share/gnome/gnomeicu/emoticons/Always/heart.gif
+share/gnome/gnomeicu/emoticons/Always/martini.gif
+share/gnome/gnomeicu/emoticons/Always/messenger.gif
+share/gnome/gnomeicu/emoticons/Always/moon.gif
+share/gnome/gnomeicu/emoticons/Always/musical_note.gif
+share/gnome/gnomeicu/emoticons/Always/phone.gif
+share/gnome/gnomeicu/emoticons/Always/present.gif
+share/gnome/gnomeicu/emoticons/Always/rainbow.gif
+share/gnome/gnomeicu/emoticons/Always/rose.gif
+share/gnome/gnomeicu/emoticons/Always/star.gif
+share/gnome/gnomeicu/emoticons/Always/sun.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
+share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
+share/gnome/gnomeicu/emoticons/Default/bigsmile.png
+share/gnome/gnomeicu/emoticons/Default/cry.png
+share/gnome/gnomeicu/emoticons/Default/emoticon-data
+share/gnome/gnomeicu/emoticons/Default/sad.png
+share/gnome/gnomeicu/emoticons/Default/scream.png
+share/gnome/gnomeicu/emoticons/Default/smile.png
+share/gnome/gnomeicu/emoticons/Default/smile2.png
+share/gnome/gnomeicu/emoticons/Default/unsure.png
+share/gnome/gnomeicu/emoticons/Default/wink.png
+share/gnome/gnomeicu/emoticons/MSN/angel.gif
+share/gnome/gnomeicu/emoticons/MSN/angry.gif
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.gif
+share/gnome/gnomeicu/emoticons/MSN/confused.gif
+share/gnome/gnomeicu/emoticons/MSN/cry.gif
+share/gnome/gnomeicu/emoticons/MSN/devil.gif
+share/gnome/gnomeicu/emoticons/MSN/embaressed.gif
+share/gnome/gnomeicu/emoticons/MSN/emoticon-data
+share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/light.gif
+share/gnome/gnomeicu/emoticons/MSN/sad.gif
+share/gnome/gnomeicu/emoticons/MSN/shocked.gif
+share/gnome/gnomeicu/emoticons/MSN/smile.gif
+share/gnome/gnomeicu/emoticons/MSN/smile8.gif
+share/gnome/gnomeicu/emoticons/MSN/straight.gif
+share/gnome/gnomeicu/emoticons/MSN/tongue.gif
+share/gnome/gnomeicu/emoticons/MSN/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
+share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
+share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
+share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
+share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
+share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
+share/gnome/gnomeicu/emoticons/Yahoo/green.gif
+share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
+share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
+share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
+share/gnome/gnomeicu/emoticons/Yahoo/light.gif
+share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
+share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
+share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
+share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
+share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
+share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
+share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
+share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
 share/gnome/gnomeicu/glade/addcontact.glade
 share/gnome/gnomeicu/glade/auth.glade
+share/gnome/gnomeicu/glade/grpmgr.glade
 share/gnome/gnomeicu/glade/history.glade
 share/gnome/gnomeicu/glade/main.glade
 share/gnome/gnomeicu/glade/message.glade
+share/gnome/gnomeicu/glade/pref.glade
 share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation001.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation002.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation003.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation004.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation005.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
@@ -20,6 +143,7 @@ share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-info
 share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
@@ -89,8 +213,6 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png
-share/gnome/help/gnomeicu/C/gnomeicu.sgml
-share/gnome/help/gnomeicu/C/topic.dat
 share/gnome/pixmaps/gnome-gnomeicu.xpm
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
@@ -124,17 +246,20 @@ share/locale/sl/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
 share/locale/uk/LC_MESSAGES/gnomeicu.mo
+share/locale/vi/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
+@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/gnomeicu/icons/Eyeballs
+@dirrm share/gnome/gnomeicu/icons/Default
 @dirrm share/gnome/gnomeicu/icons
+@dirrm share/gnome/gnomeicu/glade
+@dirrm share/gnome/gnomeicu/emoticons/Yahoo
+@dirrm share/gnome/gnomeicu/emoticons/MSN
+@dirrm share/gnome/gnomeicu/emoticons/Default
+@dirrm share/gnome/gnomeicu/emoticons/Always
+@dirrm share/gnome/gnomeicu/emoticons/AIM
+@dirrm share/gnome/gnomeicu/emoticons
 @dirrm share/gnome/gnomeicu
-@dirrm share/gnome/help/gnomeicu/C/figures
-@dirrm share/gnome/help/gnomeicu/C/stylesheet-images
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/sounds/gnomeicu
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 95456665ce32..2cf91f1a2a5a 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -5,22 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeicu
-PORTVERSION=	0.98.3
+PORTNAME=	gnomeicu2
+PORTVERSION=	0.98.111
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
+DISTNAME=	gnomeicu-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS+=	gnet-config:${PORTSDIR}/net/gnet
+LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gnet.1:${PORTSDIR}/net/gnet \
+		gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade libpanel gdkpixbuf
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix gnomehack
 USE_GMAKE=		yes
+USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,7 +45,7 @@ SOCKSLIBS=	-lsocks5
 
 CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/net-im/gnomeicu2/distinfo b/net-im/gnomeicu2/distinfo
index 5e5f3663682f..144684291db3 100644
--- a/net-im/gnomeicu2/distinfo
+++ b/net-im/gnomeicu2/distinfo
@@ -1 +1 @@
-MD5 (gnomeicu-0.98.3.tar.bz2) = 2a11f615c4de3640c5e56499f7b42f8e
+MD5 (gnomeicu-0.98.111.tar.bz2) = 57f2295e28febcc6215970924312d4d2
diff --git a/net-im/gnomeicu2/files/patch-configure b/net-im/gnomeicu2/files/patch-configure
new file mode 100644
index 000000000000..c6ee752e9833
--- /dev/null
+++ b/net-im/gnomeicu2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/09/11 08:57:13	1.1
++++ configure	2002/09/11 08:57:46
+@@ -7490,6 +7490,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net-im/gnomeicu2/files/patch-po::Makefile.in.in b/net-im/gnomeicu2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 62a7c83e66ea..000000000000
--- a/net-im/gnomeicu2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/07/20 11:41:22	1.1
-+++ po/Makefile.in.in	2002/07/20 11:41:34
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/net-im/gnomeicu2/files/patch-src::icu_db.c b/net-im/gnomeicu2/files/patch-src::icu_db.c
index 0a0196a73c92..3df66fcf8c50 100644
--- a/net-im/gnomeicu2/files/patch-src::icu_db.c
+++ b/net-im/gnomeicu2/files/patch-src::icu_db.c
@@ -1,14 +1,17 @@
---- src/icu_db.c.orig	Sat Jan  5 19:15:03 2002
-+++ src/icu_db.c	Sat Jan  5 19:16:00 2002
-@@ -33,7 +33,11 @@
+
+$FreeBSD$
+
+--- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
++++ src/icu_db.c	Wed Sep 11 11:45:05 2002
+@@ -27,7 +27,11 @@
+ 
+ #include <fcntl.h>
  #include <errno.h>
- #include <stdio.h>
- #include <string.h>
 +#if defined(HAVE_STDLIB_H)
 +#include <stdlib.h>
 +#else
  #include <malloc.h>
 +#endif
- 
- #if defined(HAVE_LIBGDBM)
- #include <gdbm.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/param.h>
diff --git a/net-im/gnomeicu2/pkg-comment b/net-im/gnomeicu2/pkg-comment
index bb39546ca3ca..0273d4c4e50c 100644
--- a/net-im/gnomeicu2/pkg-comment
+++ b/net-im/gnomeicu2/pkg-comment
@@ -1 +1 @@
-GNOME ICQ client
+GNOME2 ICQ client
diff --git a/net-im/gnomeicu2/pkg-descr b/net-im/gnomeicu2/pkg-descr
index 8e2bd46699a3..df8c0c64984b 100644
--- a/net-im/gnomeicu2/pkg-descr
+++ b/net-im/gnomeicu2/pkg-descr
@@ -1,6 +1,6 @@
  GnomeICU (previously GtkICQ) is an Internet based communications
  program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome, a growingly popular desktop environment.GnomeICU is released
+ Gnome2, a growingly popular desktop environment. GnomeICU is released
  under the GNU Public License, and is available free of charge.
 
 WWW: http://gnomeicu.sourceforge.net
diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
index 14d1f5bbf0f8..4473d442ccdf 100644
--- a/net-im/gnomeicu2/pkg-plist
+++ b/net-im/gnomeicu2/pkg-plist
@@ -1,16 +1,139 @@
 bin/gnomeicu
 bin/gnomeicu-client
-etc/CORBA/servers/GnomeICU.gnorba
 etc/sound/events/GnomeICU.soundlist
-share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/apps/Internet/GnomeICU.desktop
+libdata/bonobo/servers/GNOME_GnomeICUApplet.server
+libexec/gnomeicu-applet
+share/gnome/applications/GnomeICU.desktop
+share/gnome/gnome-2.0/ui/GNOME_GnomeICUApplet.xml
+share/gnome/gnomeicu/emoticons/AIM/angel.xpm
+share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
+share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
+share/gnome/gnomeicu/emoticons/AIM/cry.xpm
+share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
+share/gnome/gnomeicu/emoticons/AIM/emoticon-data
+share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
+share/gnome/gnomeicu/emoticons/AIM/sad.xpm
+share/gnome/gnomeicu/emoticons/AIM/scream.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
+share/gnome/gnomeicu/emoticons/AIM/think.xpm
+share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
+share/gnome/gnomeicu/emoticons/AIM/wink.xpm
+share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
+share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
+share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
+share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
+share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
+share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
+share/gnome/gnomeicu/emoticons/Always/Whining.bmp
+share/gnome/gnomeicu/emoticons/Always/asl.gif
+share/gnome/gnomeicu/emoticons/Always/bat.gif
+share/gnome/gnomeicu/emoticons/Always/beer.gif
+share/gnome/gnomeicu/emoticons/Always/boy.gif
+share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
+share/gnome/gnomeicu/emoticons/Always/cake.gif
+share/gnome/gnomeicu/emoticons/Always/camera.gif
+share/gnome/gnomeicu/emoticons/Always/cat.gif
+share/gnome/gnomeicu/emoticons/Always/clock.gif
+share/gnome/gnomeicu/emoticons/Always/coffee.gif
+share/gnome/gnomeicu/emoticons/Always/cuffs.gif
+share/gnome/gnomeicu/emoticons/Always/dog.gif
+share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
+share/gnome/gnomeicu/emoticons/Always/emoticon-data
+share/gnome/gnomeicu/emoticons/Always/envelope.gif
+share/gnome/gnomeicu/emoticons/Always/film.gif
+share/gnome/gnomeicu/emoticons/Always/girl.gif
+share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
+share/gnome/gnomeicu/emoticons/Always/heart.gif
+share/gnome/gnomeicu/emoticons/Always/martini.gif
+share/gnome/gnomeicu/emoticons/Always/messenger.gif
+share/gnome/gnomeicu/emoticons/Always/moon.gif
+share/gnome/gnomeicu/emoticons/Always/musical_note.gif
+share/gnome/gnomeicu/emoticons/Always/phone.gif
+share/gnome/gnomeicu/emoticons/Always/present.gif
+share/gnome/gnomeicu/emoticons/Always/rainbow.gif
+share/gnome/gnomeicu/emoticons/Always/rose.gif
+share/gnome/gnomeicu/emoticons/Always/star.gif
+share/gnome/gnomeicu/emoticons/Always/sun.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
+share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
+share/gnome/gnomeicu/emoticons/Default/bigsmile.png
+share/gnome/gnomeicu/emoticons/Default/cry.png
+share/gnome/gnomeicu/emoticons/Default/emoticon-data
+share/gnome/gnomeicu/emoticons/Default/sad.png
+share/gnome/gnomeicu/emoticons/Default/scream.png
+share/gnome/gnomeicu/emoticons/Default/smile.png
+share/gnome/gnomeicu/emoticons/Default/smile2.png
+share/gnome/gnomeicu/emoticons/Default/unsure.png
+share/gnome/gnomeicu/emoticons/Default/wink.png
+share/gnome/gnomeicu/emoticons/MSN/angel.gif
+share/gnome/gnomeicu/emoticons/MSN/angry.gif
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.gif
+share/gnome/gnomeicu/emoticons/MSN/confused.gif
+share/gnome/gnomeicu/emoticons/MSN/cry.gif
+share/gnome/gnomeicu/emoticons/MSN/devil.gif
+share/gnome/gnomeicu/emoticons/MSN/embaressed.gif
+share/gnome/gnomeicu/emoticons/MSN/emoticon-data
+share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/light.gif
+share/gnome/gnomeicu/emoticons/MSN/sad.gif
+share/gnome/gnomeicu/emoticons/MSN/shocked.gif
+share/gnome/gnomeicu/emoticons/MSN/smile.gif
+share/gnome/gnomeicu/emoticons/MSN/smile8.gif
+share/gnome/gnomeicu/emoticons/MSN/straight.gif
+share/gnome/gnomeicu/emoticons/MSN/tongue.gif
+share/gnome/gnomeicu/emoticons/MSN/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
+share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
+share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
+share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
+share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
+share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
+share/gnome/gnomeicu/emoticons/Yahoo/green.gif
+share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
+share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
+share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
+share/gnome/gnomeicu/emoticons/Yahoo/light.gif
+share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
+share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
+share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
+share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
+share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
+share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
+share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
+share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
 share/gnome/gnomeicu/glade/addcontact.glade
 share/gnome/gnomeicu/glade/auth.glade
+share/gnome/gnomeicu/glade/grpmgr.glade
 share/gnome/gnomeicu/glade/history.glade
 share/gnome/gnomeicu/glade/main.glade
 share/gnome/gnomeicu/glade/message.glade
+share/gnome/gnomeicu/glade/pref.glade
 share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation001.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation002.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation003.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation004.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation005.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
@@ -20,6 +143,7 @@ share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-info
 share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
@@ -89,8 +213,6 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png
-share/gnome/help/gnomeicu/C/gnomeicu.sgml
-share/gnome/help/gnomeicu/C/topic.dat
 share/gnome/pixmaps/gnome-gnomeicu.xpm
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
@@ -124,17 +246,20 @@ share/locale/sl/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
 share/locale/uk/LC_MESSAGES/gnomeicu.mo
+share/locale/vi/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
+@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/gnomeicu/icons/Eyeballs
+@dirrm share/gnome/gnomeicu/icons/Default
 @dirrm share/gnome/gnomeicu/icons
+@dirrm share/gnome/gnomeicu/glade
+@dirrm share/gnome/gnomeicu/emoticons/Yahoo
+@dirrm share/gnome/gnomeicu/emoticons/MSN
+@dirrm share/gnome/gnomeicu/emoticons/Default
+@dirrm share/gnome/gnomeicu/emoticons/Always
+@dirrm share/gnome/gnomeicu/emoticons/AIM
+@dirrm share/gnome/gnomeicu/emoticons
 @dirrm share/gnome/gnomeicu
-@dirrm share/gnome/help/gnomeicu/C/figures
-@dirrm share/gnome/help/gnomeicu/C/stylesheet-images
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/sounds/gnomeicu
diff --git a/net/Makefile b/net/Makefile
index ddecf5d49d4e..66b9fde7fb70 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -157,6 +157,7 @@
     SUBDIR += gnomba
     SUBDIR += gnome-vnc
     SUBDIR += gnomeicu
+    SUBDIR += gnomeicu2
     SUBDIR += gnomemeeting
     SUBDIR += gnometelnet
     SUBDIR += gnosamba
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 95456665ce32..2cf91f1a2a5a 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -5,22 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeicu
-PORTVERSION=	0.98.3
+PORTNAME=	gnomeicu2
+PORTVERSION=	0.98.111
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
+DISTNAME=	gnomeicu-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS+=	gnet-config:${PORTSDIR}/net/gnet
+LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gnet.1:${PORTSDIR}/net/gnet \
+		gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade libpanel gdkpixbuf
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix gnomehack
 USE_GMAKE=		yes
+USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,7 +45,7 @@ SOCKSLIBS=	-lsocks5
 
 CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo
index 5e5f3663682f..144684291db3 100644
--- a/net/gnomeicu/gnomeicu/distinfo
+++ b/net/gnomeicu/gnomeicu/distinfo
@@ -1 +1 @@
-MD5 (gnomeicu-0.98.3.tar.bz2) = 2a11f615c4de3640c5e56499f7b42f8e
+MD5 (gnomeicu-0.98.111.tar.bz2) = 57f2295e28febcc6215970924312d4d2
diff --git a/net/gnomeicu/gnomeicu/files/patch-configure b/net/gnomeicu/gnomeicu/files/patch-configure
new file mode 100644
index 000000000000..c6ee752e9833
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/09/11 08:57:13	1.1
++++ configure	2002/09/11 08:57:46
+@@ -7490,6 +7490,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnomeicu/gnomeicu/files/patch-po::Makefile.in.in b/net/gnomeicu/gnomeicu/files/patch-po::Makefile.in.in
deleted file mode 100644
index 62a7c83e66ea..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/07/20 11:41:22	1.1
-+++ po/Makefile.in.in	2002/07/20 11:41:34
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c b/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c
index 0a0196a73c92..3df66fcf8c50 100644
--- a/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c
+++ b/net/gnomeicu/gnomeicu/files/patch-src::icu_db.c
@@ -1,14 +1,17 @@
---- src/icu_db.c.orig	Sat Jan  5 19:15:03 2002
-+++ src/icu_db.c	Sat Jan  5 19:16:00 2002
-@@ -33,7 +33,11 @@
+
+$FreeBSD$
+
+--- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
++++ src/icu_db.c	Wed Sep 11 11:45:05 2002
+@@ -27,7 +27,11 @@
+ 
+ #include <fcntl.h>
  #include <errno.h>
- #include <stdio.h>
- #include <string.h>
 +#if defined(HAVE_STDLIB_H)
 +#include <stdlib.h>
 +#else
  #include <malloc.h>
 +#endif
- 
- #if defined(HAVE_LIBGDBM)
- #include <gdbm.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/param.h>
diff --git a/net/gnomeicu/gnomeicu/pkg-comment b/net/gnomeicu/gnomeicu/pkg-comment
index bb39546ca3ca..0273d4c4e50c 100644
--- a/net/gnomeicu/gnomeicu/pkg-comment
+++ b/net/gnomeicu/gnomeicu/pkg-comment
@@ -1 +1 @@
-GNOME ICQ client
+GNOME2 ICQ client
diff --git a/net/gnomeicu/gnomeicu/pkg-descr b/net/gnomeicu/gnomeicu/pkg-descr
index 8e2bd46699a3..df8c0c64984b 100644
--- a/net/gnomeicu/gnomeicu/pkg-descr
+++ b/net/gnomeicu/gnomeicu/pkg-descr
@@ -1,6 +1,6 @@
  GnomeICU (previously GtkICQ) is an Internet based communications
  program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome, a growingly popular desktop environment.GnomeICU is released
+ Gnome2, a growingly popular desktop environment. GnomeICU is released
  under the GNU Public License, and is available free of charge.
 
 WWW: http://gnomeicu.sourceforge.net
diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist
index 14d1f5bbf0f8..4473d442ccdf 100644
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ b/net/gnomeicu/gnomeicu/pkg-plist
@@ -1,16 +1,139 @@
 bin/gnomeicu
 bin/gnomeicu-client
-etc/CORBA/servers/GnomeICU.gnorba
 etc/sound/events/GnomeICU.soundlist
-share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/apps/Internet/GnomeICU.desktop
+libdata/bonobo/servers/GNOME_GnomeICUApplet.server
+libexec/gnomeicu-applet
+share/gnome/applications/GnomeICU.desktop
+share/gnome/gnome-2.0/ui/GNOME_GnomeICUApplet.xml
+share/gnome/gnomeicu/emoticons/AIM/angel.xpm
+share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
+share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
+share/gnome/gnomeicu/emoticons/AIM/cry.xpm
+share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
+share/gnome/gnomeicu/emoticons/AIM/emoticon-data
+share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
+share/gnome/gnomeicu/emoticons/AIM/sad.xpm
+share/gnome/gnomeicu/emoticons/AIM/scream.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
+share/gnome/gnomeicu/emoticons/AIM/think.xpm
+share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
+share/gnome/gnomeicu/emoticons/AIM/wink.xpm
+share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
+share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
+share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
+share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
+share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
+share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
+share/gnome/gnomeicu/emoticons/Always/Whining.bmp
+share/gnome/gnomeicu/emoticons/Always/asl.gif
+share/gnome/gnomeicu/emoticons/Always/bat.gif
+share/gnome/gnomeicu/emoticons/Always/beer.gif
+share/gnome/gnomeicu/emoticons/Always/boy.gif
+share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
+share/gnome/gnomeicu/emoticons/Always/cake.gif
+share/gnome/gnomeicu/emoticons/Always/camera.gif
+share/gnome/gnomeicu/emoticons/Always/cat.gif
+share/gnome/gnomeicu/emoticons/Always/clock.gif
+share/gnome/gnomeicu/emoticons/Always/coffee.gif
+share/gnome/gnomeicu/emoticons/Always/cuffs.gif
+share/gnome/gnomeicu/emoticons/Always/dog.gif
+share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
+share/gnome/gnomeicu/emoticons/Always/emoticon-data
+share/gnome/gnomeicu/emoticons/Always/envelope.gif
+share/gnome/gnomeicu/emoticons/Always/film.gif
+share/gnome/gnomeicu/emoticons/Always/girl.gif
+share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
+share/gnome/gnomeicu/emoticons/Always/heart.gif
+share/gnome/gnomeicu/emoticons/Always/martini.gif
+share/gnome/gnomeicu/emoticons/Always/messenger.gif
+share/gnome/gnomeicu/emoticons/Always/moon.gif
+share/gnome/gnomeicu/emoticons/Always/musical_note.gif
+share/gnome/gnomeicu/emoticons/Always/phone.gif
+share/gnome/gnomeicu/emoticons/Always/present.gif
+share/gnome/gnomeicu/emoticons/Always/rainbow.gif
+share/gnome/gnomeicu/emoticons/Always/rose.gif
+share/gnome/gnomeicu/emoticons/Always/star.gif
+share/gnome/gnomeicu/emoticons/Always/sun.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
+share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
+share/gnome/gnomeicu/emoticons/Default/bigsmile.png
+share/gnome/gnomeicu/emoticons/Default/cry.png
+share/gnome/gnomeicu/emoticons/Default/emoticon-data
+share/gnome/gnomeicu/emoticons/Default/sad.png
+share/gnome/gnomeicu/emoticons/Default/scream.png
+share/gnome/gnomeicu/emoticons/Default/smile.png
+share/gnome/gnomeicu/emoticons/Default/smile2.png
+share/gnome/gnomeicu/emoticons/Default/unsure.png
+share/gnome/gnomeicu/emoticons/Default/wink.png
+share/gnome/gnomeicu/emoticons/MSN/angel.gif
+share/gnome/gnomeicu/emoticons/MSN/angry.gif
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.gif
+share/gnome/gnomeicu/emoticons/MSN/confused.gif
+share/gnome/gnomeicu/emoticons/MSN/cry.gif
+share/gnome/gnomeicu/emoticons/MSN/devil.gif
+share/gnome/gnomeicu/emoticons/MSN/embaressed.gif
+share/gnome/gnomeicu/emoticons/MSN/emoticon-data
+share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/light.gif
+share/gnome/gnomeicu/emoticons/MSN/sad.gif
+share/gnome/gnomeicu/emoticons/MSN/shocked.gif
+share/gnome/gnomeicu/emoticons/MSN/smile.gif
+share/gnome/gnomeicu/emoticons/MSN/smile8.gif
+share/gnome/gnomeicu/emoticons/MSN/straight.gif
+share/gnome/gnomeicu/emoticons/MSN/tongue.gif
+share/gnome/gnomeicu/emoticons/MSN/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
+share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
+share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
+share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
+share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
+share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
+share/gnome/gnomeicu/emoticons/Yahoo/green.gif
+share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
+share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
+share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
+share/gnome/gnomeicu/emoticons/Yahoo/light.gif
+share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
+share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
+share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
+share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
+share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
+share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
+share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
+share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
 share/gnome/gnomeicu/glade/addcontact.glade
 share/gnome/gnomeicu/glade/auth.glade
+share/gnome/gnomeicu/glade/grpmgr.glade
 share/gnome/gnomeicu/glade/history.glade
 share/gnome/gnomeicu/glade/main.glade
 share/gnome/gnomeicu/glade/message.glade
+share/gnome/gnomeicu/glade/pref.glade
 share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation001.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation002.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation003.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation004.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation005.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
@@ -20,6 +143,7 @@ share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-info
 share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
@@ -89,8 +213,6 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png
-share/gnome/help/gnomeicu/C/gnomeicu.sgml
-share/gnome/help/gnomeicu/C/topic.dat
 share/gnome/pixmaps/gnome-gnomeicu.xpm
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
@@ -124,17 +246,20 @@ share/locale/sl/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
 share/locale/uk/LC_MESSAGES/gnomeicu.mo
+share/locale/vi/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
+@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/gnomeicu/icons/Eyeballs
+@dirrm share/gnome/gnomeicu/icons/Default
 @dirrm share/gnome/gnomeicu/icons
+@dirrm share/gnome/gnomeicu/glade
+@dirrm share/gnome/gnomeicu/emoticons/Yahoo
+@dirrm share/gnome/gnomeicu/emoticons/MSN
+@dirrm share/gnome/gnomeicu/emoticons/Default
+@dirrm share/gnome/gnomeicu/emoticons/Always
+@dirrm share/gnome/gnomeicu/emoticons/AIM
+@dirrm share/gnome/gnomeicu/emoticons
 @dirrm share/gnome/gnomeicu
-@dirrm share/gnome/help/gnomeicu/C/figures
-@dirrm share/gnome/help/gnomeicu/C/stylesheet-images
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/sounds/gnomeicu
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 95456665ce32..2cf91f1a2a5a 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -5,22 +5,27 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gnomeicu
-PORTVERSION=	0.98.3
+PORTNAME=	gnomeicu2
+PORTVERSION=	0.98.111
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gnomeicu
+DISTNAME=	gnomeicu-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS+=	gnet-config:${PORTSDIR}/net/gnet
+LIB_DEPENDS+=	glade-2.0.0:${PORTSDIR}/devel/libglade2 \
+		gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui \
+		xml2.5:${PORTSDIR}/textproc/libxml2 \
+		gnet.1:${PORTSDIR}/net/gnet \
+		gdbm.2:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade libpanel gdkpixbuf
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnomeprefix gnomehack
 USE_GMAKE=		yes
+USE_LIBTOOL=	yes
 .if defined(WITH_DANTE)
 LIB_DEPENDS+=	socks.1:${PORTSDIR}/net/dante
 SOCKSFLAGS=	-Dconnect=Rconnect -Dbind=Rbind -Dgetsockname=Rgetsockname \
@@ -40,7 +45,7 @@ SOCKSLIBS=	-lsocks5
 
 CONFIGURE_ARGS=	--with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 
diff --git a/net/gnomeicu2/distinfo b/net/gnomeicu2/distinfo
index 5e5f3663682f..144684291db3 100644
--- a/net/gnomeicu2/distinfo
+++ b/net/gnomeicu2/distinfo
@@ -1 +1 @@
-MD5 (gnomeicu-0.98.3.tar.bz2) = 2a11f615c4de3640c5e56499f7b42f8e
+MD5 (gnomeicu-0.98.111.tar.bz2) = 57f2295e28febcc6215970924312d4d2
diff --git a/net/gnomeicu2/files/patch-configure b/net/gnomeicu2/files/patch-configure
new file mode 100644
index 000000000000..c6ee752e9833
--- /dev/null
+++ b/net/gnomeicu2/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/09/11 08:57:13	1.1
++++ configure	2002/09/11 08:57:46
+@@ -7490,6 +7490,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/net/gnomeicu2/files/patch-po::Makefile.in.in b/net/gnomeicu2/files/patch-po::Makefile.in.in
deleted file mode 100644
index 62a7c83e66ea..000000000000
--- a/net/gnomeicu2/files/patch-po::Makefile.in.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- po/Makefile.in.in	2002/07/20 11:41:22	1.1
-+++ po/Makefile.in.in	2002/07/20 11:41:34
-@@ -106,7 +106,7 @@
- 	@catalogs='$(CATALOGS)'; \
- 	for cat in $$catalogs; do \
- 	  cat=`basename $$cat`; \
--	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+	  lang=`echo $$cat | sed 's/\.mo$$//'`; \
- 	  dir=$(localedir)/$$lang/LC_MESSAGES; \
- 	  $(mkinstalldirs) $(DESTDIR)$$dir; \
- 	  if test -r $$cat; then \
diff --git a/net/gnomeicu2/files/patch-src::icu_db.c b/net/gnomeicu2/files/patch-src::icu_db.c
index 0a0196a73c92..3df66fcf8c50 100644
--- a/net/gnomeicu2/files/patch-src::icu_db.c
+++ b/net/gnomeicu2/files/patch-src::icu_db.c
@@ -1,14 +1,17 @@
---- src/icu_db.c.orig	Sat Jan  5 19:15:03 2002
-+++ src/icu_db.c	Sat Jan  5 19:16:00 2002
-@@ -33,7 +33,11 @@
+
+$FreeBSD$
+
+--- src/icu_db.c.orig	Sat Jun 22 22:11:46 2002
++++ src/icu_db.c	Wed Sep 11 11:45:05 2002
+@@ -27,7 +27,11 @@
+ 
+ #include <fcntl.h>
  #include <errno.h>
- #include <stdio.h>
- #include <string.h>
 +#if defined(HAVE_STDLIB_H)
 +#include <stdlib.h>
 +#else
  #include <malloc.h>
 +#endif
- 
- #if defined(HAVE_LIBGDBM)
- #include <gdbm.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <sys/param.h>
diff --git a/net/gnomeicu2/pkg-comment b/net/gnomeicu2/pkg-comment
index bb39546ca3ca..0273d4c4e50c 100644
--- a/net/gnomeicu2/pkg-comment
+++ b/net/gnomeicu2/pkg-comment
@@ -1 +1 @@
-GNOME ICQ client
+GNOME2 ICQ client
diff --git a/net/gnomeicu2/pkg-descr b/net/gnomeicu2/pkg-descr
index 8e2bd46699a3..df8c0c64984b 100644
--- a/net/gnomeicu2/pkg-descr
+++ b/net/gnomeicu2/pkg-descr
@@ -1,6 +1,6 @@
  GnomeICU (previously GtkICQ) is an Internet based communications
  program which makes use of ICQ protocol. GnomeICU also makes use of
- Gnome, a growingly popular desktop environment.GnomeICU is released
+ Gnome2, a growingly popular desktop environment. GnomeICU is released
  under the GNU Public License, and is available free of charge.
 
 WWW: http://gnomeicu.sourceforge.net
diff --git a/net/gnomeicu2/pkg-plist b/net/gnomeicu2/pkg-plist
index 14d1f5bbf0f8..4473d442ccdf 100644
--- a/net/gnomeicu2/pkg-plist
+++ b/net/gnomeicu2/pkg-plist
@@ -1,16 +1,139 @@
 bin/gnomeicu
 bin/gnomeicu-client
-etc/CORBA/servers/GnomeICU.gnorba
 etc/sound/events/GnomeICU.soundlist
-share/gnome/applets/Network/GnomeICU.desktop
-share/gnome/apps/Internet/GnomeICU.desktop
+libdata/bonobo/servers/GNOME_GnomeICUApplet.server
+libexec/gnomeicu-applet
+share/gnome/applications/GnomeICU.desktop
+share/gnome/gnome-2.0/ui/GNOME_GnomeICUApplet.xml
+share/gnome/gnomeicu/emoticons/AIM/angel.xpm
+share/gnome/gnomeicu/emoticons/AIM/bigsmile.xpm
+share/gnome/gnomeicu/emoticons/AIM/crossedlips.xpm
+share/gnome/gnomeicu/emoticons/AIM/cry.xpm
+share/gnome/gnomeicu/emoticons/AIM/embarrassed.xpm
+share/gnome/gnomeicu/emoticons/AIM/emoticon-data
+share/gnome/gnomeicu/emoticons/AIM/kiss.xpm
+share/gnome/gnomeicu/emoticons/AIM/sad.xpm
+share/gnome/gnomeicu/emoticons/AIM/scream.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile.xpm
+share/gnome/gnomeicu/emoticons/AIM/smile8.xpm
+share/gnome/gnomeicu/emoticons/AIM/think.xpm
+share/gnome/gnomeicu/emoticons/AIM/tongue.xpm
+share/gnome/gnomeicu/emoticons/AIM/wink.xpm
+share/gnome/gnomeicu/emoticons/Always/Annoyed.bmp
+share/gnome/gnomeicu/emoticons/Always/Disgusted.bmp
+share/gnome/gnomeicu/emoticons/Always/Drooling.bmp
+share/gnome/gnomeicu/emoticons/Always/Giggling.bmp
+share/gnome/gnomeicu/emoticons/Always/Jokingly.bmp
+share/gnome/gnomeicu/emoticons/Always/Shocked.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-F.bmp
+share/gnome/gnomeicu/emoticons/Always/Surprised-M.bmp
+share/gnome/gnomeicu/emoticons/Always/Whining.bmp
+share/gnome/gnomeicu/emoticons/Always/asl.gif
+share/gnome/gnomeicu/emoticons/Always/bat.gif
+share/gnome/gnomeicu/emoticons/Always/beer.gif
+share/gnome/gnomeicu/emoticons/Always/boy.gif
+share/gnome/gnomeicu/emoticons/Always/broken_heart.gif
+share/gnome/gnomeicu/emoticons/Always/cake.gif
+share/gnome/gnomeicu/emoticons/Always/camera.gif
+share/gnome/gnomeicu/emoticons/Always/cat.gif
+share/gnome/gnomeicu/emoticons/Always/clock.gif
+share/gnome/gnomeicu/emoticons/Always/coffee.gif
+share/gnome/gnomeicu/emoticons/Always/cuffs.gif
+share/gnome/gnomeicu/emoticons/Always/dog.gif
+share/gnome/gnomeicu/emoticons/Always/dude_hug.gif
+share/gnome/gnomeicu/emoticons/Always/emoticon-data
+share/gnome/gnomeicu/emoticons/Always/envelope.gif
+share/gnome/gnomeicu/emoticons/Always/film.gif
+share/gnome/gnomeicu/emoticons/Always/girl.gif
+share/gnome/gnomeicu/emoticons/Always/girl_hug.gif
+share/gnome/gnomeicu/emoticons/Always/heart.gif
+share/gnome/gnomeicu/emoticons/Always/martini.gif
+share/gnome/gnomeicu/emoticons/Always/messenger.gif
+share/gnome/gnomeicu/emoticons/Always/moon.gif
+share/gnome/gnomeicu/emoticons/Always/musical_note.gif
+share/gnome/gnomeicu/emoticons/Always/phone.gif
+share/gnome/gnomeicu/emoticons/Always/present.gif
+share/gnome/gnomeicu/emoticons/Always/rainbow.gif
+share/gnome/gnomeicu/emoticons/Always/rose.gif
+share/gnome/gnomeicu/emoticons/Always/star.gif
+share/gnome/gnomeicu/emoticons/Always/sun.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_down.gif
+share/gnome/gnomeicu/emoticons/Always/thumbs_up.gif
+share/gnome/gnomeicu/emoticons/Always/wilted_rose.gif
+share/gnome/gnomeicu/emoticons/Default/bigsmile.png
+share/gnome/gnomeicu/emoticons/Default/cry.png
+share/gnome/gnomeicu/emoticons/Default/emoticon-data
+share/gnome/gnomeicu/emoticons/Default/sad.png
+share/gnome/gnomeicu/emoticons/Default/scream.png
+share/gnome/gnomeicu/emoticons/Default/smile.png
+share/gnome/gnomeicu/emoticons/Default/smile2.png
+share/gnome/gnomeicu/emoticons/Default/unsure.png
+share/gnome/gnomeicu/emoticons/Default/wink.png
+share/gnome/gnomeicu/emoticons/MSN/angel.gif
+share/gnome/gnomeicu/emoticons/MSN/angry.gif
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.gif
+share/gnome/gnomeicu/emoticons/MSN/confused.gif
+share/gnome/gnomeicu/emoticons/MSN/cry.gif
+share/gnome/gnomeicu/emoticons/MSN/devil.gif
+share/gnome/gnomeicu/emoticons/MSN/embaressed.gif
+share/gnome/gnomeicu/emoticons/MSN/emoticon-data
+share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/light.gif
+share/gnome/gnomeicu/emoticons/MSN/sad.gif
+share/gnome/gnomeicu/emoticons/MSN/shocked.gif
+share/gnome/gnomeicu/emoticons/MSN/smile.gif
+share/gnome/gnomeicu/emoticons/MSN/smile8.gif
+share/gnome/gnomeicu/emoticons/MSN/straight.gif
+share/gnome/gnomeicu/emoticons/MSN/tongue.gif
+share/gnome/gnomeicu/emoticons/MSN/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
+share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
+share/gnome/gnomeicu/emoticons/Yahoo/bigsmile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/blush.gif
+share/gnome/gnomeicu/emoticons/Yahoo/clown.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cow.gif
+share/gnome/gnomeicu/emoticons/Yahoo/cowboy.gif
+share/gnome/gnomeicu/emoticons/Yahoo/devil.gif
+share/gnome/gnomeicu/emoticons/Yahoo/emoticon-data
+share/gnome/gnomeicu/emoticons/Yahoo/flag.gif
+share/gnome/gnomeicu/emoticons/Yahoo/green.gif
+share/gnome/gnomeicu/emoticons/Yahoo/hrmph.gif
+share/gnome/gnomeicu/emoticons/Yahoo/ignore.gif
+share/gnome/gnomeicu/emoticons/Yahoo/kiss.gif
+share/gnome/gnomeicu/emoticons/Yahoo/light.gif
+share/gnome/gnomeicu/emoticons/Yahoo/monkey.gif
+share/gnome/gnomeicu/emoticons/Yahoo/nerd.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pig.gif
+share/gnome/gnomeicu/emoticons/Yahoo/pumpkin.gif
+share/gnome/gnomeicu/emoticons/Yahoo/quiet.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rofl.gif
+share/gnome/gnomeicu/emoticons/Yahoo/rose.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sad.gif
+share/gnome/gnomeicu/emoticons/Yahoo/shocked.gif
+share/gnome/gnomeicu/emoticons/Yahoo/skull.gif
+share/gnome/gnomeicu/emoticons/Yahoo/sleep.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile.gif
+share/gnome/gnomeicu/emoticons/Yahoo/smile8.gif
+share/gnome/gnomeicu/emoticons/Yahoo/stop.gif
+share/gnome/gnomeicu/emoticons/Yahoo/straight.gif
+share/gnome/gnomeicu/emoticons/Yahoo/tongue.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wail.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wink.gif
+share/gnome/gnomeicu/emoticons/Yahoo/wonder.gif
 share/gnome/gnomeicu/glade/addcontact.glade
 share/gnome/gnomeicu/glade/auth.glade
+share/gnome/gnomeicu/glade/grpmgr.glade
 share/gnome/gnomeicu/glade/history.glade
 share/gnome/gnomeicu/glade/main.glade
 share/gnome/gnomeicu/glade/message.glade
+share/gnome/gnomeicu/glade/pref.glade
 share/gnome/gnomeicu/glade/user_info.glade
-share/gnome/gnomeicu/icons/Default/gnomeicu-animation.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation001.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation002.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation003.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation004.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-animation005.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
@@ -20,6 +143,7 @@ share/gnome/gnomeicu/icons/Default/gnomeicu-contact.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-dnd.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-ffc.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-file.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-group.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-hist.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-info
 share/gnome/gnomeicu/icons/Default/gnomeicu-info.png
@@ -89,8 +213,6 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-rename.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-still.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-url.png
-share/gnome/help/gnomeicu/C/gnomeicu.sgml
-share/gnome/help/gnomeicu/C/topic.dat
 share/gnome/pixmaps/gnome-gnomeicu.xpm
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
@@ -124,17 +246,20 @@ share/locale/sl/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
 share/locale/uk/LC_MESSAGES/gnomeicu.mo
+share/locale/vi/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
-@dirrm share/gnome/gnomeicu/glade
-@dirrm share/gnome/gnomeicu/icons/Default
-@dirrm share/gnome/gnomeicu/icons/Eyeballs
-@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
+@dirrm share/gnome/gnomeicu/icons/Gradients
+@dirrm share/gnome/gnomeicu/icons/Eyeballs
+@dirrm share/gnome/gnomeicu/icons/Default
 @dirrm share/gnome/gnomeicu/icons
+@dirrm share/gnome/gnomeicu/glade
+@dirrm share/gnome/gnomeicu/emoticons/Yahoo
+@dirrm share/gnome/gnomeicu/emoticons/MSN
+@dirrm share/gnome/gnomeicu/emoticons/Default
+@dirrm share/gnome/gnomeicu/emoticons/Always
+@dirrm share/gnome/gnomeicu/emoticons/AIM
+@dirrm share/gnome/gnomeicu/emoticons
 @dirrm share/gnome/gnomeicu
-@dirrm share/gnome/help/gnomeicu/C/figures
-@dirrm share/gnome/help/gnomeicu/C/stylesheet-images
-@dirrm share/gnome/help/gnomeicu/C
-@dirrm share/gnome/help/gnomeicu
-@dirrm share/gnome/sounds/gnomeicu