From nobody@FreeBSD.org  Sun Feb 10 18:56:23 2008
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36F6216A420
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Feb 2008 18:56:23 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 422AD13C457
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Feb 2008 18:56:23 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.2/8.14.2) with ESMTP id m1AIsB0N066542
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 10 Feb 2008 18:54:11 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.2/8.14.1/Submit) id m1AIsBeB066541;
	Sun, 10 Feb 2008 18:54:11 GMT
	(envelope-from nobody)
Message-Id: <200802101854.m1AIsBeB066541@www.freebsd.org>
Date: Sun, 10 Feb 2008 18:54:11 GMT
From: Amaury Gauthier <amauryamaury@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] compile port net-im/gajim without dbus
X-Send-Pr-Version: www-3.1
X-GNATS-Notify: dsh@vlink.ru

>Number:         120509
>Category:       ports
>Synopsis:       [patch] compile port net-im/gajim without dbus
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    lx
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Feb 10 19:00:07 UTC 2008
>Closed-Date:    Mon Feb 18 01:24:10 UTC 2008
>Last-Modified:  Mon Feb 18 01:30:01 UTC 2008
>Originator:     Amaury Gauthier
>Release:        FreeBSD 7.0-PRERELEASE i386
>Organization:
>Environment:
FreeBSD kiki.captainpatate.info.local 7.0-PRERELEASE FreeBSD 7.0-PRERELEASE #10: Mon Feb 4 17:38:50 CET 2008 amaury@kiki.captainpatate.info.local:/usr/obj/usr/src/sys/KIKI i386
>Description:
I use the Gajim jabber client on my FreeBSD system. But, I don't want
install dbus. So I made a patch to compile gajim port without it. The
file 'files/patch-data-Makefile.am' comes from the gajim development
branch (see at http://trac.gajim.org/changeset/9258).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN gajim.orig/Makefile gajim/Makefile
--- gajim.orig/Makefile	2007-12-14 01:00:56.000000000 +0100
+++ gajim/Makefile	2008-01-22 18:41:44.000000000 +0100
@@ -14,10 +14,8 @@
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	Gajim is a Jabber client based on a plugin system
 
-BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	gtkspell.0:${PORTSDIR}/textproc/gtkspell
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl \
-		${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenSSL/SSL.so:${PORTSDIR}/security/py-openssl
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
@@ -37,7 +35,18 @@
 PLIST_SUB+=	NLS="@comment "
 .endif
 
-MAN1=		gajim.1 gajim-remote.1
+MAN1=		gajim.1
+
+.if !defined(WITHOUT_DBUS)
+BUILD_DEPENDS=      ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
+RUN_DEPENDS+=       ${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:${PORTSDIR}/devel/py-dbus
+CONFIGURE_ARGS+=    --enable-remote
+MAN1+=              gajim-remote.1
+PLIST_SUB+=         DBUS=""
+.else
+CONFIGURE_ARGS+=    --disable-remote
+PLIST_SUB+=         DBUS="@comment "
+.endif
 
 EMOTICONS=	animated static static-big
 ICONSETS=	crystal dcraven gnome goojim gossip gota jabberbulb nuvola \
diff -ruN gajim.orig/files/patch-data-Makefile.am gajim/files/patch-data-Makefile.am
--- gajim.orig/files/patch-data-Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ gajim/files/patch-data-Makefile.am	2008-01-22 19:34:18.000000000 +0100
@@ -0,0 +1,17 @@
+--- data/Makefile.am.orig	2008-01-22 19:21:15.000000000 +0100
++++ data/Makefile.am	2008-01-22 19:22:36.000000000 +0100
+@@ -14,7 +14,13 @@
+ otherdir = $(pkgdatadir)/data/other
+ other_DATA = other/servers.xml
+ 
+-man_MANS = gajim.1 gajim-remote.1
++if BUILD_REMOTE_CONTROL
++OPTIONAL_MAN = gajim-remote.1
++else
++OPTIONAL_MAN =
++endif
++
++man_MANS = gajim.1 $(OPTIONAL_MAN)
+ 
+ 
+ EXTRA_DIST = $(desktop_in_files) \
diff -ruN gajim.orig/files/patch-data-Makefile.in gajim/files/patch-data-Makefile.in
--- gajim.orig/files/patch-data-Makefile.in	2007-02-13 13:56:40.000000000 +0100
+++ gajim/files/patch-data-Makefile.in	2008-02-03 16:23:17.000000000 +0100
@@ -9,3 +9,14 @@
  desktopdir = $(datadir)/applications
  desktop_in_files = gajim.desktop.in.in 
  desktop_DATA = $(desktop_in_files:.desktop.in.in=.desktop)
+@@ -267,7 +267,9 @@
+ sounds_DATA = $(srcdir)/sounds/*.wav
+ otherdir = $(pkgdatadir)/data/other
+ other_DATA = other/servers.xml
+-man_MANS = gajim.1 gajim-remote.1
++@BUILD_REMOTE_CONTROL_FALSE@OPTIONAL_MAN = 
++@BUILD_REMOTE_CONTROL_TRUE@OPTIONAL_MAN = gajim-remote.1
++man_MANS = gajim.1 $(OPTIONAL_MAN)
+ EXTRA_DIST = $(desktop_in_files) \
+             $(sounds_DATA) \
+             $(other_DATA) \
diff -ruN gajim.orig/pkg-plist gajim/pkg-plist
--- gajim.orig/pkg-plist	2007-12-14 01:00:56.000000000 +0100
+++ gajim/pkg-plist	2008-01-22 18:37:55.000000000 +0100
@@ -1,5 +1,5 @@
 bin/gajim
-bin/gajim-remote
+%%DBUS%%bin/gajim-remote
 lib/gajim/gtkspell.la
 lib/gajim/gtkspell.so
 lib/gajim/idle.la


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sun Feb 10 19:00:14 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Denis Shaposhnikov <dsh@wizard.volgograd.ru>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/120509: [patch] compile port net-im/gajim without dbus
Date: Mon, 11 Feb 2008 18:34:35 +0300

 Hello,
 
 On Sun, 10 Feb 2008 19:00:13 UT
 Edwin Groothuis <edwin@FreeBSD.org> wrote:
 
 > Please note that PR ports/120509 has just been submitted.
 
 Thank you! I approve the patch.
 
 -- 
 DSS5-RIPE DSS-RIPN mailto:dsh@wizard.volgograd.ru xmpp:dsh@vlink.ru
 http://wizard.volgograd.ru/ 2:550/5068@fidonet 2:550/5069@fidonet
State-Changed-From-To: feedback->open 
State-Changed-By: linimon 
State-Changed-When: Tue Feb 12 09:31:01 UTC 2008 
State-Changed-Why:  
Maintainer approved. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=120509 
Responsible-Changed-From-To: freebsd-ports-bugs->lx 
Responsible-Changed-By: lx 
Responsible-Changed-When: Mon Feb 18 01:20:38 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=120509 
State-Changed-From-To: open->closed 
State-Changed-By: lx 
State-Changed-When: Mon Feb 18 01:23:35 UTC 2008 
State-Changed-Why:  
Committed, thanks. 


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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/120509: commit references a PR
Date: Mon, 18 Feb 2008 01:23:28 +0000 (UTC)

 lx          2008-02-18 01:23:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net-im/gajim         Makefile pkg-plist 
     net-im/gajim/files   patch-data-Makefile.in 
   Log:
   Allow build without DBUS.
   
   PR:             ports/120509
   Submitted by:   Amaury Gauthier <amauryamaury@gmail.com>
   Approved by:    Denis Shaposhnikov <dsh@wizard.volgograd.ru> (maintainer)
   
   Revision  Changes    Path
   1.27      +13 -4     ports/net-im/gajim/Makefile
   1.2       +11 -0     ports/net-im/gajim/files/patch-data-Makefile.in
   1.19      +1 -1      ports/net-im/gajim/pkg-plist
 _______________________________________________
 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"
 
>Unformatted:
