4 files changed, 8 insertions, 19 deletions

diff --git a/www/resin3/files/install.sh b/www/resin3/files/install.sh
index 24794c4e9be9..2499baf9607d 100644
--- a/www/resin3/files/install.sh
+++ b/www/resin3/files/install.sh
@@ -39,13 +39,13 @@ echo Created installation directory %%APP_HOME%%
 
 list()
 {
-    for dir in doc lib libexec xsl ; do
+    for dir in %%COPYDIRS%% libexec ; do
         ( cd %%WRKSRC%% ; find $dir )
     done
 }
 
 # Remove all empty dirs
-( cd %%WRKSRC%% ; find doc -type d -empty -delete )
+( cd %%WRKSRC%% && find %%COPYDIRS%% libexec -type d -empty -delete )
 
 echo Installing in %%APP_HOME%%
 list | xargs tar -C %%WRKSRC%% -cf- | tar -C %%APP_HOME%% -xpf-
diff --git a/www/resin3/files/patch-apache-Makefile.in b/www/resin3/files/patch-apache-Makefile.in
index 4b10a88f34b5..161e6d7151d7 100644
--- a/www/resin3/files/patch-apache-Makefile.in
+++ b/www/resin3/files/patch-apache-Makefile.in
@@ -1,6 +1,6 @@
 --- src/c/plugin/apache/Makefile.in.orig	Thu Nov 13 09:27:52 2003
 +++ src/c/plugin/apache/Makefile.in	Thu Nov 13 09:28:36 2003
-@@ -28,8 +28,7 @@
+@@ -29,8 +29,7 @@
  	$(CC) -c $(INCLUDES) $(CFLAGS) $<
  
  install	:
diff --git a/www/resin3/files/patch-apache2 b/www/resin3/files/patch-apache2
deleted file mode 100644
index 2130da28e974..000000000000
--- a/www/resin3/files/patch-apache2
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-resin.conf b/www/resin3/files/patch-resin.conf
index f88ee07191c4..7d059801e11f 100644
--- a/www/resin3/files/patch-resin.conf
+++ b/www/resin3/files/patch-resin.conf
@@ -1,11 +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 @@
+--- conf/resin.conf.orig	Wed Jan 21 01:46:58 2004
++++ conf/resin.conf	Fri Jan 23 12:09:34 2004
+@@ -63,7 +63,7 @@
      </class-loader>
  
      <!-- The http port -->
--    <http id='' host='*' port='8080'/>
-+    <http id='' host='*' port='%%PORT%%'/>
+-    <http id="" host="*" port="8080"/>
++    <http id="" host="*" port="%%PORT%%"/>
  
      <!--
         - SSL port configuration: