8 files changed, 42 insertions, 53 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 40382bd566e3..2d994621dafb 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.8.6
-PORTREVISION=	1
+PORTVERSION=	0.8.7
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,10 +21,12 @@ LIB_DEPENDS=	gnomemm.9:${PORTSDIR}/x11-toolkits/gnome--
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+LIBTOOLFILES=	configure jabberoo/configure
 CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 .if !defined(WITH_XMMS)
 CONFIGURE_ARGS=	--disable-xmms
 .endif
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index cdbf19dbb9e0..4941e97c2ec4 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.8.6.tar.gz) = 45c2db56a577808731c52afd9651f6c7
+MD5 (gabber-0.8.7.tar.gz) = afd0c258b27dfb386e7ec668a9d371aa
diff --git a/net/gabber/files/patch-am b/net/gabber/files/patch-am
index 8881a1114370..f207eb4dc863 100644
--- a/net/gabber/files/patch-am
+++ b/net/gabber/files/patch-am
@@ -1,12 +1,9 @@
-
-$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 @@
+--- src/Makefile.in.orig       Sun May 12 15:59:07 2002
++++ src/Makefile.in    Sun May 12 15:59:17 2002
+@@ -223,7 +223,7 @@
  gabber_LDADD = @EXTRA_GNOME_LIBS@ @XMMS_LIBS@ @SSL_LIBS@ @XSS_LIBS@ @GABBER_STATIC_LIBS@ \
  	../jabberoo/src/libjabberoo.a \
- 	../jabberoo/expat/libexpat.a \
+	../jabberoo/libjudo/src/libjudo.la \
 -	-lxml
 +	-lxml -liconv
  
diff --git a/net/gabber/files/patch-an b/net/gabber/files/patch-an
index 33ceba08d1e4..6af14251b462 100644
--- a/net/gabber/files/patch-an
+++ b/net/gabber/files/patch-an
@@ -1,11 +1,11 @@
---- src/TCPTransmitter.cc.orig Thu Jan 18 15:08:39 2001
-+++ src/TCPTransmitter.cc      Thu Jan 18 15:09:13 2001
-@@ -33,6 +33,8 @@
- #include <string.h>
- #include <sys/wait.h>
+--- src/TCPTransmitter.cc.orig Sun May 12 16:02:43 2002
++++ src/TCPTransmitter.cc      Sun May 12 16:03:01 2002
+@@ -48,6 +48,8 @@
+ #include <fcntl.h>
+ #include <glib.h>
 
 +#define TRANSMITTER_DEBUG
 +
  using namespace std;
 
-
+ #ifdef HAVE_GETHOSTBYNAME_R_GLIB_MUTEX
diff --git a/net/gabber/files/patch-configure b/net/gabber/files/patch-configure
new file mode 100644
index 000000000000..0aa660d58aa7
--- /dev/null
+++ b/net/gabber/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Sun May 12 19:33:04 2002
++++ configure	Sun May 12 19:33:31 2002
+@@ -7843,6 +7843,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/gabber/files/patch-jabberoo::configure b/net/gabber/files/patch-jabberoo::configure
index b44062175a9c..b0f58dd33130 100644
--- a/net/gabber/files/patch-jabberoo::configure
+++ b/net/gabber/files/patch-jabberoo::configure
@@ -1,9 +1,14 @@
-
-$FreeBSD$
-
---- jabberoo/configure	2002/01/14 13:30:11	1.1
-+++ jabberoo/configure	2002/01/14 13:31:00
-@@ -1532,8 +1532,8 @@
+--- jabberoo/configure.orig	Sun May 12 19:35:20 2002
++++ jabberoo/configure	Sun May 12 19:34:18 2002
+@@ -7377,6 +7377,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'
+@@ -7598,8 +7599,8 @@
          CFLAGS="$CFLAGS -g"
  	CXXFLAGS="$CXXFLAGS -g"
  else
@@ -11,6 +16,6 @@ $FreeBSD$
 -	CXXFLAGS="$CXXFLAGS -O2"
 +	CFLAGS="$CFLAGS"
 +	CXXFLAGS="$CXXFLAGS"
-         echo "$ac_t""no" 1>&6
+         echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
  fi
- 
diff --git a/net/gabber/files/patch-ltmain.sh b/net/gabber/files/patch-ltmain.sh
deleted file mode 100644
index 98cb05e4ddb3..000000000000
--- a/net/gabber/files/patch-ltmain.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$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/pkg-plist b/net/gabber/pkg-plist
index 64fd0b541231..e09fa281b36b 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -122,11 +122,14 @@ 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/invisible.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/xmms.xpm
+share/gnome/pixmaps/gabber/xmms_paused.xpm
+share/gnome/pixmaps/gabber/xmms_stopped.xpm
 share/gnome/sounds/gabber/gabber_connected.wav
 share/gnome/sounds/gabber/gabber_encrypted.wav
 share/gnome/sounds/gabber/gabber_message_queue.wav
@@ -151,6 +154,7 @@ 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/pl/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