From d20e9511d8c674dcfbb12fd9e42d002b8434301b Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 6 Nov 2010 08:38:44 +0000
Subject: [PATCH] Merge MESSAGE into README.

---
 www/tikiwiki/Makefile    |  4 ++--
 www/tikiwiki/pkg/MESSAGE | 16 ----------------
 www/tikiwiki/pkg/README  | 21 ++++++++++++++++++++-
 3 files changed, 22 insertions(+), 19 deletions(-)
 delete mode 100644 www/tikiwiki/pkg/MESSAGE

diff --git a/www/tikiwiki/Makefile b/www/tikiwiki/Makefile
index 431ea7f03c6..69db13e74e7 100644
--- a/www/tikiwiki/Makefile
+++ b/www/tikiwiki/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2010/11/06 08:27:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2010/11/06 08:38:44 ajacoutot Exp $
 
 COMMENT=	all-in-one wiki/groupware/CMS solution
 
@@ -6,7 +6,7 @@ V=		4.2
 DISTNAME=	tikiwiki-${V}
 CATEGORIES=	www
 
-REVISION=	0
+REVISION=	1
 
 HOMEPAGE=	http://tikiwiki.org/
 
diff --git a/www/tikiwiki/pkg/MESSAGE b/www/tikiwiki/pkg/MESSAGE
deleted file mode 100644
index 37261d73456..00000000000
--- a/www/tikiwiki/pkg/MESSAGE
+++ /dev/null
@@ -1,16 +0,0 @@
-Tikiwiki has been installed into ${INSTDIR}
-
-You should point this to the DocumentRoot of your web-server:
- # ln -s ../tikiwiki /var/www/htdocs/tikiwiki
-(make sure you use a relative symlink since Apache is chrooted)
-
-*** First install
-To complete the installation, make sure you read
-${INSTDIR}/README.OpenBSD then point your web browser to:
-http://<hostname>/tikiwiki/tiki-install.php
-
-*** Upgrade
-To complete the upgrade, you must update your database schema using the
-scripts under ${INSTDIR}/tikiwiki/db/.
-Make sure to read the official documentation at:
-http://tikiwiki.org/ReleaseNotes20#1_9_x_to_2_0_migration_tips
diff --git a/www/tikiwiki/pkg/README b/www/tikiwiki/pkg/README
index 2dc5bf4cb52..0b1b843e10f 100644
--- a/www/tikiwiki/pkg/README
+++ b/www/tikiwiki/pkg/README
@@ -1,4 +1,23 @@
-$OpenBSD: README,v 1.1 2010/11/06 08:27:27 ajacoutot Exp $
+$OpenBSD: README,v 1.2 2010/11/06 08:38:44 ajacoutot Exp $
+
+Post-install/update instructions for Tikiwiki
+=============================================
+
+Tikiwiki has been installed into ${INSTDIR}
+
+You should point this to the DocumentRoot of your web-server:
+ # ln -s ../tikiwiki /var/www/htdocs/tikiwiki
+(make sure you use a relative symlink since Apache is chrooted)
+
+*** First install
+To complete the installation point your web browser to:
+http://<hostname>/tikiwiki/tiki-install.php
+
+*** Upgrade
+To complete the upgrade, you must update your database schema using the
+scripts under ${INSTDIR}/tikiwiki/db/.
+Make sure to read the official documentation at:
+http://tikiwiki.org/ReleaseNotes20#1_9_x_to_2_0_migration_tips
 
 The default superuser account is: admin (password: admin).