Update Prelude-IDS ports to 1.0.1 release

security/libprelude:
- Remove BROKEN, update to version 1.0.1 [1]
- Add missing deps, port requires pkg-config during build

security/libpreludedb:
- Update to version 1.0.1p1
- Add missing deps
- Make options deterministic and not dependent on what's installed

security/prelude-lml:
- Update to version 1.0.1
- Add missing deps, port requires pkg-config during build
- Convert to OptionsNG

security/prelude-manager:
- Update to version 1.0.2
- Add missing deps, port requires pkg-config during build
- Convert to OptionsNG, remove PRELUDEDB option - it can't be turned off
  by CONFIGURE_ARGS, package links to preludedb at all times if available

security/pflogger:
- Bump PORTREVISION, libprelude ABI version changed

www/py-prewikka:
- Update to version 1.0.1p1
- Convert to OptionsNG
- Sort plist

PR:		172056 [1]
Submitted by:	KATO Tsuguru <tkato432@yahoo.com> [1]

18 files changed, 416 insertions, 382 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 310fd35726cb..24f04a352ed9 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -2,27 +2,36 @@
 # $FreeBSD$
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.24.1
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.prelude-technologies.com/download/releases/${PORTNAME}/
+MASTER_SITES=	https://www.prelude-ids.org/attachments/download/241/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework library for Prelude NIDS
 
-LIB_DEPENDS=	gnutls.47:${PORTSDIR}/security/gnutls \
-		gcrypt.18:${PORTSDIR}/security/libgcrypt
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
+		gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		nettle:${PORTSDIR}/security/nettle \
+		p11-kit:${PORTSDIR}/security/p11-kit
 
 OPTIONS_DEFINE=	PERL PYTHON DOCS
 
-BROKEN=		does not configure
-
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
+USE_AUTOTOOLS=	libtool libltdl
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--enable-gtk-doc=no \
 		--with-html-dir=${PREFIX}/share/doc
+USE_GMAKE=	yes
+USE_PKGCONFIG=	build
+USE_ICONV=	yes
+USE_GETTEXT=	yes
+USE_GNOME=	gnomehack
+USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAN1=		prelude-admin.1
 PORTDOCS=	*
@@ -30,22 +39,21 @@ PORTDOCS=	*
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=		yes
-.include "${PORTSDIR}/Mk/bsd.perl.mk"
-CONFIGURE_ARGS+=	--with-perl
-PLIST_SUB+=		WITH_PERL=""
+USE_PERL5=	yes
+CONFIGURE_ARGS+=--with-perl
+PLIST_SUB+=	PERL=""
 .else
-CONFIGURE_ARGS+=	--without-perl
-PLIST_SUB+=		WITH_PERL="@comment "
+CONFIGURE_ARGS+=--without-perl
+PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	yes
-CONFIGURE_ARGS+=	--with-python
-PLIST_SUB+=		WITH_PYTHON="" PYTHON_VER=${PYTHON_VER}
+CONFIGURE_ARGS+=--with-python
+PLIST_SUB+=	PYTHON="" PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}"
 .else
-CONFIGURE_ARGS+=	--without-python
-PLIST_SUB+=		WITH_PYTHON="@comment "
+CONFIGURE_ARGS+=--without-python
+PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .include <bsd.port.pre.mk>
@@ -55,38 +63,24 @@ BROKEN=		Does not compile
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e \
+		'/^install-data-am:/s|install-data-local||' ${WRKSRC}/docs/api/Makefile.in
 
 post-install:
+	${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1
+.for f in client.conf global.conf idmef-client.conf tls.conf
+	${INSTALL_DATA} ${WRKSRC}/${f} \
+		${PREFIX}/etc/prelude/default/${f}-dist
+.if !exists(${PREFIX}/etc/prelude/default/${f})
+	(cd ${PREFIX}/etc/prelude/default && ${CP} -p ${f}-dist ${f})
+.endif
+.endfor
+.if ${PORT_OPTIONS:MPERL}
+	-@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod
+.endif
 .if ${PORT_OPTIONS:MDOCS}
-	${INSTALL} -d ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
 .endif
-	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
-	@${INSTALL_DATA} ${WRKSRC}/client.conf \
-	                ${PREFIX}/etc/prelude/default/client.conf-dist
-	@${INSTALL_DATA} ${WRKSRC}/global.conf \
-	                ${PREFIX}/etc/prelude/default/global.conf-dist
-	@${INSTALL_DATA} ${WRKSRC}/tls.conf \
-	                ${PREFIX}/etc/prelude/default/tls.conf-dist
-	@${INSTALL_DATA} ${WRKSRC}/idmef-client.conf \
-	                ${PREFIX}/etc/prelude/default/idmef-client.conf-dist
-
-	@if [ ! -f ${PREFIX}/etc/prelude/default/client.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/client.conf-dist \
-	      ${PREFIX}/etc/prelude/default/client.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/prelude/default/global.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/global.conf-dist \
-	      ${PREFIX}/etc/prelude/default/global.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/prelude/default/idmef-client.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/idmef-client.conf-dist \
-	      ${PREFIX}/etc/prelude/default/idmef-client.conf ; \
-	fi
-	@if [ ! -f ${PREFIX}/etc/prelude/default/tls.conf ]; then \
-	   ${CP} -p ${PREFIX}/etc/prelude/default/tls.conf-dist \
-	      ${PREFIX}/etc/prelude/default/tls.conf ; \
-	fi
 
 .include <bsd.port.post.mk>
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index 02ac72118940..69e225563e8b 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libprelude-0.9.24.1.tar.gz) = 877383ba5e51709aad22a6547dc94b2453fef92a4923661b6fd98a2869875daf
-SIZE (libprelude-0.9.24.1.tar.gz) = 2582719
+SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b
+SIZE (libprelude-1.0.1.tar.gz) = 2791973
diff --git a/security/libprelude/files/patch-src__include__prelude-plugin.h b/security/libprelude/files/patch-src__include__prelude-plugin.h
new file mode 100644
index 000000000000..be59c1f7ac4d
--- /dev/null
+++ b/security/libprelude/files/patch-src__include__prelude-plugin.h
@@ -0,0 +1,13 @@
+--- src/include/prelude-plugin.h.orig	2012-06-02 00:12:30.000000000 +0900
++++ src/include/prelude-plugin.h	2012-09-11 15:46:33.000000000 +0900
+@@ -61,9 +61,9 @@
+  */
+ #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2
+ # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols
+-#endif
+ 
+ extern const void *lt_preloaded_symbols[];
++#endif
+ 
+ #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS()         \
+         prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols)
diff --git a/security/libprelude/pkg-plist b/security/libprelude/pkg-plist
index 8430c3195739..a5c6ea05b84d 100644
--- a/security/libprelude/pkg-plist
+++ b/security/libprelude/pkg-plist
@@ -16,9 +16,12 @@ etc/prelude/default/tls.conf-dist
 @exec if [ ! -f %D/etc/prelude/default/tls.conf ] ; then cp -p %D/%F %B/tls.conf; fi
 include/libprelude/common.h
 include/libprelude/daemonize.h
+include/libprelude/idmef.h
+include/libprelude/idmef.hxx
 include/libprelude/idmef-additional-data.h
 include/libprelude/idmef-class.h
 include/libprelude/idmef-criteria.h
+include/libprelude/idmef-criteria.hxx
 include/libprelude/idmef-criterion-value.h
 include/libprelude/idmef-data.h
 include/libprelude/idmef-message-helpers.h
@@ -27,19 +30,29 @@ include/libprelude/idmef-message-print.h
 include/libprelude/idmef-message-read.h
 include/libprelude/idmef-message-write.h
 include/libprelude/idmef-path.h
+include/libprelude/idmef-path.hxx
 include/libprelude/idmef-time.h
+include/libprelude/idmef-time.hxx
 include/libprelude/idmef-tree-data.h
 include/libprelude/idmef-tree-wrap.h
-include/libprelude/idmef-value-type.h
 include/libprelude/idmef-value.h
-include/libprelude/idmef.h
+include/libprelude/idmef-value.hxx
+include/libprelude/idmef-value-type.h
+include/libprelude/prelude.h
+include/libprelude/prelude.hxx
 include/libprelude/prelude-async.h
-include/libprelude/prelude-client-profile.h
 include/libprelude/prelude-client.h
+include/libprelude/prelude-client.hxx
+include/libprelude/prelude-client-easy.hxx
+include/libprelude/prelude-client-profile.h
+include/libprelude/prelude-client-profile.hxx
 include/libprelude/prelude-config.h
-include/libprelude/prelude-connection-pool.h
 include/libprelude/prelude-connection.h
+include/libprelude/prelude-connection.hxx
+include/libprelude/prelude-connection-pool.h
+include/libprelude/prelude-connection-pool.hxx
 include/libprelude/prelude-error.h
+include/libprelude/prelude-error.hxx
 include/libprelude/prelude-extract.h
 include/libprelude/prelude-failover.h
 include/libprelude/prelude-hash.h
@@ -49,6 +62,7 @@ include/libprelude/prelude-io.h
 include/libprelude/prelude-linked-object.h
 include/libprelude/prelude-list.h
 include/libprelude/prelude-log.h
+include/libprelude/prelude-log.hxx
 include/libprelude/prelude-message-id.h
 include/libprelude/prelude-msg.h
 include/libprelude/prelude-msgbuf.h
@@ -58,21 +72,31 @@ include/libprelude/prelude-plugin.h
 include/libprelude/prelude-string.h
 include/libprelude/prelude-thread.h
 include/libprelude/prelude-timer.h
-include/libprelude/prelude.h
+lib/libprelude.a
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.20
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
-%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
-%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.9.24.1-py%%PYTHON_VER%%.egg-info
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
-%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
+lib/libprelude.so.21
+lib/libpreludecpp.a
+lib/libpreludecpp.la
+lib/libpreludecpp.so
+lib/libpreludecpp.so.3
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so
+%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
 libdata/pkgconfig/libprelude.pc
 share/aclocal/libprelude.m4
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy
+%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude
 @dirrm include/libprelude
 @dirrm etc/prelude/default
 @dirrmtry etc/prelude/profile
diff --git a/security/libpreludedb/Makefile b/security/libpreludedb/Makefile
index 4ab569687d91..b84632c81f55 100644
--- a/security/libpreludedb/Makefile
+++ b/security/libpreludedb/Makefile
@@ -2,18 +2,26 @@
 # $FreeBSD$
 
 PORTNAME=	libpreludedb
-PORTVERSION=	0.9.15.3
-PORTREVISION=	1
+PORTVERSION=	1.0.1p1
 CATEGORIES=	security
-MASTER_SITES=	http://www.prelude-technologies.com/download/releases/${PORTNAME}/
+MASTER_SITES=	https://www.prelude-ids.org/attachments/download/287/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework library for access to Prelude NIDS database
 
-LIB_DEPENDS=	prelude.20:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
+		gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		prelude:${PORTSDIR}/security/libprelude \
+		nettle:${PORTSDIR}/security/nettle \
+		p11-kit:${PORTSDIR}/security/p11-kit
 
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
+USE_GETTEXT=	yes
+USE_ICONV=	yes
 
 CONFIGURE_ARGS=	--enable-gtk-doc=no
 USE_LDCONFIG=	yes
@@ -23,11 +31,10 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS MYSQL PERL PGSQL PYTHON SQLITE
 OPTIONS_DEFAULT=MYSQL
-PERL_DESC=	Include Perl bindings
-PYTHON_DESC=	Include Python bindings
-MYSQL_DESC=	Use MySQL backend
-PGSQL_DESC=	Use PostgreSQL backend
-SQLITE_DESC=	Use SQLite backend
+PERL_DESC=	Perl bindings
+MYSQL_DESC=	MySQL plugin
+PQSQL_DESC=	PostgreSQL plugin
+SQLITE_DESC=	SQLite3 plugin
 
 .include <bsd.port.options.mk>
 
@@ -50,7 +57,7 @@ CONFIGURE_ARGS+=	--without-python
 PLIST_SUB+=		WITH_PYTHON="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MMYSQL} || exists(${LOCALBASE}/bin/mysql_config)
+.if ${PORT_OPTIONS:MMYSQL}
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql
 PLIST_SUB+=		WITH_MYSQL=""
@@ -59,7 +66,7 @@ CONFIGURE_ARGS+=	--without-mysql
 PLIST_SUB+=		WITH_MYSQL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL} || exists(${LOCALBASE}/bin/pg_config)
+.if ${PORT_OPTIONS:MPGSQL}
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgresql
 PLIST_SUB+=		WITH_PGSQL=""
@@ -68,11 +75,11 @@ CONFIGURE_ARGS+=	--without-postgresql
 PLIST_SUB+=		WITH_PGSQL="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSQLITE} || exists(${LOCALBASE}/lib/libsqlite3.so)
+.if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=		yes
 CONFIGURE_ARGS+=	--with-sqlite3
 PLIST_SUB+=		WITH_SQLITE=""
-LIB_DEPENDS+=		sqlite3.8:${PORTSDIR}/databases/sqlite3
+LIB_DEPENDS+=		sqlite3:${PORTSDIR}/databases/sqlite3
 .else
 CONFIGURE_ARGS+=	--without-sqlite3
 PLIST_SUB+=		WITH_SQLITE="@comment "
@@ -87,7 +94,9 @@ post-install:
 	@${INSTALL} -d ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR}
 .endif
-
+.if ${PORT_OPTIONS:MPERL}
+	@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod
+.endif
 	@${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/
 
 .include <bsd.port.mk>
diff --git a/security/libpreludedb/distinfo b/security/libpreludedb/distinfo
index 6363f842748a..7ba7d4e4bbdd 100644
--- a/security/libpreludedb/distinfo
+++ b/security/libpreludedb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libpreludedb-0.9.15.3.tar.gz) = de72e86a4e6514998e0760e55024ed3c673d7a4d1e23d84c486ece0643ec2694
-SIZE (libpreludedb-0.9.15.3.tar.gz) = 935457
+SHA256 (libpreludedb-1.0.1p1.tar.gz) = c62a30d2d96bea4188328124a85a53e2aa1e6effebe15c83dd4440248e0f4f61
+SIZE (libpreludedb-1.0.1p1.tar.gz) = 939675
diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index 86cd83bf30f2..3846e1b83064 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,29 +1,38 @@
-# New ports collection makefile for:	prelude-lml
-# Date created:			Sun Aug 4 19:31:17 CEST 2002
-# Whom:				Clement Laforet <sheepkiller@cultdeadsheep.org>
-#
+# Created by: Clement Laforet <sheepkiller@cultdeadsheep.org>
 # $FreeBSD$
 
 PORTNAME=	prelude-lml
-PORTVERSION=	0.9.15
-PORTREVISION=	3
+PORTVERSION=	1.0.1
 CATEGORIES=	security
-MASTER_SITES=	http://www.prelude-technologies.com/download/releases/${PORTNAME}/
+MASTER_SITES=	https://www.prelude-ids.org/attachments/download/242/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Prelude Network Intrusion Detection System Log Monitoring Lackey
 
-LIB_DEPENDS+=	prelude.20:${PORTSDIR}/security/libprelude \
-		pcre.3:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	icuuc:${PORTSDIR}/devel/icu \
+		pcre:${PORTSDIR}/devel/pcre \
+		gmp:${PORTSDIR}/math/gmp \
+		gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		prelude:${PORTSDIR}/security/libprelude \
+		nettle:${PORTSDIR}/security/nettle \
+		p11-kit:${PORTSDIR}/security/p11-kit
 
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	prelude-lml
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
+USE_PKGCONFIG=	build
+USE_GETTEXT=	yes
+USE_ICONV=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	FAM
 
-.if defined(WITH_FAM)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MFAM}
 USE_FAM=	yes
 CONFIGURE_ARGS+=	--enable-fam
 .else
@@ -40,4 +49,4 @@ post-install:
 	      ${PREFIX}/etc/prelude-lml/plugins.rules ; \
 	fi
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index 246f5cd40023..a49ffe23a315 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (prelude-lml-0.9.15.tar.gz) = b326bbbff3f0873a79e26067a08cc4f77fcccffae99c86c497798b4b0e145d26
-SIZE (prelude-lml-0.9.15.tar.gz) = 1018513
+SHA256 (prelude-lml-1.0.1.tar.gz) = 2cb7c16d99390f72fde6a725cdb14c32beac7342ae37432607ba343550e3ca89
+SIZE (prelude-lml-1.0.1.tar.gz) = 1258694
diff --git a/security/prelude-lml/pkg-plist b/security/prelude-lml/pkg-plist
index 96222fd7f998..468b48485105 100644
--- a/security/prelude-lml/pkg-plist
+++ b/security/prelude-lml/pkg-plist
@@ -16,18 +16,21 @@ etc/prelude-lml/ruleset/checkpoint.rules
 etc/prelude-lml/ruleset/cisco-asa.rules
 etc/prelude-lml/ruleset/cisco-common.rules
 etc/prelude-lml/ruleset/cisco-css.rules
+etc/prelude-lml/ruleset/cisco-ips-4200.rules
 etc/prelude-lml/ruleset/cisco-ips.rules
 etc/prelude-lml/ruleset/cisco-router.rules
 etc/prelude-lml/ruleset/cisco-vpn.rules
 etc/prelude-lml/ruleset/clamav.rules
 etc/prelude-lml/ruleset/dell-om.rules
 etc/prelude-lml/ruleset/f5-bigip.rules
+etc/prelude-lml/ruleset/freeradius.rules
 etc/prelude-lml/ruleset/grsecurity.rules
 etc/prelude-lml/ruleset/honeyd.rules
 etc/prelude-lml/ruleset/honeytrap.rules
 etc/prelude-lml/ruleset/httpd.rules
 etc/prelude-lml/ruleset/ipchains.rules
 etc/prelude-lml/ruleset/ipfw.rules
+etc/prelude-lml/ruleset/juniper.rules
 etc/prelude-lml/ruleset/kojoney.rules
 etc/prelude-lml/ruleset/linksys-wap11.rules
 etc/prelude-lml/ruleset/modsecurity.rules
@@ -53,6 +56,7 @@ etc/prelude-lml/ruleset/selinux.rules
 etc/prelude-lml/ruleset/sendmail.rules
 etc/prelude-lml/ruleset/shadow-utils.rules
 etc/prelude-lml/ruleset/single.rules
+etc/prelude-lml/ruleset/snare_windows.rules
 etc/prelude-lml/ruleset/sonicwall.rules
 etc/prelude-lml/ruleset/spamassassin.rules
 etc/prelude-lml/ruleset/squid.rules
@@ -60,6 +64,7 @@ etc/prelude-lml/ruleset/ssh.rules
 etc/prelude-lml/ruleset/su.rules
 etc/prelude-lml/ruleset/sudo.rules
 etc/prelude-lml/ruleset/suhosin.rules
+etc/prelude-lml/ruleset/symantec.rules
 etc/prelude-lml/ruleset/tripwire.rules
 etc/prelude-lml/ruleset/vigor.rules
 etc/prelude-lml/ruleset/vpopmail.rules
@@ -70,8 +75,8 @@ lib/prelude-lml/debug.la
 lib/prelude-lml/debug.so
 lib/prelude-lml/pcre.la
 lib/prelude-lml/pcre.so
-@dirrm include/prelude-lml
 @dirrm lib/prelude-lml
+@dirrm include/prelude-lml
 @dirrm etc/prelude-lml/ruleset
 @dirrmtry etc/prelude-lml
 @unexec echo "If you are permanently removing this port, you should remove ${PKG_PREFIX}/etc/prelude-lml and /var/spool/prelude-lml directories to clean up any configuration and logfile metadata files left." | fmt
diff --git a/security/prelude-manager/Makefile b/security/prelude-manager/Makefile
index 1372952cf070..4504566c7905 100644
--- a/security/prelude-manager/Makefile
+++ b/security/prelude-manager/Makefile
@@ -5,24 +5,35 @@
 # $FreeBSD$
 
 PORTNAME=	prelude-manager
-PORTVERSION=	0.9.14.2
-PORTREVISION=	7
+PORTVERSION=	1.0.2
 CATEGORIES=	security
-MASTER_SITES=   http://www.prelude-technologies.com/download/releases/${PORTNAME}/
+MASTER_SITES=	https://www.prelude-ids.org/attachments/download/243/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Prelude Network Intrusion Detection System central logging point
 
-LIB_DEPENDS+=	prelude.20:${PORTSDIR}/security/libprelude \
-		gnutls.47:${PORTSDIR}/security/gnutls
+LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
+		gnutls:${PORTSDIR}/security/gnutls \
+		gcrypt:${PORTSDIR}/security/libgcrypt \
+		gpg-error:${PORTSDIR}/security/libgpg-error \
+		prelude:${PORTSDIR}/security/libprelude \
+		preludedb:${PORTSDIR}/security/libpreludedb \
+		nettle:${PORTSDIR}/security/nettle \
+		p11-kit:${PORTSDIR}/security/p11-kit
 
 USE_GMAKE=	yes
+USE_AUTOTOOLS=	libltdl
+GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
+USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USE_AUTOTOOLS=	autoconf
+
 USE_RC_SUBR=	prelude-manager
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
 			--localstatedir=/var
 CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
+
 CFLAGS+=	-I${LOCALBASE}/include
 
 USERS?=		prelude
@@ -33,23 +44,21 @@ MAN1=		prelude-manager.1
 PLIST_SUB=	PRELUDEUSER=${USERS} \
 		PRELUDEGROUP=${GROUPS}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=	XML
+OPTIONS_DEFAULT=XML
+
+XML_DESC=	XML plugin
+
+.include <bsd.port.options.mk>
 
-.if defined(WITHOUT_XML)
+.if !${PORT_OPTIONS:MXML}
 PLIST_SUB+=		WITH_XML="@comment "
 CONFIGURE_ARGS+=	--disable-xmltest --without-xml
 .else
-LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
+USE_GNOME=	libxml2
 PLIST_SUB+=	WITH_XML=""
 .endif
 
-.if defined(WITHOUT_PRELUDEDB)
-PLIST_SUB+=	WITH_PRELUDEDB="@comment "
-.else
-LIB_DEPENDS+=	preludedb.4:${PORTSDIR}/security/libpreludedb
-PLIST_SUB+=	WITH_PRELUDEDB=""
-.endif
-
 post-install:
 	@if [ ! -f ${PREFIX}/etc/prelude-manager/prelude-manager.conf ]; then \
 	   ${CP} -p ${PREFIX}/etc/prelude-manager/prelude-manager.conf-dist \
@@ -58,7 +67,8 @@ post-install:
 .if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
 	@${MKDIR} ${EXAMPLESDIR}/smtp
-	${INSTALL_DATA} ${WRKSRC}/plugins/reports/smtp/template.example ${EXAMPLESDIR}/smtp/template.example
+	${INSTALL_DATA} ${WRKSRC}/plugins/reports/smtp/template.example \
+		${EXAMPLESDIR}/smtp/template.example
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/security/prelude-manager/distinfo b/security/prelude-manager/distinfo
index a56777e2114f..350178ae9855 100644
--- a/security/prelude-manager/distinfo
+++ b/security/prelude-manager/distinfo
@@ -1,2 +1,2 @@
-SHA256 (prelude-manager-0.9.14.2.tar.gz) = b73e299ee3dabc1396f8b432e058c140769383b881b096c7ba964fd8e3ff5d22
-SIZE (prelude-manager-0.9.14.2.tar.gz) = 778280
+SHA256 (prelude-manager-1.0.2.tar.gz) = 1c8eb08ba86d9d6c3c1120ae873a1533cd9ab321a22fe65f78ee8b9dd89c9f10
+SIZE (prelude-manager-1.0.2.tar.gz) = 1151156
diff --git a/security/prelude-manager/files/patch-Makefile.in b/security/prelude-manager/files/patch-Makefile.in
index b349a4367215..9204854ecfb0 100644
--- a/security/prelude-manager/files/patch-Makefile.in
+++ b/security/prelude-manager/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-04-28 13:56:31.000000000 +0200
-+++ Makefile.in	2008-04-29 11:30:33.000000000 +0200
-@@ -927,17 +927,8 @@
+--- Makefile.in.orig	2012-06-13 12:25:15.000000000 +0200
++++ Makefile.in	2012-12-15 21:04:06.000000000 +0100
+@@ -1425,17 +1425,7 @@
  	$(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir);
  	$(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir);
  	$(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir);
@@ -16,7 +16,6 @@
 -		$(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/;                          \
 -	fi                                                                                                   
 +	$(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist
-+
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+ 
+ dist-hook:
+ 	@if test -d "$(srcdir)/.git"; then      \
diff --git a/security/prelude-manager/files/patch-configure.in b/security/prelude-manager/files/patch-configure.in
deleted file mode 100644
index 8c62d8992752..000000000000
--- a/security/prelude-manager/files/patch-configure.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- configure.in.orig	2008-08-21 14:22:20.000000000 +0200
-+++ configure.in	2009-11-09 11:33:23.000000000 +0100
-@@ -86,15 +86,6 @@
- dnl **************************************************
- dnl * Check for GnuTLS.                              *
- dnl **************************************************
--AM_PATH_LIBGNUTLS(1.0.17, gnutls=yes, gnutls=no)
--if test x$gnutls != xyes; then
--        AC_MSG_ERROR(libgnutls is required in order to build prelude-manager.)
--fi
--
--old_LIBS=$LIBS
--old_CPPFLAGS=$CPPFLAGS
--LIBS="$LIBGNUTLS_LIBS"
--CPPFLAGS="$LIBGNUTLS_CFLAGS"
- 
- AC_CHECK_LIB(gnutls, gnutls_priority_init, gnutls_string_priority=yes, gnutls_string_priority=no)
- if test x$gnutls_string_priority = xyes; then
-@@ -104,9 +95,7 @@
- AC_CHECK_HEADER(gnutls/gnutls.h, ,
-                 AC_MSG_ERROR("libgnutls development headers are required to build libprelude"))
- 
--CPPFLAGS=$old_CPPFLAGS
--LIBS=$old_LIBS
--
-+AC_SUBST(LIBGNUTLS_CFLAGS,"")
- 
- 
- dnl **************************************************
diff --git a/security/prelude-manager/pkg-plist b/security/prelude-manager/pkg-plist
index c1bd2705bbbc..ab945c4eae44 100644
--- a/security/prelude-manager/pkg-plist
+++ b/security/prelude-manager/pkg-plist
@@ -14,12 +14,10 @@ lib/prelude-manager/filters/thresholding.so
 lib/prelude-manager/filters/thresholding.la
 lib/prelude-manager/decodes/normalize.so
 lib/prelude-manager/decodes/normalize.la
-%%WITH_PRELUDEDB%%lib/prelude-manager/reports/db.la
-%%WITH_PRELUDEDB%%lib/prelude-manager/reports/db.so
+lib/prelude-manager/reports/db.la
+lib/prelude-manager/reports/db.so
 lib/prelude-manager/reports/debug.la
 lib/prelude-manager/reports/debug.so
-lib/prelude-manager/reports/relaying.la
-lib/prelude-manager/reports/relaying.so
 lib/prelude-manager/reports/smtp.la
 lib/prelude-manager/reports/smtp.so
 lib/prelude-manager/reports/textmod.la
@@ -38,6 +36,4 @@ lib/prelude-manager/reports/textmod.so
 @dirrmtry lib/prelude-manager
 @dirrmtry include/prelude-manager
 @dirrmtry etc/prelude-manager
-@dirrmtry /var/run/prelude-manager
-@dirrmtry /var/spool/prelude-manager
 @unexec echo "If you are permanently removing this port, you should remove ${PKG_PREFIX}/etc/prelude-manager, /var/run/prelude-manager and /var/spool/prelude-manager directories to clean up any files left." | fmt
diff --git a/security/prelude-pflogger/Makefile b/security/prelude-pflogger/Makefile
index 2e79fe711c8b..3f3d0d0be5b8 100644
--- a/security/prelude-pflogger/Makefile
+++ b/security/prelude-pflogger/Makefile
@@ -1,19 +1,16 @@
-# New ports collection makefile for:	prelude-pflogger
-# Date created:			19 May 2009
-# Whom:				Anders Troback <freebsd@troback.com>
-#
+# Created by: Anders Troback <freebsd@troback.com>
 # $FreeBSD$
 
 PORTNAME=	prelude-pflogger
 DISTVERSION=	0.9.0-rc2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.com/download/releases/${PORTNAME}/
 
 MAINTAINER=	freebsd@troback.com
 COMMENT=	Prelude-PFlogger Listens at OpenBSD PF
 
-LIB_DEPENDS+=	prelude.20:${PORTSDIR}/security/libprelude
+LIB_DEPENDS+=	prelude:${PORTSDIR}/security/libprelude
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/www/py-prewikka/Makefile b/www/py-prewikka/Makefile
index 7d6d4812b793..9cd87dc6e137 100644
--- a/www/py-prewikka/Makefile
+++ b/www/py-prewikka/Makefile
@@ -1,29 +1,25 @@
-# New ports collection makefile for:	prewikka
-# Date created:				2006-03-13
-# Whom:					Robin Gruyters <r.gruyters@yirdis.nl>
-#
+# Created by: Robin Gruyters <r.gruyters@yirdis.nl>
 # $FreeBSD$
-#
 
 PORTNAME=	prewikka
-PORTVERSION=	0.9.17.1
-PORTREVISION=	2
+PORTVERSION=	1.0.1p1
 CATEGORIES=	www security python
-MASTER_SITES=	http://www.prelude-technologies.com/download/releases/${PORTNAME}/
-
+MASTER_SITES=	https://www.prelude-ids.org/attachments/download/286/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Frontend for the Prelude IDS
 
 BUILD_DEPENDS=	cheetah-compile:${PORTSDIR}/devel/py-cheetah
-LIB_DEPENDS=	prelude.20:${PORTSDIR}/security/libprelude \
-		preludedb.4:${PORTSDIR}/security/libpreludedb
+LIB_DEPENDS=	prelude:${PORTSDIR}/security/libprelude \
+		preludedb:${PORTSDIR}/security/libpreludedb
 
 USE_PYTHON=		-2.7
 USE_PYDISTUTILS=	yes
 
-.if !defined(WITHOUT_NLS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 USE_GETTEXT=		yes
 PLIST_SUB+=		NLS=""
 .else
@@ -34,7 +30,7 @@ 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)
+.if !${PORT_OPTIONS:MNLS}
 	${REINPLACE_CMD} 's,\(.*self.data_files.extend(self._compile_po_files())\),#\1,' \
 	   ${WRKSRC}/setup.py
 .endif
diff --git a/www/py-prewikka/distinfo b/www/py-prewikka/distinfo
index a6d2904af1b0..10e5c522e278 100644
--- a/www/py-prewikka/distinfo
+++ b/www/py-prewikka/distinfo
@@ -1,2 +1,2 @@
-SHA256 (prewikka-0.9.17.1.tar.gz) = 95edbf851392dcbb6d677507e0f944991aa5e707b18854e14296214bc98e465b
-SIZE (prewikka-0.9.17.1.tar.gz) = 286990
+SHA256 (prewikka-1.0.1p1.tar.gz) = 3a9bbf23f50f4e68617d92d82df2bbf74d4e1d1f38ab2d6bf80ab9c908446bb7
+SIZE (prewikka-1.0.1p1.tar.gz) = 341468
diff --git a/www/py-prewikka/pkg-plist b/www/py-prewikka/pkg-plist
index c886a1a6d87f..85dcbbd577de 100644
--- a/www/py-prewikka/pkg-plist
+++ b/www/py-prewikka/pkg-plist
@@ -1,244 +1,255 @@
+bin/prewikka-httpd
 @unexec if cmp -s %D/etc/prewikka/prewikka.conf-dist %D/etc/prewikka/prewikka.conf; then rm -f %D/etc/prewikka/prewikka.conf; fi
 etc/prewikka/prewikka.conf-dist
 @exec if [ ! -f %D/etc/prewikka/prewikka.conf ] ; then cp -p %D/%F %B/prewikka.conf; fi
-bin/prewikka-httpd
-%%PYTHON_SITELIBDIR%%/prewikka/Database.py
-%%PYTHON_SITELIBDIR%%/prewikka/User.py
-%%PYTHON_SITELIBDIR%%/prewikka/Log.py
 %%PYTHON_SITELIBDIR%%/prewikka/Auth.py
-%%PYTHON_SITELIBDIR%%/prewikka/DataSet.py
-%%PYTHON_SITELIBDIR%%/prewikka/IDMEFDatabase.py
-%%PYTHON_SITELIBDIR%%/prewikka/Core.py
-%%PYTHON_SITELIBDIR%%/prewikka/Request.py
-%%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.py
-%%PYTHON_SITELIBDIR%%/prewikka/localization.py
-%%PYTHON_SITELIBDIR%%/prewikka/view.py
+%%PYTHON_SITELIBDIR%%/prewikka/Auth.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Auth.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/Chart.py
+%%PYTHON_SITELIBDIR%%/prewikka/Chart.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Chart.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.py
+%%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Config.py
-%%PYTHON_SITELIBDIR%%/prewikka/Filter.py
+%%PYTHON_SITELIBDIR%%/prewikka/Config.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Config.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/Core.py
+%%PYTHON_SITELIBDIR%%/prewikka/Core.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Core.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/DataSet.py
+%%PYTHON_SITELIBDIR%%/prewikka/DataSet.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/DataSet.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/Database.py
+%%PYTHON_SITELIBDIR%%/prewikka/Database.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Database.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/Error.py
-%%PYTHON_SITELIBDIR%%/prewikka/resolve.py
+%%PYTHON_SITELIBDIR%%/prewikka/Error.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Error.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/Filter.py
+%%PYTHON_SITELIBDIR%%/prewikka/Filter.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Filter.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/IDMEFDatabase.py
+%%PYTHON_SITELIBDIR%%/prewikka/IDMEFDatabase.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/IDMEFDatabase.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/Log.py
+%%PYTHON_SITELIBDIR%%/prewikka/Log.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Log.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.py
+%%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.py
+%%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/Request.py
+%%PYTHON_SITELIBDIR%%/prewikka/Request.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/Request.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/User.py
+%%PYTHON_SITELIBDIR%%/prewikka/User.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/User.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/__init__.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/_threading_local.py
-%%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.py
+%%PYTHON_SITELIBDIR%%/prewikka/_threading_local.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/_threading_local.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/cairoplot.py
+%%PYTHON_SITELIBDIR%%/prewikka/cairoplot.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/cairoplot.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/localization.py
+%%PYTHON_SITELIBDIR%%/prewikka/localization.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/localization.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/__init__.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/__init__.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/anonymous.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/anonymous.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/anonymous.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/cgi.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/cgi.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/cgi.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/__init__.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/loginpassword.py
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/loginpassword.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/loginpassword.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/resolve.py
+%%PYTHON_SITELIBDIR%%/prewikka/resolve.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/resolve.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/siteconfig.py
-%%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/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
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageDetails.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/siteconfig.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/siteconfig.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/templates/About.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/LoginPasswordForm.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/UserSettings.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/About.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/About.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/AlertListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/AlertListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/AlertListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/ClassicLayout.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/ClassicLayout.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/ClassicLayout.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/Command.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/Command.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/Command.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/templates/ErrorTemplate.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/IDMEFBrowser.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageSummary.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HTMLDocument.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/UserListing.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/ErrorTemplate.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/ErrorTemplate.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/templates/FilterEdition.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/TopLayout.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorHeartbeatListing.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/Command.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatListing.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/ClassicLayout.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/AlertListing.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/__init__.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorAlertListing.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/PropertiesChangeForm.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/FilterEdition.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/FilterEdition.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HTMLDocument.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HTMLDocument.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HTMLDocument.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatAnalyze.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/utils.py
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageDetails.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorListing.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/About.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatAnalyze.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatAnalyze.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/LoginPasswordForm.py
 %%PYTHON_SITELIBDIR%%/prewikka/templates/LoginPasswordForm.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/UserSettings.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/ErrorTemplate.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/IDMEFBrowser.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageSummary.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HTMLDocument.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/UserListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/LoginPasswordForm.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageDetails.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageDetails.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageDetails.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageListing.py
 %%PYTHON_SITELIBDIR%%/prewikka/templates/MessageListing.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/FilterEdition.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/TopLayout.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorHeartbeatListing.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/Command.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/utils.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatListing.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/ClassicLayout.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/AlertListing.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorAlertListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageSummary.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageSummary.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageSummary.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/PropertiesChangeForm.py
 %%PYTHON_SITELIBDIR%%/prewikka/templates/PropertiesChangeForm.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatAnalyze.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageDetails.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/PropertiesChangeForm.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorAlertListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorAlertListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorAlertListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorHeartbeatListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorHeartbeatListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorHeartbeatListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorListing.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/templates/SensorListing.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/About.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/LoginPasswordForm.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/UserSettings.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/ErrorTemplate.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/IDMEFBrowser.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageSummary.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HTMLDocument.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/UserListing.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/MessageListing.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/FilterEdition.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/Stats.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/Stats.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/Stats.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/TopLayout.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/TopLayout.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/templates/TopLayout.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorHeartbeatListing.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/Command.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatListing.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/ClassicLayout.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/AlertListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/UserListing.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/UserListing.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/UserListing.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/UserSettings.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/UserSettings.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/templates/UserSettings.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/__init__.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/templates/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/SensorAlertListing.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/PropertiesChangeForm.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/templates/HeartbeatAnalyze.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/templates/utils.py
+%%PYTHON_SITELIBDIR%%/prewikka/templates/utils.pyc
 %%PYTHON_SITELIBDIR%%/prewikka/templates/utils.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/__init__.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/anonymous.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/__init__.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/anonymous.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/anonymous.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/loginpassword.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/__init__.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/loginpassword.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/loginpassword.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/cgi.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/__init__.py
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/cgi.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/cgi.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/auth/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/modules/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Database.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/localization.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/view.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/Config.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/Filter.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/Error.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/__init__.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/siteconfig.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/utils.py
 %%PYTHON_SITELIBDIR%%/prewikka/utils.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/Database.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/User.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Log.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Auth.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/DataSet.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/IDMEFDatabase.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Core.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Request.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/ModPythonHandler.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/localization.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/view.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/CheetahFilters.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Config.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Filter.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/Error.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/__init__.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/MyConfigParser.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/siteconfig.pyo
 %%PYTHON_SITELIBDIR%%/prewikka/utils.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/resolve.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/_threading_local.pyc
-%%PYTHON_SITELIBDIR%%/prewikka/resolve.pyo
-%%PYTHON_SITELIBDIR%%/prewikka/_threading_local.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/view.py
+%%PYTHON_SITELIBDIR%%/prewikka/view.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/view.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/__init__.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/__init__.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/__init__.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/alertlisting.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/commands.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/commands.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/commands.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/filter.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/filter.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/filter.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/heartbeatlisting.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagedetails.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagedetails.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagedetails.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagelisting.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagelisting.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagelisting.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagesummary.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagesummary.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/messagesummary.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/misc.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/misc.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/misc.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/sensor.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/sensor.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/sensor.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/stats.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/stats.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/stats.pyo
+%%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.py
+%%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.pyc
+%%PYTHON_SITELIBDIR%%/prewikka/views/usermanagement.pyo
 %%NLS%%share/locale/de/LC_MESSAGES/prewikka.mo
+%%NLS%%share/locale/en/LC_MESSAGES/prewikka.mo
 %%NLS%%share/locale/es/LC_MESSAGES/prewikka.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/prewikka.mo
+%%NLS%%share/locale/it/LC_MESSAGES/prewikka.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/prewikka.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/prewikka.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/prewikka.mo
 %%DATADIR%%/cgi-bin/prewikka.cgi
-%%DATADIR%%/htdocs/images/prelude-logo.gif
-%%DATADIR%%/htdocs/images/prelude-logo.png
-%%DATADIR%%/htdocs/images/favicon.ico
-%%DATADIR%%/htdocs/images/bg_content.gif
-%%DATADIR%%/htdocs/images/n.gif
-%%DATADIR%%/htdocs/images/table_order_down.gif
-%%DATADIR%%/htdocs/images/table_order_up.gif
-%%DATADIR%%/htdocs/images/search.png
+%%DATADIR%%/database/fixlanguage-1.0.1.sql
+%%DATADIR%%/database/mysql-update-0.9.1.sql
+%%DATADIR%%/database/mysql-update-0.9.11.sql
+%%DATADIR%%/database/mysql.sql
+%%DATADIR%%/database/mysql2pgsql.sh
+%%DATADIR%%/database/mysql2sqlite.sh
+%%DATADIR%%/database/pgsql-update-0.9.1.sql
+%%DATADIR%%/database/pgsql-update-0.9.11.sql
+%%DATADIR%%/database/pgsql.sql
+%%DATADIR%%/database/sqlite-update-0.9.11.sql
+%%DATADIR%%/database/sqlite.sql
+%%DATADIR%%/htdocs/css/style.css
 %%DATADIR%%/htdocs/images/bg2.gif
+%%DATADIR%%/htdocs/images/bg_content.gif
+%%DATADIR%%/htdocs/images/favicon.ico
 %%DATADIR%%/htdocs/images/led_N.gif
 %%DATADIR%%/htdocs/images/led_Y.gif
+%%DATADIR%%/htdocs/images/n.gif
 %%DATADIR%%/htdocs/images/pause.png
 %%DATADIR%%/htdocs/images/play.png
-%%DATADIR%%/htdocs/css/style.css
+%%DATADIR%%/htdocs/images/prelude-logo.gif
+%%DATADIR%%/htdocs/images/prelude-logo.png
+%%DATADIR%%/htdocs/images/search.png
+%%DATADIR%%/htdocs/images/table_order_down.gif
+%%DATADIR%%/htdocs/images/table_order_up.gif
 %%DATADIR%%/htdocs/js/functions.js
 %%DATADIR%%/htdocs/js/jquery.js
-%%DATADIR%%/database/sqlite.sql
-%%DATADIR%%/database/sqlite-update-0.9.11.sql
-%%DATADIR%%/database/mysql.sql
-%%DATADIR%%/database/mysql-update-0.9.1.sql
-%%DATADIR%%/database/mysql-update-0.9.11.sql
-%%DATADIR%%/database/pgsql.sql
-%%DATADIR%%/database/pgsql-update-0.9.1.sql
-%%DATADIR%%/database/pgsql-update-0.9.11.sql
-%%DATADIR%%/database/mysql2sqlite.sh
-%%DATADIR%%/database/mysql2pgsql.sh
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/auth
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/log/stderr
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules/log
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/modules
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/templates
-@dirrmtry %%PYTHON_SITELIBDIR%%/prewikka/views
-@dirrm %%PYTHON_SITELIBDIR%%/prewikka
-@dirrmtry %%DATADIR%%/htdocs/images
-@dirrmtry %%DATADIR%%/htdocs/css
-@dirrmtry %%DATADIR%%/htdocs/js
+@dirrm %%DATADIR%%/htdocs/js
+@dirrm %%DATADIR%%/htdocs/images
+@dirrm %%DATADIR%%/htdocs/generated_images
+@dirrm %%DATADIR%%/htdocs/css
 @dirrm %%DATADIR%%/htdocs
-@dirrm %%DATADIR%%/cgi-bin
 @dirrm %%DATADIR%%/database
+@dirrm %%DATADIR%%/cgi-bin
 @dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/views
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/templates
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/loginpassword
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/cgi
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/modules/auth/anonymous
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/modules/auth
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka/modules
+@dirrm %%PYTHON_SITELIBDIR%%/prewikka
 @dirrm etc/prewikka