moving webapp-detect to pkg_setup

6 files changed, 8 insertions, 137 deletions

diff --git a/net-www/phpwebsite/ChangeLog b/net-www/phpwebsite/ChangeLog
index e2fb5eef3dea..0691e971cf34 100644
--- a/net-www/phpwebsite/ChangeLog
+++ b/net-www/phpwebsite/ChangeLog
@@ -1,6 +1,10 @@
 # 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.12 2004/01/06 18:40:46 rizzo Exp $
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/ChangeLog,v 1.13 2004/04/19 07:46:00 mholzer Exp $
+
+  19 Apr 2004; Martin Holzer <mholzer@gentoo.org>
+  phpwebsite-0.9.3_p2-r1.ebuild:
+  moving webapp-detect to pkg_setup
 
 *phpwebsite-0.9.3_p2-r1 (06 Jan 2004)
 
diff --git a/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p1-r1 b/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p1-r1
deleted file mode 100644
index 836436e68bbd..000000000000
--- a/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6932620b038ccaf837e9a798488fedb4 phpwebsite-0.9.3-1-full.tar.gz 2854621
diff --git a/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p2 b/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p2
deleted file mode 100644
index c7d71cbd1a51..000000000000
--- a/net-www/phpwebsite/files/digest-phpwebsite-0.9.3_p2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7cfcb9f27e92649fa7be2180f49f3929 phpwebsite-0.9.3-2-full.tar.gz 3157016
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
deleted file mode 100644
index df6676e48f0f..000000000000
--- a/net-www/phpwebsite/phpwebsite-0.9.3_p1-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.5 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"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha"
-
-DEPEND=">=sys-devel/patch-2.5.9"
-RDEPEND="virtual/php"
-
-webapp-detect || NO_WEBSERVER=1
-
-pkg_setup() {
-	webapp-pkg_setup "${NO_WEBSERVER}"
-	einfo "Installing for ${WEBAPP_SERVER}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-supplemental.patch
-	cd ${S}/setup
-	cp ${FILESDIR}/update.php-${PV} .
-}
-
-src_install() {
-	webapp-mkdirs
-
-	dodir "${HTTPD_ROOT}/phpwebsite"
-	cp -a * "${D}/${HTTPD_ROOT}/phpwebsite"
-	dodoc ${S}/docs/*
-
-	#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-r1.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild
index f36cd77d551c..04b9719d9be5 100644
--- a/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild
+++ b/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpwebsite/phpwebsite-0.9.3_p2-r1.ebuild,v 1.2 2004/04/19 07:46:00 mholzer Exp $
 
 inherit webapp-apache
 
@@ -10,7 +10,6 @@ DESCRIPTION="phpWebSite provides a complete web site content management system.
 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"
@@ -20,9 +19,9 @@ DEPEND=">=sys-devel/patch-2.5.9"
 RDEPEND="virtual/php
 		 dev-db/mysql"
 
-webapp-detect || NO_WEBSERVER=1
 
 pkg_setup() {
+	webapp-detect || NO_WEBSERVER=1
 	webapp-pkg_setup "${NO_WEBSERVER}"
 	einfo "Installing for ${WEBAPP_SERVER}"
 }
diff --git a/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild b/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild
deleted file mode 100644
index 9591f9dc3717..000000000000
--- a/net-www/phpwebsite/phpwebsite-0.9.3_p2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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.2 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"
-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_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
-}