diff options
author | abs <abs> | 2001-06-21 13:12:25 +0000 |
---|---|---|
committer | abs <abs> | 2001-06-21 13:12:25 +0000 |
commit | abd88844f80a0b7cf16c9a25347098169f9540ae (patch) | |
tree | 99ee4e3db0e859c2c7ad49b8bca66f780eec83db /www/jakarta-tomcat | |
parent | bddc1e2c30aca1cd88487cf095414c105dbbf412 (diff) | |
download | pkgsrc-abd88844f80a0b7cf16c9a25347098169f9540ae.tar.gz |
Switch to a dynamic PLIST so we can install against jdk or sun-jdk
Diffstat (limited to 'www/jakarta-tomcat')
-rw-r--r-- | www/jakarta-tomcat/Makefile | 6 | ||||
-rw-r--r-- | www/jakarta-tomcat/distinfo | 8 | ||||
-rw-r--r-- | www/jakarta-tomcat/patches/patch-aa | 32 | ||||
-rw-r--r-- | www/jakarta-tomcat/patches/patch-ab | 42 | ||||
-rw-r--r-- | www/jakarta-tomcat/patches/patch-ac | 42 |
5 files changed, 77 insertions, 53 deletions
diff --git a/www/jakarta-tomcat/Makefile b/www/jakarta-tomcat/Makefile index 254895c3f6a..7ba3cfe57e9 100644 --- a/www/jakarta-tomcat/Makefile +++ b/www/jakarta-tomcat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2001/04/05 19:12:21 jwise Exp $ +# $NetBSD: Makefile,v 1.20 2001/06/21 13:12:27 abs Exp $ DISTNAME= ${PKGNAME}-src PKGNAME= jakarta-tomcat-3.2.1 @@ -29,8 +29,8 @@ post-patch: -e "s|@JAVA_HOME@|${JAVA_HOME}|g" \ ${WRKSRC}/src/etc/workers.properties > ${WRKSRC}/src/etc/workers.properties.tmp ${MV} ${WRKSRC}/src/etc/workers.properties.tmp ${WRKSRC}/src/etc/workers.properties - ${RM} ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig - ${RM} ${WRKSRC}/src/etc/workers.properties.orig + ${RM} -f ${WRKSRC}/src/share/org/apache/tomcat/task/ApacheConfig.java.orig + ${RM} -f ${WRKSRC}/src/etc/workers.properties.orig post-build: ${SED} -e "s|@PREFIX@|${PREFIX}|g" \ diff --git a/www/jakarta-tomcat/distinfo b/www/jakarta-tomcat/distinfo index e6ddae105d8..a2837d733e3 100644 --- a/www/jakarta-tomcat/distinfo +++ b/www/jakarta-tomcat/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2001/05/21 21:54:11 wiz Exp $ +$NetBSD: distinfo,v 1.3 2001/06/21 13:12:27 abs Exp $ SHA1 (jakarta-tomcat-3.2.1-src.tar.gz) = c28d97378dcc1c9a15d15cae404733674ae91c9c Size (jakarta-tomcat-3.2.1-src.tar.gz) = 920745 bytes -SHA1 (patch-aa) = 7d2810e5306c68e416f04b26e505504924488f98 -SHA1 (patch-ab) = 6bbd0e0655dbac92dfaff25274d6c68b2deadf0d -SHA1 (patch-ac) = 9d5927d7cf660cc0e8d9b8aa27543436dd503aec +SHA1 (patch-aa) = 9bb02eba6a7444a353046461411d31a77a9dca56 +SHA1 (patch-ab) = 759c6373af773d45931bba58e512e4be50dfdc9e +SHA1 (patch-ac) = 3bdcc53f7f8649131d2d9f37c82f2d833f497281 diff --git a/www/jakarta-tomcat/patches/patch-aa b/www/jakarta-tomcat/patches/patch-aa index de952eefbeb..68fc9488cdd 100644 --- a/www/jakarta-tomcat/patches/patch-aa +++ b/www/jakarta-tomcat/patches/patch-aa @@ -1,6 +1,7 @@ -$NetBSD: patch-aa,v 1.6 2001/03/29 22:22:13 jwise Exp $ ---- build.xml.orig Tue Dec 12 14:51:36 2000 -+++ build.xml Tue Mar 27 17:17:22 2001 +$NetBSD: patch-aa,v 1.7 2001/06/21 13:12:27 abs Exp $ + +--- build.xml.orig Tue Dec 12 22:51:36 2000 ++++ build.xml @@ -6,11 +6,11 @@ <property name="build.compiler" value="classic"/> <property name="debug" value="on"/> @@ -74,7 +75,30 @@ $NetBSD: patch-aa,v 1.6 2001/03/29 22:22:13 jwise Exp $ <chmod perm="+x" file="${tomcat.build}/bin/jspc.sh"/> <chmod perm="+x" file="${tomcat.build}/bin/startup.sh"/> <chmod perm="+x" file="${tomcat.build}/bin/shutdown.sh"/> -@@ -202,8 +207,8 @@ +@@ -81,8 +86,10 @@ + <target name="tomcat" depends="prepare"> + + <!-- Determine availability of optional components --> ++ <!-- No JSSE yet + <available property="jsse.present" + classname="com.sun.net.ssl.internal.ssl.Provider" /> ++ --> + <available property="jdk12.present" + classname="java.security.PrivilegedAction" /> + +@@ -104,8 +111,10 @@ + unless="jdk12.present"/> + <exclude name="**/AdaptiveClassLoader12.java" + unless="jdk12.present"/> ++ <exclude name="**/EmbededTomcat.java" ++ unless="jsse.present"/> + <exclude name="**/SSLSocketFactory.java" +- unless="jsse.present" /> ++ unless="jsse.present"/> + </javac> + + <!-- Copy the corresponding resource files --> +@@ -202,8 +211,8 @@ </copy> <!-- Fixups for executable permissions --> diff --git a/www/jakarta-tomcat/patches/patch-ab b/www/jakarta-tomcat/patches/patch-ab index 22da6250a6f..02d6bbb0b7b 100644 --- a/www/jakarta-tomcat/patches/patch-ab +++ b/www/jakarta-tomcat/patches/patch-ab @@ -1,15 +1,29 @@ -$NetBSD: patch-ab,v 1.8 2001/04/03 11:05:25 wennmach Exp $ +$NetBSD: patch-ab,v 1.9 2001/06/21 13:12:27 abs Exp $ ---- src/share/org/apache/tomcat/task/ApacheConfig.java.orig Thu Mar 29 13:52:28 2001 -+++ src/share/org/apache/tomcat/task/ApacheConfig.java Thu Mar 29 13:52:53 2001 -@@ -115,8 +115,8 @@ - } else { - // XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat - // home -- pw.println("LoadModule jserv_module libexec/mod_jserv.so"); -- mod_jk.println("LoadModule jk_module libexec/mod_jk.so"); -+ pw.println("LoadModule jserv_module lib/httpd/mod_jserv.so"); -+ mod_jk.println("LoadModule jk_module lib/httpd/mod_jk.so"); - mod_jk.println(); - mod_jk.println("JkWorkersFile " + new File(tomcatHome, WORKERS_CONFIG)); - mod_jk.println("JkLogFile " + new File(tomcatHome, JK_LOG_LOCATION)); +--- src/etc/workers.properties.orig Tue Dec 12 22:51:46 2000 ++++ src/etc/workers.properties +@@ -40,20 +40,20 @@ + # installed tomcat. This is where you have your conf, webapps and lib + # directories. + # +-workers.tomcat_home=c:\jakarta-tomcat ++workers.tomcat_home=@PREFIX@/tomcat + + # + # workers.java_home should point to your Java installation. Normally + # you should have a bin and lib directories beneath it. + # +-workers.java_home=c:\jdk1.2.2 ++workers.java_home=@JAVA_HOME@ + + # + # You should configure your environment slash... ps=\ on NT and / on UNIX + # and maybe something different elsewhere. + # +-ps=\ +-# ps=/ ++# ps=\ ++ps=/ + + # + #------ ADVANCED MODE ------------------------------------------------ diff --git a/www/jakarta-tomcat/patches/patch-ac b/www/jakarta-tomcat/patches/patch-ac index 3369b9385cc..0be7a9ce424 100644 --- a/www/jakarta-tomcat/patches/patch-ac +++ b/www/jakarta-tomcat/patches/patch-ac @@ -1,29 +1,15 @@ -$NetBSD: patch-ac,v 1.5 2001/04/03 11:05:25 wennmach Exp $ +$NetBSD: patch-ac,v 1.6 2001/06/21 13:12:27 abs Exp $ ---- src/etc/workers.properties.orig Thu Mar 29 14:16:09 2001 -+++ src/etc/workers.properties Thu Mar 29 14:16:41 2001 -@@ -40,20 +40,20 @@ - # installed tomcat. This is where you have your conf, webapps and lib - # directories. - # --workers.tomcat_home=c:\jakarta-tomcat -+workers.tomcat_home=@PREFIX@/tomcat - - # - # workers.java_home should point to your Java installation. Normally - # you should have a bin and lib directories beneath it. - # --workers.java_home=c:\jdk1.2.2 -+workers.java_home=@JAVA_HOME@ - - # - # You should configure your environment slash... ps=\ on NT and / on UNIX - # and maybe something different elsewhere. - # --ps=\ --# ps=/ -+# ps=\ -+ps=/ - - # - #------ ADVANCED MODE ------------------------------------------------ +--- src/share/org/apache/tomcat/task/ApacheConfig.java.orig Tue Dec 12 22:52:08 2000 ++++ src/share/org/apache/tomcat/task/ApacheConfig.java +@@ -115,8 +115,8 @@ + } else { + // XXX XXX change it to mod_jserv_${os.name}.so, put all so in tomcat + // home +- pw.println("LoadModule jserv_module libexec/mod_jserv.so"); +- mod_jk.println("LoadModule jk_module libexec/mod_jk.so"); ++ pw.println("LoadModule jserv_module lib/httpd/mod_jserv.so"); ++ mod_jk.println("LoadModule jk_module lib/httpd/mod_jk.so"); + mod_jk.println(); + mod_jk.println("JkWorkersFile " + new File(tomcatHome, WORKERS_CONFIG)); + mod_jk.println("JkLogFile " + new File(tomcatHome, JK_LOG_LOCATION)); |