- Update to 2.0 pre7

PR:		ports/63640
Submitted by:	Piotr Smyrak <piotr.smyrak@heron.pl> (maintainer)

6 files changed, 31 insertions, 27 deletions

diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index eac7053b6d0f..a0bab5c5a4ca 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gnugadu2
-PORTVERSION=	2.0.p6
-PORTREVISION=	2
+PORTVERSION=	2.0.p7
 CATEGORIES=	polish net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
-DISTNAME=	gg2-${PORTVERSION:S/.p6/pre6/}
+DISTNAME=	gg2-${PORTVERSION:S/.p7/pre7/}
 
 MAINTAINER=	smyru@heron.pl
 COMMENT=	GTK2 based Gadu-Gadu client for X11
@@ -143,6 +142,7 @@ post-patch:
 post-install:
 .if (${HAVE_GNOME:Mgnomehier}!="")
 	${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${X11BASE}/share/gnome/apps/Internet
+	${LN} -sf ${PREFIX}/share/pixmaps/gg2.png ${X11BASE}/share/gnome/pixmaps
 .endif
 .if exists(${LOCALBASE}/lib/libkdecore.so)
 	${INSTALL_DATA} ${WRKSRC}/gg2.desktop ${LOCALBASE}/share/applnk/Internet
diff --git a/polish/gnugadu2/distinfo b/polish/gnugadu2/distinfo
index f684933e903c..4b48f794c903 100644
--- a/polish/gnugadu2/distinfo
+++ b/polish/gnugadu2/distinfo
@@ -1 +1,2 @@
-MD5 (gg2-2.0pre6.tar.bz2) = a22e307e31605986169ec94af600bac5
+MD5 (gg2-2.0pre7.tar.bz2) = 855526fd075bfbd739a8bc823b2aa0ac
+SIZE (gg2-2.0pre7.tar.bz2) = 893819
diff --git a/polish/gnugadu2/files/patch-gg2.desktop b/polish/gnugadu2/files/patch-gg2.desktop
deleted file mode 100644
index 99fd9743e97e..000000000000
--- a/polish/gnugadu2/files/patch-gg2.desktop
+++ /dev/null
@@ -1,15 +0,0 @@
---- gg2.desktop.orig	Wed Jan 14 20:37:47 2004
-+++ gg2.desktop	Fri Jan 30 17:18:58 2004
-@@ -3,9 +3,10 @@
- Encoding=UTF-8
- Name=GNU Gadu
- Comment=Instant Messanger Client
--Comment[pl]=Wolne Gadanie
-+Comment[pl]=Free-wolne Gadanie
- TryExec=gg2
--Icon=gg2.png
-+Exec=gg2
-+Icon=%%PREFIX%%/share/gg2/pixmaps/icon.png
- Terminal=false
- Type=Application
- Categories=Application;Network;InstantMessaging;GTK;
diff --git a/polish/gnugadu2/files/patch-po::Makefile.in.in b/polish/gnugadu2/files/patch-po::Makefile.in.in
index 51db8d662521..b59e88b0d16e 100644
--- a/polish/gnugadu2/files/patch-po::Makefile.in.in
+++ b/polish/gnugadu2/files/patch-po::Makefile.in.in
@@ -1,11 +1,11 @@
---- po/Makefile.in.in.orig	Sun Dec 14 21:44:41 2003
-+++ po/Makefile.in.in	Sun Dec 14 21:45:44 2003
-@@ -27,7 +27,7 @@
+--- po/Makefile.in.in.orig	Sun Feb 22 14:40:17 2004
++++ po/Makefile.in.in	Sun Feb 22 14:40:50 2004
+@@ -21,7 +21,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
+ datadir = @datadir@
 -localedir = $(datadir)/locale
 +localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po
- subdir = po
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@
diff --git a/polish/gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c b/polish/gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c
new file mode 100644
index 000000000000..d1ea564e661d
--- /dev/null
+++ b/polish/gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c
@@ -0,0 +1,16 @@
+--- src/plugins/jabber/jabber_plugin.c.orig	Tue Feb 17 17:12:25 2004
++++ src/plugins/jabber/jabber_plugin.c	Mon Feb 23 22:45:48 2004
+@@ -235,11 +235,12 @@
+ {
+ 	GSList *user = (GSList *) user_data;
+ 	GGaduContact *k = NULL;
++	LmMessage *m = NULL;
+ 	
+ 	if (!user) return NULL;
+ 	
+ 	k = (GGaduContact *) user->data;
+-	LmMessage *m = lm_message_new_with_sub_type(k->id, LM_MESSAGE_TYPE_PRESENCE, LM_MESSAGE_SUB_TYPE_SUBSCRIBE);
++	m = lm_message_new_with_sub_type(k->id, LM_MESSAGE_TYPE_PRESENCE, LM_MESSAGE_SUB_TYPE_SUBSCRIBE);
+ 	lm_connection_send(connection, m, NULL);
+ 	lm_message_unref(m);
+ 	return NULL;
diff --git a/polish/gnugadu2/pkg-plist b/polish/gnugadu2/pkg-plist
index aabddd4aed8c..e49fd8d46cfd 100644
--- a/polish/gnugadu2/pkg-plist
+++ b/polish/gnugadu2/pkg-plist
@@ -223,7 +223,6 @@ share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-offline-descr.png
 share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-offline.png
 share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-online-descr.png
 share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu-online.png
-share/gg2/pixmaps/icons/rozgwiazda/gadu-gadu.png
 share/gg2/pixmaps/icons/rozgwiazda/icon.png
 share/gg2/pixmaps/icons/rozgwiazda/jabber.png
 share/gg2/pixmaps/icons/rozgwiazda/license.txt
@@ -256,6 +255,7 @@ share/gg2/pixmaps/jabber.png
 share/gg2/pixmaps/new-msg.png
 share/gg2/pixmaps/offline.png
 share/gg2/pixmaps/online.png
+share/gg2/pixmaps/send-im.png
 share/gg2/pixmaps/show-hide-inactive.png
 share/gg2/pixmaps/sms.png
 share/gg2/pixmaps/sms_i.png
@@ -284,7 +284,9 @@ share/gg2/themes/vgreen2.theme
 share/gg2/themes/vred2.theme
 share/gg2/themes/white2.theme
 %%GNOME:%%share/gnome/apps/Internet/gg2.desktop
+%%GNOME:%%share/gnome/pixmaps/gg2.png
 share/locale/pl/LC_MESSAGES/gg2.mo
+share/pixmaps/gg2.png
 @dirrm share/gg2/themes
 @dirrm share/gg2/sounds
 @dirrm share/gg2/pixmaps/icons/tlen-3d