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

(-)www/cherokee/Makefile (-8 / +22 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	cherokee
8
PORTNAME=	cherokee
9
PORTVERSION=	0.4.17
9
PORTVERSION=	0.4.18
10
CATEGORIES=	www
10
CATEGORIES=	www
11
MASTER_SITES=	ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/%SUBDIR%/
11
MASTER_SITES=	ftp://laurel.datsi.fi.upm.es/pub/linux/cherokee/%SUBDIR%/
12
MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
12
MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}
Lines 14-39 Link Here
14
MAINTAINER=	ports@FreeBSD.org
14
MAINTAINER=	ports@FreeBSD.org
15
COMMENT=	An extremely fast and flexible web server
15
COMMENT=	An extremely fast and flexible web server
16
16
17
LIB_DEPENDS=	gnutls.12:${PORTSDIR}/security/gnutls
17
LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre \
18
		gnutls.12:${PORTSDIR}/security/gnutls
18
19
19
USE_GNOME=	gnomehack gnometarget pkgconfig
20
USE_GNOME=	gnomehack gnometarget pkgconfig
20
USE_GETOPT_LONG=	yes
21
USE_GETOPT_LONG=	yes
21
USE_GMAKE=	yes
22
USE_GMAKE=	yes
22
USE_INC_LIBTOOL_VER=	15
23
USE_LIBTOOL_VER=	15
23
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
24
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
24
25
INSTALLS_SHLIB=	yes
25
INSTALLS_SHLIB=	yes
26
26
27
MAN1=		cherokee-config.1 cherokee.1
27
MAN1=		cherokee-config.1 cherokee.1
28
28
29
CPPFLAGS=	${PTHREAD_CFLAGS}
29
CPPFLAGS=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
30
LDFLAGS=	${PTHREAD_LIBS}
30
LDFLAGS=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
31
31
32
.include <bsd.port.pre.mk>
32
.include <bsd.port.pre.mk>
33
33
34
.if ${OSVERSION} >= 502126
34
.if ${OSVERSION} < 500000
35
BROKEN=		"Broken pkg-plist"
35
PLIST_SUB+=	PAM=""
36
.else
37
PLIST_SUB+=	PAM="@comment "
36
.endif
38
.endif
39
40
post-patch:
41
	@${REINPLACE_CMD} -e 's|$$(top_builddir)/sherokee_reinplace|true|g' \
42
		${WRKSRC}/Makefile.in
43
44
pre-build:
45
.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
46
	@cd ${BUILD_WRKSRC} && ${SED} -e \
47
		's:%sysconfdir%:${PREFIX}/etc:g ; \
48
		 s:%datadir%:${PREFIX}/share:g ; \
49
		 s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample
50
.endfor
37
51
38
pre-install:
52
pre-install:
39
	@if [ ! -f ${PREFIX}/www ]; then \
53
	@if [ ! -f ${PREFIX}/www ]; then \
(-)www/cherokee/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (cherokee-0.4.17.tar.gz) = 2cf8c8eb973e6b3e5578406b467f23b5
1
MD5 (cherokee-0.4.18.tar.gz) = 7bc6421e28d83da59a475748ec638239
2
SIZE (cherokee-0.4.17.tar.gz) = 800872
2
SIZE (cherokee-0.4.18.tar.gz) = 1018343
(-)www/cherokee/files/patch-cherokee::macros.h (+11 lines)
Line 0 Link Here
1
--- cherokee/macros.h.orig	Sun Mar  6 08:09:33 2005
2
+++ cherokee/macros.h	Fri Apr  1 13:12:03 2005
3
@@ -31,7 +31,7 @@
4
 #define CHEROKEE_MACROS_H
5
 
6
 #include <stdio.h>
7
-#include <stdint.h>
8
+#include <inttypes.h>
9
 
10
 #ifdef  __cplusplus
11
 #  define CHEROKEE_BEGIN_DECLS  extern "C" {
(-)www/cherokee/files/patch-cherokee::socket.h (+19 lines)
Line 0 Link Here
1
--- cherokee/socket.h.orig	Sun Mar  6 08:09:33 2005
2
+++ cherokee/socket.h	Fri Apr  1 13:09:44 2005
3
@@ -45,12 +45,12 @@
4
 # include <sys/socket.h>
5
 #endif
6
 
7
-#ifdef HAVE_ARPA_INET_H
8
-# include <arpa/inet.h>
9
-#endif
10
-
11
 #ifdef HAVE_NETINET_IN_H
12
 # include <netinet/in.h>
13
+#endif
14
+
15
+#ifdef HAVE_ARPA_INET_H
16
+# include <arpa/inet.h>
17
 #endif
18
 
19
 #if defined(HAVE_GNUTLS)
(-)www/cherokee/files/patch-cherokee::validator_pam.c (+12 lines)
Line 0 Link Here
1
--- cherokee/validator_pam.c.orig	Wed Mar 30 02:15:14 2005
2
+++ cherokee/validator_pam.c	Fri Apr  1 14:51:10 2005
3
@@ -27,6 +27,9 @@
4
 
5
 #include <security/pam_appl.h>
6
 
7
+#include "connection.h"
8
+#include "connection-protected.h"
9
+
10
 
11
 cherokee_module_info_t cherokee_pam_info = {
12
 	cherokee_validator,           /* type     */
(-)www/cherokee/files/patch-src::socket.h (-19 lines)
Lines 1-19 Link Here
1
--- src/socket.h.orig	Sat Jun 19 23:03:54 2004
2
+++ src/socket.h	Sat Jul 17 20:36:02 2004
3
@@ -45,12 +45,12 @@
4
 # include <sys/socket.h>
5
 #endif
6
 
7
-#ifdef HAVE_ARPA_INET_H
8
-# include <arpa/inet.h>
9
-#endif
10
-
11
 #ifdef HAVE_NETINET_IN_H
12
 # include <netinet/in.h>
13
+#endif
14
+
15
+#ifdef HAVE_ARPA_INET_H
16
+# include <arpa/inet.h>
17
 #endif
18
 
19
 #if defined(HAVE_GNUTLS)
(-)www/cherokee/pkg-plist (-74 / +40 lines)
Lines 1-4 Link Here
1
bin/cherokee-bench
1
bin/cget
2
bin/cherokee-config
2
bin/cherokee-config
3
bin/cherokee-panic
3
bin/cherokee-panic
4
etc/cherokee/advanced.conf
4
etc/cherokee/advanced.conf
Lines 9-107 Link Here
9
etc/cherokee/sites-available/default
9
etc/cherokee/sites-available/default
10
etc/cherokee/sites-available/example.com
10
etc/cherokee/sites-available/example.com
11
etc/cherokee/sites-enabled/default
11
etc/cherokee/sites-enabled/default
12
include/cherokee/access.h
13
include/cherokee/avl.h
14
include/cherokee/buffer.h
12
include/cherokee/buffer.h
15
include/cherokee/cherokee-config.h
13
include/cherokee/cherokee-config.h
14
include/cherokee/cherokee.h
16
include/cherokee/common.h
15
include/cherokee/common.h
17
include/cherokee/connection.h
16
include/cherokee/connection.h
18
include/cherokee/crc32.h
17
include/cherokee/downloader.h
19
include/cherokee/encoder.h
18
include/cherokee/encoder.h
20
include/cherokee/encoder_table.h
21
include/cherokee/fdpoll.h
19
include/cherokee/fdpoll.h
22
include/cherokee/handler.h
20
include/cherokee/handler.h
23
include/cherokee/handler_table.h
24
include/cherokee/handler_table_entry.h
25
include/cherokee/header.h
21
include/cherokee/header.h
26
include/cherokee/http.h
22
include/cherokee/http.h
27
include/cherokee/icons.h
28
include/cherokee/list.h
23
include/cherokee/list.h
29
include/cherokee/list_ext.h
24
include/cherokee/list_merge_sort.h
30
include/cherokee/log.h
31
include/cherokee/logger.h
25
include/cherokee/logger.h
32
include/cherokee/logger_table.h
26
include/cherokee/macros.h
33
include/cherokee/match.h
34
include/cherokee/matching_list.h
35
include/cherokee/mime.h
27
include/cherokee/mime.h
36
include/cherokee/mmap.h
37
include/cherokee/module.h
28
include/cherokee/module.h
38
include/cherokee/module_loader.h
29
include/cherokee/module_loader.h
39
include/cherokee/server.h
30
include/cherokee/server.h
40
include/cherokee/socket.h
41
include/cherokee/table.h
31
include/cherokee/table.h
42
include/cherokee/tdate_parse.h
32
include/cherokee/url.h
43
include/cherokee/thread.h
33
include/cherokee/util.h
44
include/cherokee/validator.h
34
lib/cherokee/libplugin_cgi.so
45
include/cherokee/virtual_server.h
35
lib/cherokee/libplugin_combined.so
46
lib/cherokee/libcherokee_cgi.a
36
lib/cherokee/libplugin_common.so
47
lib/cherokee/libcherokee_cgi.la
37
lib/cherokee/libplugin_dirlist.so
48
lib/cherokee/libcherokee_cgi.so
38
lib/cherokee/libplugin_error_redir.so
49
lib/cherokee/libcherokee_combined.a
39
lib/cherokee/libplugin_file.so
50
lib/cherokee/libcherokee_combined.la
40
lib/cherokee/libplugin_gzip.so
51
lib/cherokee/libcherokee_combined.so
41
lib/cherokee/libplugin_ncsa.so
52
lib/cherokee/libcherokee_common.a
42
lib/cherokee/libplugin_nn.so
53
lib/cherokee/libcherokee_common.la
43
%%PAM%%lib/cherokee/libplugin_pam.so
54
lib/cherokee/libcherokee_common.so
44
lib/cherokee/libplugin_phpcgi.so
55
lib/cherokee/libcherokee_dirlist.a
45
lib/cherokee/libplugin_plain.so
56
lib/cherokee/libcherokee_dirlist.la
46
lib/cherokee/libplugin_redir.so
57
lib/cherokee/libcherokee_dirlist.so
47
lib/cherokee/libplugin_remote_control.so
58
lib/cherokee/libcherokee_file.a
48
lib/cherokee/libplugin_server_info.so
59
lib/cherokee/libcherokee_file.la
49
lib/cherokee/libplugin_w3c.so
60
lib/cherokee/libcherokee_file.so
50
lib/libcherokee-base.a
61
lib/cherokee/libcherokee_gotls.a
51
lib/libcherokee-base.so
62
lib/cherokee/libcherokee_gotls.la
52
lib/libcherokee-base.so.0
63
lib/cherokee/libcherokee_gotls.so
53
lib/libcherokee-client.a
64
lib/cherokee/libcherokee_gzip.a
54
lib/libcherokee-client.so
65
lib/cherokee/libcherokee_gzip.la
55
lib/libcherokee-client.so.0
66
lib/cherokee/libcherokee_gzip.so
56
lib/libcherokee-server.a
67
lib/cherokee/libcherokee_mono.a
57
lib/libcherokee-server.so
68
lib/cherokee/libcherokee_mono.la
58
lib/libcherokee-server.so.0
69
lib/cherokee/libcherokee_mono.so
70
lib/cherokee/libcherokee_ncsa.a
71
lib/cherokee/libcherokee_ncsa.la
72
lib/cherokee/libcherokee_ncsa.so
73
lib/cherokee/libcherokee_nn.a
74
lib/cherokee/libcherokee_nn.la
75
lib/cherokee/libcherokee_nn.so
76
lib/cherokee/libcherokee_pam.a
77
lib/cherokee/libcherokee_pam.la
78
lib/cherokee/libcherokee_pam.so
79
lib/cherokee/libcherokee_phpcgi.a
80
lib/cherokee/libcherokee_phpcgi.la
81
lib/cherokee/libcherokee_phpcgi.so
82
lib/cherokee/libcherokee_plain.a
83
lib/cherokee/libcherokee_plain.la
84
lib/cherokee/libcherokee_plain.so
85
lib/cherokee/libcherokee_redir.a
86
lib/cherokee/libcherokee_redir.la
87
lib/cherokee/libcherokee_redir.so
88
lib/cherokee/libcherokee_remote_control.a
89
lib/cherokee/libcherokee_remote_control.la
90
lib/cherokee/libcherokee_remote_control.so
91
lib/cherokee/libcherokee_server_info.a
92
lib/cherokee/libcherokee_server_info.la
93
lib/cherokee/libcherokee_server_info.so
94
lib/cherokee/libcherokee_w3c.a
95
lib/cherokee/libcherokee_w3c.la
96
lib/cherokee/libcherokee_w3c.so
97
lib/libcherokee.a
98
lib/libcherokee.la
99
lib/libcherokee.so
100
lib/libcherokee.so.0
101
libdata/pkgconfig/cherokee.pc
59
libdata/pkgconfig/cherokee.pc
102
sbin/cherokee
60
sbin/cherokee
103
share/aclocal/cherokee.m4
61
share/aclocal/cherokee.m4
104
%%DATADIR%%/Intro.txt
62
%%DATADIR%%/Intro.txt
63
%%DATADIR%%/deps/combined.deps
64
%%DATADIR%%/deps/common.deps
65
%%DATADIR%%/deps/error_redir.deps
66
%%DATADIR%%/deps/nn.deps
67
%%DATADIR%%/deps/phpcgi.deps
105
%%DATADIR%%/icons/back.png
68
%%DATADIR%%/icons/back.png
106
%%DATADIR%%/icons/binary.png
69
%%DATADIR%%/icons/binary.png
107
%%DATADIR%%/icons/blank.png
70
%%DATADIR%%/icons/blank.png
Lines 109-114 Link Here
109
%%DATADIR%%/icons/compressed.png
72
%%DATADIR%%/icons/compressed.png
110
%%DATADIR%%/icons/folder.png
73
%%DATADIR%%/icons/folder.png
111
%%DATADIR%%/icons/image.png
74
%%DATADIR%%/icons/image.png
75
%%DATADIR%%/icons/iso.png
76
%%DATADIR%%/icons/java.png
112
%%DATADIR%%/icons/movie.png
77
%%DATADIR%%/icons/movie.png
113
%%DATADIR%%/icons/pdf.png
78
%%DATADIR%%/icons/pdf.png
114
%%DATADIR%%/icons/ps.png
79
%%DATADIR%%/icons/ps.png
Lines 120-125 Link Here
120
%%DATADIR%%/icons/unknown.png
85
%%DATADIR%%/icons/unknown.png
121
%%DATADIR%%/mime_types.txt
86
%%DATADIR%%/mime_types.txt
122
@dirrm %%DATADIR%%/icons
87
@dirrm %%DATADIR%%/icons
88
@dirrm %%DATADIR%%/deps
123
@dirrm %%DATADIR%%
89
@dirrm %%DATADIR%%
124
@dirrm lib/cherokee
90
@dirrm lib/cherokee
125
@dirrm include/cherokee
91
@dirrm include/cherokee

Return to bug 79484