diff options
| author | obache <obache@pkgsrc.org> | 2011-05-14 14:28:07 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-05-14 14:28:07 +0000 |
| commit | da5f183324f152272a553063413ec75009cd65e2 (patch) | |
| tree | b01aab4085dd9a95e8e3965eb0d71f65e2631965 /chat | |
| parent | 45f32fbe33ddd69b7310ae9bd4468edc90f662a9 (diff) | |
| download | pkgsrc-da5f183324f152272a553063413ec75009cd65e2.tar.gz | |
* convert almost python related dependency from buildlink to simple DEPENDS.
* require python builtin sqlite3 module, PR#44968.
* require python>=25.
* drop avahi option from suggested. it require avahi-python, but python option
of net/avahi is disabled by default.
Bump PKGREVISION.
Diffstat (limited to 'chat')
| -rw-r--r-- | chat/gajim/Makefile | 10 | ||||
| -rw-r--r-- | chat/gajim/options.mk | 16 |
2 files changed, 14 insertions, 12 deletions
diff --git a/chat/gajim/Makefile b/chat/gajim/Makefile index 279303b7086..486b53f8069 100644 --- a/chat/gajim/Makefile +++ b/chat/gajim/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2011/04/22 13:43:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2011/05/14 14:28:07 obache Exp $ # DISTNAME= gajim-0.14.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= chat python MASTER_SITES= http://www.gajim.org/downloads/0.14/ EXTRACT_SUFX= .tar.bz2 @@ -13,7 +13,8 @@ COMMENT= Jabber client written in PyGTK LICENSE= gnu-gpl-v3 DEPENDS= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat -DEPENDS= ${PYPKGPREFIX}-dbus-[0-9]*:../../sysutils/py-dbus +DEPENDS= ${PYPKGPREFIX}-dbus>=0.81:../../sysutils/py-dbus +DEPENDS= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 PKG_DESTDIR_SUPPORT= user-destdir @@ -22,9 +23,10 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_TOOLS+= gmake intltool pkg-config GNU_CONFIGURE= yes +PYTHON_VERSIONS_ACCEPTED= 27 26 25 + .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" -.include "../../databases/py-sqlite2/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/libXScrnSaver/buildlink3.mk" .include "../../x11/py-gtk2/buildlink3.mk" diff --git a/chat/gajim/options.mk b/chat/gajim/options.mk index a15497c778b..8f65b2ab577 100644 --- a/chat/gajim/options.mk +++ b/chat/gajim/options.mk @@ -1,28 +1,28 @@ -# $NetBSD: options.mk,v 1.1.1.1 2010/12/24 00:02:29 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2011/05/14 14:28:07 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gajim PKG_SUPPORTED_OPTIONS= avahi gnome gnome-keyring ssl -PKG_SUGGESTED_OPTIONS= avahi ssl +PKG_SUGGESTED_OPTIONS= ssl .include "../../mk/bsd.options.mk" # ssl .if !empty(PKG_OPTIONS:Mssl) -DEPENDS+= ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL -.include "../../security/py-amkCrypto/buildlink3.mk" +DEPENDS+= ${PYPKGPREFIX}-OpenSSL>=0.9:../../security/py-OpenSSL +DEPENDS+= ${PYPKGPREFIX}-amkCrypto-[0-9]*:../../security/py-amkCrypto .endif # avahi .if !empty(PKG_OPTIONS:Mavahi) -.include "../../net/avahi/buildlink3.mk" +DEPENDS+= avahi-[0-9]*:../../net/avahi .endif # gnome .if !empty(PKG_OPTIONS:Mgnome) -.include "../../x11/py-gnome2/buildlink3.mk" +DEPENDS+= ${PYPKGPREFIX}-gnome2-[0-9]*:../../x11/py-gnome2 .endif -# avahi +# gnome-keyring .if !empty(PKG_OPTIONS:Mgnome-keyring) -.include "../../x11/py-gnome2-desktop/buildlink3.mk" +DEPENDS+= ${PYPKGPREFIX}-gnome2-desktop-[0-9]*:../../x11/py-gnome2-desktop .endif |