diff options
author | Ernst de Haan <znerd@FreeBSD.org> | 2003-09-29 12:57:59 +0000 |
---|---|---|
committer | Ernst de Haan <znerd@FreeBSD.org> | 2003-09-29 12:57:59 +0000 |
commit | 2cbb10ab13bf5caf1abb09cef702c9493a3e7509 (patch) | |
tree | f34382b61cb65efda02e78b94a4395621d7c1172 /www/resin3/files | |
parent | d66b1112ffb7978d899f46ba734d8462a8fe5d15 (diff) |
Notes
Diffstat (limited to 'www/resin3/files')
-rw-r--r-- | www/resin3/files/patch-apache2 | 11 | ||||
-rw-r--r-- | www/resin3/files/patch-apache2-install | 11 | ||||
-rw-r--r-- | www/resin3/files/patch-httpd.sh | 41 | ||||
-rw-r--r-- | www/resin3/files/patch-resin.conf | 11 |
4 files changed, 74 insertions, 0 deletions
diff --git a/www/resin3/files/patch-apache2 b/www/resin3/files/patch-apache2 new file mode 100644 index 000000000000..2130da28e974 --- /dev/null +++ b/www/resin3/files/patch-apache2 @@ -0,0 +1,11 @@ +--- src/c/plugin/apache2/mod_caucho.c.orig Tue Apr 15 23:28:46 2003 ++++ src/c/plugin/apache2/mod_caucho.c Fri Jun 6 01:37:29 2003 +@@ -52,7 +52,7 @@ + #include "cse.h" + #include "version.h" + +-#ifndef APR_HAS_THREADS ++#if !APR_HAS_THREADS + #define apr_thread_mutex_t int + #define apr_thread_mutex_create(a,b,c) + #define apr_thread_mutex_lock(a) diff --git a/www/resin3/files/patch-apache2-install b/www/resin3/files/patch-apache2-install new file mode 100644 index 000000000000..3092a1ae2762 --- /dev/null +++ b/www/resin3/files/patch-apache2-install @@ -0,0 +1,11 @@ +--- src/c/plugin/apache2/install.sh.orig Mon Sep 29 11:12:07 2003 ++++ src/c/plugin/apache2/install.sh Mon Sep 29 11:12:22 2003 +@@ -53,7 +53,7 @@ + + LoadModule caucho_module $LIBEXECDIR/mod_caucho.so + +-ResinConfigHost localhost 6802 ++ResinConfigServer localhost 6802 + EOF + + fi diff --git a/www/resin3/files/patch-httpd.sh b/www/resin3/files/patch-httpd.sh new file mode 100644 index 000000000000..9f67cb03dd9d --- /dev/null +++ b/www/resin3/files/patch-httpd.sh @@ -0,0 +1,41 @@ +--- bin/httpd.sh.orig Tue Sep 23 00:54:37 2003 ++++ bin/httpd.sh Mon Sep 29 10:33:13 2003 +@@ -37,11 +37,8 @@ + # + # You can predefine JAVA_HOME and RESIN_HOME + # +-# JAVA_HOME=/usr/java +-# export JAVA_HOME +-# +-# RESIN_HOME=/usr/local/resin +-# export RESIN_HOME ++export JAVA_HOME=%%JAVA_HOME%% ++export RESIN_HOME=%%PREFIX%%/%%PKGNAMEPREFIX%%%%PORTNAME%% + # + # Extra arguments to Java. If you're passing arguments to the JVM, you'll + # need to use -Jxxx. For example, args="-J-ms48m". You can modify +@@ -68,15 +65,13 @@ + # + # ulimit -s 2048 + # +-# trace script and simlinks to find thw wrapper +-# +-script=`/bin/ls -l $0 | awk '{ print $NF; }'` +- +-while test -h "$script" +-do +- script=`/bin/ls -l $script | awk '{ print $NF; }'` +-done +- +-bin=`dirname $script` + +-exec $perl $bin/wrapper.pl -chdir -name "$name" -class "$class" $args $* ++su -f -m www -c \ ++"exec $perl %%PREFIX%%/sbin/resinctl \ ++-pid /var/run/resin.pid \ ++-conf %%PREFIX%%/etc/resin.xml \ ++-chdir -name "$name" \ ++-class "$class" \ ++$args $*" \ ++> /dev/null \ ++&& echo -n '%%PKGNAMEPREFIX%%%%PORTNAME%% ' diff --git a/www/resin3/files/patch-resin.conf b/www/resin3/files/patch-resin.conf new file mode 100644 index 000000000000..f88ee07191c4 --- /dev/null +++ b/www/resin3/files/patch-resin.conf @@ -0,0 +1,11 @@ +--- conf/resin.conf.orig Mon Sep 29 10:29:29 2003 ++++ conf/resin.conf Mon Sep 29 10:29:48 2003 +@@ -37,7 +37,7 @@ + </class-loader> + + <!-- The http port --> +- <http id='' host='*' port='8080'/> ++ <http id='' host='*' port='%%PORT%%'/> + + <!-- + - SSL port configuration: |