1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-23 04:23:08 +00:00

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>
This commit is contained in:
Edwin Groothuis 2003-04-13 11:05:52 +00:00
parent 6d88156ca0
commit a94afa84a0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=78869
10 changed files with 250 additions and 226 deletions

View File

@ -5,90 +5,54 @@
# $FreeBSD$
#
PORTNAME= Cherokee
PORTVERSION= 0.2.8
PORTNAME= cherokee
PORTVERSION= 0.4.2
CATEGORIES= www
MASTER_SITES= http://www.alobbs.com/cherokee/
MASTER_SITES= ftp://www.alobbs.com/cherokee/
MAINTAINER= oksala@videotron.ca
COMMENT= Cherokee is an extremely fast and tiny web server
USE_AUTOCONF= yes
USE_AUTOMAKE= yes
#USE_AUTOCONF= yes
#USE_AUTOMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= \
--prefix=${PREFIX} \
--enable-daemon\
--enable-warnings\
--with-htdocs=${HTDOCS}\
--with-uid=${UID} \
--with-gid=${GID} \
--with-port=${PORT} \
--with-index=${INDEX}
CONFIGURE_ARGS= --prefix=${PREFIX}
INSTALLS_SHLIB= yes
#
# User Configuration
# This may seem a little overloaded
# But there is not configuration files or getopt options
#
#User Configurations
#Dir for your html files
.if defined(HTDOCS)
HTDOCS=${HTDOCS}
.else
HTDOCS=${PREFIX}/www/data
#This is experimental
#do not expect it to work properly
.if defined(WITH_PHP)
CONFIGURE_ARGS+=--with-php=${PREFIX}/include/php
BUILD_DEPENDS=mod_php4:${PORTSDIR}/www/mod_php4:
.endif
#Process UID
.if defined(USER_ID)
USER_ID=${USER_ID}
.else
USER_ID=80 #www
.endif
MAN1= cherokee.1
#Process GID
.if defined(GROUP_ID)
GROUP_ID=${GROUP_ID}
.else
GROUP_ID=80 #www
.endif
#inet port
.if defined(PORT)
PORT=${PORT}
.else
PORT=80
.endif
#index files
.if defined(INDEX)
INDEX=${INDEX}
.else
INDEX=index.html
.endif
pre-configure:
@${ECHO} ""
@${ECHO} "=================================="
@${ECHO} ""
@${ECHO} "Current configuration :"
@${ECHO} "Working directory : ${HTDOCS} (HTDOCS)"
@${ECHO} "Process id : ${USER_ID} (USER_ID)"
@${ECHO} "Process gid : ${GROUP_ID} (GROUP_ID)"
@${ECHO} "Inet port : ${PORT} (PORT)"
@${ECHO} "Index files : ${INDEX} (INDEX)"
@${ECHO} ""
@${ECHO} "=================================="
@${ECHO} ""
#pre-everything:
# @${ECHO_MSG} "----------------------------"
# @${ECHO_MSG} " "
# @${ECHO_MSG} "You can add php support"
# @${ECHO_MSG} "This is experimental"
# @${ECHO_MSG} "builds cherokee with WITH_PHP=yes"
# @${ECHO_MSG} "For example,"
# @${ECHO_MSG} "make WITH_PHP=yes"
# @${ECHO_MSG} " "
# @${ECHO_MSG} "----------------------------"
pre-install:
@if [ ! -f ${PREFIX}/www ]; then \
${MKDIR} ${PREFIX}/www;\
fi
@if [ ! -f ${HTDOCS} ] ; then \
${MKDIR} ${HTDOCS};\
@if [ ! -f ${PREFIX}/www/data ] ; then \
${MKDIR} ${PREFIX}/www/data;\
fi
@${ECHO_MSG} " `pwd` "
post-install:
@${INSTALL} -m 644 ${WRKSRC}/doc/Intro.txt ${PREFIX}/share/cherokee
@${ECHO_MSG} " "
@${ECHO_MSG} " Dont forget to read the doc "
@${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt"
@${ECHO_MSG} " "
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (Cherokee-0.2.8.tar.gz) = ffefd914d7d242c2e52fc85b3ecc221a
MD5 (cherokee-0.4.2.tar.gz) = cfebf2348fb7c195db262ea6f2abde62

View File

@ -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>
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 <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 @@
#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>
#include "configuration.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 <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"

View File

@ -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"

View File

@ -1,3 +1,48 @@
bin/cherokee
@dirrm www/data
@dirrm www
bin/cherokee-config
bin/cherokee_static
etc/cherokee/cherokee.conf
include/cherokee/avl.h
include/cherokee/buffer.h
include/cherokee/cherokee.h
include/cherokee/common.h
include/cherokee/connection.h
include/cherokee/fdpoll.h
include/cherokee/handler.h
include/cherokee/http.h
include/cherokee/list.h
include/cherokee/log.h
include/cherokee/plugin_table.h
include/cherokee/plugin_table_entry.h
include/cherokee/server.h
include/cherokee/table.h
include/cherokee/virtual_server.h
lib/cherokee/libcherokee_common.a
lib/cherokee/libcherokee_common.la
lib/cherokee/libcherokee_common.so
lib/cherokee/libcherokee_common.so.0
lib/cherokee/libcherokee_dirlist.a
lib/cherokee/libcherokee_dirlist.la
lib/cherokee/libcherokee_dirlist.so
lib/cherokee/libcherokee_dirlist.so.0
lib/cherokee/libcherokee_file.a
lib/cherokee/libcherokee_file.la
lib/cherokee/libcherokee_file.so
lib/cherokee/libcherokee_file.so.0
lib/cherokee/libcherokee_redir.a
lib/cherokee/libcherokee_redir.la
lib/cherokee/libcherokee_redir.so
lib/cherokee/libcherokee_redir.so.0
lib/libcherokee.a
lib/libcherokee.la
lib/libcherokee.so
lib/libcherokee.so.0
share/aclocal/cherokee.m4
share/cherokee/mime_types.txt
share/cherokee/Intro.txt
@dirrm etc/cherokee
@dirrm include/cherokee
@dirrm lib/cherokee
@dirrm share/cherokee
@unexec rmdir %%LOCALBASE%%/www/data 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/www 2>/dev/null || true

View File

@ -5,90 +5,54 @@
# $FreeBSD$
#
PORTNAME= Cherokee
PORTVERSION= 0.2.8
PORTNAME= cherokee
PORTVERSION= 0.4.2
CATEGORIES= www
MASTER_SITES= http://www.alobbs.com/cherokee/
MASTER_SITES= ftp://www.alobbs.com/cherokee/
MAINTAINER= oksala@videotron.ca
COMMENT= Cherokee is an extremely fast and tiny web server
USE_AUTOCONF= yes
USE_AUTOMAKE= yes
#USE_AUTOCONF= yes
#USE_AUTOMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= \
--prefix=${PREFIX} \
--enable-daemon\
--enable-warnings\
--with-htdocs=${HTDOCS}\
--with-uid=${UID} \
--with-gid=${GID} \
--with-port=${PORT} \
--with-index=${INDEX}
CONFIGURE_ARGS= --prefix=${PREFIX}
INSTALLS_SHLIB= yes
#
# User Configuration
# This may seem a little overloaded
# But there is not configuration files or getopt options
#
#User Configurations
#Dir for your html files
.if defined(HTDOCS)
HTDOCS=${HTDOCS}
.else
HTDOCS=${PREFIX}/www/data
#This is experimental
#do not expect it to work properly
.if defined(WITH_PHP)
CONFIGURE_ARGS+=--with-php=${PREFIX}/include/php
BUILD_DEPENDS=mod_php4:${PORTSDIR}/www/mod_php4:
.endif
#Process UID
.if defined(USER_ID)
USER_ID=${USER_ID}
.else
USER_ID=80 #www
.endif
MAN1= cherokee.1
#Process GID
.if defined(GROUP_ID)
GROUP_ID=${GROUP_ID}
.else
GROUP_ID=80 #www
.endif
#inet port
.if defined(PORT)
PORT=${PORT}
.else
PORT=80
.endif
#index files
.if defined(INDEX)
INDEX=${INDEX}
.else
INDEX=index.html
.endif
pre-configure:
@${ECHO} ""
@${ECHO} "=================================="
@${ECHO} ""
@${ECHO} "Current configuration :"
@${ECHO} "Working directory : ${HTDOCS} (HTDOCS)"
@${ECHO} "Process id : ${USER_ID} (USER_ID)"
@${ECHO} "Process gid : ${GROUP_ID} (GROUP_ID)"
@${ECHO} "Inet port : ${PORT} (PORT)"
@${ECHO} "Index files : ${INDEX} (INDEX)"
@${ECHO} ""
@${ECHO} "=================================="
@${ECHO} ""
#pre-everything:
# @${ECHO_MSG} "----------------------------"
# @${ECHO_MSG} " "
# @${ECHO_MSG} "You can add php support"
# @${ECHO_MSG} "This is experimental"
# @${ECHO_MSG} "builds cherokee with WITH_PHP=yes"
# @${ECHO_MSG} "For example,"
# @${ECHO_MSG} "make WITH_PHP=yes"
# @${ECHO_MSG} " "
# @${ECHO_MSG} "----------------------------"
pre-install:
@if [ ! -f ${PREFIX}/www ]; then \
${MKDIR} ${PREFIX}/www;\
fi
@if [ ! -f ${HTDOCS} ] ; then \
${MKDIR} ${HTDOCS};\
@if [ ! -f ${PREFIX}/www/data ] ; then \
${MKDIR} ${PREFIX}/www/data;\
fi
@${ECHO_MSG} " `pwd` "
post-install:
@${INSTALL} -m 644 ${WRKSRC}/doc/Intro.txt ${PREFIX}/share/cherokee
@${ECHO_MSG} " "
@${ECHO_MSG} " Dont forget to read the doc "
@${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt"
@${ECHO_MSG} " "
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (Cherokee-0.2.8.tar.gz) = ffefd914d7d242c2e52fc85b3ecc221a
MD5 (cherokee-0.4.2.tar.gz) = cfebf2348fb7c195db262ea6f2abde62

View File

@ -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>
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 <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 @@
#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>
#include "configuration.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 <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"

View File

@ -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"

View File

@ -1,3 +1,48 @@
bin/cherokee
@dirrm www/data
@dirrm www
bin/cherokee-config
bin/cherokee_static
etc/cherokee/cherokee.conf
include/cherokee/avl.h
include/cherokee/buffer.h
include/cherokee/cherokee.h
include/cherokee/common.h
include/cherokee/connection.h
include/cherokee/fdpoll.h
include/cherokee/handler.h
include/cherokee/http.h
include/cherokee/list.h
include/cherokee/log.h
include/cherokee/plugin_table.h
include/cherokee/plugin_table_entry.h
include/cherokee/server.h
include/cherokee/table.h
include/cherokee/virtual_server.h
lib/cherokee/libcherokee_common.a
lib/cherokee/libcherokee_common.la
lib/cherokee/libcherokee_common.so
lib/cherokee/libcherokee_common.so.0
lib/cherokee/libcherokee_dirlist.a
lib/cherokee/libcherokee_dirlist.la
lib/cherokee/libcherokee_dirlist.so
lib/cherokee/libcherokee_dirlist.so.0
lib/cherokee/libcherokee_file.a
lib/cherokee/libcherokee_file.la
lib/cherokee/libcherokee_file.so
lib/cherokee/libcherokee_file.so.0
lib/cherokee/libcherokee_redir.a
lib/cherokee/libcherokee_redir.la
lib/cherokee/libcherokee_redir.so
lib/cherokee/libcherokee_redir.so.0
lib/libcherokee.a
lib/libcherokee.la
lib/libcherokee.so
lib/libcherokee.so.0
share/aclocal/cherokee.m4
share/cherokee/mime_types.txt
share/cherokee/Intro.txt
@dirrm etc/cherokee
@dirrm include/cherokee
@dirrm lib/cherokee
@dirrm share/cherokee
@unexec rmdir %%LOCALBASE%%/www/data 2>/dev/null || true
@unexec rmdir %%LOCALBASE%%/www 2>/dev/null || true