Update to 0.8.3

PR:		27371 (no patches), 27463 (modified patches)
Submitted by:	Josh Elsasser <josh@elsasser.org> ports/27371
		Erich Zigler <erich@tacni.net> ports/27463

5 files changed, 27 insertions, 55 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 812661447c94..8f6f49b8dfa3 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.8.2
+PORTVERSION=	0.8.3
 CATEGORIES=	net gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,6 +25,8 @@ CONFIGURE_ENV+=	GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+MAN1=		gabber.1
+
 post-patch:
 	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index 663f1a094092..5e680b7cb79f 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.8.2.tar.gz) = fd7e2884e28dff9029222768ec7a1af1
+MD5 (gabber-0.8.3.tar.gz) = e74cd30afd9c7ada4e0990e7b4838a4d
diff --git a/net/gabber/files/patch-ai b/net/gabber/files/patch-ai
index 3ff1a30660ca..048169cc271e 100644
--- a/net/gabber/files/patch-ai
+++ b/net/gabber/files/patch-ai
@@ -1,17 +1,7 @@
---- jabberoo/Makefile.am.orig	Wed Sep 13 12:18:07 2000
-+++ jabberoo/Makefile.am	Wed Sep 13 12:18:11 2000
-@@ -1,2 +1,2 @@
+--- 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 = expat src test 
-+SUBDIRS = expat src
---- jabberoo/Makefile.in.orig	Mon Jul 31 23:38:31 2000
-+++ jabberoo/Makefile.in	Tue Sep 12 15:00:38 2000
-@@ -69,7 +69,7 @@
- VERSION = @VERSION@
- 
- EXTRA_DIST = include
--SUBDIRS = expat src test 
-+SUBDIRS = expat src
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
+-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-al b/net/gabber/files/patch-al
deleted file mode 100644
index 1cb21d75c9ef..000000000000
--- a/net/gabber/files/patch-al
+++ /dev/null
@@ -1,26 +0,0 @@
---- 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: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:4978: checking for iconv in -lgiconv" >&5
- if eval "test \"`echo '$''{'ac_cv_libiconv'+set}'`\" = set"; then
-@@ -4984,3 +4984,3 @@
- 
--#include <iconv.h>
-+#include <giconv.h>
- 
-@@ -5007,3 +5007,3 @@
- if test $ac_cv_libiconv = yes; then
--	ICONV_LIBS="$ICONV_LIBS -liconv"
-+	ICONV_LIBS="$ICONV_LIBS -lgiconv"
- 	have_iconv=yes
-@@ -5133,3 +5133,3 @@
- 
--#include <iconv.h>
-+#include <giconv.h>
- #include <stdlib.h>
diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist
index 182720afab38..51f5723c47f1 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -58,6 +58,10 @@ share/gnome/gabber/glade-sendasnormal.xpm
 share/gnome/gabber/glade-sendasooo.xpm
 share/gnome/gabber/glade-unlock-key.xpm
 share/gnome/gabber/glade-users.xpm
+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/gpg-badsigned.xpm
 share/gnome/gabber/gpg-encrypted.xpm
 share/gnome/gabber/gpg-signed.xpm
@@ -137,16 +141,17 @@ 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/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/az/LC_MESSAGES/gabber.mo
 share/locale/da/LC_MESSAGES/gabber.mo
 share/locale/de/LC_MESSAGES/gabber.mo
 share/locale/es/LC_MESSAGES/gabber.mo
@@ -157,9 +162,10 @@ 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
+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
-@dirrm share/gnome/sounds/Gabber
+@dirrm share/gnome/sounds/gabber
 @dirrm share/gnome/pixmaps/gabber
 @dirrm share/gnome/omf/gabber
 @dirrm share/gnome/help/gabber/C/stylesheet-images