3 files changed, 43 insertions, 41 deletions

diff --git a/net-mgmt/nagstamon/Makefile b/net-mgmt/nagstamon/Makefile
index ba31c63fa8d5..acab8a9e5e8b 100644
--- a/net-mgmt/nagstamon/Makefile
+++ b/net-mgmt/nagstamon/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	nagstamon
-PORTVERSION=	0.9.6.1
+PORTVERSION=	0.9.7
 CATEGORIES=	net-mgmt python
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}/ CRITICAL/.
+MASTER_SITES=	SF/nagstamon/nagstamon/SVN/ CRITICAL/.
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
@@ -28,10 +28,10 @@ MAN1=		nagstamon.1
 
 MAKE_JOBS_SAFE=	yes
 
+WRKSRC=		${WRKDIR}/Nagstamon
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/\(man/man1\)|\1|' ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e "s|0.9.6|${PORTVERSION}|" \
-		${WRKSRC}/Nagstamon/GUI.py
 
 post-install:
 	@${LN} ${PREFIX}/bin/${PORTNAME}.py ${PREFIX}/bin/${PORTNAME}
diff --git a/net-mgmt/nagstamon/distinfo b/net-mgmt/nagstamon/distinfo
index 077dd06dd0d3..9f50019284a3 100644
--- a/net-mgmt/nagstamon/distinfo
+++ b/net-mgmt/nagstamon/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nagstamon_0.9.6.1.tar.gz) = 18efbe457072b1152040491f31ef4bdf87488ac9f629e0235b3c2cac2846511b
-SIZE (nagstamon_0.9.6.1.tar.gz) = 365786
+SHA256 (nagstamon_0.9.7.tar.gz) = af8de6bfecc95d5ab18ada5205d8c08fe3d88d24a75b4ffbdcf032f679f83e75
+SIZE (nagstamon_0.9.7.tar.gz) = 376194
diff --git a/net-mgmt/nagstamon/pkg-plist b/net-mgmt/nagstamon/pkg-plist
index 462183d24580..e2b4002e0c13 100644
--- a/net-mgmt/nagstamon/pkg-plist
+++ b/net-mgmt/nagstamon/pkg-plist
@@ -1,43 +1,55 @@
 bin/nagstamon
 bin/nagstamon.py
 %%PYTHON_SITELIBDIR%%/Nagstamon/Actions.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Actions.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/Actions.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/BeautifulSoup.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/BeautifulSoup.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/BeautifulSoup.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/Config.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Config.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/Config.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/Custom.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Custom.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/Custom.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/GUI.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/GUI.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/GUI.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/Objects.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/__init__.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Objects.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/Objects.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Centreon.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Icinga.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Multisite.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Nagios.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Ninja.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Opsview.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/__init__.py
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Generic.py
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Centreon.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Icinga.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Multisite.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Nagios.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Ninja.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Opsview.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Generic.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Centreon.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Generic.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Generic.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Generic.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Icinga.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Icinga.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Icinga.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Multisite.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Multisite.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Multisite.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Nagios.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Nagios.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Nagios.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Ninja.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Ninja.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Ninja.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Opsview.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Opsview.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/Opsview.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/__init__.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/Server/__init__.pyc
 %%PYTHON_SITELIBDIR%%/Nagstamon/Server/__init__.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/Server/Generic.pyo
+%%PYTHON_SITELIBDIR%%/Nagstamon/__init__.py
+%%PYTHON_SITELIBDIR%%/Nagstamon/__init__.pyc
+%%PYTHON_SITELIBDIR%%/Nagstamon/__init__.pyo
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/LICENSE
-%%PYTHON_SITELIBDIR%%/Nagstamon/resources/acknowledge_dialog.glade
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/acknowledge_dialog.ui
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/close.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/close.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/critical.wav
-%%PYTHON_SITELIBDIR%%/Nagstamon/resources/downtime_dialog.glade
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/downtime_dialog.ui
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/hostdown.wav
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/hosts.png
@@ -45,12 +57,12 @@ bin/nagstamon.py
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagios.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagios.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon.1
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon.desktop
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon.icns
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon.ico
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_acknowledged.png
-%%PYTHON_SITELIBDIR%%/Nagstamon/resources/recheckall.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_acknowledged.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_black.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_black.svg
@@ -60,18 +72,23 @@ bin/nagstamon.py
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_downtime.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_error.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_error.svg
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_flapping.png
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_flapping.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_green.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_green.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_label.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_label.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_orange.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_orange.svg
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_passive.png
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_passive.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_red.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_red.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_small.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_small.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_yellow.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/nagstamon_yellow.svg
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/recheckall.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/recheckall.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/refresh.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/refresh.svg
@@ -79,25 +96,10 @@ bin/nagstamon.py
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/services.svg
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/settings.png
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/settings.svg
-%%PYTHON_SITELIBDIR%%/Nagstamon/resources/settings_dialog.glade
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/settings_dialog.ui
-%%PYTHON_SITELIBDIR%%/Nagstamon/resources/settings_server_dialog.glade
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/settings_server_dialog.ui
+%%PYTHON_SITELIBDIR%%/Nagstamon/resources/submit_check_result_dialog.ui
 %%PYTHON_SITELIBDIR%%/Nagstamon/resources/warning.wav
-%%PYTHON_SITELIBDIR%%/Nagstamon/Actions.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/BeautifulSoup.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Config.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Custom.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/GUI.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Objects.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/__init__.pyc
-%%PYTHON_SITELIBDIR%%/Nagstamon/Actions.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/BeautifulSoup.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/Config.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/Custom.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/GUI.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/Objects.pyo
-%%PYTHON_SITELIBDIR%%/Nagstamon/__init__.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/Nagstamon/resources
 @dirrm %%PYTHON_SITELIBDIR%%/Nagstamon/Server
 @dirrm %%PYTHON_SITELIBDIR%%/Nagstamon