diff options
| -rw-r--r-- | www-apache/mod_jk/ChangeLog | 8 | ||||
| -rw-r--r-- | www-apache/mod_jk/Manifest | 12 | ||||
| -rw-r--r-- | www-apache/mod_jk/files/jk-workers.properties | 11 | ||||
| -rw-r--r-- | www-apache/mod_jk/mod_jk-1.2.10.ebuild | 11 |
4 files changed, 21 insertions, 21 deletions
diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog index 858492877bfc..0e9ed4941405 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.1 2005/04/14 19:37:58 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.2 2005/04/29 17:42:25 luckyduck Exp $ + + 29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> + files/jk-workers.properties, mod_jk-1.2.10.ebuild: + tomcat dependency isnt required, give the choice to the user. fixes #89939. + also modified the default workers file. thanks to Andy Wang + <dopey@moonteeth.com> for the suggestion. *mod_jk-1.2.10 (14 Apr 2005) diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index dbc07fd67d96..9414216b246d 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 f2037b5fc7ee2019dcc28b79894df054 mod_jk-1.2.10.ebuild 1499 -MD5 4b8d9f2ab0568db8db87d28360b59055 ChangeLog 526 +MD5 77d6077b38d5241691b565021c50594b mod_jk-1.2.10.ebuild 1653 +MD5 bb68aeabbd8a2df754d9bd6bac0c26e4 ChangeLog 816 MD5 11ef6cb34c4b91bfd47d0587040d276b metadata.xml 254 -MD5 86fedc18b7719c7544590cbe38781ad5 files/jk-workers.properties 1380 +MD5 83e37c0f3e893815403a6f9e4efde4f1 files/jk-workers.properties 1034 MD5 4816b7fbdd754d6ad17f967ec252ea39 files/digest-mod_jk-1.2.10 88 MD5 1e8094206c6318f27770a5d0062d59d6 files/88_mod_jk.conf 5392 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) -iD8DBQFCXsas06ebR+OMO78RAnw0AKCILvn8TwF77bw6do6bkxtCr+vXswCfU2P5 -DNy5X2f3Ay85bzU1Y960IA8= -=Zmsf +iD8DBQFCcnIV06ebR+OMO78RAu4CAJ93WPxJ+trhI6+sCre4DkX6FonlMgCgkIvw +3Qz8fXgDFCSxcDqrGgFRjLs= +=fyQ2 -----END PGP SIGNATURE----- diff --git a/www-apache/mod_jk/files/jk-workers.properties b/www-apache/mod_jk/files/jk-workers.properties index 59744d18b9ca..b73892fae9e5 100644 --- a/www-apache/mod_jk/files/jk-workers.properties +++ b/www-apache/mod_jk/files/jk-workers.properties @@ -8,17 +8,6 @@ # As a general note, the characters $( and ) are used internally to define # macros. Do not use them in your own configuration! -# workers.tomcat_home should point to the location where you -# installed tomcat. This is where you have your conf, webapps and lib -# directories. -# -workers.tomcat_home=/usr/share/tomcat-5 - -# workers.java_home should point to your Java installation. Normally -# you should have a bin and lib directories beneath it. -# -workers.java_home=$JAVA_HOME - # The list of Tomcat workers # worker.list=ajp13 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 89bc3ed39992..0830875a1626 100644 --- a/www-apache/mod_jk/mod_jk-1.2.10.ebuild +++ b/www-apache/mod_jk/mod_jk-1.2.10.ebuild @@ -1,6 +1,6 @@ # 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.1 2005/04/14 19:37:59 luckyduck Exp $ +# $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 $ inherit apache-module @@ -15,8 +15,7 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="apache2" -DEPEND=">=virtual/jdk-1.4 - >=www-servers/tomcat-5.0.28" +DEPEND=">=virtual/jdk-1.4" S="${WORKDIR}/${MY_P}/jk/native" APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so" @@ -56,3 +55,9 @@ src_install() { # 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." +} |