diff options
author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-04-13 11:05:52 +0000 |
---|---|---|
committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-04-13 11:05:52 +0000 |
commit | a94afa84a03d822575b0d3cafb3edad6bf446a56 (patch) | |
tree | 06f1d681e3bd35c2e458bff046e4bf446a6212a0 /www/cherokee/files | |
parent | don't forget this file, needed to make that makefile X11BASe clean (diff) |
Update www/cherokee
Update www/cherokee from 0.2.8 to 0.4.2
PR: ports/50764
Submitted by: Pierre-Luc Lesperance <oksala@videotron.ca>
Diffstat (limited to 'www/cherokee/files')
-rw-r--r-- | www/cherokee/files/patch-aa | 66 | ||||
-rw-r--r-- | www/cherokee/files/patch-ab | 11 |
2 files changed, 40 insertions, 37 deletions
diff --git a/www/cherokee/files/patch-aa b/www/cherokee/files/patch-aa index 7cd751ce8f59..4a99dbeb6dec 100644 --- a/www/cherokee/files/patch-aa +++ b/www/cherokee/files/patch-aa @@ -1,43 +1,35 @@ ---- src/cherokee.h.old Fri Dec 28 07:39:11 2001 -+++ src/cherokee.h Tue May 14 14:49:35 2002 -@@ -28,11 +28,11 @@ - #include <stdio.h> - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - #include <netinet/in.h> - #include <sys/socket.h> - #include <sys/wait.h> - #include <sys/time.h> --#include <sys/types.h> - #include <sys/stat.h> - #include <unistd.h> - #include <fcntl.h> ---- src/server.h.old Fri Dec 28 07:25:54 2001 -+++ src/server.h Tue May 14 14:49:35 2002 -@@ -26,9 +26,9 @@ +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 - #include <stdio.h> - #include <stdlib.h> --#include <netinet/in.h> --#include <sys/socket.h> - #include <sys/types.h> -+#include <sys/socket.h> -+#include <netinet/in.h> + ## + ## 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 "configuration.h" +-#include <varargs.h> + #include <stdarg.h> ---- src/socket.h.old Thu Dec 27 05:49:07 2001 -+++ src/socket.h Tue May 14 14:49:35 2002 -@@ -26,8 +26,11 @@ + #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 <stdio.h> - #include <stdlib.h> -+#include <string.h> +#include <sys/types.h> - #include <sys/socket.h> - #include <sys/time.h> -+#include <unistd.h> - - int __inline socket_ready_to_read (int socket); ++ + #include <time.h> + #include "common.h" diff --git a/www/cherokee/files/patch-ab b/www/cherokee/files/patch-ab new file mode 100644 index 000000000000..67d6c7351e41 --- /dev/null +++ b/www/cherokee/files/patch-ab @@ -0,0 +1,11 @@ +--- 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" |