Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 22 Mar 2012 00:00:26 +0100 (CET)
From:      Pierre Guinoiseau <pierre@guinoiseau.eu>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/166309: [patch] net-im/gajim: make gnomekeyring and gtkspell support optional
Message-ID:  <20120321230026.CC02DA97@alderaan.home.poildetroll.net>
Resent-Message-ID: <201203212310.q2LNAEot052396@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         166309
>Category:       ports
>Synopsis:       [patch] net-im/gajim: make gnomekeyring and gtkspell support optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Mar 21 23:10:14 UTC 2012
>Closed-Date:
>Last-Modified:
>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:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120321230026.CC02DA97>