Update to 0.8.6.

PR:		33678
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

9 files changed, 116 insertions, 71 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 717f88cf8888..ceac56c9cf95 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,31 +6,38 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.8.3
-PORTREVISION=	2
+PORTVERSION=	0.8.6
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	gnome@FreeBSD.org
 
+BUILD_DEPENDS=	msgfmt-new:${PORTSDIR}/devel/gettext-devel
+.if defined(WITH_XMMS)
+BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/audio/xmms
+.endif
 LIB_DEPENDS=	gnomemm.9:${PORTSDIR}/x11-toolkits/gnome--
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-USE_LIBTOOL=	yes
-LIBTOOLFILES=	configure jabberoo/configure
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
+		XGETTEXT=${LOCALBASE}/bin/xgettext-new
+.if !defined(WITH_XMMS)
+CONFIGURE_ARGS=	--disable-xmms
+.endif
 
 MAN1=		gabber.1
 
 post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@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 \
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index 5e680b7cb79f..cdbf19dbb9e0 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.8.3.tar.gz) = e74cd30afd9c7ada4e0990e7b4838a4d
+MD5 (gabber-0.8.6.tar.gz) = 45c2db56a577808731c52afd9651f6c7
diff --git a/net/gabber/files/patch-ae b/net/gabber/files/patch-ae
deleted file mode 100644
index d2eafb79abbf..000000000000
--- a/net/gabber/files/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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_GLADEDIR  = "@prefix@/share/gabber/";
--static const char* GABBER_SHAREDIR  = "@prefix@/share/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   = "@datadir@/gabber/gabber-logs.css";
- #endif
diff --git a/net/gabber/files/patch-ai b/net/gabber/files/patch-ai
deleted file mode 100644
index 048169cc271e..000000000000
--- a/net/gabber/files/patch-ai
+++ /dev/null
@@ -1,7 +0,0 @@
---- jabberoo/Makefile.in.orig	Sun May 13 19:49:30 2001
-+++ jabberoo/Makefile.in	Sun May 20 20:49:16 2001
-@@ -73,3 +73,3 @@
- EXTRA_DIST = include
--SUBDIRS = macros expat $(sigc_dir) src test 
-+SUBDIRS = macros expat $(sigc_dir) src
- DIST_SUBDIRS = macros expat $(sigc_dir) src test
diff --git a/net/gabber/files/patch-am b/net/gabber/files/patch-am
index 9ac7b8700186..595d3c45604f 100644
--- a/net/gabber/files/patch-am
+++ b/net/gabber/files/patch-am
@@ -1,7 +1,14 @@
---- 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 @@
+
+$FreeBSD$
+
+--- src/Makefile.in	2002/01/14 13:22:27	1.1
++++ src/Makefile.in	2002/01/14 13:21:55
+@@ -220,7 +220,7 @@
+ gabber_LDADD = @EXTRA_GNOME_LIBS@ @XMMS_LIBS@ @SSL_LIBS@ @XSS_LIBS@ @GABBER_STATIC_LIBS@ \
+ 	../jabberoo/src/libjabberoo.a \
+ 	../jabberoo/expat/libexpat.a \
+-	-lxml
++	-lxml -lgiconv
  
--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
  
+ gabber_LDFLAGS = @GABBER_STATIC@
diff --git a/net/gabber/files/patch-jabberoo::configure b/net/gabber/files/patch-jabberoo::configure
new file mode 100644
index 000000000000..b44062175a9c
--- /dev/null
+++ b/net/gabber/files/patch-jabberoo::configure
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- jabberoo/configure	2002/01/14 13:30:11	1.1
++++ jabberoo/configure	2002/01/14 13:31:00
+@@ -1532,8 +1532,8 @@
+         CFLAGS="$CFLAGS -g"
+ 	CXXFLAGS="$CXXFLAGS -g"
+ else
+-	CFLAGS="$CFLAGS -O2"
+-	CXXFLAGS="$CXXFLAGS -O2"
++	CFLAGS="$CFLAGS"
++	CXXFLAGS="$CXXFLAGS"
+         echo "$ac_t""no" 1>&6
+ fi
+ 
diff --git a/net/gabber/files/patch-ltmain.sh b/net/gabber/files/patch-ltmain.sh
new file mode 100644
index 000000000000..98cb05e4ddb3
--- /dev/null
+++ b/net/gabber/files/patch-ltmain.sh
@@ -0,0 +1,28 @@
+
+$FreeBSD$
+
+--- ltmain.sh	2001/08/27 09:51:26	1.1
++++ ltmain.sh	2001/08/27 09:51:42
+@@ -2408,6 +2408,9 @@
+ 	  *-*-netbsd*)
+ 	    # Don't link with libc until the a.out ld.so is fixed.
+ 	    ;;
++	  *-*-freebsd*)
++	    # FreeBSD doesn't need this...
++	    ;;
+ 	  *)
+ 	    # Add libc to deplibs on all other systems if necessary.
+ 	    if test "$build_libtool_need_lc" = "yes"; then
+@@ -4175,10 +4178,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/net/gabber/files/patch-po::Makefile.in.in b/net/gabber/files/patch-po::Makefile.in.in
new file mode 100644
index 000000000000..dd01626b17f3
--- /dev/null
+++ b/net/gabber/files/patch-po::Makefile.in.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- po/Makefile.in.in	2002/01/14 14:48:50	1.1
++++ po/Makefile.in.in	2002/01/14 14:49:01
+@@ -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/gabber/pkg-plist b/net/gabber/pkg-plist
index 51f5723c47f1..64fd0b541231 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -8,6 +8,9 @@ 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/FTRecv_dlg.glade
+share/gnome/gabber/FTSend_dlg.glade
+share/gnome/gabber/FTTransfer_dlg.glade
 share/gnome/gabber/FilterList_dlg.glade
 share/gnome/gabber/Filter_dlg.glade
 share/gnome/gabber/GCIRecv_dlg.glade
@@ -20,7 +23,8 @@ 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/MessageRecv_win.glade
+share/gnome/gabber/MessageSend_win.glade
 share/gnome/gabber/MyContactInfo_win.glade
 share/gnome/gabber/OOOChat_win.glade
 share/gnome/gabber/Prefs_win.glade
@@ -29,7 +33,11 @@ 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/URLRecv_dlg.glade
 share/gnome/gabber/Welcome_win.glade
+share/gnome/gabber/connected-ssl.xpm
+share/gnome/gabber/connected.xpm
+share/gnome/gabber/disconnected.xpm
 share/gnome/gabber/gabber-logs.css
 share/gnome/gabber/glade-add-group-menu.xpm
 share/gnome/gabber/glade-alert.xpm
@@ -40,6 +48,7 @@ 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-file.xpm
 share/gnome/gabber/glade-gabber-logo.png
 share/gnome/gabber/glade-gabber-sideways.png
 share/gnome/gabber/glade-gci.xpm
@@ -48,11 +57,14 @@ 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-new-user.xpm
+share/gnome/gabber/glade-noclose.xpm
 share/gnome/gabber/glade-ooochat.xpm
+share/gnome/gabber/glade-receive-file.xpm
 share/gnome/gabber/glade-s10n.xpm
 share/gnome/gabber/glade-send-contact-menu.xpm
+share/gnome/gabber/glade-send-file-menu.xpm
+share/gnome/gabber/glade-send-file.xpm
 share/gnome/gabber/glade-send-gci.xpm
 share/gnome/gabber/glade-sendasnormal.xpm
 share/gnome/gabber/glade-sendasooo.xpm
@@ -62,46 +74,27 @@ share/gnome/gabber/gnome-globe.png
 share/gnome/gabber/gnome-info.png
 share/gnome/gabber/gnome-locksreen.png
 share/gnome/gabber/gnome-modem.png
+share/gnome/gabber/gnome-question.png
 share/gnome/gabber/gpg-badsigned.xpm
 share/gnome/gabber/gpg-encrypted.xpm
 share/gnome/gabber/gpg-signed.xpm
 share/gnome/gabber/gpg-unencrypted.xpm
 share/gnome/gabber/gpg-unsigned.xpm
 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/legalnotice.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-normal.png
 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
@@ -115,20 +108,12 @@ 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/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/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/dnd.xpm
+share/gnome/pixmaps/gabber/gabber-about.png
 share/gnome/pixmaps/gabber/gnome-editgroups.xpm
 share/gnome/pixmaps/gabber/gnome-gabber.xpm
 share/gnome/pixmaps/gabber/gnome-gpg.xpm
@@ -140,7 +125,8 @@ 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/pixmaps/gabber/xa.xpm
+share/gnome/pixmaps/gabber/xmms.xpm
 share/gnome/sounds/gabber/gabber_connected.wav
 share/gnome/sounds/gabber/gabber_encrypted.wav
 share/gnome/sounds/gabber/gabber_message_queue.wav
@@ -152,19 +138,27 @@ share/gnome/sounds/gabber/gabber_ooochat_recv.wav
 share/gnome/sounds/gabber/gabber_startup.wav
 share/gnome/sounds/gabber/gabber_subrequest.wav
 share/locale/az/LC_MESSAGES/gabber.mo
+share/locale/ca/LC_MESSAGES/gabber.mo
 share/locale/da/LC_MESSAGES/gabber.mo
 share/locale/de/LC_MESSAGES/gabber.mo
+share/locale/el/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/ja/LC_MESSAGES/gabber.mo
+share/locale/ko/LC_MESSAGES/gabber.mo
+share/locale/lt/LC_MESSAGES/gabber.mo
+share/locale/ms/LC_MESSAGES/gabber.mo
 share/locale/nl/LC_MESSAGES/gabber.mo
 share/locale/no/LC_MESSAGES/gabber.mo
+share/locale/pt/LC_MESSAGES/gabber.mo
+share/locale/ro/LC_MESSAGES/gabber.mo
 share/locale/ru/LC_MESSAGES/gabber.mo
+share/locale/sk/LC_MESSAGES/gabber.mo
 share/locale/sv/LC_MESSAGES/gabber.mo
 share/locale/tr/LC_MESSAGES/gabber.mo
 share/locale/uk/LC_MESSAGES/gabber.mo
-@unexec rmdir %D/etc/sound/events 2>/dev/null || true
-@unexec rmdir %D/etc/sound 2>/dev/null || true
+share/locale/zh_TW/LC_MESSAGES/gabber.mo
 @dirrm share/gnome/sounds/gabber
 @dirrm share/gnome/pixmaps/gabber
 @dirrm share/gnome/omf/gabber