Rename to match Python naming convention. Depend on py-cheetah.

Fix PLIST. Conflict on old name.

2 files changed, 63 insertions, 3 deletions

diff --git a/security/py-prewikka/Makefile b/security/py-prewikka/Makefile
index e798a6e63e2..915c67dddbf 100644
--- a/security/py-prewikka/Makefile
+++ b/security/py-prewikka/Makefile
@@ -1,15 +1,18 @@
-# $NetBSD: Makefile,v 1.7 2006/05/18 20:30:00 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2006/06/11 23:44:23 joerg Exp $
 #
 
 DISTNAME=		prewikka-0.9.5
+PKGNAME=		${PYPKGPREFIX}-prewikka-0.9.5
 CATEGORIES=		security
 MASTER_SITES=		http://prelude-ids.org/download/releases/
 
+CONFLICTS=		prewikka-[0-9]*
+
 MAINTAINER=		shannonjr@NetBSD.org
 HOMEPAGE=		http://prelude-ids.org/download/releases/
 COMMENT=		Prelude-IDS console
 
-BROKEN_IN=		pkgsrc-2006Q1
+DEPENDS+=		${PYPKGPREFIX}-cheetah-[0-9]*:../../devel/py-cheetah
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/py-prewikka/PLIST b/security/py-prewikka/PLIST
index 5625a926188..b3a88d21ff9 100644
--- a/security/py-prewikka/PLIST
+++ b/security/py-prewikka/PLIST
@@ -1,50 +1,72 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/06 12:28:01 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/06/11 23:44:23 joerg Exp $
 bin/prewikka-httpd
+${PYSITELIB}/prewikka/Auth.py
 ${PYSITELIB}/prewikka/Auth.pyc
 ${PYSITELIB}/prewikka/Auth.pyo
+${PYSITELIB}/prewikka/CheetahFilters.py
 ${PYSITELIB}/prewikka/CheetahFilters.pyc
 ${PYSITELIB}/prewikka/CheetahFilters.pyo
+${PYSITELIB}/prewikka/Config.py
 ${PYSITELIB}/prewikka/Config.pyc
 ${PYSITELIB}/prewikka/Config.pyo
+${PYSITELIB}/prewikka/Core.py
 ${PYSITELIB}/prewikka/Core.pyc
 ${PYSITELIB}/prewikka/Core.pyo
+${PYSITELIB}/prewikka/DataSet.py
 ${PYSITELIB}/prewikka/DataSet.pyc
 ${PYSITELIB}/prewikka/DataSet.pyo
+${PYSITELIB}/prewikka/Database.py
 ${PYSITELIB}/prewikka/Database.pyc
 ${PYSITELIB}/prewikka/Database.pyo
+${PYSITELIB}/prewikka/Error.py
 ${PYSITELIB}/prewikka/Error.pyc
 ${PYSITELIB}/prewikka/Error.pyo
+${PYSITELIB}/prewikka/Filter.py
 ${PYSITELIB}/prewikka/Filter.pyc
 ${PYSITELIB}/prewikka/Filter.pyo
+${PYSITELIB}/prewikka/IDMEFDatabase.py
 ${PYSITELIB}/prewikka/IDMEFDatabase.pyc
 ${PYSITELIB}/prewikka/IDMEFDatabase.pyo
+${PYSITELIB}/prewikka/Log.py
 ${PYSITELIB}/prewikka/Log.pyc
 ${PYSITELIB}/prewikka/Log.pyo
+${PYSITELIB}/prewikka/ModPythonHandler.py
 ${PYSITELIB}/prewikka/ModPythonHandler.pyc
 ${PYSITELIB}/prewikka/ModPythonHandler.pyo
+${PYSITELIB}/prewikka/MyConfigParser.py
 ${PYSITELIB}/prewikka/MyConfigParser.pyc
 ${PYSITELIB}/prewikka/MyConfigParser.pyo
+${PYSITELIB}/prewikka/ParametersNormalizer.py
 ${PYSITELIB}/prewikka/ParametersNormalizer.pyc
 ${PYSITELIB}/prewikka/ParametersNormalizer.pyo
+${PYSITELIB}/prewikka/Request.py
 ${PYSITELIB}/prewikka/Request.pyc
 ${PYSITELIB}/prewikka/Request.pyo
+${PYSITELIB}/prewikka/User.py
 ${PYSITELIB}/prewikka/User.pyc
 ${PYSITELIB}/prewikka/User.pyo
 ${PYSITELIB}/prewikka/__init__.py
 ${PYSITELIB}/prewikka/__init__.pyc
 ${PYSITELIB}/prewikka/__init__.pyo
+${PYSITELIB}/prewikka/modules/__init__.py
 ${PYSITELIB}/prewikka/modules/__init__.pyc
 ${PYSITELIB}/prewikka/modules/__init__.pyo
+${PYSITELIB}/prewikka/modules/auth/__init__.py
 ${PYSITELIB}/prewikka/modules/auth/__init__.pyc
 ${PYSITELIB}/prewikka/modules/auth/__init__.pyo
+${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.py
 ${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.pyc
 ${PYSITELIB}/prewikka/modules/auth/loginpassword/__init__.pyo
+${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.py
 ${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.pyc
 ${PYSITELIB}/prewikka/modules/auth/loginpassword/loginpassword.pyo
+${PYSITELIB}/prewikka/modules/log/__init__.py
 ${PYSITELIB}/prewikka/modules/log/__init__.pyc
 ${PYSITELIB}/prewikka/modules/log/__init__.pyo
+${PYSITELIB}/prewikka/modules/log/stderr/__init__.py
 ${PYSITELIB}/prewikka/modules/log/stderr/__init__.pyc
 ${PYSITELIB}/prewikka/modules/log/stderr/__init__.pyo
+${PYSITELIB}/prewikka/modules/log/stderr/stderr.py
 ${PYSITELIB}/prewikka/modules/log/stderr/stderr.pyc
 ${PYSITELIB}/prewikka/modules/log/stderr/stderr.pyo
 ${PYSITELIB}/prewikka/siteconfig.py
@@ -116,32 +138,67 @@ ${PYSITELIB}/prewikka/templates/__init__.pyo
 ${PYSITELIB}/prewikka/templates/utils.py
 ${PYSITELIB}/prewikka/templates/utils.pyc
 ${PYSITELIB}/prewikka/templates/utils.pyo
+${PYSITELIB}/prewikka/utils.py
 ${PYSITELIB}/prewikka/utils.pyc
 ${PYSITELIB}/prewikka/utils.pyo
+${PYSITELIB}/prewikka/view.py
 ${PYSITELIB}/prewikka/view.pyc
 ${PYSITELIB}/prewikka/view.pyo
+${PYSITELIB}/prewikka/views/__init__.py
 ${PYSITELIB}/prewikka/views/__init__.pyc
 ${PYSITELIB}/prewikka/views/__init__.pyo
+${PYSITELIB}/prewikka/views/commands.py
 ${PYSITELIB}/prewikka/views/commands.pyc
 ${PYSITELIB}/prewikka/views/commands.pyo
+${PYSITELIB}/prewikka/views/filter.py
 ${PYSITELIB}/prewikka/views/filter.pyc
 ${PYSITELIB}/prewikka/views/filter.pyo
+${PYSITELIB}/prewikka/views/messagedetails.py
 ${PYSITELIB}/prewikka/views/messagedetails.pyc
 ${PYSITELIB}/prewikka/views/messagedetails.pyo
+${PYSITELIB}/prewikka/views/messagelisting.py
 ${PYSITELIB}/prewikka/views/messagelisting.pyc
 ${PYSITELIB}/prewikka/views/messagelisting.pyo
+${PYSITELIB}/prewikka/views/messagesummary.py
 ${PYSITELIB}/prewikka/views/messagesummary.pyc
 ${PYSITELIB}/prewikka/views/messagesummary.pyo
+${PYSITELIB}/prewikka/views/misc.py
 ${PYSITELIB}/prewikka/views/misc.pyc
 ${PYSITELIB}/prewikka/views/misc.pyo
+${PYSITELIB}/prewikka/views/sensor.py
 ${PYSITELIB}/prewikka/views/sensor.pyc
 ${PYSITELIB}/prewikka/views/sensor.pyo
+${PYSITELIB}/prewikka/views/usermanagement.py
 ${PYSITELIB}/prewikka/views/usermanagement.pyc
 ${PYSITELIB}/prewikka/views/usermanagement.pyo
 sbin/runPrewikka
 share/examples/rc.d/prewikka
+share/prewikka/cgi-bin/prewikka.cgi
+share/prewikka/database/mysql-update-0.9.1.sql
+share/prewikka/database/mysql.sql
+share/prewikka/database/mysql2sqlite.sh
+share/prewikka/database/pgsql-update-0.9.1.sql
+share/prewikka/database/pgsql.sql
 share/prewikka/database/sqlite.sql
+share/prewikka/htdocs/css/style.css
+share/prewikka/htdocs/images/bg2.gif
+share/prewikka/htdocs/images/bg_content.gif
+share/prewikka/htdocs/images/favicon.ico
+share/prewikka/htdocs/images/led_N.gif
+share/prewikka/htdocs/images/led_Y.gif
+share/prewikka/htdocs/images/n.gif
+share/prewikka/htdocs/images/prelude-logo.gif
+share/prewikka/htdocs/images/prelude-logo.png
+share/prewikka/htdocs/images/search.png
+share/prewikka/htdocs/images/table_order_down.gif
+share/prewikka/htdocs/images/table_order_up.gif
+share/prewikka/htdocs/js/functions.js
+@dirrm share/prewikka/cgi-bin
 @dirrm share/prewikka/database
+@dirrm share/prewikka/htdocs/css
+@dirrm share/prewikka/htdocs/images
+@dirrm share/prewikka/htdocs/js
+@dirrm share/prewikka/htdocs
 @dirrm ${PYSITELIB}/prewikka/views
 @dirrm ${PYSITELIB}/prewikka/templates
 @dirrm ${PYSITELIB}/prewikka/modules/log/stderr