diff options
author | 2013-01-15 19:36:09 +0000 | |
---|---|---|
committer | 2013-01-15 19:36:09 +0000 | |
commit | 94ab8c629de77045aacf982b146dee03fd6e0b42 (patch) | |
tree | 7b0829bd200b346b06ed43746ea674ad5da6a897 /app-admin/apache-tools | |
parent | Forgot credits and bug # (diff) | |
download | gentoo-2-94ab8c629de77045aacf982b146dee03fd6e0b42.tar.gz gentoo-2-94ab8c629de77045aacf982b146dee03fd6e0b42.tar.bz2 gentoo-2-94ab8c629de77045aacf982b146dee03fd6e0b42.zip |
added prefix support (bug #447298)
(Portage version: 2.2.0_alpha153/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Diffstat (limited to 'app-admin/apache-tools')
-rw-r--r-- | app-admin/apache-tools/ChangeLog | 8 | ||||
-rw-r--r-- | app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild | 22 |
2 files changed, 18 insertions, 12 deletions
diff --git a/app-admin/apache-tools/ChangeLog b/app-admin/apache-tools/ChangeLog index 94bd1becf02f..20e8a3c7f2c5 100644 --- a/app-admin/apache-tools/ChangeLog +++ b/app-admin/apache-tools/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/apache-tools -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.128 2012/11/27 18:38:44 pacho Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/ChangeLog,v 1.129 2013/01/15 19:36:09 ottxor Exp $ + + 15 Jan 2013; Christoph Junghans <ottxor@gentoo.org> + apache-tools-2.4.3-r1.ebuild: + added prefix support (bug #447298) 27 Nov 2012; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop apache herd as discussed in http://www.gossamer- diff --git a/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild b/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild index afd0bf3f9ae8..a8385b7f5f11 100644 --- a/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild +++ b/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild,v 1.1 2012/11/01 06:55:40 qnikst Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/apache-tools/apache-tools-2.4.3-r1.ebuild,v 1.2 2013/01/15 19:36:09 ottxor Exp $ EAPI="3" inherit flag-o-matic eutils @@ -11,7 +11,7 @@ SRC_URI="mirror://apache/httpd/httpd-${PV}.tar.bz2" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc64-solaris ~x64-solaris" IUSE="ssl" RESTRICT="test" @@ -31,16 +31,18 @@ src_configure() { # Instead of filtering --as-needed (bug #128505), append --no-as-needed append-ldflags $(no-as-needed) - use ssl && myconf+=" --with-ssl=/usr --enable-ssl" + use ssl && myconf+=" --with-ssl=${EPREFIX}/usr --enable-ssl" # econf overwrites the stuff from config.layout, so we have to put them into # our myconf line too econf \ - --sbindir=/usr/sbin \ - --with-z=/usr \ - --with-apr=/usr \ - --with-apr-util=/usr \ - --with-pcre=/usr \ + --sbindir="${EPREFIX}"/usr/sbin \ + --with-perl="${EPREFIX}"/usr/bin/perl \ + --with-expat="${EPREFIX}"/usr \ + --with-z="${EPREFIX}"/usr \ + --with-apr="${EPREFIX}"/usr \ + --with-apr-util="${EPREFIX}"/usr \ + --with-pcre="${EPREFIX}"/usr \ ${myconf} } @@ -52,7 +54,7 @@ src_compile() { src_install () { cd support || die - make DESTDIR="${ED}" install + make DESTDIR="${D}" install # install manpages doman "${S}"/docs/man/{dbmmanage,htdigest,htpasswd,htdbm,ab,logresolve}.1 \ |