be honest to comments in bug #81671

Package-Manager: portage-2.0.51-r15

4 files changed, 70 insertions, 6 deletions

diff --git a/www-apps/mediawiki/ChangeLog b/www-apps/mediawiki/ChangeLog
index fa4243ec8590..637b79bc11dd 100644
--- a/www-apps/mediawiki/ChangeLog
+++ b/www-apps/mediawiki/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-apps/mediawiki
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.7 2005/02/17 02:02:48 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/ChangeLog,v 1.8 2005/02/17 04:28:54 trapni Exp $
+
+  17 Feb 2005; Christian Parpart <trapni@gentoo.org>
+  +files/postinstall-1.4-en.txt:
+  be honest to comments in bug #81671
 
 *mediawiki-1.4.0_beta6 (17 Feb 2005)
 
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index c9dc56f843c4..6b4fb59188e8 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,11 +1,12 @@
-MD5 bdf728f655375991838a65c6cbd04767 ChangeLog 1406
+MD5 f40e3355092577f6879868582b0ae5d9 ChangeLog 1531
 MD5 d4cefb1e8b2ce25b591d6e58b25ea5b0 mediawiki-1.3.10.ebuild 2887
 MD5 8505d1d4f9e8fb24f4b443b93c9a83ad mediawiki-1.3.9.ebuild 2905
 MD5 0e201daa491640c742b312e06075cbc5 metadata.xml 225
 MD5 35a0e6cf4443d23878ea785986f334ea mediawiki-1.3.8.ebuild 2907
-MD5 9019470fe1ad27860826df85ec4fbe0d mediawiki-1.4.0_beta6.ebuild 2752
+MD5 aeddff7b218bc1f7bff167d67002ed7f mediawiki-1.4.0_beta6.ebuild 2783
 MD5 f083e5c34cf1201e213e4b2daa3b289a files/digest-mediawiki-1.3.8 68
 MD5 e7fd7d166aef336c1a208037b713c73f files/digest-mediawiki-1.3.9 68
 MD5 85f32b5fca9afd6479cdcea022c096f2 files/postinstall-en.txt 1731
 MD5 65a9a4a88505bddcab12d66386dde551 files/digest-mediawiki-1.3.10 69
 MD5 879799e2704ed2b265e9891f6712447f files/digest-mediawiki-1.4.0_beta6 71
+MD5 7ec90d807694699cb90d9a56ec2ff67b files/postinstall-1.4-en.txt 1843
diff --git a/www-apps/mediawiki/files/postinstall-1.4-en.txt b/www-apps/mediawiki/files/postinstall-1.4-en.txt
new file mode 100644
index 000000000000..b1da07d51d95
--- /dev/null
+++ b/www-apps/mediawiki/files/postinstall-1.4-en.txt
@@ -0,0 +1,58 @@
+
+Completing setup:
+
+To complete installation cd into the MediaWiki install location, but
+make sure to start mysql first with:
+
+$ /etc/init.d/mysql start
+
+$ cd /var/www/localhost/htdocs/mediawiki/
+
+The host directory, localhost, may change depending on your installation.
+
+Then temporarily make the MediaWiki /config directory writable
+to the  user the web server is running as. The quickest way is 
+to make  the directory world writable.  For example:
+
+$ chmod a+w config
+ 
+Then access it, for example:
+
+lynx http://localhost/mediawiki/config/
+ 
+After setup move the newly created LocalSettings.php from the config/
+directory to the main mediawiki directory, for example:
+  
+$ mv config/LocalSettings.php .
+
+    Remember to restore safe permissions to the MediaWiki config/ and
+    LocalSettings.php (which contains clear-text passwords).
+    chmod a-w config
+    chmod ug=r,o=  LocalSettings.php
+    chown root:apache LocalSettings.php
+
+After these steps MediaWiki should be accesable at
+http://localhost/mediawiki/
+ 
+Enabling Optional Features:
+
+If you wish to enable image uploads then you must manually edit the
+LocalSettings.php file to uncomment the \$wgDisableUploads line.  
+If MediaWiki was built with the imagemagick USE-flag the directory
+permissions are correct, otherwise you must install ImageMagick and
+also adjust permissions on the images directory to allow the server
+to write.  For example:
+ 
+$ chown apache:apache /var/www/localhost/htdocs/mediawiki/images
+
+Math Support:
+
+If you wish to enable the math support then you must manually edit" 
+the LocalSettings.php file to uncomment the \$wgUseTeX line.
+MediaWiki must have been built with the math USE-flag enabled or the
+necessary support executable will not be present.
+You may also have to execute
+
+$ texconfig dvips printcmd -
+
+if you have not configured tetex before.
diff --git a/www-apps/mediawiki/mediawiki-1.4.0_beta6.ebuild b/www-apps/mediawiki/mediawiki-1.4.0_beta6.ebuild
index 8ba2bfac038b..0709be4fc05e 100644
--- a/www-apps/mediawiki/mediawiki-1.4.0_beta6.ebuild
+++ b/www-apps/mediawiki/mediawiki-1.4.0_beta6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.4.0_beta6.ebuild,v 1.1 2005/02/17 02:02:48 trapni Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/mediawiki/mediawiki-1.4.0_beta6.ebuild,v 1.2 2005/02/17 04:28:54 trapni Exp $
 
 inherit webapp
 
@@ -19,7 +19,8 @@ DEPEND="math? ( >=dev-lang/ocaml-3.0.6 )"
 RDEPEND="virtual/php
 		 >=dev-db/mysql-4
 		 math? ( app-text/tetex
-		 		 app-text/ghostscript )
+		 		 app-text/ghostscript
+				 media-gfx/imagemagick )
 		 imagemagick? ( media-gfx/imagemagick )"
 
 src_compile() {
@@ -108,6 +109,6 @@ src_install() {
 		webapp_serverowned ${MY_HTDOCSDIR}/images/tmp
 	fi
 
-	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+	webapp_postinst_txt en ${FILESDIR}/postinstall-1.4-en.txt
 	webapp_src_install
 }