From 398bbf950e39924cf9a06dec0f707dc83f6ce676 Mon Sep 17 00:00:00 2001 From: William Thomson Date: Sun, 4 Mar 2007 23:06:43 +0000 Subject: Corrected error in apache module conf file logs -> log (Portage version: 2.1.2.1) --- www-apache/mod_jk/ChangeLog | 12 +++- www-apache/mod_jk/files/88_mod_jk.conf | 2 +- www-apache/mod_jk/files/digest-mod_jk-1.2.19 | 3 - www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1 | 3 + www-apache/mod_jk/files/digest-mod_jk-1.2.20 | 3 - www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1 | 3 + www-apache/mod_jk/files/digest-mod_jk-1.2.21 | 3 - www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1 | 3 + www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild | 77 +++++++++++++++++++++++++ www-apache/mod_jk/mod_jk-1.2.19.ebuild | 77 ------------------------- www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild | 65 +++++++++++++++++++++ www-apache/mod_jk/mod_jk-1.2.20.ebuild | 65 --------------------- www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild | 70 ++++++++++++++++++++++ www-apache/mod_jk/mod_jk-1.2.21.ebuild | 70 ---------------------- 14 files changed, 233 insertions(+), 223 deletions(-) delete mode 100644 www-apache/mod_jk/files/digest-mod_jk-1.2.19 create mode 100644 www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1 delete mode 100644 www-apache/mod_jk/files/digest-mod_jk-1.2.20 create mode 100644 www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1 delete mode 100644 www-apache/mod_jk/files/digest-mod_jk-1.2.21 create mode 100644 www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1 create mode 100644 www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild delete mode 100644 www-apache/mod_jk/mod_jk-1.2.19.ebuild create mode 100644 www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild delete mode 100644 www-apache/mod_jk/mod_jk-1.2.20.ebuild create mode 100644 www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild delete mode 100644 www-apache/mod_jk/mod_jk-1.2.21.ebuild (limited to 'www-apache/mod_jk') diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog index f73e3f21458c..76083e268f92 100644 --- a/www-apache/mod_jk/ChangeLog +++ b/www-apache/mod_jk/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for www-apache/mod_jk # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.22 2007/03/02 17:43:30 wltjr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.23 2007/03/04 23:06:43 wltjr Exp $ + +*mod_jk-1.2.21-r1 (04 Mar 2007) +*mod_jk-1.2.20-r1 (04 Mar 2007) +*mod_jk-1.2.19-r1 (04 Mar 2007) + + 04 Mar 2007; William L. Thomson Jr. + files/88_mod_jk.conf, -mod_jk-1.2.19.ebuild, +mod_jk-1.2.19-r1.ebuild, + -mod_jk-1.2.20.ebuild, +mod_jk-1.2.20-r1.ebuild, -mod_jk-1.2.21.ebuild, + +mod_jk-1.2.21-r1.ebuild: + Corrected error in apache module conf file logs -> log 02 Mar 2007; William L. Thomson Jr. -mod_jk-1.2.21_pre.ebuild, +mod_jk-1.2.21.ebuild: diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf index b868205be592..4dd0df6c2c36 100644 --- a/www-apache/mod_jk/files/88_mod_jk.conf +++ b/www-apache/mod_jk/files/88_mod_jk.conf @@ -13,7 +13,7 @@ JkWorkersFile /etc/apache2/jk-workers.properties ### Where to put mod_jk logs ### # specify the location where mod_jk is going to place its log file. -JkLogFile /etc/apache2/logs/mod_jk.log +JkLogFile /etc/apache2/log/mod_jk.log ### diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.19 b/www-apache/mod_jk/files/digest-mod_jk-1.2.19 deleted file mode 100644 index 068380b5cd69..000000000000 --- a/www-apache/mod_jk/files/digest-mod_jk-1.2.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 9c3b7135a4992c7f39d5f7aef9c25b30 tomcat-connectors-1.2.19-src.tar.gz 1246419 -RMD160 f48895b847b84a77f95ec87faa47115b023f686f tomcat-connectors-1.2.19-src.tar.gz 1246419 -SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0 tomcat-connectors-1.2.19-src.tar.gz 1246419 diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1 new file mode 100644 index 000000000000..068380b5cd69 --- /dev/null +++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.19-r1 @@ -0,0 +1,3 @@ +MD5 9c3b7135a4992c7f39d5f7aef9c25b30 tomcat-connectors-1.2.19-src.tar.gz 1246419 +RMD160 f48895b847b84a77f95ec87faa47115b023f686f tomcat-connectors-1.2.19-src.tar.gz 1246419 +SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0 tomcat-connectors-1.2.19-src.tar.gz 1246419 diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.20 b/www-apache/mod_jk/files/digest-mod_jk-1.2.20 deleted file mode 100644 index fbc0dafee4d2..000000000000 --- a/www-apache/mod_jk/files/digest-mod_jk-1.2.20 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 f10709339009b3be9398d3a838d9cabd tomcat-connectors-1.2.20-src.tar.gz 1316612 -RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc tomcat-connectors-1.2.20-src.tar.gz 1316612 -SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610 tomcat-connectors-1.2.20-src.tar.gz 1316612 diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1 new file mode 100644 index 000000000000..fbc0dafee4d2 --- /dev/null +++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.20-r1 @@ -0,0 +1,3 @@ +MD5 f10709339009b3be9398d3a838d9cabd tomcat-connectors-1.2.20-src.tar.gz 1316612 +RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc tomcat-connectors-1.2.20-src.tar.gz 1316612 +SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610 tomcat-connectors-1.2.20-src.tar.gz 1316612 diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21 b/www-apache/mod_jk/files/digest-mod_jk-1.2.21 deleted file mode 100644 index 4ee079f49367..000000000000 --- a/www-apache/mod_jk/files/digest-mod_jk-1.2.21 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 ed65157ecbea7d3569de08611aa160eb tomcat-connectors-1.2.21-src.tar.gz 1334563 -RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d tomcat-connectors-1.2.21-src.tar.gz 1334563 -SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa tomcat-connectors-1.2.21-src.tar.gz 1334563 diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1 new file mode 100644 index 000000000000..4ee079f49367 --- /dev/null +++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.21-r1 @@ -0,0 +1,3 @@ +MD5 ed65157ecbea7d3569de08611aa160eb tomcat-connectors-1.2.21-src.tar.gz 1334563 +RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d tomcat-connectors-1.2.21-src.tar.gz 1334563 +SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa tomcat-connectors-1.2.21-src.tar.gz 1334563 diff --git a/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild new file mode 100644 index 000000000000..09dbf537a5df --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.19-r1.ebuild,v 1.1 2007/03/04 23:06:43 wltjr Exp $ + +inherit apache-module autotools java-pkg-opt-2 + +MY_P="tomcat-connectors-${PV}-src" + +KEYWORDS="amd64 ~ppc x86" + +DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." +HOMEPAGE="http://tomcat.apache.org/connectors-doc/" +SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="java" + +DEPEND="java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${MY_P}/native" + +APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" +APACHE1_MOD_CONF="88_${PN}" +APACHE1_MOD_DEFINE="JK" + +APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" +APACHE2_MOD_CONF="88_${PN}" +APACHE2_MOD_DEFINE="JK" + +DOCFILES="CHANGES.txt README" + +need_apache + +src_unpack() { + unpack ${A} + cd "${S}" + + eautoreconf +} + +src_compile() { + local apxs + local java_args + use apache2 && apxs="${APXS2}" + use apache2 || apxs="${APXS1}" + use java && java_args="--with-java-home=${JAVA_HOME} \ + --with-java-platform=2 --enable-jni" + + econf \ + --with-apxs=${apxs} \ + --with-apr-config=/usr/bin/apr-config \ + ${java_args} \ + || die "econf failed" + emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" +} + +src_install() { + # install the workers.properties file + insinto "${APACHE_CONFDIR}" + doins "${FILESDIR}/jk-workers.properties" + + # if using java, install the jni stuff + if use java ; then + insinto "${APACHE_MODULESDIR}" + doins "${S}/jni/jk_jnicb.so" + fi + + # call the nifty default src_install :-) + apache-module_src_install +} + +pkg_postinst() { + elog "Tomcat is not a dependency of mod_jk any longer, if you intend" + elog "to use it with Tomcat, you have to merge www-servers/tomcat on" + elog "your own." +} diff --git a/www-apache/mod_jk/mod_jk-1.2.19.ebuild b/www-apache/mod_jk/mod_jk-1.2.19.ebuild deleted file mode 100644 index 7fe066726472..000000000000 --- a/www-apache/mod_jk/mod_jk-1.2.19.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.19.ebuild,v 1.6 2007/01/15 16:45:26 chtekk Exp $ - -inherit apache-module autotools java-pkg-opt-2 - -MY_P="tomcat-connectors-${PV}-src" - -KEYWORDS="amd64 ~ppc x86" - -DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." -HOMEPAGE="http://tomcat.apache.org/connectors-doc/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="java" - -DEPEND="java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )" -RDEPEND="${DEPEND}" - -S="${WORKDIR}/${MY_P}/native" - -APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" -APACHE1_MOD_CONF="88_${PN}" -APACHE1_MOD_DEFINE="JK" - -APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" -APACHE2_MOD_CONF="88_${PN}" -APACHE2_MOD_DEFINE="JK" - -DOCFILES="CHANGES.txt README" - -need_apache - -src_unpack() { - unpack ${A} - cd "${S}" - - eautoreconf -} - -src_compile() { - local apxs - local java_args - use apache2 && apxs="${APXS2}" - use apache2 || apxs="${APXS1}" - use java && java_args="--with-java-home=${JAVA_HOME} \ - --with-java-platform=2 --enable-jni" - - econf \ - --with-apxs=${apxs} \ - --with-apr-config=/usr/bin/apr-config \ - ${java_args} \ - || die "econf failed" - emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" -} - -src_install() { - # install the workers.properties file - insinto "${APACHE_CONFDIR}" - doins "${FILESDIR}/jk-workers.properties" - - # if using java, install the jni stuff - if use java ; then - insinto "${APACHE_MODULESDIR}" - doins "${S}/jni/jk_jnicb.so" - fi - - # call the nifty default src_install :-) - apache-module_src_install -} - -pkg_postinst() { - elog "Tomcat is not a dependency of mod_jk any longer, if you intend" - elog "to use it with Tomcat, you have to merge www-servers/tomcat on" - elog "your own." -} diff --git a/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild new file mode 100644 index 000000000000..b684d6589301 --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.20-r1.ebuild,v 1.1 2007/03/04 23:06:43 wltjr Exp $ + +inherit apache-module autotools + +MY_P="tomcat-connectors-${PV}-src" + +KEYWORDS="amd64 ~ppc x86" + +DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." +HOMEPAGE="http://tomcat.apache.org/connectors-doc/" +SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + + +S="${WORKDIR}/${MY_P}/native" + +APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" +APACHE1_MOD_CONF="88_${PN}" +APACHE1_MOD_DEFINE="JK" + +APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" +APACHE2_MOD_CONF="88_${PN}" +APACHE2_MOD_DEFINE="JK" + +DOCFILES="CHANGES.txt README" + +need_apache + +src_unpack() { + unpack ${A} + cd "${S}" + + eautoreconf +} + +src_compile() { + local apxs + use apache2 && apxs="${APXS2}" + use apache2 || apxs="${APXS1}" + + econf \ + --with-apxs=${apxs} \ + --with-apr-config=/usr/bin/apr-config \ + || die "econf failed" + emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" +} + +src_install() { + # install the workers.properties file + insinto "${APACHE_CONFDIR}" + doins "${FILESDIR}/jk-workers.properties" + + # call the nifty default src_install :-) + apache-module_src_install +} + +pkg_postinst() { + elog "Tomcat is not a dependency of mod_jk any longer, if you intend" + elog "to use it with Tomcat, you have to merge www-servers/tomcat on" + elog "your own." +} diff --git a/www-apache/mod_jk/mod_jk-1.2.20.ebuild b/www-apache/mod_jk/mod_jk-1.2.20.ebuild deleted file mode 100644 index 99b4dd07592b..000000000000 --- a/www-apache/mod_jk/mod_jk-1.2.20.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.20.ebuild,v 1.6 2007/02/03 19:20:49 beandog Exp $ - -inherit apache-module autotools - -MY_P="tomcat-connectors-${PV}-src" - -KEYWORDS="amd64 ~ppc x86" - -DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." -HOMEPAGE="http://tomcat.apache.org/connectors-doc/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - - -S="${WORKDIR}/${MY_P}/native" - -APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" -APACHE1_MOD_CONF="88_${PN}" -APACHE1_MOD_DEFINE="JK" - -APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" -APACHE2_MOD_CONF="88_${PN}" -APACHE2_MOD_DEFINE="JK" - -DOCFILES="CHANGES.txt README" - -need_apache - -src_unpack() { - unpack ${A} - cd "${S}" - - eautoreconf -} - -src_compile() { - local apxs - use apache2 && apxs="${APXS2}" - use apache2 || apxs="${APXS1}" - - econf \ - --with-apxs=${apxs} \ - --with-apr-config=/usr/bin/apr-config \ - || die "econf failed" - emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" -} - -src_install() { - # install the workers.properties file - insinto "${APACHE_CONFDIR}" - doins "${FILESDIR}/jk-workers.properties" - - # call the nifty default src_install :-) - apache-module_src_install -} - -pkg_postinst() { - elog "Tomcat is not a dependency of mod_jk any longer, if you intend" - elog "to use it with Tomcat, you have to merge www-servers/tomcat on" - elog "your own." -} diff --git a/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild new file mode 100644 index 000000000000..07cc78e59dc0 --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.21-r1.ebuild,v 1.1 2007/03/04 23:06:43 wltjr Exp $ + +inherit apache-module autotools + +MY_P="tomcat-connectors-${PV}-src" + +KEYWORDS="~amd64 ~ppc ~x86" + +DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." +HOMEPAGE="http://tomcat.apache.org/connectors-doc/" +SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +IUSE="" + + +S="${WORKDIR}/${MY_P}/native" + +APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" +APACHE1_MOD_CONF="88_${PN}" +APACHE1_MOD_DEFINE="JK" + +APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" +APACHE2_MOD_CONF="88_${PN}" +APACHE2_MOD_DEFINE="JK" + +DOCFILES="CHANGES.txt README" + +need_apache + +src_unpack() { + unpack ${A} + cd "${S}" + + eautoreconf +} + +src_compile() { + local apxs + use apache2 && apxs="${APXS2}" + use apache2 || apxs="${APXS1}" + + econf \ + --with-apxs=${apxs} \ + --with-apr-config=/usr/bin/apr-config \ + || die "econf failed" + emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" +} + +src_install() { + # install the workers.properties file + insinto "${APACHE_CONFDIR}" + doins "${FILESDIR}/jk-workers.properties" + + # call the nifty default src_install :-) + apache-module_src_install + + if ! use apache2 ; then + sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \ + || die "Could not update jk-workers.properties for apache" + fi +} + +pkg_postinst() { + elog "Tomcat is not a dependency of mod_jk any longer, if you intend" + elog "to use it with Tomcat, you have to merge www-servers/tomcat on" + elog "your own." +} diff --git a/www-apache/mod_jk/mod_jk-1.2.21.ebuild b/www-apache/mod_jk/mod_jk-1.2.21.ebuild deleted file mode 100644 index 8aa9e55e4e3e..000000000000 --- a/www-apache/mod_jk/mod_jk-1.2.21.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.21.ebuild,v 1.3 2007/03/02 17:43:30 wltjr Exp $ - -inherit apache-module autotools - -MY_P="tomcat-connectors-${PV}-src" - -KEYWORDS="~amd64 ~ppc ~x86" - -DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol." -HOMEPAGE="http://tomcat.apache.org/connectors-doc/" -SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - - -S="${WORKDIR}/${MY_P}/native" - -APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so" -APACHE1_MOD_CONF="88_${PN}" -APACHE1_MOD_DEFINE="JK" - -APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so" -APACHE2_MOD_CONF="88_${PN}" -APACHE2_MOD_DEFINE="JK" - -DOCFILES="CHANGES.txt README" - -need_apache - -src_unpack() { - unpack ${A} - cd "${S}" - - eautoreconf -} - -src_compile() { - local apxs - use apache2 && apxs="${APXS2}" - use apache2 || apxs="${APXS1}" - - econf \ - --with-apxs=${apxs} \ - --with-apr-config=/usr/bin/apr-config \ - || die "econf failed" - emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed" -} - -src_install() { - # install the workers.properties file - insinto "${APACHE_CONFDIR}" - doins "${FILESDIR}/jk-workers.properties" - - # call the nifty default src_install :-) - apache-module_src_install - - if ! use apache2 ; then - sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \ - || die "Could not update jk-workers.properties for apache" - fi -} - -pkg_postinst() { - elog "Tomcat is not a dependency of mod_jk any longer, if you intend" - elog "to use it with Tomcat, you have to merge www-servers/tomcat on" - elog "your own." -} -- cgit v1.2.3-65-gdbad