Attachment #77502 for bug #111611

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





PORTNAME=	cherokee
PORTVERSION=	0.5.6
PORTREVISION=	4
CATEGORIES=	www
MASTER_SITES=	http://www.cherokee-project.com/download/${PORTVERSION:R}/${PORTVERSION}/ \
		http://www.alaskaparadise.com/freebsd/

MAINTAINER=	beech@alaskaparadise.com
COMMENT=	An extremely fast and flexible web server

LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre

CONFLICTS=	cherokee-devel-[0-9]*

USE_GNOME=	gnomehack gnometarget pkgconfig
USE_AUTOTOOLS=	libtool:15
USE_LDCONFIG=	yes
USE_GETOPT_LONG=yes
USE_GCC=	3.4+
USE_BISON=	yes
USE_GETOPT_LONG=	yes
USE_GMAKE=	yes
USE_BISON=	yes
USE_GCC=	3.4+
GNU_CONFIGURE=	yes

USE_RC_SUBR=	cherokee.sh
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man \
		--with-wwwroot=${PREFIX}/www/cherokee \
		--enable-readdir_r

OPTIONS=	GNUTLS	"TLS/SSL Use gnutls"	on \
		OPENSSL	"TLS/SSL Use openssl"	off \
		IPV6	"Enable IPv6"		on \
		STATIC	"Build all modules statically"	off

MAN1=		cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1

.include <bsd.port.pre.mk>

.if !defined(WITHOUT_GNUTLS)
.if defined(WITH_OPENSSL)
BROKEN=			Choose only one TLS/SSL backend
.endif
LIB_DEPENDS+=		gnutls.15:${PORTSDIR}/security/gnutls
CONFIGURE_ARGS+=	--enable-tls=gnutls
.endif

.if defined(WITH_OPENSSL)
.if !defined(WITHOUT_GNUTLS)
BROKEN=			Choose only one TLS/SSL backend
.endif
CFLAGS+=		-DHAVE_OPENSSL
CONFIGURE_ARGS+=	--enable-tls=openssl
LDFLAGS+=		-lssl -lcrypto
.endif

.if defined(WITHOUT_GNUTLS) && !defined(WITH_OPENSSL)
CONFIGURE_ARGS+=	--disable-tls
.endif

.if !defined(WITH_IPV6)
CONFIGURE_ARGS+=	--disable-ipv6
.endif

.if defined(WITH_STATIC)
CONFIGURE_ARGS+=	--enable-static-module=all
PLIST_SUB+=		STATIC="@comment "
.else
PLIST_SUB+=		STATIC=""
.endif

post-configure:
.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
	@cd ${BUILD_WRKSRC} && ${SED} -E -e \
		's:%sysconfdir%:${PREFIX}/etc:g ; \
		s:%datadir%:${PREFIX}/share:g ; \
		s:%wwwroot%:${PREFIX}/www/cherokee:g ; \
		s:%prefix%:${PREFIX}:g ; \
		s:#.*User.*nobody:User www:g ; \
		s:#.*Group.*nogroup:Group www:g ; \
		s:#.*PollMethod.*poll:PollMethod kqueue:g' \
			< ${file}.sample.pre > ${file}.sample
.endfor

post-install:
	@${INSTALL_DATA} ${WRKSRC}/advanced.conf.sample ${PREFIX}/etc/cherokee/advanced.conf.default
	@${INSTALL_DATA} ${WRKSRC}/cherokee.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.default
	@if [ "`${FIND} ${PREFIX}/etc/cherokee/sites-enabled -type f`" = "" ]; then \
		${INSTALL_DATA} ${PREFIX}/etc/cherokee/sites-available/default \
			${PREFIX}/etc/cherokee/sites-enabled/default ; \
	fi
.if !defined(NOPORTDOCS)
	@${INSTALL} -d ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
	@${INSTALL} -d ${DOCSDIR}/images
	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/images
.endif
	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}
	@${ECHO_MSG} " "
	@${ECHO_MSG} " Dont forget to read the doc "
	@${ECHO_MSG} " ${DATADIR}/Intro.txt"
	@${ECHO_MSG} " "

.include <bsd.port.post.mk>




bin/cherokee-config
bin/cherokee-panic
bin/cherokee_logrotate
@unexec if cmp -s %D/etc/cherokee/advanced.conf.default %D/etc/cherokee/advanced.conf; then rm -f %D/etc/cherokee/advanced.conf; fi
etc/cherokee/advanced.conf.default
@unexec if cmp -s %D/etc/cherokee/cherokee.conf.default %D/etc/cherokee/cherokee.conf; then rm -f %D/etc/cherokee/cherokee.conf; fi
etc/cherokee/cherokee.conf.default
etc/cherokee/icons.conf
etc/cherokee/mime.compression.types
etc/cherokee/mime.types
etc/cherokee/mods-available/admin
etc/cherokee/mods-available/ssl
@unexec if cmp -s %D/etc/cherokee/sites-enabled/default %D/etc/cherokee/sites-available/default; then rm -f %D/etc/cherokee/sites-enabled/default; fi
etc/cherokee/sites-available/default
etc/cherokee/sites-available/example.com
etc/cherokee/sites-enabled/default
include/cherokee/admin_client.h
include/cherokee/buffer.h
include/cherokee/cherokee-config.h

include/cherokee/typed_table.h
include/cherokee/url.h
include/cherokee/util.h
%%STATIC%%lib/cherokee/libplugin_admin.a
%%STATIC%%lib/cherokee/libplugin_admin.la
%%STATIC%%lib/cherokee/libplugin_admin.so
%%STATIC%%lib/cherokee/libplugin_cgi.a
%%STATIC%%lib/cherokee/libplugin_cgi.la
%%STATIC%%lib/cherokee/libplugin_cgi.so
%%STATIC%%lib/cherokee/libplugin_combined.a
%%STATIC%%lib/cherokee/libplugin_combined.la
%%STATIC%%lib/cherokee/libplugin_combined.so
%%STATIC%%lib/cherokee/libplugin_common.a
%%STATIC%%lib/cherokee/libplugin_common.la
%%STATIC%%lib/cherokee/libplugin_common.so
%%STATIC%%lib/cherokee/libplugin_dirlist.a
%%STATIC%%lib/cherokee/libplugin_dirlist.la
%%STATIC%%lib/cherokee/libplugin_dirlist.so
%%STATIC%%lib/cherokee/libplugin_error_redir.a
%%STATIC%%lib/cherokee/libplugin_error_redir.la
%%STATIC%%lib/cherokee/libplugin_error_redir.so
%%STATIC%%lib/cherokee/libplugin_fastcgi.a
%%STATIC%%lib/cherokee/libplugin_fastcgi.la
%%STATIC%%lib/cherokee/libplugin_fastcgi.so
%%STATIC%%lib/cherokee/libplugin_fcgi.a
%%STATIC%%lib/cherokee/libplugin_fcgi.la
%%STATIC%%lib/cherokee/libplugin_fcgi.so
%%STATIC%%lib/cherokee/libplugin_file.a
%%STATIC%%lib/cherokee/libplugin_file.la
%%STATIC%%lib/cherokee/libplugin_file.so
%%STATIC%%lib/cherokee/libplugin_gzip.a
%%STATIC%%lib/cherokee/libplugin_gzip.la
%%STATIC%%lib/cherokee/libplugin_gzip.so
%%STATIC%%lib/cherokee/libplugin_htdigest.a
%%STATIC%%lib/cherokee/libplugin_htdigest.la
%%STATIC%%lib/cherokee/libplugin_htdigest.so
%%STATIC%%lib/cherokee/libplugin_ncsa.a
%%STATIC%%lib/cherokee/libplugin_ncsa.la
%%STATIC%%lib/cherokee/libplugin_ncsa.so
%%STATIC%%lib/cherokee/libplugin_nn.a
%%STATIC%%lib/cherokee/libplugin_nn.la
%%STATIC%%lib/cherokee/libplugin_nn.so
%%STATIC%%lib/cherokee/libplugin_phpcgi.a
%%STATIC%%lib/cherokee/libplugin_phpcgi.la
%%STATIC%%lib/cherokee/libplugin_phpcgi.so
%%STATIC%%lib/cherokee/libplugin_plain.a
%%STATIC%%lib/cherokee/libplugin_plain.la
%%STATIC%%lib/cherokee/libplugin_plain.so
%%STATIC%%lib/cherokee/libplugin_read_config.a
%%STATIC%%lib/cherokee/libplugin_read_config.la
%%STATIC%%lib/cherokee/libplugin_read_config.so
%%STATIC%%lib/cherokee/libplugin_redir.a
%%STATIC%%lib/cherokee/libplugin_redir.la
%%STATIC%%lib/cherokee/libplugin_redir.so
%%STATIC%%lib/cherokee/libplugin_scgi.a
%%STATIC%%lib/cherokee/libplugin_scgi.la
%%STATIC%%lib/cherokee/libplugin_scgi.so
%%STATIC%%lib/cherokee/libplugin_server_info.a
%%STATIC%%lib/cherokee/libplugin_server_info.la
%%STATIC%%lib/cherokee/libplugin_server_info.so
%%STATIC%%lib/cherokee/libplugin_w3c.a
%%STATIC%%lib/cherokee/libplugin_w3c.la
%%STATIC%%lib/cherokee/libplugin_w3c.so
lib/libcherokee-base.a
lib/libcherokee-base.la
lib/libcherokee-base.so
lib/libcherokee-base.so.0
lib/libcherokee-client.a
lib/libcherokee-client.la
lib/libcherokee-client.so
lib/libcherokee-client.so.0
lib/libcherokee-config.a
lib/libcherokee-config.la
lib/libcherokee-config.so
lib/libcherokee-config.so.0
lib/libcherokee-server.a
lib/libcherokee-server.la
lib/libcherokee-server.so
lib/libcherokee-server.so.0

%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
%%PORTDOCS%%%%DOCSDIR%%/Cget.html
%%PORTDOCS%%%%DOCSDIR%%/images/Cherokee-icono.png
%%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html
%%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html
%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html

%%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html
%%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html
%%PORTDOCS%%%%DOCSDIR%%/Encoders.html
%%PORTDOCS%%%%DOCSDIR%%/images/Exquisite-khelpcenter.png
%%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html
%%PORTDOCS%%%%DOCSDIR%%/FastCGI.html
%%PORTDOCS%%%%DOCSDIR%%/File_sending.html

%%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html
%%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html
%%PORTDOCS%%%%DOCSDIR%%/SCGI.html
%%PORTDOCS%%%%DOCSDIR%%/images/Server-conf-small.png
%%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html
%%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html
%%PORTDOCS%%%%DOCSDIR%%/Validators.html

%%PORTDOCS%%%%DOCSDIR%%/WebApplications.html
%%PORTDOCS%%%%DOCSDIR%%/cherokee.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
www/cherokee/images/cherokee-logo.png
www/cherokee/images/default-bg.png
www/cherokee/images/powered_by_cherokee.png
www/cherokee/index.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/icons
@dirrm %%DATADIR%%/deps
@dirrm %%DATADIR%%
@dirrm lib/cherokee
@dirrm include/cherokee
@dirrmtry etc/cherokee/ssl
@dirrmtry etc/cherokee/sites-enabled
@dirrm etc/cherokee/sites-available
@dirrmtry etc/cherokee/mods-enabled
@dirrm etc/cherokee/mods-available
@dirrmtry etc/cherokee
@dirrmtry www/cherokee/images
@dirrmtry www/cherokee




# $FreeBSD: ports/www/cherokee/files/cherokee.sh.in,v 1.2 2006/07/19 18:55:37 rafan Exp $
#
# PROVIDE: cherokee
# REQUIRE: DAEMON
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable cherokee:

pidfile=/var/run/cherokee.pid
required_files=${cherokee_conf}
stop_postcmd=stop_postcmd
restart_precmd="checkconfig"

checkconfig()
{
	echo "Performing sanity check on ${name} configuration:"
	eval "${command} ${command_args} -t"
}

stop_postcmd()
{




--- Makefile.in.orig	Wed Dec 13 18:38:31 2006
+++ Makefile.in	Sun Apr 15 09:51:21 2007
@@ -315,7 +315,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@

 bin_SCRIPTS = cherokee-config
 SUFFIXES = .sample.pre .sample
 
@@ -980,7 +980,7 @@
 
 
 .sample.pre.sample:

 
 install-data-local-config:
 	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
@@ -1024,14 +1024,10 @@
 		echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
 	else \
 		$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
 	fi
-	@if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
-		$(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
-	fi
 	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/default ; then \
 		echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/default"; \
 	else \
 		$(INSTALL_DATA) $(top_builddir)/sites-default.sample $(DESTDIR)$(cherokeeconfdir)/sites-available/default; \
-		$(SHELL) -c "cd $(DESTDIR)$(cherokeeconfdir)/sites-enabled/ && $(LN_S) ../sites-available/default ."; \
 	fi
 	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/example.com ; then \
 		echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/example.com"; \

Return to bug 111611

Lines 7-16 Link Here

(-)Makefile (-35 / +55 lines)
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.5.6	9	PORTVERSION= 0.5.6
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= www	11	CATEGORIES= www
12	MASTER_SITES= http://www.cherokee-project.com/download/${PORTVERSION:R}/${PORTVERSION}/ \	12	MASTER_SITES= http://www.cherokee-project.com/download/${PORTVERSION:R}/${PORTVERSION}/ \
13	CENKES http://www.alaskaparadise.com/freebsd/	13	http://www.alaskaparadise.com/freebsd/
14		14
15	MAINTAINER= beech@alaskaparadise.com	15	MAINTAINER= beech@alaskaparadise.com
16	COMMENT= An extremely fast and flexible web server	16	COMMENT= An extremely fast and flexible web server
Lines 18-90 Link Here
18	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre	18	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
19		19
20	CONFLICTS= cherokee-devel-[0-9]*	20	CONFLICTS= cherokee-devel-[0-9]*
		21
21	USE_GNOME= gnomehack gnometarget pkgconfig	22	USE_GNOME= gnomehack gnometarget pkgconfig
		23	USE_AUTOTOOLS= libtool:15
22	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
23	USE_RC_SUBR= cherokee.sh	25	USE_GETOPT_LONG=yes
24	USE_GCC= 3.4+
25	USE_BISON= yes
26	USE_GETOPT_LONG= yes
27	USE_GMAKE= yes	26	USE_GMAKE= yes
		27	USE_BISON= yes
		28	USE_GCC= 3.4+
28	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
29	CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}	30
30	LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS}	31	USE_RC_SUBR= cherokee.sh
31	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
32	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \	32	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
33	--with-wwwroot=${PREFIX}/www \	33	--with-wwwroot=${PREFIX}/www/cherokee \
34	--disable-static	34	--enable-readdir_r
35		35
36	OPTIONS= GNUTLS "TLS/SSL Use gnutls" on \	36	OPTIONS= GNUTLS "TLS/SSL Use gnutls" on \
37	OPENSSL "TLS/SSL Use openssl" off \	37	OPENSSL "TLS/SSL Use openssl" off \
38	NOTLS "No TLS/SSL" off \	38	IPV6 "Enable IPv6" on \
39	NOIPV6 "No IPv6" off	39	STATIC "Build all modules statically" off
40		40
41	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1	41	MAN1= cget.1 cherokee-config.1 cherokee.1 cherokee_logrotate.1
42		42
43	.include <bsd.port.pre.mk>	43	.include <bsd.port.pre.mk>
44		44
45	.if !defined(WITHOUT_GNUTLS)	45	.if !defined(WITHOUT_GNUTLS)
46	LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls	46	.if defined(WITH_OPENSSL)
		47	BROKEN= Choose only one TLS/SSL backend
		48	.endif
		49	LIB_DEPENDS+= gnutls.15:${PORTSDIR}/security/gnutls
47	CONFIGURE_ARGS+= --enable-tls=gnutls	50	CONFIGURE_ARGS+= --enable-tls=gnutls
48	.endif	51	.endif
49		52
50	.if defined(WITH_OPENSSL)	53	.if defined(WITH_OPENSSL)
51	CFLAGS+= -DHAVE_OPENSSL	54	.if !defined(WITHOUT_GNUTLS)
52	CONFIGURE_ARGS+=--enable-tls=openssl	55	BROKEN= Choose only one TLS/SSL backend
53	LDFLAGS+= -lssl -lcrypto	56	.endif
		57	CFLAGS+= -DHAVE_OPENSSL
		58	CONFIGURE_ARGS+= --enable-tls=openssl
		59	LDFLAGS+= -lssl -lcrypto
54	.endif	60	.endif
55		61
56	.if defined(WITH_NOTLS)	62	.if defined(WITHOUT_GNUTLS) && !defined(WITH_OPENSSL)
57	CONFIGURE_ARGS+=--disable-tls	63	CONFIGURE_ARGS+= --disable-tls
58	.endif	64	.endif
59		65
60	.if defined(WITH_NOIPV6)	66	.if !defined(WITH_IPV6)
61	CONFIGURE_ARGS+=--disable-ipv6	67	CONFIGURE_ARGS+= --disable-ipv6
62	.endif	68	.endif
63		69
64	post-patch:	70	.if defined(WITH_STATIC)
65	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	71	CONFIGURE_ARGS+= --enable-static-module=all
66	's\|@mkdir_p@\|${MKDIR} --\|g'	72	PLIST_SUB+= STATIC="@comment "
		73	.else
		74	PLIST_SUB+= STATIC=""
		75	.endif
67		76
68	pre-build:	77	post-configure:
69	.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example	78	.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example
70	@cd ${BUILD_WRKSRC} && ${SED} -e \	79	@cd ${BUILD_WRKSRC} && ${SED} -E -e \
71	's:%sysconfdir%:${PREFIX}/etc:g ; \	80	's:%sysconfdir%:${PREFIX}/etc:g ; \
72	s:%datadir%:${PREFIX}/share:g ; \	81	s:%datadir%:${PREFIX}/share:g ; \
73	s:%wwwroot%:${PREFIX}/www:g ; \	82	s:%wwwroot%:${PREFIX}/www/cherokee:g ; \
74	s:%prefix%:${PREFIX}:g' < ${file}.sample.pre > ${file}.sample	83	s:%prefix%:${PREFIX}:g ; \
		84	s:#.User.nobody:User www:g ; \
		85	s:#.Group.nogroup:Group www:g ; \
		86	s:#.PollMethod.poll:PollMethod kqueue:g' \
		87	< ${file}.sample.pre > ${file}.sample
75	.endfor	88	.endfor
76		89
77	post-install:	90	post-install:
		91	@${INSTALL_DATA} ${WRKSRC}/advanced.conf.sample ${PREFIX}/etc/cherokee/advanced.conf.default
		92	@${INSTALL_DATA} ${WRKSRC}/cherokee.conf.sample ${PREFIX}/etc/cherokee/cherokee.conf.default
		93	@if [ "`${FIND} ${PREFIX}/etc/cherokee/sites-enabled -type f`" = "" ]; then \
		94	${INSTALL_DATA} ${PREFIX}/etc/cherokee/sites-available/default \
		95	${PREFIX}/etc/cherokee/sites-enabled/default ; \
		96	fi
78	.if !defined(NOPORTDOCS)	97	.if !defined(NOPORTDOCS)
79	@${INSTALL} -d ${DOCSDIR}/	98	@${INSTALL} -d ${DOCSDIR}
80	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/	99	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
81	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}/	100	${INSTALL_DATA} ${WRKSRC}/doc/*.png ${DOCSDIR}
82	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/	101	@${INSTALL} -d ${DOCSDIR}/images
		102	${INSTALL_DATA} ${WRKSRC}/doc/images/*.png ${DOCSDIR}/images
83	.endif	103	.endif
84	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}/	104	${INSTALL_DATA} ${WRKSRC}/doc/develop/Intro.txt ${DATADIR}
85	@${ECHO_MSG} " "	105	@${ECHO_MSG} " "
86	@${ECHO_MSG} " Dont forget to read the doc "	106	@${ECHO_MSG} " Dont forget to read the doc "
87	@${ECHO_MSG} " ${PREFIX}/share/cherokee/Intro.txt"	107	@${ECHO_MSG} " ${DATADIR}/Intro.txt"
88	@${ECHO_MSG} " "	108	@${ECHO_MSG} " "
89		109
90	.include <bsd.port.post.mk>	110	.include <bsd.port.post.mk>

Lines 2-17 Link Here

(-)pkg-plist (-55 / +83 lines)
2	bin/cherokee-config	2	bin/cherokee-config
3	bin/cherokee-panic	3	bin/cherokee-panic
4	bin/cherokee_logrotate	4	bin/cherokee_logrotate
5	etc/cherokee/advanced.conf	5	@unexec if cmp -s %D/etc/cherokee/advanced.conf.default %D/etc/cherokee/advanced.conf; then rm -f %D/etc/cherokee/advanced.conf; fi
6	etc/cherokee/cherokee.conf	6	etc/cherokee/advanced.conf.default
		7	@unexec if cmp -s %D/etc/cherokee/cherokee.conf.default %D/etc/cherokee/cherokee.conf; then rm -f %D/etc/cherokee/cherokee.conf; fi
		8	etc/cherokee/cherokee.conf.default
7	etc/cherokee/icons.conf	9	etc/cherokee/icons.conf
8	etc/cherokee/mime.compression.types	10	etc/cherokee/mime.compression.types
9	etc/cherokee/mime.types	11	etc/cherokee/mime.types
10	etc/cherokee/mods-available/admin	12	etc/cherokee/mods-available/admin
11	etc/cherokee/mods-available/ssl	13	etc/cherokee/mods-available/ssl
		14	@unexec if cmp -s %D/etc/cherokee/sites-enabled/default %D/etc/cherokee/sites-available/default; then rm -f %D/etc/cherokee/sites-enabled/default; fi
12	etc/cherokee/sites-available/default	15	etc/cherokee/sites-available/default
13	etc/cherokee/sites-available/example.com	16	etc/cherokee/sites-available/example.com
14	etc/cherokee/sites-enabled/default
15	include/cherokee/admin_client.h	17	include/cherokee/admin_client.h
16	include/cherokee/buffer.h	18	include/cherokee/buffer.h
17	include/cherokee/cherokee-config.h	19	include/cherokee/cherokee-config.h
Lines 40-94 Link Here
40	include/cherokee/typed_table.h	42	include/cherokee/typed_table.h
41	include/cherokee/url.h	43	include/cherokee/url.h
42	include/cherokee/util.h	44	include/cherokee/util.h
43	lib/cherokee/libplugin_admin.la	45	%%STATIC%%lib/cherokee/libplugin_admin.a
44	lib/cherokee/libplugin_admin.so	46	%%STATIC%%lib/cherokee/libplugin_admin.la
45	lib/cherokee/libplugin_cgi.la	47	%%STATIC%%lib/cherokee/libplugin_admin.so
46	lib/cherokee/libplugin_cgi.so	48	%%STATIC%%lib/cherokee/libplugin_cgi.a
47	lib/cherokee/libplugin_combined.la	49	%%STATIC%%lib/cherokee/libplugin_cgi.la
48	lib/cherokee/libplugin_combined.so	50	%%STATIC%%lib/cherokee/libplugin_cgi.so
49	lib/cherokee/libplugin_common.la	51	%%STATIC%%lib/cherokee/libplugin_combined.a
50	lib/cherokee/libplugin_common.so	52	%%STATIC%%lib/cherokee/libplugin_combined.la
51	lib/cherokee/libplugin_dirlist.la	53	%%STATIC%%lib/cherokee/libplugin_combined.so
52	lib/cherokee/libplugin_dirlist.so	54	%%STATIC%%lib/cherokee/libplugin_common.a
53	lib/cherokee/libplugin_error_redir.la	55	%%STATIC%%lib/cherokee/libplugin_common.la
54	lib/cherokee/libplugin_error_redir.so	56	%%STATIC%%lib/cherokee/libplugin_common.so
55	lib/cherokee/libplugin_fastcgi.la	57	%%STATIC%%lib/cherokee/libplugin_dirlist.a
56	lib/cherokee/libplugin_fastcgi.so	58	%%STATIC%%lib/cherokee/libplugin_dirlist.la
57	lib/cherokee/libplugin_fcgi.la	59	%%STATIC%%lib/cherokee/libplugin_dirlist.so
58	lib/cherokee/libplugin_fcgi.so	60	%%STATIC%%lib/cherokee/libplugin_error_redir.a
59	lib/cherokee/libplugin_file.la	61	%%STATIC%%lib/cherokee/libplugin_error_redir.la
60	lib/cherokee/libplugin_file.so	62	%%STATIC%%lib/cherokee/libplugin_error_redir.so
61	lib/cherokee/libplugin_gzip.la	63	%%STATIC%%lib/cherokee/libplugin_fastcgi.a
62	lib/cherokee/libplugin_gzip.so	64	%%STATIC%%lib/cherokee/libplugin_fastcgi.la
63	lib/cherokee/libplugin_htdigest.la	65	%%STATIC%%lib/cherokee/libplugin_fastcgi.so
64	lib/cherokee/libplugin_htdigest.so	66	%%STATIC%%lib/cherokee/libplugin_fcgi.a
65	lib/cherokee/libplugin_ncsa.la	67	%%STATIC%%lib/cherokee/libplugin_fcgi.la
66	lib/cherokee/libplugin_ncsa.so	68	%%STATIC%%lib/cherokee/libplugin_fcgi.so
67	lib/cherokee/libplugin_nn.la	69	%%STATIC%%lib/cherokee/libplugin_file.a
68	lib/cherokee/libplugin_nn.so	70	%%STATIC%%lib/cherokee/libplugin_file.la
69	lib/cherokee/libplugin_phpcgi.la	71	%%STATIC%%lib/cherokee/libplugin_file.so
70	lib/cherokee/libplugin_phpcgi.so	72	%%STATIC%%lib/cherokee/libplugin_gzip.a
71	lib/cherokee/libplugin_plain.la	73	%%STATIC%%lib/cherokee/libplugin_gzip.la
72	lib/cherokee/libplugin_plain.so	74	%%STATIC%%lib/cherokee/libplugin_gzip.so
73	lib/cherokee/libplugin_read_config.la	75	%%STATIC%%lib/cherokee/libplugin_htdigest.a
74	lib/cherokee/libplugin_read_config.so	76	%%STATIC%%lib/cherokee/libplugin_htdigest.la
75	lib/cherokee/libplugin_redir.la	77	%%STATIC%%lib/cherokee/libplugin_htdigest.so
76	lib/cherokee/libplugin_redir.so	78	%%STATIC%%lib/cherokee/libplugin_ncsa.a
77	lib/cherokee/libplugin_scgi.la	79	%%STATIC%%lib/cherokee/libplugin_ncsa.la
78	lib/cherokee/libplugin_scgi.so	80	%%STATIC%%lib/cherokee/libplugin_ncsa.so
79	lib/cherokee/libplugin_server_info.la	81	%%STATIC%%lib/cherokee/libplugin_nn.a
80	lib/cherokee/libplugin_server_info.so	82	%%STATIC%%lib/cherokee/libplugin_nn.la
81	lib/cherokee/libplugin_w3c.la	83	%%STATIC%%lib/cherokee/libplugin_nn.so
82	lib/cherokee/libplugin_w3c.so	84	%%STATIC%%lib/cherokee/libplugin_phpcgi.a
		85	%%STATIC%%lib/cherokee/libplugin_phpcgi.la
		86	%%STATIC%%lib/cherokee/libplugin_phpcgi.so
		87	%%STATIC%%lib/cherokee/libplugin_plain.a
		88	%%STATIC%%lib/cherokee/libplugin_plain.la
		89	%%STATIC%%lib/cherokee/libplugin_plain.so
		90	%%STATIC%%lib/cherokee/libplugin_read_config.a
		91	%%STATIC%%lib/cherokee/libplugin_read_config.la
		92	%%STATIC%%lib/cherokee/libplugin_read_config.so
		93	%%STATIC%%lib/cherokee/libplugin_redir.a
		94	%%STATIC%%lib/cherokee/libplugin_redir.la
		95	%%STATIC%%lib/cherokee/libplugin_redir.so
		96	%%STATIC%%lib/cherokee/libplugin_scgi.a
		97	%%STATIC%%lib/cherokee/libplugin_scgi.la
		98	%%STATIC%%lib/cherokee/libplugin_scgi.so
		99	%%STATIC%%lib/cherokee/libplugin_server_info.a
		100	%%STATIC%%lib/cherokee/libplugin_server_info.la
		101	%%STATIC%%lib/cherokee/libplugin_server_info.so
		102	%%STATIC%%lib/cherokee/libplugin_w3c.a
		103	%%STATIC%%lib/cherokee/libplugin_w3c.la
		104	%%STATIC%%lib/cherokee/libplugin_w3c.so
		105	lib/libcherokee-base.a
83	lib/libcherokee-base.la	106	lib/libcherokee-base.la
84	lib/libcherokee-base.so	107	lib/libcherokee-base.so
85	lib/libcherokee-base.so.0	108	lib/libcherokee-base.so.0
		109	lib/libcherokee-client.a
86	lib/libcherokee-client.la	110	lib/libcherokee-client.la
87	lib/libcherokee-client.so	111	lib/libcherokee-client.so
88	lib/libcherokee-client.so.0	112	lib/libcherokee-client.so.0
		113	lib/libcherokee-config.a
89	lib/libcherokee-config.la	114	lib/libcherokee-config.la
90	lib/libcherokee-config.so	115	lib/libcherokee-config.so
91	lib/libcherokee-config.so.0	116	lib/libcherokee-config.so.0
		117	lib/libcherokee-server.a
92	lib/libcherokee-server.la	118	lib/libcherokee-server.la
93	lib/libcherokee-server.so	119	lib/libcherokee-server.so
94	lib/libcherokee-server.so.0	120	lib/libcherokee-server.so.0
Lines 125-131 Link Here
125	%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html	151	%%PORTDOCS%%%%DOCSDIR%%/Behavior_configuration.html
126	%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html	152	%%PORTDOCS%%%%DOCSDIR%%/CGI_executing.html
127	%%PORTDOCS%%%%DOCSDIR%%/Cget.html	153	%%PORTDOCS%%%%DOCSDIR%%/Cget.html
128	%%PORTDOCS%%%%DOCSDIR%%/Cherokee-icono.png	154	%%PORTDOCS%%%%DOCSDIR%%/images/Cherokee-icono.png
129	%%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html	155	%%PORTDOCS%%%%DOCSDIR%%/Combined_logger.html
130	%%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html	156	%%PORTDOCS%%%%DOCSDIR%%/Combined_logs.html
131	%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html	157	%%PORTDOCS%%%%DOCSDIR%%/Common_behavior.html
Lines 137-143 Link Here
137	%%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html	163	%%PORTDOCS%%%%DOCSDIR%%/Directory_configuration.html
138	%%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html	164	%%PORTDOCS%%%%DOCSDIR%%/Directory_listing.html
139	%%PORTDOCS%%%%DOCSDIR%%/Encoders.html	165	%%PORTDOCS%%%%DOCSDIR%%/Encoders.html
140	%%PORTDOCS%%%%DOCSDIR%%/Exquisite-khelpcenter.png	166	%%PORTDOCS%%%%DOCSDIR%%/images/Exquisite-khelpcenter.png
141	%%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html	167	%%PORTDOCS%%%%DOCSDIR%%/Extension_configuration.html
142	%%PORTDOCS%%%%DOCSDIR%%/FastCGI.html	168	%%PORTDOCS%%%%DOCSDIR%%/FastCGI.html
143	%%PORTDOCS%%%%DOCSDIR%%/File_sending.html	169	%%PORTDOCS%%%%DOCSDIR%%/File_sending.html
Lines 160-166 Link Here
160	%%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html	186	%%PORTDOCS%%%%DOCSDIR%%/Request_configuration.html
161	%%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html	187	%%PORTDOCS%%%%DOCSDIR%%/Ruby_on_Rails_with_SCGI.html
162	%%PORTDOCS%%%%DOCSDIR%%/SCGI.html	188	%%PORTDOCS%%%%DOCSDIR%%/SCGI.html
163	%%PORTDOCS%%%%DOCSDIR%%/Server-conf-small.png	189	%%PORTDOCS%%%%DOCSDIR%%/images/Server-conf-small.png
164	%%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html	190	%%PORTDOCS%%%%DOCSDIR%%/Server_configuration.html
165	%%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html	191	%%PORTDOCS%%%%DOCSDIR%%/U-Cherokee.html
166	%%PORTDOCS%%%%DOCSDIR%%/Validators.html	192	%%PORTDOCS%%%%DOCSDIR%%/Validators.html
Lines 169-188 Link Here
169	%%PORTDOCS%%%%DOCSDIR%%/WebApplications.html	195	%%PORTDOCS%%%%DOCSDIR%%/WebApplications.html
170	%%PORTDOCS%%%%DOCSDIR%%/cherokee.png	196	%%PORTDOCS%%%%DOCSDIR%%/cherokee.png
171	%%PORTDOCS%%%%DOCSDIR%%/index.html	197	%%PORTDOCS%%%%DOCSDIR%%/index.html
172	www/images/cherokee-logo.png	198	www/cherokee/images/cherokee-logo.png
173	www/images/default-bg.png	199	www/cherokee/images/default-bg.png
174	www/images/powered_by_cherokee.png	200	www/cherokee/images/powered_by_cherokee.png
175	www/index.html	201	www/cherokee/index.html
		202	%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
176	%%PORTDOCS%%@dirrm %%DOCSDIR%%	203	%%PORTDOCS%%@dirrm %%DOCSDIR%%
177	@dirrm %%DATADIR%%/icons	204	@dirrm %%DATADIR%%/icons
178	@dirrm %%DATADIR%%/deps	205	@dirrm %%DATADIR%%/deps
179	@dirrm %%DATADIR%%	206	@dirrm %%DATADIR%%
180	@dirrm lib/cherokee	207	@dirrm lib/cherokee
181	@dirrm include/cherokee	208	@dirrm include/cherokee
182	@dirrm etc/cherokee/ssl	209	@dirrmtry etc/cherokee/ssl
183	@dirrm etc/cherokee/sites-enabled	210	@dirrmtry etc/cherokee/sites-enabled
184	@dirrm etc/cherokee/sites-available	211	@dirrm etc/cherokee/sites-available
185	@dirrm etc/cherokee/mods-enabled	212	@dirrmtry etc/cherokee/mods-enabled
186	@dirrm etc/cherokee/mods-available	213	@dirrm etc/cherokee/mods-available
187	@dirrm etc/cherokee	214	@dirrmtry etc/cherokee
188	@dirrmtry www/images	215	@dirrmtry www/cherokee/images
		216	@dirrmtry www/cherokee

Lines 3-9 Link Here

(-)files/cherokee.sh.in (-8 / +1 lines)
3	# $FreeBSD: ports/www/cherokee/files/cherokee.sh.in,v 1.2 2006/07/19 18:55:37 rafan Exp $	3	# $FreeBSD: ports/www/cherokee/files/cherokee.sh.in,v 1.2 2006/07/19 18:55:37 rafan Exp $
4	#	4	#
5	# PROVIDE: cherokee	5	# PROVIDE: cherokee
6	# REQUIRE: %%REQUIRE%%	6	# REQUIRE: DAEMON
7	# KEYWORD: shutdown	7	# KEYWORD: shutdown
8	#	8	#
9	# Add the following lines to /etc/rc.conf to enable cherokee:	9	# Add the following lines to /etc/rc.conf to enable cherokee:
Lines 29-41 Link Here
29	pidfile=/var/run/cherokee.pid	29	pidfile=/var/run/cherokee.pid
30	required_files=${cherokee_conf}	30	required_files=${cherokee_conf}
31	stop_postcmd=stop_postcmd	31	stop_postcmd=stop_postcmd
32	restart_precmd="checkconfig"
33
34	checkconfig()
35	{
36	echo "Performing sanity check on ${name} configuration:"
37	eval "${command} ${command_args} -t"
38	}
39		32
40	stop_postcmd()	33	stop_postcmd()
41	{	34	{

Lines 1-6 Link Here

(-)files/patch-Makefile.in (-8 / +13 lines)
1	--- Makefile.in.orig Tue Apr 4 17:23:41 2006	1	--- Makefile.in.orig Wed Dec 13 18:38:31 2006
2	+++ Makefile.in Tue Apr 11 02:25:14 2006	2	+++ Makefile.in Sun Apr 15 09:51:21 2007
3	@@ -314,7 +314,7 @@	3	@@ -315,7 +315,7 @@
4	sharedstatedir = @sharedstatedir@	4	sharedstatedir = @sharedstatedir@
5	sysconfdir = @sysconfdir@	5	sysconfdir = @sysconfdir@
6	target_alias = @target_alias@	6	target_alias = @target_alias@
Lines 9-15 Link Here
9	bin_SCRIPTS = cherokee-config	9	bin_SCRIPTS = cherokee-config
10	SUFFIXES = .sample.pre .sample	10	SUFFIXES = .sample.pre .sample
11		11
12	@@ -979,7 +979,7 @@	12	@@ -980,7 +980,7 @@
13		13
14		14
15	.sample.pre.sample:	15	.sample.pre.sample:
Lines 18-30 Link Here
18		18
19	install-data-local-config:	19	install-data-local-config:
20	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);	20	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
21	@@ -1022,9 +1022,6 @@	21	@@ -1024,14 +1024,10 @@
22	echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
23	else \	22	else \
24	$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \	23	$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
25	- fi	24	fi
26	- @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \	25	- @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \
27	- $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \	26	- $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \
28	fi	27	- fi
29	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/default ; then \	28	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/default ; then \
30	echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/default"; \	29	echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/default"; \
		30	else \
		31	$(INSTALL_DATA) $(top_builddir)/sites-default.sample $(DESTDIR)$(cherokeeconfdir)/sites-available/default; \
		32	- $(SHELL) -c "cd $(DESTDIR)$(cherokeeconfdir)/sites-enabled/ && $(LN_S) ../sites-available/default ."; \
		33	fi
		34	@if test -f $(DESTDIR)$(cherokeeconfdir)/sites-available/example.com ; then \
		35	echo "$@ will not overwrite existing $(cherokeeconfdir)/sites-available/example.com"; \