5 files changed, 15 insertions, 36 deletions

diff --git a/polish/gnugadu2/Makefile b/polish/gnugadu2/Makefile
index 2e927dad37ef..b6f1138a3c57 100644
--- a/polish/gnugadu2/Makefile
+++ b/polish/gnugadu2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnugadu2
-PORTVERSION=	2.0.p7
+PORTVERSION=	2.0.p8
 CATEGORIES=	polish net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	ggadu
-DISTNAME=	gg2-${PORTVERSION:S/.p7/pre7/}
+DISTNAME=	gg2-${PORTVERSION:S/.p/pre/}
 
 MAINTAINER=	smyru@heron.pl
 COMMENT=	GTK2 based Gadu-Gadu client for X11
@@ -26,6 +26,7 @@ USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
+CONFLICTS=	qhacc-*
 
 CONFIGURE_ARGS=	--with-gui \
 		--with-gadu \
@@ -42,6 +43,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 WITH_ESOUND=	yes
 .endif
 
+.if defined(WITH_GTKSPELL)
+CONFIGURE_ARGS+=	--with-gtkspell
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
+.endif
+
 .if defined(WITH_DOCKLET)
 CONFIGURE_ARGS+=	--with-docklet_system_tray
 PLIST_SUB+=	DOCKLET:=""
diff --git a/polish/gnugadu2/distinfo b/polish/gnugadu2/distinfo
index 5243d2a18972..34a21fd79e28 100644
--- a/polish/gnugadu2/distinfo
+++ b/polish/gnugadu2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gg2-2.0pre7.tar.bz2) = 855526fd075bfbd739a8bc823b2aa0ac
-SIZE (gg2-2.0pre6.tar.bz2) = 833596
+MD5 (gg2-2.0pre8.tar.bz2) = 1d44788e6fb7b6c47453e2a0ad104c54
+SIZE (gg2-2.0pre8.tar.bz2) = 959182
 SIZE (gg2-2.0pre7.tar.bz2) = 893819
diff --git a/polish/gnugadu2/files/patch-lib::Makefile.in b/polish/gnugadu2/files/patch-lib::Makefile.in
index 51dc7f757f39..89ee7d0f7d69 100644
--- a/polish/gnugadu2/files/patch-lib::Makefile.in
+++ b/polish/gnugadu2/files/patch-lib::Makefile.in
@@ -1,11 +1,11 @@
---- lib/Makefile.in.orig	Sun Dec 14 21:27:52 2003
-+++ lib/Makefile.in	Sun Dec 14 21:28:26 2003
-@@ -252,7 +252,7 @@
+--- lib/Makefile.in.orig	Wed Mar 17 22:59:16 2004
++++ lib/Makefile.in	Wed Mar 17 22:59:46 2004
+@@ -303,7 +303,7 @@
+ 	perl_embed.h 
  
  libgg2_core_la_HEADERS = gg2_core.h
- 
 -libgg2_core_la_LIBADD = $(PERL_OPTION_LDFLAGS) -ldl 
 +libgg2_core_la_LIBADD = $(PERL_OPTION_LDFLAGS)
  libgg2_core_la_LDFLAGS = -version-info 2:0:0
- 
  pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gg2_core.pc
diff --git a/polish/gnugadu2/files/patch-src::plugins::Makefile.in b/polish/gnugadu2/files/patch-src::plugins::Makefile.in
deleted file mode 100644
index 0ae35503c4c8..000000000000
--- a/polish/gnugadu2/files/patch-src::plugins::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/Makefile.in.orig	Wed Jan 14 21:21:00 2004
-+++ src/plugins/Makefile.in	Wed Feb 18 10:56:37 2004
-@@ -244,6 +244,8 @@
- 
- @BUILD_SOUND_OSS_TRUE@SOUND = sound
- 
-+@BUILD_SOUND_EXTERNAL_TRUE@SOUND = sound
-+
- @BUILD_SMS_TRUE@SMS = sms
- 
- @BUILD_REMOTE_TRUE@REMOTE = remote
diff --git a/polish/gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c b/polish/gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c
deleted file mode 100644
index d1ea564e661d..000000000000
--- a/polish/gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- 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;