summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStuart Herbert <stuart@gentoo.org>2003-08-03 19:29:15 +0000
committerStuart Herbert <stuart@gentoo.org>2003-08-03 19:29:15 +0000
commit6e2354873a2b0326f946d79952f3aa96a50f358e (patch)
tree45771193a3b4ec353f1503d90b4521a1d1559fde /net-www/phpBB
parentAdded acknowledgement of Ian Leitch's contribution (diff)
downloadgentoo-2-6e2354873a2b0326f946d79952f3aa96a50f358e.tar.gz
gentoo-2-6e2354873a2b0326f946d79952f3aa96a50f358e.tar.bz2
gentoo-2-6e2354873a2b0326f946d79952f3aa96a50f358e.zip
Fix for bug #25061
Diffstat (limited to 'net-www/phpBB')
-rw-r--r--net-www/phpBB/Manifest2
-rw-r--r--net-www/phpBB/phpBB-2.0.5.ebuild22
2 files changed, 11 insertions, 13 deletions
diff --git a/net-www/phpBB/Manifest b/net-www/phpBB/Manifest
index d4d0763f83b9..504978755cd0 100644
--- a/net-www/phpBB/Manifest
+++ b/net-www/phpBB/Manifest
@@ -1,4 +1,4 @@
-MD5 4a19fcfcfcffdc9ae043a36e093cb222 phpBB-2.0.5.ebuild 1498
+MD5 15adaf31c00c498e612fc15748db3861 phpBB-2.0.5.ebuild 1300
MD5 f6af7020b2e58fda3d18fb6650f9921c phpBB-2.0.4.ebuild 1444
MD5 e3ffd195d56f5b33813705d1b0a2a438 ChangeLog 528
MD5 1c9cf1de5be80b37285838551452ebf4 files/digest-phpBB-2.0.4 63
diff --git a/net-www/phpBB/phpBB-2.0.5.ebuild b/net-www/phpBB/phpBB-2.0.5.ebuild
index 528d18153403..c42031430ce6 100644
--- a/net-www/phpBB/phpBB-2.0.5.ebuild
+++ b/net-www/phpBB/phpBB-2.0.5.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License, v2 or later
# Maintainer: Tim Raedisch <tim.raedisch@udo.edu>
-# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.5.ebuild,v 1.1 2003/06/20 08:53:38 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/phpBB/phpBB-2.0.5.ebuild,v 1.2 2003/08/03 19:29:07 stuart Exp $
S=${WORKDIR}/${PN}2
DESCRIPTION="phpBB is a high powered, fully scalable, and highly customisable open-source bulletin board package."
@@ -14,15 +14,12 @@ KEYWORDS="~x86 ~ppc ~sparc ~alpha"
DEPEND="virtual/php"
-HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache/conf/apache.conf | cut -d\ -f2`"
-[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="`grep '^DocumentRoot' /etc/apache2/conf/apache.conf | cut -d\ -f2`"
-[ -z "${HTTPD_ROOT}" ] && HTTPD_ROOT="/home/httpd/htdocs"
-HTTPD_USER="apache"
-HTTPD_GROUP="apache"
-
+inherit webapp-apache
+webapp-determine-installowner
+webapp-determine-htdocsdir
pkg_setup() {
- if [ -L ${HTTPD_ROOT}/phpbb ] ; then
+ if [ -d ${HTTPD_ROOT}/phpbb ] ; then
ewarn "You need to unmerge your old phpBB version first."
ewarn "phpBB will be installed into ${HTTPD_ROOT}/phpbb"
ewarn "directly instead of a version-dependant directory."
@@ -37,11 +34,12 @@ src_compile() {
src_install() {
cd ${S}
- dodir ${HTTPD_ROOT}/phpbb
- cp -r * ${D}/${HTTPD_ROOT}/phpbb
- cd ${D}/${HTTPD_ROOT}
- chown -R ${HTTPD_USER}.${HTTPD_GROUP} ${D}/${HTTPD_ROOT}/phpbb
+ dodir "${HTTPD_ROOT}/phpbb"
+ cp -a * "${D}/${HTTPD_ROOT}/phpbb"
dodoc ${S}/docs/*
+
+ cd "${D}/${HTTPD_ROOT}"
+ chown -R "${HTTPD_USER}.${HTTPD_GROUP}" "${D}/${HTTPD_ROOT}/phpbb"
}