Patched Database.php to fix create index bug

6 files changed, 87 insertions, 9 deletions

diff --git a/net-www/phpwebsite/ChangeLog b/net-www/phpwebsite/ChangeLog
index 34cc1e149d31..e2fb5eef3dea 100644
--- a/net-www/phpwebsite/ChangeLog
+++ b/net-www/phpwebsite/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/phpwebsite
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.11 2003/12/16 02:41:53 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.12 2004/01/06 18:40:46 rizzo Exp $
+
+*phpwebsite-0.9.3_p2-r1 (06 Jan 2004)
+
+  06 Jan 2004; Don Seiler <rizzo@gentoo.org>; phpwebsite-0.9.3_p1-r1.ebuild,
+  phpwebsite-0.9.3_p2-r1.ebuild, phpwebsite-0.9.3_p2.ebuild:
+  Adding in fixed Database.php
 
 *phpwebsite-0.9.3_p2 (15 Dec 2003)
 
diff --git a/net-www/phpwebsite/Manifest b/net-www/phpwebsite/Manifest
index 27e1b163ad9c..3472fb9b23fd 100644
--- a/net-www/phpwebsite/Manifest
+++ b/net-www/phpwebsite/Manifest
@@ -1,7 +1,7 @@
-MD5 1e83376a133a0cbc1a2791d77c831529 phpwebsite-0.9.3_p2.ebuild 1943
-MD5 7d452d8a8d68dd59a8d80f68a751190e phpwebsite-0.9.3_p2-r1.ebuild 1993
-MD5 c590ad4544fcf54cf12f651414b4ea7e phpwebsite-0.9.3_p1-r1.ebuild 1970
-MD5 efe786c0994abe3d64a10ce5321d8cc3 ChangeLog 1782
+MD5 45311cfd6d354609f8cb240e71fc63dc phpwebsite-0.9.3_p2.ebuild 1943
+MD5 e83fb96f448a054b88d1496fe40db09f phpwebsite-0.9.3_p2-r1.ebuild 2089
+MD5 493db8b2833babafa47b7c2cddb87166 phpwebsite-0.9.3_p1-r1.ebuild 1969
+MD5 f87e6f1634563e40fb7e1d47b9561517 ChangeLog 1991
 MD5 ecbb5a02001856289bc050635b8d8394 metadata.xml 522
 MD5 cfee6010162e807cab7db166192cc4d0 files/digest-phpwebsite-0.9.3_p1-r1 76
 MD5 5d0bf869aca158f5d35948955a1aafee files/digest-phpwebsite-0.9.3_p2-r1 136
diff --git a/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p2-r1 b/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p2-r1
new file mode 100644
index 000000000000..ebb2e9494dd8
--- /dev/null
+++ b/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p2-r1
@@ -0,0 +1,2 @@
+MD5 7cfcb9f27e92649fa7be2180f49f3929 phpwebsite-0.9.3-2-full.tar.gz 3157016
+MD5 af07936975e9db44c878669c46cd4d82 Database0932.zip 11203
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
index 24a9256b427f..df6676e48f0f 100644
--- a/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
+++ b/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild,v 1.4 2003/12/15 20:51:18 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild,v 1.5 2004/01/06 18:40:46 rizzo Exp $
 
 inherit webapp-apache
 
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild
new file mode 100644
index 000000000000..f36cd77d551c
--- /dev/null
+++ b/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild,v 1.1 2004/01/06 18:40:46 rizzo Exp $
+
+inherit webapp-apache
+
+MY_PV="${PV/_p/-}"
+S="${WORKDIR}/${PN}-${MY_PV}-full"
+DESCRIPTION="phpWebSite provides a complete web site content management system. Web-based administration allows for easy maintenance of interactive, community-driven web sites."
+HOMEPAGE="http://phpwebsite.appstate.edu"
+SRC_URI="mirror://sourceforge/phpwebsite/${PN}-${MY_PV}-full.tar.gz
+		http://phpwsbb.sourceforge.net/Database0932.zip"
+RESTRICT="nomirror"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND=">=sys-devel/patch-2.5.9"
+RDEPEND="virtual/php
+		 dev-db/mysql"
+
+webapp-detect || NO_WEBSERVER=1
+
+pkg_setup() {
+	webapp-pkg_setup "${NO_WEBSERVER}"
+	einfo "Installing for ${WEBAPP_SERVER}"
+}
+
+src_unpack() {
+	unpack ${PN}-${MY_PV}-full.tar.gz
+	cd ${S}/core/
+	unpack Database0932.zip
+}
+
+src_install() {
+	webapp-mkdirs
+
+	dodir "${HTTPD_ROOT}/phpwebsite"
+	cp -a * "${D}/${HTTPD_ROOT}/phpwebsite"
+	dodoc ${S}/docs/*.txt
+	dodoc ${S}/docs/*.php
+	dodoc ${S}/docs/developers/*.txt
+	dodoc ${S}/docs/developers/*.php
+
+	#cd "${D}/${HTTPD_ROOT}"
+	chown -R "${HTTPD_USER}:${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpwebsite"
+	chmod 0775 "${D}/${HTTPD_ROOT}/phpwebsite"
+	find "${D}/${HTTPD_ROOT}/phpwebsite/" -type d | xargs chmod 2775
+	find "${D}/${HTTPD_ROOT}/phpwebsite/" -type f | xargs chmod 0664
+	chmod 0555 "${D}/${HTTPD_ROOT}/phpwebsite/setup/*.sh"
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You will need to create a database for phpWebSite"
+	einfo "on your own before starting setup."
+	einfo
+	#einfo "cd ${HTTPD_ROOT}/phpwebsite/setup"
+	#einfo "./secure_setup.sh setup"
+	#einfo
+	einfo "Once you have a database ready proceed to"
+	einfo "http://$HOSTNAME/phpwebsite to continue installation."
+	einfo
+	einfo "Once you are done with installation you need to run"
+	einfo
+	einfo "cd ${HTTPD_ROOT}/phpwebsite/setup"
+	einfo "./secure_phpws.sh run apache users"
+	einfo
+}
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild
index fb39de59c6a1..9591f9dc3717 100644
--- a/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild
+++ b/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild,v 1.1 2003/12/16 02:41:53 rizzo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild,v 1.2 2004/01/06 18:40:46 rizzo Exp $
 
 inherit webapp-apache