4 files changed, 30 insertions, 46 deletions
diff --git a/www/cherokee-devel/files/patch-aa b/www/cherokee-devel/files/patch-aa
deleted file mode 100644
index 4a99dbeb6dec..000000000000
--- a/www/cherokee-devel/files/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ruN cherokee-0.4.2.orig/cherokee.conf cherokee-0.4.2/cherokee.conf
---- cherokee.conf.orig	Mon Mar 17 12:25:35 2003
-+++ cherokee.conf	Mon Apr  7 12:58:12 2003
-@@ -37,7 +37,7 @@
- ## documents. By default, all requests are taken from this directory, but
- ## symbolic links and aliases may be used to point to other locations.
- ##
--DocumentRoot /var/www
-+DocumentRoot /usr/local/www/data
- 
- ##
- ## Log: Turn On/Off the logging in to syslog
-diff -ruN cherokee-0.4.2.orig/src/common.c cherokee-0.4.2/src/common.c
---- src.orig/common.c	Sun Mar 23 14:55:03 2003
-+++ src/common.c	Mon Apr  7 12:57:07 2003
-@@ -23,7 +23,6 @@
-  * USA
-  */
- 
--#include <varargs.h>
- #include <stdarg.h>
- 
- #include "common.h"
-diff -ruN cherokee-0.4.2.orig/src/server.h cherokee-0.4.2/src/server.h
---- src.orig/server.h	Wed Mar 19 16:19:19 2003
-+++ src/server.h	Mon Apr  7 12:57:20 2003
-@@ -26,6 +26,8 @@
- #ifndef __CHEROKEE2_SERVER_H__
- #define __CHEROKEE2_SERVER_H__
- 
-+#include <sys/types.h>
-+
- #include <time.h>
- 
- #include "common.h"
diff --git a/www/cherokee-devel/files/patch-ab b/www/cherokee-devel/files/patch-ab
deleted file mode 100644
index 67d6c7351e41..000000000000
--- a/www/cherokee-devel/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Apr  7 13:28:00 2003
-+++ configure	Mon Apr  7 13:27:40 2003
-@@ -6331,7 +6331,7 @@
-   withval="$with_php"
-   
-    CHEROKEE_PHP_CFLAGS="-I$withval -I$withval/main -I$withval/Zend -I$withval/regex -I$withval/TSRM"
--   CHEROKEE_PHP_LIBADD="$withval/libphp4.la"
-+   CHEROKEE_PHP_LIBADD="/usr/local/libexec/apache/libphp4.so"
-    
-    
-    php_support="yes"
diff --git a/www/cherokee-devel/files/patch-cherokee.conf.sample.pre b/www/cherokee-devel/files/patch-cherokee.conf.sample.pre
new file mode 100644
index 000000000000..677dae3d8df0
--- /dev/null
+++ b/www/cherokee-devel/files/patch-cherokee.conf.sample.pre
@@ -0,0 +1,11 @@
+--- cherokee.conf.sample.pre.orig	Tue Jun 29 05:54:01 2004
++++ cherokee.conf.sample.pre	Sat Jul 17 22:19:43 2004
+@@ -68,7 +68,7 @@
+ ## documents. By default, all requests are taken from this directory, but
+ ## symbolic links and aliases may be used to point to other locations.
+ ##
+-DocumentRoot /var/www
++DocumentRoot /usr/local/www/data
+ 
+ ##
+ ## Hide Version:  Hide the software version
diff --git a/www/cherokee-devel/files/patch-src::socket.h b/www/cherokee-devel/files/patch-src::socket.h
new file mode 100644
index 000000000000..641be13d6b3f
--- /dev/null
+++ b/www/cherokee-devel/files/patch-src::socket.h
@@ -0,0 +1,19 @@
+--- src/socket.h.orig	Sat Jun 19 23:03:54 2004
++++ src/socket.h	Sat Jul 17 20:36:02 2004
+@@ -45,12 +45,12 @@
+ # include <sys/socket.h>
+ #endif
+ 
+-#ifdef HAVE_ARPA_INET_H
+-# include <arpa/inet.h>
+-#endif
+-
+ #ifdef HAVE_NETINET_IN_H
+ # include <netinet/in.h>
++#endif
++
++#ifdef HAVE_ARPA_INET_H
++# include <arpa/inet.h>
+ #endif
+ 
+ #if defined(HAVE_GNUTLS)