Version bump. Cleaned up postinstall instructions. Closes #59170.

5 files changed, 95 insertions, 18 deletions

diff --git a/www-apps/tikiwiki/ChangeLog b/www-apps/tikiwiki/ChangeLog
index bf38e2b028d8..9e383a5e7c37 100644
--- a/www-apps/tikiwiki/ChangeLog
+++ b/www-apps/tikiwiki/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/tikiwiki
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.1 2004/08/15 15:44:07 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/ChangeLog,v 1.2 2004/08/30 19:56:57 rl03 Exp $
+
+*tikiwiki-1.8.4 (30 Aug 2004)
+
+  30 Aug 2004; Renat Lumpau <rl03@gentoo.org> files/postinstall-en.txt,
+  +tikiwiki-1.8.4.ebuild:
+  Version bump. Cleaned up postinstall instructions. Closes #59170.
 
 *tikiwiki-1.8.3 (15 Aug 2004)
 
diff --git a/www-apps/tikiwiki/Manifest b/www-apps/tikiwiki/Manifest
index 9372afe4dd1a..fffa7f462bc5 100644
--- a/www-apps/tikiwiki/Manifest
+++ b/www-apps/tikiwiki/Manifest
@@ -1,9 +1,11 @@
-MD5 10e700f5e72d5bd98db8aed8aa037f99 tikiwiki-1.8.2.ebuild 1635
+MD5 019fed8d7f73afcb6663c34014802f61 tikiwiki-1.8.2.ebuild 1635
+MD5 e35543eb8e3fea424c1e43da745df38f tikiwiki-1.8.4.ebuild 1946
+MD5 734e95d383d5ffd6c6117dcacc7483c7 ChangeLog 1919
 MD5 c339473e0ff43da76eb2f2607c441921 metadata.xml 280
-MD5 0bbd5547d7480794de55335296ba3768 ChangeLog 1467
-MD5 d4b710d3f2d93edbaea90bfbc3342031 tikiwiki-1.8.2-r1.ebuild 1978
-MD5 18e65d6c028b0b174d1836e2044345e2 tikiwiki-1.8.3.ebuild 1950
-MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2 68
-MD5 bd86652016f6c4480eda7199fa25ebd9 files/postinstall-en.txt 1407
+MD5 a2d9ce37654e5644d6ae92f6e3f82d56 tikiwiki-1.8.3.ebuild 1950
+MD5 ea2fb140c39492e75c1140472ac58b5e tikiwiki-1.8.2-r1.ebuild 1978
+MD5 1dc0330a9bc435b3eae532688c95c278 files/postinstall-en.txt 1288
 MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2-r1 68
+MD5 02710bef8251c7989bb55efc5628bcc6 files/digest-tikiwiki-1.8.2 68
 MD5 a0ee80f78f566fc992524890c3222b78 files/digest-tikiwiki-1.8.3 68
+MD5 d43326550a6aaa9078722f5fb371859a files/digest-tikiwiki-1.8.4 68
diff --git a/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4 b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4
new file mode 100644
index 000000000000..fb56a54752fd
--- /dev/null
+++ b/www-apps/tikiwiki/files/digest-tikiwiki-1.8.4
@@ -0,0 +1 @@
+MD5 ce102d08d5f74dcb5fbf812aa86bb2ed tikiwiki-1.8.4.tar.bz2 5500352
diff --git a/www-apps/tikiwiki/files/postinstall-en.txt b/www-apps/tikiwiki/files/postinstall-en.txt
index fab991414186..f64e6e6fae45 100644
--- a/www-apps/tikiwiki/files/postinstall-en.txt
+++ b/www-apps/tikiwiki/files/postinstall-en.txt
@@ -16,7 +16,7 @@ __EOSQL
 
 
 TikiWiki likes to have a generous PHP environment.  Please edit
-/etc/php4/php.ini or arrange the settings through another mechanism such as
+your php.ini or arrange the settings through another mechanism such as
 Apache .htaccess files.
 
 Tiki requires PHP to have :
@@ -27,9 +27,8 @@ Tiki likes PHP to have :
     ==> 'file_uploads = On'
 
 
-Please read the files in:
-${G_HTDOCSDIR}${G_INSTALLDIR}doc 
-especially if you want clean URLS under Apache.
+Please read the files in ${MY_INSTALLDIR}/doc
+especially if you want clean URLs under Apache.
 
 You may find further information on the Tiki website
     ==> http://tikiwiki.org/InstallGettingStarted
@@ -40,15 +39,10 @@ Note: The equivalent of running setup.sh has already been completed.
 Now, point your browser to the location of tiki-install.php to complete the
 setup/upgrade.  For example:
 
-http://${G_HOSTNAME}/${G_INSTALLDIR}/tiki-install.php
-
+http://${VHOST_HOSTNAME}/tiki-install.php
 
 You may need to manually rename tiki-install.php to tiki-install.done to
-secure your system.  For example:
-
-cd ${G_HTDOCSDIR}${G_INSTALLDIR}
-mv tiki-install.php tiki-install.done
-
+secure your system.
 
 Enjoy your TikiWiki site.
 
diff --git a/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild b/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild
new file mode 100644
index 000000000000..8b9f7bed611c
--- /dev/null
+++ b/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/tikiwiki/tikiwiki-1.8.4.ebuild,v 1.1 2004/08/30 19:56:57 rl03 Exp $
+
+inherit webapp
+
+DESCRIPTION="Full featured Web Content Management System using Php and Smarty Templates"
+HOMEPAGE="http://tikiwiki.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+IUSE=""
+KEYWORDS="~x86 ~ppc ~sparc"
+
+RDEPEND="virtual/php
+	media-gfx/graphviz"
+
+
+src_install() {
+	webapp_src_preinst
+
+	local DIR
+	local DIRENTRY
+	local DIRS="backups db dump img/wiki
+		img/wiki_up modules/cache temp temp/cache
+		templates_c templates styles lib/Galaxia/processes"
+
+
+	# Ensure that directories exist, some don't.
+	# (part of setup.sh)
+	#
+	for DIR in ${DIRS}; do
+		mkdir -p ${DIR}
+	done
+
+	# Remove the execute permission from the setup.sh script
+	# and rename it.  Its actions have been incorporated here.
+	#
+	chmod a-x setup.sh
+	mv setup.sh setup.sh.done
+
+	# Install the minimal doc (points to web page)
+	#
+	dodoc doc/readme.txt doc/htaccess doc/htaccess.readme INSTALL README
+
+	# The bulk goes into htdocs
+	# but don't copy INSTALL and README
+	cp -a [[:lower:]]* ${D}/${MY_HTDOCSDIR}
+
+	# Recursively set server ownership to allow server to write
+	# This is the rough equivalent of the setup.sh script
+	# provided in the distribution.
+	# Note: Cannot use xargs or find -exec here because 
+	# 		these don't	work with shell functions.
+	#
+	webapp_serverowned ${MY_HTDOCSDIR}
+	for DIR in ${DIRS}; do
+		find ${DIR} | while read DIRENTRY; do
+			webapp_serverowned ${MY_HTDOCSDIR}/${DIRENTRY}
+		done
+	done
+
+	# Flag files for scripting engine
+	#
+	find . -name '*.php' -a ! -name '*.inc.php' | while read DIRENTRY; do
+		webapp_runbycgibin php ${MY_HTDOCSDIR}/${DIRENTRY}
+	done
+
+	# Setup some post-install notes for webapp-config
+	#
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en.txt
+
+	webapp_src_install
+}