summaryrefslogtreecommitdiff
path: root/chat/gajim
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2014-01-25 10:29:56 +0000
committerwiz <wiz@pkgsrc.org>2014-01-25 10:29:56 +0000
commit4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8 (patch)
tree3bbaa4e1a32886abb417eed9e3a6c4c742388c9a /chat/gajim
parentda96a0b73ccce3895e3b718798083bf1740293d8 (diff)
downloadpkgsrc-4fc0b0ed6a186ccd83fc93c34cc9ed91862930d8.tar.gz
Mark packages as not ready for python-3.x where applicable;
either because they themselves are not ready or because a dependency isn't. This is annotated by PYTHON_VERSIONS_INCOMPATIBLE= 33 # not yet ported as of x.y.z or PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-foo, py-bar respectively, please use the same style for other packages, and check during updates. Use versioned_dependencies.mk where applicable. Use REPLACE_PYTHON instead of handcoded alternatives, where applicable. Reorder Makefile sections into standard order, where applicable. Remove PYTHON_VERSIONS_INCLUDE_3X lines since that will be default with the next commit. Whitespace cleanups and other nits corrected, where necessary.
Diffstat (limited to 'chat/gajim')
-rw-r--r--chat/gajim/Makefile5
-rw-r--r--chat/gajim/options.mk3
2 files changed, 5 insertions, 3 deletions
diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile
index a3e6c13c3ec..71574cee484 100644
--- a/chat/gajim/Makefile
+++ b/chat/gajim/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2013/10/10 14:42:02 ryoon Exp $
-#
+# $NetBSD: Makefile,v 1.24 2014/01/25 10:29:57 wiz Exp $
DISTNAME= gajim-0.15
PKGREVISION= 11
@@ -16,6 +15,8 @@ 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= 33 # py-gtk2
+
.include "options.mk"
USE_TOOLS+= gmake intltool pkg-config msgfmt
diff --git a/chat/gajim/options.mk b/chat/gajim/options.mk
index e849e3851fa..8c7381280ba 100644
--- a/chat/gajim/options.mk
+++ b/chat/gajim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2012/04/17 20:57:09 gls Exp $
+# $NetBSD: options.mk,v 1.4 2014/01/25 10:29:57 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.gajim
PKG_SUPPORTED_OPTIONS= avahi gnome gnome-keyring ssl
@@ -20,6 +20,7 @@ DEPENDS+= avahi-[0-9]*:../../net/avahi
# gnome
.if !empty(PKG_OPTIONS:Mgnome)
DEPENDS+= ${PYPKGPREFIX}-gnome2-[0-9]*:../../x11/py-gnome2
+PYTHON_VERSIONS_INCOMPATIBLE= 33 # py-ORBit via py-gnome2
.endif
# gnome-keyring