Update to 0.99.5.

36 files changed, 384 insertions, 216 deletions

diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 61b457400d90..eb02207c5707 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
-USE_GMAKE=		yes
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
+USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 .if defined(WITH_DANTE)
@@ -47,8 +46,14 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 
+.ifndef(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+CONFIGURE_ARGS+=--enable-gtkspell
+.else
+CONFIGURE_ARGS+=--disable-gtkspell
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \
 		${WRKSRC}/src/gnomeicu.c
 
diff --git a/net-im/gnomeicu/distinfo b/net-im/gnomeicu/distinfo
index 433215e3c63d..4121cb36ef7c 100644
--- a/net-im/gnomeicu/distinfo
+++ b/net-im/gnomeicu/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnomeicu-0.99.tar.bz2) = d5e49557a3ed3545b98c3749257e58ef
-SIZE (gnomeicu-0.99.tar.bz2) = 1368468
+MD5 (gnomeicu-0.99.5.tar.bz2) = 59ff902171a14ad37896f6661ddedb7a
+SIZE (gnomeicu-0.99.5.tar.bz2) = 2102452
diff --git a/net-im/gnomeicu/files/patch-configure b/net-im/gnomeicu/files/patch-configure
deleted file mode 100644
index c6ee752e9833..000000000000
--- a/net-im/gnomeicu/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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-src::gnomeicu-client.c b/net-im/gnomeicu/files/patch-src::gnomeicu-client.c
deleted file mode 100644
index c3a82000bfca..000000000000
--- a/net-im/gnomeicu/files/patch-src::gnomeicu-client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gnomeicu-client.c.orig Sun Sep 29 14:59:15 2002
-+++ src/gnomeicu-client.c      Sun Sep 29 14:59:25 2002
-@@ -17,9 +17,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
--#include <sys/types.h>
- #include <sys/un.h>
- #include <unistd.h>
-
diff --git a/net-im/gnomeicu/files/patch-src_userserver.c b/net-im/gnomeicu/files/patch-src_userserver.c
index 0e602dbbc662..23e5ed601943 100644
--- a/net-im/gnomeicu/files/patch-src_userserver.c
+++ b/net-im/gnomeicu/files/patch-src_userserver.c
@@ -1,11 +1,10 @@
---- src/userserver.c.orig	Mon Mar 10 16:49:07 2003
-+++ src/userserver.c	Mon Mar 10 16:49:16 2003
-@@ -27,13 +27,13 @@
+--- src/userserver.c.orig	Fri Apr  2 15:20:45 2004
++++ src/userserver.c	Fri Apr  2 15:20:54 2004
+@@ -6,12 +6,12 @@
+ ***************************/
  
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
-+#include <sys/types.h>
  #include <errno.h>
++#include <sys/types.h>
  #include <netinet/in.h>
  #include <pwd.h>
  #include <stdio.h>
diff --git a/net-im/gnomeicu/files/patch-src_v7login.c b/net-im/gnomeicu/files/patch-src_v7login.c
new file mode 100644
index 000000000000..cea1c7fbe447
--- /dev/null
+++ b/net-im/gnomeicu/files/patch-src_v7login.c
@@ -0,0 +1,10 @@
+--- src/v7login.c.orig	Fri Apr  2 15:25:21 2004
++++ src/v7login.c	Fri Apr  2 15:25:57 2004
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/gnomeicu/files/patch-src_v7newuser.c b/net-im/gnomeicu/files/patch-src_v7newuser.c
new file mode 100644
index 000000000000..e235da7be9c0
--- /dev/null
+++ b/net-im/gnomeicu/files/patch-src_v7newuser.c
@@ -0,0 +1,10 @@
+--- src/v7newuser.c.orig	Fri Apr  2 15:26:51 2004
++++ src/v7newuser.c	Fri Apr  2 15:27:04 2004
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/gnomeicu/files/patch-src_v7recv.c b/net-im/gnomeicu/files/patch-src_v7recv.c
new file mode 100644
index 000000000000..43a64d9961cd
--- /dev/null
+++ b/net-im/gnomeicu/files/patch-src_v7recv.c
@@ -0,0 +1,10 @@
+--- src/v7recv.c.orig	Fri Apr  2 15:27:50 2004
++++ src/v7recv.c	Fri Apr  2 15:28:03 2004
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/gnomeicu/pkg-plist b/net-im/gnomeicu/pkg-plist
index c4e12d3b045e..84142858de25 100644
--- a/net-im/gnomeicu/pkg-plist
+++ b/net-im/gnomeicu/pkg-plist
@@ -93,23 +93,23 @@ share/gnome/gnomeicu/emoticons/Default/straight.png
 share/gnome/gnomeicu/emoticons/Default/tongue.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/angel.png
+share/gnome/gnomeicu/emoticons/MSN/angry.png
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
+share/gnome/gnomeicu/emoticons/MSN/confused.png
+share/gnome/gnomeicu/emoticons/MSN/cry.png
+share/gnome/gnomeicu/emoticons/MSN/devil.png
+share/gnome/gnomeicu/emoticons/MSN/embarassed.png
 share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/kiss.png
 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/MSN/sad.png
+share/gnome/gnomeicu/emoticons/MSN/shocked.png
+share/gnome/gnomeicu/emoticons/MSN/smile.png
+share/gnome/gnomeicu/emoticons/MSN/smile8.png
+share/gnome/gnomeicu/emoticons/MSN/straight.png
+share/gnome/gnomeicu/emoticons/MSN/tongue.png
+share/gnome/gnomeicu/emoticons/MSN/wink.png
 share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
@@ -158,6 +158,7 @@ share/gnome/gnomeicu/glade/welcome.glade
 share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
@@ -222,9 +223,30 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/prefs_icon_gnomeicu.png
 share/gnome/gnomeicu/prefs_icon_icq.png
+share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/C/figures/mainwindow.png
+share/gnome/help/gnomeicu/C/figures/messagedialog.png
+share/gnome/help/gnomeicu/C/figures/notificationicon.png
+share/gnome/help/gnomeicu/C/figures/prefdialog.png
+share/gnome/help/gnomeicu/C/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/C/figures/sendfile.png
+share/gnome/help/gnomeicu/C/figures/sendurl.png
+share/gnome/help/gnomeicu/C/figures/userinfo.png
 share/gnome/help/gnomeicu/C/gnomeicu.xml
+share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/uk/figures/mainwindow.png
+share/gnome/help/gnomeicu/uk/figures/messagedialog.png
+share/gnome/help/gnomeicu/uk/figures/notificationicon.png
+share/gnome/help/gnomeicu/uk/figures/prefdialog.png
+share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/uk/figures/sendfile.png
+share/gnome/help/gnomeicu/uk/figures/sendurl.png
+share/gnome/help/gnomeicu/uk/figures/userinfo.png
+share/gnome/help/gnomeicu/uk/gnomeicu.xml
 share/gnome/omf/gnomeicu/gnomeicu-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnomeicu/gnomeicu-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-gnomeicu.png
 share/gnome/sounds/gnomeicu/Auth.wav
 share/gnome/sounds/gnomeicu/File.wav
@@ -234,12 +256,15 @@ share/gnome/sounds/gnomeicu/contlist.wav
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/am/LC_MESSAGES/gnomeicu.mo
 share/locale/az/LC_MESSAGES/gnomeicu.mo
+share/locale/be/LC_MESSAGES/gnomeicu.mo
 share/locale/bg/LC_MESSAGES/gnomeicu.mo
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
 share/locale/cs/LC_MESSAGES/gnomeicu.mo
 share/locale/da/LC_MESSAGES/gnomeicu.mo
 share/locale/de/LC_MESSAGES/gnomeicu.mo
 share/locale/el/LC_MESSAGES/gnomeicu.mo
+share/locale/en_CA/LC_MESSAGES/gnomeicu.mo
+share/locale/en_GB/LC_MESSAGES/gnomeicu.mo
 share/locale/es/LC_MESSAGES/gnomeicu.mo
 share/locale/eu/LC_MESSAGES/gnomeicu.mo
 share/locale/fi/LC_MESSAGES/gnomeicu.mo
@@ -247,12 +272,15 @@ share/locale/fr/LC_MESSAGES/gnomeicu.mo
 share/locale/ga/LC_MESSAGES/gnomeicu.mo
 share/locale/gl/LC_MESSAGES/gnomeicu.mo
 share/locale/he/LC_MESSAGES/gnomeicu.mo
+share/locale/hr/LC_MESSAGES/gnomeicu.mo
 share/locale/hu/LC_MESSAGES/gnomeicu.mo
 share/locale/it/LC_MESSAGES/gnomeicu.mo
 share/locale/ja/LC_MESSAGES/gnomeicu.mo
 share/locale/ko/LC_MESSAGES/gnomeicu.mo
 share/locale/lt/LC_MESSAGES/gnomeicu.mo
 share/locale/lv/LC_MESSAGES/gnomeicu.mo
+share/locale/mk/LC_MESSAGES/gnomeicu.mo
+share/locale/ml/LC_MESSAGES/gnomeicu.mo
 share/locale/ms/LC_MESSAGES/gnomeicu.mo
 share/locale/nl/LC_MESSAGES/gnomeicu.mo
 share/locale/nn/LC_MESSAGES/gnomeicu.mo
@@ -264,6 +292,8 @@ share/locale/ro/LC_MESSAGES/gnomeicu.mo
 share/locale/ru/LC_MESSAGES/gnomeicu.mo
 share/locale/sk/LC_MESSAGES/gnomeicu.mo
 share/locale/sl/LC_MESSAGES/gnomeicu.mo
+share/locale/sr/LC_MESSAGES/gnomeicu.mo
+share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/th/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
@@ -273,6 +303,9 @@ share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/omf/gnomeicu
+@dirrm share/gnome/help/gnomeicu/uk/figures
+@dirrm share/gnome/help/gnomeicu/uk
+@dirrm share/gnome/help/gnomeicu/C/figures
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
@@ -311,3 +344,4 @@ share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 61b457400d90..eb02207c5707 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
-USE_GMAKE=		yes
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
+USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 .if defined(WITH_DANTE)
@@ -47,8 +46,14 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 
+.ifndef(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+CONFIGURE_ARGS+=--enable-gtkspell
+.else
+CONFIGURE_ARGS+=--disable-gtkspell
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \
 		${WRKSRC}/src/gnomeicu.c
 
diff --git a/net-im/gnomeicu2/distinfo b/net-im/gnomeicu2/distinfo
index 433215e3c63d..4121cb36ef7c 100644
--- a/net-im/gnomeicu2/distinfo
+++ b/net-im/gnomeicu2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnomeicu-0.99.tar.bz2) = d5e49557a3ed3545b98c3749257e58ef
-SIZE (gnomeicu-0.99.tar.bz2) = 1368468
+MD5 (gnomeicu-0.99.5.tar.bz2) = 59ff902171a14ad37896f6661ddedb7a
+SIZE (gnomeicu-0.99.5.tar.bz2) = 2102452
diff --git a/net-im/gnomeicu2/files/patch-configure b/net-im/gnomeicu2/files/patch-configure
deleted file mode 100644
index c6ee752e9833..000000000000
--- a/net-im/gnomeicu2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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-src::gnomeicu-client.c b/net-im/gnomeicu2/files/patch-src::gnomeicu-client.c
deleted file mode 100644
index c3a82000bfca..000000000000
--- a/net-im/gnomeicu2/files/patch-src::gnomeicu-client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gnomeicu-client.c.orig Sun Sep 29 14:59:15 2002
-+++ src/gnomeicu-client.c      Sun Sep 29 14:59:25 2002
-@@ -17,9 +17,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
--#include <sys/types.h>
- #include <sys/un.h>
- #include <unistd.h>
-
diff --git a/net-im/gnomeicu2/files/patch-src_userserver.c b/net-im/gnomeicu2/files/patch-src_userserver.c
index 0e602dbbc662..23e5ed601943 100644
--- a/net-im/gnomeicu2/files/patch-src_userserver.c
+++ b/net-im/gnomeicu2/files/patch-src_userserver.c
@@ -1,11 +1,10 @@
---- src/userserver.c.orig	Mon Mar 10 16:49:07 2003
-+++ src/userserver.c	Mon Mar 10 16:49:16 2003
-@@ -27,13 +27,13 @@
+--- src/userserver.c.orig	Fri Apr  2 15:20:45 2004
++++ src/userserver.c	Fri Apr  2 15:20:54 2004
+@@ -6,12 +6,12 @@
+ ***************************/
  
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
-+#include <sys/types.h>
  #include <errno.h>
++#include <sys/types.h>
  #include <netinet/in.h>
  #include <pwd.h>
  #include <stdio.h>
diff --git a/net-im/gnomeicu2/files/patch-src_v7login.c b/net-im/gnomeicu2/files/patch-src_v7login.c
new file mode 100644
index 000000000000..cea1c7fbe447
--- /dev/null
+++ b/net-im/gnomeicu2/files/patch-src_v7login.c
@@ -0,0 +1,10 @@
+--- src/v7login.c.orig	Fri Apr  2 15:25:21 2004
++++ src/v7login.c	Fri Apr  2 15:25:57 2004
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/gnomeicu2/files/patch-src_v7newuser.c b/net-im/gnomeicu2/files/patch-src_v7newuser.c
new file mode 100644
index 000000000000..e235da7be9c0
--- /dev/null
+++ b/net-im/gnomeicu2/files/patch-src_v7newuser.c
@@ -0,0 +1,10 @@
+--- src/v7newuser.c.orig	Fri Apr  2 15:26:51 2004
++++ src/v7newuser.c	Fri Apr  2 15:27:04 2004
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/gnomeicu2/files/patch-src_v7recv.c b/net-im/gnomeicu2/files/patch-src_v7recv.c
new file mode 100644
index 000000000000..43a64d9961cd
--- /dev/null
+++ b/net-im/gnomeicu2/files/patch-src_v7recv.c
@@ -0,0 +1,10 @@
+--- src/v7recv.c.orig	Fri Apr  2 15:27:50 2004
++++ src/v7recv.c	Fri Apr  2 15:28:03 2004
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net-im/gnomeicu2/pkg-plist b/net-im/gnomeicu2/pkg-plist
index c4e12d3b045e..84142858de25 100644
--- a/net-im/gnomeicu2/pkg-plist
+++ b/net-im/gnomeicu2/pkg-plist
@@ -93,23 +93,23 @@ share/gnome/gnomeicu/emoticons/Default/straight.png
 share/gnome/gnomeicu/emoticons/Default/tongue.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/angel.png
+share/gnome/gnomeicu/emoticons/MSN/angry.png
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
+share/gnome/gnomeicu/emoticons/MSN/confused.png
+share/gnome/gnomeicu/emoticons/MSN/cry.png
+share/gnome/gnomeicu/emoticons/MSN/devil.png
+share/gnome/gnomeicu/emoticons/MSN/embarassed.png
 share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/kiss.png
 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/MSN/sad.png
+share/gnome/gnomeicu/emoticons/MSN/shocked.png
+share/gnome/gnomeicu/emoticons/MSN/smile.png
+share/gnome/gnomeicu/emoticons/MSN/smile8.png
+share/gnome/gnomeicu/emoticons/MSN/straight.png
+share/gnome/gnomeicu/emoticons/MSN/tongue.png
+share/gnome/gnomeicu/emoticons/MSN/wink.png
 share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
@@ -158,6 +158,7 @@ share/gnome/gnomeicu/glade/welcome.glade
 share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
@@ -222,9 +223,30 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/prefs_icon_gnomeicu.png
 share/gnome/gnomeicu/prefs_icon_icq.png
+share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/C/figures/mainwindow.png
+share/gnome/help/gnomeicu/C/figures/messagedialog.png
+share/gnome/help/gnomeicu/C/figures/notificationicon.png
+share/gnome/help/gnomeicu/C/figures/prefdialog.png
+share/gnome/help/gnomeicu/C/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/C/figures/sendfile.png
+share/gnome/help/gnomeicu/C/figures/sendurl.png
+share/gnome/help/gnomeicu/C/figures/userinfo.png
 share/gnome/help/gnomeicu/C/gnomeicu.xml
+share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/uk/figures/mainwindow.png
+share/gnome/help/gnomeicu/uk/figures/messagedialog.png
+share/gnome/help/gnomeicu/uk/figures/notificationicon.png
+share/gnome/help/gnomeicu/uk/figures/prefdialog.png
+share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/uk/figures/sendfile.png
+share/gnome/help/gnomeicu/uk/figures/sendurl.png
+share/gnome/help/gnomeicu/uk/figures/userinfo.png
+share/gnome/help/gnomeicu/uk/gnomeicu.xml
 share/gnome/omf/gnomeicu/gnomeicu-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnomeicu/gnomeicu-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-gnomeicu.png
 share/gnome/sounds/gnomeicu/Auth.wav
 share/gnome/sounds/gnomeicu/File.wav
@@ -234,12 +256,15 @@ share/gnome/sounds/gnomeicu/contlist.wav
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/am/LC_MESSAGES/gnomeicu.mo
 share/locale/az/LC_MESSAGES/gnomeicu.mo
+share/locale/be/LC_MESSAGES/gnomeicu.mo
 share/locale/bg/LC_MESSAGES/gnomeicu.mo
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
 share/locale/cs/LC_MESSAGES/gnomeicu.mo
 share/locale/da/LC_MESSAGES/gnomeicu.mo
 share/locale/de/LC_MESSAGES/gnomeicu.mo
 share/locale/el/LC_MESSAGES/gnomeicu.mo
+share/locale/en_CA/LC_MESSAGES/gnomeicu.mo
+share/locale/en_GB/LC_MESSAGES/gnomeicu.mo
 share/locale/es/LC_MESSAGES/gnomeicu.mo
 share/locale/eu/LC_MESSAGES/gnomeicu.mo
 share/locale/fi/LC_MESSAGES/gnomeicu.mo
@@ -247,12 +272,15 @@ share/locale/fr/LC_MESSAGES/gnomeicu.mo
 share/locale/ga/LC_MESSAGES/gnomeicu.mo
 share/locale/gl/LC_MESSAGES/gnomeicu.mo
 share/locale/he/LC_MESSAGES/gnomeicu.mo
+share/locale/hr/LC_MESSAGES/gnomeicu.mo
 share/locale/hu/LC_MESSAGES/gnomeicu.mo
 share/locale/it/LC_MESSAGES/gnomeicu.mo
 share/locale/ja/LC_MESSAGES/gnomeicu.mo
 share/locale/ko/LC_MESSAGES/gnomeicu.mo
 share/locale/lt/LC_MESSAGES/gnomeicu.mo
 share/locale/lv/LC_MESSAGES/gnomeicu.mo
+share/locale/mk/LC_MESSAGES/gnomeicu.mo
+share/locale/ml/LC_MESSAGES/gnomeicu.mo
 share/locale/ms/LC_MESSAGES/gnomeicu.mo
 share/locale/nl/LC_MESSAGES/gnomeicu.mo
 share/locale/nn/LC_MESSAGES/gnomeicu.mo
@@ -264,6 +292,8 @@ share/locale/ro/LC_MESSAGES/gnomeicu.mo
 share/locale/ru/LC_MESSAGES/gnomeicu.mo
 share/locale/sk/LC_MESSAGES/gnomeicu.mo
 share/locale/sl/LC_MESSAGES/gnomeicu.mo
+share/locale/sr/LC_MESSAGES/gnomeicu.mo
+share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/th/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
@@ -273,6 +303,9 @@ share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/omf/gnomeicu
+@dirrm share/gnome/help/gnomeicu/uk/figures
+@dirrm share/gnome/help/gnomeicu/uk
+@dirrm share/gnome/help/gnomeicu/C/figures
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
@@ -311,3 +344,4 @@ share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 61b457400d90..eb02207c5707 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
-USE_GMAKE=		yes
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
+USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 .if defined(WITH_DANTE)
@@ -47,8 +46,14 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 
+.ifndef(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+CONFIGURE_ARGS+=--enable-gtkspell
+.else
+CONFIGURE_ARGS+=--disable-gtkspell
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \
 		${WRKSRC}/src/gnomeicu.c
 
diff --git a/net/gnomeicu/gnomeicu/distinfo b/net/gnomeicu/gnomeicu/distinfo
index 433215e3c63d..4121cb36ef7c 100644
--- a/net/gnomeicu/gnomeicu/distinfo
+++ b/net/gnomeicu/gnomeicu/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnomeicu-0.99.tar.bz2) = d5e49557a3ed3545b98c3749257e58ef
-SIZE (gnomeicu-0.99.tar.bz2) = 1368468
+MD5 (gnomeicu-0.99.5.tar.bz2) = 59ff902171a14ad37896f6661ddedb7a
+SIZE (gnomeicu-0.99.5.tar.bz2) = 2102452
diff --git a/net/gnomeicu/gnomeicu/files/patch-configure b/net/gnomeicu/gnomeicu/files/patch-configure
deleted file mode 100644
index c6ee752e9833..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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-src::gnomeicu-client.c b/net/gnomeicu/gnomeicu/files/patch-src::gnomeicu-client.c
deleted file mode 100644
index c3a82000bfca..000000000000
--- a/net/gnomeicu/gnomeicu/files/patch-src::gnomeicu-client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gnomeicu-client.c.orig Sun Sep 29 14:59:15 2002
-+++ src/gnomeicu-client.c      Sun Sep 29 14:59:25 2002
-@@ -17,9 +17,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
--#include <sys/types.h>
- #include <sys/un.h>
- #include <unistd.h>
-
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_userserver.c b/net/gnomeicu/gnomeicu/files/patch-src_userserver.c
index 0e602dbbc662..23e5ed601943 100644
--- a/net/gnomeicu/gnomeicu/files/patch-src_userserver.c
+++ b/net/gnomeicu/gnomeicu/files/patch-src_userserver.c
@@ -1,11 +1,10 @@
---- src/userserver.c.orig	Mon Mar 10 16:49:07 2003
-+++ src/userserver.c	Mon Mar 10 16:49:16 2003
-@@ -27,13 +27,13 @@
+--- src/userserver.c.orig	Fri Apr  2 15:20:45 2004
++++ src/userserver.c	Fri Apr  2 15:20:54 2004
+@@ -6,12 +6,12 @@
+ ***************************/
  
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
-+#include <sys/types.h>
  #include <errno.h>
++#include <sys/types.h>
  #include <netinet/in.h>
  #include <pwd.h>
  #include <stdio.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7login.c b/net/gnomeicu/gnomeicu/files/patch-src_v7login.c
new file mode 100644
index 000000000000..cea1c7fbe447
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-src_v7login.c
@@ -0,0 +1,10 @@
+--- src/v7login.c.orig	Fri Apr  2 15:25:21 2004
++++ src/v7login.c	Fri Apr  2 15:25:57 2004
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c b/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c
new file mode 100644
index 000000000000..e235da7be9c0
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-src_v7newuser.c
@@ -0,0 +1,10 @@
+--- src/v7newuser.c.orig	Fri Apr  2 15:26:51 2004
++++ src/v7newuser.c	Fri Apr  2 15:27:04 2004
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c b/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c
new file mode 100644
index 000000000000..43a64d9961cd
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-src_v7recv.c
@@ -0,0 +1,10 @@
+--- src/v7recv.c.orig	Fri Apr  2 15:27:50 2004
++++ src/v7recv.c	Fri Apr  2 15:28:03 2004
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/gnomeicu/gnomeicu/pkg-plist b/net/gnomeicu/gnomeicu/pkg-plist
index c4e12d3b045e..84142858de25 100644
--- a/net/gnomeicu/gnomeicu/pkg-plist
+++ b/net/gnomeicu/gnomeicu/pkg-plist
@@ -93,23 +93,23 @@ share/gnome/gnomeicu/emoticons/Default/straight.png
 share/gnome/gnomeicu/emoticons/Default/tongue.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/angel.png
+share/gnome/gnomeicu/emoticons/MSN/angry.png
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
+share/gnome/gnomeicu/emoticons/MSN/confused.png
+share/gnome/gnomeicu/emoticons/MSN/cry.png
+share/gnome/gnomeicu/emoticons/MSN/devil.png
+share/gnome/gnomeicu/emoticons/MSN/embarassed.png
 share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/kiss.png
 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/MSN/sad.png
+share/gnome/gnomeicu/emoticons/MSN/shocked.png
+share/gnome/gnomeicu/emoticons/MSN/smile.png
+share/gnome/gnomeicu/emoticons/MSN/smile8.png
+share/gnome/gnomeicu/emoticons/MSN/straight.png
+share/gnome/gnomeicu/emoticons/MSN/tongue.png
+share/gnome/gnomeicu/emoticons/MSN/wink.png
 share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
@@ -158,6 +158,7 @@ share/gnome/gnomeicu/glade/welcome.glade
 share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
@@ -222,9 +223,30 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/prefs_icon_gnomeicu.png
 share/gnome/gnomeicu/prefs_icon_icq.png
+share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/C/figures/mainwindow.png
+share/gnome/help/gnomeicu/C/figures/messagedialog.png
+share/gnome/help/gnomeicu/C/figures/notificationicon.png
+share/gnome/help/gnomeicu/C/figures/prefdialog.png
+share/gnome/help/gnomeicu/C/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/C/figures/sendfile.png
+share/gnome/help/gnomeicu/C/figures/sendurl.png
+share/gnome/help/gnomeicu/C/figures/userinfo.png
 share/gnome/help/gnomeicu/C/gnomeicu.xml
+share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/uk/figures/mainwindow.png
+share/gnome/help/gnomeicu/uk/figures/messagedialog.png
+share/gnome/help/gnomeicu/uk/figures/notificationicon.png
+share/gnome/help/gnomeicu/uk/figures/prefdialog.png
+share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/uk/figures/sendfile.png
+share/gnome/help/gnomeicu/uk/figures/sendurl.png
+share/gnome/help/gnomeicu/uk/figures/userinfo.png
+share/gnome/help/gnomeicu/uk/gnomeicu.xml
 share/gnome/omf/gnomeicu/gnomeicu-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnomeicu/gnomeicu-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-gnomeicu.png
 share/gnome/sounds/gnomeicu/Auth.wav
 share/gnome/sounds/gnomeicu/File.wav
@@ -234,12 +256,15 @@ share/gnome/sounds/gnomeicu/contlist.wav
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/am/LC_MESSAGES/gnomeicu.mo
 share/locale/az/LC_MESSAGES/gnomeicu.mo
+share/locale/be/LC_MESSAGES/gnomeicu.mo
 share/locale/bg/LC_MESSAGES/gnomeicu.mo
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
 share/locale/cs/LC_MESSAGES/gnomeicu.mo
 share/locale/da/LC_MESSAGES/gnomeicu.mo
 share/locale/de/LC_MESSAGES/gnomeicu.mo
 share/locale/el/LC_MESSAGES/gnomeicu.mo
+share/locale/en_CA/LC_MESSAGES/gnomeicu.mo
+share/locale/en_GB/LC_MESSAGES/gnomeicu.mo
 share/locale/es/LC_MESSAGES/gnomeicu.mo
 share/locale/eu/LC_MESSAGES/gnomeicu.mo
 share/locale/fi/LC_MESSAGES/gnomeicu.mo
@@ -247,12 +272,15 @@ share/locale/fr/LC_MESSAGES/gnomeicu.mo
 share/locale/ga/LC_MESSAGES/gnomeicu.mo
 share/locale/gl/LC_MESSAGES/gnomeicu.mo
 share/locale/he/LC_MESSAGES/gnomeicu.mo
+share/locale/hr/LC_MESSAGES/gnomeicu.mo
 share/locale/hu/LC_MESSAGES/gnomeicu.mo
 share/locale/it/LC_MESSAGES/gnomeicu.mo
 share/locale/ja/LC_MESSAGES/gnomeicu.mo
 share/locale/ko/LC_MESSAGES/gnomeicu.mo
 share/locale/lt/LC_MESSAGES/gnomeicu.mo
 share/locale/lv/LC_MESSAGES/gnomeicu.mo
+share/locale/mk/LC_MESSAGES/gnomeicu.mo
+share/locale/ml/LC_MESSAGES/gnomeicu.mo
 share/locale/ms/LC_MESSAGES/gnomeicu.mo
 share/locale/nl/LC_MESSAGES/gnomeicu.mo
 share/locale/nn/LC_MESSAGES/gnomeicu.mo
@@ -264,6 +292,8 @@ share/locale/ro/LC_MESSAGES/gnomeicu.mo
 share/locale/ru/LC_MESSAGES/gnomeicu.mo
 share/locale/sk/LC_MESSAGES/gnomeicu.mo
 share/locale/sl/LC_MESSAGES/gnomeicu.mo
+share/locale/sr/LC_MESSAGES/gnomeicu.mo
+share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/th/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
@@ -273,6 +303,9 @@ share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/omf/gnomeicu
+@dirrm share/gnome/help/gnomeicu/uk/figures
+@dirrm share/gnome/help/gnomeicu/uk
+@dirrm share/gnome/help/gnomeicu/C/figures
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
@@ -311,3 +344,4 @@ share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 61b457400d90..eb02207c5707 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -16,13 +16,12 @@ DISTNAME=	gnomeicu-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME2 ICQ client
 
-LIB_DEPENDS+=	gnet-glib2.7:${PORTSDIR}/net/gnet-glib2 \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel libxml2
-USE_GMAKE=		yes
+USE_GNOME=	gnomeprefix gnomehack libglade2 gnomepanel lthack libxml2
+USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 .if defined(WITH_DANTE)
@@ -47,8 +46,14 @@ CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS} -lintl" \
 		CFLAGS="${CFLAGS}"
 
+.ifndef(WITHOUT_GTKSPELL)
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+CONFIGURE_ARGS+=--enable-gtkspell
+.else
+CONFIGURE_ARGS+=--disable-gtkspell
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|gnet|gnet-glib2|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|GNOME_PARAM_GNOME_DATADIR|GNOME_PARAM_APP_DATADIR|g' \
 		${WRKSRC}/src/gnomeicu.c
 
diff --git a/net/gnomeicu2/distinfo b/net/gnomeicu2/distinfo
index 433215e3c63d..4121cb36ef7c 100644
--- a/net/gnomeicu2/distinfo
+++ b/net/gnomeicu2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnomeicu-0.99.tar.bz2) = d5e49557a3ed3545b98c3749257e58ef
-SIZE (gnomeicu-0.99.tar.bz2) = 1368468
+MD5 (gnomeicu-0.99.5.tar.bz2) = 59ff902171a14ad37896f6661ddedb7a
+SIZE (gnomeicu-0.99.5.tar.bz2) = 2102452
diff --git a/net/gnomeicu2/files/patch-configure b/net/gnomeicu2/files/patch-configure
deleted file mode 100644
index c6ee752e9833..000000000000
--- a/net/gnomeicu2/files/patch-configure
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$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-src::gnomeicu-client.c b/net/gnomeicu2/files/patch-src::gnomeicu-client.c
deleted file mode 100644
index c3a82000bfca..000000000000
--- a/net/gnomeicu2/files/patch-src::gnomeicu-client.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/gnomeicu-client.c.orig Sun Sep 29 14:59:15 2002
-+++ src/gnomeicu-client.c      Sun Sep 29 14:59:25 2002
-@@ -17,9 +17,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
--#include <sys/types.h>
- #include <sys/un.h>
- #include <unistd.h>
-
diff --git a/net/gnomeicu2/files/patch-src_userserver.c b/net/gnomeicu2/files/patch-src_userserver.c
index 0e602dbbc662..23e5ed601943 100644
--- a/net/gnomeicu2/files/patch-src_userserver.c
+++ b/net/gnomeicu2/files/patch-src_userserver.c
@@ -1,11 +1,10 @@
---- src/userserver.c.orig	Mon Mar 10 16:49:07 2003
-+++ src/userserver.c	Mon Mar 10 16:49:16 2003
-@@ -27,13 +27,13 @@
+--- src/userserver.c.orig	Fri Apr  2 15:20:45 2004
++++ src/userserver.c	Fri Apr  2 15:20:54 2004
+@@ -6,12 +6,12 @@
+ ***************************/
  
- #include <gdk/gdk.h>
- #include <gdk/gdkkeysyms.h>
-+#include <sys/types.h>
  #include <errno.h>
++#include <sys/types.h>
  #include <netinet/in.h>
  #include <pwd.h>
  #include <stdio.h>
diff --git a/net/gnomeicu2/files/patch-src_v7login.c b/net/gnomeicu2/files/patch-src_v7login.c
new file mode 100644
index 000000000000..cea1c7fbe447
--- /dev/null
+++ b/net/gnomeicu2/files/patch-src_v7login.c
@@ -0,0 +1,10 @@
+--- src/v7login.c.orig	Fri Apr  2 15:25:21 2004
++++ src/v7login.c	Fri Apr  2 15:25:57 2004
+@@ -18,6 +18,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/gnomeicu2/files/patch-src_v7newuser.c b/net/gnomeicu2/files/patch-src_v7newuser.c
new file mode 100644
index 000000000000..e235da7be9c0
--- /dev/null
+++ b/net/gnomeicu2/files/patch-src_v7newuser.c
@@ -0,0 +1,10 @@
+--- src/v7newuser.c.orig	Fri Apr  2 15:26:51 2004
++++ src/v7newuser.c	Fri Apr  2 15:27:04 2004
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/gnomeicu2/files/patch-src_v7recv.c b/net/gnomeicu2/files/patch-src_v7recv.c
new file mode 100644
index 000000000000..43a64d9961cd
--- /dev/null
+++ b/net/gnomeicu2/files/patch-src_v7recv.c
@@ -0,0 +1,10 @@
+--- src/v7recv.c.orig	Fri Apr  2 15:27:50 2004
++++ src/v7recv.c	Fri Apr  2 15:28:03 2004
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <netinet/in.h>
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <fcntl.h>
diff --git a/net/gnomeicu2/pkg-plist b/net/gnomeicu2/pkg-plist
index c4e12d3b045e..84142858de25 100644
--- a/net/gnomeicu2/pkg-plist
+++ b/net/gnomeicu2/pkg-plist
@@ -93,23 +93,23 @@ share/gnome/gnomeicu/emoticons/Default/straight.png
 share/gnome/gnomeicu/emoticons/Default/tongue.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/angel.png
+share/gnome/gnomeicu/emoticons/MSN/angry.png
+share/gnome/gnomeicu/emoticons/MSN/bigsmile.png
+share/gnome/gnomeicu/emoticons/MSN/confused.png
+share/gnome/gnomeicu/emoticons/MSN/cry.png
+share/gnome/gnomeicu/emoticons/MSN/devil.png
+share/gnome/gnomeicu/emoticons/MSN/embarassed.png
 share/gnome/gnomeicu/emoticons/MSN/emoticon-data
-share/gnome/gnomeicu/emoticons/MSN/kiss.gif
+share/gnome/gnomeicu/emoticons/MSN/kiss.png
 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/MSN/sad.png
+share/gnome/gnomeicu/emoticons/MSN/shocked.png
+share/gnome/gnomeicu/emoticons/MSN/smile.png
+share/gnome/gnomeicu/emoticons/MSN/smile8.png
+share/gnome/gnomeicu/emoticons/MSN/straight.png
+share/gnome/gnomeicu/emoticons/MSN/tongue.png
+share/gnome/gnomeicu/emoticons/MSN/wink.png
 share/gnome/gnomeicu/emoticons/Yahoo/alien.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angel.gif
 share/gnome/gnomeicu/emoticons/Yahoo/angry.gif
@@ -158,6 +158,7 @@ share/gnome/gnomeicu/glade/welcome.glade
 share/gnome/gnomeicu/icons/Default/gnomeicu-animation.gif
 share/gnome/gnomeicu/icons/Default/gnomeicu-auth.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-away.png
+share/gnome/gnomeicu/icons/Default/gnomeicu-birthday.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-blank.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-cancel.png
 share/gnome/gnomeicu/icons/Default/gnomeicu-chat.png
@@ -222,9 +223,30 @@ share/gnome/gnomeicu/icons/reDubbed/gnomeicu-offline.png
 share/gnome/gnomeicu/icons/reDubbed/gnomeicu-online.png
 share/gnome/gnomeicu/prefs_icon_gnomeicu.png
 share/gnome/gnomeicu/prefs_icon_icq.png
+share/gnome/help/gnomeicu/C/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/C/figures/mainwindow.png
+share/gnome/help/gnomeicu/C/figures/messagedialog.png
+share/gnome/help/gnomeicu/C/figures/notificationicon.png
+share/gnome/help/gnomeicu/C/figures/prefdialog.png
+share/gnome/help/gnomeicu/C/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/C/figures/sendfile.png
+share/gnome/help/gnomeicu/C/figures/sendurl.png
+share/gnome/help/gnomeicu/C/figures/userinfo.png
 share/gnome/help/gnomeicu/C/gnomeicu.xml
+share/gnome/help/gnomeicu/uk/figures/addcontactdruid.png
+share/gnome/help/gnomeicu/uk/figures/mainwindow.png
+share/gnome/help/gnomeicu/uk/figures/messagedialog.png
+share/gnome/help/gnomeicu/uk/figures/notificationicon.png
+share/gnome/help/gnomeicu/uk/figures/prefdialog.png
+share/gnome/help/gnomeicu/uk/figures/sendcontactlist.png
+share/gnome/help/gnomeicu/uk/figures/sendfile.png
+share/gnome/help/gnomeicu/uk/figures/sendurl.png
+share/gnome/help/gnomeicu/uk/figures/userinfo.png
+share/gnome/help/gnomeicu/uk/gnomeicu.xml
 share/gnome/omf/gnomeicu/gnomeicu-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnomeicu/gnomeicu-uk.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gnome-gnomeicu.png
 share/gnome/sounds/gnomeicu/Auth.wav
 share/gnome/sounds/gnomeicu/File.wav
@@ -234,12 +256,15 @@ share/gnome/sounds/gnomeicu/contlist.wav
 share/gnome/sounds/gnomeicu/message.wav
 share/locale/am/LC_MESSAGES/gnomeicu.mo
 share/locale/az/LC_MESSAGES/gnomeicu.mo
+share/locale/be/LC_MESSAGES/gnomeicu.mo
 share/locale/bg/LC_MESSAGES/gnomeicu.mo
 share/locale/ca/LC_MESSAGES/gnomeicu.mo
 share/locale/cs/LC_MESSAGES/gnomeicu.mo
 share/locale/da/LC_MESSAGES/gnomeicu.mo
 share/locale/de/LC_MESSAGES/gnomeicu.mo
 share/locale/el/LC_MESSAGES/gnomeicu.mo
+share/locale/en_CA/LC_MESSAGES/gnomeicu.mo
+share/locale/en_GB/LC_MESSAGES/gnomeicu.mo
 share/locale/es/LC_MESSAGES/gnomeicu.mo
 share/locale/eu/LC_MESSAGES/gnomeicu.mo
 share/locale/fi/LC_MESSAGES/gnomeicu.mo
@@ -247,12 +272,15 @@ share/locale/fr/LC_MESSAGES/gnomeicu.mo
 share/locale/ga/LC_MESSAGES/gnomeicu.mo
 share/locale/gl/LC_MESSAGES/gnomeicu.mo
 share/locale/he/LC_MESSAGES/gnomeicu.mo
+share/locale/hr/LC_MESSAGES/gnomeicu.mo
 share/locale/hu/LC_MESSAGES/gnomeicu.mo
 share/locale/it/LC_MESSAGES/gnomeicu.mo
 share/locale/ja/LC_MESSAGES/gnomeicu.mo
 share/locale/ko/LC_MESSAGES/gnomeicu.mo
 share/locale/lt/LC_MESSAGES/gnomeicu.mo
 share/locale/lv/LC_MESSAGES/gnomeicu.mo
+share/locale/mk/LC_MESSAGES/gnomeicu.mo
+share/locale/ml/LC_MESSAGES/gnomeicu.mo
 share/locale/ms/LC_MESSAGES/gnomeicu.mo
 share/locale/nl/LC_MESSAGES/gnomeicu.mo
 share/locale/nn/LC_MESSAGES/gnomeicu.mo
@@ -264,6 +292,8 @@ share/locale/ro/LC_MESSAGES/gnomeicu.mo
 share/locale/ru/LC_MESSAGES/gnomeicu.mo
 share/locale/sk/LC_MESSAGES/gnomeicu.mo
 share/locale/sl/LC_MESSAGES/gnomeicu.mo
+share/locale/sr/LC_MESSAGES/gnomeicu.mo
+share/locale/sr@Latn/LC_MESSAGES/gnomeicu.mo
 share/locale/sv/LC_MESSAGES/gnomeicu.mo
 share/locale/th/LC_MESSAGES/gnomeicu.mo
 share/locale/tr/LC_MESSAGES/gnomeicu.mo
@@ -273,6 +303,9 @@ share/locale/zh_CN/LC_MESSAGES/gnomeicu.mo
 share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm share/gnome/sounds/gnomeicu
 @dirrm share/gnome/omf/gnomeicu
+@dirrm share/gnome/help/gnomeicu/uk/figures
+@dirrm share/gnome/help/gnomeicu/uk
+@dirrm share/gnome/help/gnomeicu/C/figures
 @dirrm share/gnome/help/gnomeicu/C
 @dirrm share/gnome/help/gnomeicu
 @dirrm share/gnome/gnomeicu/icons/reDubbed
@@ -311,3 +344,4 @@ share/locale/zh_TW/LC_MESSAGES/gnomeicu.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu/general
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnomeicu
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnomeicu/gnomeicu-uk.omf 2>/dev/null || /usr/bin/true