From pierre@home.poildetroll.net  Wed Mar 21 23:00:37 2012
Return-Path: <pierre@home.poildetroll.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1F692106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Mar 2012 23:00:37 +0000 (UTC)
	(envelope-from pierre@home.poildetroll.net)
Received: from kashyyyk.home.poildetroll.net (kashyyyk.home.poildetroll.net [IPv6:2001:910:10b7:f00::1])
	by mx1.freebsd.org (Postfix) with ESMTP id 880F98FC16
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 21 Mar 2012 23:00:36 +0000 (UTC)
Received: from alderaan.home.poildetroll.net (alderaan.home.poildetroll.net [10.42.1.6])
	by kashyyyk.home.poildetroll.net (Postfix) with ESMTP id 444DFF2FE1
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Mar 2012 00:00:27 +0100 (CET)
Received: by alderaan.home.poildetroll.net (Postfix, from userid 1001)
	id CC02DA97; Thu, 22 Mar 2012 00:00:26 +0100 (CET)
Message-Id: <20120321230026.CC02DA97@alderaan.home.poildetroll.net>
Date: Thu, 22 Mar 2012 00:00:26 +0100 (CET)
From: Pierre Guinoiseau <pierre@guinoiseau.eu>
Reply-To: Pierre Guinoiseau <pierre@guinoiseau.eu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] net-im/gajim: make gnomekeyring and gtkspell support optional
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         166309
>Category:       ports
>Synopsis:       [patch] net-im/gajim: make gnomekeyring and gtkspell support optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 21 23:10:14 UTC 2012
>Closed-Date:    Thu Mar 22 07:12:49 UTC 2012
>Last-Modified:  Thu Mar 22 07:12:49 UTC 2012
>Originator:     Pierre Guinoiseau <pierre@guinoiseau.eu>
>Release:        FreeBSD 9.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD alderaan.home.poildetroll.net 9.0-STABLE FreeBSD 9.0-STABLE #0 r231201M: Wed Feb 8 15:29:54 CET 2012 root@alderaan.home.poildetroll.net:/usr/obj/usr/src/sys/ALDERAAN amd64


	
>Description:
Hello,

the update of net-im/gajim to 0.15 wanted me to install almost all gnome
desktop:

% make -C /usr/ports/net-im/gajim missing | wc -l
     111

Not everyone wants to install the whole gnome desktop along with gajim (which
is because of a dependence on pygnomedesktop, which is only useful for
GnomeKeyring support). So, I added an option for it, which is disabled by
default (there was no dep on pygnomedesktop before the 0.15 update, it restores
this behaviour), we may want to bump the port version because of this change. I
added an option for gtkspell too, it can be useful for those who don't need it.

Regards,

>How-To-Repeat:
	
>Fix:

	

--- gajim-0.15-gnomekeyring.diff begins here ---
diff -ruN --exclude=CVS ../gajim.orig/Makefile ./Makefile
--- ../gajim.orig/Makefile	2012-03-21 05:28:44.000000000 +0100
+++ ./Makefile	2012-03-21 23:29:37.055767845 +0100
@@ -15,7 +15,6 @@
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}openssl>=0:${PORTSDIR}/security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}asn1>=0:${PORTSDIR}/devel/py-asn1
@@ -25,7 +24,7 @@
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pygnomedesktop pygtk2
+USE_GNOME=	pygtk2
 USE_PYTHON=	-2.7
 USE_XORG=	x11 xext xscrnsaver
 
@@ -35,7 +34,9 @@
 
 OPTIONS=	CRYPTO "End to end encryption support" Off \
 		DBUS "Adds support for D-Bus (Desktop Bus)" On \
-		NLS "Native Language Support via gettext utilities" On
+		KEYRING "GnomeKeyring support" Off \
+		NLS "Native Language Support via gettext utilities" On \
+		SPELL "Spell checking support" On
 
 .include <bsd.port.options.mk>
 
@@ -55,6 +56,14 @@
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pycrypto>=0:${PORTSDIR}/security/py-pycrypto
 .endif
 
+.if defined(WITH_KEYRING)
+USE_GNOME+=	pygnomedesktop
+.endif
+
+.if defined(WITH_SPELL)
+LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
+.endif
+
 MAN1=		gajim.1 gajim-remote.1 gajim-history-manager.1
 
 pre-build:
--- gajim-0.15-gnomekeyring.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->rm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Mar 21 23:10:28 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166309 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/166309: commit references a PR
Date: Thu, 22 Mar 2012 07:07:22 +0000 (UTC)

 rm          2012-03-22 07:07:12 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/gajim         Makefile 
   Log:
   - depend on py-gnome-desktop conditionally (via option, default off)
   - bump PORTREVISION
   
   PR:             166309
   Submitted by:   Pierre Guinoiseau <pierre at guinoiseau dot eu>
   Suggested by:   David Thiel <lx at redundancy.redundancy dot org>
   Feature safe:   yes
   
   Revision  Changes    Path
   1.53      +13 -3     ports/net-im/gajim/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: rm 
State-Changed-When: Thu Mar 22 07:12:48 UTC 2012 
State-Changed-Why:  
Committed, thank you! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=166309 
>Unformatted:
