ports/120509: [patch] compile port net-im/gajim without dbus
Amaury Gauthier
amauryamaury at gmail.com
Sun Feb 10 19:00:07 UTC 2008
>Number: 120509
>Category: ports
>Synopsis: [patch] compile port net-im/gajim without dbus
>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: Sun Feb 10 19:00:07 UTC 2008
>Closed-Date:
>Last-Modified:
>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 at 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 at 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
++ at BUILD_REMOTE_CONTROL_FALSE@OPTIONAL_MAN =
++ at 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:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list