Fixed broken installation routine, bump to 9.2.1 and updated postinstall

instructions.
(Portage version: 2.1.4_rc7)

3 files changed, 29 insertions, 23 deletions

diff --git a/www-apps/dragonflycms/ChangeLog b/www-apps/dragonflycms/ChangeLog
index 03283072bad6..3d7d04d46057 100644
--- a/www-apps/dragonflycms/ChangeLog
+++ b/www-apps/dragonflycms/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/dragonflycms
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.18 2008/02/22 15:49:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/ChangeLog,v 1.19 2008/02/28 07:06:41 wrobel Exp $
+
+*dragonflycms-9.2.1 (28 Feb 2008)
+
+  28 Feb 2008; Gunnar Wrobel <wrobel@gentoo.org> files/postinstall-en.txt,
+  -dragonflycms-9.1.2.1.ebuild, +dragonflycms-9.2.1.ebuild:
+  Fixed broken installation routine, bump to 9.2.1 and updated postinstall
+  instructions.
 
   22 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
   dragonflycms-9.1.2.1.ebuild:
diff --git a/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild b/www-apps/dragonflycms/dragonflycms-9.2.1.ebuild
index 5f82ee9ccef8..8bfbef8a26ef 100644
--- a/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild
+++ b/www-apps/dragonflycms/dragonflycms-9.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.1.2.1.ebuild,v 1.3 2008/02/22 15:49:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/dragonflycms/dragonflycms-9.2.1.ebuild,v 1.1 2008/02/28 07:06:41 wrobel Exp $
 
 inherit webapp depend.php
 
@@ -23,7 +23,7 @@ S="${WORKDIR}"
 
 pkg_nofetch() {
 	einfo "Please download ${MY_P}.tar.bz2 from:"
-	einfo "http://dragonflycms.org/Downloads/get=263.html"
+	einfo "http://dragonflycms.org/Downloads/get=28.html"
 	einfo "and move it to ${DISTDIR}"
 }
 
@@ -33,7 +33,7 @@ src_install() {
 	dodoc documentation/{BACKUP,IMPORTANT_NOTES,INSTALL,README,UPGRADE}.txt
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r public_html/
+	doins -r public_html/*
 
 	webapp_configfile "${MY_HTDOCSDIR}"/install/config.php
 
diff --git a/www-apps/dragonflycms/files/postinstall-en.txt b/www-apps/dragonflycms/files/postinstall-en.txt
index 4c3cf1837adf..34b47080868a 100644
--- a/www-apps/dragonflycms/files/postinstall-en.txt
+++ b/www-apps/dragonflycms/files/postinstall-en.txt
@@ -1,25 +1,24 @@
-To complete your installation, you must
+You will need to provide a database for your ${PN} installation.
 
-1) Create a new database, for example, 'dragonfly': mysqladmin create dragonfly
-   OR add a database through your web control panel.
-   
-2) Edit the file "config.php". Change all the fields until you are happy with
-   the changes and they fit the need of your web site. Give special attention
-   to the database configuration section. When you have finished editing
-   config.php, save it.
-	 
-3) install by going to http://localhost/dragonflycms/install.php
+This assumes you have some knowledge of MySQL, and already have it
+installed and configured. If not, please refer to the Gentoo MySQL
+guide at the following URL:
 
-4) IMPORTANT: certain directories have been chmodded 755 if you don't have
-no-suexec in your useflags! if however you don't use suexec please change the
-permissions on following dirs to 777
-	- cache
-	- modules/coppermine/albums
-	- modules/coppermine/albums/userpics
-	- uploads/avatars
-	- uploads/forums
+http://www.gentoo.org/doc/en/mysql-howto.xml
 
+Once you have a database ready all you need to do is to go to this 
+location
 
-Enjoy DragonFly!!!
+http://${VHOST_HOSTNAME}/${VHOST_APPDIR}/install.php
 
+and provide the credentials required for the database access.
 
+Note the credentials of the administration user you will generate
+during the installation procedure.
+
+For your own security you will need to remove the installation tools
+by running
+
+rm -rf ${MY_INSTALLDIR}/install*
+
+Enjoy ${PN}!