From 809eee2774383feae09c19606019735f6c80a0e8 Mon Sep 17 00:00:00 2001
From: aanriot <aanriot@openbsd.org>
Date: Sat, 11 Nov 2006 19:33:57 +0000
Subject: [PATCH] - add an advised rc.local entry in README.OpenBSD. - disable
 default logging on STDERR, in order to run prewikka-httpd in   the
 background. - sync regexp in mysql2sqlite.sh with upstream fix. - bump
 PKGNAME.

---
 security/prelude/prewikka/Makefile                   |  4 ++--
 security/prelude/prewikka/files/README.OpenBSD       | 11 ++++++++---
 .../prewikka/patches/patch-conf_prewikka_conf        | 12 ++++++++++++
 .../prewikka/patches/patch-database_mysql2sqlite_sh  |  4 ++--
 4 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 security/prelude/prewikka/patches/patch-conf_prewikka_conf

diff --git a/security/prelude/prewikka/Makefile b/security/prelude/prewikka/Makefile
index a834b28316c..29408a06b97 100644
--- a/security/prelude/prewikka/Makefile
+++ b/security/prelude/prewikka/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.5 2006/10/06 08:04:23 aanriot Exp $
+# $OpenBSD: Makefile,v 1.6 2006/11/11 19:33:57 aanriot Exp $
 
 COMMENT=	"Prelude Management Console"
 
 DISTNAME=	prewikka-0.9.7.1
-PKGNAME=	prelude-${DISTNAME}p0
+PKGNAME=	prelude-${DISTNAME}p1
 
 MODULES=	lang/python
 
diff --git a/security/prelude/prewikka/files/README.OpenBSD b/security/prelude/prewikka/files/README.OpenBSD
index 557f2e5af53..68c5140c874 100644
--- a/security/prelude/prewikka/files/README.OpenBSD
+++ b/security/prelude/prewikka/files/README.OpenBSD
@@ -33,7 +33,12 @@ Instructions for SQLite:
   to use this/these database file(s), thanks to the "file" keyword
   (which indicates the location of the database).
 
-Eventually, you can start prewikka's webserver, prewikka-httpd
-(listening by default on 8000/tcp) or use Apache. The default user is
-"admin", with "admin" as password and should be changed.
+Eventually, you can start prewikka's webserver (or Apache) which is
+listening by default on 8000/tcp using:
 
+if [ -x ${LOCALBASE}/bin/prewikka-httpd ]; then
+	echo -n ' prewikka-httpd'; ${LOCALBASE}/bin/prewikka-httpd &
+fi
+
+The default user is "admin", with "admin" as password and should be
+changed.
diff --git a/security/prelude/prewikka/patches/patch-conf_prewikka_conf b/security/prelude/prewikka/patches/patch-conf_prewikka_conf
new file mode 100644
index 00000000000..b12ef43c4cb
--- /dev/null
+++ b/security/prelude/prewikka/patches/patch-conf_prewikka_conf
@@ -0,0 +1,12 @@
+$OpenBSD: patch-conf_prewikka_conf,v 1.4 2006/11/11 19:33:57 aanriot Exp $
+--- conf/prewikka.conf.orig	Sun Nov  5 01:36:37 2006
++++ conf/prewikka.conf	Sun Nov  5 01:37:03 2006
+@@ -31,7 +31,7 @@ user: prelude
+ pass: prelude
+ name: prewikka
+ 
+-[log stderr]
++#[log stderr]
+ 
+ [auth loginpassword]
+ expiration: 60
diff --git a/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh b/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh
index c97e7abbe3d..50e7462eb7f 100644
--- a/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh
+++ b/security/prelude/prewikka/patches/patch-database_mysql2sqlite_sh
@@ -1,4 +1,4 @@
-$OpenBSD: patch-database_mysql2sqlite_sh,v 1.1 2006/10/06 08:04:23 aanriot Exp $
+$OpenBSD: patch-database_mysql2sqlite_sh,v 1.2 2006/11/11 19:33:57 aanriot Exp $
 --- database/mysql2sqlite.sh.orig	Tue Jan 10 09:22:21 2006
 +++ database/mysql2sqlite.sh	Thu Oct  5 15:59:49 2006
 @@ -2,7 +2,7 @@
@@ -6,7 +6,7 @@ $OpenBSD: patch-database_mysql2sqlite_sh,v 1.1 2006/10/06 08:04:23 aanriot Exp $
  	-e 's/#.*//' \
  	-e '/^DROP /d' \
 -	-e 's/\w*INT /INTEGER /' \
-+	-e 's/[a-zA-Z]*INT[ E]/INTEGER /' \
++	-e 's/[a-zA-Z]*INT /INTEGER /' \
  	-e 's/UNSIGNED //' \
  	-e 's/ENUM([^)]\+)/TEXT/' \
  	-e 's/VARCHAR([^)]\+)/TEXT/' \