Fixed broken installation routine, bump to 9.2.1 and updated postinstall

instructions.
Package-Manager: portage-2.1.4_rc7

4 files changed, 37 insertions, 31 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/Manifest b/www-apps/dragonflycms/Manifest
index bf833fa9097d..a62aae22530a 100644
--- a/www-apps/dragonflycms/Manifest
+++ b/www-apps/dragonflycms/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX postinstall-en.txt 826 RMD160 c3eb5b5b0c28e8efd1901f37bee026ae1eb00804 SHA1 410ae02e2b882424011122a0dcb104d50a19811c SHA256 7482db56b00602f3b55fc7a214e3988ade65c4055b4db9bd926c7f6c287ce439
-DIST Dragonfly9.1.2.1.tar.bz2 1433301 RMD160 81d84bc9175d954c75576344ef45468d487ce5c6 SHA1 f5512fb806c3261bc6aff775e1534c38aa179985 SHA256 0544ad79ec8d035ed4c436eeca265195e0af152ec0c9f3fde1d7af9efaf087f5
-EBUILD dragonflycms-9.1.2.1.ebuild 1250 RMD160 69e4a6425cabaf965e2857a195f086514f7efe1c SHA1 c1d21c36c490f526c50798531c14d319b2f7b8a2 SHA256 c7de267f9fe6851b701f41c85f06c878de09629ddfc3794d55420bddbd96794e
-MISC ChangeLog 2739 RMD160 d66d17d138a63360fcce65ce425532a7a8a4815f SHA1 47a82ed8a72e1b72542f3f691f191876b92a0343 SHA256 15545c1dca0792f48dffac7484fdbdfa2ad74004811e3f44ad63c3d9c76b1bca
+AUX postinstall-en.txt 700 RMD160 2c5a5b0c952afcd69524ab0080d2cc0c0d60454f SHA1 5958d94ed653cc0509c785ab1b0b8901bc094f6c SHA256 98e263b06fa2c41866a29caec883c05ca08f935bc4dd354a91c1dc24cd1ed00e
+DIST Dragonfly9.2.1.tar.bz2 1411421 RMD160 b0aeb92fc3a9804d36f74db58b9abf0574c03472 SHA1 ff975ed60eed805397c01c51724f6a463ffd8371 SHA256 b827e55fcf0fbddf99c22d8ce4185b66905bb858affd5fc2379c2257839f6ae1
+EBUILD dragonflycms-9.2.1.ebuild 1248 RMD160 ef118765c6d14696ad6b5f2c01fa514817191e87 SHA1 7977ecea548d1b78dce7dfefa9fe65cf7c68453e SHA256 40746b4c137c0945505799a5744b51a8c759c9681c3b40c76a1dddccc15612f8
+MISC ChangeLog 3001 RMD160 474c0b8e30eb33e09e0d2f999895571a45631b00 SHA1 68deede8cfa677f0fccc3dc9f2395fbd8fdf8a3b SHA256 81e84dae676f6aafa5d0ba928c72a1603dd1a7729e49af6c85dee4f198d97952
 MISC metadata.xml 500 RMD160 fc35a4871a65227eb6cb50a3d86ff46883ca460f SHA1 3959911b92d1736a6a0ca48a93606f3f135cc318 SHA256 4be57cf2c31d5212f3fae4d87a0f2d693462aebcce0b6cc97e29ea67430fe664
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iEYEARECAAYFAke+7w4ACgkQmPFBzbX68WEOEQCfRL4BWLywQiZV1YasLaLhP649
-XDYAnigdoMNayVUqdJw0GM1SEjOlJw4/
-=wtIR
+iD8DBQFHxl2HEEcxCpcDQ74RAnoLAJ96cbn7ym3tOJH/W3fKeNBmyuw30gCgmPFA
+NNqHE6S+hHEI1MY9REWFT3U=
+=YtuD
 -----END PGP SIGNATURE-----
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}!