- Update to 0.9.10

PR:		111450
Submitted by:	Robin Gruyters <r.gruyters@yirdis.nl> (maintainer)

3 files changed, 27 insertions, 15 deletions

diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index 896eac3b6ebf..32b1818c7f82 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	prewikka
-PORTVERSION=	0.9.9
+PORTVERSION=	0.9.10
 CATEGORIES=	www security python
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -22,10 +22,21 @@ LIB_DEPENDS=	prelude.11:${PORTSDIR}/security/libprelude \
 USE_PYTHON=		2.3+
 USE_PYDISTUTILS=	yes
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=		yes
+PLIST_SUB+=		NLS=""
+.else
+PLIST_SUB+=		NLS="@comment "
+.endif
+
 post-patch:
 	${MV} ${WRKSRC}/conf/prewikka.conf ${WRKSRC}/conf/prewikka.conf-dist
 	${REINPLACE_CMD} 's,conf/prewikka.conf,conf/prewikka.conf-dist,' \
 	   ${WRKSRC}/setup.py
+.if defined(WITHOUT_NLS)
+	${REINPLACE_CMD} 's,\(.*self.data_files.extend(self._compile_po_files())\),#\1,' \
+	   ${WRKSRC}/setup.py
+.endif
 
 post-install:
 	@if [ ! -f ${PREFIX}/etc/prewikka/prewikka.conf ]; then \
diff --git a/www/py-prewikka/distinfo b/www/py-prewikka/distinfo
index b62c669fcb87..f7204f027929 100644
--- a/www/py-prewikka/distinfo
+++ b/www/py-prewikka/distinfo
@@ -1,3 +1,3 @@
-MD5 (prewikka-0.9.9.tar.gz) = c615fa14c2f887dab357146f4ab029f1
-SHA256 (prewikka-0.9.9.tar.gz) = 554078fd61ce26e7ef74ca37575f0afe95294f21a2e0aa84cf73acc5131ae3ec
-SIZE (prewikka-0.9.9.tar.gz) = 188355
+MD5 (prewikka-0.9.10.tar.gz) = e1f12a7753425365bd120dc386d9d9d3
+SHA256 (prewikka-0.9.10.tar.gz) = 480aa3d4b2b1517a42afd03e14867cd0358b74449f29eb25e5c17e94b0791f83
+SIZE (prewikka-0.9.10.tar.gz) = 210816
diff --git a/www/py-prewikka/pkg-plist b/www/py-prewikka/pkg-plist
index b4e6e393fa12..d038a6c9deb8 100644
--- a/www/py-prewikka/pkg-plist
+++ b/www/py-prewikka/pkg-plist
@@ -4,7 +4,6 @@ etc/prewikka/prewikka.conf-dist
 bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/Database.py
 %%PYTHON_SITELIBDIR%%/prewikka/User.py
-%%PYTHON_SITELIBDIR%%/prewikka/ParametersNormalizer.py
 %%PYTHON_SITELIBDIR%%/prewikka/Log.py
 %%PYTHON_SITELIBDIR%%/prewikka/Auth.py
 %%PYTHON_SITELIBDIR%%/prewikka/DataSet.py
@@ -12,6 +11,7 @@ bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/Core.py
 %%PYTHON_SITELIBDIR%%/prewikka/Request.py
 %%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.py
+%%PYTHON_SITELIBDIR%%/prewikka/locale.py
 %%PYTHON_SITELIBDIR%%/prewikka/view.py
 %%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.py
 %%PYTHON_SITELIBDIR%%/prewikka/Config.py
@@ -23,34 +23,34 @@ bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/utils.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/commands.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/filter.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagesummary.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/misc.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagelisting.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/sensor.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/__init__.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagedetails.py
 %%PYTHON_SITELIBDIR%%/prewikka/views/commands.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/filter.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagesummary.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/misc.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagelisting.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/sensor.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/__init__.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagedetails.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/commands.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/filter.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagesummary.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/misc.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagelisting.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.py
-%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.py
-%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/sensor.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/__init__.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/views/messagedetails.pyo
@@ -139,15 +139,15 @@ bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Database.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/User.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/ParametersNormalizer.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/Log.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/User.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/Auth.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/DataSet.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/IDMEFDatabase.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/Core.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/Request.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/locale.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/view.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/Config.pyc
@@ -159,7 +159,6 @@ bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/utils.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/Database.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/User.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/ParametersNormalizer.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Log.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Auth.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/DataSet.pyo
@@ -167,6 +166,7 @@ bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/Core.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Request.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/locale.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/view.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Config.pyo
@@ -176,6 +176,7 @@ bin/prewikka-httpd
 %%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/siteconfig.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/utils.pyo
+%%NLS%%share/locale/fr/LC_MESSAGES/prewikka.mo
 %%DATADIR%%/cgi-bin/prewikka.cgi
 %%DATADIR%%/htdocs/images/prelude-logo.gif
 %%DATADIR%%/htdocs/images/prelude-logo.png
@@ -190,13 +191,13 @@ bin/prewikka-httpd
 %%DATADIR%%/htdocs/images/led_Y.gif
 %%DATADIR%%/htdocs/css/style.css
 %%DATADIR%%/htdocs/js/functions.js
-%%DATADIR%%/database/mysql2pgsql.sh
 %%DATADIR%%/database/sqlite.sql
 %%DATADIR%%/database/mysql-update-0.9.1.sql
 %%DATADIR%%/database/pgsql.sql
 %%DATADIR%%/database/pgsql-update-0.9.1.sql
 %%DATADIR%%/database/mysql.sql
 %%DATADIR%%/database/mysql2sqlite.sh
+%%DATADIR%%/database/mysql2pgsql.sh
 @dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi
 @dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword
 @dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth