diff options
author | Jan Brinkmann <luckyduck@gentoo.org> | 2005-06-01 19:42:17 +0000 |
---|---|---|
committer | Jan Brinkmann <luckyduck@gentoo.org> | 2005-06-01 19:42:17 +0000 |
commit | 0d3ef355ebd8e4a3f9c34bd1b9244eb4eb428af8 (patch) | |
tree | ae2a65f5106ba0b2d48277bb7ad832b768182ac6 /www-apache | |
parent | Fix the ebuild not selecting a default MPM if no MPM use flags are present. (diff) | |
download | gentoo-2-0d3ef355ebd8e4a3f9c34bd1b9244eb4eb428af8.tar.gz gentoo-2-0d3ef355ebd8e4a3f9c34bd1b9244eb4eb428af8.tar.bz2 gentoo-2-0d3ef355ebd8e4a3f9c34bd1b9244eb4eb428af8.zip |
updated HOMEPAGE, new upstream version.
(Portage version: 2.0.51.22-r1)
Diffstat (limited to 'www-apache')
-rw-r--r-- | www-apache/mod_jk/ChangeLog | 8 | ||||
-rw-r--r-- | www-apache/mod_jk/Manifest | 16 | ||||
-rw-r--r-- | www-apache/mod_jk/files/digest-mod_jk-1.2.13 | 1 | ||||
-rw-r--r-- | www-apache/mod_jk/mod_jk-1.2.10.ebuild | 4 | ||||
-rw-r--r-- | www-apache/mod_jk/mod_jk-1.2.13.ebuild | 63 |
5 files changed, 77 insertions, 15 deletions
diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog index 0e9ed4941405..1841a14128ae 100644 --- a/www-apache/mod_jk/ChangeLog +++ b/www-apache/mod_jk/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for www-apache/mod_jk # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.2 2005/04/29 17:42:25 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.3 2005/06/01 19:42:17 luckyduck Exp $ + +*mod_jk-1.2.13 (01 Jun 2005) + + 01 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> mod_jk-1.2.10.ebuild, + +mod_jk-1.2.13.ebuild: + updated HOMEPAGE, new upstream version. 29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> files/jk-workers.properties, mod_jk-1.2.10.ebuild: diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index 9414216b246d..ad4565cfcc50 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,16 +1,8 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 77d6077b38d5241691b565021c50594b mod_jk-1.2.10.ebuild 1653 -MD5 bb68aeabbd8a2df754d9bd6bac0c26e4 ChangeLog 816 +MD5 229df921041a4369108505014098edd2 mod_jk-1.2.13.ebuild 1638 +MD5 229df921041a4369108505014098edd2 mod_jk-1.2.10.ebuild 1638 +MD5 af3761b71d3b950c0821bb2eb6a41d52 ChangeLog 988 MD5 11ef6cb34c4b91bfd47d0587040d276b metadata.xml 254 MD5 83e37c0f3e893815403a6f9e4efde4f1 files/jk-workers.properties 1034 MD5 4816b7fbdd754d6ad17f967ec252ea39 files/digest-mod_jk-1.2.10 88 +MD5 0a5d4f7b9130e9a14216fc10df29468a files/digest-mod_jk-1.2.13 88 MD5 1e8094206c6318f27770a5d0062d59d6 files/88_mod_jk.conf 5392 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCcnIV06ebR+OMO78RAu4CAJ93WPxJ+trhI6+sCre4DkX6FonlMgCgkIvw -3Qz8fXgDFCSxcDqrGgFRjLs= -=fyQ2 ------END PGP SIGNATURE----- diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.13 b/www-apache/mod_jk/files/digest-mod_jk-1.2.13 new file mode 100644 index 000000000000..1bae906455ea --- /dev/null +++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.13 @@ -0,0 +1 @@ +MD5 028e39a84b81847b62d07ed9cd9427ae jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067 diff --git a/www-apache/mod_jk/mod_jk-1.2.10.ebuild b/www-apache/mod_jk/mod_jk-1.2.10.ebuild index 0830875a1626..ddeaa0537006 100644 --- a/www-apache/mod_jk/mod_jk-1.2.10.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.10.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2005 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.10.ebuild,v 1.2 2005/04/29 17:42:25 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.10.ebuild,v 1.3 2005/06/01 19:42:17 luckyduck Exp $ inherit apache-module MY_P="jakarta-tomcat-connectors-${PV}-src" DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol" -HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc/jk2/index.html" +HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc" SRC_URI="mirror://apache/jakarta/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" LICENSE="Apache-2.0" diff --git a/www-apache/mod_jk/mod_jk-1.2.13.ebuild b/www-apache/mod_jk/mod_jk-1.2.13.ebuild new file mode 100644 index 000000000000..2a58f78ed755 --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.13.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2005 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.13.ebuild,v 1.1 2005/06/01 19:42:17 luckyduck Exp $ + +inherit apache-module + +MY_P="jakarta-tomcat-connectors-${PV}-src" + +DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol" +HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc" +SRC_URI="mirror://apache/jakarta/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="apache2" + +DEPEND=">=virtual/jdk-1.4" +S="${WORKDIR}/${MY_P}/jk/native" + +APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so" +APACHE1_MOD_CONF="88_${PN}" +APACHE1_MOD_DEFINE="JK" + +APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.so" +APACHE2_MOD_CONF="88_${PN}" +APACHE2_MOD_DEFINE="JK" + +DOCFILES="CHANGES.txt README" + +need_apache + +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 "make failed" +} + +src_install() { + # install the workers.properties file + local confdir="" + use apache2 && confdir="/etc/apache2" + use apache2 || confdir="/etc/apache" + + dodir ${confdir} + insinto ${confdir} + doins ${FILESDIR}/jk-workers.properties + + # call the nifty default src_install :-) + apache-module_src_install +} + +pkg_postinst() { + einfo "Tomcat is not a dependency of mod_jk any longer, if you intend" + einfo "to use it with Tomcat, you have to merge www-servers/tomcat on" + einfo "your own." +} |