diff options
| author |   Chuck Short <zul@gentoo.org> | 2004-06-25 11:52:56 +0000 |
|---|---|---|
| committer | Chuck Short <zul@gentoo.org> | 2004-06-25 11:52:56 +0000 |
| commit | 0d1a0c8df08e933dcdd31ba897de3b1b62ae37b8 (patch) | |
| tree | a0790af51cde01720620aebc91f3a528e039d156 /net-www | |
| parent | version bump (diff) | |
| download | historical-0d1a0c8df08e933dcdd31ba897de3b1b62ae37b8.tar.gz historical-0d1a0c8df08e933dcdd31ba897de3b1b62ae37b8.tar.bz2 historical-0d1a0c8df08e933dcdd31ba897de3b1b62ae37b8.zip | |
Replaced berkdb detection. closes #54932.
Diffstat (limited to 'net-www')
| -rw-r--r-- | net-www/apache/ChangeLog | 6 | ||||
| -rw-r--r-- | net-www/apache/Manifest | 4 | ||||
| -rw-r--r-- | net-www/apache/apache-2.0.49-r3.ebuild | 36 |
3 files changed, 26 insertions, 20 deletions
diff --git a/net-www/apache/ChangeLog b/net-www/apache/ChangeLog index 2a02d9928d49..9e151616a26f 100644 --- a/net-www/apache/ChangeLog +++ b/net-www/apache/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-www/apache # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.210 2004/06/25 00:48:56 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/ChangeLog,v 1.211 2004/06/25 11:52:56 zul Exp $ + + 25 Jun 2004; Chuck Short <zul@gentoo.org> apache-2.0.49-r3.ebuild: + Replaced version berkdb detection with something that is much more smarter. + Shamelessly taken from the php.eclass. Closes #54932. 21 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> apache-1.3.31-r2.ebuild: Marked stable on amd64. diff --git a/net-www/apache/Manifest b/net-www/apache/Manifest index 6ae18f57ba9f..6be1adcb8804 100644 --- a/net-www/apache/Manifest +++ b/net-www/apache/Manifest @@ -2,9 +2,9 @@ MD5 3ba8e2e64f2dee1396729b5de985a70d apache-1.3.29-r2.ebuild 7140 MD5 6fb2420645fe7cd13366395eaf0bd49e apache-1.3.31.ebuild 6700 MD5 db153310aaa276e8a42441815a0e6145 apache-2.0.49-r1.ebuild 12683 MD5 eccf2b4d6a170c2f7fb5842b8631c27b apache-1.3.31-r2.ebuild 6831 -MD5 25da764b1afbecd343a1de30e1a9f69a apache-2.0.49-r3.ebuild 13098 +MD5 1089a2661d7e128b68ebdf18ae21753e apache-2.0.49-r3.ebuild 13139 MD5 49d4a0eec048c26bc43c8e238db04673 apache-1.3.31-r1.ebuild 6706 -MD5 5e66956f0e1cf1fe309e3276d481d38e ChangeLog 38478 +MD5 16befd2b5b9b2a34130d09614b53e9de ChangeLog 38677 MD5 5b6dd438f81019e56fa641841c0c13fe metadata.xml 501 MD5 d4b8a4908870107e15cc1edbd0ec6ebb files/apache-1.3.29_mod_auth_db.patch 729 MD5 161245c7aa1eb785db53b34d6a10be43 files/suexec_pam_gentoo.patch 2149 diff --git a/net-www/apache/apache-2.0.49-r3.ebuild b/net-www/apache/apache-2.0.49-r3.ebuild index 2d8af07b8ac0..0b13e3bd14cf 100644 --- a/net-www/apache/apache-2.0.49-r3.ebuild +++ b/net-www/apache/apache-2.0.49-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# Copyright 1999-2004 Gentoo Foundation. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r3.ebuild,v 1.15 2004/06/25 00:48:56 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-www/apache/apache-2.0.49-r3.ebuild,v 1.16 2004/06/25 11:52:56 zul Exp $ inherit flag-o-matic eutils fixheadtails gnuconfig @@ -9,8 +9,7 @@ S="${WORKDIR}/httpd-${PV}" DESCRIPTION="Apache Web Server, Version 2.0.x" HOMEPAGE="http://www.apache.org/" SRC_URI="http://www.apache.org/dist/httpd/httpd-${PV}.tar.gz - mirror://gentoo/apache-patches-${PATCH_LEVEL}.tar.bz2 - http://dev.gentoo.org/~zul/apache/apache-patches-${PATCH_LEVEL}.tar.bz2" + mirror://gentoo/apache-patches-${PATCH_LEVEL}.tar.bz2" LICENSE="Apache-2.0" SLOT="2" @@ -33,21 +32,8 @@ DEPEND="dev-util/yacc apache_setup_vars() { # Sets the USERDIR to default. USERDIR="public_html" - - if use berkdb; then - db_major=`grep DB_VERSION_MAJOR /usr/include/db.h | cut -f3` - db_minor=`grep DB_VERSION_MINOR /usr/include/db.h | cut -f3` - if [ $db_minor -gt 0 ]; - then - db_version="db4" - else - db_version=`echo "db$db_major.$db_minor"` - fi - append-ldflags -l`echo "$db_version"` - fi einfo "DATADIR is set to: ${DATADIR}" einfo "USERDIR is set to: $USERDIR" - einfo "DB verison detected is $db_version" } set_filter_flags () { @@ -79,6 +65,22 @@ src_unpack() { epatch ${WORKDIR}/01_ssl_verify_client.patch || die fi + if use berkdb; then + einfo "Enabling berkdb." + if has_version '=sys-libs/db-4*'; then + einfo "Enabling db4" + myconf="${myconf} --with-dbm=db4 --with-berkely-db=/usr" + elif has_version '=sys-libs/db-3*'; then + einfo "Enabling db3" + myconf="${myconf} --with-dbm=db3 --with-berkely-db=/usr" + elif has_version '=sys-libs/db-2'; then + einfo "Enabling db2" + myconf="${myconf} --with-dbm=db2 --with-berkely-db=/usr" + fi + else + echo "Disabling berkdb" + fi + #avoid utf-8 charset problems export LC_CTYPE=C |