Attachment #30037 for bug #50764

View | Details | Raw Unified | Return to bug 50764
Collapse All | Expand All




# $FreeBSD: ports/www/cherokee/Makefile,v 1.1 2003/04/06 00:30:58 edwin Exp $
#

PORTNAME=	cherokee
PORTVERSION=	0.4.2
CATEGORIES=	www
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
HAS_CONFIGURE=  yes
CONFIGURE_ARGS= --prefix=${PREFIX}
		--prefix=${PREFIX} \
		--enable-daemon\
		--enable-warnings\
		--with-htdocs=${HTDOCS}\
		--with-uid=${UID} \
		--with-gid=${GID} \
		--with-port=${PORT} \
		--with-index=${INDEX}


#
# 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
.endif

#Process UID
.if defined(USER_ID)
USER_ID=${USER_ID}
.else
USER_ID=80      #www
.endif

#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

#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

#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} "----------------------------"
	@${ECHO} ""
	@${ECHO} "=================================="
	@${ECHO} ""

pre-install:
	@if [ ! -f ${PREFIX}/www ]; then \
		${MKDIR} ${PREFIX}/www;\
	fi
	@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>

Line 1 Link Here

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




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__
 
--- 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 <time.h>
+#include <unistd.h>
 
 int __inline socket_ready_to_read (int socket);
 
 #include "common.h"

Line 0 Link Here

(-)cherokee/files/patch-ab (+11 lines)
	1	--- configure.orig Mon Apr 7 13:28:00 2003
	2	+++ configure Mon Apr 7 13:27:40 2003
	3	@@ -6331,7 +6331,7 @@
	4	withval="$with_php"
	5
	6	CHEROKEE_PHP_CFLAGS="-I$withval -I$withval/main -I$withval/Zend -I$withval/regex -I$withval/TSRM"
	7	- CHEROKEE_PHP_LIBADD="$withval/libphp4.la"
	8	+ CHEROKEE_PHP_LIBADD="/usr/local/libexec/apache/libphp4.so"
	9
	10
	11	php_support="yes"




bin/cherokee
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
@dirrm www/data
@dirrm www

Return to bug 50764

Lines 5-94 Link Here

(-)cherokee/Makefile (-70 / +31 lines)
5	# $FreeBSD: ports/www/cherokee/Makefile,v 1.1 2003/04/06 00:30:58 edwin Exp $	5	# $FreeBSD: ports/www/cherokee/Makefile,v 1.1 2003/04/06 00:30:58 edwin Exp $
6	#	6	#
7		7
8	PORTNAME= Cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.2.8	9	PORTVERSION= 0.4.2
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= http://www.alobbs.com/cherokee/	11	MASTER_SITES= ftp://www.alobbs.com/cherokee/
12		12
13	MAINTAINER= oksala@videotron.ca	13	MAINTAINER= oksala@videotron.ca
14	COMMENT= Cherokee is an extremely fast and tiny web server	14	COMMENT= Cherokee is an extremely fast and tiny web server
15		15
16	USE_AUTOCONF= yes	16	#USE_AUTOCONF= yes
17	USE_AUTOMAKE= yes	17	#USE_AUTOMAKE= yes
18	HAS_CONFIGURE= yes	18	HAS_CONFIGURE= yes
19	CONFIGURE_ARGS+= \	19	CONFIGURE_ARGS= --prefix=${PREFIX}
20	--prefix=${PREFIX} \
21	--enable-daemon\
22	--enable-warnings\
23	--with-htdocs=${HTDOCS}\
24	--with-uid=${UID} \
25	--with-gid=${GID} \
26	--with-port=${PORT} \
27	--with-index=${INDEX}
28
29
30	#
31	# User Configuration
32	# This may seem a little overloaded
33	# But there is not configuration files or getopt options
34	#
35
36	#User Configurations
37	#Dir for your html files
38	.if defined(HTDOCS)
39	HTDOCS=${HTDOCS}
40	.else
41	HTDOCS=${PREFIX}/www/data
42	.endif
43
44	#Process UID
45	.if defined(USER_ID)
46	USER_ID=${USER_ID}
47	.else
48	USER_ID=80 #www
49	.endif
50
51	#Process GID
52	.if defined(GROUP_ID)
53	GROUP_ID=${GROUP_ID}
54	.else
55	GROUP_ID=80 #www
56	.endif
57
58	#inet port
59	.if defined(PORT)
60	PORT=${PORT}
61	.else
62	PORT=80
63	.endif
64		20
65	#index files	21	#This is experimental
66	.if defined(INDEX)	22	#do not expect it to work properly
67	INDEX=${INDEX}	23	.if defined(WITH_PHP)
68	.else	24	CONFIGURE_ARGS+=--with-php=${PREFIX}/include/php
69	INDEX=index.html	25	BUILD_DEPENDS=mod_php4:${PORTSDIR}/www/mod_php4:
70	.endif	26	.endif
71		27
72	pre-configure:	28	#pre-everything:
73	@${ECHO} ""	29	# @${ECHO_MSG} "----------------------------"
74	@${ECHO} "=================================="	30	# @${ECHO_MSG} " "
75	@${ECHO} ""	31	# @${ECHO_MSG} "You can add php support"
76	@${ECHO} "Current configuration :"	32	# @${ECHO_MSG} "This is experimental"
77	@${ECHO} "Working directory : ${HTDOCS} (HTDOCS)"	33	# @${ECHO_MSG} "builds cherokee with WITH_PHP=yes"
78	@${ECHO} "Process id : ${USER_ID} (USER_ID)"	34	# @${ECHO_MSG} "For example,"
79	@${ECHO} "Process gid : ${GROUP_ID} (GROUP_ID)"	35	# @${ECHO_MSG} "make WITH_PHP=yes"
80	@${ECHO} "Inet port : ${PORT} (PORT)"	36	# @${ECHO_MSG} " "
81	@${ECHO} "Index files : ${INDEX} (INDEX)"	37	# @${ECHO_MSG} "----------------------------"
82	@${ECHO} ""
83	@${ECHO} "=================================="
84	@${ECHO} ""
85		38
86	pre-install:	39	pre-install:
87	@if [ ! -f ${PREFIX}/www ]; then \	40	@if [ ! -f ${PREFIX}/www ]; then \
88	${MKDIR} ${PREFIX}/www;\	41	${MKDIR} ${PREFIX}/www;\
89	fi	42	fi
90	@if [ ! -f ${HTDOCS} ] ; then \	43	@if [ ! -f ${PREFIX}/www/data ] ; then \
91	${MKDIR} ${HTDOCS};\	44	${MKDIR} ${PREFIX}/www/data;\
92	fi	45	fi
		46	@${ECHO_MSG} " `pwd` "
		47
		48	post-install:
		49	@${INSTALL} -m 644 ${WRKSRC}/doc/Intro.txt ${PREFIX}/share/cherokee
		50	@${ECHO_MSG} " "
		51	@${ECHO_MSG} " Dont forget to read the doc "
		52	@${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt"
		53	@${ECHO_MSG} " "
93		54
94	.include <bsd.port.mk>	55	.include <bsd.port.mk>

Lines 1-43 Link Here

(-)cherokee/files/patch-aa (-40 / +32 lines)
1	--- src/cherokee.h.old Fri Dec 28 07:39:11 2001	1	diff -ruN cherokee-0.4.2.orig/cherokee.conf cherokee-0.4.2/cherokee.conf
2	+++ src/cherokee.h Tue May 14 14:49:35 2002	2	--- cherokee.conf.orig Mon Mar 17 12:25:35 2003
3	@@ -28,11 +28,11 @@	3	+++ cherokee.conf Mon Apr 7 12:58:12 2003
4	#include <stdio.h>	4	@@ -37,7 +37,7 @@
5	#include <stdlib.h>	5	## documents. By default, all requests are taken from this directory, but
6	#include <string.h>	6	## symbolic links and aliases may be used to point to other locations.
7	+#include <sys/types.h>	7	##
8	#include <netinet/in.h>	8	-DocumentRoot /var/www
9	#include <sys/socket.h>	9	+DocumentRoot /usr/local/www/data
10	#include <sys/wait.h>	10
11	#include <sys/time.h>	11	##
12	-#include <sys/types.h>	12	## Log: Turn On/Off the logging in to syslog
13	#include <sys/stat.h>	13	diff -ruN cherokee-0.4.2.orig/src/common.c cherokee-0.4.2/src/common.c
14	#include <unistd.h>	14	--- src.orig/common.c Sun Mar 23 14:55:03 2003
15	#include <fcntl.h>	15	+++ src/common.c Mon Apr 7 12:57:07 2003
16	--- src/server.h.old Fri Dec 28 07:25:54 2001	16	@@ -23,7 +23,6 @@
17	+++ src/server.h Tue May 14 14:49:35 2002	17	* USA
18	@@ -26,9 +26,9 @@	18	*/
19		19
20	#include <stdio.h>	20	-#include <varargs.h>
21	#include <stdlib.h>	21	#include <stdarg.h>
22	-#include <netinet/in.h>	22
23	-#include <sys/socket.h>	23	#include "common.h"
24	#include <sys/types.h>	24	diff -ruN cherokee-0.4.2.orig/src/server.h cherokee-0.4.2/src/server.h
25	+#include <sys/socket.h>	25	--- src.orig/server.h Wed Mar 19 16:19:19 2003
26	+#include <netinet/in.h>	26	+++ src/server.h Mon Apr 7 12:57:20 2003
27		27	@@ -26,6 +26,8 @@
28	#include "configuration.h"	28	#ifndef __CHEROKEE2_SERVER_H__
		29	#define __CHEROKEE2_SERVER_H__
29		30
30	--- src/socket.h.old Thu Dec 27 05:49:07 2001
31	+++ src/socket.h Tue May 14 14:49:35 2002
32	@@ -26,8 +26,11 @@
33
34	#include <stdio.h>
35	#include <stdlib.h>
36	+#include <string.h>
37	+#include <sys/types.h>	31	+#include <sys/types.h>
38	#include <sys/socket.h>	32	+
39	#include <sys/time.h>	33	#include <time.h>
40	+#include <unistd.h>
41
42	int __inline socket_ready_to_read (int socket);
43		34
		35	#include "common.h"

Lines 1-3 Link Here

(-)cherokee/pkg-plist (+45 lines)
1	bin/cherokee	1	bin/cherokee
		2	bin/cherokee-config
		3	bin/cherokee_static
		4	etc/cherokee/cherokee.conf
		5	include/cherokee/avl.h
		6	include/cherokee/buffer.h
		7	include/cherokee/cherokee.h
		8	include/cherokee/common.h
		9	include/cherokee/connection.h
		10	include/cherokee/fdpoll.h
		11	include/cherokee/handler.h
		12	include/cherokee/http.h
		13	include/cherokee/list.h
		14	include/cherokee/log.h
		15	include/cherokee/plugin_table.h
		16	include/cherokee/plugin_table_entry.h
		17	include/cherokee/server.h
		18	include/cherokee/table.h
		19	include/cherokee/virtual_server.h
		20	lib/cherokee/libcherokee_common.a
		21	lib/cherokee/libcherokee_common.la
		22	lib/cherokee/libcherokee_common.so
		23	lib/cherokee/libcherokee_common.so.0
		24	lib/cherokee/libcherokee_dirlist.a
		25	lib/cherokee/libcherokee_dirlist.la
		26	lib/cherokee/libcherokee_dirlist.so
		27	lib/cherokee/libcherokee_dirlist.so.0
		28	lib/cherokee/libcherokee_file.a
		29	lib/cherokee/libcherokee_file.la
		30	lib/cherokee/libcherokee_file.so
		31	lib/cherokee/libcherokee_file.so.0
		32	lib/cherokee/libcherokee_redir.a
		33	lib/cherokee/libcherokee_redir.la
		34	lib/cherokee/libcherokee_redir.so
		35	lib/cherokee/libcherokee_redir.so.0
		36	lib/libcherokee.a
		37	lib/libcherokee.la
		38	lib/libcherokee.so
		39	lib/libcherokee.so.0
		40	share/aclocal/cherokee.m4
		41	share/cherokee/mime_types.txt
		42	share/cherokee/Intro.txt
		43	@dirrm etc/cherokee
		44	@dirrm include/cherokee
		45	@dirrm lib/cherokee
		46	@dirrm share/cherokee
2	@dirrm www/data	47	@dirrm www/data
3	@dirrm www	48	@dirrm www