Attachment #61404 for bug #92013

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




#

PORTNAME=	cherokee
PORTVERSION=	0.4.30
PORTREVISION=	1
CATEGORIES=	www
MASTER_SITES=	http://www.0x50.org/download/%SUBDIR%/
MASTER_SITE_SUBDIR=	${PORTVERSION:R}/${PORTVERSION}

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

USE_GNOME=	gnomehack gnometarget pkgconfig
USE_GCC=	3.4+
USE_GETOPT_LONG=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes

post-patch:
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|@mkdir_p@|${MKDIR} --|g'
	@${REINPLACE_CMD} -e '/^if/s|==|=|g' ${WRKSRC}/configure

pre-build:
.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example

Lines 1-3 Link Here

(-)www/cherokee/distinfo (-3 / +3 lines)
1	MD5 (cherokee-0.4.29.tar.gz) = 854e6e61a69781746496012658d8ef98	1	MD5 (cherokee-0.4.30.tar.gz) = bedcf9997928faeb550f54bc6621c13b
2	SHA256 (cherokee-0.4.29.tar.gz) = 7091536ef2a51d2548ac6268cc846dda9c37f7f7348597868c793f42b9be7d78	2	SHA256 (cherokee-0.4.30.tar.gz) = 336cc7008fc2ee65d0f5f45892e3404e8d5b36a8b903358c45aa2ddc090bc71d
3	SIZE (cherokee-0.4.29.tar.gz) = 1474498	3	SIZE (cherokee-0.4.30.tar.gz) = 1367424




--- Makefile.in.orig	Thu Jan 19 03:58:11 2006
+++ Makefile.in	Thu Jan 19 14:01:55 2006
@@ -314,7 +314,7 @@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@

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

 
 install-data-local-config:
 	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
@@ -1021,9 +1021,6 @@
 		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; \




 #include <sys/event.h>
 #include <sys/time.h>
 #include <unistd.h>
@@ -92,7 +93,7 @@
 		 */
 		index = fdp->nchanges;
 		if ( index > FDPOLL(fdp)->nfiles) {
-			PRINT_ERROR ("ERROR: Maximum number of fd exeeded\n");
+			PRINT_ERROR_S ("ERROR: Maximum number of fd exeeded\n");
 			return ret_error;
 		}
 		fdp->idx_fd_chlist[fd] = index;

Lines 1-11 Link Here

(-)www/cherokee/files/patch-cherokee-request.h (-11 lines)
1	--- cherokee/request.h.orig Tue Jun 28 01:25:32 2005
2	+++ cherokee/request.h Sat Sep 17 21:22:39 2005
3	@@ -25,6 +25,8 @@
4	#ifndef CHEROKEE_REQUEST_H
5	#define CHEROKEE_REQUEST_H
6
7	+#include <sys/types.h>
8	+
9	#include "common.h"
10	#include "url.h"
11	#include "http.h"




etc/cherokee/advanced.conf
etc/cherokee/cherokee.conf
etc/cherokee/icons.conf
etc/cherokee/mime.compression.types
etc/cherokee/mime.types
etc/cherokee/mods-available/admin
etc/cherokee/mods-available/ssl
etc/cherokee/sites-available/default

include/cherokee/logger.h
include/cherokee/macros.h
include/cherokee/mime.h
include/cherokee/mime_entry.h
include/cherokee/module.h
include/cherokee/module_loader.h
include/cherokee/nonce.h

%%PORTDOCS%%%%DOCSDIR%%/cherokee.png
%%PORTDOCS%%%%DOCSDIR%%/index.html
www/images/cherokee-logo.png
www/images/default-bg.png
www/images/powered_by_cherokee.png
www/images/top-layer.png
www/index.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/icons

Return to bug 92013

Lines 6-13 Link Here

(-)www/cherokee/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= cherokee	8	PORTNAME= cherokee
9	PORTVERSION= 0.4.29	9	PORTVERSION= 0.4.30
10	PORTREVISION= 1
11	CATEGORIES= www	10	CATEGORIES= www
12	MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/	11	MASTER_SITES= http://www.0x50.org/download/%SUBDIR%/
13	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}	12	MASTER_SITE_SUBDIR= ${PORTVERSION:R}/${PORTVERSION}
Lines 18-23 Link Here
18	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre	17	LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre
19		18
20	USE_GNOME= gnomehack gnometarget pkgconfig	19	USE_GNOME= gnomehack gnometarget pkgconfig
		20	USE_GCC= 3.4+
21	USE_GETOPT_LONG= yes	21	USE_GETOPT_LONG= yes
22	USE_REINPLACE= yes	22	USE_REINPLACE= yes
23	USE_GMAKE= yes	23	USE_GMAKE= yes
Lines 51-56 Link Here
51	post-patch:	51	post-patch:
52	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \	52	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
53	's\|@mkdir_p@\|${MKDIR} --\|g'	53	's\|@mkdir_p@\|${MKDIR} --\|g'
		54	@${REINPLACE_CMD} -e '/^if/s\|==\|=\|g' ${WRKSRC}/configure
54		55
55	pre-build:	56	pre-build:
56	.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example	57	.for file in advanced.conf cherokee.conf mods-ssl sites-default sites-example

Lines 1-6 Link Here

(-)www/cherokee/files/patch-Makefile.in (-7 / +7 lines)
1	--- Makefile.in.orig Thu Jul 7 23:03:20 2005	1	--- Makefile.in.orig Thu Jan 19 03:58:11 2006
2	+++ Makefile.in Tue Jul 12 01:18:30 2005	2	+++ Makefile.in Thu Jan 19 14:01:55 2006
3	@@ -305,7 +305,7 @@	3	@@ -314,7 +314,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	@@ -961,7 +961,7 @@	12	@@ -978,7 +978,7 @@
13		13
14		14
15	.sample.pre.sample:	15	.sample.pre.sample:
Lines 18-27 Link Here
18		18
19	install-data-local-config:	19	install-data-local-config:
20	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);	20	@$(mkinstalldirs) $(DESTDIR)$(pkgincludedir);
21	@@ -999,9 +999,6 @@	21	@@ -1021,9 +1021,6 @@
22	echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.conf"; \	22	echo "$@ will not overwrite existing $(cherokeeconfdir)/mime.compression.types"; \
23	else \	23	else \
24	$(INSTALL_DATA) $(top_srcdir)/mime.conf.sample $(DESTDIR)$(cherokeeconfdir)/mime.conf; \	24	$(INSTALL_DATA) $(top_srcdir)/mime.compression.types.sample $(DESTDIR)$(cherokeeconfdir)/mime.compression.types; \
25	- fi	25	- fi
26	- @if test -d $(DESTDIR)$(sysconfdir)/pam.d && test ! -d $(DESTDIR)$(sysconfdir)/pam.d/cherokee ; then \	26	- @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; \	27	- $(INSTALL_DATA) $(top_srcdir)/pam.d_cherokee $(DESTDIR)$(sysconfdir)/pam.d/cherokee; \

Lines 8-19 Link Here

(-)www/cherokee/files/patch-cherokee-fdpoll-kqueue.c (-9 lines)
8	#include <sys/event.h>	8	#include <sys/event.h>
9	#include <sys/time.h>	9	#include <sys/time.h>
10	#include <unistd.h>	10	#include <unistd.h>
11	@@ -92,7 +93,7 @@
12	*/
13	index = fdp->nchanges;
14	if ( index > FDPOLL(fdp)->nfiles) {
15	- PRINT_ERROR ("ERROR: Maximum number of fd exeeded\n");
16	+ PRINT_ERROR_S ("ERROR: Maximum number of fd exeeded\n");
17	return ret_error;
18	}
19	fdp->idx_fd_chlist[fd] = index;

Lines 5-11 Link Here

(-)www/cherokee/pkg-plist (-2 / +4 lines)
5	etc/cherokee/advanced.conf	5	etc/cherokee/advanced.conf
6	etc/cherokee/cherokee.conf	6	etc/cherokee/cherokee.conf
7	etc/cherokee/icons.conf	7	etc/cherokee/icons.conf
8	etc/cherokee/mime.conf	8	etc/cherokee/mime.compression.types
		9	etc/cherokee/mime.types
9	etc/cherokee/mods-available/admin	10	etc/cherokee/mods-available/admin
10	etc/cherokee/mods-available/ssl	11	etc/cherokee/mods-available/ssl
11	etc/cherokee/sites-available/default	12	etc/cherokee/sites-available/default
Lines 29-34 Link Here
29	include/cherokee/logger.h	30	include/cherokee/logger.h
30	include/cherokee/macros.h	31	include/cherokee/macros.h
31	include/cherokee/mime.h	32	include/cherokee/mime.h
		33	include/cherokee/mime_entry.h
32	include/cherokee/module.h	34	include/cherokee/module.h
33	include/cherokee/module_loader.h	35	include/cherokee/module_loader.h
34	include/cherokee/nonce.h	36	include/cherokee/nonce.h
Lines 129-136 Link Here
129	%%PORTDOCS%%%%DOCSDIR%%/cherokee.png	131	%%PORTDOCS%%%%DOCSDIR%%/cherokee.png
130	%%PORTDOCS%%%%DOCSDIR%%/index.html	132	%%PORTDOCS%%%%DOCSDIR%%/index.html
131	www/images/cherokee-logo.png	133	www/images/cherokee-logo.png
		134	www/images/default-bg.png
132	www/images/powered_by_cherokee.png	135	www/images/powered_by_cherokee.png
133	www/images/top-layer.png
134	www/index.html	136	www/index.html
135	%%PORTDOCS%%@dirrm %%DOCSDIR%%	137	%%PORTDOCS%%@dirrm %%DOCSDIR%%
136	@dirrm %%DATADIR%%/icons	138	@dirrm %%DATADIR%%/icons