From b9068bb0d082a711093be04213c17b2e4d449dbe Mon Sep 17 00:00:00 2001 From: jasper Date: Mon, 27 Oct 2008 00:04:23 +0000 Subject: [PATCH] - update telepathy-butterfly to 0.3.2 with help from landry@ and upstream waf, thanks! feedback and ok ajacoutot@ --- net/telepathy/telepathy-butterfly/Makefile | 12 +--- net/telepathy/telepathy-butterfly/distinfo | 10 +-- .../patches/patch-setup_py | 11 ---- .../telepathy-butterfly/patches/patch-wscript | 19 ++++++ net/telepathy/telepathy-butterfly/pkg/PLIST | 63 ++++++++++++++----- 5 files changed, 74 insertions(+), 41 deletions(-) delete mode 100644 net/telepathy/telepathy-butterfly/patches/patch-setup_py create mode 100644 net/telepathy/telepathy-butterfly/patches/patch-wscript diff --git a/net/telepathy/telepathy-butterfly/Makefile b/net/telepathy/telepathy-butterfly/Makefile index 8549272a670..7f3a54f5e12 100644 --- a/net/telepathy/telepathy-butterfly/Makefile +++ b/net/telepathy/telepathy-butterfly/Makefile @@ -1,22 +1,16 @@ -# $OpenBSD: Makefile,v 1.3 2008/01/01 22:28:10 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2008/10/27 00:04:23 jasper Exp $ COMMENT= flexible communications framework, MSN component -DISTNAME= telepathy-butterfly-0.1.4 -PKGNAME= ${DISTNAME}p0 +DISTNAME= telepathy-butterfly-0.3.2 MASTER_SITES= ${MASTER_SITES_TELEPATHY:=telepathy-butterfly/} -MODULES= lang/python +MODULES= devel/waf BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::net/telepathy/telepathy-python NO_REGRESS= Yes -post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/dbus-1/services - ${INSTALL_DATA} ${WRKSRC}/data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service \ - ${PREFIX}/share/dbus-1/services - .include diff --git a/net/telepathy/telepathy-butterfly/distinfo b/net/telepathy/telepathy-butterfly/distinfo index cbab802cf21..c752694ef41 100644 --- a/net/telepathy/telepathy-butterfly/distinfo +++ b/net/telepathy/telepathy-butterfly/distinfo @@ -1,5 +1,5 @@ -MD5 (telepathy-butterfly-0.1.4.tar.gz) = H3zbvdRahWlZMYObM71oYw== -RMD160 (telepathy-butterfly-0.1.4.tar.gz) = EOOluEw8sXpa1oxCaOqF3BqaVj0= -SHA1 (telepathy-butterfly-0.1.4.tar.gz) = hq6+8B3z+Nr+y6pPd91R90udGQg= -SHA256 (telepathy-butterfly-0.1.4.tar.gz) = xMru1vEeQwAIoCWsMlFTOPegRYlFapmv5GAiqUNDRh4= -SIZE (telepathy-butterfly-0.1.4.tar.gz) = 15582 +MD5 (telepathy-butterfly-0.3.2.tar.gz) = 8dsw3iXa84KqPptbjv7NcA== +RMD160 (telepathy-butterfly-0.3.2.tar.gz) = nOzm/0ZMD73ofo/vCq53BDNM13o= +SHA1 (telepathy-butterfly-0.3.2.tar.gz) = 4nGKKNBsi04wff/Uwz2NX/LBkM4= +SHA256 (telepathy-butterfly-0.3.2.tar.gz) = sfcKbpgEeVcjWazZ3qx4M+XI8aLmC1oi2sySsTvR+Bk= +SIZE (telepathy-butterfly-0.3.2.tar.gz) = 121806 diff --git a/net/telepathy/telepathy-butterfly/patches/patch-setup_py b/net/telepathy/telepathy-butterfly/patches/patch-setup_py deleted file mode 100644 index 59ccec59096..00000000000 --- a/net/telepathy/telepathy-butterfly/patches/patch-setup_py +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-setup_py,v 1.1.1.1 2007/10/27 16:18:54 jasper Exp $ ---- setup.py.orig Fri Oct 12 18:38:54 2007 -+++ setup.py Fri Oct 12 18:39:00 2007 -@@ -44,7 +44,6 @@ setup(name=NAME, - packages=['TelepathyButterfly'], - scripts=['telepathy-butterfly'], - data_files=[ -- (dbus_service_dir, ['data/org.freedesktop.Telepathy.ConnectionManager.butterfly.service']), - (telepathy_manager_dir, ['data/butterfly.manager']) - ], - classifiers=[ diff --git a/net/telepathy/telepathy-butterfly/patches/patch-wscript b/net/telepathy/telepathy-butterfly/patches/patch-wscript new file mode 100644 index 00000000000..be467d899bd --- /dev/null +++ b/net/telepathy/telepathy-butterfly/patches/patch-wscript @@ -0,0 +1,19 @@ +$OpenBSD: patch-wscript,v 1.1 2008/10/27 00:04:23 jasper Exp $ +--- wscript.orig Mon Oct 27 00:12:33 2008 ++++ wscript Mon Oct 27 00:13:15 2008 +@@ -15,12 +15,15 @@ Scripting.g_excludes.extend(['pymsn', 'telepathy', 'di + def set_options(opt): + opt.tool_options('python') + opt.tool_options('gnu_dirs', 'tools') ++ opt.tool_options ('compiler_cc') + + def configure(conf): + conf.check_tool('python misc') + conf.check_tool('gnu_dirs', 'tools') + + conf.check_python_version() ++ ++ conf.check_tool ('compiler_cc') + + conf.define('VERSION', VERSION) + conf.define('PACKAGE', APPNAME) diff --git a/net/telepathy/telepathy-butterfly/pkg/PLIST b/net/telepathy/telepathy-butterfly/pkg/PLIST index 5ba934025b0..6adab01d9eb 100644 --- a/net/telepathy/telepathy-butterfly/pkg/PLIST +++ b/net/telepathy/telepathy-butterfly/pkg/PLIST @@ -1,19 +1,50 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2007/10/27 16:18:54 jasper Exp $ -bin/telepathy-butterfly -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/ -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/__init__.py -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/connection.py -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/connection.pyc -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/connmgr.py -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/connmgr.pyc -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/contacts.py -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/contacts.pyc -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/conversation.py -lib/python${MODPY_VERSION}/site-packages/TelepathyButterfly/conversation.pyc -lib/python${MODPY_VERSION}/site-packages/telepathy_butterfly-0.1.4-py${MODPY_VERSION}.egg-info -share/dbus-1/ -share/dbus-1/services/ +@comment $OpenBSD: PLIST,v 1.2 2008/10/27 00:04:23 jasper Exp $ +lib/python${MODPY_VERSION}/site-packages/butterfly/ +lib/python${MODPY_VERSION}/site-packages/butterfly/__init__.py +lib/python${MODPY_VERSION}/site-packages/butterfly/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/aliasing.py +lib/python${MODPY_VERSION}/site-packages/butterfly/aliasing.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/aliasing.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/avatars.py +lib/python${MODPY_VERSION}/site-packages/butterfly/avatars.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/avatars.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/ +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/__init__.py +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/contact_list.py +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/contact_list.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/contact_list.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/group.py +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/group.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/group.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/text.py +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/text.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/channel/text.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/channel_manager.py +lib/python${MODPY_VERSION}/site-packages/butterfly/channel_manager.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/channel_manager.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/connection.py +lib/python${MODPY_VERSION}/site-packages/butterfly/connection.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/connection.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/connection_manager.py +lib/python${MODPY_VERSION}/site-packages/butterfly/connection_manager.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/connection_manager.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/handle.py +lib/python${MODPY_VERSION}/site-packages/butterfly/handle.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/handle.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/presence.py +lib/python${MODPY_VERSION}/site-packages/butterfly/presence.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/presence.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/util/ +lib/python${MODPY_VERSION}/site-packages/butterfly/util/__init__.py +lib/python${MODPY_VERSION}/site-packages/butterfly/util/__init__.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/util/__init__.pyo +lib/python${MODPY_VERSION}/site-packages/butterfly/util/decorator.py +lib/python${MODPY_VERSION}/site-packages/butterfly/util/decorator.pyc +lib/python${MODPY_VERSION}/site-packages/butterfly/util/decorator.pyo +libexec/telepathy-butterfly share/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.butterfly.service share/telepathy/ share/telepathy/managers/