Bug 64391

Summary: [patch] update polish/gnugadu2 to pre8
Product: Ports & Packages Reporter: Piotr Smyrak <smyru>
Component: Individual Port(s)Assignee: freebsd-ports-bugs (Nobody) <ports-bugs>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
gnugadu2.patch.7 none

Description Piotr Smyrak 2004-03-17 23:50:24 UTC 
	+ update the port to pre8
	+ introduce textproc/gtkspell2 support via a knob

How-To-Repeat: 	N/A
Comment 1 Kirill Ponomarev freebsd_committer freebsd_triage 2004-03-18 13:51:23 UTC 
State Changed
From-To: open->feedback

It does build neither on 4-x nor on 5-x: 

In file included from gui_main.c:33: 
/usr/X11R6/include/plugins.h:23: memory: No such file or directory 
/usr/X11R6/include/plugins.h:24: vector: No such file or directory 
In file included from /usr/X11R6/include/plugins.h:26, 
from gui_main.c:33: 
/usr/X11R6/include/qstring.h:56: string: No such file or directory 
In file included from gui_main.c:33: 
/usr/X11R6/include/qshared.h:47: syntax error before `{' 
/usr/X11R6/include/qshared.h:48: syntax error before `:' 
/usr/X11R6/include/qshared.h:48: warning: return-type defaults to `int' 
/usr/X11R6/include/qshared.h: In function `count': 
/usr/X11R6/include/qshared.h:48: warning: control reaches end of non-void 
function 
/usr/X11R6/include/qshared.h: In function `ref': 
/usr/X11R6/include/qshared.h:49: wrong type argument to increment 
/usr/X11R6/include/qshared.h: At top level: 
/usr/X11R6/include/qshared.h:50: syntax error before `deref' 
/usr/X11R6/include/qshared.h:50: warning: return-type defaults to `int' 
/usr/X11R6/include/qshared.h: In function `deref': 
/usr/X11R6/include/qshared.h:50: wrong type argument to decrement 
/usr/X11R6/include/qshared.h:50: warning: control reaches end of non-void 
function 
/usr/X11R6/include/qshared.h: At top level: 
/usr/X11R6/include/qshared.h:51: syntax error before `count' 
/usr/X11R6/include/qshared.h:51: warning: type defaults to `int' in declaration 
of `count'
Comment 2 Piotr Smyrak 2004-04-01 16:54:37 UTC 
Hi,

On Thu, 18 Mar 2004 05:52:25 -0800 (PST), Kirill Ponomarew
<krion@FreeBSD.org>  wrote:

> Synopsis: [patch] update polish/gnugadu2 to pre8
> 
> State-Changed-From-To: open->feedback 
> State-Changed-By: krion
> State-Changed-When: Thu Mar 18 05:51:23 PST 2004
> State-Changed-Why: 
> It does build neither on 4-x nor on 5-x:
> 
[snip]
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=64391

The updated patch with CONFLICTS should take care of this error.

--- patch starts ---
diff -Naru gnugadu2.orig/Makefile gnugadu2/Makefile
--- gnugadu2.orig/Makefile	Sun Mar 14 07:17:13 2004
+++ gnugadu2/Makefile	Wed Mar 24 21:53:44 2004
@@ -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_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 WANT_GNOME=	yes
+CONFLICTS=	qhacc-*
 
 CONFIGURE_ARGS=	--with-gui \
 		--with-gadu \
@@ -40,6 +41,11 @@
 
 .if (${HAVE_GNOME:Mesound}!="")
 WITH_ESOUND=	yes
+.endif
+
+.if defined(WITH_GTKSPELL)
+CONFIGURE_ARGS+=	--with-gtkspell
+LIB_DEPENDS+=	gtkspell.0:${PORTSDIR}/textproc/gtkspell2
 .endif
 
 .if defined(WITH_DOCKLET)
diff -Naru gnugadu2.orig/distinfo gnugadu2/distinfo
--- gnugadu2.orig/distinfo	Tue Mar  2 19:57:32 2004
+++ gnugadu2/distinfo	Wed Mar 24 21:53:44 2004
@@ -1,2 +1,2 @@
-MD5 (gg2-2.0pre7.tar.bz2) = 855526fd075bfbd739a8bc823b2aa0ac
-SIZE (gg2-2.0pre7.tar.bz2) = 893819
+MD5 (gg2-2.0pre8.tar.bz2) = 1d44788e6fb7b6c47453e2a0ad104c54
+SIZE (gg2-2.0pre8.tar.bz2) = 959182
diff -Naru gnugadu2.orig/files/patch-lib::Makefile.in
gnugadu2/files/patch-lib::Makefile.in
--- gnugadu2.orig/files/patch-lib::Makefile.in	Fri Jan 16 00:48:06 2004
+++ gnugadu2/files/patch-lib::Makefile.in	Wed Mar 24 21:53:44 2004
@@ -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 -Naru gnugadu2.orig/files/patch-src::plugins::Makefile.in
gnugadu2/files/patch-src::plugins::Makefile.in
--- gnugadu2.orig/files/patch-src::plugins::Makefile.in	Wed Feb 18 11:04:48 2004
+++ gnugadu2/files/patch-src::plugins::Makefile.in	Thu Jan  1 01:00:00 1970
@@ -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 -Naru
gnugadu2.orig/files/patch-src::plugins::jabber::jabber_plugin.c
gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c
--- gnugadu2.orig/files/patch-src::plugins::jabber::jabber_plugin.c	Tue Mar  2 19:57:32 2004
+++ gnugadu2/files/patch-src::plugins::jabber::jabber_plugin.c	Thu Jan  1 01:00:00 1970
@@ -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;
--- patch ends ---

-- 
 Piotr Smyrak
 piotr.smyrak@heron.pl
Comment 3 Pav Lucistnik freebsd_committer freebsd_triage 2004-04-01 23:12:12 UTC 
State Changed
From-To: feedback->closed

Committed, thanks!