18 files changed, 242 insertions, 217 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 5bd0cc242746..cd08c634f55a 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,19 +6,15 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.8.1
-CATEGORIES=	net
+PORTVERSION=	0.8.2
+CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	erich@tacni.net
 
-LIB_DEPENDS=	gtkmm.2:${PORTSDIR}/x11-toolkits/gtk-- \
-		gnomemm.3:${PORTSDIR}/x11-toolkits/gnome-- \
-		sigc.1:${PORTSDIR}/devel/libsigc++ \
-		gal.4:${PORTSDIR}/x11-toolkits/gal \
-		giconv.2:${PORTSDIR}/converters/libiconv \
-		glade.4:${PORTSDIR}/devel/libglade
+LIB_DEPENDS=	gnomemm.6:${PORTSDIR}/x11-toolkits/gnome-- \
+		gal.6:${PORTSDIR}/x11-toolkits/gal
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -35,5 +31,7 @@ post-patch:
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
 		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@find ${WRKSRC}/src -name "*.[ch]" | xargs ${PERL} -pi -e \
+		's|\<iconv.h\>|\<giconv.h\>|g'
 
 .include <bsd.port.mk>
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index a3f5bcc745ea..663f1a094092 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.8.1.tar.gz) = a0f5d038665cd244b891d998c15791c0
+MD5 (gabber-0.8.2.tar.gz) = fd7e2884e28dff9029222768ec7a1af1
diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae
index 850bd445eed4..d2eafb79abbf 100644
--- a/net/gabber/files/patch-ae
+++ b/net/gabber/files/patch-ae
@@ -1,15 +1,14 @@
---- src/GabberConfig.hh.in.orig        Thu Jan 18 12:28:59 2001
-+++ src/GabberConfig.hh.in     Thu Jan 18 12:30:07 2001
-@@ -3,9 +3,9 @@
- #include <config.h>
- static const char* GABBER_PACKAGE   = PACKAGE;
+--- src/GabberConfig.hh.in.orig	Sat Feb  3 23:19:41 2001
++++ src/GabberConfig.hh.in	Wed Mar 28 14:37:49 2001
+@@ -5,7 +5,7 @@
  static const char* GABBER_VERSION   = VERSION;
--static const char* GABBER_GLADEFILE = "@prefix@/share/gabber/gabber.glade";
+-static const char* GABBER_GLADEDIR  = "@prefix@/share/gabber/";
 -static const char* GABBER_SHAREDIR  = "@prefix@/share/gabber/";
-+static const char* GABBER_GLADEFILE = "@prefix@/share/gnome/gabber/gabber.glade";
-+static const char* GABBER_SHAREDIR  = "@prefix@/share/gnome/gabber/";
++static const char* GABBER_GLADEDIR  = "@datadir@/gabber/";
++static const char* GABBER_SHAREDIR  = "@datadir@/gabber/";
  static const char* GABBER_CONFIG    = "/Gabber/";
 -static const char* GABBER_PIXPATH   = "@prefix@/share/pixmaps/gabber/";
+-static const char* GABBER_CSSFILE   = "@prefix@/share/gabber/gabber-logs.css";
 +static const char* GABBER_PIXPATH   = "@datadir@/pixmaps/gabber/";
- static const char* GABBER_CSSFILE   = "@prefix@/share/gabber/gabber-logs.css";
++static const char* GABBER_CSSFILE   = "@datadir@/gabber/gabber-logs.css";
  #endif
diff --git a/net/gabber/files/patch-aj b/net/gabber/files/patch-aj
deleted file mode 100644
index 4d3bae2d00af..000000000000
--- a/net/gabber/files/patch-aj
+++ /dev/null
@@ -1,68 +0,0 @@
---- configure.in.orig	Thu Jan 18 08:22:50 2001
-+++ configure.in	Mon Jan 29 23:48:54 2001
-@@ -70,15 +70,15 @@
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
- CFLAGS="$CFLAGS $ICONV_CFLAGS"
--LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
--AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
--#include <iconv.h>
-+LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
-+AC_CACHE_CHECK(for iconv in -lgiconv, ac_cv_libiconv, AC_TRY_LINK([
-+#include <giconv.h>
- ], [
- 	iconv_t cd;
- 	cd = iconv_open ("UTF-8", "ISO-8859-1");
- ], ac_cv_libiconv=yes, ac_cv_libiconv=no))
- if test $ac_cv_libiconv = yes; then
--	ICONV_LIBS="$ICONV_LIBS -liconv"
-+	ICONV_LIBS="$ICONV_LIBS -lgiconv"
- 	have_iconv=yes
- else
- 	CFLAGS="$save_CFLAGS"
-@@ -91,7 +91,7 @@
- 		AC_CHECK_FUNCS(gnu_get_libc_version)
- 	fi
- 	AC_CACHE_CHECK([if iconv() handles UTF-8], ac_cv_libiconv_utf8, AC_TRY_RUN([
--#include <iconv.h>
-+#include <giconv.h>
- #include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_GNU_GET_LIBC_VERSION
-@@ -151,22 +151,22 @@
- dnl ******************************
- dnl Gnome App Lib checking
- dnl ******************************
--dnl AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3)
--dnl if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then 
--dnl    vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
--dnl        awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
--dnl    if test "$vers" -ge 30000; then
--dnl        AC_MSG_RESULT(found)
--dnl    else
--dnl        AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3)
--dnl    fi
--dnl else
--dnl    AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
--dnl fi
-+AC_MSG_CHECKING(for Gnome App libraries (GAL) >= 0.3)
-+if $GNOME_CONFIG --libs gal > /dev/null 2>&1; then 
-+   vers=`$GNOME_CONFIG --modversion gal | sed -e "s/gal-//" -e 's/cvs$//' -e 's/pre$//' | \
-+       awk 'BEGIN { FS = "."; } { print $1 * 1000000 + $2 * 10000 + $3 * 100 + $4;}'`
-+   if test "$vers" -ge 30000; then
-+       AC_MSG_RESULT(found)
-+   else
-+       AC_MSG_ERROR(You need at least GNOME Application Lib (GAL) 0.3)
-+   fi
-+else
-+   AC_MSG_ERROR(Did not find GnomeAppLib (GAL) installed)
-+fi
- 
- dnl add 'gal' to both of these if you want gal dependency
--EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui` $ICONV_LIBS $UNICODE_LIBS"
--EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade` $ICONV_CFLAGS $UNICODE_CFLAGS"
-+EXTRA_GNOME_LIBS="`$GNOME_CONFIG --libs libglade gnomeui gal` $ICONV_LIBS $UNICODE_LIBS"
-+EXTRA_GNOME_CFLAGS="`$GNOME_CONFIG --cflags libglade gal` $ICONV_CFLAGS $UNICODE_CFLAGS"
- 
- AC_SUBST(EXTRA_GNOME_LIBS)
- AC_SUBST(EXTRA_GNOME_CFLAGS)
diff --git a/net/gabber/files/patch-ak b/net/gabber/files/patch-ak
deleted file mode 100644
index 6edc8c35475d..000000000000
--- a/net/gabber/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/GabberUtility.cc.orig  Thu Jan 18 12:39:58 2001
-+++ src/GabberUtility.cc       Thu Jan 18 12:40:12 2001
-@@ -1,7 +1,7 @@
-   
- #include "GabberUtility.hh"
- #include "Gabber.hh"
--#include "e-unicode.h"
-+#include <gal/widgets/e-unicode.h>
-
- using namespace jabberoo;
-
diff --git a/net/gabber/files/patch-al b/net/gabber/files/patch-al
index ee8e5d30071f..1cb21d75c9ef 100644
--- a/net/gabber/files/patch-al
+++ b/net/gabber/files/patch-al
@@ -1,42 +1,26 @@
---- configure.orig	Thu Jan 18 08:27:41 2001
-+++ configure	Mon Jan 29 23:54:52 2001
-@@ -4900,9 +4900,9 @@
- save_CFLAGS="$CFLAGS"
- save_LDFLAGS="$LDFLAGS"
+--- configure.orig	Wed Mar 28 19:22:35 2001
++++ configure	Thu Apr 19 12:54:15 2001
+@@ -4974,5 +4974,5 @@
  CFLAGS="$CFLAGS $ICONV_CFLAGS"
 -LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
 -echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6
--echo "configure:4906: checking for iconv in -liconv" >&5
+-echo "configure:4978: checking for iconv in -liconv" >&5
 +LDFLAGS="$LDFLAGS $ICONV_LIBS -lgiconv"
 +echo $ac_n "checking for iconv in -lgiconv""... $ac_c" 1>&6
-+echo "configure:4906: checking for iconv in -lgiconv" >&5
++echo "configure:4978: checking for iconv in -lgiconv" >&5
  if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -4910,7 +4910,7 @@
- #line 4911 "configure"
- #include "confdefs.h"
+@@ -4984,3 +4984,3 @@
  
 -#include <iconv.h>
 +#include <giconv.h>
  
- int main() {
- 
-@@ -4933,7 +4933,7 @@
- 
- echo "$ac_t""$ac_cv_libiconv" 1>&6
+@@ -5007,3 +5007,3 @@
  if test $ac_cv_libiconv = yes; then
 -	ICONV_LIBS="$ICONV_LIBS -liconv"
 +	ICONV_LIBS="$ICONV_LIBS -lgiconv"
  	have_iconv=yes
- else
- 	CFLAGS="$save_CFLAGS"
-@@ -5059,7 +5059,7 @@
- #line 5060 "configure"
- #include "confdefs.h"
+@@ -5133,3 +5133,3 @@
  
 -#include <iconv.h>
 +#include <giconv.h>
  #include <stdlib.h>
- #include <string.h>
- #ifdef HAVE_GNU_GET_LIBC_VERSION
diff --git a/net/gabber/files/patch-am b/net/gabber/files/patch-am
index 2aef3a0a4ea5..9ac7b8700186 100644
--- a/net/gabber/files/patch-am
+++ b/net/gabber/files/patch-am
@@ -1,11 +1,7 @@
---- src/Makefile.in.orig	Thu Jan 18 08:32:41 2001
-+++ src/Makefile.in	Mon Jan 29 23:59:01 2001
-@@ -148,7 +148,7 @@
- gabber_SOURCES = main.cc           xtext.h xtext.c 	  e-cache.h e-cache.c 	  e-font.h e-font.c 	  e-unicode.h e-unicode.c           TCPTransmitter.hh TCPTransmitter.cc           GabberLogger.hh GabberLogger.cc           GabberUtility.hh GabberUtility.cc           ConfigManager.hh ConfigManager.cc           GabberApp.hh GabberApp.cc           BaseGabberWindow.hh BaseGabberWindow.cc           GabberWin.hh GabberWin.cc           ChatView.hh ChatView.cc           RosterView.hh RosterView.cc           LoginDlg.hh LoginDlg.cc           SubscriptionRequestDlg.hh SubscriptionRequestDlg.cc           PrefsWin.hh PrefsWin.cc           GCJoinDlg.hh GCJoinDlg.cc           EditUserDlg.hh EditUserDlg.cc           EasyOptionMenu.hh EasyOptionMenu.cc           StatusDlg.hh StatusDlg.cc           AddToGroupDlg.hh AddToGroupDlg.cc           AddUserDruid.hh AddUserDruid.cc           WelcomeDruid.hh WelcomeDruid.cc 	  UserInfoWin.hh UserInfoWin.cc 	  StatusDock.hh StatusDock.cc 	  RawXML.hh RawXML.cc 	  HistoryDlg.hh HistoryDlg.cc           TransInfoDlg.hh TransInfoDlg.cc           AgentInterface.hh AgentInterface.cc           FilterInterface.hh FilterInterface.cc 	  EditGroupsDlg.hh EditGroupsDlg.cc           MessageManager.hh MessageManager.cc           MessageViews.hh MessageViews.cc 	  GPGInterface.hh GPGInterface.cc 	  GabberGPG.hh GabberGPG.cc 	  $(ssl_sources)
+--- src/Makefile.in.orig	Wed Mar 14 16:07:36 2001
++++ src/Makefile.in	Wed Mar 28 14:52:10 2001
+@@ -156,3 +156,3 @@
  
- 
--gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@                ../jabberoo/src/libjabberoo.a                ../jabberoo/expat/libexpat.a                -lxml
-+gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@                ../jabberoo/src/libjabberoo.a                ../jabberoo/expat/libexpat.a			 -lxml -liconv 
- 
- gabber_LDFLAGS = @GABBER_STATIC@
+-gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ 	../jabberoo/src/libjabberoo.a 	../jabberoo/expat/libexpat.a 	-lxml
++gabber_LDADD = @EXTRA_GNOME_LIBS@ @GNOMEMM_LIBS@ @SSL_LIBS@ @XSS_LIBS@ 	../jabberoo/src/libjabberoo.a 	../jabberoo/expat/libexpat.a 	-lxml -lgiconv
  
diff --git a/net/gabber/files/patch-ao b/net/gabber/files/patch-ao
deleted file mode 100644
index 673ba27ee2c3..000000000000
--- a/net/gabber/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- jabberoo/src/Makefile.in.orig	Tue Jan 30 02:10:13 2001
-+++ jabberoo/src/Makefile.in	Tue Jan 30 02:10:32 2001
-@@ -74,7 +74,7 @@
- libjabberoo_a_LIBS = ../expat/libexpat.a @SIGC_LIBS@ 
- INCLUDES = -I../include @SIGC_CFLAGS@
- 
--CXXFLAGS = -O2
-+#CXXFLAGS = -O2
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- LIBRARIES =  $(noinst_LIBRARIES)
diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist
index 6af8f7bfe356..182720afab38 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -1,62 +1,103 @@
 bin/gabber
 etc/sound/events/gabber.soundlist
-share/locale/da/LC_MESSAGES/gabber.mo
-share/locale/de/LC_MESSAGES/gabber.mo
-share/locale/fr/LC_MESSAGES/gabber.mo
-share/locale/ru/LC_MESSAGES/gabber.mo
-share/gnome/gabber/gabber.glade
+share/gnome/apps/Internet/gabber.desktop
+share/gnome/gabber/AUDruid_win.glade
+share/gnome/gabber/AgentBrowser_dlg.glade
+share/gnome/gabber/Autoupdate_dlg.glade
+share/gnome/gabber/ContactInfo_dlg.glade
+share/gnome/gabber/ContactRecv_dlg.glade
+share/gnome/gabber/ContactSend_dlg.glade
+share/gnome/gabber/EditGroups_dlg.glade
+share/gnome/gabber/FilterList_dlg.glade
+share/gnome/gabber/Filter_dlg.glade
+share/gnome/gabber/GCIRecv_dlg.glade
+share/gnome/gabber/GCI_dlg.glade
+share/gnome/gabber/GCJoin_dlg.glade
+share/gnome/gabber/GC_win.glade
+share/gnome/gabber/GPGInfo_dlg.glade
+share/gnome/gabber/GPGPass_dlg.glade
+share/gnome/gabber/Gabber_win.glade
+share/gnome/gabber/IgnoreAdd_dlg.glade
+share/gnome/gabber/Ignore_dlg.glade
+share/gnome/gabber/Login_dlg.glade
+share/gnome/gabber/Message_win.glade
+share/gnome/gabber/MyContactInfo_win.glade
+share/gnome/gabber/OOOChat_win.glade
+share/gnome/gabber/Prefs_win.glade
+share/gnome/gabber/RawXML_dlg.glade
+share/gnome/gabber/RegDruid_win.glade
+share/gnome/gabber/Status_dlg.glade
+share/gnome/gabber/SubscriptionRequest_dlg.glade
+share/gnome/gabber/TransInfo_dlg.glade
+share/gnome/gabber/Welcome_win.glade
 share/gnome/gabber/gabber-logs.css
+share/gnome/gabber/glade-add-group-menu.xpm
+share/gnome/gabber/glade-alert.xpm
+share/gnome/gabber/glade-blank.xpm
+share/gnome/gabber/glade-contact.xpm
+share/gnome/gabber/glade-delete-user-menu.xpm
+share/gnome/gabber/glade-delete-user.xpm
+share/gnome/gabber/glade-edit-group-menu.xpm
+share/gnome/gabber/glade-edit-user-menu.xpm
+share/gnome/gabber/glade-edit-user.xpm
 share/gnome/gabber/glade-gabber-logo.png
+share/gnome/gabber/glade-gabber-sideways.png
+share/gnome/gabber/glade-gci.xpm
+share/gnome/gabber/glade-group.xpm
+share/gnome/gabber/glade-groupchat-menu.xpm
+share/gnome/gabber/glade-groupchat.xpm
 share/gnome/gabber/glade-message.xpm
+share/gnome/gabber/glade-new-user-menu.xpm
+share/gnome/gabber/glade-new-user.xpm   
+share/gnome/gabber/glade-noclose.xpm   
 share/gnome/gabber/glade-ooochat.xpm
-share/gnome/gabber/glade-blank.xpm
 share/gnome/gabber/glade-s10n.xpm
-share/gnome/gabber/glade-new-user.xpm   
-share/gnome/gabber/glade-new-user-menu.xpm
-share/gnome/gabber/glade-edit-user.xpm
-share/gnome/gabber/glade-edit-user-menu.xpm
-share/gnome/gabber/glade-edit-group-menu.xpm
-share/gnome/gabber/glade-delete-user.xpm
-share/gnome/gabber/glade-delete-user-menu.xpm
-share/gnome/gabber/glade-groupchat.xpm
-share/gnome/gabber/glade-groupchat-menu.xpm
-share/gnome/gabber/glade-users.xpm
-share/gnome/gabber/glade-sendasooo.xpm
+share/gnome/gabber/glade-send-contact-menu.xpm
+share/gnome/gabber/glade-send-gci.xpm
 share/gnome/gabber/glade-sendasnormal.xpm
-share/gnome/gabber/glade-noclose.xpm   
-share/gnome/gabber/glade-gabber-sideways.png
+share/gnome/gabber/glade-sendasooo.xpm
+share/gnome/gabber/glade-unlock-key.xpm
+share/gnome/gabber/glade-users.xpm
+share/gnome/gabber/gpg-badsigned.xpm
 share/gnome/gabber/gpg-encrypted.xpm
-share/gnome/gabber/gpg-unencrypted.xpm
 share/gnome/gabber/gpg-signed.xpm
-share/gnome/gabber/gpg-badsigned.xpm
+share/gnome/gabber/gpg-unencrypted.xpm
 share/gnome/gabber/gpg-unsigned.xpm
-share/gnome/gabber/glade-alert.xpm
-share/gnome/gabber/glade-unlock-key.xpm
-share/gnome/pixmaps/gabber.png
-share/gnome/pixmaps/gabber/away.xpm
-share/gnome/pixmaps/gabber/chat.xpm
-share/gnome/pixmaps/gabber/dnd.xpm      
-share/gnome/pixmaps/gabber/offline.xpm
-share/gnome/pixmaps/gabber/online.xpm
-share/gnome/pixmaps/gabber/stalker.xpm
-share/gnome/pixmaps/gabber/xa.xpm   
-share/gnome/pixmaps/gabber/gnome-gabber.xpm
-share/gnome/pixmaps/gabber/gnome-message.xpm
-share/gnome/pixmaps/gabber/gnome-ooochat.xpm
-share/gnome/pixmaps/gabber/gnome-s10n.xpm
-share/gnome/sounds/Gabber/gabber_message_queue.wav
-share/gnome/sounds/Gabber/gabber_message_recv.wav
-share/gnome/sounds/Gabber/gabber_ooochat_queue.wav
-share/gnome/sounds/Gabber/gabber_ooochat_recv.wav
-share/gnome/sounds/Gabber/gabber_online.wav
-share/gnome/sounds/Gabber/gabber_offline.wav
-share/gnome/sounds/Gabber/gabber_encrypted.wav
-share/gnome/sounds/Gabber/gabber_subrequest.wav
-share/gnome/sounds/Gabber/gabber_startup.wav
-share/gnome/sounds/Gabber/gabber_connected.wav
-share/gnome/help/gabber/C/index.html
-share/gnome/help/gabber/C/topic.dat
+share/gnome/gabber/offline.xpm
+share/gnome/help/gabber/C/agents-search.html
+share/gnome/help/gabber/C/agents.html 
+share/gnome/help/gabber/C/authors.html   
+share/gnome/help/gabber/C/bugs.html
+share/gnome/help/gabber/C/docbook.css
+share/gnome/help/gabber/C/first.html
+share/gnome/help/gabber/C/first.png
 share/gnome/help/gabber/C/gabber.sgml
+share/gnome/help/gabber/C/index.html
+share/gnome/help/gabber/C/intro.html
+share/gnome/help/gabber/C/license.html     
+share/gnome/help/gabber/C/login.html
+share/gnome/help/gabber/C/login.png
+share/gnome/help/gabber/C/main-menubar.html
+share/gnome/help/gabber/C/main-status.html
+share/gnome/help/gabber/C/main-toolbar.html
+share/gnome/help/gabber/C/main.html
+share/gnome/help/gabber/C/main.png
+share/gnome/help/gabber/C/msg-gc.html
+share/gnome/help/gabber/C/msg-normal.html
+share/gnome/help/gabber/C/msg-normal.png    
+share/gnome/help/gabber/C/msg-ooo.html
+share/gnome/help/gabber/C/msg-ooo.png
+share/gnome/help/gabber/C/msg-que.html
+share/gnome/help/gabber/C/msg-rules.html
+share/gnome/help/gabber/C/msg.html
+share/gnome/help/gabber/C/panel.html
+share/gnome/help/gabber/C/pref-appearance.html
+share/gnome/help/gabber/C/pref-autoaway.html
+share/gnome/help/gabber/C/pref-connection.html
+share/gnome/help/gabber/C/pref-encryption.html
+share/gnome/help/gabber/C/pref-logs.html
+share/gnome/help/gabber/C/pref-msg.html
+share/gnome/help/gabber/C/pref.html
 share/gnome/help/gabber/C/stylesheet-images/caution.gif
 share/gnome/help/gabber/C/stylesheet-images/home.gif
 share/gnome/help/gabber/C/stylesheet-images/important.gif
@@ -69,31 +110,59 @@ share/gnome/help/gabber/C/stylesheet-images/toc-minus.gif
 share/gnome/help/gabber/C/stylesheet-images/toc-plus.gif
 share/gnome/help/gabber/C/stylesheet-images/up.gif
 share/gnome/help/gabber/C/stylesheet-images/warning.gif
-share/gnome/help/gabber/C/agents.html 
-share/gnome/help/gabber/C/authors.html   
-share/gnome/help/gabber/C/bugs.html
-share/gnome/help/gabber/C/first.html
-share/gnome/help/gabber/C/license.html     
-share/gnome/help/gabber/C/ln7.html   
-share/gnome/help/gabber/C/login.html
-share/gnome/help/gabber/C/main.html
-share/gnome/help/gabber/C/msg.html
-share/gnome/help/gabber/C/panel.html
-share/gnome/help/gabber/C/pref.html
+share/gnome/help/gabber/C/topic.dat
+share/gnome/help/gabber/C/userinfo-vcard.html
 share/gnome/help/gabber/C/userinfo.html
+share/gnome/help/gabber/C/users-adduser.html
+share/gnome/help/gabber/C/users-deluser.html
+share/gnome/help/gabber/C/users-edituser.html
+share/gnome/help/gabber/C/users-history.html
+share/gnome/help/gabber/C/users-ignore.html
+share/gnome/help/gabber/C/users-send.html
 share/gnome/help/gabber/C/users.html
-share/gnome/help/gabber/C/docbook.css
-share/gnome/help/gabber/C/first.png
-share/gnome/help/gabber/C/login.png
-share/gnome/help/gabber/C/main.png
-share/gnome/help/gabber/C/msg-normal.png    
-share/gnome/help/gabber/C/msg-ooo.png
-share/gnome/apps/Internet/gabber.desktop
+share/gnome/omf/gabber/gabber-C.omf
+share/gnome/pixmaps/gabber.png
+share/gnome/pixmaps/gabber/away.xpm
+share/gnome/pixmaps/gabber/chat.xpm
+share/gnome/pixmaps/gabber/dnd.xpm      
+share/gnome/pixmaps/gabber/gnome-editgroups.xpm
+share/gnome/pixmaps/gabber/gnome-gabber.xpm
+share/gnome/pixmaps/gabber/gnome-gpg.xpm
+share/gnome/pixmaps/gabber/gnome-groupchat.xpm
+share/gnome/pixmaps/gabber/gnome-message.xpm
+share/gnome/pixmaps/gabber/gnome-ooochat.xpm
+share/gnome/pixmaps/gabber/gnome-s10n.xpm
+share/gnome/pixmaps/gabber/gnome-userinfo.xpm
+share/gnome/pixmaps/gabber/offline.xpm
+share/gnome/pixmaps/gabber/online.xpm
+share/gnome/pixmaps/gabber/stalker.xpm
+share/gnome/pixmaps/gabber/xa.xpm   
+share/gnome/sounds/Gabber/gabber_connected.wav
+share/gnome/sounds/Gabber/gabber_encrypted.wav
+share/gnome/sounds/Gabber/gabber_message_queue.wav
+share/gnome/sounds/Gabber/gabber_message_recv.wav
+share/gnome/sounds/Gabber/gabber_offline.wav
+share/gnome/sounds/Gabber/gabber_online.wav
+share/gnome/sounds/Gabber/gabber_ooochat_queue.wav
+share/gnome/sounds/Gabber/gabber_ooochat_recv.wav
+share/gnome/sounds/Gabber/gabber_startup.wav
+share/gnome/sounds/Gabber/gabber_subrequest.wav
+share/locale/da/LC_MESSAGES/gabber.mo
+share/locale/de/LC_MESSAGES/gabber.mo
+share/locale/es/LC_MESSAGES/gabber.mo
+share/locale/fi/LC_MESSAGES/gabber.mo
+share/locale/fr/LC_MESSAGES/gabber.mo
+share/locale/nl/LC_MESSAGES/gabber.mo
+share/locale/no/LC_MESSAGES/gabber.mo
+share/locale/ru/LC_MESSAGES/gabber.mo
+share/locale/sv/LC_MESSAGES/gabber.mo
+share/locale/tr/LC_MESSAGES/gabber.mo
 @unexec rmdir %D/etc/sound/events 2>/dev/null || true
 @unexec rmdir %D/etc/sound 2>/dev/null || true
-@dirrm share/gnome/gabber
-@dirrm share/gnome/pixmaps/gabber
 @dirrm share/gnome/sounds/Gabber
+@dirrm share/gnome/pixmaps/gabber
+@dirrm share/gnome/omf/gabber
 @dirrm share/gnome/help/gabber/C/stylesheet-images
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
+@dirrm share/gnome/gabber
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index f29558638ad6..a1c29d9fd284 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gnomeicu
 PORTVERSION=	0.96.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= gnomeicu
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
@@ -35,7 +35,7 @@ SOCKSLIBS=	-lsocks
 
 CONFIGURE_ARGS= --with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \
 		CFLAGS="${CFLAGS}"
 
 pre-patch:
diff --git a/net/gnomeicu/files/patch-configure b/net/gnomeicu/files/patch-configure
new file mode 100644
index 000000000000..fcb467e8a8ef
--- /dev/null
+++ b/net/gnomeicu/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Tue Feb 27 13:35:06 2001
++++ configure	Thu Apr 19 15:50:55 2001
+@@ -5039,5 +5039,5 @@
+ 
+-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
+-echo "configure:5043: checking for iconv.h" >&5
++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
++echo "configure:5043: checking for giconv.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+@@ -5048,3 +5048,3 @@
+ #include "confdefs.h"
+-#include <iconv.h>
++#include <giconv.h>
+ EOF
diff --git a/net/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/files/patch-src::kanji_conv.c
new file mode 100644
index 000000000000..497b91d16c89
--- /dev/null
+++ b/net/gnomeicu/files/patch-src::kanji_conv.c
@@ -0,0 +1,7 @@
+--- src/kanji_conv.c.orig	Wed Jan  3 16:14:39 2001
++++ src/kanji_conv.c	Thu Apr 19 15:51:21 2001
+@@ -32,3 +32,3 @@
+ #ifdef HAVE_ICONV
+-#include <iconv.h>
++#include <giconv.h>
+ #endif
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index f29558638ad6..a1c29d9fd284 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gnomeicu
 PORTVERSION=	0.96.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= gnomeicu
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
@@ -35,7 +35,7 @@ SOCKSLIBS=	-lsocks
 
 CONFIGURE_ARGS= --with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \
 		CFLAGS="${CFLAGS}"
 
 pre-patch:
diff --git a/net/gnomeicu/gnomeicu/files/patch-configure b/net/gnomeicu/gnomeicu/files/patch-configure
new file mode 100644
index 000000000000..fcb467e8a8ef
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Tue Feb 27 13:35:06 2001
++++ configure	Thu Apr 19 15:50:55 2001
+@@ -5039,5 +5039,5 @@
+ 
+-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
+-echo "configure:5043: checking for iconv.h" >&5
++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
++echo "configure:5043: checking for giconv.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+@@ -5048,3 +5048,3 @@
+ #include "confdefs.h"
+-#include <iconv.h>
++#include <giconv.h>
+ EOF
diff --git a/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c
new file mode 100644
index 000000000000..497b91d16c89
--- /dev/null
+++ b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c
@@ -0,0 +1,7 @@
+--- src/kanji_conv.c.orig	Wed Jan  3 16:14:39 2001
++++ src/kanji_conv.c	Thu Apr 19 15:51:21 2001
+@@ -32,3 +32,3 @@
+ #ifdef HAVE_ICONV
+-#include <iconv.h>
++#include <giconv.h>
+ #endif
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index f29558638ad6..a1c29d9fd284 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -7,14 +7,14 @@
 
 PORTNAME=	gnomeicu
 PORTVERSION=	0.96.1
+PORTREVISION=	1
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR= gnomeicu
 
 MAINTAINER=	nectar@FreeBSD.org
 
-LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm \
-		iconv.2:${PORTSDIR}/converters/iconv
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
 USE_BZIP2=	yes
@@ -35,7 +35,7 @@ SOCKSLIBS=	-lsocks
 
 CONFIGURE_ARGS= --with-statusmenu
 CONFIGURE_ENV=	CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
+		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \
 		CFLAGS="${CFLAGS}"
 
 pre-patch:
diff --git a/net/gnomeicu2/files/patch-configure b/net/gnomeicu2/files/patch-configure
new file mode 100644
index 000000000000..fcb467e8a8ef
--- /dev/null
+++ b/net/gnomeicu2/files/patch-configure
@@ -0,0 +1,16 @@
+--- configure.orig	Tue Feb 27 13:35:06 2001
++++ configure	Thu Apr 19 15:50:55 2001
+@@ -5039,5 +5039,5 @@
+ 
+-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6
+-echo "configure:5043: checking for iconv.h" >&5
++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'`
++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6
++echo "configure:5043: checking for giconv.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+@@ -5048,3 +5048,3 @@
+ #include "confdefs.h"
+-#include <iconv.h>
++#include <giconv.h>
+ EOF
diff --git a/net/gnomeicu2/files/patch-src::kanji_conv.c b/net/gnomeicu2/files/patch-src::kanji_conv.c
new file mode 100644
index 000000000000..497b91d16c89
--- /dev/null
+++ b/net/gnomeicu2/files/patch-src::kanji_conv.c
@@ -0,0 +1,7 @@
+--- src/kanji_conv.c.orig	Wed Jan  3 16:14:39 2001
++++ src/kanji_conv.c	Thu Apr 19 15:51:21 2001
+@@ -32,3 +32,3 @@
+ #ifdef HAVE_ICONV
+-#include <iconv.h>
++#include <giconv.h>
+ #endif