Update to 0.7.0

PR:		20349 (in part - I reworked it)
Submitted by:	maintainer

5 files changed, 76 insertions, 62 deletions

diff --git a/net/gabber/Makefile b/net/gabber/Makefile
index 60bdbc40f2f6..f4311e1d3614 100644
--- a/net/gabber/Makefile
+++ b/net/gabber/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gabber
-PORTVERSION=	0.6.1
+PORTVERSION=	0.7.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,18 +15,18 @@ MAINTAINER=	erich@tacni.net
 
 LIB_DEPENDS=	gnome.4:${PORTSDIR}/x11/gnomelibs \
 		gtkmm-1.2.1:${PORTSDIR}/x11-toolkits/gtk-- \
-		gnomemm-1.1.2:${PORTSDIR}/x11-toolkits/gnome-- \
+		gnomemm-1.1.3:${PORTSDIR}/x11-toolkits/gnome-- \
 		sigc.1:${PORTSDIR}/devel/libsigc++ \
 		gnet.0:${PORTSDIR}/net/gnet \
 		glade.4:${PORTSDIR}/devel/libglade
-RUN_DEPENDS=	gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter
+RUN_DEPENDS=	panel:${PORTSDIR}/x11/gnomecore
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_AUTOCONF=	yes
+LIBTOOLFILES=	configure jabberoo/configure
 CONFIGURE_ENV+=	GTK_CONFIG="${GTK_CONFIG}" GLIB_CONFIG="${GLIB_CONFIG}" \
 		GNOME_LIBCONFIG_PATH="${LOCALBASE}/lib:${X11BASE}/lib" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/gabber/distinfo b/net/gabber/distinfo
index 65c6ee651010..04411b80ecaa 100644
--- a/net/gabber/distinfo
+++ b/net/gabber/distinfo
@@ -1 +1 @@
-MD5 (gabber-0.6.1.tar.gz) = 423c62683083c0e8d89d11448cd9e9a4
+MD5 (gabber-0.7.0.tar.gz) = 0446b9692de1203515bf3c498c1eb899
diff --git a/net/gabber/files/patch-ah b/net/gabber/files/patch-ah
new file mode 100644
index 000000000000..592f013846b8
--- /dev/null
+++ b/net/gabber/files/patch-ah
@@ -0,0 +1,9 @@
+--- src/RegistrationWin.cc.orig	Sat Jul 29 23:08:27 2000
++++ src/RegistrationWin.cc	Tue Sep 12 13:32:24 2000
+@@ -86,4 +86,4 @@
+ 
+-     append_button_with_pixmap(_("Ok"), GNOME_STOCK_BUTTON_OK);
+-     append_button_with_pixmap(_("Cancel"), GNOME_STOCK_BUTTON_CANCEL);
++     append_button(_("Ok"), GNOME_STOCK_BUTTON_OK);
++     append_button(_("Cancel"), GNOME_STOCK_BUTTON_CANCEL);
+      
diff --git a/net/gabber/files/patch-ai b/net/gabber/files/patch-ai
new file mode 100644
index 000000000000..074375922acb
--- /dev/null
+++ b/net/gabber/files/patch-ai
@@ -0,0 +1,11 @@
+--- 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 = 
diff --git a/net/gabber/pkg-plist b/net/gabber/pkg-plist
index 77f41e4dc679..1a74ade0f18a 100644
--- a/net/gabber/pkg-plist
+++ b/net/gabber/pkg-plist
@@ -1,93 +1,87 @@
 bin/gabber
-share/locale/en_SE/LC_MESSAGES/gabber.mo
 share/gabber/gabber.glade
+share/gabber/glade-delete-user-menu.xpm
+share/gabber/glade-delete-user.xpm
+share/gabber/glade-edit-user-menu.xpm
+share/gabber/glade-edit-user.xpm
 share/gabber/glade-gabber-logo.png
 share/gabber/glade-message.xpm
+share/gabber/glade-new-user-menu.xpm
+share/gabber/glade-new-user.xpm
+share/gabber/glade-noclose.xpm
 share/gabber/glade-ooochat.xpm
 share/gabber/glade-s10n.xpm
-share/gabber/glade-new-user.xpm
-share/gabber/glade-new-user-menu.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/help/gabber/C/index.html
-share/gnome/help/gabber/C/topic.dat
-share/gnome/help/gabber/C/gabber.sgml
-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
-share/gnome/help/gabber/C/stylesheet-images/next.gif
-share/gnome/help/gabber/C/stylesheet-images/note.gif
-share/gnome/help/gabber/C/stylesheet-images/prev.gif
-share/gnome/help/gabber/C/stylesheet-images/tip.gif
-share/gnome/help/gabber/C/stylesheet-images/toc-blank.gif
-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/gabber/glade-sendasooo.xpm
+share/gabber/glade-users.xpm
+share/gnome/apps/Internet/gabber.desktop
+share/gnome/help/gabber/C/agents-available.png
+share/gnome/help/gabber/C/agents-register.png
 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/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/userinfo.html
-share/gnome/help/gabber/C/users.html
-share/gnome/help/gabber/C/docbook.css
-share/gnome/help/gabber/C/agents-available.png
-share/gnome/help/gabber/C/agents-register.png
-share/gnome/help/gabber/C/first.png
 share/gnome/help/gabber/C/login.png
-share/gnome/help/gabber/C/main-menubar-gabber.png
-share/gnome/help/gabber/C/main-menubar-help.png
-share/gnome/help/gabber/C/main-menubar-roster.png
-share/gnome/help/gabber/C/main-menubar-user.png
-share/gnome/help/gabber/C/main-roster-menu.png
 share/gnome/help/gabber/C/main-status-roster.png
 share/gnome/help/gabber/C/main-status-user-dialog.png
 share/gnome/help/gabber/C/main-status-user-show.png
 share/gnome/help/gabber/C/main-toolbar.png
+share/gnome/help/gabber/C/main.html
 share/gnome/help/gabber/C/main.png
 share/gnome/help/gabber/C/mainshot.png
 share/gnome/help/gabber/C/msg-gc-join.png
-share/gnome/help/gabber/C/msg-gc-main-menubar-chat.png
-share/gnome/help/gabber/C/msg-gc-main-menubar-edit.png
-share/gnome/help/gabber/C/msg-gc-main-menubar-help.png
 share/gnome/help/gabber/C/msg-gc-main.png
-share/gnome/help/gabber/C/msg-normal-advanced.png
 share/gnome/help/gabber/C/msg-normal-reply.png
 share/gnome/help/gabber/C/msg-normal.png
 share/gnome/help/gabber/C/msg-ooo.png
-share/gnome/help/gabber/C/pref-connection.png
-share/gnome/help/gabber/C/pref-mainwindow.png
-share/gnome/help/gabber/C/pref-msg.png
-share/gnome/help/gabber/C/pref-roster-statuscolors.png
-share/gnome/help/gabber/C/pref-roster.png
-share/gnome/help/gabber/C/userinfo-basic.png
+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/stylesheet-images/caution.gif
+share/gnome/help/gabber/C/stylesheet-images/home.gif
+share/gnome/help/gabber/C/stylesheet-images/important.gif
+share/gnome/help/gabber/C/stylesheet-images/next.gif
+share/gnome/help/gabber/C/stylesheet-images/note.gif
+share/gnome/help/gabber/C/stylesheet-images/prev.gif
+share/gnome/help/gabber/C/stylesheet-images/tip.gif
+share/gnome/help/gabber/C/stylesheet-images/toc-blank.gif
+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/topic.dat
+share/gnome/help/gabber/C/userinfo-general.png
 share/gnome/help/gabber/C/userinfo-jud.png
+share/gnome/help/gabber/C/userinfo.html
 share/gnome/help/gabber/C/users-adduser.png
+share/gnome/help/gabber/C/users-edituser-client.png
 share/gnome/help/gabber/C/users-edituser-groups-add.png
 share/gnome/help/gabber/C/users-edituser-groups.png
 share/gnome/help/gabber/C/users-edituser-info.png
 share/gnome/help/gabber/C/users-edituser-s10n.png
 share/gnome/help/gabber/C/users-subscriptionrequest.png
-share/gnome/apps/Internet/gabber.desktop
-@dirrm share/gabber
+share/gnome/help/gabber/C/users.html
+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-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/pixmaps/gabber/offline.xpm
+share/gnome/pixmaps/gabber/online.xpm
+share/gnome/pixmaps/gabber/stalker.xpm
+share/gnome/pixmaps/gabber/xa.xpm
+share/locale/en_SE/LC_MESSAGES/gabber.mo
 @dirrm share/gnome/pixmaps/gabber
 @dirrm share/gnome/help/gabber/C/stylesheet-images
 @dirrm share/gnome/help/gabber/C
 @dirrm share/gnome/help/gabber
+@dirrm share/gabber