From 2fa61380496e158cafb2506ca3c5f1344dfe9418 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 8 Apr 2011 14:39:37 +0000 Subject: [PATCH] Update to nagstamon-0.9.5. Amongst other things: improved Icinga support (compatibility with Icinga 1.3) --- x11/nagstamon/Makefile | 11 +++--- x11/nagstamon/distinfo | 10 ++--- ...monConfig_py => patch-Nagstamon_Config_py} | 8 ++-- x11/nagstamon/patches/patch-setup_py | 14 +++---- x11/nagstamon/pkg/PLIST | 39 ++++++++++++++----- 5 files changed, 52 insertions(+), 30 deletions(-) rename x11/nagstamon/patches/{patch-Nagstamon_nagstamonConfig_py => patch-Nagstamon_Config_py} (69%) diff --git a/x11/nagstamon/Makefile b/x11/nagstamon/Makefile index 7384be7c3de..73dc79e7c6c 100755 --- a/x11/nagstamon/Makefile +++ b/x11/nagstamon/Makefile @@ -1,13 +1,11 @@ -# $OpenBSD: Makefile,v 1.2 2011/04/04 09:41:34 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2011/04/08 14:39:37 ajacoutot Exp $ COMMENT= nagios status monitor for the Desktop -MODPY_EGG_VERSION= 0.9.4 +MODPY_EGG_VERSION= 0.9.5 DISTNAME= nagstamon_${MODPY_EGG_VERSION} PKGNAME= ${DISTNAME:S/_/-/} -REVISION= 0 - CATEGORIES= x11 net/nagios HOMEPAGE= http://nagstamon.sourceforge.net/ @@ -32,6 +30,9 @@ RUN_DEPENDS= textproc/py-lxml \ NO_REGRESS= Yes pre-configure: - ${SUBST_CMD} ${WRKSRC}/Nagstamon/nagstamonConfig.py + ${SUBST_CMD} ${WRKSRC}/Nagstamon/Config.py + +post-install: + cd ${PREFIX}/bin && ln -s nagstamon.py nagstamon .include diff --git a/x11/nagstamon/distinfo b/x11/nagstamon/distinfo index af4314192b2..81e95a9e152 100644 --- a/x11/nagstamon/distinfo +++ b/x11/nagstamon/distinfo @@ -1,5 +1,5 @@ -MD5 (nagstamon_0.9.4.tar.gz) = Us2L/CgIbimoTsy2B+nOPA== -RMD160 (nagstamon_0.9.4.tar.gz) = tQPyUFSVM4K7euGCSzC8UJmIpRE= -SHA1 (nagstamon_0.9.4.tar.gz) = 6TjQ6lDMhje3Dzs05xAQSKITcN4= -SHA256 (nagstamon_0.9.4.tar.gz) = yuVU1DBk9W6ubiJEk/sA0oIp//K/dQUZ87XsXyVStrc= -SIZE (nagstamon_0.9.4.tar.gz) = 165591 +MD5 (nagstamon_0.9.5.tar.gz) = bNGqzoU868arSf39LWefFg== +RMD160 (nagstamon_0.9.5.tar.gz) = OY5yLgmM6ZeklnBCLMygeB+SCK8= +SHA1 (nagstamon_0.9.5.tar.gz) = pC4GOEZjtS3JBU+agK2l2BSzusI= +SHA256 (nagstamon_0.9.5.tar.gz) = OgnkBanFaLUhI/s+El4gS4eQSvTN7NtkBB80dbmxn9U= +SIZE (nagstamon_0.9.5.tar.gz) = 334271 diff --git a/x11/nagstamon/patches/patch-Nagstamon_nagstamonConfig_py b/x11/nagstamon/patches/patch-Nagstamon_Config_py similarity index 69% rename from x11/nagstamon/patches/patch-Nagstamon_nagstamonConfig_py rename to x11/nagstamon/patches/patch-Nagstamon_Config_py index 6b99b7fa050..b80fcd16be5 100644 --- a/x11/nagstamon/patches/patch-Nagstamon_nagstamonConfig_py +++ b/x11/nagstamon/patches/patch-Nagstamon_Config_py @@ -1,7 +1,7 @@ -$OpenBSD: patch-Nagstamon_nagstamonConfig_py,v 1.1.1.1 2011/04/01 11:29:26 ajacoutot Exp $ ---- Nagstamon/nagstamonConfig.py.orig Fri Apr 1 10:42:49 2011 -+++ Nagstamon/nagstamonConfig.py Fri Apr 1 10:44:24 2011 -@@ -76,9 +76,9 @@ class Config(object): +$OpenBSD: patch-Nagstamon_Config_py,v 1.1 2011/04/08 14:39:37 ajacoutot Exp $ +--- Nagstamon/Config.py.orig Fri Apr 8 16:31:25 2011 ++++ Nagstamon/Config.py Fri Apr 8 16:32:23 2011 +@@ -93,9 +93,9 @@ class Config(object): self.icon_in_systray = False else: # the Linux settings diff --git a/x11/nagstamon/patches/patch-setup_py b/x11/nagstamon/patches/patch-setup_py index a0515479013..9cf988477d4 100644 --- a/x11/nagstamon/patches/patch-setup_py +++ b/x11/nagstamon/patches/patch-setup_py @@ -1,10 +1,10 @@ -$OpenBSD: patch-setup_py,v 1.1.1.1 2011/04/01 11:29:26 ajacoutot Exp $ ---- setup.py.orig Fri Apr 1 10:32:35 2011 -+++ setup.py Fri Apr 1 10:32:44 2011 -@@ -50,6 +50,6 @@ setup(name = 'nagstamon', - scripts = ['Nagstamon/nagstamon'], - packages = ['Nagstamon'], - package_data = {'': ['resources/*']}, +$OpenBSD: patch-setup_py,v 1.2 2011/04/08 14:39:37 ajacoutot Exp $ +--- setup.py.orig Tue Apr 5 13:20:36 2011 ++++ setup.py Fri Apr 8 16:31:01 2011 +@@ -51,6 +51,6 @@ setup(name = 'nagstamon', + packages = ['Nagstamon', 'Nagstamon.Server'], + package_dir = {'Nagstamon':'Nagstamon'}, + package_data = {'Nagstamon':['resources/*']}, - data_files = [('%s/share/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1'])] + data_files = [('%s/man/man1' % sys.prefix, ['Nagstamon/resources/nagstamon.1'])] ) diff --git a/x11/nagstamon/pkg/PLIST b/x11/nagstamon/pkg/PLIST index d06fba8b884..d1eba064a05 100644 --- a/x11/nagstamon/pkg/PLIST +++ b/x11/nagstamon/pkg/PLIST @@ -1,16 +1,36 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2011/04/01 11:29:26 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.2 2011/04/08 14:39:37 ajacoutot Exp $ bin/nagstamon +bin/nagstamon.py lib/python${MODPY_VERSION}/site-packages/Nagstamon/ +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Actions.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Actions.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Config.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Config.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Custom.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Custom.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/GUI.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/GUI.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Objects.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Objects.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/ +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Centreon.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Centreon.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Generic.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Generic.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Icinga.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Icinga.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Multisite.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Multisite.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Nagios.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Nagios.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Ninja.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Ninja.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Opsview.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/Opsview.pyc +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/__init__.py +lib/python${MODPY_VERSION}/site-packages/Nagstamon/Server/__init__.pyc lib/python${MODPY_VERSION}/site-packages/Nagstamon/__init__.py lib/python${MODPY_VERSION}/site-packages/Nagstamon/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonActions.py -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonActions.pyc -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonConfig.py -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonConfig.pyc -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonGUI.py -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonGUI.pyc -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonObjects.py -lib/python${MODPY_VERSION}/site-packages/Nagstamon/nagstamonObjects.pyc lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/LICENSE lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/acknowledge_dialog.glade @@ -24,6 +44,7 @@ lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/hosts.svg lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagios.png lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagios.svg lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.1 +lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.icns lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.ico lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.png lib/python${MODPY_VERSION}/site-packages/Nagstamon/resources/nagstamon.svg