[pkgsrc/pkgsrc-2017Q1]: pkgsrc/chat/gajim Pullup ticket #5258 - requested by ...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf2fa6f9cf79
branches:  pkgsrc-2017Q1
changeset: 360263:bf2fa6f9cf79
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Mon Apr 17 14:39:44 2017 +0000

description:
Pullup ticket #5258 - requested by sevan
chat/gajim: build fix

Revisions pulled up:
- chat/gajim/Makefile                                           1.34
- chat/gajim/options.mk                                         1.9

---
   Module Name:    pkgsrc
   Committed By:   riastradh
   Date:           Sat Apr  8 18:08:53 UTC 2017

   Modified Files:
           pkgsrc/chat/gajim: Makefile options.mk

   Log Message:
   dbus is optional in gajim.

diffstat:

 chat/gajim/Makefile   |   3 +--
 chat/gajim/options.mk |  11 ++++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 8d1568f54fe5 -r bf2fa6f9cf79 chat/gajim/Makefile
--- a/chat/gajim/Makefile       Sun Apr 16 15:40:01 2017 +0000
+++ b/chat/gajim/Makefile       Mon Apr 17 14:39:44 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2017/02/12 06:25:07 ryoon Exp $
+# $NetBSD: Makefile,v 1.33.2.1 2017/04/17 14:39:44 bsiegert Exp $
 
 DISTNAME=      gajim-0.15
 PKGREVISION=   16
@@ -12,7 +12,6 @@
 LICENSE=       gnu-gpl-v3
 
 DEPENDS=       ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
-DEPENDS=       ${PYPKGPREFIX}-dbus>=0.81:../../sysutils/py-dbus
 DEPENDS=       ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 
 PYTHON_VERSIONS_INCOMPATIBLE=  34 35 36 # py-gtk2
diff -r 8d1568f54fe5 -r bf2fa6f9cf79 chat/gajim/options.mk
--- a/chat/gajim/options.mk     Sun Apr 16 15:40:01 2017 +0000
+++ b/chat/gajim/options.mk     Mon Apr 17 14:39:44 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.8 2017/01/01 14:43:25 wiz Exp $
+# $NetBSD: options.mk,v 1.8.2.1 2017/04/17 14:39:44 bsiegert Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gajim
-PKG_SUPPORTED_OPTIONS= avahi gnome gnome-keyring ssl
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUPPORTED_OPTIONS= avahi dbus gnome gnome-keyring ssl
+PKG_SUGGESTED_OPTIONS= dbus ssl
 
 .include "../../mk/bsd.options.mk"
 
@@ -27,3 +27,8 @@
 .if !empty(PKG_OPTIONS:Mgnome-keyring)
 DEPENDS+=      ${PYPKGPREFIX}-gnome2-desktop-[0-9]*:../../x11/py-gnome2-desktop
 .endif
+
+# dbus
+.if !empty(PKG_OPTIONS:Mdbus)
+DEPENDS=       ${PYPKGPREFIX}-dbus>=0.81:../../sysutils/py-dbus
+.endif