diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2004-01-07 21:40:04 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2004-01-07 21:40:04 +0000 |
| commit | 727fca173d2e93ba40cf1c039e93f0b8ed2d39c0 (patch) | |
| tree | 920b1fd64cbb70880f9b1620af61542a77ce59c8 /net-www/horde-turba | |
| parent | aww, might as well stable on sparc, everyone's running it anyway... (diff) | |
| download | gentoo-2-727fca173d2e93ba40cf1c039e93f0b8ed2d39c0.tar.gz gentoo-2-727fca173d2e93ba40cf1c039e93f0b8ed2d39c0.tar.bz2 gentoo-2-727fca173d2e93ba40cf1c039e93f0b8ed2d39c0.zip | |
fix bug #37492 and update copyright headers
Diffstat (limited to 'net-www/horde-turba')
| -rw-r--r-- | net-www/horde-turba/ChangeLog | 5 | ||||
| -rw-r--r-- | net-www/horde-turba/horde-turba-1.2.1.ebuild | 18 |
2 files changed, 11 insertions, 12 deletions
diff --git a/net-www/horde-turba/ChangeLog b/net-www/horde-turba/ChangeLog index 958211b77fa8..5319f7661d8e 100644 --- a/net-www/horde-turba/ChangeLog +++ b/net-www/horde-turba/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-www/horde-turba # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/ChangeLog,v 1.9 2003/12/15 20:48:12 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/ChangeLog,v 1.10 2004/01/07 21:37:39 robbat2 Exp $ + + 07 Jan 2004; Robin H. Johnson <robbat2@gentoo.org> horde-turba-1.2.1.ebuild: + fix bug #37492 and update copyright headers 15 Dec 2003; Stuart Herbert <stuart@gentoo.org> horde-turba-1.2.1.ebuild: Fix for bug #32636 diff --git a/net-www/horde-turba/horde-turba-1.2.1.ebuild b/net-www/horde-turba/horde-turba-1.2.1.ebuild index 513d8bfd1350..9461b5afda37 100644 --- a/net-www/horde-turba/horde-turba-1.2.1.ebuild +++ b/net-www/horde-turba/horde-turba-1.2.1.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/horde-turba/horde-turba-1.2.1.ebuild,v 1.5 2003/12/15 20:48:12 stuart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/horde-turba/horde-turba-1.2.1.ebuild,v 1.6 2004/01/07 21:37:39 robbat2 Exp $ inherit webapp-apache @@ -19,21 +19,17 @@ S=${WORKDIR}/${MY_P} webapp-detect || NO_WEBSERVER=1 pkg_setup() { - webapp-pkg_setup "${NO_WEBSERVER}" - einfo "Installing into ${ROOT}${HTTPD_ROOT}." - - GREPSQL=`grep sql /var/db/pkg/dev-php/mod_php*/USE` - GREPLDAP=`grep ldap /var/db/pkg/dev-php/mod_php*/USE` - if [ "${GREPSQL}" != "" ] || [ "${GREPLDAP}" != "" ] ; then - return 0 - else + GREPBACKEND=`egrep 'sql|odbc|postgres|ldap' /var/db/pkg/dev-php/mod_php*/USE` + if [ -z "${GREPBACKEND}" ] ; then eerror "Missing SQL or LDAP support in mod_php !" die "aborting..." fi + webapp-pkg_setup "${NO_WEBSERVER}" + einfo "Installing into ${ROOT}${HTTPD_ROOT}." + export REGISTRY=${HTTPD_ROOT}/horde/config/registry.php [ -f ${REGISTRY} ] || REGISTRY=${HTTPD_ROOT}/horde/config/registry.php.dist - [ -f ${REGISTRY} ] || die "${REGISTRY} not found" } |